huskies: merge 945

server/src/chat/transport/matrix/assign.rs

@@ -323,7 +323,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));
@@ -379,7 +378,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));
@@ -430,7 +428,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let agents = std::sync::Arc::new(AgentPool::new_test(3000));

server/src/chat/transport/matrix/delete.rs

@@ -115,6 +115,9 @@ fn stage_display_label(stage: &crate::pipeline_state::Stage) -> &'static str {
         Stage::Done { .. } => "done",
         Stage::Archived { .. } => "archived",
         Stage::MergeFailure { .. } => "merge-failure",
+        Stage::MergeFailureFinal { .. } => "merge-failure-final",
+        Stage::Frozen { .. } => "frozen",
+        Stage::ReviewHold { .. } => "review-hold",
     }
 }
 
@@ -250,7 +253,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         // Seed in content store so find_story_by_number can resolve it.