huskies: merge 945

2026-05-13 06:09:34 +00:00
parent 3a8894ea8f
commit 9ce5a8df0c
53 changed files with 497 additions and 654 deletions
@@ -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.