Skip to content

Split Rust validator outcomes #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CalvinSturm merged 1 commit into from
Jul 4, 2026
Merged

Split Rust validator outcomes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 68 additions & 6 deletions src/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ impl<P: ModelProvider> Agent<P> {
.required_validation_command(user_prompt)
.map(ToOwned::to_owned),
inferred_validator: None,
inferred_validator_outcomes: Vec::new(),
satisfied: false,
repair_mode: false,
exact_final_answer_required: self.exact_final_answer_required(user_prompt),
Expand Down Expand Up @@ -2908,6 +2909,15 @@ impl<P: ModelProvider> Agent<P> {
"next_phase": crate::agent::interrupts::run_phase_name(&effect.transition.to_phase)
}),
);
if let Some(developer_message) = effect.developer_message {
messages.push(Message {
role: Role::Developer,
content: Some(developer_message),
tool_call_id: None,
tool_name: None,
tool_calls: None,
});
}
}

Ok(Ok(successful_write_tool_ok_this_step))
Expand Down Expand Up @@ -2941,13 +2951,60 @@ impl<P: ModelProvider> Agent<P> {
.inferred_validator
.clone()
{
if runtime_checkpoint.validation_state.satisfied
let last_shell_ok = observed_tool_executions
.last()
.is_some_and(|execution| execution.name == "shell" && execution.ok);
if last_shell_ok {
if let Some(next_step) = crate::agent::validators::next_pending_step(
&validator,
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes,
) {
runtime_checkpoint.phase = crate::agent_runtime::state::RunPhase::Validating;
runtime_checkpoint.validation_state.required_command =
Some(next_step.command.clone());
runtime_checkpoint.validation_state.satisfied = false;
messages.push(Message {
role: Role::Developer,
content: Some(
crate::agent::completion_policy::required_validation_phase_message(
&next_step.command,
),
),
tool_call_id: None,
tool_name: None,
tool_calls: None,
});
self.emit_event(
run_id,
step,
EventKind::StepBlocked,
serde_json::json!({
"reason": "inferred_validator_next_step",
"validator_kind": validator.kind,
"validator_label": validator.label,
"command": next_step.command,
"outcome": validator.run_outcome(
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes
)
}),
);
return Ok(PhaseStepDispatch::ContinueAgentStep);
}
}
if crate::agent::validators::all_steps_passed(
&validator,
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes,
) && runtime_checkpoint.validation_state.satisfied
&& !runtime_checkpoint
.validation_state
.exact_final_answer_required
&& observed_tool_executions
.last()
.is_some_and(|execution| execution.name == "shell" && execution.ok)
&& last_shell_ok
{
let outcome = crate::agent::validators::ValidatorOutcome::Passed;
self.emit_event(
Expand All @@ -2959,14 +3016,19 @@ impl<P: ModelProvider> Agent<P> {
"validator_kind": validator.kind,
"validator_label": validator.label,
"command": validator.command,
"outcome": outcome
"outcome": outcome,
"validator_run": validator.run_outcome(
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes
)
}),
);
return Err(self.finalize_ok_with_end(
step,
run_id.to_string(),
started_at.to_string(),
format!("Validation passed: `{}`.", validator.command),
"Validation passed: Rust validators.".to_string(),
messages.clone(),
observed_tool_calls.to_vec(),
observed_tool_decisions.to_vec(),
Expand Down
2 changes: 2 additions & 0 deletions src/agent/completion_policy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ mod tests {
validation_state: crate::agent_runtime::state::ValidationState {
required_command: Some("cargo test".to_string()),
inferred_validator: None,
inferred_validator_outcomes: Vec::new(),
satisfied: false,
repair_mode: false,
exact_final_answer_required: false,
Expand Down Expand Up @@ -670,6 +671,7 @@ mod tests {
validation_state: crate::agent_runtime::state::ValidationState {
required_command: Some("cargo test".to_string()),
inferred_validator: None,
inferred_validator_outcomes: Vec::new(),
satisfied: true,
repair_mode: false,
exact_final_answer_required: true,
Expand Down
61 changes: 60 additions & 1 deletion src/agent/phase_transitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub(crate) enum PostToolPhaseRefreshEffect {
EmitCompletionBlocked {
transition: RuntimePhaseTransitionDecision,
reason: String,
developer_message: Option<String>,
},
StopAfterRepairBudgetExhausted {
reason: String,
Expand Down Expand Up @@ -132,6 +133,36 @@ pub(crate) fn refresh_phase_state_from_tool_facts(
.exact_final_answer_required,
&tool_facts,
);
let mut validation_facts = validation_facts;
if let Some(validator) = runtime_checkpoint
.validation_state
.inferred_validator
.as_ref()
{
if let Some(required_command) = required_command {
if validation_facts.satisfied || validation_facts.repair_needed {
crate::agent::validators::record_step_outcome_for_command(
validator,
&mut runtime_checkpoint
.validation_state
.inferred_validator_outcomes,
required_command,
validation_facts.satisfied,
);
}
}
if validation_facts.satisfied
&& crate::agent::validators::next_pending_step(
validator,
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes,
)
.is_some()
{
validation_facts.satisfied = false;
}
}
runtime_checkpoint.validation_state.satisfied = validation_facts.satisfied;
runtime_checkpoint.last_tool_fact_envelopes =
tool_fact_envelopes_from_tool_facts(&tool_facts, &runtime_checkpoint.phase);
Expand All @@ -142,9 +173,31 @@ pub(crate) fn refresh_phase_state_from_tool_facts(
let budget = crate::agent::validators::RepairBudget::one_repair(
runtime_checkpoint.retry_state.validation_repair_turn_count,
);
let remaining_before_repair = budget.max.saturating_sub(budget.used);
let compact_evidence = runtime_checkpoint
.validation_state
.inferred_validator
.as_ref()
.map(|validator| {
crate::agent::validators::compact_outcome_evidence(
validator,
&runtime_checkpoint
.validation_state
.inferred_validator_outcomes,
remaining_before_repair,
)
});
if !budget.can_authorize_repair() {
return PostToolPhaseRefreshEffect::StopAfterRepairBudgetExhausted {
reason: "validation failed after the single allowed repair turn".to_string(),
reason: compact_evidence
.map(|evidence| {
format!(
"validation failed after the single allowed repair turn\n{evidence}"
)
})
.unwrap_or_else(|| {
"validation failed after the single allowed repair turn".to_string()
}),
};
}
runtime_checkpoint.retry_state.validation_repair_turn_count = runtime_checkpoint
Expand All @@ -157,6 +210,7 @@ pub(crate) fn refresh_phase_state_from_tool_facts(
PostToolPhaseRefreshEffect::EmitCompletionBlocked {
transition: validation_resume_execution_transition_decision(),
reason: "validation failed and runtime requires a code-fix repair step".to_string(),
developer_message: compact_evidence,
}
}
ValidationPhaseTransitionDecision::EnterPostValidationFinalAnswerOnly => {
Expand All @@ -172,6 +226,7 @@ pub(crate) fn refresh_phase_state_from_tool_facts(
reason: post_validation_final_answer_transition_decision()
.completion_reason
.to_string(),
developer_message: None,
}
}
ValidationPhaseTransitionDecision::ClearRepair => {
Expand Down Expand Up @@ -223,6 +278,10 @@ pub(crate) fn apply_verified_write_follow_on(
runtime_checkpoint.validation_state.required_command = Some(follow_on.command.clone());
runtime_checkpoint.validation_state.inferred_validator =
follow_on.inferred_validator.clone();
runtime_checkpoint
.validation_state
.inferred_validator_outcomes
.clear();
Some(VerifiedWriteFollowOnUpdate {
control: PhaseLoopControl::ContinueAgentStep,
developer_message: follow_on.developer_message.clone(),
Expand Down
21 changes: 12 additions & 9 deletions src/agent/run_finalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,18 @@ impl<P: ModelProvider> Agent<P> {
if !self.validation_shell_available() {
return None;
}
inferred_validator.map(|validator| {
crate::agent::completion_policy::RequiredValidationFollowOn {
developer_message:
crate::agent::completion_policy::required_validation_phase_message(
&validator.command,
),
command: validator.command.clone(),
inferred_validator: Some(validator),
}
inferred_validator.and_then(|validator| {
let first_step = validator.first_step()?;
Some(
crate::agent::completion_policy::RequiredValidationFollowOn {
developer_message:
crate::agent::completion_policy::required_validation_phase_message(
&first_step.command,
),
command: first_step.command,
inferred_validator: Some(validator),
},
)
})
};
match crate::agent::completion_policy::decide_verified_write_completion(
Expand Down
13 changes: 10 additions & 3 deletions src/agent/runtime_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ pub(crate) enum GuardEffect {
pub(crate) struct CompletionBlockedEffect {
pub(crate) transition: RuntimePhaseTransitionDecision,
pub(crate) reason: String,
pub(crate) developer_message: Option<String>,
}

pub(crate) fn apply_required_validation_guard_decision(
Expand Down Expand Up @@ -108,9 +109,15 @@ pub(crate) fn completion_blocked_effect_from_post_tool_refresh(
) -> Option<CompletionBlockedEffect> {
match effect {
PostToolPhaseRefreshEffect::None => None,
PostToolPhaseRefreshEffect::EmitCompletionBlocked { transition, reason } => {
Some(CompletionBlockedEffect { transition, reason })
}
PostToolPhaseRefreshEffect::EmitCompletionBlocked {
transition,
reason,
developer_message,
} => Some(CompletionBlockedEffect {
transition,
reason,
developer_message,
}),
PostToolPhaseRefreshEffect::StopAfterRepairBudgetExhausted { .. } => None,
}
}
Expand Down
Loading
Loading