@taskless-app/swarm 0.6.18 → 0.6.20

package/dist/overmind.js

@@ -311,8 +311,8 @@ function computeReviewPhase(input) {
   }
   if (ciRed) {
     const jobs = (input.ciFailing ?? []).filter((j) => j && j !== "?");
-    const label2 = jobs.length ? `${REVIEW_PHASE_TEXT.ci_fixing}: ${jobs.join(", ")}` : REVIEW_PHASE_TEXT.ci_fixing;
-    return { kind: "ci_fixing", label: label2, ready: false };
+    const label3 = jobs.length ? `${REVIEW_PHASE_TEXT.ci_fixing}: ${jobs.join(", ")}` : REVIEW_PHASE_TEXT.ci_fixing;
+    return { kind: "ci_fixing", label: label3, ready: false };
   }
   if (reviewVerdict === "changes") {
     return { kind: "changes", label: REVIEW_PHASE_TEXT.changes, ready: false };
@@ -327,8 +327,8 @@ function computeReviewPhase(input) {
   if (p && p.total > 0 && p.pass >= p.total) {
     return { kind: "awaiting_reviewer", label: REVIEW_PHASE_TEXT.awaiting_reviewer, ready: false };
   }
-  const label = p && p.total > 0 ? `${REVIEW_PHASE_TEXT.checks} \u2014 CI ${p.pass}/${p.total}` : REVIEW_PHASE_TEXT.checks;
-  return { kind: "checks", label, ready: false };
+  const label2 = p && p.total > 0 ? `${REVIEW_PHASE_TEXT.checks} \u2014 CI ${p.pass}/${p.total}` : REVIEW_PHASE_TEXT.checks;
+  return { kind: "checks", label: label2, ready: false };
 }
 var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
 var init_reviewPhase = __esm({
@@ -439,6 +439,92 @@ var init_mergeGate = __esm({
   }
 });
 
+// ../swarm-core/src/mergeQueue.ts
+function orderMergeQueue(ready) {
+  return [...ready].sort((a, b) => a.prNumber - b.prNumber || a.runId - b.runId);
+}
+function label(e) {
+  return e.slug ? `#${e.prNumber} (${e.slug})` : `#${e.prNumber}`;
+}
+function computeMergeQueue(input) {
+  const queue = orderMergeQueue(input.ready);
+  const size = queue.length;
+  const idx = queue.findIndex((e) => e.runId === input.entry.runId && e.prNumber === input.entry.prNumber);
+  const position = idx + 1;
+  const head = queue[0];
+  if (head && idx > 0) {
+    return {
+      allowed: false,
+      code: "queue_wait",
+      reason: `\u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 PR \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443: \u0441\u0435\u0439\u0447\u0430\u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u044C PR ${label(head)}, \u044D\u0442\u043E\u0442 \u2014 ${position}-\u0439 \u0438\u0437 ${size}. \u041C\u0435\u0440\u0436\u0438\u0442\u044C \u0435\u0433\u043E \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0435\u043B\u044C\u0437\u044F \u2014 \u0434\u043E\u0436\u0434\u0438\u0441\u044C, \u043F\u043E\u043A\u0430 \u043F\u0435\u0440\u0435\u0434 \u043D\u0438\u043C \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u0442\u0441\u044F (TASWM-472)`,
+      position,
+      size
+    };
+  }
+  if (input.behindBy == null) {
+    return {
+      allowed: false,
+      code: "base_unknown",
+      reason: "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0443\u0437\u043D\u0430\u0442\u044C, \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043B\u0438 \u0432\u0435\u0442\u043A\u0430 PR \u0442\u0435\u043A\u0443\u0449\u0438\u0439 main \u2014 \u0430 \u0431\u0435\u0437 \u044D\u0442\u043E\u0433\u043E \u0437\u0435\u043B\u0451\u043D\u044B\u0439 CI \u043D\u0435 \u0433\u043E\u0432\u043E\u0440\u0438\u0442 \u043D\u0438\u0447\u0435\u0433\u043E \u043F\u0440\u043E main \u043F\u043E\u0441\u043B\u0435 \u0432\u043B\u0438\u0432\u0430\u043D\u0438\u044F. \u042D\u0442\u043E \u0442\u0440\u0430\u043D\u0437\u0438\u0435\u043D\u0442\u043D\u043E (gh \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B): \u043F\u043E\u0432\u0442\u043E\u0440\u0438 \u0447\u0435\u0440\u0435\u0437 \u043C\u0438\u043D\u0443\u0442\u0443 (TASWM-472)",
+      position,
+      size
+    };
+  }
+  if (input.behindBy > 0) {
+    return {
+      allowed: false,
+      code: "base_stale",
+      reason: `\u0431\u0430\u0437\u0430 \u0443\u0435\u0445\u0430\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434 \u043D\u0430 ${input.behindBy} \u043A\u043E\u043C\u043C\u0438\u0442(\u043E\u0432) \u0441 \u043C\u043E\u043C\u0435\u043D\u0442\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u2014 \u0437\u0435\u043B\u0451\u043D\u044B\u0439 CI \u043D\u0430 \u0441\u0442\u0430\u0440\u043E\u0439 \u0431\u0430\u0437\u0435 \u043D\u0435 \u0434\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442, \u0447\u0442\u043E main \u043E\u0441\u0442\u0430\u043D\u0435\u0442\u0441\u044F \u0437\u0435\u043B\u0451\u043D\u044B\u043C. \u0412\u043B\u0435\u0439 main \u0432 \u0432\u0435\u0442\u043A\u0443 PR \u0438 \u0434\u043E\u0436\u0434\u0438\u0441\u044C \u0437\u0435\u043B\u0451\u043D\u044B\u0445 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u043D\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 (TASWM-472)`,
+      position,
+      size
+    };
+  }
+  if (input.checks === null) {
+    return {
+      allowed: false,
+      code: "checks_unknown",
+      reason: "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 PR \u2014 \u0430 \u043D\u0430 \u0441\u0432\u0435\u0436\u0435\u0439 \u0431\u0430\u0437\u0435 \u0438\u043C\u0435\u043D\u043D\u043E \u043E\u043D\u0438 \u0438 \u043E\u0442\u0432\u0435\u0447\u0430\u044E\u0442, \u043E\u0441\u0442\u0430\u043D\u0435\u0442\u0441\u044F \u043B\u0438 main \u0437\u0435\u043B\u0451\u043D\u044B\u043C. \u042D\u0442\u043E \u0442\u0440\u0430\u043D\u0437\u0438\u0435\u043D\u0442\u043D\u043E (gh \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B): \u043F\u043E\u0432\u0442\u043E\u0440\u0438 \u0447\u0435\u0440\u0435\u0437 \u043C\u0438\u043D\u0443\u0442\u0443 (TASWM-472)",
+      position,
+      size
+    };
+  }
+  if (input.checks === "fail") {
+    return {
+      allowed: false,
+      code: "checks_red",
+      reason: "\u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 \u041E\u0411\u041D\u041E\u0412\u041B\u0401\u041D\u041D\u041E\u0419 \u0431\u0430\u0437\u0435 \u043A\u0440\u0430\u0441\u043D\u044B\u0435 \u2014 \u044D\u0442\u043E\u0442 PR \u043B\u043E\u043C\u0430\u0435\u0442 main \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0442\u0435\u043A\u0443\u0449\u0438\u043C \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435\u043C \u0431\u0430\u0437\u044B. \u041C\u0435\u0440\u0436\u0438\u0442\u044C \u043D\u0435\u043B\u044C\u0437\u044F: \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0430 (TASWM-472)",
+      position,
+      size
+    };
+  }
+  if (input.checks === "pending") {
+    return {
+      allowed: false,
+      code: "checks_pending",
+      reason: "\u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 \u0435\u0449\u0451 \u0438\u0434\u0443\u0442 \u2014 \u0438\u0445 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0438 \u0435\u0441\u0442\u044C \u043E\u0442\u0432\u0435\u0442 \xAB\u043E\u0441\u0442\u0430\u043D\u0435\u0442\u0441\u044F \u043B\u0438 main \u0437\u0435\u043B\u0451\u043D\u044B\u043C\xBB. \u0414\u043E\u0436\u0434\u0438\u0441\u044C (TASWM-472)",
+      position,
+      size
+    };
+  }
+  return {
+    allowed: true,
+    code: "queue_head",
+    reason: "\u0433\u043E\u043B\u043E\u0432\u0430 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u043C\u0435\u0440\u0436\u0430, \u0431\u0430\u0437\u0430 \u043F\u043E\u0434 PR \u0441\u0432\u0435\u0436\u0430\u044F, \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 \u043D\u0435\u0439 \u043D\u0435 \u043A\u0440\u0430\u0441\u043D\u044B\u0435 \u2014 \u043C\u0435\u0440\u0436\u0438\u0442\u044C \u043C\u043E\u0436\u043D\u043E",
+    position,
+    size
+  };
+}
+function computeMergeDecision(gate, queue) {
+  if (!gate.allowed || gate.code === "unknown_pr" || !queue) return { ...gate, queue: queue ?? null };
+  if (!queue.allowed) return { allowed: false, code: queue.code, reason: queue.reason, queue };
+  return { ...gate, reason: `${gate.reason}; ${queue.reason}`, queue };
+}
+var init_mergeQueue = __esm({
+  "../swarm-core/src/mergeQueue.ts"() {
+    "use strict";
+  }
+});
+
 // ../swarm-core/src/modelPolicy.ts
 function findProvider(id) {
   const key = typeof id === "string" ? id.trim().toLowerCase() : "";
@@ -1545,6 +1631,7 @@ var init_src = __esm({
     init_timeline();
     init_reviewPhase();
     init_mergeGate();
+    init_mergeQueue();
     init_verifyVerdict();
     init_modelPolicy();
     init_status();
@@ -2161,6 +2248,7 @@ __export(config_exports, {
   SWARM_MAX_FD_LOAD_FACTOR: () => SWARM_MAX_FD_LOAD_FACTOR,
   SWARM_MAX_IN_FLIGHT: () => SWARM_MAX_IN_FLIGHT,
   SWARM_MAX_LOAD_FACTOR: () => SWARM_MAX_LOAD_FACTOR,
+  SWARM_MERGE_QUEUE: () => SWARM_MERGE_QUEUE,
   SWARM_MIN_FREE_GB: () => SWARM_MIN_FREE_GB,
   SWARM_OUTBOX: () => SWARM_OUTBOX,
   SWARM_PROD_HEARTBEAT_MS: () => SWARM_PROD_HEARTBEAT_MS,
@@ -2187,6 +2275,7 @@ __export(config_exports, {
   SWARM_VERIFY: () => SWARM_VERIFY,
   SWARM_VERSION_CHECK_MS: () => SWARM_VERSION_CHECK_MS,
   SWARM_WATCHDOG_STALL_MS: () => SWARM_WATCHDOG_STALL_MS,
+  SWARM_WORKTREE_REAP_INTERVAL_MS: () => SWARM_WORKTREE_REAP_INTERVAL_MS,
   TASKLESS_API: () => TASKLESS_API,
   TASKLESS_MCP_PATH: () => TASKLESS_MCP_PATH,
   TASKLESS_TASK_URL_BASE: () => TASKLESS_TASK_URL_BASE,
@@ -2283,7 +2372,7 @@ function reviewCutoffAt() {
   }
   return at;
 }
-var DB_PATH, EXECUTOR, DRONE_HOME, DRONE_HOME_ISOLATION, DRONE_ISOLATION, WORKTREES_NOINDEX_DIR, WORKTREES_LEGACY_DIR, WORKTREES_DIR, RUN_LOGS_DIR, DAEMON_LOG_PATH, DAEMON_LOG_MAX_BYTES, DAEMON_LOG_KEEP, DAEMON_LOG_CHECK_MS, DIST_BUILD, SWARM_BACKEND, SWARM_OUTBOX, SWARM_MAX_IN_FLIGHT, SWARM_CLAIM_INTERVAL_MS, SWARM_MAX_LOAD_FACTOR, SWARM_MIN_FREE_GB, SWARM_MAX_FD_LOAD_FACTOR, SWARM_MAX_CPU_BUSY, SWARM_CPU_WINDOW_MS, SWARM_CPU_SANITY_BUSY, SWARM_CPU_SANITY_LOAD_FACTOR, SWARM_CPU_SANITY_LAG_MS, SWARM_RELIEF_LOAD_FACTOR, SWARM_RELIEF_MIN_FREE_GB, SWARM_RELIEF_MAX_FD_LOAD_FACTOR, SWARM_RELIEF_CPU_BUSY, SWARM_RELIEF_COST_WINDOW_MS, SWARM_RELIEF_ALERT_PAUSES, SWARM_RELIEF_ALERT_LOST_MS, SWARM_RELIEF_ALERT_MIN_STEPS, SWARM_RELIEF_ALERT_SUSTAIN_MS, SWARM_LOW_DISK_GB, SWARM_REHYDRATE_MS, SWARM_DRONE_BRIDGE_MS, SWARM_PROD_HEARTBEAT_MS, SWARM_VERSION_CHECK_MS, SWARM_SWEEP_INTERVAL_MS, DRONE_CHANNEL_ENABLED, DRONE_CHANNEL_PORT, DRONE_CHANNEL_URL, DRONE_CHANNEL_SECRET_PATH, DRONE_CHANNEL_GRACE_MS, HEARTBEAT_PATH, HEARTBEAT_STALE_MS, SWARM_REPO, SWARM_SCAN_DEPTH, SWARM_REPO_PATHS, SWARM_SCAN_ROOTS_RAW, REPO_MAP_PATH, SWARM_REPO_MAP_MS, SWARM_REPO_SCAN_TTL_MS, TASKLESS_API, SWARM_SHOT_TIMEOUT_MS, TASKLESS_MCP_PATH, TASKLESS_TOKEN, TASKLESS_WORKSPACE, TASKLESS_WORKSPACE_SLUG, TASKLESS_TASK_URL_BASE, SWARM_VERIFY, SWARM_AUTO_REVIEW, SWARM_AUTO_VERIFY, REVIEW_CUTOFF_PATH, SWARM_REVIEW_CAP, SWARM_STORM_URL, WEB_PORT, WEB_REDIRECT_URI, SWARM_ANOMALY_RENOTIFY_MS, SWARM_ANOMALY_MAX_REPEATS, SWARM_ANOMALY_RUN_DOWN_WINDOW_MS, SWARM_ANOMALY_FAILED_SPIKE_COUNT, SWARM_ANOMALY_FAILED_SPIKE_WINDOW_MS, SWARM_ANOMALY_QUEUE_STALLED_MS, SWARM_ANOMALY_PR_STUCK_MERGE_MS, SWARM_ANOMALY_PR_NO_REVIEWER_MS, SWARM_ANOMALY_QUESTION_UNANSWERED_MS, SWARM_ANOMALY_OUTBOX_STUCK_MS, SWARM_ANOMALY_RESOURCE_GATE_STALL_MS, SWARM_ANOMALY_DEP_MISSING_MS, SWARM_WATCHDOG_STALL_MS;
+var DB_PATH, EXECUTOR, DRONE_HOME, DRONE_HOME_ISOLATION, DRONE_ISOLATION, WORKTREES_NOINDEX_DIR, WORKTREES_LEGACY_DIR, WORKTREES_DIR, RUN_LOGS_DIR, DAEMON_LOG_PATH, DAEMON_LOG_MAX_BYTES, DAEMON_LOG_KEEP, DAEMON_LOG_CHECK_MS, DIST_BUILD, SWARM_BACKEND, SWARM_OUTBOX, SWARM_MAX_IN_FLIGHT, SWARM_CLAIM_INTERVAL_MS, SWARM_MAX_LOAD_FACTOR, SWARM_MIN_FREE_GB, SWARM_MAX_FD_LOAD_FACTOR, SWARM_MAX_CPU_BUSY, SWARM_CPU_WINDOW_MS, SWARM_CPU_SANITY_BUSY, SWARM_CPU_SANITY_LOAD_FACTOR, SWARM_CPU_SANITY_LAG_MS, SWARM_RELIEF_LOAD_FACTOR, SWARM_RELIEF_MIN_FREE_GB, SWARM_RELIEF_MAX_FD_LOAD_FACTOR, SWARM_RELIEF_CPU_BUSY, SWARM_RELIEF_COST_WINDOW_MS, SWARM_RELIEF_ALERT_PAUSES, SWARM_RELIEF_ALERT_LOST_MS, SWARM_RELIEF_ALERT_MIN_STEPS, SWARM_RELIEF_ALERT_SUSTAIN_MS, SWARM_LOW_DISK_GB, SWARM_REHYDRATE_MS, SWARM_DRONE_BRIDGE_MS, SWARM_PROD_HEARTBEAT_MS, SWARM_VERSION_CHECK_MS, SWARM_SWEEP_INTERVAL_MS, SWARM_WORKTREE_REAP_INTERVAL_MS, DRONE_CHANNEL_ENABLED, DRONE_CHANNEL_PORT, DRONE_CHANNEL_URL, DRONE_CHANNEL_SECRET_PATH, DRONE_CHANNEL_GRACE_MS, HEARTBEAT_PATH, HEARTBEAT_STALE_MS, SWARM_REPO, SWARM_SCAN_DEPTH, SWARM_REPO_PATHS, SWARM_SCAN_ROOTS_RAW, REPO_MAP_PATH, SWARM_REPO_MAP_MS, SWARM_REPO_SCAN_TTL_MS, TASKLESS_API, SWARM_SHOT_TIMEOUT_MS, TASKLESS_MCP_PATH, TASKLESS_TOKEN, TASKLESS_WORKSPACE, TASKLESS_WORKSPACE_SLUG, TASKLESS_TASK_URL_BASE, SWARM_VERIFY, SWARM_AUTO_REVIEW, SWARM_AUTO_VERIFY, SWARM_MERGE_QUEUE, REVIEW_CUTOFF_PATH, SWARM_REVIEW_CAP, SWARM_STORM_URL, WEB_PORT, WEB_REDIRECT_URI, SWARM_ANOMALY_RENOTIFY_MS, SWARM_ANOMALY_MAX_REPEATS, SWARM_ANOMALY_RUN_DOWN_WINDOW_MS, SWARM_ANOMALY_FAILED_SPIKE_COUNT, SWARM_ANOMALY_FAILED_SPIKE_WINDOW_MS, SWARM_ANOMALY_QUEUE_STALLED_MS, SWARM_ANOMALY_PR_STUCK_MERGE_MS, SWARM_ANOMALY_PR_NO_REVIEWER_MS, SWARM_ANOMALY_QUESTION_UNANSWERED_MS, SWARM_ANOMALY_OUTBOX_STUCK_MS, SWARM_ANOMALY_RESOURCE_GATE_STALL_MS, SWARM_ANOMALY_DEP_MISSING_MS, SWARM_WATCHDOG_STALL_MS;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
@@ -2332,6 +2421,7 @@ var init_config = __esm({
     SWARM_PROD_HEARTBEAT_MS = envNum("SWARM_PROD_HEARTBEAT_MS", 15e3);
     SWARM_VERSION_CHECK_MS = envNum("SWARM_VERSION_CHECK_MS", 5 * 6e4);
     SWARM_SWEEP_INTERVAL_MS = envNum("SWARM_SWEEP_INTERVAL_MS", 10 * 6e4);
+    SWARM_WORKTREE_REAP_INTERVAL_MS = envNum("SWARM_WORKTREE_REAP_INTERVAL_MS", 5 * 6e4);
     DRONE_CHANNEL_ENABLED = process.env.SWARM_DRONE_CHANNEL !== "0";
     DRONE_CHANNEL_PORT = Number(process.env.SWARM_DRONE_CHANNEL_PORT) || 7421;
     DRONE_CHANNEL_URL = process.env.SWARM_DRONE_CHANNEL_URL || `http://127.0.0.1:${DRONE_CHANNEL_PORT}`;
@@ -2356,6 +2446,7 @@ var init_config = __esm({
     SWARM_VERIFY = process.env.SWARM_VERIFY === "ci" ? "ci" : "local";
     SWARM_AUTO_REVIEW = process.env.SWARM_AUTO_REVIEW !== "0";
     SWARM_AUTO_VERIFY = process.env.SWARM_AUTO_VERIFY !== "0";
+    SWARM_MERGE_QUEUE = process.env.SWARM_MERGE_QUEUE !== "0";
     REVIEW_CUTOFF_PATH = process.env.SWARM_REVIEW_CUTOFF || join5(SWARM_HOME, "review-cutoff.json");
     SWARM_REVIEW_CAP = Math.trunc(envNum("SWARM_REVIEW_CAP", 1));
     SWARM_STORM_URL = process.env.SWARM_STORM_URL || "";
@@ -2401,12 +2492,12 @@ function isTransientResourceError(e) {
   const code = e?.code;
   return code === "ENFILE" || code === "EMFILE" || code === "EAGAIN";
 }
-function logTransientSpawnError(label, e) {
+function logTransientSpawnError(label2, e) {
   if (isTransientResourceError(e)) {
     const code = e.code;
-    console.warn(`[overmind] ${label}: \u041E\u0421 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u044C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B (${code}) \u2014 \u043F\u0440\u043E\u043F\u0443\u0441\u043A\u0430\u044E \u0441\u0438\u0433\u043D\u0430\u043B \u044D\u0442\u043E\u0433\u043E \u0442\u0438\u043A\u0430, \u043D\u0435 \u043F\u0430\u0434\u0430\u044E`);
+    console.warn(`[overmind] ${label2}: \u041E\u0421 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u044C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B (${code}) \u2014 \u043F\u0440\u043E\u043F\u0443\u0441\u043A\u0430\u044E \u0441\u0438\u0433\u043D\u0430\u043B \u044D\u0442\u043E\u0433\u043E \u0442\u0438\u043A\u0430, \u043D\u0435 \u043F\u0430\u0434\u0430\u044E`);
   } else {
-    console.warn(`[overmind] ${label} \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F (\u043D\u0435\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0437\u0430 \u044D\u0442\u043E\u0442 \u0442\u0438\u043A): ${String(e)}`);
+    console.warn(`[overmind] ${label2} \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F (\u043D\u0435\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0437\u0430 \u044D\u0442\u043E\u0442 \u0442\u0438\u043A): ${String(e)}`);
   }
 }
 function resourcesOk(load1, cpus, freeGb, maxLoadFactor = SWARM_MAX_LOAD_FACTOR, minFreeGb = SWARM_MIN_FREE_GB, fdLoadRatio = null, maxFdLoadFactor = SWARM_MAX_FD_LOAD_FACTOR, cpuBusy = null, maxCpuBusy = SWARM_MAX_CPU_BUSY) {
@@ -2417,8 +2508,8 @@ function resourcesOk(load1, cpus, freeGb, maxLoadFactor = SWARM_MAX_LOAD_FACTOR,
 }
 function parseVmStatAvailableBytes(vmStatOut) {
   const page = Number(vmStatOut.match(/page size of (\d+) bytes/)?.[1]) || 4096;
-  const pages = (label) => {
-    const m = vmStatOut.match(new RegExp(`Pages ${label}:\\s+(\\d+)`));
+  const pages = (label2) => {
+    const m = vmStatOut.match(new RegExp(`Pages ${label2}:\\s+(\\d+)`));
     return m ? Number(m[1]) : 0;
   };
   return (pages("free") + pages("inactive") + pages("speculative") + pages("purgeable")) * page;
@@ -2870,8 +2961,8 @@ function describeError(e, maxDepth = 4) {
     const msg = (cur instanceof Error ? cur.message : typeof cur === "string" ? cur : String(cur)).trim();
     const code = cur.code;
     const codeText = code === void 0 || code === null ? "" : String(code);
-    const label = codeText && !msg.includes(codeText) ? `${msg} [code=${codeText}]` : msg;
-    if (label && !parts.includes(label)) parts.push(label);
+    const label2 = codeText && !msg.includes(codeText) ? `${msg} [code=${codeText}]` : msg;
+    if (label2 && !parts.includes(label2)) parts.push(label2);
     cur = cur.cause;
   }
   return parts.join(" \u2190 ") || String(e);
@@ -3397,12 +3488,18 @@ async function previousHooksPath(worktree) {
 }
 async function removeWorktree(repo, path) {
   const branch = (await $2({ reject: false })`git -C ${path} symbolic-ref --quiet --short HEAD`).stdout.trim();
+  await releaseWorktree(repo, path);
+  if (branch) await $2({ reject: false })`git -C ${repo} branch -D ${branch}`;
+}
+async function releaseWorktree(repo, path) {
   await cleanupWorktreeProcesses(path);
   await detachWorktree(repo, path);
-  if (branch) await $2({ reject: false })`git -C ${repo} branch -D ${branch}`;
+}
+async function pruneWorktrees(repo) {
+  await $2({ reject: false })`git -C ${repo} worktree prune`;
 }
 async function worktreeDirty(path) {
-  const st = await $2({ reject: false })`git -C ${path} status --porcelain`;
+  const st = await $2({ reject: false })`git -C ${path} status --porcelain --untracked-files=all`;
   if (st.exitCode !== 0) return true;
   const status = st.stdout.trim();
   if (status) return true;
@@ -3992,37 +4089,37 @@ async function materializeAttachments(opts) {
   let index = 0;
   for (const ref of opts.refs) {
     index++;
-    const label = ref.caption || ref.url;
+    const label2 = ref.caption || ref.url;
     const cls = classifyAttachment(ref);
     if ("skip" in cls) {
-      result.skipped.push(`${label} \u2014 ${cls.skip}`);
+      result.skipped.push(`${label2} \u2014 ${cls.skip}`);
       continue;
     }
     if (result.files.length >= maxFiles) {
-      result.skipped.push(`${label} \u2014 \u0441\u0432\u0435\u0440\u0445 \u043B\u0438\u043C\u0438\u0442\u0430 \u0432 ${maxFiles} \u0444\u0430\u0439\u043B\u043E\u0432`);
+      result.skipped.push(`${label2} \u2014 \u0441\u0432\u0435\u0440\u0445 \u043B\u0438\u043C\u0438\u0442\u0430 \u0432 ${maxFiles} \u0444\u0430\u0439\u043B\u043E\u0432`);
       continue;
     }
     if (ref.size != null && ref.size > maxFile) {
-      result.skipped.push(`${label} \u2014 ${mb(ref.size)} > \u043B\u0438\u043C\u0438\u0442\u0430 ${mb(maxFile)} \u043D\u0430 \u0444\u0430\u0439\u043B`);
+      result.skipped.push(`${label2} \u2014 ${mb(ref.size)} > \u043B\u0438\u043C\u0438\u0442\u0430 ${mb(maxFile)} \u043D\u0430 \u0444\u0430\u0439\u043B`);
       continue;
     }
     let file = null;
     try {
       file = await opts.fetchFile(ref.url);
     } catch (e) {
-      result.skipped.push(`${label} \u2014 \u043D\u0435 \u0441\u043A\u0430\u0447\u0430\u043B\u043E\u0441\u044C (${errText(e)})`);
+      result.skipped.push(`${label2} \u2014 \u043D\u0435 \u0441\u043A\u0430\u0447\u0430\u043B\u043E\u0441\u044C (${errText(e)})`);
       continue;
     }
     if (!file) {
-      result.skipped.push(`${label} \u2014 \u043D\u0435 \u0441\u043A\u0430\u0447\u0430\u043B\u043E\u0441\u044C (\u043D\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0438\u043B\u0438 \u0444\u0430\u0439\u043B \u0443\u0434\u0430\u043B\u0451\u043D)`);
+      result.skipped.push(`${label2} \u2014 \u043D\u0435 \u0441\u043A\u0430\u0447\u0430\u043B\u043E\u0441\u044C (\u043D\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0438\u043B\u0438 \u0444\u0430\u0439\u043B \u0443\u0434\u0430\u043B\u0451\u043D)`);
       continue;
     }
     if (file.bytes.byteLength > maxFile) {
-      result.skipped.push(`${label} \u2014 ${mb(file.bytes.byteLength)} > \u043B\u0438\u043C\u0438\u0442\u0430 ${mb(maxFile)} \u043D\u0430 \u0444\u0430\u0439\u043B`);
+      result.skipped.push(`${label2} \u2014 ${mb(file.bytes.byteLength)} > \u043B\u0438\u043C\u0438\u0442\u0430 ${mb(maxFile)} \u043D\u0430 \u0444\u0430\u0439\u043B`);
       continue;
     }
     if (total + file.bytes.byteLength > maxTotal) {
-      result.skipped.push(`${label} \u2014 \u043D\u0435 \u0432\u043B\u0435\u0437\u043B\u043E \u0432 \u043E\u0431\u0449\u0438\u0439 \u043B\u0438\u043C\u0438\u0442 ${mb(maxTotal)}`);
+      result.skipped.push(`${label2} \u2014 \u043D\u0435 \u0432\u043B\u0435\u0437\u043B\u043E \u0432 \u043E\u0431\u0449\u0438\u0439 \u043B\u0438\u043C\u0438\u0442 ${mb(maxTotal)}`);
       continue;
     }
     const name = attachmentFileName(index, ref.caption, attachmentExt(ref, file.contentType));
@@ -4033,7 +4130,7 @@ async function materializeAttachments(opts) {
       }
       await io.writeFile(join20(dir, name), file.bytes);
     } catch (e) {
-      result.skipped.push(`${label} \u2014 \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043B\u043E\u0441\u044C \u043D\u0430 \u0434\u0438\u0441\u043A (${errText(e)})`);
+      result.skipped.push(`${label2} \u2014 \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043B\u043E\u0441\u044C \u043D\u0430 \u0434\u0438\u0441\u043A (${errText(e)})`);
       continue;
     }
     total += file.bytes.byteLength;
@@ -4681,7 +4778,7 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
       return await safeCall("update_task", { id, assigneeId: userId }) != null;
     },
     uploadShot: (file) => uploadShot(safeCall, file, fetchImpl),
-    addComment: async (idOrSlug, body, label, attachments) => {
+    addComment: async (idOrSlug, body, label2, attachments) => {
       const id = await resolveId(idOrSlug);
       if (!id) {
         console.error(`[taskless] add_comment \u043F\u0440\u043E\u043F\u0443\u0449\u0435\u043D: \u0437\u0430\u0434\u0430\u0447\u0430 ${idOrSlug} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430 (resolveId \u2192 null)`);
@@ -4700,7 +4797,7 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
           body: parts[i],
           // Метки роя — на КАЖДОЙ части: без них хвост отчёта выглядит в ленте задачи
           // чужой репликой без автора (swarmKind/swarmDroneName рисуются чипами).
-          ...label ?? {},
+          ...label2 ?? {},
           // TASWM-294: скрины — к ПЕРВОЙ части, к шапке отчёта. Разносить их по
           // частям треда нельзя: человек открывает задачу и должен увидеть, как
           // это выглядит, в том же комменте, что и «что сделано».
@@ -10418,6 +10515,70 @@ function parkReason(attempts, reason) {
   return `${PRE_START_MARK} ${attempts} \u0440\u0430\u0437\u0430 \u043F\u043E\u0434\u0440\u044F\u0434 \u2014 ${SPAWN_PARK_MARK}, \u0447\u0442\u043E\u0431\u044B \u043D\u0435 \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u044C \u043F\u043E \u043A\u0440\u0443\u0433\u0443. \u0427\u0435\u0433\u043E \u043D\u0435 \u0445\u0432\u0430\u0442\u0438\u043B\u043E: ${reason}`;
 }
 
+// src/worktreeReap.ts
+init_src();
+var DIRTY_WORKTREE_MARK = "worktree \u043D\u0435 \u0443\u0431\u0440\u0430\u043D: \u0432 \u043D\u0451\u043C \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430";
+var HOLDS_WORKTREE = /* @__PURE__ */ new Set(["running", "blocked", "review", "paused", "storm_dead", "stalled"]);
+function isHelperRun(run) {
+  return run.reviews_run_id != null || run.verifies_run_id != null || run.resolves_run_id != null;
+}
+function prIsDead(st) {
+  return st.merged || st.state.toUpperCase() === "MERGED" || st.state.toUpperCase() === "CLOSED";
+}
+function heldByLive(deps, all, run, path) {
+  if (deps.liveWorktrees?.().has(path)) return true;
+  return all.some((r) => r.id !== run.id && r.worktree_path === path && HOLDS_WORKTREE.has(r.status));
+}
+async function reapFinishedWorktrees(deps) {
+  const report = { removed: 0, keptDirty: 0 };
+  const prunedRepos = /* @__PURE__ */ new Set();
+  const all = deps.db.listRuns();
+  for (const run of all) {
+    const path = run.worktree_path;
+    if (!path || !isTerminalStatus(run.status)) continue;
+    if (heldByLive(deps, all, run, path)) continue;
+    if (!deps.worktreeExists(path)) {
+      if (run.repo && deps.pruneWorktrees && !prunedRepos.has(run.repo)) {
+        prunedRepos.add(run.repo);
+        await deps.pruneWorktrees(run.repo).catch(() => {
+        });
+      }
+      continue;
+    }
+    if (!isHelperRun(run)) {
+      if (!run.pr_url) continue;
+      const st = await deps.prStatus(run.pr_url).catch(() => null);
+      if (!st || !prIsDead(st)) continue;
+    }
+    if (await keepDirty(deps, run, path)) {
+      report.keptDirty += 1;
+      continue;
+    }
+    await deps.releaseWorktree(run.repo, path).catch(() => {
+    });
+    deps.db.addEvent(run.id, "step", `worktree \u0443\u0431\u0440\u0430\u043D: ${path} (\u043F\u0440\u043E\u0433\u043E\u043D \u0437\u0430\u0432\u0435\u0440\u0448\u0451\u043D, ${reapReason(run)}) \u2014 \u0441\u043B\u0430\u0433 \u0441\u0432\u043E\u0431\u043E\u0434\u0435\u043D \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430`);
+    report.removed += 1;
+  }
+  return report;
+}
+function reapReason(run) {
+  return isHelperRun(run) ? "\u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0432\u044B\u043D\u0435\u0441\u0435\u043D, \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0441\u043A\u0430\u044F \u043A\u043E\u043F\u0438\u044F \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043D\u0443\u0436\u043D\u0430" : "PR \u0441\u043C\u0435\u0440\u0436\u0435\u043D \u0438\u043B\u0438 \u0437\u0430\u043A\u0440\u044B\u0442";
+}
+async function keepDirty(deps, run, path) {
+  const dirty = deps.isDirty ? await deps.isDirty(path).catch(() => true) : true;
+  if (!dirty) return false;
+  const already = deps.db.events(run.id).some((e) => (e.text ?? "").includes(DIRTY_WORKTREE_MARK));
+  if (!already) {
+    deps.db.addEvent(
+      run.id,
+      "anomaly",
+      `${DIRTY_WORKTREE_MARK}. \u041F\u0443\u0442\u044C: ${path}. \u0412\u043D\u0443\u0442\u0440\u0438 \u0435\u0441\u0442\u044C \u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u044B\u0435 \u0438\u043B\u0438 \u043D\u0435\u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u0435\u043C\u044B\u0435 \u0444\u0430\u0439\u043B\u044B \u043B\u0438\u0431\u043E \u043A\u043E\u043C\u043C\u0438\u0442\u044B, \u043D\u0435 \u0434\u043E\u0448\u0435\u0434\u0448\u0438\u0435 \u0434\u043E origin, \u2014 \u0441\u043D\u043E\u0441\u0438\u0442\u044C \u043D\u0435\u043B\u044C\u0437\u044F, \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0438 \u0441\u0430\u043C \u0438 \u0443\u0431\u0435\u0440\u0438 \u0440\u0443\u043A\u0430\u043C\u0438 (\`git -C ${path} status --untracked-files=all\`).`
+    );
+    deps.narrate?.(`${run.task_slug}: worktree \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D \u043D\u0430 \u0434\u0438\u0441\u043A\u0435 \u2014 \u0432 \u043D\u0451\u043C \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 (${path}).`);
+  }
+  return true;
+}
+
 // src/overmind.ts
 init_git();
 
@@ -10472,6 +10633,22 @@ async function prHeadBranch(prUrl, run = realRunner) {
     return null;
   }
 }
+async function prBaseSync(prUrl, run = realRunner) {
+  const m = prUrl.trim().match(/github\.com\/([^/\s]+)\/([^/\s]+)\/pull\/\d+/i);
+  if (!isGithubPrUrl(prUrl) || !m) return null;
+  const [, owner, repo] = m;
+  try {
+    const j = JSON.parse(await run(["pr", "view", prUrl, "--json", "baseRefName,headRefOid"]));
+    const base3 = j.baseRefName;
+    const head = j.headRefOid;
+    if (!base3 || !head) return null;
+    const out = await run(["api", `repos/${owner}/${repo}/compare/${base3}...${head}?per_page=1`, "--jq", ".behind_by"]);
+    const behindBy = Number(out.trim());
+    return Number.isFinite(behindBy) && behindBy >= 0 ? { behindBy, base: base3 } : null;
+  } catch {
+    return null;
+  }
+}
 async function openPrsForBranch(branch, repoDir, run = realRepoRunner) {
   if (!branch || !repoDir) return [];
   try {
@@ -10704,17 +10881,17 @@ function normalizeZoneLabel(zone) {
   return (zone ?? "").trim().replace(/^area:/i, "").trim().toLowerCase();
 }
 function renderZoneMemoryBlock(zone, notes) {
-  const label = normalizeZoneLabel(zone);
-  if (!label) return "";
+  const label2 = normalizeZoneLabel(zone);
+  if (!label2) return "";
   const head = notes.length ? [
-    `\u{1F9E0} \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \`${label}\` \u2014 \u0447\u0442\u043E \u0440\u043E\u0439 \u0443\u0436\u0435 \u0432\u044B\u044F\u0441\u043D\u0438\u043B \u043F\u0440\u043E \u044D\u0442\u043E\u0442 \u043A\u0443\u0441\u043E\u043A \u043A\u043E\u0434\u0430 (\u043F\u0440\u043E\u0432\u0435\u0440\u0435\u043D\u043E \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u043E\u043C, \u043D\u0435 \u043F\u0435\u0440\u0435\u0441\u043A\u0430\u0437 \u043A\u043E\u0434\u0430):`,
+    `\u{1F9E0} \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \`${label2}\` \u2014 \u0447\u0442\u043E \u0440\u043E\u0439 \u0443\u0436\u0435 \u0432\u044B\u044F\u0441\u043D\u0438\u043B \u043F\u0440\u043E \u044D\u0442\u043E\u0442 \u043A\u0443\u0441\u043E\u043A \u043A\u043E\u0434\u0430 (\u043F\u0440\u043E\u0432\u0435\u0440\u0435\u043D\u043E \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u043E\u043C, \u043D\u0435 \u043F\u0435\u0440\u0435\u0441\u043A\u0430\u0437 \u043A\u043E\u0434\u0430):`,
     ...notes.map((n) => `\u2022 [${n.id}] ${n.claim}`),
     "\u042D\u0442\u043E \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438, \u0430 \u043D\u0435 \u0438\u0441\u0442\u0438\u043D\u0430 \u0432 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0439 \u0438\u043D\u0441\u0442\u0430\u043D\u0446\u0438\u0438: \u0440\u0430\u0437\u043E\u0448\u043B\u043E\u0441\u044C \u0441 \u043A\u043E\u0434\u043E\u043C \u2014 \u0432\u0435\u0440\u044C \u043A\u043E\u0434\u0443 \u0438 \u0441\u043A\u0430\u0436\u0438 \u043E\u0431 \u044D\u0442\u043E\u043C \u0432 \u0441\u0434\u0430\u0447\u0435.",
     `\u041F\u0440\u0438\u0433\u043E\u0434\u0438\u043B\u0430\u0441\u044C \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u2014 \u043D\u0430\u0437\u043E\u0432\u0438 \u0435\u0451 \u0432 done: \`zone_notes_used: ["${notes[0].id}"]\` (id \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0432\u044B\u0448\u0435 \u0438\u043B\u0438 \u0441\u0430\u043C \u0442\u0435\u043A\u0441\u0442 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F). \u042D\u0442\u043E \u0435\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435, \u0447\u0435\u043C \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u0436\u0438\u0432\u0451\u0442: \u043F\u0430\u043C\u044F\u0442\u044C \u0437\u043E\u043D\u044B \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0430, \u0438 \u0432\u044B\u0442\u0435\u0441\u043D\u044F\u0435\u0442\u0441\u044F \u0442\u0430, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u0439 \u0440\u043E\u0439 \u0434\u043E\u043B\u044C\u0448\u0435 \u0432\u0441\u0435\u0445 \u043D\u0435 \u0443\u0431\u0435\u0436\u0434\u0430\u043B\u0441\u044F. \u041D\u0435 \u043F\u0440\u0438\u0433\u043E\u0434\u0438\u043B\u043E\u0441\u044C \u043D\u0438\u0447\u0435\u0433\u043E \u2014 \u043D\u0435 \u043D\u0430\u0437\u044B\u0432\u0430\u0439 \u043D\u0438\u0447\u0435\u0433\u043E, \u044D\u0442\u043E \u043D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0438\u0441\u0445\u043E\u0434.`
-  ] : [`\u{1F9E0} \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \`${label}\` \u043F\u0443\u0441\u0442\u0430 \u2014 \u0440\u043E\u0439 \u043F\u0440\u043E \u044D\u0442\u043E\u0442 \u043A\u0443\u0441\u043E\u043A \u043A\u043E\u0434\u0430 \u043F\u043E\u043A\u0430 \u043D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043B.`];
+  ] : [`\u{1F9E0} \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \`${label2}\` \u043F\u0443\u0441\u0442\u0430 \u2014 \u0440\u043E\u0439 \u043F\u0440\u043E \u044D\u0442\u043E\u0442 \u043A\u0443\u0441\u043E\u043A \u043A\u043E\u0434\u0430 \u043F\u043E\u043A\u0430 \u043D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043B.`];
   return [
     ...head,
-    `\u{1F9E0} \u0417\u0410\u041C\u0415\u0422\u041A\u0410 \u0412 \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \u2014 \u0432 \u043A\u043E\u043D\u0446\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0438 \u0434\u043E ${ZONE_NOTES_PER_RUN_MAX} \u0448\u0442\u0443\u043A: \`zone_notes: [{ zone: "${label}", claim: "\u2026", why: "\u2026" }]\` (zone \u043C\u043E\u0436\u043D\u043E \u043D\u0435 \u0443\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u2014 \u0432\u043E\u0437\u044C\u043C\u0451\u0442\u0441\u044F \u0442\u0432\u043E\u044F). \u0427\u0422\u041E \u0433\u043E\u0434\u0438\u0442\u0441\u044F: \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0441 \u043F\u0440\u0438\u0447\u0438\u043D\u043E\u0439 (\xAB\u043E\u0447\u0435\u0440\u0435\u0434\u044C \u0447\u0438\u0442\u0430\u044E\u0442 \u0438\u0437 \u043E\u0434\u043D\u043E\u0439 \u0442\u043E\u0447\u043A\u0438, \u043F\u043E\u0442\u043E\u043C\u0443 \u0447\u0442\u043E \u2026\xBB), \u0433\u0440\u0430\u0431\u043B\u0438 \u0441 \u0446\u0435\u043D\u043E\u0439 (\xAB\u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438 \u043D\u0430\u043A\u0430\u0442\u044B\u0432\u0430\u044E\u0442\u0441\u044F \u043D\u0435 \u0442\u0435\u043C, \u0447\u0435\u043C \u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u2014 \u0441\u0442\u043E\u0438\u043B\u043E \u0447\u0430\u0441\u0430\xBB), \u043E\u0442\u0431\u0440\u043E\u0448\u0435\u043D\u043D\u044B\u0439 \u0432\u0430\u0440\u0438\u0430\u043D\u0442 \u0441 \u043F\u0440\u0438\u0447\u0438\u043D\u043E\u0439. \u0427\u0422\u041E \u041D\u0415 \u0433\u043E\u0434\u0438\u0442\u0441\u044F: \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E \u043A\u043E\u0434\u0430 (\xAB\u0445\u0435\u043D\u0434\u043B\u0435\u0440 \u043B\u0435\u0436\u0438\u0442 \u0432 handlers.ts\xBB, \xAB\u044D\u0442\u0430 \u0444\u0443\u043D\u043A\u0446\u0438\u044F \u0434\u0435\u043B\u0430\u0435\u0442 \u0442\u043E-\u0442\u043E\xBB) \u2014 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0434\u0440\u043E\u043D \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0435\u0442 \u044D\u0442\u043E \u0441\u0430\u043C \u0438 \u0431\u044B\u0441\u0442\u0440\u0435\u0435, \u0447\u0435\u043C \u0442\u0432\u043E\u044E \u0437\u0430\u043C\u0435\u0442\u043A\u0443. \u0420\u0435\u0448\u0430\u0435\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440; \u043D\u0438\u0447\u0435\u0433\u043E \u0442\u0430\u043A\u043E\u0433\u043E \u043D\u0435 \u0431\u044B\u043B\u043E \u2014 \u043D\u0435 \u0432\u044B\u0434\u0443\u043C\u044B\u0432\u0430\u0439, \u043F\u0443\u0441\u0442\u043E\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u044D\u0442\u043E \u043D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0438\u0441\u0445\u043E\u0434 \u043F\u0440\u043E\u0433\u043E\u043D\u0430.`
+    `\u{1F9E0} \u0417\u0410\u041C\u0415\u0422\u041A\u0410 \u0412 \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B \u2014 \u0432 \u043A\u043E\u043D\u0446\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0438 \u0434\u043E ${ZONE_NOTES_PER_RUN_MAX} \u0448\u0442\u0443\u043A: \`zone_notes: [{ zone: "${label2}", claim: "\u2026", why: "\u2026" }]\` (zone \u043C\u043E\u0436\u043D\u043E \u043D\u0435 \u0443\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u2014 \u0432\u043E\u0437\u044C\u043C\u0451\u0442\u0441\u044F \u0442\u0432\u043E\u044F). \u0427\u0422\u041E \u0433\u043E\u0434\u0438\u0442\u0441\u044F: \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0441 \u043F\u0440\u0438\u0447\u0438\u043D\u043E\u0439 (\xAB\u043E\u0447\u0435\u0440\u0435\u0434\u044C \u0447\u0438\u0442\u0430\u044E\u0442 \u0438\u0437 \u043E\u0434\u043D\u043E\u0439 \u0442\u043E\u0447\u043A\u0438, \u043F\u043E\u0442\u043E\u043C\u0443 \u0447\u0442\u043E \u2026\xBB), \u0433\u0440\u0430\u0431\u043B\u0438 \u0441 \u0446\u0435\u043D\u043E\u0439 (\xAB\u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438 \u043D\u0430\u043A\u0430\u0442\u044B\u0432\u0430\u044E\u0442\u0441\u044F \u043D\u0435 \u0442\u0435\u043C, \u0447\u0435\u043C \u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u2014 \u0441\u0442\u043E\u0438\u043B\u043E \u0447\u0430\u0441\u0430\xBB), \u043E\u0442\u0431\u0440\u043E\u0448\u0435\u043D\u043D\u044B\u0439 \u0432\u0430\u0440\u0438\u0430\u043D\u0442 \u0441 \u043F\u0440\u0438\u0447\u0438\u043D\u043E\u0439. \u0427\u0422\u041E \u041D\u0415 \u0433\u043E\u0434\u0438\u0442\u0441\u044F: \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E \u043A\u043E\u0434\u0430 (\xAB\u0445\u0435\u043D\u0434\u043B\u0435\u0440 \u043B\u0435\u0436\u0438\u0442 \u0432 handlers.ts\xBB, \xAB\u044D\u0442\u0430 \u0444\u0443\u043D\u043A\u0446\u0438\u044F \u0434\u0435\u043B\u0430\u0435\u0442 \u0442\u043E-\u0442\u043E\xBB) \u2014 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0434\u0440\u043E\u043D \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0435\u0442 \u044D\u0442\u043E \u0441\u0430\u043C \u0438 \u0431\u044B\u0441\u0442\u0440\u0435\u0435, \u0447\u0435\u043C \u0442\u0432\u043E\u044E \u0437\u0430\u043C\u0435\u0442\u043A\u0443. \u0420\u0435\u0448\u0430\u0435\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440; \u043D\u0438\u0447\u0435\u0433\u043E \u0442\u0430\u043A\u043E\u0433\u043E \u043D\u0435 \u0431\u044B\u043B\u043E \u2014 \u043D\u0435 \u0432\u044B\u0434\u0443\u043C\u044B\u0432\u0430\u0439, \u043F\u0443\u0441\u0442\u043E\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u044D\u0442\u043E \u043D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0438\u0441\u0445\u043E\u0434 \u043F\u0440\u043E\u0433\u043E\u043D\u0430.`
   ].join("\n");
 }
 function collectZoneNoteConfirmations(report) {
@@ -11635,6 +11812,52 @@ import { createHash as createHash3 } from "crypto";
 
 // src/anomalies.ts
 init_src();
+
+// src/reviewRescue.ts
+init_src();
+var REVIEW_RESCUE_AFTER_MS = Math.max(6e4, Number(process.env.SWARM_REVIEW_RESCUE_MS) || 10 * 6e4);
+var REVIEW_RESCUE_MARK = "\u0430\u0432\u0442\u043E\u043F\u043E\u0434\u044A\u0451\u043C \u0440\u0435\u0432\u044C\u044E";
+var AUTHOR_GONE_STATUSES = /* @__PURE__ */ new Set(["paused", "failed", "stalled"]);
+function isExecutorRun(run) {
+  if (run.reviews_run_id != null || run.verifies_run_id != null || run.resolves_run_id != null) return false;
+  const kind = run.kind ?? "drone";
+  return kind === "drone" || kind === "hero";
+}
+function prOpenedAtMs(events) {
+  const opened = events.filter((e) => e.kind === "pr_opened");
+  if (opened.length === 0) return null;
+  const ms = sqliteMs(opened[opened.length - 1].at);
+  return Number.isFinite(ms) ? ms : null;
+}
+function reviewlessPrCandidates(db, now, afterMs = REVIEW_RESCUE_AFTER_MS) {
+  const out = [];
+  for (const run of db.listRuns()) {
+    if (!run.pr_url) continue;
+    if (run.status !== "review" && !AUTHOR_GONE_STATUSES.has(run.status)) continue;
+    if (!isExecutorRun(run)) continue;
+    if (run.review_verdict != null) continue;
+    if (run.status === "review") {
+      if (db.reviewerCountFor(run.id) > 0) continue;
+      if (db.activeReviewersFor(run.id).length > 0) continue;
+    }
+    const events = db.events(run.id);
+    const openedAt = prOpenedAtMs(events) ?? sqliteMs(run.updated_at);
+    if (!Number.isFinite(openedAt) || now - openedAt < afterMs) continue;
+    out.push(run);
+  }
+  return out;
+}
+function lastReviewBlockReason(db, runId) {
+  const hit = db.events(runId).findLast((e) => (e.text ?? "").includes(`${REVIEW_RESCUE_MARK}:`));
+  if (!hit?.text) return null;
+  const idx = hit.text.indexOf(`${REVIEW_RESCUE_MARK}:`);
+  return hit.text.slice(idx + REVIEW_RESCUE_MARK.length + 1).trim() || null;
+}
+function shouldNoteReason(db, runId, reason) {
+  return lastReviewBlockReason(db, runId) !== reason;
+}
+
+// src/anomalies.ts
 var LEVEL_RANK = { note: 0, feed: 1, decision: 2 };
 function plural2(n, forms) {
   const mod100 = n % 100;
@@ -12002,15 +12225,18 @@ function buildAnomalyCandidates(db, now, thresholds, opts) {
         key: `pr_no_reviewer:${run.id}`,
         minDurationMs: thresholds.prNoReviewerMs,
         group: PR_GROUP,
-        build: () => ({
-          runId: run.id,
-          // В ленту: ревьюер не поднялся из-за гейта (cap/maxDrones/cutoff) — как только
-          // гейт откроется, рой поднимет его сам, решения человека тут не требуется.
-          level: "feed",
-          title: runTitle(run, "PR \u0431\u0435\u0437 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430"),
-          body: `${droneOf(run)}: PR \u043E\u0442\u043A\u0440\u044B\u0442 \u2265${Math.round(thresholds.prNoReviewerMs / 6e4)} \u043C\u0438\u043D, \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0442\u0430\u043A \u0438 \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F (SWARM_REVIEW_CAP/maxDrones/cutoff?) \u2014 ${run.pr_url}.`,
-          ...hrefOf(run.task_url)
-        })
+        build: () => {
+          const why = lastReviewBlockReason(db, run.id);
+          return {
+            runId: run.id,
+            // В ленту: рой действует сам (автоподъём), решения человека тут не требуется —
+            // если и подъём не вышел, причина в теле и есть то, с чем человек идёт разбираться.
+            level: "feed",
+            title: runTitle(run, "PR \u0431\u0435\u0437 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430"),
+            body: `${droneOf(run)}: PR \u043E\u0442\u043A\u0440\u044B\u0442 \u2265${Math.round(thresholds.prNoReviewerMs / 6e4)} \u043C\u0438\u043D, \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0442\u0430\u043A \u0438 \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F \u2014 ${why ?? "\u0440\u043E\u0439 \u0435\u0449\u0451 \u043D\u0435 \u043D\u0430\u0437\u0432\u0430\u043B \u043F\u0440\u0438\u0447\u0438\u043D\u0443 (\u0430\u0432\u0442\u043E\u043F\u043E\u0434\u044A\u0451\u043C \u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u0434\u043E\u0448\u0451\u043B \u0434\u043E \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430)"} \u2014 ${run.pr_url}.`,
+            ...hrefOf(run.task_url)
+          };
+        }
       });
     } else if (run.review_verdict === "changes" && db.activeReviewersFor(run.id).length === 0) {
       candidates.push({
@@ -12508,6 +12734,11 @@ function makeDroneCapReader(opts) {
 
 // src/mergeGate.ts
 init_src();
+
+// src/mergeQueue.ts
+init_src();
+
+// src/prNumber.ts
 function prNumberOf(ref) {
   const s = (ref || "").trim();
   if (!s) return null;
@@ -12516,6 +12747,79 @@ function prNumberOf(ref) {
   const bare = s.match(/^#?(\d+)$/);
   return bare ? Number(bare[1]) : null;
 }
+
+// src/mergeQueue.ts
+var TERMINAL2 = /* @__PURE__ */ new Set(["done", "failed", "stalled", "stopped", "superseded", "returned"]);
+function isMergeCandidate(r) {
+  return !!r.pr_url && r.reviews_run_id == null && r.verifies_run_id == null && r.resolves_run_id == null && !TERMINAL2.has(r.status) && prNumberOf(r.pr_url) != null;
+}
+function mergeQueueCandidates(runs, repo) {
+  const byPr = /* @__PURE__ */ new Map();
+  for (const r of runs) {
+    if (r.repo !== repo || !isMergeCandidate(r)) continue;
+    const num = prNumberOf(r.pr_url);
+    const seen = byPr.get(num);
+    if (!seen || r.id > seen.id) byPr.set(num, r);
+  }
+  return [...byPr.values()];
+}
+var BASE_TTL_MS = 2e4;
+function makeMergeQueueResolver(deps) {
+  const memo = /* @__PURE__ */ new Map();
+  const evaluate = async (e, prUrl, ready) => {
+    const now = Date.now();
+    let cached = memo.get(prUrl);
+    const ttl = deps.ttlMs ?? BASE_TTL_MS;
+    if (!cached || now - cached.at >= ttl) {
+      const base3 = await deps.baseSync(prUrl).catch(() => null);
+      let checks = "none";
+      if (base3?.behindBy === 0 && deps.checks) {
+        const ci = await deps.checks(prUrl).catch(() => null);
+        checks = ci ? ci.bucket : null;
+      }
+      cached = { at: now, base: base3, checks };
+      memo.set(prUrl, cached);
+    }
+    return computeMergeQueue({ entry: e, ready, behindBy: cached.base ? cached.base.behindBy : null, checks: cached.checks });
+  };
+  return async (run) => {
+    if (!deps.baseSync || !run.pr_url) return null;
+    const num = prNumberOf(run.pr_url);
+    if (num == null) return null;
+    const candidates = mergeQueueCandidates(deps.listRuns(), run.repo);
+    const mine = candidates.find((c) => prNumberOf(c.pr_url) === num);
+    if (!mine) return null;
+    const ready = [];
+    const urlOf = /* @__PURE__ */ new Map();
+    for (const c of candidates) {
+      if (!await deps.gateAllows(c).catch(() => false)) continue;
+      ready.push(entryOf(c));
+      urlOf.set(c.id, c.pr_url);
+    }
+    const entry = entryOf(mine);
+    if (!ready.some((e) => e.runId === entry.runId)) return null;
+    let queue = orderMergeQueue(ready);
+    while (queue.length > 1 && queue[0].runId !== entry.runId) {
+      const head = queue[0];
+      const headUrl = urlOf.get(head.runId);
+      const decision = await evaluate(head, headUrl, queue);
+      if (decision.code !== "checks_red") break;
+      queue = queue.slice(1);
+    }
+    if (queue[0].runId !== entry.runId) {
+      return computeMergeQueue({ entry, ready: queue, behindBy: null, checks: "none" });
+    }
+    return evaluate(entry, mine.pr_url, queue);
+  };
+}
+function entryOf(r) {
+  return { runId: r.id, prNumber: prNumberOf(r.pr_url), slug: r.task_slug };
+}
+function needsBaseRefresh(d) {
+  return d?.code === "base_stale";
+}
+
+// src/mergeGate.ts
 function findRunByPr(runs, ref) {
   const num = prNumberOf(ref);
   if (num == null) return null;
@@ -12527,17 +12831,34 @@ function findRunByPr(runs, ref) {
   return best;
 }
 function makeMergeGateResolver(deps) {
-  return async (ref) => {
-    const run = findRunByPr(deps.listRuns(), ref);
-    if (!run) return { ...computeMergeGate({ hasRun: false, autoReview: false, reviewVerdict: null }), run: null };
+  return makeMergeGateParts(deps).gate;
+}
+function makeMergeGateParts(deps) {
+  const gateFor = async (run) => {
     const autoReview = deps.autoReview ? await deps.autoReview(run.repo).catch(() => deps.fallbackAutoReview) : deps.fallbackAutoReview;
-    const decision = computeMergeGate({
+    return computeMergeGate({
       hasRun: true,
       autoReview,
       reviewVerdict: run.review_verdict,
       autoVerify: deps.autoVerify === true,
       verifyVerdict: run.verify_verdict ?? null
     });
+  };
+  const queueFor = makeMergeQueueResolver({
+    listRuns: deps.listRuns,
+    gateAllows: async (r) => (await gateFor(r)).allowed,
+    ...deps.baseSync ? { baseSync: deps.baseSync } : {},
+    ...deps.checks ? { checks: deps.checks } : {},
+    ...deps.ttlMs != null ? { ttlMs: deps.ttlMs } : {}
+  });
+  const gate = async (ref) => {
+    const run = findRunByPr(deps.listRuns(), ref);
+    if (!run) {
+      return { ...computeMergeDecision(computeMergeGate({ hasRun: false, autoReview: false, reviewVerdict: null }), null), run: null };
+    }
+    const accept = await gateFor(run);
+    const queue = accept.allowed && accept.code !== "unknown_pr" ? await queueFor(run) : null;
+    const decision = computeMergeDecision(accept, queue);
     return {
       ...decision,
       run: {
@@ -12550,6 +12871,7 @@ function makeMergeGateResolver(deps) {
       }
     };
   };
+  return { gate, queue: queueFor };
 }
 
 // src/envGate.ts
@@ -12990,7 +13312,7 @@ async function changedPaths(worktree, opts = {}) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.18",
+  version: "0.6.20",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -13040,7 +13362,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "9531f684d8a7c6c4c3595f0c57e4aebce0038ac1"
+  gitHead: "2d05a2e2b7c197ab916f7ff756e3a829b138df16"
 };
 
 // src/version.ts
@@ -14743,8 +15065,8 @@ async function executeHostCommands(opts) {
 }
 async function executeOne(cmd, opts) {
   const { effects, ack, statePath } = opts;
-  const label = hostCommandLabel(cmd);
-  effects.narrate(`\u{1F4DF} \u041A\u043E\u043C\u0430\u043D\u0434\u0430 \u0438\u0437 Taskless: ${label}`);
+  const label2 = hostCommandLabel(cmd);
+  effects.narrate(`\u{1F4DF} \u041A\u043E\u043C\u0430\u043D\u0434\u0430 \u0438\u0437 Taskless: ${label2}`);
   try {
     switch (cmd.kind) {
       case "pause":
@@ -15627,6 +15949,14 @@ function lastConflictAttemptMs(db, runId) {
   if (!evs.length) return null;
   return Date.parse(evs[evs.length - 1].at.replace(" ", "T") + "Z");
 }
+async function needsBaseRefreshNow(deps, run, stormActive, now) {
+  if (!deps.mergeQueue || !deps.resolveConflict || stormActive) return false;
+  if (deps.db.activeResolverFor(run.id)) return false;
+  if (deps.db.resolverCountFor(run.id) >= RESOLVE_LIMIT) return false;
+  const last = lastConflictAttemptMs(deps.db, run.id);
+  if (last != null && now - last < CONFLICT_RESOLVE_COOLDOWN_MS) return false;
+  return needsBaseRefresh(await deps.mergeQueue(run).catch(() => null));
+}
 function lastCiCheckMs(db, runId) {
   const evs = db.events(runId).filter((e) => e.kind === "ci_wake" || e.kind === "ci_checked");
   if (!evs.length) return null;
@@ -15882,6 +16212,92 @@ async function closeMergedTaskRuns(deps) {
     }
   }
 }
+function relinkUnboundReviewers(deps) {
+  const all = deps.db.listRuns();
+  const unbound = all.filter((r) => r.kind === "reviewer" && r.reviews_run_id == null && r.pr_url && REVIEWER_ALIVE_STATUSES.has(r.status));
+  if (unbound.length === 0) return;
+  for (const rv of unbound) {
+    const candidates = all.filter(
+      (r) => r.id !== rv.id && r.pr_url === rv.pr_url && (r.kind ?? "drone") !== "reviewer" && (r.kind ?? "drone") !== "verifier" && r.reviews_run_id == null && r.verifies_run_id == null && r.resolves_run_id == null
+    );
+    if (candidates.length !== 1) {
+      const why = candidates.length === 0 ? `\u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u044B\u0439 \u043F\u0440\u043E\u0433\u043E\u043D \u043F\u043E \u0441\u0441\u044B\u043B\u043A\u0435 ${rv.pr_url} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u043D\u0435\u043A\u0443\u0434\u0430` : `\u043F\u043E \u0441\u0441\u044B\u043B\u043A\u0435 ${rv.pr_url} \u043D\u0430\u0439\u0434\u0435\u043D\u043E ${candidates.length} \u043F\u0440\u043E\u0433\u043E\u043D\u043E\u0432 \u2014 \u043A\u0430\u043A\u043E\u0439 \u0438\u0437 \u043D\u0438\u0445 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u044B\u0439, \u0443\u0433\u0430\u0434\u044B\u0432\u0430\u0442\u044C \u043D\u0435\u043B\u044C\u0437\u044F`;
+      if (!deps.db.events(rv.id).some((e) => (e.text ?? "").includes(why))) deps.db.addEvent(rv.id, "step", why);
+      continue;
+    }
+    const parent = candidates[0];
+    deps.db.updateRun(rv.id, { reviews_run_id: parent.id, review_cycle: parent.review_cycle });
+    deps.db.addEvent(rv.id, "step", `\u0441\u0432\u044F\u0437\u044C \u0441 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u044B\u043C \u043F\u0440\u043E\u0433\u043E\u043D\u043E\u043C \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043F\u043E \u0441\u0441\u044B\u043B\u043A\u0435 PR: #${parent.id} (${parent.task_slug}) \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0435\u0441\u0442\u044C \u043A\u0443\u0434\u0430 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C (TASWM-375)`);
+    deps.db.addEvent(parent.id, "step", `\u0440\u0435\u0432\u044C\u044E\u0435\u0440 ${rv.name} (#${rv.id}) \u043F\u043E\u0434\u043D\u044F\u0442 \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438 \u2014 \u0441\u0432\u044F\u0437\u0430\u043B \u0435\u0433\u043E \u0441 \u043F\u0440\u043E\u0433\u043E\u043D\u043E\u043C \u043F\u043E PR-\u0441\u0441\u044B\u043B\u043A\u0435, \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u043B\u044F\u0436\u0435\u0442 \u0441\u044E\u0434\u0430`);
+    narrate(deps, `${droneLabel(rv)} \u0440\u0430\u0431\u043E\u0442\u0430\u043B \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438 \u043A \u043F\u0440\u043E\u0433\u043E\u043D\u0443 \u2014 \u0441\u0432\u044F\u0437\u0430\u043B \u043F\u043E PR-\u0441\u0441\u044B\u043B\u043A\u0435, \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0442\u0435\u043F\u0435\u0440\u044C \u043B\u044F\u0436\u0435\u0442 \u0432 ${parent.task_slug}, \u0430 \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u043A\u043E\u043C\u043C\u0435\u043D\u0442 GitHub.`);
+  }
+}
+function deliberateReviewStop(db, run) {
+  const texts = db.events(run.id).map((e) => e.text ?? "");
+  const has = (mark) => texts.some((t) => t.includes(mark));
+  if (has(SELF_REFERENCE_MARK)) {
+    return `PR \u0442\u0440\u043E\u0433\u0430\u0435\u0442 \u043A\u043E\u0434 \u0441\u0430\u043C\u043E\u0433\u043E \u0434\u0435\u043C\u043E\u043D\u0430 (${DAEMON_CODE_PATHS.join(", ")}) \u2014 \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u043D\u043E (TASWM-270): \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0438\u0439 \u0434\u0435\u043C\u043E\u043D \u043A\u0440\u0443\u0442\u0438\u0442\u0441\u044F \u043D\u0430 \u0441\u0442\u0430\u0440\u043E\u043C \u043A\u043E\u0434\u0435 \u0438 \u0441\u0432\u043E\u044E \u0436\u0435 \u043F\u0440\u0430\u0432\u043A\u0443 \u043D\u0435 \u0430\u0442\u0442\u0435\u0441\u0442\u0443\u0435\u0442. \u041D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`;
+  }
+  if (has(REVIEW_ESCALATION_MARK)) return `\u043F\u043E\u043F\u044B\u0442\u043A\u0438 \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D\u044B (${REVIEW_SPAWN_LIMIT}) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`;
+  if (has(REVIEW_CYCLE_ESCALATION_MARK)) return `\u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0446\u0438\u043A\u043B\u043E\u0432 \u0440\u0435-\u0440\u0435\u0432\u044C\u044E (${REVIEW_CYCLE_LIMIT}) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`;
+  if (has(reviewBudgetMark(run.review_cycle ?? 0))) return "\u0440\u0435\u0432\u044C\u044E \u044D\u0442\u043E\u0433\u043E \u043A\u0440\u0443\u0433\u0430 \u0441\u0433\u043E\u0440\u0435\u043B\u043E \u043D\u0430 \u043F\u043E\u0442\u043E\u043B\u043A\u0435 \u0442\u0440\u0430\u0442 \u2014 \u043F\u043E\u0432\u0442\u043E\u0440 \u0443\u043F\u0440\u0451\u0442\u0441\u044F \u0432 \u0442\u043E\u0442 \u0436\u0435, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A";
+  if (has(reviewUnrecoverableMark(run.branch || run.task_slug))) return "\u0432\u0435\u0442\u043A\u0438 PR \u043D\u0435\u0442 \u043D\u0430 origin \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u043C \u043D\u0435 \u043B\u0435\u0447\u0438\u0442\u0441\u044F, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A";
+  return null;
+}
+function noteReviewBlocked(deps, run, reason) {
+  if (!shouldNoteReason(deps.db, run.id, reason)) return;
+  deps.db.addEvent(run.id, "step", `${REVIEW_RESCUE_MARK}: ${reason}`);
+}
+async function rescueReviewlessPrs(deps, stormActive, now) {
+  for (const run of reviewlessPrCandidates(deps.db, now)) {
+    try {
+      const stop = deliberateReviewStop(deps.db, run);
+      if (stop) {
+        noteReviewBlocked(deps, run, stop);
+        continue;
+      }
+      const authorGone = AUTHOR_GONE_STATUSES.has(run.status) && (run.status !== "paused" || NO_AUTO_WAKE_REASONS.some((r) => run.stop_reason?.startsWith(r)));
+      if (authorGone) {
+        const st = await deps.prStatus(run.pr_url).catch(() => null);
+        const liveness = prLiveness(st);
+        if (liveness !== "open") {
+          noteReviewBlocked(deps, run, liveness === "unknown" ? "gh \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0435\u0442 \u043F\u0440\u043E PR \u2014 \u043D\u0435 \u0437\u043D\u0430\u044E, \u0436\u0438\u0432 \u043B\u0438 \u043E\u043D; \u043F\u043E\u0432\u0442\u043E\u0440\u044E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" : `PR ${liveness === "merged" ? "\u0441\u043C\u0435\u0440\u0436\u0435\u043D" : "\u0437\u0430\u043A\u0440\u044B\u0442"} \u2014 \u0440\u0435\u0432\u044C\u044E\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E`);
+          continue;
+        }
+        if (st.isDraft) {
+          noteReviewBlocked(deps, run, "PR \u2014 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A: \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A\u0438 \u043D\u0435 \u0441\u043C\u043E\u0442\u0440\u0438\u0442 (\u0441\u043D\u0438\u043C\u0438 draft)");
+          continue;
+        }
+        const wasLabel = STATUS_META[run.status]?.label ?? run.status;
+        deps.db.updateRun(run.id, { status: "review" });
+        deps.db.addEvent(
+          run.id,
+          "step",
+          `${REVIEW_RESCUE_MARK}: \u0430\u0432\u0442\u043E\u0440 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 (${wasLabel}), \u0430 PR \u043E\u0442\u043A\u0440\u044B\u0442 \u0438 \u0431\u0435\u0437 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u044E \u043F\u0440\u043E\u0433\u043E\u043D \u043D\u0430 \u0440\u0435\u0432\u044C\u044E, \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E\u0449\u0438\u0439 \u043D\u0443\u0436\u0435\u043D \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E \u043E\u0442 \u0441\u0443\u0434\u044C\u0431\u044B \u0430\u0432\u0442\u043E\u0440\u0430`
+        );
+        narrate(deps, `PR ${droneLabel(run)} \u0436\u0438\u0432, \u0430 \u0435\u0433\u043E \u0430\u0432\u0442\u043E\u0440 \u2014 \u043D\u0435\u0442 (${wasLabel}): \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u044E \u043F\u0440\u043E\u0433\u043E\u043D \u043D\u0430 \u0440\u0435\u0432\u044C\u044E, \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0432\u0441\u0451 \u0440\u0430\u0432\u043D\u043E \u043D\u0443\u0436\u0435\u043D.`);
+        continue;
+      }
+      if (run.status !== "review") continue;
+      noteReviewBlocked(deps, run, reviewGateReason(deps, run, stormActive));
+    } catch (e) {
+      console.error(`[overmind] \u0430\u0432\u0442\u043E\u043F\u043E\u0434\u044A\u0451\u043C \u0440\u0435\u0432\u044C\u044E \u0434\u043B\u044F \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id} (${run.task_slug}) \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F:`, e);
+    }
+  }
+}
+function reviewGateReason(deps, run, stormActive) {
+  if (!deps.spawnReviewer) return "\u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043E \u043D\u0430 \u044D\u0442\u043E\u0439 \u043C\u0430\u0448\u0438\u043D\u0435 (SWARM_AUTO_REVIEW=0)";
+  if (stormActive) return "\u0448\u0442\u043E\u0440\u043C Anthropic \u2014 \u043D\u043E\u0432\u044B\u0445 \u0441\u0435\u0441\u0441\u0438\u0439 \u0440\u043E\u0439 \u043D\u0435 \u043F\u043E\u0434\u043D\u0438\u043C\u0430\u0435\u0442, \u0440\u0435\u0432\u044C\u044E \u0436\u0434\u0451\u0442 \u043E\u0442\u0431\u043E\u044F";
+  if (deps.reviewCutoffAt && run.updated_at < deps.reviewCutoffAt) {
+    return `\u043F\u0440\u043E\u0433\u043E\u043D \u0441\u0442\u0430\u0440\u0448\u0435 \u043C\u043E\u043C\u0435\u043D\u0442\u0430 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E (cutoff ${deps.reviewCutoffAt}) \u2014 \u0440\u043E\u0439 \u0435\u0433\u043E \u043D\u0435 \u0431\u0435\u0440\u0451\u0442, \u043F\u0440\u043E\u0432\u0435\u0440\u044C \u0440\u0443\u043A\u0430\u043C\u0438`;
+  }
+  if (deps.resourcesOk && !deps.resourcesOk()) return "\u043C\u0430\u0448\u0438\u043D\u0430 \u043F\u0435\u0440\u0435\u0433\u0440\u0443\u0436\u0435\u043D\u0430 \u2014 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0436\u0434\u0451\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0445 \u0440\u0435\u0441\u0443\u0440\u0441\u043E\u0432";
+  if (deps.reviewCap !== void 0) {
+    const busy = countActiveReviewers(deps.db);
+    if (busy >= deps.reviewCap) return `\u0437\u0430\u043D\u044F\u0442 \u0441\u043B\u043E\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430: \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 ${busy} \u043F\u0440\u0438 SWARM_REVIEW_CAP=${deps.reviewCap} \u2014 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043F\u043E\u0434\u043D\u0438\u043C\u0435\u0442\u0441\u044F, \u043A\u0430\u043A \u0442\u043E\u043B\u044C\u043A\u043E \u0441\u043B\u043E\u0442 \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u0442\u0441\u044F`;
+  }
+  return "\u0432\u0441\u0435 \u0433\u0435\u0439\u0442\u044B \u043E\u0442\u043A\u0440\u044B\u0442\u044B, \u0430 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F \u2014 \u0441\u043C\u043E\u0442\u0440\u0438 \u043B\u043E\u0433 \u0434\u0435\u043C\u043E\u043D\u0430 \u043D\u0430 \u043E\u0448\u0438\u0431\u043A\u0443 \u0441\u043F\u0430\u0432\u043D\u0430";
+}
 async function closeOrphanedReviewers(deps) {
   for (const rv of deps.db.listRuns()) {
     const checkedId = rv.kind === "reviewer" ? rv.reviews_run_id : rv.kind === "verifier" ? rv.verifies_run_id : null;
@@ -16957,9 +17373,42 @@ async function trySpawnQueuedRun(deps, run) {
       return "skipped";
     }
     if (e instanceof AreaBusyError) return deferSpawn(deps, run, e.message);
+    if (e instanceof WorktreeBusyError && await healBusyWorktree(deps, run, e)) {
+      try {
+        await deps.spawn(run);
+        if (deps.spawnDefer) clearDefer(deps.spawnDefer, `run:${run.id}`);
+        narrate(deps, `\u0411\u0435\u0440\u0443 ${run.task_slug} \u0438\u0437 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u2014 \u0441\u043F\u0430\u0432\u043D\u044E ${droneLabel(run)} (\u043F\u0440\u0438\u0431\u0440\u0430\u043B \u0437\u0430 \u043C\u0451\u0440\u0442\u0432\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0435\u0439).`);
+        return "spawned";
+      } catch (again) {
+        return await failBeforeStart(deps, run, String(again));
+      }
+    }
     return await failBeforeStart(deps, run, String(e));
   }
 }
+async function healBusyWorktree(deps, run, e) {
+  const path = e.worktreePath;
+  if (!deps.releaseWorktree) return false;
+  if (deps.liveWorktrees?.().has(path)) return false;
+  const holder = deps.db.listRuns().find((r) => r.id !== run.id && r.worktree_path === path && !isTerminalStatus(r.status));
+  if (holder && (holder.pid == null || deps.isAlive(holder.pid))) {
+    return false;
+  }
+  if (deps.isDirty && await deps.isDirty(path).catch(() => true)) {
+    deps.db.addEvent(
+      run.id,
+      "anomaly",
+      `${DIRTY_WORKTREE_MARK}. \u041F\u0443\u0442\u044C: ${path}. \u0416\u0438\u0432\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u0437\u0430 \u043D\u0438\u043C \u043D\u0435\u0442, \u043D\u043E \u0432\u043D\u0443\u0442\u0440\u0438 \u0435\u0441\u0442\u044C \u043D\u0435\u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 \u2014 \u043F\u0440\u0438\u0431\u0438\u0440\u0430\u0442\u044C \u043D\u0435 \u0441\u0442\u0430\u043B, \u043F\u0440\u043E\u0433\u043E\u043D \u043D\u0435 \u0441\u043F\u0430\u0432\u043D\u044E. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438 \u0441\u0430\u043C: \`git -C ${path} status --untracked-files=all\`.`
+    );
+    narrate(deps, `${run.task_slug}: worktree \u0437\u0430\u043D\u044F\u0442 \u043C\u0451\u0440\u0442\u0432\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0435\u0439, \u043D\u043E \u0432 \u043D\u0451\u043C \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 \u2014 \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u044E, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A.`);
+    return false;
+  }
+  await deps.releaseWorktree(run.repo, path).catch(() => {
+  });
+  deps.db.addEvent(run.id, "step", `worktree ${path} \u0434\u0435\u0440\u0436\u0430\u043B\u0430 \u043C\u0451\u0440\u0442\u0432\u0430\u044F \u0441\u0435\u0441\u0441\u0438\u044F \u2014 \u043F\u0440\u0438\u0431\u0440\u0430\u043B \u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u044F\u044E \u0441\u043F\u0430\u0432\u043D (TASWM-476)`);
+  if (holder) deps.db.addEvent(holder.id, "step", `worktree ${path} \u043E\u0441\u0432\u043E\u0431\u043E\u0436\u0434\u0451\u043D: \u0436\u0438\u0432\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u0437\u0430 \u043D\u0438\u043C \u043D\u0435\u0442, \u0441\u043B\u0430\u0433 \u043F\u043E\u043D\u0430\u0434\u043E\u0431\u0438\u043B\u0441\u044F \u043F\u0440\u043E\u0433\u043E\u043D\u0443 #${run.id}`);
+  return true;
+}
 async function failBeforeStart(deps, run, reason) {
   deps.db.updateRun(run.id, { status: "failed", stop_reason: `${PRE_START_MARK}: ${reason}` });
   deps.db.addEvent(run.id, "failed", `${PRE_START_MARK} \u2014 ${reason}`);
@@ -17524,6 +17973,18 @@ async function tickOnce(deps) {
       }
     }
   }
+  if (deps.reapWorktrees) {
+    const rw = deps.reapWorktrees;
+    const sinceLast = rw.lastAt == null ? Infinity : now - rw.lastAt;
+    if (sinceLast >= rw.intervalMs) {
+      rw.lastAt = now;
+      try {
+        await rw.run();
+      } catch (e) {
+        console.error("[overmind] \u0443\u0431\u043E\u0440\u043A\u0430 worktree \u0441\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C:", e);
+      }
+    }
+  }
   if (deps.logRotate) {
     const lr = deps.logRotate;
     const sinceLast = lr.lastAt == null ? Infinity : now - lr.lastAt;
@@ -17653,7 +18114,8 @@ async function tickOnce(deps) {
         continue;
       }
       await retireOutdatedReviewers(deps, run);
-      if (st.conflicting && deps.resolveConflict && !stormActive) {
+      const baseStale = !st.conflicting && await needsBaseRefreshNow(deps, run, stormActive, now);
+      if ((st.conflicting || baseStale) && deps.resolveConflict && !stormActive) {
         if (deps.resourcesOk && !deps.resourcesOk()) continue;
         if (countActiveDrones(deps.db) >= droneCap) continue;
         if (!await projectQuotaGateAllows(deps, run)) continue;
@@ -17666,7 +18128,11 @@ async function tickOnce(deps) {
         }
         const last = lastConflictAttemptMs(deps.db, run.id);
         if (last != null && now - last < CONFLICT_RESOLVE_COOLDOWN_MS) continue;
-        deps.db.addEvent(run.id, "conflict", "PR \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u0435\u0442 \u0441 main \u2014 \u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 main (merge-main-in)");
+        deps.db.addEvent(
+          run.id,
+          "conflict",
+          st.conflicting ? "PR \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u0435\u0442 \u0441 main \u2014 \u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 main (merge-main-in)" : "\u043E\u0447\u0435\u0440\u0435\u0434\u044C \u043C\u0435\u0440\u0436\u0430: \u0431\u0430\u0437\u0430 \u043F\u043E\u0434 PR \u0443\u0435\u0445\u0430\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434 \u2014 \u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 main \u0438 \u043F\u0435\u0440\u0435\u0433\u043E\u043D\u044F\u0435\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 (TASWM-472)"
+        );
         try {
           await deps.resolveConflict(run);
         } catch (e) {
@@ -17755,6 +18221,8 @@ async function tickOnce(deps) {
     }
   }
   await closeMergedTaskRuns(deps);
+  await rescueReviewlessPrs(deps, stormActive, now);
+  relinkUnboundReviewers(deps);
   await closeOrphanedReviewers(deps);
   await spawnVerifiersForOpenPrs(deps, stormActive);
   refreshReviewPhases(deps);
@@ -18989,8 +19457,21 @@ async function runDaemon(opts) {
   };
   control.set = setPaused;
   const restart = initialRestartState();
+  const mergeParts = makeMergeGateParts({
+    listRuns: () => db.listRuns(),
+    ...autoReviewProject ? { autoReview: autoReviewProject } : {},
+    fallbackAutoReview: SWARM_AUTO_REVIEW,
+    autoVerify: SWARM_AUTO_VERIFY,
+    // TASWM-344: вторая ось приёмки — вердикт верификатора
+    // TASWM-472: третья ось — ОЧЕРЕДЬ. Вливаем по одному и только на свежей базе; ридер
+    // свежести ходит в gh (`compare/base...head` → behind_by). Ключа нет при
+    // SWARM_MERGE_QUEUE=0 — тогда гейт отвечает ровно как до TASWM-472.
+    ...SWARM_MERGE_QUEUE ? { baseSync: (url) => prBaseSync(url), checks: (url) => prCiStatus(url) } : {}
+  });
   const deps = {
     db,
+    // TASWM-472: реконсайлу от очереди нужен ровно исход `base_stale` (см. needsBaseRefreshNow).
+    ...SWARM_MERGE_QUEUE ? { mergeQueue: mergeParts.queue } : {},
     narrate: narrator.narrate,
     control,
     spawn: async (run) => {
@@ -19072,7 +19553,7 @@ async function runDaemon(opts) {
     // TasklessClient.addComment + gh/git хелперы. Без tl (нет токена) ключи не задаём —
     // postAdoptionReport/postScrapedVerdictReport становятся no-op, как раньше.
     ...tl ? {
-      reportComment: (slug, body, label, ws) => tl.forWorkspace(ws).addComment(slug, body, label)
+      reportComment: (slug, body, label2, ws) => tl.forWorkspace(ws).addComment(slug, body, label2)
     } : {},
     prCommitTitles: (prUrl) => prCommitTitles(prUrl),
     prHeadBranch: (prUrl) => prHeadBranch(prUrl),
@@ -19135,6 +19616,32 @@ async function runDaemon(opts) {
       intervalMs: SWARM_SWEEP_INTERVAL_MS,
       lastAt: null
     },
+    // Жнец worktree (TASWM-476): убирает копии терминальных прогонов, чьи PR смержены/закрыты.
+    // Живость каталога определяем ПО ПРОЦЕССАМ (listDroneProcesses — тот же снимок, по которому
+    // идёт реконсайл рантайма), а не только по статусу в зеркале: статус мог не успеть
+    // обновиться, а сносить каталог из-под работающего дрона нельзя ни при каком статусе.
+    reapWorktrees: {
+      run: async () => {
+        const report = await reapFinishedWorktrees({
+          db,
+          prStatus: (url) => prStatus(url),
+          isDirty: (p) => worktreeDirty(p),
+          releaseWorktree: (repo, p) => releaseWorktree(repo || opts.repo, p),
+          pruneWorktrees: (repo) => pruneWorktrees(repo || opts.repo),
+          worktreeExists: existsSync17,
+          liveWorktrees: () => new Set(listDroneProcesses().map((p) => p.worktree)),
+          narrate: narrator.narrate
+        });
+        if (report.removed || report.keptDirty) {
+          console.log(`[overmind] \u0443\u0431\u043E\u0440\u043A\u0430 worktree: \u0441\u043D\u0435\u0441\u0435\u043D\u043E ${report.removed}, \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043E \u0441 \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u043E\u0439 \u0440\u0430\u0431\u043E\u0442\u043E\u0439 ${report.keptDirty}`);
+        }
+      },
+      intervalMs: SWARM_WORKTREE_REAP_INTERVAL_MS,
+      lastAt: null
+    },
+    // Самолечение залипшего слага (TASWM-476): те же два кирпича, что у жнеца выше.
+    releaseWorktree: (repo, p) => releaseWorktree(repo || opts.repo, p),
+    liveWorktrees: () => new Set(listDroneProcesses().map((p) => p.worktree)),
     isDirty: (p) => worktreeDirty(p),
     // git-активность как liveness (TASWM-67): последний коммит worktree — реальный git-вызов.
     lastCommitMs: (p) => worktreeLastCommitMs(p),
@@ -19548,13 +20055,7 @@ async function runDaemon(opts) {
     // TASWM-396: тот же ридер решает и подъём ревьюера, не только мерж — иначе проектная
     // настройка «ревью не нужно» ничего не выключала, а машина продолжала платить.
     ...autoReviewProject ? { autoReviewForRepo: autoReviewProject } : {},
-    mergeGate: makeMergeGateResolver({
-      listRuns: () => db.listRuns(),
-      ...autoReviewProject ? { autoReview: autoReviewProject } : {},
-      fallbackAutoReview: SWARM_AUTO_REVIEW,
-      autoVerify: SWARM_AUTO_VERIFY
-      // TASWM-344: вторая ось приёмки — вердикт верификатора
-    }),
+    mergeGate: mergeParts.gate,
     // Оператор-пауза + «Оживить» (TASWM-214 Фаза 2): тот же shared-флаг, что читает тик;
     // narrate — операторские действия видны в ленте роя; revive — сброс залипшего шторма.
     control,