huskies: merge 1008

server/src/db/content_store.rs

@@ -37,6 +37,11 @@ pub enum ContentKey<'a> {
     /// CRDT projection layer can reconstruct the typed kind on server restart
     /// without substring-scanning the gate output string (story 986).
     MergeFailureKind(&'a str),
+    /// Flag set by the merge runner when a squash merge succeeds with
+    /// `story_archived: true`.  Written before the CRDT job status is set to
+    /// "completed" so the mergemaster agent exit handler in `spawn.rs` can
+    /// distinguish a clean success from a transient crash (bug 1008).
+    MergeSuccess(&'a str),
 }
 
 impl<'a> ContentKey<'a> {
@@ -54,6 +59,7 @@ impl<'a> ContentKey<'a> {
             ContentKey::CommitRecoveryPending(id) => format!("{id}:commit_recovery_pending"),
             ContentKey::MergeFixupPending(id) => format!("{id}:merge_fixup_pending"),
             ContentKey::MergeFailureKind(id) => format!("{id}:merge_failure_kind"),
+            ContentKey::MergeSuccess(id) => format!("{id}:merge_success"),
         }
     }
 }