huskies: merge 997

server/src/chat/commands/backlog.rs

@@ -70,7 +70,6 @@ mod tests {
             name: name.to_string(),
             stage,
             depends_on: Vec::new(),
-            retry_count: 0,
         }
     }
 
@@ -80,7 +79,6 @@ mod tests {
             name: name.to_string(),
             stage,
             depends_on: deps.iter().map(|n| StoryId(n.to_string())).collect(),
-            retry_count: 0,
         }
     }
 
@@ -96,6 +94,7 @@ mod tests {
                 Stage::Coding {
                     claim: None,
                     plan: Default::default(),
+                    retries: 0,
                 },
             ),
             make_item("30_story_in_qa", "In QA", Stage::Qa),
@@ -240,6 +239,7 @@ mod tests {
             Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             },
         )];
         let output = build_backlog_from_items(&items);

server/src/chat/commands/status/tests.rs

@@ -12,7 +12,6 @@ fn make_item(id: &str, name: &str, stage: Stage) -> PipelineItem {
         name: name.to_string(),
         stage,
         depends_on: Vec::new(),
-        retry_count: 0,
     }
 }
 
@@ -23,7 +22,6 @@ fn make_item_with_deps(id: &str, name: &str, stage: Stage, deps: Vec<u32>) -> Pi
         name: name.to_string(),
         stage,
         depends_on: deps.iter().map(|n| StoryId(n.to_string())).collect(),
-        retry_count: 0,
     }
 }
 
@@ -140,6 +138,7 @@ fn status_does_not_show_full_filename_stem() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -169,6 +168,7 @@ fn status_shows_cost_when_token_usage_exists() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -209,6 +209,7 @@ fn status_no_cost_when_no_usage() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -232,6 +233,7 @@ fn status_aggregates_multiple_records_per_story() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -279,6 +281,7 @@ fn status_shows_waiting_on_for_story_with_unmet_deps() {
             Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             },
             vec![999],
         ),
@@ -307,6 +310,7 @@ fn status_does_not_show_waiting_on_when_dep_is_done() {
             Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             },
             vec![999],
         ),
@@ -340,6 +344,7 @@ fn status_shows_no_waiting_info_when_no_deps() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -406,7 +411,8 @@ fn stage_is_blocked_returns_false_for_coding() {
     assert!(!matches!(
         Stage::Coding {
             claim: None,
-            plan: Default::default()
+            plan: Default::default(),
+            retries: 0,
         },
         Stage::Blocked { .. }
             | Stage::MergeFailure { .. }
@@ -449,6 +455,7 @@ fn status_shows_idle_dot_for_unassigned_story() {
         Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         },
     )];
 
@@ -541,6 +548,7 @@ fn merge_stage() -> Stage {
         feature_branch: BranchName("feature/test".to_string()),
         commits_ahead: std::num::NonZeroU32::new(1).unwrap(),
         claim: None,
+        retries: 0,
     }
 }
 
@@ -823,6 +831,7 @@ fn in_progress_count_includes_blocked_items() {
             Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             },
         ),
         make_item(
@@ -858,6 +867,7 @@ fn frozen_coding_item_appears_in_in_progress_section() {
             resume_to: Box::new(Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             }),
         },
     )];
@@ -919,6 +929,7 @@ fn frozen_item_shows_snowflake_indicator() {
             resume_to: Box::new(Stage::Coding {
                 claim: None,
                 plan: Default::default(),
+                retries: 0,
             }),
         },
     )];
@@ -952,6 +963,7 @@ fn frozen_and_blocked_use_distinct_indicators() {
                 resume_to: Box::new(Stage::Coding {
                     claim: None,
                     plan: Default::default(),
+                    retries: 0,
                 }),
             },
         ),

server/src/chat/commands/unblock.rs

@@ -218,7 +218,6 @@ mod tests {
             "2_blocked",
             Some("Stuck Story"),
             None,
-            Some(5),
             None,
             None,
         );
@@ -289,15 +288,7 @@ mod tests {
         );
         // Seed CRDT registers: blocked=true, retry_count=5, with a name so the
         // response can echo it back instead of falling through to the raw id.
-        crate::crdt_state::write_item_str(
-            story_id,
-            stage,
-            Some("Stuck Story"),
-            None,
-            Some(5),
-            None,
-            None,
-        );
+        crate::crdt_state::write_item_str(story_id, stage, Some("Stuck Story"), None, None, None);
 
         let output = unblock_cmd_with_root(tmp.path(), "9904").unwrap();
 
@@ -351,7 +342,6 @@ mod tests {
             "blocked",
             Some("In QA"),
             None,
-            Some(3),
             None,
             None,
         );

server/src/chat/transport/matrix/assign.rs

@@ -323,7 +323,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));
@@ -376,7 +375,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));
@@ -424,7 +422,6 @@ mod tests {
             Some("coder-sonnet"),
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));

server/src/chat/transport/matrix/delete.rs

@@ -253,7 +253,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         // Seed in content store so find_story_by_number can resolve it.