huskies: merge 1010

server/src/pipeline_state/transition.rs

@@ -4,8 +4,8 @@ use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
 use super::{
-    AgentName, ArchiveReason, BranchName, ExecutionState, GitSha, MergeFailureKind, Stage, StoryId,
-    TransitionError, stage_label,
+    AgentName, ArchiveReason, BranchName, ExecutionState, GitSha, MergeFailureKind, PlanState,
+    Stage, StoryId, TransitionError, stage_label,
 };
 
 // ── Pipeline events ─────────────────────────────────────────────────────────
@@ -149,7 +149,10 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         (Upcoming, Triage) => Ok(Backlog),
 
         // ── Forward path ────────────────────────────────────────────────
-        (Backlog, DepsMet) => Ok(Coding { claim: None }),
+        (Backlog, DepsMet) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
         (Coding { .. }, GatesStarted) => Ok(Qa),
         (
             Coding { .. },
@@ -173,7 +176,10 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
             commits_ahead,
             claim: None,
         }),
-        (Qa, GatesFailed { .. }) => Ok(Coding { claim: None }),
+        (Qa, GatesFailed { .. }) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
         (Merge { .. }, MergeSucceeded { merge_commit }) => Ok(Done {
             merged_at: now,
             merge_commit,
@@ -312,7 +318,10 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         (Stage::ReviewHold { resume_to, .. }, ReviewHoldCleared) => Ok(*resume_to),
 
         // ── FixupRequested: MergeFailure → Coding (coder fixup) ────────
-        (MergeFailure { .. }, FixupRequested) => Ok(Coding { claim: None }),
+        (MergeFailure { .. }, FixupRequested) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
 
         // ── FixupRequested: MergeFailureFinal → Coding (operator override)
         //
@@ -321,19 +330,28 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         // the gate failure is fixable and send the story back for another
         // coder attempt.  The budget counter is a mergemaster bookkeeping
         // detail, not a hard ceiling.
-        (MergeFailureFinal { .. }, FixupRequested) => Ok(Coding { claim: None }),
+        (MergeFailureFinal { .. }, FixupRequested) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
 
         // ── ReQueuedForQa: MergeFailure → Qa (re-review) ────────────────
         (MergeFailure { .. }, ReQueuedForQa) => Ok(Qa),
 
         // ── MergeAborted: Merge → Coding (abort in-flight merge) ─────────
-        (Merge { .. }, MergeAborted) => Ok(Coding { claim: None }),
+        (Merge { .. }, MergeAborted) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
 
         // ── 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 { claim: None }),
+        (Done { .. }, HotfixRequested) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
 
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
         (MergeFailure { kind, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { kind }),
@@ -344,7 +362,10 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         (Stage::ReviewHold { resume_to, .. }, Unblock) => Ok(*resume_to),
 
         // ── Unblock: Blocked → Coding ─────────────────────────────────
-        (Blocked { .. }, Unblock) => Ok(Coding { claim: None }),
+        (Blocked { .. }, Unblock) => Ok(Coding {
+            claim: None,
+            plan: PlanState::Missing,
+        }),
 
         // ── Unblock MergeFailure → Merge (re-attempt) ────────────────────
         // `unblock_story` on a failed merge re-queues it for merge, restoring