story-kit: merge 258_bug_auto_assign_not_called_after_merge_failure

This commit is contained in:
Dave
2026-03-17 13:35:51 +00:00
parent 730e7324ea
commit 3602f882d2

View File

@@ -1188,6 +1188,7 @@ impl AgentPool {
tokio::spawn(async move { tokio::spawn(async move {
let report = pool.run_merge_pipeline(&root, &sid).await; let report = pool.run_merge_pipeline(&root, &sid).await;
let failed = report.is_err();
let status = match report { let status = match report {
Ok(r) => super::merge::MergeJobStatus::Completed(r), Ok(r) => super::merge::MergeJobStatus::Completed(r),
Err(e) => super::merge::MergeJobStatus::Failed(e), Err(e) => super::merge::MergeJobStatus::Failed(e),
@@ -1197,6 +1198,9 @@ impl AgentPool {
{ {
job.status = status; job.status = status;
} }
if failed {
pool.auto_assign_available_work(&root).await;
}
}); });
Ok(()) Ok(())