huskies: merge 852

2026-04-29 08:51:22 +00:00
parent 549a9defc4
commit dcd695ad0e
3 changed files with 70 additions and 15 deletions
@@ -114,6 +114,7 @@ pub(crate) fn spawn_tick_loop(
            }

            // Watchdog: detect orphaned Running agents every 30 ticks.
+            // Also reap stale Running merge_jobs from previous server instances.
            if tick_count.is_multiple_of(30) {
                let found = agents.run_watchdog_pass(root.as_deref());
                if found > 0 {
@@ -124,6 +125,7 @@ pub(crate) fn spawn_tick_loop(
                        agents.auto_assign_available_work(r).await;
                    }
                }
+                agents.reap_stale_merge_jobs();
            }

            // Sweep: promote done→archived every sweep_interval_secs ticks.