huskies: merge 773

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

@@ -350,7 +350,6 @@ impl AgentPool {
             log_writer.clone(),
             self.child_killers.clone(),
             self.watcher_tx.clone(),
-            Arc::clone(&self.merge_jobs),
             inactivity_timeout_secs,
             prior_events,
         ));

server/src/agents/pool/start/spawn.rs

@@ -16,7 +16,6 @@ use crate::config::ProjectConfig;
 use crate::io::watcher::WatcherEvent;
 use crate::slog_error;
 
-use super::super::super::merge::MergeJob;
 use super::super::super::runtime::{
     AgentRuntime, ClaudeCodeRuntime, GeminiRuntime, OpenAiRuntime, RuntimeContext,
 };
@@ -46,7 +45,6 @@ pub(super) async fn run_agent_spawn(
     log_writer: Option<Arc<Mutex<AgentLogWriter>>>,
     child_killers: Arc<Mutex<HashMap<String, Box<dyn ChildKiller + Send + Sync>>>>,
     watcher_tx: broadcast::Sender<WatcherEvent>,
-    merge_jobs: Arc<Mutex<HashMap<String, MergeJob>>>,
     inactivity_timeout_secs: u64,
     // Formatted `<recent-events>` block drained from the previous session's
     // buffer. Prepended to the first agent turn so the agent sees what
@@ -70,7 +68,6 @@ pub(super) async fn run_agent_spawn(
     let log_writer_clone = log_writer;
     let child_killers_clone = child_killers;
     let watcher_tx_clone = watcher_tx;
-    let merge_jobs_clone = merge_jobs;
     let _ = inactivity_timeout_secs; // currently unused inside the closure body
 
     // Step 1: create the worktree (slow — git checkout, pnpm install, etc.)
@@ -328,11 +325,10 @@ pub(super) async fn run_agent_spawn(
                 // Clear any stale Running merge job so the next mergemaster
                 // can call start_merge_agent_work without hitting "Merge
                 // already in progress" (bug 498).
-                if let Ok(mut jobs) = merge_jobs_clone.lock()
-                    && let Some(job) = jobs.get(&sid)
-                    && matches!(job.status, crate::agents::merge::MergeJobStatus::Running)
+                if crate::crdt_state::read_merge_job(&sid)
+                    .is_some_and(|job| job.status == "running")
                 {
-                    jobs.remove(&sid);
+                    crate::crdt_state::delete_merge_job(&sid);
                 }
                 let _ = tx_done.send(AgentEvent::Done {
                     story_id: sid.clone(),