huskies: merge 973

server/src/agents/pool/pipeline/merge/runner.rs

@@ -111,6 +111,18 @@ impl AgentPool {
 
         tokio::spawn(async move {
             let report = pool.run_merge_pipeline(&root, &sid).await;
+
+            // Story 973: if the story was aborted (Merge → Coding) while the git
+            // operation was running, skip state-machine transitions and watcher
+            // notifications — they would reference the wrong stage.
+            if let Some(job) = crate::crdt_state::read_merge_job(&sid)
+                && job.status == "cancelled"
+            {
+                crate::crdt_state::delete_merge_job(&sid);
+                pool.auto_assign_available_work(&root).await;
+                return;
+            }
+
             let success = matches!(&report, Ok(r) if r.success);
 
             let finished_at = unix_now();