huskies: merge 868

server/src/service/agents/mod.rs

@@ -208,6 +208,7 @@ pub fn get_work_item_content(
                 crate::pipeline_state::Stage::Blocked { .. } => "blocked",
                 crate::pipeline_state::Stage::Qa => "qa",
                 crate::pipeline_state::Stage::Merge { .. } => "merge",
+                crate::pipeline_state::Stage::MergeFailure { .. } => "merge_failure",
                 crate::pipeline_state::Stage::Done { .. } => "done",
                 crate::pipeline_state::Stage::Archived { .. } => "archived",
                 crate::pipeline_state::Stage::Frozen { .. } => "frozen",

server/src/service/notifications/format.rs

@@ -18,6 +18,7 @@ pub fn stage_display_name(stage: &str) -> &'static str {
         Some(Stage::Merge { .. }) => "Merge",
         Some(Stage::Done { .. }) => "Done",
         Some(Stage::Archived { .. }) => "Archived",
+        Some(Stage::MergeFailure { .. }) => "MergeFailure",
         Some(Stage::Frozen { .. }) => "Frozen",
         None => "Unknown",
     }