@taskless-app/swarm 0.6.18 → 0.6.20

package/dist/cli.js

@@ -472,6 +472,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() : "";
@@ -1471,6 +1557,7 @@ var init_src = __esm({
     init_timeline();
     init_reviewPhase();
     init_mergeGate();
+    init_mergeQueue();
     init_verifyVerdict();
     init_modelPolicy();
     init_status();
@@ -2080,7 +2167,7 @@ function tokenFromFile() {
     return "";
   }
 }
-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";
@@ -2129,6 +2216,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}`;
@@ -2153,6 +2241,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 || join4(SWARM_HOME, "review-cutoff.json");
     SWARM_REVIEW_CAP = Math.trunc(envNum("SWARM_REVIEW_CAP", 1));
     SWARM_STORM_URL = process.env.SWARM_STORM_URL || "";
@@ -2284,7 +2373,7 @@ var init_package = __esm({
   "package.json"() {
     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: [
@@ -2334,7 +2423,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "9531f684d8a7c6c4c3595f0c57e4aebce0038ac1"
+      gitHead: "2d05a2e2b7c197ab916f7ff756e3a829b138df16"
     };
   }
 });
@@ -2501,8 +2590,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);
@@ -5172,18 +5261,18 @@ 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 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;
@@ -8469,6 +8558,11 @@ init_config();
 
 // src/mergeGate.ts
 init_src();
+
+// src/mergeQueue.ts
+init_src();
+
+// src/prNumber.ts
 function prNumberOf(ref) {
   const s = (ref || "").trim();
   if (!s) return null;
@@ -8477,6 +8571,76 @@ 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 };
+}
+
+// src/mergeGate.ts
 function findRunByPr(runs, ref) {
   const num = prNumberOf(ref);
   if (num == null) return null;
@@ -8488,17 +8652,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: {
@@ -8511,6 +8692,7 @@ function makeMergeGateResolver(deps) {
       }
     };
   };
+  return { gate, queue: queueFor };
 }
 
 // src/web.ts
@@ -10841,12 +11023,15 @@ async function previousHooksPath(worktree) {
 }
 async function removeWorktree(repo, path) {
   const branch = (await $5({ reject: false })`git -C ${path} symbolic-ref --quiet --short HEAD`).stdout.trim();
+  await releaseWorktree(repo, path);
+  if (branch) await $5({ reject: false })`git -C ${repo} branch -D ${branch}`;
+}
+async function releaseWorktree(repo, path) {
   await cleanupWorktreeProcesses(path);
   await detachWorktree(repo, path);
-  if (branch) await $5({ reject: false })`git -C ${repo} branch -D ${branch}`;
 }
 async function worktreeDirty(path) {
-  const st = await $5({ reject: false })`git -C ${path} status --porcelain`;
+  const st = await $5({ 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;