huskies: merge 988

2026-05-13 17:24:18 +00:00
parent a078d3df7c
commit caed894db9
15 changed files with 169 additions and 81 deletions
@@ -52,7 +52,16 @@ pub(super) async fn scan_and_claim(
        }

        // Skip blocked stories (story 945: `Stage::Blocked` is the source of truth).
-        if item.stage().is_blocked() {
+        if matches!(
+            item.stage(),
+            crate::pipeline_state::Stage::Blocked { .. }
+                | crate::pipeline_state::Stage::MergeFailure { .. }
+                | crate::pipeline_state::Stage::MergeFailureFinal { .. }
+                | crate::pipeline_state::Stage::Archived {
+                    reason: crate::pipeline_state::ArchiveReason::Blocked { .. },
+                    ..
+                }
+        ) {
            continue;
        }