huskies: merge 982

server/src/chat/commands/status/render.rs

@@ -235,12 +235,12 @@ fn render_item_line(
     ) {
         match &item.stage {
             // MergeFailureFinal: mergemaster already tried and gave up — always ⛔.
-            Stage::MergeFailureFinal { reason } => {
-                let snippet = first_non_empty_snippet(reason, 120);
+            Stage::MergeFailureFinal { kind } => {
+                let snippet = first_non_empty_snippet(&kind.display_reason(), 120);
                 return format!("  \u{26D4} {display}{cost_suffix}{dep_suffix} — {snippet}\n");
             }
             // MergeFailure: a recovery agent may be running or queued.
-            Stage::MergeFailure { reason, .. } => {
+            Stage::MergeFailure { kind, .. } => {
                 return match agent.map(|a| &a.status) {
                     Some(AgentStatus::Running) => format!(
                         "  \u{1F916} {display}{cost_suffix}{dep_suffix} — mergemaster running\n"
@@ -249,7 +249,7 @@ fn render_item_line(
                         "  \u{23F3} {display}{cost_suffix}{dep_suffix} — mergemaster queued\n"
                     ),
                     _ => {
-                        let snippet = first_non_empty_snippet(reason, 120);
+                        let snippet = first_non_empty_snippet(&kind.display_reason(), 120);
                         format!("  \u{26D4} {display}{cost_suffix}{dep_suffix} — {snippet}\n")
                     }
                 };

server/src/chat/commands/status/tests.rs

@@ -901,7 +901,9 @@ fn merge_failure_item_appears_in_merge_section_not_blocked() {
         "100_story_merge_fail",
         "Merge Failure Story",
         Stage::MergeFailure {
-            reason: "conflict in lib.rs".to_string(),
+            kind: crate::pipeline_state::MergeFailureKind::ConflictDetected(Some(
+                "conflict in lib.rs".to_string(),
+            )),
             feature_branch: BranchName("feature/100".to_string()),
             commits_ahead: std::num::NonZeroU32::new(1).unwrap(),
         },