huskies: merge 1185 story Bounded auto-retry for GatesFailed merges before requiring human intervention

server/src/startup/tick_loop.rs

@@ -98,6 +98,15 @@ pub(crate) fn spawn_event_bridges(
             root.clone(),
         );
 
+        // GatesFailed auto-retry subscriber: re-triggers the server-side merge
+        // after a delay for GatesFailed failures, bounded by the same
+        // merge_failure_block_threshold budget the auto-block subscriber above
+        // uses (story 1185).
+        crate::agents::pool::auto_assign::spawn_merge_failure_retry_subscriber(
+            Arc::clone(&agents),
+            root.clone(),
+        );
+
         // Content-store GC subscriber: purges all ContentKey::* entries for a
         // story when it reaches a terminal stage, preventing zombie entries from
         // accumulating in the process heap (story 996).
@@ -542,6 +551,9 @@ pub(crate) async fn run_reconcile_pass(
     // Merge-block: no-op (in-memory counter cannot be reconstructed from CRDT).
     crate::agents::pool::auto_assign::reconcile_merge_failure_block();
 
+    // Merge-retry: no-op (in-memory attempt counter cannot be reconstructed from CRDT).
+    crate::agents::pool::auto_assign::reconcile_merge_failure_retry();
+
     // Audit-log: no-op (historical replay would produce misleading entries).
     crate::pipeline_state::reconcile_audit_log();
 }