huskies: merge 982

server/src/pipeline_state/transition.rs

@@ -4,8 +4,8 @@ use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
 use super::{
-    AgentName, ArchiveReason, BranchName, ExecutionState, GitSha, Stage, StoryId, TransitionError,
-    stage_label,
+    AgentName, ArchiveReason, BranchName, ExecutionState, GitSha, MergeFailureKind, Stage, StoryId,
+    TransitionError, stage_label,
 };
 
 // ── Pipeline events ─────────────────────────────────────────────────────────
@@ -35,7 +35,7 @@ pub enum PipelineEvent {
     MergeSucceeded { merge_commit: GitSha },
     /// Merge pipeline failed (conflicts or gate failures); story moves to
     /// `Stage::MergeFailure` awaiting human intervention or retry.
-    MergeFailed { reason: String },
+    MergeFailed { kind: MergeFailureKind },
     /// Mergemaster gave up after retry budget.
     MergeFailedFinal { reason: String },
     /// Story accepted (Done → Archived).
@@ -214,9 +214,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
                 feature_branch,
                 commits_ahead,
             },
-            MergeFailed { reason },
+            MergeFailed { kind },
         ) => Ok(MergeFailure {
-            reason,
+            kind,
             feature_branch,
             commits_ahead,
         }),
@@ -231,9 +231,9 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
                 commits_ahead,
                 ..
             },
-            MergeFailed { reason },
+            MergeFailed { kind },
         ) => Ok(MergeFailure {
-            reason,
+            kind,
             feature_branch,
             commits_ahead,
         }),
@@ -326,8 +326,8 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
         (Done { .. }, HotfixRequested) => Ok(Coding),
 
         // ── MergemasterAttempted: MergeFailure → MergeFailureFinal ─────
-        (MergeFailure { reason, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
-        (MergeFailureFinal { reason }, MergemasterAttempted) => Ok(MergeFailureFinal { reason }),
+        (MergeFailure { kind, .. }, MergemasterAttempted) => Ok(MergeFailureFinal { kind }),
+        (MergeFailureFinal { kind }, MergemasterAttempted) => Ok(MergeFailureFinal { kind }),
 
         // ── Unblock: from Frozen/ReviewHold → resume_to ────────────────
         (Frozen { resume_to }, Unblock) => Ok(*resume_to),