huskies: merge 971

server/src/pipeline_state/transition.rs

@@ -68,6 +68,8 @@ pub enum PipelineEvent {
     /// Story 945: mergemaster has been auto-spawned and gave up; transitions
     /// `Stage::MergeFailure` → `Stage::MergeFailureFinal`.
     MergemasterAttempted,
+    /// Story 971: user sends a MergeFailure story back to Coding for coder fixup.
+    FixupRequested,
 }
 
 // ── Per-node execution events ───────────────────────────────────────────────
@@ -111,6 +113,7 @@ pub fn event_label(e: &PipelineEvent) -> &'static str {
         PipelineEvent::Unfreeze => "Unfreeze",
         PipelineEvent::ReviewHoldCleared => "ReviewHoldCleared",
         PipelineEvent::MergemasterAttempted => "MergemasterAttempted",
+        PipelineEvent::FixupRequested => "FixupRequested",
     }
 }
 
@@ -298,6 +301,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // ── ReviewHoldCleared: ReviewHold → resume_to ──────────────────
         (Stage::ReviewHold { resume_to, .. }, ReviewHoldCleared) => Ok(*resume_to),
 
+        // ── FixupRequested: MergeFailure → Coding (coder fixup) ────────
+        (MergeFailure { .. }, FixupRequested) => Ok(Coding),
+
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
         (MergeFailure { reason, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
         (MergeFailureFinal { reason }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),