huskies: merge 866

server/src/pipeline_state/transition.rs

@@ -160,14 +160,11 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
             reason: ArchiveReason::Completed,
         }),
 
-        // ── Stuck states (any active → Archived) ───────────────────────
+        // ── Block: any active → Blocked ──────────────────────────────
         (Backlog, Block { reason })
         | (Coding, Block { reason })
         | (Qa, Block { reason })
-        | (Merge { .. }, Block { reason }) => Ok(Archived {
-            archived_at: now,
-            reason: ArchiveReason::Blocked { reason },
-        }),
+        | (Merge { .. }, Block { reason }) => Ok(Blocked { reason }),
 
         (Backlog, ReviewHold { reason })
         | (Coding, ReviewHold { reason })
@@ -221,7 +218,10 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
             merge_commit: GitSha("closed".to_string()),
         }),
 
-        // ── Unblock: from Archived(Blocked) or Archived(MergeFailed) → Backlog
+        // ── Unblock: Blocked → Coding ─────────────────────────────────
+        (Blocked { .. }, Unblock) => Ok(Coding),
+
+        // ── Legacy unblock: Archived(Blocked|MergeFailed) → Backlog ──
         (
             Archived {
                 reason: ArchiveReason::Blocked { .. },