huskies: merge 981

server/src/db/content_store.rs

@@ -26,6 +26,13 @@ pub enum ContentKey<'a> {
     RunTestsOk(&'a str),
     /// Flag indicating a commit-recovery respawn is in progress.
     CommitRecoveryPending(&'a str),
+    /// Flag indicating a merge gate fixup coder session is in progress.
+    ///
+    /// Set when the merge gate fails with a self-evident-fix class of failure
+    /// (fmt drift, clippy warning, missing doc) so the pipeline advance handler
+    /// can route the fixup coder's completion directly back to merge instead of
+    /// through the normal QA path (story 981).
+    MergeFixupPending(&'a str),
 }
 
 impl<'a> ContentKey<'a> {
@@ -41,6 +48,7 @@ impl<'a> ContentKey<'a> {
             ContentKey::MergeMasterSpawnCount(id) => format!("{id}:mergemaster_spawn_count"),
             ContentKey::RunTestsOk(id) => format!("{id}:run_tests_ok"),
             ContentKey::CommitRecoveryPending(id) => format!("{id}:commit_recovery_pending"),
+            ContentKey::MergeFixupPending(id) => format!("{id}:merge_fixup_pending"),
         }
     }
 }