huskies: merge 945

server/src/http/mcp/story_tools/epic.rs

@@ -127,20 +127,20 @@ pub(crate) fn tool_show_epic(args: &Value, _ctx: &AppContext) -> Result<String,
             continue;
         };
         if member_view.epic() == Some(epic_id) {
-            // Frozen is now an orthogonal CRDT flag (story 934, stage 4).
-            let stage_name = if member_view.frozen() {
-                "frozen"
-            } else {
-                match &item.stage {
-                    Stage::Upcoming | Stage::Backlog => "backlog",
-                    Stage::Coding => "current",
-                    Stage::Qa => "qa",
-                    Stage::Merge { .. } => "merge",
-                    Stage::Done { .. } => "done",
-                    Stage::Archived { .. } => "archived",
-                    Stage::MergeFailure { .. } => "merge_failure",
-                    Stage::Blocked { .. } => "blocked",
-                }
+            // Story 945: Frozen / ReviewHold / MergeFailureFinal are first-class
+            // Stage variants — no more orthogonal boolean flags.
+            let stage_name = match &item.stage {
+                Stage::Upcoming | Stage::Backlog => "backlog",
+                Stage::Coding => "current",
+                Stage::Qa => "qa",
+                Stage::Merge { .. } => "merge",
+                Stage::Done { .. } => "done",
+                Stage::Archived { .. } => "archived",
+                Stage::MergeFailure { .. } => "merge_failure",
+                Stage::MergeFailureFinal { .. } => "merge_failure_final",
+                Stage::Blocked { .. } => "blocked",
+                Stage::Frozen { .. } => "frozen",
+                Stage::ReviewHold { .. } => "review_hold",
             };
             if matches!(item.stage, Stage::Done { .. }) {
                 done += 1;