huskies: merge 982

server/src/agents/pool/pipeline/advance/mod.rs

@@ -186,12 +186,13 @@ impl AgentPool {
                                  fixup failure: {e}"
                             );
                         }
-                        let reason = format!(
+                        let kind = crate::pipeline_state::MergeFailureKind::GatesFailed(format!(
                             "Merge fixup coder could not resolve gate failures: {}",
                             truncate_gate_output(&completion.gate_output)
-                        );
+                        ));
+                        let display = kind.display_reason();
                         if let Err(e) =
-                            crate::agents::lifecycle::transition_to_merge_failure(story_id, &reason)
+                            crate::agents::lifecycle::transition_to_merge_failure(story_id, kind)
                         {
                             slog_error!(
                                 "[pipeline] Failed to transition '{story_id}' to MergeFailure \
@@ -200,7 +201,7 @@ impl AgentPool {
                         }
                         let _ = self.watcher_tx.send(WatcherEvent::MergeFailure {
                             story_id: story_id.to_string(),
-                            reason,
+                            reason: display,
                         });
                     }
                 } else if completion.gates_passed {