huskies: merge 945

server/src/io/watcher/mod.rs

@@ -58,6 +58,12 @@ pub fn stage_metadata(stage: &str, item_id: &str) -> Option<(&'static str, Strin
         Stage::MergeFailure { .. } => {
             ("merge_failure", format!("huskies: merge_failure {item_id}"))
         }
+        Stage::MergeFailureFinal { .. } => (
+            "merge_failure_final",
+            format!("huskies: merge_failure_final {item_id}"),
+        ),
+        Stage::Frozen { .. } => ("freeze", format!("huskies: freeze {item_id}")),
+        Stage::ReviewHold { .. } => ("review_hold", format!("huskies: review_hold {item_id}")),
         Stage::Done { .. } => ("done", format!("huskies: done {item_id}")),
         Stage::Archived { .. } => ("accept", format!("huskies: accept {item_id}")),
     };

server/src/io/watcher/tests.rs

@@ -166,7 +166,6 @@ fn sweep_uses_crdt_merged_at_not_utc_now() {
         None,
         None,
         None,
-        None,
         Some(ten_seconds_ago),
     );
 
@@ -199,7 +198,6 @@ fn sweep_keeps_item_newer_than_retention() {
         None,
         None,
         None,
-        None,
         Some(one_second_ago),
     );