huskies: merge 973

server/src/pipeline_state/transition.rs

@@ -72,6 +72,8 @@ pub enum PipelineEvent {
     FixupRequested,
     /// Story 972: user sends a MergeFailure story back to Qa for re-review.
     ReQueuedForQa,
+    /// Story 973: user aborts an in-flight merge, sending the story back to Coding.
+    MergeAborted,
 }
 
 // ── Per-node execution events ───────────────────────────────────────────────
@@ -117,6 +119,7 @@ pub fn event_label(e: &PipelineEvent) -> &'static str {
         PipelineEvent::MergemasterAttempted => "MergemasterAttempted",
         PipelineEvent::FixupRequested => "FixupRequested",
         PipelineEvent::ReQueuedForQa => "ReQueuedForQa",
+        PipelineEvent::MergeAborted => "MergeAborted",
     }
 }
 
@@ -310,6 +313,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // ── ReQueuedForQa: MergeFailure → Qa (re-review) ────────────────
         (MergeFailure { .. }, ReQueuedForQa) => Ok(Qa),
 
+        // ── MergeAborted: Merge → Coding (abort in-flight merge) ─────────
+        (Merge { .. }, MergeAborted) => Ok(Coding),
+
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
         (MergeFailure { reason, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
         (MergeFailureFinal { reason }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),