huskies: merge 988

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

@@ -362,12 +362,30 @@ fn stage_is_blocked_returns_true_for_archived_blocked() {
             reason: "too many retries".to_string(),
         },
     };
-    assert!(stage.is_blocked());
+    assert!(matches!(
+        stage,
+        Stage::Blocked { .. }
+            | Stage::MergeFailure { .. }
+            | Stage::MergeFailureFinal { .. }
+            | Stage::Archived {
+                reason: ArchiveReason::Blocked { .. },
+                ..
+            }
+    ));
 }
 
 #[test]
 fn stage_is_blocked_returns_false_for_coding() {
-    assert!(!Stage::Coding.is_blocked());
+    assert!(!matches!(
+        Stage::Coding,
+        Stage::Blocked { .. }
+            | Stage::MergeFailure { .. }
+            | Stage::MergeFailureFinal { .. }
+            | Stage::Archived {
+                reason: ArchiveReason::Blocked { .. },
+                ..
+            }
+    ));
 }
 
 #[test]
@@ -376,7 +394,16 @@ fn stage_is_blocked_returns_false_for_archived_completed() {
         archived_at: Utc::now(),
         reason: ArchiveReason::Completed,
     };
-    assert!(!stage.is_blocked());
+    assert!(!matches!(
+        stage,
+        Stage::Blocked { .. }
+            | Stage::MergeFailure { .. }
+            | Stage::MergeFailureFinal { .. }
+            | Stage::Archived {
+                reason: ArchiveReason::Blocked { .. },
+                ..
+            }
+    ));
 }
 
 // -- status output shows idle dot for items with no active agent --------