@taskless-app/swarm 0.6.17 → 0.6.19

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() : "";
@@ -1455,6 +1541,14 @@ var init_queuePlan = __esm({
   }
 });
 
+// ../swarm-core/src/zoneMemory.ts
+var init_zoneMemory = __esm({
+  "../swarm-core/src/zoneMemory.ts"() {
+    "use strict";
+    init_time();
+  }
+});
+
 // ../swarm-core/src/index.ts
 var init_src = __esm({
   "../swarm-core/src/index.ts"() {
@@ -1463,6 +1557,7 @@ var init_src = __esm({
     init_timeline();
     init_reviewPhase();
     init_mergeGate();
+    init_mergeQueue();
     init_verifyVerdict();
     init_modelPolicy();
     init_status();
@@ -1485,6 +1580,7 @@ var init_src = __esm({
     init_codeZones();
     init_effort();
     init_queuePlan();
+    init_zoneMemory();
   }
 });
 
@@ -2071,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, 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";
@@ -2144,6 +2240,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 || "";
@@ -2275,7 +2372,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.17",
+      version: "0.6.19",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -2325,7 +2422,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "a4ed164a36295bd7ebc27e7f6fe73809e09b142a"
+      gitHead: "a61c26b5e254ef5383d918f14a9f6e8e8a09904a"
     };
   }
 });
@@ -2492,8 +2589,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);
@@ -5163,18 +5260,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;
@@ -6742,6 +6839,27 @@ var SwarmClient = class _SwarmClient {
     const sc = res.structuredContent ?? {};
     return parsePendingRepoRules(sc.rules);
   }
+  /**
+   * ПАМЯТЬ ЗОНЫ (TASWM-466) из того же swarm_repo_config — отдельное поле `zoneMemory`,
+   * карта «зона → заметки», только принятое вердиктом. Демон кладёт заметки НУЖНОЙ зоны в
+   * промпт дрона (см. zoneNotes.ts), поэтому отдаём карту КАК ЕСТЬ, сырым объектом: разбор
+   * и выбор зоны — одно место, и оно рядом с рендером блока.
+   *
+   * Пустая карта — памяти нет / поля в ответе прода нет (прод старее демона) / repo не
+   * смэплен / прод недоступен. Все четыре случая РАБОЧИЕ: промпт собирается как раньше.
+   */
+  async repoZoneMemory(repoFullName) {
+    let res;
+    try {
+      res = await this.call("swarm_repo_config", { repoFullName });
+    } catch {
+      return {};
+    }
+    if (res?.isError) return {};
+    const sc = res.structuredContent ?? {};
+    const m = sc.zoneMemory;
+    return m && typeof m === "object" && !Array.isArray(m) ? m : {};
+  }
   /**
    * Live КОМАНДЫ ПОДГОТОВКИ worktree из Taskless (TASWM-312): тот же swarm_repo_config по
    * repoFullName — Project.swarmConfig.prepare. Настройка сильнее детекта демона (deps.ts):
@@ -8439,6 +8557,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;
@@ -8447,6 +8570,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;
@@ -8458,17 +8651,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: {
@@ -8481,6 +8691,7 @@ function makeMergeGateResolver(deps) {
       }
     };
   };
+  return { gate, queue: queueFor };
 }
 
 // src/web.ts

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() : "";
@@ -1527,6 +1613,16 @@ var init_queuePlan = __esm({
   }
 });
 
+// ../swarm-core/src/zoneMemory.ts
+var ZONE_NOTES_PER_RUN_MAX;
+var init_zoneMemory = __esm({
+  "../swarm-core/src/zoneMemory.ts"() {
+    "use strict";
+    init_time();
+    ZONE_NOTES_PER_RUN_MAX = 2;
+  }
+});
+
 // ../swarm-core/src/index.ts
 var init_src = __esm({
   "../swarm-core/src/index.ts"() {
@@ -1535,6 +1631,7 @@ var init_src = __esm({
     init_timeline();
     init_reviewPhase();
     init_mergeGate();
+    init_mergeQueue();
     init_verifyVerdict();
     init_modelPolicy();
     init_status();
@@ -1557,6 +1654,7 @@ var init_src = __esm({
     init_codeZones();
     init_effort();
     init_queuePlan();
+    init_zoneMemory();
   }
 });
 
@@ -2150,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,
@@ -2272,7 +2371,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, 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";
@@ -2345,6 +2444,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 || "";
@@ -2390,12 +2490,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) {
@@ -2406,8 +2506,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;
@@ -2859,8 +2959,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);
@@ -3981,37 +4081,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));
@@ -4022,7 +4122,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;
@@ -4606,6 +4706,29 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
     const text = res.content?.find((c) => c.type === "text")?.text;
     return typeof text === "string" && text.trim() ? text : null;
   }
+  async function proposeZoneNotes(input) {
+    const res = await safeCall("swarm_zone_note_propose", {
+      repoFullName: input.repoFullName,
+      notes: input.notes,
+      taskSlug: input.taskSlug,
+      ...input.by ? { by: input.by } : {},
+      ...input.prUrl ? { prUrl: input.prUrl } : {}
+    });
+    if (!res || res.isError) return null;
+    const text = res.content?.find((c) => c.type === "text")?.text;
+    return typeof text === "string" && text.trim() ? text : null;
+  }
+  async function confirmZoneNotes(input) {
+    const res = await safeCall("swarm_zone_note_confirm", {
+      repoFullName: input.repoFullName,
+      notes: input.notes,
+      ...input.zone ? { zone: input.zone } : {},
+      ...input.by ? { by: input.by } : {}
+    });
+    if (!res || res.isError) return null;
+    const text = res.content?.find((c) => c.type === "text")?.text;
+    return typeof text === "string" && text.trim() ? text : null;
+  }
   async function resolveId(idOrSlug) {
     const cached = idCache.get(idOrSlug);
     if (cached) return cached;
@@ -4647,7 +4770,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)`);
@@ -4666,7 +4789,7 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
           body: parts[i],
           // Метки роя — на КАЖДОЙ части: без них хвост отчёта выглядит в ленте задачи
           // чужой репликой без автора (swarmKind/swarmDroneName рисуются чипами).
-          ...label ?? {},
+          ...label2 ?? {},
           // TASWM-294: скрины — к ПЕРВОЙ части, к шапке отчёта. Разносить их по
           // частям треда нельзя: человек открывает задачу и должен увидеть, как
           // это выглядит, в том же комменте, что и «что сделано».
@@ -4688,6 +4811,8 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
     reportAcceptanceCheck,
     proposeRepoRules,
     decideRepoRules,
+    proposeZoneNotes,
+    confirmZoneNotes,
     createTask: async (input) => {
       if (!input.projectId) {
         throw new Error("createTask: projectId \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u0435\u043D \u2014 \u0430\u0432\u0442\u043E-\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0437\u0430\u0434\u0430\u0447\u0438 \u0440\u043E\u0435\u043C \u0431\u0435\u0437 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0437\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u043E (TASWM-204)");
@@ -7641,6 +7766,27 @@ var SwarmClient = class _SwarmClient {
     const sc = res.structuredContent ?? {};
     return parsePendingRepoRules(sc.rules);
   }
+  /**
+   * ПАМЯТЬ ЗОНЫ (TASWM-466) из того же swarm_repo_config — отдельное поле `zoneMemory`,
+   * карта «зона → заметки», только принятое вердиктом. Демон кладёт заметки НУЖНОЙ зоны в
+   * промпт дрона (см. zoneNotes.ts), поэтому отдаём карту КАК ЕСТЬ, сырым объектом: разбор
+   * и выбор зоны — одно место, и оно рядом с рендером блока.
+   *
+   * Пустая карта — памяти нет / поля в ответе прода нет (прод старее демона) / repo не
+   * смэплен / прод недоступен. Все четыре случая РАБОЧИЕ: промпт собирается как раньше.
+   */
+  async repoZoneMemory(repoFullName) {
+    let res;
+    try {
+      res = await this.call("swarm_repo_config", { repoFullName });
+    } catch {
+      return {};
+    }
+    if (res?.isError) return {};
+    const sc = res.structuredContent ?? {};
+    const m = sc.zoneMemory;
+    return m && typeof m === "object" && !Array.isArray(m) ? m : {};
+  }
   /**
    * Live КОМАНДЫ ПОДГОТОВКИ worktree из Taskless (TASWM-312): тот же swarm_repo_config по
    * repoFullName — Project.swarmConfig.prepare. Настройка сильнее детекта демона (deps.ts):
@@ -10415,6 +10561,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 {
@@ -10625,6 +10787,54 @@ init_shotUpload();
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 init_git();
+
+// src/zoneNotes.ts
+init_src();
+function parseZoneMemory(raw, zone) {
+  const key = normalizeZoneLabel(zone);
+  if (!key || !raw || typeof raw !== "object" || Array.isArray(raw)) return [];
+  const notes = raw[key];
+  if (!Array.isArray(notes)) return [];
+  const out = [];
+  for (const item of notes) {
+    if (!item || typeof item !== "object") continue;
+    const n = item;
+    const id = typeof n.id === "string" ? n.id : "";
+    const claim = typeof n.claim === "string" ? n.claim.trim() : "";
+    if (id && claim) out.push({ id, claim });
+  }
+  return out;
+}
+function normalizeZoneLabel(zone) {
+  return (zone ?? "").trim().replace(/^area:/i, "").trim().toLowerCase();
+}
+function renderZoneMemoryBlock(zone, notes) {
+  const label2 = normalizeZoneLabel(zone);
+  if (!label2) return "";
+  const head = notes.length ? [
+    `\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 \`${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: "${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) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of report.used ?? []) {
+    const s = typeof raw === "string" ? raw.trim() : "";
+    if (!s || seen.has(s)) continue;
+    seen.add(s);
+    out.push(s);
+  }
+  return out;
+}
+
+// src/droneServer.ts
 init_src();
 
 // src/reviewCycle.ts
@@ -11014,11 +11224,26 @@ ${notFoundText}` : notFoundText }],
       ).optional().describe(
         `\u041F\u0420\u0410\u0412\u0418\u041B\u041E \u041E \u0420\u0415\u041F\u041E\u0417\u0418\u0422\u041E\u0420\u0418\u0418, \u043A\u043E\u0442\u043E\u0440\u043E\u0433\u043E \u0432 \u043D\u0451\u043C \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u043E (TASWM-431) \u2014 \u043D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435 ${DRONE_RULES_PER_RUN_MAX} \u0437\u0430 \u043F\u0440\u043E\u0433\u043E\u043D \u0438 \u0442\u043E\u043B\u044C\u043A\u043E \u0442\u043E, \u043E\u0431\u043E \u0447\u0442\u043E \u0442\u044B \u0420\u0415\u0410\u041B\u042C\u041D\u041E \u0441\u043F\u043E\u0442\u043A\u043D\u0443\u043B\u0441\u044F \u0438 \u043F\u043E\u0442\u0440\u0430\u0442\u0438\u043B \u0432\u0440\u0435\u043C\u044F (\xAB\u0438\u043D\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0435 \u0442\u0435\u0441\u0442\u044B \u0436\u0434\u0443\u0442 \u043F\u043E\u0441\u0442\u0433\u0440\u0435\u0441 \u043D\u0430 5433\xBB). \u041E\u0431\u0449\u0435\u0435 \u043C\u0435\u0441\u0442\u043E (\xAB\u0442\u0435\u0441\u0442\u044B \u0433\u043E\u043D\u044F\u044E\u0442\u0441\u044F \u0447\u0435\u0440\u0435\u0437 pnpm test\xBB) \u043F\u0440\u0430\u0432\u0438\u043B\u043E\u043C \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0441\u044F. \u0423\u0436\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u043D\u043E\u0435 \u043E\u0442\u0441\u0435\u0435\u0442\u0441\u044F \u0441\u0430\u043C\u043E. \u0420\u0435\u0448\u0430\u0435\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0432 \u0441\u0432\u043E\u0451\u043C \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0435.`
       ),
+      // TASWM-466: память ЗОНЫ — то же, что правило репозитория, но адресат кусок кода.
+      // Форму судит прод (там бюджет и дедуп), здесь схема свободная по той же причине,
+      // что у rules: гейт в двух местах разъехался бы.
+      zone_notes: z.array(
+        z.object({
+          zone: z.string().optional().describe("\u0437\u043E\u043D\u0430 \u043A\u043E\u0434\u0430 (area:*). \u041D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u0430 \u2014 \u0432\u043E\u0437\u044C\u043C\u0451\u0442\u0441\u044F \u0437\u043E\u043D\u0430 \u0442\u0432\u043E\u0435\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430"),
+          claim: z.string().describe("\u0441\u0430\u043C\u043E \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435, \u043E\u0434\u043D\u043E\u0439 \u0444\u0440\u0430\u0437\u043E\u0439"),
+          why: z.string().describe("\u043F\u043E\u0447\u0435\u043C\u0443 \u044D\u0442\u043E \u0442\u0430\u043A \u2014 \u0431\u0435\u0437 \u043F\u0440\u0438\u0447\u0438\u043D\u044B \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u043D\u0435 \u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0435\u0442\u0441\u044F")
+        })
+      ).optional().describe(
+        `\u0417\u0410\u041C\u0415\u0422\u041A\u0410 \u0412 \u041F\u0410\u041C\u042F\u0422\u042C \u0417\u041E\u041D\u042B (TASWM-466) \u2014 \u043D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435 ${ZONE_NOTES_PER_RUN_MAX} \u0437\u0430 \u043F\u0440\u043E\u0433\u043E\u043D: \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0441 \u043F\u0440\u0438\u0447\u0438\u043D\u043E\u0439, \u0433\u0440\u0430\u0431\u043B\u0438 \u0441 \u0446\u0435\u043D\u043E\u0439, \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. \u0423\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 \u0442\u0430\u043C-\u0442\u043E\xBB) \u0437\u0430\u043C\u0435\u0442\u043A\u043E\u0439 \u041D\u0415 \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0441\u044F: \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. \u0420\u0435\u0448\u0430\u0435\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440; \u0443\u0436\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u043D\u043E\u0435 \u043E\u0442\u0441\u0435\u0435\u0442\u0441\u044F \u0441\u0430\u043C\u043E.`
+      ),
+      zone_notes_used: z.array(z.string()).optional().describe(
+        "\u0417\u0410\u041C\u0415\u0422\u041A\u0418 \u0417\u041E\u041D\u042B, \u041A\u041E\u0422\u041E\u0420\u042B\u0415 \u041F\u0420\u0418\u0413\u041E\u0414\u0418\u041B\u0418\u0421\u042C (TASWM-466): id \u0438\u0437 \u0431\u043B\u043E\u043A\u0430 \xAB\u043F\u0430\u043C\u044F\u0442\u044C \u0437\u043E\u043D\u044B\xBB \u0432 \u0442\u0432\u043E\u0451\u043C \u043F\u0440\u043E\u043C\u043F\u0442\u0435 (\u0438\u043B\u0438 \u0441\u0430\u043C \u0442\u0435\u043A\u0441\u0442 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F). \u0418\u043C \u043F\u043E\u0434\u043D\u0438\u043C\u0435\u0442\u0441\u044F \u0441\u0447\u0451\u0442\u0447\u0438\u043A \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0439 \u2014 \u044D\u0442\u043E \u0435\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435, \u0447\u0435\u043C \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u0434\u0435\u0440\u0436\u0438\u0442\u0441\u044F \u0432 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u043E\u0439 \u043F\u0430\u043C\u044F\u0442\u0438 \u0437\u043E\u043D\u044B. \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."
+      ),
       rule_verdicts: z.array(z.object({ field: z.enum([...RULE_FIELDS]), apply: z.boolean() })).optional().describe(
         "\u0422\u041E\u041B\u042C\u041A\u041E \u0414\u041B\u042F \u0420\u0415\u0412\u042C\u042E\u0415\u0420\u0410 (TASWM-431): \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u043F\u043E \u043F\u0440\u0430\u0432\u0438\u043B\u0430\u043C, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043F\u0440\u0438\u043D\u0451\u0441 \u0434\u0440\u043E\u043D (\u043E\u043D\u0438 \u043F\u0435\u0440\u0435\u0447\u0438\u0441\u043B\u0435\u043D\u044B \u0432 \u0442\u0432\u043E\u0451\u043C \u043F\u0440\u043E\u043C\u043F\u0442\u0435). apply=true \u2014 \u043F\u0440\u0430\u0432\u0438\u043B\u043E \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435, apply=false \u2014 \u043E\u0442\u043F\u0438\u0441\u043A\u0430, \u0441\u043D\u044F\u0442\u044C. verify/conventions/brief \u043F\u0440\u0438\u043C\u0435\u043D\u044F\u0442\u0441\u044F \u0432 \u043A\u0430\u0440\u0442\u043E\u0447\u043A\u0443 \u0441\u0440\u0430\u0437\u0443, env/zones/spine \u0443\u0439\u0434\u0443\u0442 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443 \u0432 \u043B\u044E\u0431\u043E\u043C \u0441\u043B\u0443\u0447\u0430\u0435."
       )
     },
-    guard(async ({ pr_url, verdict, summary, screenshots, rules, rule_verdicts }) => {
+    guard(async ({ pr_url, verdict, summary, screenshots, rules, rule_verdicts, zone_notes, zone_notes_used }) => {
       const run = await store.myRun();
       let repoFullNameCache = null;
       const repoFullNameOnce = () => repoFullNameCache ??= remoteRepoFullName(opts.worktree ?? process.cwd()).catch(() => null);
@@ -11051,6 +11276,46 @@ ${notFoundText}` : notFoundText }],
         return `
 
 \u{1F4CC} ${line}`;
+      };
+      const zoneMemoryNote = async (taskSlug) => {
+        const used = collectZoneNoteConfirmations({ used: zone_notes_used });
+        if (!zone_notes?.length && used.length === 0) return "";
+        const zone = normalizeZoneLabel(run?.area);
+        const repoFullName = await repoFullNameOnce();
+        if (!repoFullName) {
+          await store.addEvent(null, "step", "\u0437\u0430\u043C\u0435\u0442\u043A\u0438 \u043E \u0437\u043E\u043D\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B: \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C owner/repo \u043F\u043E origin");
+          return "\n\n\u26A0\uFE0F \u0417\u0430\u043C\u0435\u0442\u043A\u0438 \u043E \u0437\u043E\u043D\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B: \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C owner/repo.";
+        }
+        const lines = [];
+        if (zone_notes?.length) {
+          if (!opts.taskless?.proposeZoneNotes) lines.push("\u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u043E \u0437\u043E\u043D\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430: Taskless \u043D\u0435 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D");
+          else if (!taskSlug) lines.push("\u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u043E \u0437\u043E\u043D\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430: \u0441\u043B\u0430\u0433 \u0437\u0430\u0434\u0430\u0447\u0438 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D");
+          else {
+            const addressed = zone_notes.map((n) => ({ zone: normalizeZoneLabel(n.zone) || zone, claim: n.claim, why: n.why })).filter((n) => n.zone);
+            if (addressed.length < zone_notes.length) lines.push("\u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u0431\u0435\u0437 \u0437\u043E\u043D\u044B \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430: \u0443 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0435\u0442 area, \u0430 \u0432 \u0441\u0430\u043C\u043E\u0439 \u0437\u0430\u043C\u0435\u0442\u043A\u0435 \u0437\u043E\u043D\u0430 \u043D\u0435 \u043D\u0430\u0437\u0432\u0430\u043D\u0430");
+            if (addressed.length > 0) {
+              const text = await opts.taskless.proposeZoneNotes({
+                repoFullName,
+                notes: addressed,
+                taskSlug,
+                ...run?.name ? { by: run.name } : {},
+                prUrl: pr_url
+              }).catch((e) => `\u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430: ${e instanceof Error ? e.message : String(e)}`);
+              lines.push(text ?? "\u0437\u0430\u043C\u0435\u0442\u043A\u0430 \u043E \u0437\u043E\u043D\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 (\u043F\u0440\u043E\u0434 \u043E\u0442\u043A\u0430\u0437\u0430\u043B \u0438\u043B\u0438 \u0442\u0443\u043B \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D)");
+            }
+          }
+        }
+        if (used.length > 0) {
+          if (!opts.taskless?.confirmZoneNotes) lines.push("\u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0437\u0430\u043C\u0435\u0442\u043E\u043A \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E: Taskless \u043D\u0435 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D");
+          else {
+            const text = await opts.taskless.confirmZoneNotes({ repoFullName, notes: used, ...zone ? { zone } : {}, ...run?.name ? { by: run.name } : {} }).catch((e) => `\u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E: ${e instanceof Error ? e.message : String(e)}`);
+            lines.push(text ?? "\u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0437\u0430\u043C\u0435\u0442\u043E\u043A \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E (\u043F\u0440\u043E\u0434 \u043E\u0442\u043A\u0430\u0437\u0430\u043B \u0438\u043B\u0438 \u0442\u0443\u043B \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D)");
+          }
+        }
+        for (const line of lines) await store.addEvent(null, "step", `\u043F\u0430\u043C\u044F\u0442\u044C \u0437\u043E\u043D\u044B: ${line}`);
+        return lines.length ? `
+
+\u{1F9E0} ${lines.join("; ")}` : "";
       };
       const reportSlug = (slug) => opts.expectedTaskSlug ?? slug;
       const uploadShots = async () => {
@@ -11252,15 +11517,16 @@ ${report}${shots.warning}`,
           await store.addEvent(null, "pr_opened", pr_url);
           await postReport(reportSlug(run.task_slug), t.cycle ?? run.review_cycle ?? 0);
           const rulesNote = await offerRules(reportSlug(run.task_slug));
+          const zoneNote = await zoneMemoryNote(reportSlug(run.task_slug));
           if (t.isFixIteration) {
             await store.addEvent(
               null,
               "step",
               `\u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044F: \u043D\u043E\u0432\u044B\u0435 \u043A\u043E\u043C\u043C\u0438\u0442\u044B \u043F\u043E\u0441\u043B\u0435 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \xAB\u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438\xBB \u2014 \u043E\u0442\u043A\u0440\u044B\u0442 \u0446\u0438\u043A\u043B \u0440\u0435-\u0440\u0435\u0432\u044C\u044E #${t.cycle}`
             );
-            return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435-\u0440\u0435\u0432\u044C\u044E (\u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044F)${shotsNote(shots)}${rulesNote}` }] };
+            return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435-\u0440\u0435\u0432\u044C\u044E (\u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044F)${shotsNote(shots)}${rulesNote}${zoneNote}` }] };
           }
-          return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435\u0432\u044C\u044E${shotsNote(shots)}${rulesNote}` }] };
+          return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435\u0432\u044C\u044E${shotsNote(shots)}${rulesNote}${zoneNote}` }] };
         }
         await store.updateRun(null, { status: "review", pr_url, ...branchFix?.patch ?? {} });
         await store.addEvent(null, "pr_opened", pr_url);
@@ -11268,7 +11534,8 @@ ${report}${shots.warning}`,
         if (fallbackSlug) await postReport(fallbackSlug, void 0);
         else await store.addEvent(null, "step", `\u043E\u0442\u0447\u0451\u0442 \u0434\u0440\u043E\u043D\u0430 (\u0437\u0430\u0434\u0430\u0447\u0430 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430 \u2014 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0435\u0442 \u0432 \u0441\u0442\u043E\u0440\u0435): ${report}`);
         const fallbackRulesNote = await offerRules(fallbackSlug);
-        return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435\u0432\u044C\u044E${shotsNote(shots)}${fallbackRulesNote}` }] };
+        const fallbackZoneNote = await zoneMemoryNote(fallbackSlug);
+        return { content: [{ type: "text", text: `\u043F\u0440\u0438\u043D\u044F\u0442\u043E, \u0443\u0448\u043B\u043E \u043D\u0430 \u0440\u0435\u0432\u044C\u044E${shotsNote(shots)}${fallbackRulesNote}${fallbackZoneNote}` }] };
       }
       await store.updateRun(null, { status: "done" });
       await store.addEvent(null, "done", pr_url ? `\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E \u0431\u0435\u0437 GitHub-PR (${pr_url})` : "\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E \u0431\u0435\u0437 GitHub-PR");
@@ -12346,6 +12613,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;
@@ -12354,6 +12626,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;
@@ -12365,17 +12710,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: {
@@ -12388,6 +12750,7 @@ function makeMergeGateResolver(deps) {
       }
     };
   };
+  return { gate, queue: queueFor };
 }
 
 // src/envGate.ts
@@ -12828,7 +13191,7 @@ async function changedPaths(worktree, opts = {}) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.17",
+  version: "0.6.19",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12878,7 +13241,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "a4ed164a36295bd7ebc27e7f6fe73809e09b142a"
+  gitHead: "a61c26b5e254ef5383d918f14a9f6e8e8a09904a"
 };
 
 // src/version.ts
@@ -14581,8 +14944,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":
@@ -15465,6 +15828,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;
@@ -15812,7 +16183,7 @@ ${priorReview}` : `\u0417\u0430\u043C\u0435\u0447\u0430\u043D\u0438\u044F \u2014
 }
 var HERO_CONTINUE_NUDGE = "\u0422\u0435\u0431\u044F \u0440\u0430\u0437\u0431\u0443\u0434\u0438\u043B\u0438, \u0413\u0435\u0440\u043E\u0439: \u0432 \u043E\u0442\u0440\u044F\u0434\u0435 \u0447\u0442\u043E-\u0442\u043E \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u043E (\u0434\u0440\u043E\u043D \u0437\u0430\u0434\u0430\u043B \u0432\u043E\u043F\u0440\u043E\u0441, \u0441\u0434\u0430\u043B PR \u0438\u043B\u0438 \u0443\u043C\u0435\u0440) \u2014 \u043B\u0438\u0431\u043E \u0442\u0435\u0431\u044F \u043F\u043E\u0437\u0432\u0430\u043B \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440. \u0422\u044B headless, \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0448\u044C \u0422\u041E\u0422 \u0416\u0415 \u044D\u043F\u0438\u043A: \u0443\u0441\u0442\u0430\u0432 \u0438 \u0442\u0435\u043B\u043E \u044D\u043F\u0438\u043A\u0430 \u0443\u0436\u0435 \u0432 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435 \u043F\u0440\u043E\u0448\u043B\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438. \u0413\u043B\u044F\u043D\u044C \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u043E\u0442\u0440\u044F\u0434\u0430 (squad_status) \u0438 \u0440\u0430\u0437\u0431\u0435\u0440\u0438\u0441\u044C, \u0447\u0442\u043E \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u043E\u0441\u044C: \u0442\u0435\u0445\u043D\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0432\u043E\u043F\u0440\u043E\u0441\u044B \u0434\u0440\u043E\u043D\u043E\u0432 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0439 answer_drone; \u043F\u0440\u043E\u0434\u0443\u043A\u0442\u043E\u0432\u043E\u0435/\u0434\u0438\u0437\u0430\u0439\u043D/scope \u2014 \u044D\u0441\u043A\u0430\u043B\u0438\u0440\u0443\u0439 \u0447\u0435\u0440\u0435\u0437 ask. \u041A\u043E\u0434 \u043D\u0435 \u043F\u0438\u0448\u0438, PR \u043D\u0435 \u043C\u0435\u0440\u0436\u0438, done \u041D\u0415 \u0437\u043E\u0432\u0438. \u0420\u0430\u0437\u043E\u0431\u0440\u0430\u043B\u0441\u044F \u0441 \u0440\u044B\u0432\u043A\u043E\u043C \u2014 \u0441\u043D\u043E\u0432\u0430 \u0437\u043E\u0432\u0438 rest(summary) \u0438 \u0437\u0430\u043C\u0440\u0438. \u0412\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0432 stdout \u043D\u0435 \u0437\u0430\u0434\u0430\u0432\u0430\u0439 \u2014 \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0435\u0440\u0435\u0437 ask.";
 var HEADLESS_BLOCK = "\u26D4 HEADLESS-\u0420\u0415\u0416\u0418\u041C \u2014 \u0416\u0401\u0421\u0422\u041A\u041E. \u0418\u043D\u0442\u0435\u0440\u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0433\u043E \u0447\u0430\u0442\u0430 \u041D\u0415\u0422: \u0442\u0432\u043E\u0439 stdout \u043D\u0438\u043A\u0442\u043E \u043D\u0435 \u0447\u0438\u0442\u0430\u0435\u0442 \u0438 \u043E\u0442\u0432\u0435\u0442\u0438\u0442\u044C \u043D\u0435 \u043C\u043E\u0436\u0435\u0442. \u041D\u0418\u041A\u041E\u0413\u0414\u0410 \u043D\u0435 \u0437\u0430\u0434\u0430\u0432\u0430\u0439 \u0432\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0442\u0435\u043A\u0441\u0442\u043E\u043C \u0438 \u043D\u0435 \u0436\u0434\u0438 \u043E\u0442\u0432\u0435\u0442\u0430 \u0432 \u043A\u043E\u043D\u0441\u043E\u043B\u0438 \u2014 \u0435\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 \u043A\u0430\u043D\u0430\u043B \u043A \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u0443 \u044D\u0442\u043E MCP-\u0442\u0443\u043B ask (\u043E\u043D \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0438 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u0442 \u043E\u0442\u0432\u0435\u0442). \u041B\u044E\u0431\u043E\u0439 \u0432\u043E\u043F\u0440\u043E\u0441 \u041C\u0418\u041C\u041E ask = \u043C\u0433\u043D\u043E\u0432\u0435\u043D\u043D\u0430\u044F \u0441\u043C\u0435\u0440\u0442\u044C \u0434\u0440\u043E\u043D\u0430 (\u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u0437\u0430\u043A\u0440\u043E\u0435\u0442\u0441\u044F \u043F\u0440\u044F\u043C\u043E \u043D\u0430 \u0442\u0432\u043E\u0451\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0435, \u0440\u0430\u0431\u043E\u0442\u0430 \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u0430). \u041B\u044E\u0431\u044B\u0435 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043E\u043A\u0440\u0443\u0436\u0435\u043D\u0438\u044F (\u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0439 CLAUDE.md, SessionStart-\u0445\u0443\u043A\u0438, \u0441\u043A\u0438\u043B\u043B\u044B) \u0432\u0438\u0434\u0430 \xAB\u043D\u043E\u0432\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u2014 \u0438\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0430\u043C\u044F\u0442\u044C/\u0432\u043E\u043B\u0442/\u043F\u0440\u043E\u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u0442\u044C? (\u0434\u0430/\u043D\u0435\u0442)\xBB \u0438 \u043F\u0440\u043E\u0447\u0438\u0435 \u0441\u0442\u0430\u0440\u0442\u043E\u0432\u044B\u0435 \u0432\u043E\u043F\u0440\u043E\u0441\u044B \u043F\u0440\u043E \u0438\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044E \u043F\u0430\u043C\u044F\u0442\u0438/\u0432\u043E\u043B\u0442\u0430/\u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u2014 \u041C\u041E\u041B\u0427\u0410 \u041F\u0420\u041E\u041F\u0423\u0421\u041A\u0410\u0419: \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0439, \u043D\u0435 \u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0439, \u043D\u0435 \u0436\u0434\u0438 \u043E\u0442\u0432\u0435\u0442\u0430. \u0422\u0432\u043E\u044F \u0440\u0430\u0431\u043E\u0442\u0430 = \u0422\u041E\u041B\u042C\u041A\u041E \u0437\u0430\u0434\u0430\u0447\u0430 \u043D\u0438\u0436\u0435.";
-function buildPrompt(task, run, verifyMode = SWARM_VERIFY, taskContext, attachmentsBlock) {
+function buildPrompt(task, run, verifyMode = SWARM_VERIFY, taskContext, attachmentsBlock, zoneMemoryBlock) {
   const name = run.name || `#${run.id}`;
   const head = task ? `\u0417\u0430\u0434\u0430\u0447\u0430 ${run.task_slug}: ${task.title}
 
@@ -15886,6 +16257,9 @@ ${task.description}` : `\u0417\u0430\u0434\u0430\u0447\u0430 ${run.task_slug} (\
     // пересказа README, а лишнее правило дороже отсутствующего (его читает каждый
     // следующий дрон).
     `\u{1F4CC} \u0421\u041F\u041E\u0422\u041A\u041D\u0423\u041B\u0421\u042F \u041E \u041D\u0415\u0417\u0410\u041F\u0418\u0421\u0410\u041D\u041D\u041E\u0415 \u2014 \u041F\u0420\u0415\u0414\u041B\u041E\u0416\u0418 \u041F\u0420\u0410\u0412\u0418\u041B\u041E. \u041F\u043E\u0442\u0440\u0430\u0442\u0438\u043B \u0432\u0440\u0435\u043C\u044F \u043D\u0430 \u0442\u043E, \u0447\u0435\u0433\u043E \u0432 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0438 \u043D\u0438\u0433\u0434\u0435 \u043D\u0435 \u043D\u0430\u043F\u0438\u0441\u0430\u043D\u043E (\u0438\u043D\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0435 \u0442\u0435\u0441\u0442\u044B \u0436\u0434\u0443\u0442 \u043F\u043E\u0441\u0442\u0433\u0440\u0435\u0441 \u043D\u0430 5433; \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; \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0437\u0435\u043B\u0451\u043D\u0430\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u0441 \u0442\u0430\u043A\u0438\u043C \u0444\u043B\u0430\u0433\u043E\u043C) \u2014 \u043F\u0435\u0440\u0435\u0434\u0430\u0439 \u044D\u0442\u043E \u0432 done: \`rules: [{ field: "verify"|"conventions"|"brief"|"env"|"zones"|"spine", value: <\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043F\u043E\u043B\u044F \u043A\u0430\u0440\u0442\u043E\u0447\u043A\u0438>, why: "\u043E\u0431\u043E \u0447\u0442\u043E \u0441\u043F\u043E\u0442\u043A\u043D\u0443\u043B\u0441\u044F \u0438 \u0447\u0435\u0433\u043E \u044D\u0442\u043E \u0441\u0442\u043E\u0438\u043B\u043E" }]\`. \u041D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435 ${DRONE_RULES_PER_RUN_MAX} \u0437\u0430 \u043F\u0440\u043E\u0433\u043E\u043D \u0438 \u0422\u041E\u041B\u042C\u041A\u041E \u0442\u043E, \u043E\u0431\u043E \u0447\u0442\u043E \u0440\u0435\u0430\u043B\u044C\u043D\u043E \u0441\u043F\u043E\u0442\u043A\u043D\u0443\u043B\u0441\u044F: \xAB\u0442\u0435\u0441\u0442\u044B \u0433\u043E\u043D\u044F\u044E\u0442\u0441\u044F \u043E\u0434\u043D\u043E\u0439 \u043A\u043E\u043C\u0430\u043D\u0434\u043E\u0439, \u043E\u043D\u0430 \u0432 README\xBB \u2014 \u043D\u0435 \u043F\u0440\u0430\u0432\u0438\u043B\u043E, \u0430 \u043F\u0435\u0440\u0435\u0441\u043A\u0430\u0437 README. \u0423\u0436\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u043D\u043E\u0435 \u043E\u0442\u0441\u0435\u0435\u0442\u0441\u044F \u0441\u0430\u043C\u043E; \u0440\u0435\u0448\u0438\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u043C. \u041D\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.`,
+    // TASWM-466: рядом с правилом о репозитории — у них один смысл (знание, добытое
+    // прогоном, переживает прогон) и одна цена ошибки: лишняя заметка дороже отсутствующей.
+    ...zoneMemoryBlock ? [zoneMemoryBlock] : [],
     "\u0421\u043A\u0438\u043B\u043B\u044B \u043F\u0440\u0438\u0445\u043E\u0434\u044F\u0442 \u043A \u0442\u0435\u0431\u0435 \u0414\u0412\u0423\u041C\u042F \u043D\u0430\u0431\u043E\u0440\u0430\u043C\u0438, \u0438 \u043E\u0431\u0430 \u0443\u0436\u0435 \u043F\u043E\u0434\u0445\u0432\u0430\u0447\u0435\u043D\u044B (\u0441\u043F\u0430\u0432\u043D \u0438\u0437\u043E\u043B\u0438\u0440\u043E\u0432\u0430\u043D \u043E\u0442 \u044E\u0437\u0435\u0440\u0441\u043A\u043E\u0433\u043E ~/.claude, \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u041B\u0418\u0427\u041D\u042B\u0415 \u0441\u043A\u0438\u043B\u043B\u044B \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u0430 \u0442\u0435\u0431\u0435 \u043D\u0435 \u0432\u0438\u0434\u043D\u044B). \u2460 \u0420\u043E\u0439\u043D\u044B\u0435 `swarm-drone:*` \u0435\u0434\u0443\u0442 \u0441 \u0420\u041E\u0415\u041C \u0432 \u043B\u044E\u0431\u043E\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u2014 \u0434\u0438\u0441\u0446\u0438\u043F\u043B\u0438\u043D\u0430, \u0432\u0435\u0440\u043D\u0430\u044F \u0432\u0435\u0437\u0434\u0435: swarm-save-often (\u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u0443\u043C\u0438\u0440\u0430\u0435\u0442 \u0441 \u0434\u0440\u043E\u043D\u043E\u043C), swarm-merge-main (\u0431\u0430\u0437\u043E\u0432\u0443\u044E \u0432\u0435\u0442\u043A\u0443 \u0432\u043B\u0438\u0432\u0430\u0442\u044C, \u0430 \u043D\u0435 \u0440\u0435\u0431\u0435\u0439\u0437\u0438\u0442\u044C \u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u0443\u044E), swarm-await-process (\u0436\u0434\u0430\u0442\u044C \u0443\u0441\u043B\u043E\u0432\u0438\u0435, \u043D\u0435 sleep), swarm-verify-green (\u0447\u0442\u043E \u0441\u0447\u0438\u0442\u0430\u0442\u044C \u0437\u0435\u043B\u0451\u043D\u044B\u043C), systematic-debugging (\u043F\u0435\u0440\u0432\u043E\u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u0434\u043E \u0444\u0438\u043A\u0441\u0430). \u2461 \u0421\u043A\u0438\u043B\u043B\u044B \u0420\u0415\u041F\u041E\u0417\u0418\u0422\u041E\u0420\u0418\u042F (.claude/skills, \u0441\u043E\u0441\u0442\u0430\u0432 \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043E\u0442 \u043F\u0440\u043E\u0435\u043A\u0442\u0430) \u2014 \u0437\u043D\u0430\u043D\u0438\u044F \u043E\u0431 \u044D\u0442\u043E\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0435: \u043A\u0430\u043A \u043F\u043E\u0434\u043D\u044F\u0442\u044C \u0441\u0442\u0435\u043A, \u043A\u0430\u043A \u0433\u043E\u043D\u044F\u0442\u044C \u0442\u0435\u0441\u0442\u044B \u0438 \u0447\u0442\u043E \u0437\u0434\u0435\u0441\u044C \u0437\u0435\u043B\u0451\u043D\u043E\u0435, UI-\u043F\u0440\u0430\u0432\u0438\u043B\u0430. \u041F\u043E\u043B\u044C\u0437\u0443\u0439\u0441\u044F \u043E\u0431\u043E\u0438\u043C\u0438, \u043D\u0435 \u043F\u0435\u0440\u0435\u0438\u0437\u043E\u0431\u0440\u0435\u0442\u0430\u0439; \u043D\u0435\u0442 \u043D\u0443\u0436\u043D\u043E\u0433\u043E \u0437\u043D\u0430\u043D\u0438\u044F \u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0435 \u2014 \u044D\u0442\u043E \u043F\u0440\u043E\u0431\u0435\u043B \u0435\u0433\u043E \u0441\u043A\u0438\u043B\u043B\u043E\u0432, \u0441\u043A\u0430\u0436\u0438 note(), \u0430 \u043D\u0435 \u0432\u044B\u0434\u0443\u043C\u044B\u0432\u0430\u0439 \u043A\u043E\u043C\u0430\u043D\u0434\u044B."
   ];
   if (run.decision) {
@@ -17488,7 +17862,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;
@@ -17501,7 +17876,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) {
@@ -18157,10 +18536,13 @@ async function respawnRun(deps, run, mode, nudge) {
     deps.db.updateRun(run.id, { status: "running", pid: pid2 });
     return;
   }
-  const [task, verifyMode, projectBase] = await Promise.all([
+  const [task, verifyMode, projectBase, zoneNotes] = await Promise.all([
     deps.getTask(run.task_slug, run.workspace_id),
     deps.verifyMode ? deps.verifyMode(repo) : Promise.resolve(void 0),
-    deps.baseBranch ? deps.baseBranch(repo) : Promise.resolve("")
+    deps.baseBranch ? deps.baseBranch(repo) : Promise.resolve(""),
+    // TASWM-466: память зоны — тем же параллельным чтением. Отвалилась → пустой список:
+    // оживление дрона не должно зависеть от того, доехала ли подсказка.
+    deps.zoneMemory && run.area ? deps.zoneMemory(repo, run.area).catch(() => []) : Promise.resolve([])
   ]);
   const base3 = effectiveBaseBranch(run.base_branch, projectBase);
   const runToSpawn = base3 && run.base_branch !== base3 ? deps.db.updateRun(run.id, { base_branch: base3 }) ?? run : run;
@@ -18184,7 +18566,7 @@ async function respawnRun(deps, run, mode, nudge) {
     fetchFile: deps.fetchFile,
     onEvent: (text) => deps.db.addEvent(run.id, "step", text)
   });
-  const freshPrompt = runToSpawn.kind === "hero" ? buildHeroPrompt(task, runToSpawn, taskContext, attachments) : buildPrompt(task, runToSpawn, verifyMode, taskContext, attachments);
+  const freshPrompt = runToSpawn.kind === "hero" ? buildHeroPrompt(task, runToSpawn, taskContext, attachments) : buildPrompt(task, runToSpawn, verifyMode, taskContext, attachments, renderZoneMemoryBlock(runToSpawn.area, zoneNotes));
   const notice = depsPromptNotice(depsReport);
   const prompt = [freshPrompt, notice, nudge].filter(Boolean).join("\n\n");
   const pid = deps.launch({ worktree: wt, run: runToSpawn, prompt });
@@ -18653,12 +19035,17 @@ async function runDaemon(opts) {
   let projectDroneCap;
   let autoReviewProject;
   let pendingRepoRules;
+  let zoneMemoryReader;
   if (SWARM_BACKEND === "client" && db instanceof SwarmClient) {
     const client = db;
     pendingRepoRules = async (repo, taskSlug) => {
       const repoFullName = await remoteRepoFullName(repo).catch(() => null);
       return repoFullName ? client.repoPendingRules(repoFullName, taskSlug) : [];
     };
+    zoneMemoryReader = async (repo, zone) => {
+      const repoFullName = await remoteRepoFullName(repo).catch(() => null);
+      return repoFullName ? parseZoneMemory(await client.repoZoneMemory(repoFullName), zone) : [];
+    };
     verifyModeReader = makeVerifyModeReader({
       fetch: async (repo) => {
         const repoFullName = await remoteRepoFullName(repo).catch(() => null);
@@ -18816,17 +19203,33 @@ 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) => {
       const repoOfRun = normalizeRepo(run.repo || opts.repo);
       const taskClient = tlFor(run.workspace_id);
-      const [rawTask, verifyMode, projectBase] = await Promise.all([
+      const [rawTask, verifyMode, projectBase, zoneNotes] = await Promise.all([
         taskClient ? taskClient.getTask(run.task_slug) : Promise.resolve(null),
         verifyModeReader ? verifyModeReader(repoOfRun) : Promise.resolve(void 0),
-        baseBranchReader ? baseBranchReader(repoOfRun) : Promise.resolve("")
+        baseBranchReader ? baseBranchReader(repoOfRun) : Promise.resolve(""),
+        // TASWM-466: память зоны прогона — тем же параллельным чтением, что и остальные
+        // живые ручки. Зоны у прогона нет (герой, разметка без area) → читать нечего.
+        zoneMemoryReader && run.area ? zoneMemoryReader(repoOfRun, run.area).catch(() => []) : Promise.resolve([])
       ]);
       const task = taskClient ? requireTaskBody(rawTask, run.task_slug, run.workspace_id) : null;
       const healed = healTaskSlug(db, run, task);
@@ -18843,7 +19246,7 @@ async function runDaemon(opts) {
               fetchFile: taskClient?.fetchFile?.bind(taskClient),
               onEvent: (text) => db.addEvent(r.id, "step", text)
             });
-            return r.kind === "hero" ? buildHeroPrompt(task, r, taskContext, attachments) : buildPrompt(task, r, verifyMode, taskContext, attachments);
+            return r.kind === "hero" ? buildHeroPrompt(task, r, taskContext, attachments) : buildPrompt(task, r, verifyMode, taskContext, attachments, renderZoneMemoryBlock(r.area, zoneNotes));
           }
         },
         runToSpawn
@@ -18896,7 +19299,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),
@@ -19055,6 +19458,9 @@ async function runDaemon(opts) {
           return client ? requireTaskBody(await client.getTask(slug), slug, ws) : null;
         },
         ...verifyModeReader ? { verifyMode: verifyModeReader } : {},
+        // TASWM-466: тот же ридер памяти зоны, что на спавне — оживлённый дрон строит
+        // промпт с нуля и без него потерял бы память своей зоны.
+        ...zoneMemoryReader ? { zoneMemory: zoneMemoryReader } : {},
         getTaskContext: (task, ws) => {
           const client = tlFor(ws);
           return client ? fetchTaskContext(client, task) : Promise.resolve(void 0);
@@ -19369,13 +19775,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "type": "module",
   "description": "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   "keywords": [
@@ -38,7 +38,7 @@
     "execa": "^10.0.0",
     "zod": "3.25.76"
   },
-  "gitHead": "a4ed164a36295bd7ebc27e7f6fe73809e09b142a",
+  "gitHead": "a61c26b5e254ef5383d918f14a9f6e8e8a09904a",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",