huskies: merge 997

server/src/worktree/cleanup.rs

@@ -319,6 +319,7 @@ mod tests {
                 Some(Stage::Coding {
                     claim: None,
                     plan: Default::default(),
+                    retries: 0,
                 })
             } else {
                 None

server/src/worktree/sweep.rs

@@ -180,6 +180,7 @@ mod tests {
         assert!(!worktree_should_be_swept(Some(&Stage::Coding {
             claim: None,
             plan: Default::default(),
+            retries: 0,
         })));
     }
 
@@ -194,6 +195,7 @@ mod tests {
             feature_branch: crate::pipeline_state::BranchName("feature/x".to_string()),
             commits_ahead: NonZeroU32::new(1).unwrap(),
             claim: None,
+            retries: 0,
         };
         assert!(!worktree_should_be_swept(Some(&stage)));
     }
@@ -306,6 +308,7 @@ mod tests {
                 Some(Stage::Coding {
                     claim: None,
                     plan: Default::default(),
+                    retries: 0,
                 })
             } else {
                 None
@@ -376,6 +379,7 @@ mod tests {
                     ),
                     commits_ahead: NonZeroU32::new(1).unwrap(),
                     claim: None,
+                    retries: 0,
                 })
             } else {
                 None