huskies: merge 1016

server/src/agent_mode/mod.rs

@@ -198,16 +198,10 @@ pub async fn run(
         )
     };
 
-    // Reconcile any committed work from a previous session.
-    {
-        let recon_agents = Arc::clone(&agents);
-        let recon_root = project_root.clone();
-        let (recon_tx, _) = broadcast::channel(64);
-        slog!("[agent-mode] Reconciling completed worktrees from previous session.");
-        recon_agents
-            .reconcile_on_startup(&recon_root, &recon_tx)
-            .await;
-    }
+    // Replay current pipeline state so subscribers (worktree lifecycle, merge-failure
+    // auto-spawn) react to any stories already in active stages, then auto-assign.
+    slog!("[agent-mode] Replaying current pipeline state.");
+    crate::pipeline_state::replay_current_pipeline_state();
 
     // Run initial auto-assign.
     slog!("[agent-mode] Initial auto-assign scan.");