huskies: merge 893

This commit is contained in:
dave
2026-05-12 22:46:51 +00:00
parent 8e9112066f
commit 541433d96e
4 changed files with 98 additions and 4 deletions
+11 -2
View File
@@ -242,8 +242,17 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
// ── Unblock: Blocked → Coding ─────────────────────────────────
(Blocked { .. }, Unblock) => Ok(Coding),
// ── Unblock MergeFailure → Backlog ───────────────────────────────
(MergeFailure { .. }, Unblock) => Ok(Backlog),
// ── Unblock MergeFailure → Coding (retry) ────────────────────────
// `unblock_story` on a failed merge re-enters the coding stage so a
// coder agent can rework the branch, rather than routing back through
// the backlog (which would require an extra DepsMet promotion step).
(MergeFailure { .. }, Unblock) => Ok(Coding),
// ── Demote MergeFailure → Backlog (manual parking) ───────────────
// Lets operators park a failed-merge story in the backlog without an
// agent retry. Complements `Unblock` (→ Coding) which triggers an
// immediate retry by a coder agent.
(MergeFailure { .. }, Demote) => Ok(Backlog),
// ── Legacy unblock: Archived(Blocked|MergeFailed) → Backlog ──
(