huskies: merge 982

server/src/crdt_state/read.rs

@@ -442,13 +442,21 @@ fn project_stage_for_view(
             feature_branch: BranchName(format!("feature/story-{story_id}")),
             commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
         }),
-        "merge_failure" => Some(Stage::MergeFailure {
-            reason: String::new(),
-            feature_branch: BranchName(format!("feature/story-{story_id}")),
-            commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
-        }),
+        "merge_failure" => {
+            // Reconstruct the typed kind from ContentKey::GateOutput so the
+            // auto-assigner can match on the variant after a server restart.
+            // This is the sole persistence backing for MergeFailureKind.
+            let kind = crate::db::read_content(crate::db::ContentKey::GateOutput(story_id))
+                .map(|s| crate::pipeline_state::MergeFailureKind::infer_from_gate_output(&s))
+                .unwrap_or(crate::pipeline_state::MergeFailureKind::Other(String::new()));
+            Some(Stage::MergeFailure {
+                kind,
+                feature_branch: BranchName(format!("feature/story-{story_id}")),
+                commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
+            })
+        }
         "merge_failure_final" => Some(Stage::MergeFailureFinal {
-            reason: String::new(),
+            kind: crate::pipeline_state::MergeFailureKind::Other(String::new()),
         }),
         "frozen" => Some(Stage::Frozen {
             resume_to: resume_target(),