fix: honor configured rework routing

Author: Shooksie

crates/orchestrator-core/src/services/tests.rs

@@ -2,7 +2,8 @@ use super::*;
 use crate::types::{
     ArchitectureEntity, ListPageRequest, Priority, RequirementFilter, RequirementItem, RequirementPriority,
     RequirementQuery, RequirementQuerySort, RequirementStatus, RequirementType, TaskCreateInput, TaskQuery,
-    TaskQuerySort, TaskType, WorkflowFilter, WorkflowQuery, WorkflowQuerySort, WorkflowRunInput, WorkflowStatus,
+    TaskQuerySort, TaskType, WorkflowDecisionRisk, WorkflowFilter, WorkflowQuery, WorkflowQuerySort, WorkflowRunInput,
+    WorkflowStatus,
 };
 
 fn scoped_ao_root(project_root: &std::path::Path) -> std::path::PathBuf {
@@ -642,6 +643,94 @@ async fn file_hub_persists_workflows_with_machine_state() {
     assert_eq!(loaded.machine_state, crate::types::WorkflowMachineState::RunPhase);
 }
 
+#[tokio::test]
+async fn file_hub_complete_phase_with_decision_honors_rework_routing() {
+    let temp = tempfile::tempdir().expect("tempdir");
+    let mut workflow_config = crate::load_workflow_config(temp.path()).expect("load workflow config");
+    for (phase_id, label, category) in [
+        ("implement", "Implement", "build"),
+        ("qa-review", "QA Review", "qa"),
+        ("push-branch", "Push Branch", "git"),
+    ] {
+        workflow_config.phase_catalog.insert(
+            phase_id.to_string(),
+            crate::PhaseUiDefinition {
+                label: label.to_string(),
+                description: String::new(),
+                category: category.to_string(),
+                icon: None,
+                docs_url: None,
+                tags: Vec::new(),
+                visible: true,
+            },
+        );
+    }
+    workflow_config.workflows.push(crate::WorkflowDefinition {
+        id: "routed-rework".to_string(),
+        name: "Routed Rework".to_string(),
+        description: "Regression test for file-backed rework routing".to_string(),
+        phases: vec![
+            "implement".to_string().into(),
+            crate::WorkflowPhaseEntry::Rich(crate::WorkflowPhaseConfig {
+                id: "qa-review".to_string(),
+                skip_if: Vec::new(),
+                max_rework_attempts: 3,
+                on_verdict: std::collections::HashMap::from([(
+                    "rework".to_string(),
+                    crate::PhaseTransitionConfig {
+                        target: "implement".to_string(),
+                        guard: None,
+                        allow_agent_target: false,
+                        allowed_targets: Vec::new(),
+                    },
+                )]),
+            }),
+            "push-branch".to_string().into(),
+        ],
+        post_success: None,
+        variables: Vec::new(),
+    });
+    crate::write_workflow_config(temp.path(), &workflow_config).expect("write workflow config");
+
+    let hub = file_hub(temp.path()).expect("create hub");
+    let workflow = WorkflowServiceApi::run(
+        &hub,
+        WorkflowRunInput::for_task("TASK-routed-rework".to_string(), Some("routed-rework".to_string())),
+    )
+    .await
+    .expect("run workflow");
+
+    let workflow =
+        WorkflowServiceApi::complete_current_phase(&hub, &workflow.id).await.expect("complete implement phase");
+    assert_eq!(workflow.current_phase.as_deref(), Some("qa-review"));
+    assert_eq!(workflow.current_phase_index, 1);
+
+    let workflow = WorkflowServiceApi::complete_current_phase_with_decision(
+        &hub,
+        &workflow.id,
+        Some(crate::PhaseDecision {
+            kind: "phase_result".to_string(),
+            phase_id: "qa-review".to_string(),
+            verdict: crate::PhaseDecisionVerdict::Rework,
+            reason: "needs fixes".to_string(),
+            confidence: 0.9,
+            risk: WorkflowDecisionRisk::Medium,
+            evidence: Vec::new(),
+            guardrail_violations: Vec::new(),
+            commit_message: None,
+            target_phase: None,
+        }),
+    )
+    .await
+    .expect("qa review should request rework");
+
+    assert_eq!(workflow.status, WorkflowStatus::Running);
+    assert_eq!(workflow.current_phase.as_deref(), Some("implement"));
+    assert_eq!(workflow.current_phase_index, 0);
+    assert_eq!(workflow.phases[0].status, crate::types::WorkflowPhaseStatus::Running);
+    assert_eq!(workflow.decision_history.last().and_then(|entry| entry.target_phase.as_deref()), Some("implement"));
+}
+
 #[tokio::test]
 async fn file_hub_auto_prunes_checkpoints_on_completion_when_enabled() {
     let temp = tempfile::tempdir().expect("tempdir");

crates/orchestrator-core/src/services/workflow_impl.rs

@@ -432,6 +432,8 @@ impl WorkflowServiceApi for FileServiceHub {
         let state_machines = load_compiled_state_machines(self.project_root.as_path())?;
         let retry_configs = load_phase_retry_configs(self.project_root.as_path());
         let workflow_config = crate::load_workflow_config_or_default(self.project_root.as_path());
+        let verdict_routing =
+            crate::resolve_workflow_verdict_routing(&workflow_config.config, workflow.workflow_ref.as_deref());
         let skip_guards =
             crate::resolve_workflow_skip_guards(&workflow_config.config, workflow.workflow_ref.as_deref());
         let executor = WorkflowLifecycleExecutor::with_state_machines(
@@ -441,6 +443,7 @@ impl WorkflowServiceApi for FileServiceHub {
             )?,
             state_machines,
         )
+        .with_verdict_routing_config(verdict_routing)
         .with_retry_configs(retry_configs)
         .with_skip_guards(skip_guards);
         executor.mark_current_phase_success_with_decision(&mut workflow, decision);

crates/orchestrator-core/src/workflow/lifecycle_executor.rs

@@ -154,6 +154,11 @@ impl WorkflowLifecycleExecutor {
         }
     }
 
+    pub fn with_verdict_routing_config(mut self, verdict_routing: VerdictRouting) -> Self {
+        self.verdict_routing = verdict_routing;
+        self
+    }
+
     pub fn with_retry_configs(mut self, configs: HashMap<String, PhaseRetryConfig>) -> Self {
         self.retry_configs = configs;
         self