@taskless-app/swarm 0.6.48 → 0.6.50

package/dist/overmind.js

@@ -666,7 +666,7 @@ var init_modelPolicy = __esm({
         label: "Anthropic",
         executorId: "claude-code",
         selectable: true,
-        roles: { executor: "claude-opus-5", review: "claude-sonnet-5" }
+        roles: { executor: "claude-opus-5-5", review: "claude-sonnet-5" }
       },
       // TASWM-565 · шаг 1 из четырёх: провайдер в реестре ЕСТЬ, выбрать его ещё нельзя.
       // Имён моделей здесь нет СОЗНАТЕЛЬНО: у владельца подписка, состав моделей в ней нам
@@ -1277,6 +1277,9 @@ var init_cost = __esm({
 });
 
 // ../swarm-core/src/modelPricing.ts
+function cacheReadFactorOf(pricing) {
+  return pricing.cacheReadFactor ?? CACHE_READ_FACTOR;
+}
 function findModelPricing(model, table = MODEL_PRICING) {
   if (!model) return void 0;
   const exact = table[model];
@@ -1298,6 +1301,10 @@ var init_modelPricing = __esm({
       // и «почему прогон вчера стоил иначе» приходится выяснять по коду, а не по таблице.
       // Меняется цена — меняется строка, одним видимым коммитом.
       "claude-sonnet-5": { inputPerMTok: 2, outputPerMTok: 10 },
+      // Opus 5.5 — 4/20, и чтение из кеша у него 5 % входа ($0.20), а не обычные 10 %.
+      // У дронов чтение из кеша — основная часть токенов: с общим множителем прогон на
+      // Opus 5.5 стоил бы в расчёте почти вдвое больше настоящего.
+      "claude-opus-5-5": { inputPerMTok: 4, outputPerMTok: 20, cacheReadFactor: 0.05 },
       "claude-opus-5": { inputPerMTok: 5, outputPerMTok: 25 },
       "claude-fable-5": { inputPerMTok: 10, outputPerMTok: 50 },
       // Прогоны и вызовы на 4.x остаются в истории — строки держим ради их стоимости.
@@ -1716,13 +1723,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);
@@ -1739,12 +1794,18 @@ function predictFiles(model, opts) {
   }
   return [...best.values()].sort((a, b) => b.weight - a.weight || a.path.localeCompare(b.path)).slice(0, limit);
 }
+function heldByPrediction(predicted) {
+  const named = predicted.filter((p) => p.named);
+  return (named.length ? named : predicted).map((p) => p.path);
+}
 function overlapRisk(predicted, actual, opts = {}) {
   const o = { ...OVERLAP_DEFAULTS, ...opts };
   const actualSet = new Set(actual);
   const actualDirs = new Set([...actualSet].map(dirOf).filter(Boolean));
   const totalWeight = predicted.reduce((a, p) => a + p.weight, 0);
   if (!totalWeight) return { overlap: false, score: 0, sharedFiles: [], sharedDirs: [] };
+  const hasNamed = predicted.some((p) => p.named);
+  let namedHit = false;
   let hit = 0;
   let strong = false;
   const sharedFiles = [];
@@ -1753,24 +1814,26 @@ function overlapRisk(predicted, actual, opts = {}) {
     if (actualSet.has(p.path)) {
       hit += p.weight;
       sharedFiles.push(p.path);
-      if (p.weight >= o.strongFile) strong = true;
+      if (p.named) namedHit = true;
+      if (p.weight >= o.strongFile && (p.named || !hasNamed)) strong = true;
       continue;
     }
     const d = dirOf(p.path);
     if (d && actualDirs.has(d)) {
       hit += p.weight * 0.25;
       sharedDirs.add(d);
+      if (p.named) namedHit = true;
     }
   }
   const score = Math.min(1, hit / totalWeight);
   return {
-    overlap: strong || score >= o.threshold,
+    overlap: strong || score >= o.threshold && (!hasNamed || namedHit),
     score,
     sharedFiles: sharedFiles.slice(0, 10),
     sharedDirs: [...sharedDirs].slice(0, 5)
   };
 }
-var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS, OVERLAP_DEFAULTS;
+var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS, PATH_CANDIDATE, historyIndex, NAMED_BACKGROUND_FACTOR, OVERLAP_DEFAULTS;
 var init_codeZones = __esm({
   "../swarm-core/src/codeZones.ts"() {
     "use strict";
@@ -1849,6 +1912,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;
     OVERLAP_DEFAULTS = { threshold: 0.2, strongFile: 0.35 };
   }
 });
@@ -2168,7 +2234,7 @@ function costFromUsage(usage, model, table = MODEL_PRICING) {
   const output = usage.output_tokens ?? 0;
   const cacheWrite = usage.cache_creation_input_tokens ?? 0;
   const cacheRead = usage.cache_read_input_tokens ?? 0;
-  const costUsd = (input * pricing.inputPerMTok + output * pricing.outputPerMTok + cacheWrite * pricing.inputPerMTok * CACHE_WRITE_5M_FACTOR + cacheRead * pricing.inputPerMTok * CACHE_READ_FACTOR) / 1e6;
+  const costUsd = (input * pricing.inputPerMTok + output * pricing.outputPerMTok + cacheWrite * pricing.inputPerMTok * CACHE_WRITE_5M_FACTOR + cacheRead * pricing.inputPerMTok * cacheReadFactorOf(pricing)) / 1e6;
   return { costUsd };
 }
 var init_pricing = __esm({
@@ -3480,6 +3546,18 @@ var init_zoneNotes = __esm({
   }
 });
 
+// src/store.ts
+function isCleanResolve(run) {
+  return (run.stop_reason ?? "").includes(RESOLVE_CLEAN_MARK);
+}
+var RESOLVE_CLEAN_MARK;
+var init_store = __esm({
+  "src/store.ts"() {
+    "use strict";
+    RESOLVE_CLEAN_MARK = "\u0447\u0438\u0441\u0442\u043E\u0435 \u0432\u043B\u0438\u0432\u0430\u043D\u0438\u0435 \u0431\u0430\u0437\u044B";
+  }
+});
+
 // src/agentToken.ts
 import { readFileSync as readFileSync6, writeFileSync as writeFileSync5, unlinkSync as unlinkSync2 } from "fs";
 import { join as join8 } from "path";
@@ -6234,6 +6312,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: когда заведена сама задача — по ней проверка дубля отличает свой
@@ -6271,6 +6353,7 @@ var init_db = __esm({
     init_names2();
     init_zoneNotes();
     init_storm();
+    init_store();
     init_src();
     TERMINAL_SQL = TERMINAL_STATUSES.map((s) => `'${s}'`).join(",");
     RESOLVER_TERMINAL_SQL = [...TERMINAL_STATUSES, "stalled"].map((s) => `'${s}'`).join(",");
@@ -6308,6 +6391,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,
@@ -6402,6 +6486,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.
@@ -6624,9 +6710,19 @@ CREATE TABLE IF NOT EXISTS imports (
         ).get(reviewRunId);
         return row ? rowToRun(row) : null;
       }
-      /** Сколько всего резолверов уже поднимали на этот review-PR — потолок авто-попыток. */
+      /**
+       * Сколько резолверов С ДРОНОМ уже поднимали на этот review-PR — потолок авто-попыток.
+       *
+       * TASWM-575: чистые вливания базы (RESOLVE_CLEAN_MARK в stop_reason — git свёл сам, дрон
+       * не поднимался, стоимость ноль) в счёт НЕ идут. Потолок защищает от карусели ДРОНОВ на
+       * нетривиальном конфликте (TASWM-127); бесплатное вливание не карусель, а на оживлённом
+       * main оно случается на каждый чужой мерж — три сдвига main выбирали потолок, и PR с
+       * отставшей базой застревал молча (гейт мержа не пускает base_stale, а вливать уже
+       * некому). Всё остальное (failed/stalled резолверы, в т.ч. транзиентные сбои ОС) считается
+       * как раньше — иначе потолок потерял бы смысл на органических смертях.
+       */
       resolverCountFor(reviewRunId) {
-        const row = this.db.prepare("SELECT COUNT(*) n FROM runs WHERE resolves_run_id = ?").get(reviewRunId);
+        const row = this.db.prepare("SELECT COUNT(*) n FROM runs WHERE resolves_run_id = ? AND (stop_reason IS NULL OR stop_reason NOT LIKE ?)").get(reviewRunId, `%${RESOLVE_CLEAN_MARK}%`);
         return row.n;
       }
       /**
@@ -7177,7 +7273,7 @@ var init_droneStore = __esm({
 
 // src/overmind.ts
 import { homedir as homedir7 } from "os";
-import { existsSync as existsSync20, readFileSync as readFileSync25, readdirSync as readdirSync14, renameSync as renameSync12 } from "fs";
+import { existsSync as existsSync20, readFileSync as readFileSync25, readdirSync as readdirSync14, renameSync as renameSync12, statSync as statSync13 } from "fs";
 import { basename as basename6, dirname as dirname5, join as join34 } from "path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "url";
 import { spawn as spawn4 } from "child_process";
@@ -7312,6 +7408,7 @@ function renderPendingRulesBlock(rules) {
 
 // src/swarmClient.ts
 init_zoneNotes();
+init_store();
 init_toolFailure();
 
 // src/logTail.ts
@@ -7524,6 +7621,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;
 }
@@ -7991,6 +8094,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);
@@ -8061,8 +8175,10 @@ var SwarmClient = class _SwarmClient {
     const cands = [...this.runs.values()].filter((r) => r.resolves_run_id === reviewRunId && !RESOLVER_TERMINAL.has(r.status)).sort((a, b) => b.id - a.id);
     return cands.length ? this.mat(cands[0]) : null;
   }
+  // Потолок авто-попыток: чистые вливания базы (дрон не поднимался, стоимость ноль) не
+  // считаются — см. db.ts:resolverCountFor и store.ts:RESOLVE_CLEAN_MARK (TASWM-575).
   resolverCountFor(reviewRunId) {
-    return [...this.runs.values()].filter((r) => r.resolves_run_id === reviewRunId).length;
+    return [...this.runs.values()].filter((r) => r.resolves_run_id === reviewRunId && !isCleanResolve(r)).length;
   }
   // failed/stalled ревьюеры (сорвался спавн ДО вердикта) в счёт НЕ идут; stopped/superseded
   // тоже (TASWM-253: оператор закрыл зомби-ревьюера/сбросил попытки ревью — POST /swarm/
@@ -9535,6 +9651,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.
@@ -9570,6 +9689,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;
@@ -9927,6 +10047,7 @@ function parseDecision(v) {
 }
 
 // src/overmind.ts
+init_store();
 init_config();
 init_heartbeat();
 
@@ -12359,7 +12480,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.48",
+  version: "0.6.50",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12410,7 +12531,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "62a77b0a48d5a07ae71b45c5f0f6212dc6069829"
+  gitHead: "859ffe2d91bf4c791af067147515b14a41b96739"
 };
 
 // src/version.ts
@@ -12728,18 +12849,48 @@ async function prHeadBranch(prUrl, run = realRunner) {
     return null;
   }
 }
-async function prBaseSync(prUrl, run = realRunner) {
+function prRepoPath(prUrl) {
   const m = prUrl.trim().match(/github\.com\/([^/\s]+)\/([^/\s]+)\/pull\/\d+/i);
-  if (!isGithubPrUrl(prUrl) || !m) return null;
-  const [, owner, repo] = m;
+  return isGithubPrUrl(prUrl) && m ? `${m[1]}/${m[2]}` : null;
+}
+async function prBaseSync(prUrl, run = realRunner) {
+  const repoPath = prRepoPath(prUrl);
+  if (!repoPath) return null;
   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 out = await run(["api", `repos/${repoPath}/compare/${base3}...${head}?per_page=1`, "--jq", ".behind_by"]);
     const behindBy = Number(out.trim());
-    return Number.isFinite(behindBy) && behindBy >= 0 ? { behindBy, base: base3 } : null;
+    return Number.isFinite(behindBy) && behindBy >= 0 ? { behindBy, base: base3, headSha: head } : null;
+  } catch {
+    return null;
+  }
+}
+var ACTIONS_RUN_OK = /* @__PURE__ */ new Set(["success", "skipped", "neutral"]);
+async function prActionsRuns(prUrl, headSha2, run = realRunner) {
+  const repoPath = prRepoPath(prUrl);
+  if (!repoPath || !/^[0-9a-f]{7,40}$/i.test(headSha2)) return null;
+  try {
+    const j = JSON.parse(
+      await run(["api", `repos/${repoPath}/actions/runs?head_sha=${headSha2}&per_page=100&exclude_pull_requests=true`])
+    );
+    const runs = j.workflow_runs;
+    if (!Array.isArray(runs)) return null;
+    if (typeof j.total_count === "number" && j.total_count > runs.length) return null;
+    const latest = /* @__PURE__ */ new Map();
+    for (const r of runs) {
+      const key = `${r.workflow_id ?? r.name ?? "?"}:${r.event ?? "?"}`;
+      const seen = latest.get(key);
+      if (!seen || (r.id ?? 0) > (seen.id ?? 0)) latest.set(key, r);
+    }
+    const label2 = (r, what) => `${r.name || "workflow"} (${what || "?"})`;
+    return {
+      total: runs.length,
+      active: runs.filter((r) => r.status !== "completed").map((r) => label2(r, r.status)),
+      failed: [...latest.values()].filter((r) => r.status === "completed" && !ACTIONS_RUN_OK.has(r.conclusion ?? "")).map((r) => label2(r, r.conclusion))
+    };
   } catch {
     return null;
   }
@@ -15303,22 +15454,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;
@@ -15353,6 +15492,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 } : {} };
+  };
+}
 function needsBaseRefresh(d) {
   return d?.code === "base_stale";
 }
@@ -15384,9 +15641,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 } : {},
@@ -15412,7 +15675,68 @@ 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/prodMerge.ts
+init_config();
+init_taskless();
+var TIMEOUT_MS = 3e4;
+async function tokenFor(api, deps) {
+  return deps.token ? deps.token() : resolveApiToken(api);
+}
+async function prodMergePr(runId, sha, deps = {}) {
+  const api = deps.api ?? TASKLESS_API;
+  const doFetch = deps.fetchFn ?? fetch;
+  try {
+    const token = await tokenFor(api, deps);
+    if (!token) return { ok: false, error: "\u043D\u0435\u0447\u0435\u043C \u0445\u043E\u0434\u0438\u0442\u044C \u0432 \u043F\u0440\u043E\u0434 (\u043D\u0435\u0442 \u0442\u043E\u043A\u0435\u043D\u0430)" };
+    const res = await doFetch(restEndpoint(api, "/swarm/merge"), {
+      method: "POST",
+      headers: { Authorization: `Bearer ${token}`, "content-type": "application/json" },
+      body: JSON.stringify(sha ? { runId, sha } : { runId }),
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      let code;
+      try {
+        code = JSON.parse(text).error;
+      } catch {
+        code = void 0;
+      }
+      if (code === "head_moved") return { ok: false, error: "HEAD PR \u0441\u043C\u0435\u043D\u0438\u043B\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438", headMoved: true };
+      return { ok: false, error: `\u043F\u0440\u043E\u0434 \u043E\u0442\u043A\u0430\u0437\u0430\u043B (${res.status}): ${text.slice(0, 300)}` };
+    }
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
+async function prodClearMergeIntent(runId, deps = {}) {
+  const api = deps.api ?? TASKLESS_API;
+  const doFetch = deps.fetchFn ?? fetch;
+  try {
+    const token = await tokenFor(api, deps);
+    if (!token) return false;
+    const res = await doFetch(restEndpoint(api, `/swarm/merge-request/${encodeURIComponent(runId)}`), {
+      method: "DELETE",
+      headers: { Authorization: `Bearer ${token}` },
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    return res.ok;
+  } catch {
+    return false;
+  }
 }
 
 // src/envGate.ts
@@ -18000,8 +18324,8 @@ async function headSha(repo) {
 function runText(run) {
   return [run.task_title ?? "", run.task_desc ?? ""].join(" ").trim();
 }
-function predictForRun(model, run) {
-  return predictFiles(model, { zone: run.area, text: runText(run) });
+function predictForRun(model, run, fileExists) {
+  return predictFiles(model, { zone: run.area, text: runText(run), ...fileExists ? { fileExists } : {} });
 }
 function short(files, n = 3) {
   return files.slice(0, n).join(", ") + (files.length > n ? ` \u0438 \u0435\u0449\u0451 ${files.length - n}` : "");
@@ -18016,17 +18340,17 @@ var SPINE_PREDICTION_WEIGHT = 0.7;
 function spineOfPrediction(spine, predicted) {
   return predicted.filter((p) => spine.has(p.path) && p.weight >= SPINE_PREDICTION_WEIGHT).map((p) => p.path);
 }
-function decideConflict({ model, candidate, active }) {
+function decideConflict({ model, candidate, active, fileExists }) {
   if ((candidate.kind ?? "drone") !== "drone") return { kind: "clear" };
   if (!hasZoneModel(model)) return { kind: "unknown" };
-  const predicted = predictForRun(model, candidate);
+  const predicted = predictForRun(model, candidate, fileExists);
   if (!predicted.length) return { kind: "unknown" };
   if (!active.length) return { kind: "clear" };
   const spine = new Set(model.spine);
   const candidateSpine = new Set(spineOfPrediction(spine, predicted));
   if (candidateSpine.size) {
     for (const w of active) {
-      const theirSpine = w.actual ? w.files.filter((f) => spine.has(f)) : spineOfPrediction(spine, predictForRun(model, w.run));
+      const theirSpine = w.actual ? w.files.filter((f) => spine.has(f)) : spineOfPrediction(spine, predictForRun(model, w.run, fileExists));
       const shared = theirSpine.filter((f) => candidateSpine.has(f));
       if (!shared.length) continue;
       return {
@@ -18150,6 +18474,8 @@ var EXITED_CONTINUE_NUDGE = "\u0422\u0432\u043E\u044F \u043F\u0440\u043E\u0448\u
 var STORM_DEAD_LIMIT = Number(process.env.SWARM_STORM_DEAD_LIMIT) || 3;
 var CONFLICT_RESOLVE_COOLDOWN_MS = Number(process.env.SWARM_CONFLICT_COOLDOWN_MS) || 3 * 60 * 1e3;
 var RESOLVE_LIMIT = Number(process.env.SWARM_RESOLVE_LIMIT) || 3;
+var BASE_MERGED_MARK = "\u0431\u0430\u0437\u0430 \u0432\u043B\u0438\u0442\u0430 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438";
+var BASE_NOOP_MARK = "\u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E";
 var REVIEW_SPAWN_LIMIT = Number(process.env.SWARM_REVIEW_SPAWN_LIMIT) || 3;
 var REVIEW_CYCLE_LIMIT = Number(process.env.SWARM_REVIEW_CYCLE_LIMIT) || 3;
 var CI_WAKE_LIMIT = Number(process.env.SWARM_CI_WAKE_LIMIT) || 3;
@@ -18231,14 +18557,46 @@ function lastConflictAttemptMs(db, runId) {
   if (!evs.length) return null;
   return Date.parse(evs[evs.length - 1].at.replace(" ", "T") + "Z");
 }
+function lastBaseMergeWasNoop(db, runId) {
+  const outcomes = db.events(runId).filter((e) => e.kind === "conflict" && ((e.text ?? "").includes(BASE_NOOP_MARK) || (e.text ?? "").includes(BASE_MERGED_MARK)));
+  return (outcomes[outcomes.length - 1]?.text ?? "").includes(BASE_NOOP_MARK);
+}
+function resolveEscalated(db, runId) {
+  return db.events(runId).some((e) => e.kind === "conflict" && (e.text ?? "").includes(RESOLVE_ESCALATION_MARK));
+}
 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;
+  if (resolveEscalated(deps.db, run.id)) 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));
 }
+async function dropMergeIntent(deps, run, reason) {
+  if (!deps.clearMergeIntent) return false;
+  if (!await deps.clearMergeIntent(run).catch(() => false)) return false;
+  deps.db.updateRun(run.id, { merge_requested_at: null });
+  deps.db.addEvent(run.id, "step", `\u043C\u0435\u0440\u0436 \u0441\u043D\u044F\u0442: ${reason}`);
+  narrate(deps, `\u0421\u043D\u044F\u043B \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u0435 \u0441\u043C\u0435\u0440\u0436\u0438\u0442\u044C PR ${droneLabel(run)} \u2014 ${reason}.`);
+  return true;
+}
+function mergeIntentDropReason(deps, run, conflicting) {
+  if (needsFixIteration(run)) return "\u043F\u043E PR \u043F\u0440\u0438\u0448\u0451\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \xAB\u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438\xBB \u2014 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0430";
+  if (conflicting && resolveEscalated(deps.db, run.id)) return "\u0440\u043E\u0439 \u043D\u0435 \u0441\u043C\u043E\u0433 \u0441\u0432\u0435\u0441\u0442\u0438 \u0432\u0435\u0442\u043A\u0443 \u0441 \u0431\u0430\u0437\u043E\u0439 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A";
+  return null;
+}
+var MERGE_INTENT_FAIL_MARK = "\u043C\u0435\u0440\u0436 \u043F\u043E \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u044E \u043D\u0435 \u043F\u0440\u043E\u0448\u0451\u043B";
+var MERGE_INTENT_FAIL_NOTE_MS = 60 * 6e4;
+function noteMergeIntentFailure(deps, run, error, now) {
+  const text = `${MERGE_INTENT_FAIL_MARK}: ${error} \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u044E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C`;
+  const prev = deps.db.events(run.id).filter((e) => (e.text ?? "").startsWith(MERGE_INTENT_FAIL_MARK));
+  const last = prev[prev.length - 1];
+  if (last && last.text === text) {
+    const at = Date.parse(last.at.replace(" ", "T") + "Z");
+    if (!Number.isNaN(at) && now - at < MERGE_INTENT_FAIL_NOTE_MS) return;
+  }
+  deps.db.addEvent(run.id, "step", text);
+}
 function lastCiCheckMs(db, runId) {
   const evs = db.events(runId).filter((e) => e.kind === "ci_wake" || e.kind === "ci_checked");
   if (!evs.length) return null;
@@ -19669,6 +20027,13 @@ async function zoneConflictFor(db, models, activeFiles, run, repo, repoFallback)
   if (!hasZoneModel(model)) return { kind: "unknown" };
   const holders = db.listRuns().filter((r) => holdsFiles(r));
   activeFiles.prune(holders.map((r) => r.id));
+  const fileExists = (p) => {
+    try {
+      return statSync13(join34(repo, p), { throwIfNoEntry: false })?.isFile() ?? false;
+    } catch {
+      return false;
+    }
+  };
   const active = [];
   for (const r of holders) {
     if (r.id === run.id) continue;
@@ -19677,10 +20042,10 @@ async function zoneConflictFor(db, models, activeFiles, run, repo, repoFallback)
     const files = snapshot.length ? snapshot : await activeFiles.filesOf(r);
     const prUrl = r.status === "review" ? r.pr_url : null;
     active.push(
-      files.length ? { run: r, files, actual: true, prUrl } : { run: r, files: predictForRun(model, r).map((p) => p.path), actual: false, prUrl }
+      files.length ? { run: r, files, actual: true, prUrl } : { run: r, files: heldByPrediction(predictForRun(model, r, fileExists)), actual: false, prUrl }
     );
   }
-  return decideConflict({ model, candidate: run, active });
+  return decideConflict({ model, candidate: run, active, fileExists });
 }
 function activeDronesOnRepo(deps, repo, exceptRunId) {
   return deps.db.listRuns().filter(
@@ -20868,6 +21233,7 @@ async function tickOnce(deps) {
         continue;
       }
       if (prLiveness(st) === "closed") {
+        if (hasMergeIntent(run)) await dropMergeIntent(deps, run, "PR \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430");
         await finalizeClosedPrReview(deps, run, "PR \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430 \u2014 \u0440\u0435\u0432\u044C\u044E \u043E\u0442\u043C\u0435\u043D\u0435\u043D\u043E, \u043F\u0440\u043E\u0433\u043E\u043D \u0437\u0430\u043A\u0440\u044B\u0442");
         narrate(deps, `PR ${droneLabel(run)} \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430 \u2014 ${run.task_slug} \u0441\u043D\u0438\u043C\u0430\u0435\u0442\u0441\u044F \u0441 \u0440\u0435\u0432\u044C\u044E, \u0441\u043B\u043E\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u0435\u043D.`);
         continue;
@@ -20897,18 +21263,62 @@ async function tickOnce(deps) {
         continue;
       }
       await retireOutdatedReviewers(deps, run);
-      const baseStale = !st.conflicting && await needsBaseRefreshNow(deps, run, stormActive, now);
+      let intentBaseStale = false;
+      if (hasMergeIntent(run)) {
+        const drop = mergeIntentDropReason(deps, run, st.conflicting === true);
+        if (drop) {
+          if (await dropMergeIntent(deps, run, drop)) run = deps.db.getRun(run.id) ?? run;
+        } else if (deps.mergeIntent && !stormActive) {
+          const decision = await deps.mergeIntent(run).catch(() => null);
+          if (decision?.action === "clear") {
+            if (await dropMergeIntent(deps, run, decision.reason)) run = deps.db.getRun(run.id) ?? run;
+          } else if (decision?.action === "refresh_base") {
+            if (resolveEscalated(deps.db, run.id)) {
+              if (await dropMergeIntent(deps, run, "\u0440\u043E\u0439 \u043D\u0435 \u0441\u043C\u043E\u0433 \u043F\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u0432\u0435\u0442\u043A\u0443 \u043A \u0441\u0432\u0435\u0436\u0435\u0439 \u0431\u0430\u0437\u0435 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A")) run = deps.db.getRun(run.id) ?? run;
+            } else {
+              intentBaseStale = true;
+            }
+          } else if (decision?.action === "merge" && deps.mergePr && !st.conflicting) {
+            const res = await deps.mergePr(run, decision.headSha).catch((e) => ({ ok: false, error: describeError(e) }));
+            if (res.ok) {
+              deps.db.addEvent(run.id, "step", `\u0440\u043E\u0439 \u0432\u043B\u0438\u043B PR \u043F\u043E \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u043C\u0435\u0440\u0436\u0430: ${decision.reason} (TASWM-577)`);
+              narrate(deps, `\u0412\u043B\u0438\u043B PR ${droneLabel(run)} \u043F\u043E \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u043C\u0435\u0440\u0436\u0430: ${decision.reason}.`);
+              continue;
+            }
+            if ("headMoved" in res && res.headMoved) {
+              deps.db.addEvent(run.id, "step", `\u043C\u0435\u0440\u0436 \u043F\u043E \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u044E \u043E\u0442\u043B\u043E\u0436\u0435\u043D: HEAD PR \u0441\u043C\u0435\u043D\u0438\u043B\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 ${(decision.headSha ?? "").slice(0, 7)} \u2014 \u043F\u0440\u043E\u0432\u0435\u0440\u044E \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C (TASWM-580)`);
+            } else {
+              noteMergeIntentFailure(deps, run, res.error, now);
+            }
+          }
+        }
+      }
+      const baseStale = !st.conflicting && (intentBaseStale || 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;
         if (deps.db.activeResolverFor(run.id)) continue;
         if (deps.db.resolverCountFor(run.id) >= RESOLVE_LIMIT) {
-          if (!deps.db.events(run.id).some((e) => e.kind === "conflict" && (e.text ?? "").includes(RESOLVE_ESCALATION_MARK))) {
-            deps.db.addEvent(run.id, "conflict", `${RESOLVE_ESCALATION_MARK}: \u0430\u0432\u0442\u043E-\u0440\u0435\u0437\u043E\u043B\u0432\u0435\u0440 \u043D\u0435 \u0441\u043F\u0440\u0430\u0432\u0438\u043B\u0441\u044F \u0437\u0430 ${RESOLVE_LIMIT} \u043F\u043E\u043F\u044B\u0442(\u043E\u043A) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`);
+          if (!resolveEscalated(deps.db, run.id)) {
+            deps.db.addEvent(
+              run.id,
+              "conflict",
+              st.conflicting ? `${RESOLVE_ESCALATION_MARK}: \u0430\u0432\u0442\u043E-\u0440\u0435\u0437\u043E\u043B\u0432\u0435\u0440 \u043D\u0435 \u0441\u043F\u0440\u0430\u0432\u0438\u043B\u0441\u044F \u0437\u0430 ${RESOLVE_LIMIT} \u043F\u043E\u043F\u044B\u0442(\u043E\u043A) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A` : `${RESOLVE_ESCALATION_MARK}: \u0431\u0430\u0437\u0430 \u043F\u043E\u0434 PR \u0443\u0435\u0445\u0430\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434, \u0430 \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0430\u0432\u0442\u043E-\u0440\u0435\u0437\u043E\u043B\u0432\u0435\u0440\u043E\u0432 (${RESOLVE_LIMIT}) \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D \u2014 \u0432\u043B\u0438\u0442\u044C \u0431\u0430\u0437\u0443 \u0434\u043E\u043B\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`
+            );
           }
           continue;
         }
+        if (baseStale && lastBaseMergeWasNoop(deps.db, run.id)) {
+          if (!resolveEscalated(deps.db, run.id)) {
+            deps.db.addEvent(
+              run.id,
+              "conflict",
+              `${RESOLVE_ESCALATION_MARK}: \u043E\u0447\u0435\u0440\u0435\u0434\u044C \u043C\u0435\u0440\u0436\u0430 \u0441\u0447\u0438\u0442\u0430\u0435\u0442 \u0431\u0430\u0437\u0443 \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0435\u0439, \u0430 \u0432\u043B\u0438\u0432\u0430\u0442\u044C \u0432 \u0432\u0435\u0442\u043A\u0443 \u043D\u0435\u0447\u0435\u0433\u043E \u2014 \u0441\u0430\u043C\u0430 \u0441\u043E\u0431\u043E\u0439 \u0442\u0430\u043A\u0430\u044F \u0431\u0430\u0437\u0430 \u043D\u0435 \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u0441\u044F, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`
+            );
+          }
+          continue;
+        }
+        if (deps.resourcesOk && !deps.resourcesOk()) continue;
+        if (countActiveDrones(deps.db) >= droneCap) continue;
+        if (!await projectQuotaGateAllows(deps, run)) continue;
         const last = lastConflictAttemptMs(deps.db, run.id);
         if (last != null && now - last < CONFLICT_RESOLVE_COOLDOWN_MS) continue;
         deps.db.addEvent(
@@ -21514,13 +21924,14 @@ async function resolveConflict(deps, reviewRun) {
       if (m.changed) await deps.git.pushHeadTo(wt, branch);
       await deps.git.removeWorktree(repo, wt).catch(() => {
       });
-      deps.db.updateRun(resolver.id, { status: "done" });
+      const cleanWhy = m.changed ? `\u0447\u0438\u0441\u0442\u044B\u0439 merge ${mainRef} \u2014 \u0434\u0440\u043E\u043D \u043D\u0435 \u043F\u043E\u043D\u0430\u0434\u043E\u0431\u0438\u043B\u0441\u044F` : `${mainRef} \u0443\u0436\u0435 \u0432\u043B\u0438\u0442 \u2014 \u043D\u0435\u0447\u0435\u0433\u043E \u0434\u0435\u043B\u0430\u0442\u044C`;
+      deps.db.updateRun(resolver.id, { status: "done", stop_reason: `${RESOLVE_CLEAN_MARK}: ${cleanWhy}` });
+      deps.db.addEvent(resolver.id, "done", cleanWhy);
       deps.db.addEvent(
-        resolver.id,
-        "done",
-        m.changed ? `\u0447\u0438\u0441\u0442\u044B\u0439 merge ${mainRef} \u2014 \u0434\u0440\u043E\u043D \u043D\u0435 \u043F\u043E\u043D\u0430\u0434\u043E\u0431\u0438\u043B\u0441\u044F` : `${mainRef} \u0443\u0436\u0435 \u0432\u043B\u0438\u0442 \u2014 \u043D\u0435\u0447\u0435\u0433\u043E \u0434\u0435\u043B\u0430\u0442\u044C`
+        reviewRun.id,
+        "conflict",
+        m.changed ? `${BASE_MERGED_MARK} (${mainRef}, \u0431\u0435\u0437 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432) \u2014 PR \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D` : `${mainRef} \u0443\u0436\u0435 \u0432 \u0432\u0435\u0442\u043A\u0435 \u2014 ${BASE_NOOP_MARK}, \u0431\u0430\u0437\u0430 \u043E\u0442 \u044D\u0442\u043E\u0433\u043E \u043D\u0435 \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u0441\u044F`
       );
-      deps.db.addEvent(reviewRun.id, "conflict", `\u0431\u0430\u0437\u0430 \u0432\u043B\u0438\u0442\u0430 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 (${mainRef}, \u0431\u0435\u0437 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432) \u2014 PR \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D`);
     } else {
       const prompt = buildResolverPrompt(reviewRun, resolver, m.conflicts, branch, mainRef);
       const pid = deps.launch({ worktree: wt, run: resolver, prompt });
@@ -22400,7 +22811,10 @@ async function runDaemon(opts) {
         const ci = await prCiStatus(url);
         if (ci.bucket === "denied" || ci.bucket === "unavailable") return null;
         return { bucket: ci.bucket };
-      }
+      },
+      // TASWM-577: прогоны GitHub Actions на HEAD — только вливанию по намерению: рой
+      // вливает сам и обязан дождаться, пока CI на этом коммите добежит целиком.
+      actionsRuns: (url, sha) => prActionsRuns(url, sha)
     } : {}
   });
   const deps = {
@@ -22410,6 +22824,24 @@ async function runDaemon(opts) {
     worktreesDir,
     // TASWM-472: реконсайлу от очереди нужен ровно исход `base_stale` (см. needsBaseRefreshNow).
     ...SWARM_MERGE_QUEUE ? { mergeQueue: mergeParts.queue } : {},
+    // TASWM-577: вливание ПО НАМЕРЕНИЮ — та же ось, тот же вход (mergeParts), но очередь из
+    // одних отмеченных PR. Выключается тем же ключом, что и очередь: SWARM_MERGE_QUEUE=0 —
+    // рой не вливает ничего, мержит человек кнопкой, как до этой задачи.
+    ...SWARM_MERGE_QUEUE ? { mergeIntent: mergeParts.intent } : {},
+    // Сам мерж и снятие намерения идут в ПРОД-ручки (`POST /swarm/merge` — GitHub App
+    // воркспейса, squash; `DELETE /swarm/merge-request/:runId`), а адресуются они cuid'ом
+    // прогона в проде. Он есть только у клиентского бэкенда: в sqlite-режиме прогонов в
+    // проде нет вовсе, и рой там по-прежнему не мержит — мержит человек.
+    ...db instanceof SwarmClient ? {
+      mergePr: async (run, sha) => {
+        const prodId = db.prodRunId(run.id);
+        return prodId ? prodMergePr(prodId, sha) : { ok: false, error: "\u043F\u0440\u043E\u0433\u043E\u043D \u0435\u0449\u0451 \u043D\u0435 \u0434\u043E\u043B\u0435\u0442\u0435\u043B \u0434\u043E \u043F\u0440\u043E\u0434\u0430 \u2014 \u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u043C" };
+      },
+      clearMergeIntent: async (run) => {
+        const prodId = db.prodRunId(run.id);
+        return prodId ? prodClearMergeIntent(prodId) : false;
+      }
+    } : {},
     narrate: narrator.narrate,
     control,
     spawn: async (run) => {