huskies: merge 1009

server/src/worktree/cleanup.rs

@@ -315,7 +315,7 @@ mod tests {
         let config = empty_config();
         let report = run_cleanup_with_lookup(&project_root, &config, true, |id| {
             if id == story_id {
-                Some(Stage::Coding)
+                Some(Stage::Coding { claim: None })
             } else {
                 None
             }

server/src/worktree/sweep.rs

@@ -183,7 +183,9 @@ mod tests {
 
     #[test]
     fn should_not_sweep_coding() {
-        assert!(!worktree_should_be_swept(Some(&Stage::Coding)));
+        assert!(!worktree_should_be_swept(Some(&Stage::Coding {
+            claim: None
+        })));
     }
 
     #[test]
@@ -196,6 +198,7 @@ mod tests {
         let stage = Stage::Merge {
             feature_branch: crate::pipeline_state::BranchName("feature/x".to_string()),
             commits_ahead: NonZeroU32::new(1).unwrap(),
+            claim: None,
         };
         assert!(!worktree_should_be_swept(Some(&stage)));
     }
@@ -305,7 +308,7 @@ mod tests {
 
         let removed = sweep_with_lookup(&project_root, &config, |id| {
             if id == story_id {
-                Some(Stage::Coding)
+                Some(Stage::Coding { claim: None })
             } else {
                 None
             }
@@ -374,6 +377,7 @@ mod tests {
                         "feature/story-104_merge_story".to_string(),
                     ),
                     commits_ahead: NonZeroU32::new(1).unwrap(),
+                    claim: None,
                 })
             } else {
                 None