huskies: merge 972

server/src/pipeline_state/transition.rs

@@ -70,6 +70,8 @@ pub enum PipelineEvent {
     MergemasterAttempted,
     /// Story 971: user sends a MergeFailure story back to Coding for coder fixup.
     FixupRequested,
+    /// Story 972: user sends a MergeFailure story back to Qa for re-review.
+    ReQueuedForQa,
 }
 
 // ── Per-node execution events ───────────────────────────────────────────────
@@ -114,6 +116,7 @@ pub fn event_label(e: &PipelineEvent) -> &'static str {
         PipelineEvent::ReviewHoldCleared => "ReviewHoldCleared",
         PipelineEvent::MergemasterAttempted => "MergemasterAttempted",
         PipelineEvent::FixupRequested => "FixupRequested",
+        PipelineEvent::ReQueuedForQa => "ReQueuedForQa",
     }
 }
 
@@ -304,6 +307,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // ── FixupRequested: MergeFailure → Coding (coder fixup) ────────
         (MergeFailure { .. }, FixupRequested) => Ok(Coding),
 
+        // ── ReQueuedForQa: MergeFailure → Qa (re-review) ────────────────
+        (MergeFailure { .. }, ReQueuedForQa) => Ok(Qa),
+
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
         (MergeFailure { reason, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
         (MergeFailureFinal { reason }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),