huskies: merge 998

server/src/agents/pool/auto_assign/mod.rs

@@ -4,6 +4,8 @@
 mod auto_assign;
 mod backlog;
 mod merge;
+/// TransitionFired subscriber that auto-spawns mergemaster on ConflictDetected merge failures.
+pub(crate) mod merge_failure_subscriber;
 mod pipeline;
 mod reconcile;
 mod scan;
@@ -13,3 +15,6 @@ pub(crate) mod watchdog;
 // Re-export items that were pub(super) in the original monolithic auto_assign.rs
 // so that pool::lifecycle and pool::pipeline continue to access them unchanged.
 pub(super) use scan::{find_free_agent_for_stage, is_agent_free};
+
+/// Re-export for `startup::tick_loop`.
+pub(crate) use merge_failure_subscriber::spawn_merge_failure_subscriber;