huskies: merge 1036

server/src/db/content_store.rs

@@ -56,6 +56,10 @@ pub enum ContentKey<'a> {
     /// "completed" so the mergemaster agent exit handler in `spawn.rs` can
     /// distinguish a clean success from a transient crash (bug 1008).
     MergeSuccess(&'a str),
+    /// JSON-serialised `MergeReport` written by the merge runner on successful
+    /// completion.  Read by `get_merge_status` to surface gate output for the
+    /// "completed" state without a separate MergeJob CRDT register (story 1036).
+    MergeReport(&'a str),
 }
 
 impl<'a> ContentKey<'a> {
@@ -80,6 +84,7 @@ impl<'a> ContentKey<'a> {
             ContentKey::MergeFixupPending(id) => format!("{id}:merge_fixup_pending"),
             ContentKey::MergeFailureKind(id) => format!("{id}:merge_failure_kind"),
             ContentKey::MergeSuccess(id) => format!("{id}:merge_success"),
+            ContentKey::MergeReport(id) => format!("{id}:merge_report"),
         }
     }
 }

server/src/db/gc.rs

@@ -30,6 +30,7 @@ pub(crate) fn purge_content_keys_for_story(story_id: &str) {
     delete_content(ContentKey::CommitRecoveryPending(story_id));
     delete_content(ContentKey::MergeFixupPending(story_id));
     delete_content(ContentKey::MergeFailureKind(story_id));
+    delete_content(ContentKey::MergeReport(story_id));
 }
 
 /// Spawn a background task that purges content-store entries when a story reaches a terminal stage.