From 6e76b6a063b9d079e306a7fc86071bca2ca34813 Mon Sep 17 00:00:00 2001
From: dave <futurechimp@users.noreply.github.com>
Date: Wed, 13 May 2026 08:01:08 +0000
Subject: [PATCH] huskies: merge 930

---
 server/src/agents/pool/pipeline/advance/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/agents/pool/pipeline/advance/mod.rs b/server/src/agents/pool/pipeline/advance/mod.rs
index 0368fccf..7f97cd42 100644
--- a/server/src/agents/pool/pipeline/advance/mod.rs
+++ b/server/src/agents/pool/pipeline/advance/mod.rs
@@ -414,6 +414,7 @@ impl AgentPool {
                             slog_error!("[pipeline] Failed to move '{story_id}' to done: {e}");
                         }
                         self.remove_agents_for_story(story_id);
+                        crate::crdt_state::delete_merge_job(story_id);
                         // TODO: Re-enable worktree cleanup once we have persistent agent logs.
                         // Removing worktrees destroys evidence needed to debug empty-commit agents.
                         // let config =