huskies: merge 944

server/src/service/status/format.rs

@@ -4,6 +4,7 @@
 //! a human-readable string.  Adding a new event type means adding one match arm
 //! here — no per-transport duplication anywhere in the codebase.
 
+use crate::pipeline_state::Stage;
 use crate::service::common::item_id::extract_item_number;
 use crate::service::notifications::format::stage_display_name;
 use crate::service::status::StatusEvent;
@@ -25,9 +26,15 @@ pub fn format_status_event(event: &StatusEvent) -> String {
         } => {
             let number = extract_item_number(story_id).unwrap_or(story_id.as_str());
             let name = story_name.as_deref().unwrap_or(story_id.as_str());
-            let from = stage_display_name(from_stage);
-            let to = stage_display_name(to_stage);
-            let prefix = if to == "Done" { "\u{1f389} " } else { "" };
+            let from_typed = Stage::from_dir(from_stage).unwrap_or(Stage::Upcoming);
+            let to_typed = Stage::from_dir(to_stage).unwrap_or(Stage::Upcoming);
+            let from = stage_display_name(&from_typed);
+            let to = stage_display_name(&to_typed);
+            let prefix = if matches!(to_typed, Stage::Done { .. }) {
+                "\u{1f389} "
+            } else {
+                ""
+            };
             format!("{prefix}#{number} {name} \u{2014} {from} \u{2192} {to}")
         }
         StatusEvent::MergeFailure {