huskies: merge 773

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

@@ -311,14 +311,8 @@ impl AgentPool {
 
             // Skip if a merge job is already running for this story (e.g. triggered
             // by a previous auto-assign pass or by pipeline advancement).
-            let already_running = self
-                .merge_jobs
-                .lock()
-                .ok()
-                .and_then(|jobs| jobs.get(story_id.as_str()).cloned())
-                .is_some_and(|job| {
-                    matches!(job.status, crate::agents::merge::MergeJobStatus::Running)
-                });
+            let already_running = crate::crdt_state::read_merge_job(story_id.as_str())
+                .is_some_and(|job| job.status == "running");
             if already_running {
                 continue;
             }