huskies: merge 1086 story Pipeline+Status split — Step C: migrate auto-assign, subscribers, and lifecycle transitions to read Pipeline + Status

server/src/agents/pool/auto_assign/merge_failure_subscriber.rs

@@ -9,7 +9,7 @@
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use crate::pipeline_state::{MergeFailureKind, Stage};
+use crate::pipeline_state::{MergeFailureKind, Stage, Status};
 use crate::slog;
 use crate::slog_warn;
 
@@ -26,6 +26,11 @@ use super::scan::{find_free_agent_for_stage, is_story_assigned_for_stage};
 pub(crate) async fn reconcile_merge_failure(pool: &Arc<AgentPool>, project_root: &Path) {
     use crate::pipeline_state::{MergeFailureKind, PipelineEvent, Stage, TransitionFired};
     for item in crate::pipeline_state::read_all_typed() {
+        // Story 1086: scan via the Status projection; the variant pattern is
+        // still needed to read `kind`.
+        if item.stage.status() != Status::MergeFailure {
+            continue;
+        }
         if let Stage::MergeFailure { ref kind, .. } = item.stage
             && matches!(kind, MergeFailureKind::ConflictDetected(_))
         {
@@ -73,6 +78,11 @@ async fn on_merge_failure_transition(
     project_root: &Path,
     fired: &crate::pipeline_state::TransitionFired,
 ) {
+    // Story 1086: gate on the typed `Status` projection first; only the
+    // `MergeFailure` kind extraction needs the variant pattern.
+    if fired.after.status() != Status::MergeFailure {
+        return;
+    }
     let Stage::MergeFailure { ref kind, .. } = fired.after else {
         return;
     };