@taskless-app/swarm 0.6.49 → 0.6.51

package/dist/cli.js

@@ -164,6 +164,104 @@ var init_types = __esm({
   }
 });
 
+// ../swarm-core/src/verifyVerdict.ts
+function isVerifyVerdict(v) {
+  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
+}
+function toVerifyVerdict(v) {
+  return isVerifyVerdict(v) ? v : null;
+}
+function isNegativeVerifyVerdict(v) {
+  return v === "not_reproduced" || v === "found_issues";
+}
+function verifyVerdictLabel(v) {
+  switch (v) {
+    case "confirmed":
+      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
+    case "not_reproduced":
+      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
+    case "found_issues":
+      return "\u041D\u0410\u0428\u0401\u041B";
+  }
+}
+function verifyStats(runs) {
+  let confirmed = 0;
+  let notReproduced = 0;
+  let foundIssues = 0;
+  for (const r of runs) {
+    switch (toVerifyVerdict(r.verify_verdict)) {
+      case "confirmed":
+        confirmed++;
+        break;
+      case "not_reproduced":
+        notReproduced++;
+        break;
+      case "found_issues":
+        foundIssues++;
+        break;
+      default:
+        break;
+    }
+  }
+  const negative = notReproduced + foundIssues;
+  const total = confirmed + negative;
+  return { total, confirmed, notReproduced, foundIssues, negative, negativeShare: total ? negative / total : 0 };
+}
+function verifyStatsByDrone(runs) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const r of runs) {
+    if (!toVerifyVerdict(r.verify_verdict)) continue;
+    const name = (r.name ?? "").trim() || "(\u0438\u043C\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E)";
+    const bucket = byName.get(name);
+    if (bucket) bucket.push(r);
+    else byName.set(name, [r]);
+  }
+  return [...byName.entries()].map(([name, rs]) => ({ name, ...verifyStats(rs) })).sort((a, b) => b.negative - a.negative || b.total - a.total || a.name.localeCompare(b.name));
+}
+function verifyStatsLine(s) {
+  if (!s.total) return "\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442";
+  const pct = Math.round(s.negativeShare * 100);
+  return `\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 ${s.total} \xB7 \u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 ${s.negative} (${pct}%): \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u043B\u043E\u0441\u044C ${s.notReproduced}, \u043D\u0430\u0448\u043B\u0438 \u0434\u0435\u0444\u0435\u043A\u0442 ${s.foundIssues}`;
+}
+var VERIFY_VERDICTS, VERIFY_VERDICT_SET;
+var init_verifyVerdict = __esm({
+  "../swarm-core/src/verifyVerdict.ts"() {
+    "use strict";
+    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
+    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
+  }
+});
+
+// ../swarm-core/src/reviewPhase.ts
+function reviewPhaseKindOf(label2) {
+  if (!label2) return null;
+  return PHASE_BY_LENGTH.find((k) => label2.startsWith(REVIEW_PHASE_TEXT[k])) ?? null;
+}
+var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
+var init_reviewPhase = __esm({
+  "../swarm-core/src/reviewPhase.ts"() {
+    "use strict";
+    init_verifyVerdict();
+    REVIEW_PHASE_TEXT = {
+      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
+      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
+      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
+      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
+      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
+      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
+      verify_dead: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0434\u0430\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
+      ready: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0433\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443",
+      ready_awaiting_ci: "\u0413\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443 \u2014 \u0436\u0434\u0451\u0442 CI",
+      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
+    };
+    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
+      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
+    );
+  }
+});
+
 // ../swarm-core/src/timeline.ts
 function resolveDepRef(ref, lk) {
   const mapped = lk.slugByCuid.get(ref);
@@ -335,7 +433,8 @@ function computeCounters(lanes) {
       if (l.dependsOn.some((d) => !d.met)) c.waitingDep++;
       else c.waitingSlot++;
     } else if (l.status === "review") {
-      if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
+      if (reviewPhaseKindOf(l.reviewPhase) === "ready_awaiting_ci") c.waitingCI++;
+      else if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
       else c.waitingCI++;
     }
   }
@@ -345,103 +444,11 @@ var DEFAULT_RUN_MS;
 var init_timeline = __esm({
   "../swarm-core/src/timeline.ts"() {
     "use strict";
+    init_reviewPhase();
     DEFAULT_RUN_MS = 25 * 6e4;
   }
 });
 
-// ../swarm-core/src/verifyVerdict.ts
-function isVerifyVerdict(v) {
-  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
-}
-function toVerifyVerdict(v) {
-  return isVerifyVerdict(v) ? v : null;
-}
-function isNegativeVerifyVerdict(v) {
-  return v === "not_reproduced" || v === "found_issues";
-}
-function verifyVerdictLabel(v) {
-  switch (v) {
-    case "confirmed":
-      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
-    case "not_reproduced":
-      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
-    case "found_issues":
-      return "\u041D\u0410\u0428\u0401\u041B";
-  }
-}
-function verifyStats(runs) {
-  let confirmed = 0;
-  let notReproduced = 0;
-  let foundIssues = 0;
-  for (const r of runs) {
-    switch (toVerifyVerdict(r.verify_verdict)) {
-      case "confirmed":
-        confirmed++;
-        break;
-      case "not_reproduced":
-        notReproduced++;
-        break;
-      case "found_issues":
-        foundIssues++;
-        break;
-      default:
-        break;
-    }
-  }
-  const negative = notReproduced + foundIssues;
-  const total = confirmed + negative;
-  return { total, confirmed, notReproduced, foundIssues, negative, negativeShare: total ? negative / total : 0 };
-}
-function verifyStatsByDrone(runs) {
-  const byName = /* @__PURE__ */ new Map();
-  for (const r of runs) {
-    if (!toVerifyVerdict(r.verify_verdict)) continue;
-    const name = (r.name ?? "").trim() || "(\u0438\u043C\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E)";
-    const bucket = byName.get(name);
-    if (bucket) bucket.push(r);
-    else byName.set(name, [r]);
-  }
-  return [...byName.entries()].map(([name, rs]) => ({ name, ...verifyStats(rs) })).sort((a, b) => b.negative - a.negative || b.total - a.total || a.name.localeCompare(b.name));
-}
-function verifyStatsLine(s) {
-  if (!s.total) return "\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442";
-  const pct = Math.round(s.negativeShare * 100);
-  return `\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 ${s.total} \xB7 \u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 ${s.negative} (${pct}%): \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u043B\u043E\u0441\u044C ${s.notReproduced}, \u043D\u0430\u0448\u043B\u0438 \u0434\u0435\u0444\u0435\u043A\u0442 ${s.foundIssues}`;
-}
-var VERIFY_VERDICTS, VERIFY_VERDICT_SET;
-var init_verifyVerdict = __esm({
-  "../swarm-core/src/verifyVerdict.ts"() {
-    "use strict";
-    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
-    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
-  }
-});
-
-// ../swarm-core/src/reviewPhase.ts
-var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
-var init_reviewPhase = __esm({
-  "../swarm-core/src/reviewPhase.ts"() {
-    "use strict";
-    init_verifyVerdict();
-    REVIEW_PHASE_TEXT = {
-      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
-      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
-      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
-      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
-      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
-      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
-      verify_dead: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0434\u0430\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
-      ready: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0433\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443",
-      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
-    };
-    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
-      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
-    );
-  }
-});
-
 // ../swarm-core/src/mergeGate.ts
 function computeMergeGate(input) {
   if (!input.hasRun) {
@@ -1288,6 +1295,10 @@ function pathZoneCandidate(path) {
   if (parts[0] === "src" && parts.length >= 3 && !GENERIC_DIRS.has(parts[1])) return parts[1];
   return parts[0];
 }
+function dirOf(path) {
+  const i = path.lastIndexOf("/");
+  return i < 0 ? "" : path.slice(0, i);
+}
 function tokenize(text) {
   const out = [];
   for (const raw of text.split(/[^\p{L}\p{N}]+/u)) {
@@ -1521,13 +1532,61 @@ function similarTasks(model, text, limit = 5) {
   }
   return scored.sort((a, b) => b.score - a.score).slice(0, limit);
 }
+function historyFiles(model) {
+  let idx = historyIndex.get(model);
+  if (!idx) {
+    const files = new Set(model.entries.flatMap((e) => e.files));
+    const byBase = /* @__PURE__ */ new Map();
+    for (const f of files) {
+      const base3 = f.slice(f.lastIndexOf("/") + 1);
+      byBase.set(base3, [...byBase.get(base3) ?? [], f]);
+    }
+    idx = { files, byBase };
+    historyIndex.set(model, idx);
+  }
+  return idx;
+}
+function namedPaths(model, text, fileExists) {
+  const { files, byBase } = historyFiles(model);
+  const known = (p) => files.has(p) || (fileExists?.(p) ?? false);
+  const raw = [...new Set((text.match(PATH_CANDIDATE) ?? []).map((c) => c.replace(/^\.?\/+/, "").replace(/\.+$/, "")))].filter((c) => c && !c.split("/").includes(".."));
+  raw.sort((a, b) => b.split("/").length - a.split("/").length);
+  const out = [];
+  const dirs = /* @__PURE__ */ new Set();
+  const take = (p) => {
+    if (out.includes(p)) return;
+    out.push(p);
+    dirs.add(dirOf(p));
+  };
+  for (const c of raw) {
+    if (known(c)) {
+      take(c);
+      continue;
+    }
+    const base3 = c.slice(c.lastIndexOf("/") + 1);
+    let matches = (byBase.get(base3) ?? []).filter((f) => f === c || f.endsWith(`/${c}`));
+    if (matches.length > 1) matches = matches.filter((f) => dirs.has(dirOf(f)));
+    if (matches.length === 1) {
+      take(matches[0]);
+      continue;
+    }
+    if (!c.includes("/") && fileExists) {
+      const sibling = [...dirs].map((d) => d ? `${d}/${c}` : c).filter(fileExists);
+      if (sibling.length === 1) take(sibling[0]);
+    }
+  }
+  return out;
+}
 function predictFiles(model, opts) {
   if (!hasZoneModel(model)) return [];
   const limit = opts.limit ?? 40;
   const best = /* @__PURE__ */ new Map();
+  const named = opts.text ? namedPaths(model, opts.text, opts.fileExists) : [];
+  for (const path of named) best.set(path, { path, weight: 1, why: "\u043D\u0430\u0437\u0432\u0430\u043D \u0432 \u0437\u0430\u0434\u0430\u0447\u0435", named: true });
+  const factor = named.length ? NAMED_BACKGROUND_FACTOR : 1;
   const put = (path, weight, why) => {
     const cur = best.get(path);
-    if (!cur || cur.weight < weight) best.set(path, { path, weight, why });
+    if (!cur || cur.weight < weight * factor) best.set(path, { path, weight: weight * factor, why });
   };
   if (opts.text) {
     const sim = similarTasks(model, opts.text, opts.similar ?? 5);
@@ -1564,7 +1623,7 @@ function checkZoneAgreement(model, entries = model.entries) {
   const n = rows.length;
   return { checked: n, matched, compatible, rate: n ? matched / n : 0, looseRate: n ? (matched + compatible) / n : 0, rows };
 }
-var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS;
+var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS, PATH_CANDIDATE, historyIndex, NAMED_BACKGROUND_FACTOR;
 var init_codeZones = __esm({
   "../swarm-core/src/codeZones.ts"() {
     "use strict";
@@ -1643,6 +1702,9 @@ var init_codeZones = __esm({
       "\u043F\u0435\u0440\u0444",
       "wip"
     ]);
+    PATH_CANDIDATE = /[\w@.\-/]+\.[A-Za-z][A-Za-z0-9]{0,5}/g;
+    historyIndex = /* @__PURE__ */ new WeakMap();
+    NAMED_BACKGROUND_FACTOR = 0.1;
   }
 });
 
@@ -1661,7 +1723,7 @@ var init_effort = __esm({
 });
 
 // ../swarm-core/src/queuePlan.ts
-var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS, QUEUE_REVIEW_TAIL_MS;
+var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS;
 var init_queuePlan = __esm({
   "../swarm-core/src/queuePlan.ts"() {
     "use strict";
@@ -1672,7 +1734,6 @@ var init_queuePlan = __esm({
     MIN_MS = 6e4;
     QUEUE_NOMINAL_RUN_MS = 25 * MIN_MS;
     QUEUE_MIN_TAIL_MS = 3 * MIN_MS;
-    QUEUE_REVIEW_TAIL_MS = 10 * MIN_MS;
   }
 });
 
@@ -3431,7 +3492,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.49",
+      version: "0.6.51",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3482,7 +3543,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "27600667531d4f65761c74793e8c4ee4859dc8ae"
+      gitHead: "24aad254ba4f3f71904310b73435e647a08f22f5"
     };
   }
 });
@@ -4817,6 +4878,10 @@ function rowToRun(row) {
     // вычисляемая фаза ревью (TASWM-230)
     review_cycle: row.review_cycle ?? 0,
     // старые прогоны без колонки → 0
+    // TASWM-577: намерение смержить (человек отметил «пора влить»). В sqlite-бэкенде оно
+    // живёт только здесь — ставить его некому, кроме самого демона, зато читает его
+    // реконсайл, и колонка нужна, чтобы отметка пережила рестарт.
+    merge_requested_at: row.merge_requested_at ?? null,
     task_title: row.task_title ?? null,
     task_desc: row.task_desc ?? null,
     // TASWM-556: когда заведена сама задача — по ней проверка дубля отличает свой
@@ -4892,6 +4957,7 @@ CREATE TABLE IF NOT EXISTS runs (
   verifies_run_id INTEGER,
   verify_verdict TEXT,
   review_cycle INTEGER NOT NULL DEFAULT 0,
+  merge_requested_at TEXT,
   task_title TEXT,
   task_desc TEXT,
   task_created_at TEXT,
@@ -4986,6 +5052,8 @@ CREATE TABLE IF NOT EXISTS imports (
           "ALTER TABLE runs ADD COLUMN verify_verdict TEXT",
           // Авто-ревью v2 (TASWM-162): номер цикла ревью — пере-ревью после фикс-итерации.
           "ALTER TABLE runs ADD COLUMN review_cycle INTEGER NOT NULL DEFAULT 0",
+          // TASWM-577: намерение смержить — по нему рой вливает PR сам, по очереди мержа.
+          "ALTER TABLE runs ADD COLUMN merge_requested_at TEXT",
           // Вычисляемая фаза ревью (TASWM-230): человеко-фраза «чего ждёт PR», её считает демон.
           "ALTER TABLE runs ADD COLUMN review_phase TEXT",
           // Приоритетная очередь (TASWM-269): явный приоритет прогона, выше — раньше из queued.
@@ -7317,6 +7385,12 @@ function depsFailureRetriable(code) {
 function runRef(runKey) {
   return { __runRef: runKey };
 }
+function isoOrNull(v) {
+  if (v == null) return null;
+  const raw = v instanceof Date ? v.toISOString() : typeof v === "string" ? v : "";
+  const at = Date.parse(raw);
+  return Number.isNaN(at) ? null : new Date(at).toISOString();
+}
 function isRunRef(v) {
   return typeof v === "object" && v !== null && "__runRef" in v;
 }
@@ -7784,6 +7858,17 @@ var SwarmClient = class _SwarmClient {
   runKeyOf(id) {
     return this.runs.get(id)?.runKey ?? null;
   }
+  /**
+   * Cuid прогона В ПРОДЕ — им адресуются прод-РУЧКИ, а не MCP-тулы (TASWM-577: демон
+   * вливает PR тем же `POST /swarm/merge`, что и кнопка, и снимает намерение тем же
+   * `DELETE /swarm/merge-request/:runId`). null — прогон до прода ещё не долетел
+   * (создан этим демоном, флаш не прошёл): адресовать его там нечем, и вызывающий
+   * обязан прочитать это как «сейчас нельзя», а не как ошибку.
+   */
+  prodRunId(id) {
+    const key = this.runs.get(id)?.runKey;
+    return key ? this.prodIdFor(key) ?? null : null;
+  }
   runByKey(key) {
     const direct = [...this.runs.values()].find((r) => r.runKey === key);
     if (direct) return this.mat(direct);
@@ -9330,6 +9415,9 @@ var SwarmClient = class _SwarmClient {
         verify_verdict: null,
         review_phase: null,
         // вычисляемая фаза ревью (TASWM-230) — прод хранит и раздаёт
+        // TASWM-577: намерение смержить — прод-поле (его ставит человек ручкой
+        // /swarm/merge-request), заполняется ниже из ответа.
+        merge_requested_at: null,
         // Локальная бухгалтерия (в прод-схему не уходит) — на гидрации из прода дефолт 0;
         // существующая локальная запись НЕ перетирается (поле не в field-copy ниже),
         // в отличие от respawns, — авто-ревью v2, TASWM-162.
@@ -9365,6 +9453,7 @@ var SwarmClient = class _SwarmClient {
     local.task_title = pr.taskTitle ?? local.task_title;
     local.task_desc = pr.taskDesc ?? local.task_desc;
     local.task_created_at = pr.taskCreatedAt ?? local.task_created_at;
+    if ("mergeRequestedAt" in pr) local.merge_requested_at = isoOrNull(pr.mergeRequestedAt);
     local.name = pr.droneName ?? local.name;
     local.kind = pr.role ?? local.kind;
     const heroProd = pr.heroId ?? null;
@@ -10397,22 +10486,10 @@ function mergeQueueCandidates(runs, repo, repoFallback) {
 }
 var BASE_TTL_MS = 2e4;
 function makeMergeQueueResolver(deps) {
-  const memo = /* @__PURE__ */ new Map();
+  const read = deps.headState ?? makeHeadStateReader(deps);
   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 });
+    const st = await read(prUrl);
+    return computeMergeQueue({ entry: e, ready, behindBy: st.behindBy, checks: st.checks });
   };
   return async (run) => {
     if (!deps.baseSync || !run.pr_url) return null;
@@ -10447,6 +10524,124 @@ function makeMergeQueueResolver(deps) {
 function entryOf(r) {
   return { runId: r.id, prNumber: prNumberOf(r.pr_url), slug: r.task_slug };
 }
+function makeHeadStateReader(deps) {
+  const memo = /* @__PURE__ */ new Map();
+  return async (prUrl) => {
+    const now = Date.now();
+    const ttl = deps.ttlMs ?? BASE_TTL_MS;
+    const cached = memo.get(prUrl);
+    if (cached && now - cached.at < ttl) return { behindBy: cached.behindBy, checks: cached.checks, headSha: cached.headSha };
+    const base3 = deps.baseSync ? await deps.baseSync(prUrl).catch(() => null) : null;
+    let checks = "none";
+    if (base3?.behindBy === 0 && deps.checks) {
+      const ci = await deps.checks(prUrl).catch(() => null);
+      checks = ci ? ci.bucket : null;
+    }
+    const fresh = { behindBy: base3 ? base3.behindBy : null, checks, headSha: base3?.headSha ?? null };
+    memo.set(prUrl, { at: now, ...fresh });
+    return fresh;
+  };
+}
+function hasMergeIntent(r) {
+  return !!(r.merge_requested_at ?? "").trim();
+}
+var NO_CI_GRACE_MS = 10 * 6e4;
+var shortSha = (sha) => sha.slice(0, 7);
+function makeMergeIntentResolver(deps) {
+  const read = deps.headState ?? makeHeadStateReader(deps);
+  const firstSeen = /* @__PURE__ */ new Map();
+  const ciSettled = async (prUrl, st, now) => {
+    const sha = st.headSha;
+    if (!sha) {
+      return { action: "wait", code: "checks_unknown", reason: "gh \u043D\u0435 \u0441\u043A\u0430\u0437\u0430\u043B HEAD PR \u2014 \u0431\u0435\u0437 \u043D\u0435\u0433\u043E \u043D\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C, \u0434\u043E\u0431\u0435\u0436\u0430\u043B \u043B\u0438 \u043D\u0430 \u043D\u0451\u043C CI. \u0421\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    if (!deps.actionsRuns) {
+      return { action: "wait", code: "checks_unknown", reason: "\u0440\u043E\u044E \u043D\u0435\u0447\u0435\u043C \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 HEAD PR \u2014 \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443 \u0430\u0433\u0440\u0435\u0433\u0430\u0442\u0443 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u0432\u0441\u043B\u0435\u043F\u0443\u044E \u043D\u0435 \u0432\u043B\u0438\u0432\u0430\u044E" };
+    }
+    const runs = await deps.actionsRuns(prUrl, sha).catch(() => null);
+    if (!runs) {
+      return { action: "wait", code: "checks_unknown", reason: `\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 ${shortSha(sha)} \u2014 \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C` };
+    }
+    if (runs.failed.length > 0) {
+      return { action: "clear", code: "checks_red", reason: `\u043D\u0430 ${shortSha(sha)} \u0443\u043F\u0430\u043B \u043F\u0440\u043E\u0433\u043E\u043D GitHub Actions: ${runs.failed.join(", ")} \u2014 \u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E, \u043D\u0443\u0436\u043D\u0430 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0430` };
+    }
+    if (runs.active.length > 0) {
+      return {
+        action: "wait",
+        code: "checks_pending",
+        reason: `\u043D\u0430 ${shortSha(sha)} \u0435\u0449\u0451 \u0438\u0434\u0443\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions: ${runs.active.join(", ")} \u2014 \u0432\u0438\u0434\u0438\u043C\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0437\u0435\u043B\u0451\u043D\u044B\u043C\u0438, \u043F\u043E\u043A\u0430 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F \u0432\u043E\u043B\u043D\u0430 \u0434\u0436\u043E\u0431 \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u043D\u0430`
+      };
+    }
+    if (st.checks === "none") {
+      if (runs.total > 0) {
+        return { action: "wait", code: "checks_pending", reason: `\u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 ${shortSha(sha)} \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0438\u0441\u044C, \u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u0443 PR \u0435\u0449\u0451 \u043D\u0435 \u0432\u0438\u0434\u043D\u043E \u2014 \u0436\u0434\u0443, \u043F\u043E\u043A\u0430 GitHub \u0438\u0445 \u043F\u043E\u043A\u0430\u0436\u0435\u0442` };
+      }
+      const seen = firstSeen.get(prUrl);
+      const waited = seen && seen.sha === sha ? now - seen.at : 0;
+      const graceMin = NO_CI_GRACE_MS / 6e4;
+      if (waited < NO_CI_GRACE_MS) {
+        return {
+          action: "wait",
+          code: "checks_pending",
+          reason: `\u043D\u0430 ${shortSha(sha)} \u043F\u043E\u043A\u0430 \u043D\u0438 \u043E\u0434\u043D\u043E\u0439 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0438 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430 GitHub Actions \u2014 CI \u043C\u043E\u0433 \u0435\u0449\u0451 \u043D\u0435 \u0437\u0430\u0432\u0435\u0441\u0442\u0438 \u0434\u0436\u043E\u0431\u044B \u043F\u043E\u0441\u043B\u0435 \u043F\u0443\u0448\u0430. \u0416\u0434\u0443 \u0434\u043E ${graceMin} \u043C\u0438\u043D (\u043F\u0440\u043E\u0448\u043B\u043E ${Math.floor(waited / 6e4)})`
+        };
+      }
+      return { action: "merge", code: "queue_head", reason: `\u0435\u0433\u043E \u0447\u0435\u0440\u0451\u0434 \u0438 \u0431\u0430\u0437\u0430 \u0441\u0432\u0435\u0436\u0430\u044F, \u0430 ${shortSha(sha)} ${graceMin} \u043C\u0438\u043D \u043F\u0440\u043E\u0441\u0442\u043E\u044F\u043B \u0431\u0435\u0437 \u0435\u0434\u0438\u043D\u043E\u0439 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0438 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 GitHub Actions \u2014 CI \u0443 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F \u043D\u0435\u0442` };
+    }
+    return { action: "merge", code: "queue_head", reason: `\u0435\u0433\u043E \u0447\u0435\u0440\u0451\u0434, \u0431\u0430\u0437\u0430 \u0441\u0432\u0435\u0436\u0430\u044F, \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 ${shortSha(sha)} \u0437\u0435\u043B\u0451\u043D\u044B\u0435 \u0438 \u0432\u0441\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 \u043D\u0451\u043C \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u044B` };
+  };
+  const confirmLive = async (prUrl, sha, verdict) => {
+    if (!sha) {
+      return { action: "wait", code: "checks_unknown", reason: "gh \u043D\u0435 \u0441\u043A\u0430\u0437\u0430\u043B HEAD PR \u2014 \u043D\u0435 \u043F\u043E\u043D\u044F\u0442\u044C, \u043F\u0440\u043E \u043A\u0430\u043A\u043E\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u044D\u0442\u043E\u0442 \u0432\u0435\u0440\u0434\u0438\u043A\u0442; \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    const live = deps.baseSync ? await deps.baseSync(prUrl).catch(() => null) : null;
+    if (!live || !live.headSha) {
+      return { action: "wait", code: "base_unknown", reason: "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0435\u0440\u0435\u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u0436\u0438\u0432\u043E\u0439 HEAD PR \u2014 \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    if (verdict.action === "merge" && live.behindBy > 0) {
+      return {
+        action: "refresh_base",
+        code: "base_stale",
+        reason: `\u0431\u0430\u0437\u0430 \u0443\u0448\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434 \u043D\u0430 ${live.behindBy} \u043A\u043E\u043C\u043C\u0438\u0442(\u043E\u0432) \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0433\u043E \u043C\u0435\u0440\u0436\u0430 \u2014 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0432\u043B\u0438\u0442\u044C main \u0438 \u0434\u043E\u0436\u0434\u0430\u0442\u044C\u0441\u044F CI \u043D\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435`
+      };
+    }
+    if (live.headSha !== sha) {
+      return { action: "wait", code: "checks_pending", reason: `\u043D\u0430 PR \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 ${shortSha(live.headSha)} \u2014 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E \u0437\u0430\u043D\u043E\u0432\u043E` };
+    }
+    return verdict;
+  };
+  return async (run) => {
+    if (!deps.baseSync || !run.pr_url || !hasMergeIntent(run)) return null;
+    const num = prNumberOf(run.pr_url);
+    if (num == null) return null;
+    const marked = mergeQueueCandidates(deps.listRuns(), effectiveRepoOf(run.repo, deps.repoFallback), deps.repoFallback).filter(hasMergeIntent);
+    const mine = marked.find((c) => prNumberOf(c.pr_url) === num);
+    if (!mine) return null;
+    const queue = orderMergeQueue(marked.map(entryOf));
+    const entry = entryOf(mine);
+    const position = queue.findIndex((e) => e.runId === entry.runId) + 1;
+    const head = queue[0];
+    if (head.runId !== entry.runId) {
+      return {
+        action: "wait",
+        code: "queue_wait",
+        reason: `\u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443: \u0441\u0435\u0439\u0447\u0430\u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u044C PR #${head.prNumber}${head.slug ? ` (${head.slug})` : ""}, \u044D\u0442\u043E\u0442 \u2014 ${position}-\u0439 \u0438\u0437 ${queue.length}`,
+        position,
+        size: queue.length
+      };
+    }
+    const st = await read(mine.pr_url);
+    const now = deps.now ? deps.now() : Date.now();
+    if (st.headSha) {
+      const seen = firstSeen.get(mine.pr_url);
+      if (!seen || seen.sha !== st.headSha) firstSeen.set(mine.pr_url, { sha: st.headSha, at: now });
+    }
+    const d = computeMergeQueue({ entry, ready: queue, behindBy: st.behindBy, checks: st.checks });
+    const verdict = d.code === "queue_head" ? await ciSettled(mine.pr_url, st, now) : { action: d.code === "base_stale" ? "refresh_base" : d.code === "checks_red" ? "clear" : "wait", code: d.code, reason: d.reason };
+    const final = verdict.action === "merge" || verdict.action === "clear" ? await confirmLive(mine.pr_url, st.headSha, verdict) : verdict;
+    return { ...final, position, size: queue.length, ...st.headSha ? { headSha: st.headSha } : {} };
+  };
+}
 
 // src/mergeGate.ts
 function findRunByPr(runs, ref, scope = {}) {
@@ -10475,9 +10670,15 @@ function makeMergeGateParts(deps) {
     });
   };
   const repoOfRun = deps.repoFullNameOf ? (r) => deps.repoFullNameOf(effectiveRepoOf(r.repo, deps.repoFallback)) : void 0;
+  const headState = makeHeadStateReader({
+    ...deps.baseSync ? { baseSync: deps.baseSync } : {},
+    ...deps.checks ? { checks: deps.checks } : {},
+    ...deps.ttlMs != null ? { ttlMs: deps.ttlMs } : {}
+  });
   const queueFor = makeMergeQueueResolver({
     listRuns: deps.listRuns,
     gateAllows: async (r) => (await gateFor(r)).allowed,
+    headState,
     ...deps.repoFallback ? { repoFallback: deps.repoFallback } : {},
     ...deps.baseSync ? { baseSync: deps.baseSync } : {},
     ...deps.checks ? { checks: deps.checks } : {},
@@ -10503,7 +10704,16 @@ function makeMergeGateParts(deps) {
       }
     };
   };
-  return { gate, queue: queueFor };
+  const intentFor = makeMergeIntentResolver({
+    listRuns: deps.listRuns,
+    headState,
+    ...deps.repoFallback ? { repoFallback: deps.repoFallback } : {},
+    ...deps.baseSync ? { baseSync: deps.baseSync } : {},
+    ...deps.checks ? { checks: deps.checks } : {},
+    ...deps.actionsRuns ? { actionsRuns: deps.actionsRuns } : {},
+    ...deps.ttlMs != null ? { ttlMs: deps.ttlMs } : {}
+  });
+  return { gate, queue: queueFor, intent: intentFor };
 }
 
 // src/web.ts