From 3602f882d21f6bd39c354867f34eab413d06e13e Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Tue, 17 Mar 2026 13:35:51 +0000
Subject: [PATCH] story-kit: merge
 258_bug_auto_assign_not_called_after_merge_failure

---
 server/src/agents/pool.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/agents/pool.rs b/server/src/agents/pool.rs
index 46b1366..3986cbc 100644
--- a/server/src/agents/pool.rs
+++ b/server/src/agents/pool.rs
@@ -1188,6 +1188,7 @@ impl AgentPool {
 
         tokio::spawn(async move {
             let report = pool.run_merge_pipeline(&root, &sid).await;
+            let failed = report.is_err();
             let status = match report {
                 Ok(r) => super::merge::MergeJobStatus::Completed(r),
                 Err(e) => super::merge::MergeJobStatus::Failed(e),
@@ -1197,6 +1198,9 @@ impl AgentPool {
             {
                 job.status = status;
             }
+            if failed {
+                pool.auto_assign_available_work(&root).await;
+            }
         });
 
         Ok(())