huskies: merge 868

server/src/pipeline_state/transition.rs

@@ -33,6 +33,9 @@ pub enum PipelineEvent {
     },
     /// Mergemaster squash succeeded.
     MergeSucceeded { merge_commit: GitSha },
+    /// Merge pipeline failed (conflicts or gate failures); story moves to
+    /// `Stage::MergeFailure` awaiting human intervention or retry.
+    MergeFailed { reason: String },
     /// Mergemaster gave up after retry budget.
     MergeFailedFinal { reason: String },
     /// Story accepted (Done → Archived).
@@ -87,6 +90,7 @@ pub fn event_label(e: &PipelineEvent) -> &'static str {
         PipelineEvent::GatesFailed { .. } => "GatesFailed",
         PipelineEvent::QaSkipped { .. } => "QaSkipped",
         PipelineEvent::MergeSucceeded { .. } => "MergeSucceeded",
+        PipelineEvent::MergeFailed { .. } => "MergeFailed",
         PipelineEvent::MergeFailedFinal { .. } => "MergeFailedFinal",
         PipelineEvent::Accepted => "Accepted",
         PipelineEvent::Block { .. } => "Block",
@@ -174,6 +178,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
             reason: ArchiveReason::ReviewHeld { reason },
         }),
 
+        // ── MergeFailed: Merge → MergeFailure (recoverable intermediate) ──
+        (Merge { .. }, MergeFailed { reason }) => Ok(MergeFailure { reason }),
+
         (Merge { .. }, MergeFailedFinal { reason }) => Ok(Archived {
             archived_at: now,
             reason: ArchiveReason::MergeFailed { reason },
@@ -221,6 +228,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // ── Unblock: Blocked → Coding ─────────────────────────────────
         (Blocked { .. }, Unblock) => Ok(Coding),
 
+        // ── Unblock MergeFailure → Backlog ───────────────────────────────
+        (MergeFailure { .. }, Unblock) => Ok(Backlog),
+
         // ── Legacy unblock: Archived(Blocked|MergeFailed) → Backlog ──
         (
             Archived {