huskies: merge 974

server/src/pipeline_state/transition.rs

@@ -74,6 +74,8 @@ pub enum PipelineEvent {
     ReQueuedForQa,
     /// Story 973: user aborts an in-flight merge, sending the story back to Coding.
     MergeAborted,
+    /// Story 974: user re-opens a Done story for a post-merge hotfix, sending it back to Coding.
+    HotfixRequested,
 }
 
 // ── Per-node execution events ───────────────────────────────────────────────
@@ -120,6 +122,7 @@ pub fn event_label(e: &PipelineEvent) -> &'static str {
         PipelineEvent::FixupRequested => "FixupRequested",
         PipelineEvent::ReQueuedForQa => "ReQueuedForQa",
         PipelineEvent::MergeAborted => "MergeAborted",
+        PipelineEvent::HotfixRequested => "HotfixRequested",
     }
 }
 
@@ -316,6 +319,12 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // ── MergeAborted: Merge → Coding (abort in-flight merge) ─────────
         (Merge { .. }, MergeAborted) => Ok(Coding),
 
+        // ── HotfixRequested: Done → Coding (post-merge hotfix) ───────────
+        // Allows reopening a completed story so a coder can apply a hotfix.
+        // A fresh feature branch is forked from master when auto-assign spawns
+        // the coder.
+        (Done { .. }, HotfixRequested) => Ok(Coding),
+
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
         (MergeFailure { reason, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
         (MergeFailureFinal { reason }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),