huskies: merge 997

server/src/agents/pool/auto_assign/merge.rs

@@ -39,6 +39,7 @@ impl AgentPool {
             feature_branch: BranchName(String::new()),
             commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
             claim: None,
+            retries: 0,
         };
         let merge_items = scan_stage_items(&merge_stage);
         for story_id in &merge_items {

server/src/agents/pool/auto_assign/merge_failure_block_subscriber.rs

@@ -144,6 +144,7 @@ mod tests {
                 feature_branch: BranchName("feature/test".to_string()),
                 commits_ahead: NonZeroU32::new(1).unwrap(),
                 claim: None,
+                retries: 0,
             },
             after: Stage::MergeFailure {
                 kind: kind.clone(),
@@ -166,6 +167,7 @@ mod tests {
             after: Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             },
             event: PipelineEvent::FixupRequested,
             at: chrono::Utc::now(),

server/src/agents/pool/auto_assign/merge_failure_subscriber.rs

@@ -161,6 +161,7 @@ mod tests {
                 feature_branch: BranchName("feature/test".to_string()),
                 commits_ahead: NonZeroU32::new(1).unwrap(),
                 claim: None,
+                retries: 0,
             },
             after: crate::pipeline_state::Stage::MergeFailure {
                 kind: kind.clone(),

server/src/agents/pool/auto_assign/pipeline.rs

@@ -31,6 +31,7 @@ impl AgentPool {
                 Stage::Coding {
                     claim: None,
                     plan: Default::default(),
+                    retries: 0,
                 },
                 PipelineStage::Coder,
             ),

server/src/agents/pool/auto_assign/scan.rs

@@ -222,6 +222,7 @@ mod tests {
         let items = scan_stage_items(&Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         });
         // The global CRDT may contain items from other tests, so check
         // that our three items are present and appear in sorted order.

server/src/agents/pool/auto_assign/story_checks.rs

@@ -96,7 +96,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         assert!(has_review_hold("890_spike_held"));
     }
@@ -112,7 +111,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         assert!(!has_review_hold("890_spike_active_qa"));
     }
@@ -186,7 +184,6 @@ mod tests {
             "2_current",
             Some("Blocked"),
             None,
-            None,
             Some("[999]"),
             None,
         );
@@ -196,21 +193,12 @@ mod tests {
     #[test]
     fn has_unmet_dependencies_returns_false_when_dep_done() {
         crate::crdt_state::init_for_test();
-        crate::crdt_state::write_item_str(
-            "999_story_dep",
-            "5_done",
-            Some("Dep"),
-            None,
-            None,
-            None,
-            None,
-        );
+        crate::crdt_state::write_item_str("999_story_dep", "5_done", Some("Dep"), None, None, None);
         crate::crdt_state::write_item_str(
             "10_story_ok",
             "2_current",
             Some("Ok"),
             None,
-            None,
             Some("[999]"),
             None,
         );
@@ -227,7 +215,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         assert!(!has_unmet_dependencies("5_story_free"));
     }
@@ -245,14 +232,12 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         crate::crdt_state::write_item_str(
             "503_story_dependent",
             "1_backlog",
             Some("Dependent"),
             None,
-            None,
             Some("[500]"),
             None,
         );
@@ -271,14 +256,12 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         crate::crdt_state::write_item_str(
             "503_story_waiting",
             "1_backlog",
             Some("Waiting"),
             None,
-            None,
             Some("[490]"),
             None,
         );

server/src/agents/pool/auto_assign/watchdog/tests/limits_tests.rs

@@ -250,7 +250,6 @@ max_turns = 10
         None,
         None,
         None,
-        None,
     );
 
     // 12 turns in a single session exceeds the configured max of 10.
@@ -378,7 +377,6 @@ max_turns = 10
         None,
         None,
         None,
-        None,
     );
 
     // Prior session with 5 turns (under limit alone).
@@ -448,15 +446,7 @@ max_turns = 10
     let initial = "---\nname: Retry Test\n---\n";
     crate::crdt_state::init_for_test();
     crate::db::write_content(crate::db::ContentKey::Story(story_id), initial);
-    crate::crdt_state::write_item_str(
-        story_id,
-        "2_current",
-        Some("Retry Test"),
-        None,
-        None,
-        None,
-        None,
-    );
+    crate::crdt_state::write_item_str(story_id, "2_current", Some("Retry Test"), None, None, None);
 
     // Session 1: exceeds limit → retry_count=1 in CRDT, NOT blocked.
     {

server/src/agents/pool/cost_rollup_subscriber.rs

@@ -135,6 +135,7 @@ mod tests {
                 feature_branch: BranchName("feature/test".to_string()),
                 commits_ahead: NonZeroU32::new(1).unwrap(),
                 claim: None,
+                retries: 0,
             },
             after: Stage::Done {
                 merged_at: Utc::now(),
@@ -153,6 +154,7 @@ mod tests {
             before: Stage::Coding {
                 claim: None,
                 plan: PlanState::Missing,
+                retries: 0,
             },
             after: Stage::Abandoned { ts: Utc::now() },
             event: PipelineEvent::Abandon,
@@ -167,6 +169,7 @@ mod tests {
             after: Stage::Coding {
                 claim: None,
                 plan: PlanState::Missing,
+                retries: 0,
             },
             event: PipelineEvent::DepsMet,
             at: Utc::now(),

server/src/agents/pool/start/tests_selection.rs

@@ -293,7 +293,6 @@ stage = "coder"
         Some("coder-opus"),
         None,
         None,
-        None,
     );
 
     let pool = AgentPool::new_test(3011);