huskies: merge 986

server/src/db/content_store.rs

@@ -33,6 +33,10 @@ pub enum ContentKey<'a> {
     /// can route the fixup coder's completion directly back to merge instead of
     /// through the normal QA path (story 981).
     MergeFixupPending(&'a str),
+    /// JSON-serialised `MergeFailureKind` written alongside `GateOutput` so the
+    /// CRDT projection layer can reconstruct the typed kind on server restart
+    /// without substring-scanning the gate output string (story 986).
+    MergeFailureKind(&'a str),
 }
 
 impl<'a> ContentKey<'a> {
@@ -49,6 +53,7 @@ impl<'a> ContentKey<'a> {
             ContentKey::RunTestsOk(id) => format!("{id}:run_tests_ok"),
             ContentKey::CommitRecoveryPending(id) => format!("{id}:commit_recovery_pending"),
             ContentKey::MergeFixupPending(id) => format!("{id}:merge_fixup_pending"),
+            ContentKey::MergeFailureKind(id) => format!("{id}:merge_failure_kind"),
         }
     }
 }