huskies: merge 998

server/src/startup/tick_loop.rs

@@ -66,6 +66,15 @@ pub(crate) fn spawn_event_bridges(
     // ensures that MergeFailure and other non-"active" stages are covered
     // without any per-stage special-casing.
     if let Some(root) = project_root {
+        // Mergemaster auto-spawn subscriber: reacts to TransitionFired events for
+        // Stage::MergeFailure { kind: ConflictDetected } and spawns mergemaster
+        // directly from the typed event, eliminating the predicate-mismatch
+        // failure mode of the previous scan-loop approach (story 998).
+        crate::agents::pool::auto_assign::spawn_merge_failure_subscriber(
+            Arc::clone(&agents),
+            root.clone(),
+        );
+
         let watcher_auto_rx = watcher_tx.subscribe();
         let watcher_auto_agents = Arc::clone(&agents);
         tokio::spawn(async move {