@taskless-app/swarm 0.5.0 → 0.6.0

package/dist/overmind.js

@@ -720,6 +720,14 @@ var init_hosts = __esm({
   }
 });
 
+// ../swarm-core/src/hostPool.ts
+var init_hostPool = __esm({
+  "../swarm-core/src/hostPool.ts"() {
+    "use strict";
+    init_hosts();
+  }
+});
+
 // ../swarm-core/src/hostCommands.ts
 function isHostCommandKind(v) {
   return typeof v === "string" && HOST_COMMAND_KINDS.includes(v);
@@ -729,17 +737,20 @@ function isHostCommandExpired(expiresAt, nowMs) {
   const at = Date.parse(expiresAt);
   return Number.isFinite(at) && at <= nowMs;
 }
+function isRunScopedCommand(kind) {
+  return RUN_SCOPED.has(kind);
+}
 function hostCommandLabel(cmd) {
   const base3 = HOST_COMMAND_LABELS[cmd.kind];
   if (cmd.kind === "set_max_drones" && cmd.maxDrones != null) return `${base3} \u2192 ${cmd.maxDrones}`;
-  if (cmd.kind === "stop_run" && cmd.runSlug) return `${base3} ${cmd.runSlug}`;
+  if (isRunScopedCommand(cmd.kind) && cmd.runSlug) return `${base3} ${cmd.runSlug}`;
   return base3;
 }
-var HOST_COMMAND_KINDS, HOST_COMMAND_STATUSES, TERMINAL, HOST_COMMAND_OPEN_STATUSES, UPDATE_STEP_LABELS, HOST_COMMAND_TTL_MS, HOST_COMMAND_KEEPALIVE_MS, HOST_COMMAND_LABELS, MAX_DRONES_LIMIT;
+var HOST_COMMAND_KINDS, HOST_COMMAND_STATUSES, TERMINAL, HOST_COMMAND_OPEN_STATUSES, UPDATE_STEP_LABELS, HOST_COMMAND_TTL_MS, HOST_COMMAND_KEEPALIVE_MS, HOST_COMMAND_LABELS, RUN_SCOPED_COMMAND_KINDS, RUN_SCOPED, MAX_DRONES_LIMIT;
 var init_hostCommands = __esm({
   "../swarm-core/src/hostCommands.ts"() {
     "use strict";
-    HOST_COMMAND_KINDS = ["pause", "resume", "restart", "update", "set_max_drones", "stop_run"];
+    HOST_COMMAND_KINDS = ["pause", "resume", "restart", "update", "set_max_drones", "stop_run", "wake_run"];
     HOST_COMMAND_STATUSES = ["pending", "delivered", "running", "done", "failed", "rejected", "expired"];
     TERMINAL = /* @__PURE__ */ new Set(["done", "failed", "rejected", "expired"]);
     HOST_COMMAND_OPEN_STATUSES = HOST_COMMAND_STATUSES.filter((s) => !TERMINAL.has(s));
@@ -758,8 +769,11 @@ var init_hostCommands = __esm({
       restart: "\u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A",
       update: "\u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u0434\u043E \u0441\u0432\u0435\u0436\u0435\u0433\u043E \u043A\u043E\u0434\u0430",
       set_max_drones: "\u0441\u043C\u0435\u043D\u0430 \u0447\u0438\u0441\u043B\u0430 \u0434\u0440\u043E\u043D\u043E\u0432",
-      stop_run: "\u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430"
+      stop_run: "\u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430",
+      wake_run: "\u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0441 \u0442\u043E\u0433\u043E \u0436\u0435 \u043C\u0435\u0441\u0442\u0430"
     };
+    RUN_SCOPED_COMMAND_KINDS = ["stop_run", "wake_run"];
+    RUN_SCOPED = new Set(RUN_SCOPED_COMMAND_KINDS);
     MAX_DRONES_LIMIT = 8;
   }
 });
@@ -774,6 +788,436 @@ var init_relief = __esm({
   }
 });
 
+// ../swarm-core/src/cost.ts
+var EMPTY_TASK_COST;
+var init_cost = __esm({
+  "../swarm-core/src/cost.ts"() {
+    "use strict";
+    EMPTY_TASK_COST = Object.freeze({
+      costUsd: 0,
+      tokensIn: 0,
+      tokensOut: 0,
+      durationMs: 0,
+      runs: 0,
+      respawns: 0
+    });
+  }
+});
+
+// ../swarm-core/src/runGuards.ts
+var DEFAULT_RUN_LIMITS;
+var init_runGuards = __esm({
+  "../swarm-core/src/runGuards.ts"() {
+    "use strict";
+    DEFAULT_RUN_LIMITS = {
+      maxCostUsd: 20,
+      runTimeoutMs: 8 * 60 * 6e4,
+      stepTimeoutMs: 90 * 6e4,
+      lostMs: 30 * 6e4
+    };
+  }
+});
+
+// ../swarm-core/src/codeZones.ts
+function hasZoneModel(m) {
+  return m.tasks > 0 && m.zones.length > 0;
+}
+function testFileFeature(basename5) {
+  const head = basename5.replace(/\.(test|spec)\.[a-z]+$/i, "").split(".")[0].toLowerCase();
+  return head && !GENERIC_DIRS.has(head) ? head : null;
+}
+function pathZoneCandidate(path) {
+  const parts = path.split("/").filter(Boolean);
+  if (parts.length <= 1) return "root";
+  if (WORKSPACE_DIRS.has(parts[0]) && parts.length >= 3) {
+    const pkg = parts[1];
+    if (parts[2] === "src" && parts.length >= 5) {
+      const feature = parts[3];
+      if (!GENERIC_DIRS.has(feature)) return feature;
+    }
+    if (GENERIC_TEST_DIRS.has(parts[2])) {
+      const feature = testFileFeature(parts[parts.length - 1]);
+      if (feature) return feature;
+    }
+    return pkg;
+  }
+  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)) {
+    if (!raw) continue;
+    for (const piece of raw.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(" ")) {
+      const t = piece.toLowerCase();
+      if (t.length < 3 || STOP_TERMS.has(t) || /^\d+$/.test(t)) continue;
+      out.push(t);
+    }
+  }
+  return out;
+}
+function normalizeZoneName(raw) {
+  if (!raw) return null;
+  const s = raw.trim().toLowerCase().replace(/^area:/, "");
+  return s || null;
+}
+function bump(m, k, by = 1) {
+  m.set(k, (m.get(k) ?? 0) + by);
+}
+function topKey(m) {
+  let best = null;
+  let bestN = 0;
+  let total = 0;
+  for (const [k, n] of m) {
+    total += n;
+    if (n > bestN) {
+      best = k;
+      bestN = n;
+    }
+  }
+  return best === null || total === 0 ? null : { key: best, count: bestN, share: bestN / total };
+}
+function buildZoneModel(entries, opts = {}) {
+  const o = { ...DEFAULTS, ...opts };
+  const tasks = entries.filter((e) => e.files.length > 0);
+  if (tasks.length < o.minTasks) return EMPTY_ZONE_MODEL;
+  const fileTasks = /* @__PURE__ */ new Map();
+  const candidate = /* @__PURE__ */ new Map();
+  for (const t of tasks) {
+    for (const f of new Set(t.files)) {
+      bump(fileTasks, f);
+      if (!candidate.has(f)) candidate.set(f, pathZoneCandidate(f));
+    }
+  }
+  const zoneOf = new Map(candidate);
+  for (const [file, seen] of fileTasks) {
+    if (seen < 2) continue;
+    const votes = /* @__PURE__ */ new Map();
+    for (const t of tasks) {
+      const files = [...new Set(t.files)];
+      if (!files.includes(file)) continue;
+      const others = files.filter((f) => f !== file);
+      if (!others.length) continue;
+      for (const f of others) bump(votes, candidate.get(f), 1 / others.length);
+    }
+    const top = topKey(votes);
+    if (top && top.share >= 0.6 && top.key !== candidate.get(file)) zoneOf.set(file, top.key);
+  }
+  const voteWeight = (file) => 1 / Math.log2(2 + (fileTasks.get(file) ?? 1));
+  const taskZonePre = /* @__PURE__ */ new Map();
+  for (const t of tasks) {
+    const votes = /* @__PURE__ */ new Map();
+    for (const f of new Set(t.files)) bump(votes, zoneOf.get(f), voteWeight(f));
+    const top = topKey(votes);
+    if (top) taskZonePre.set(t.slug, top.key);
+  }
+  const fileZones = /* @__PURE__ */ new Map();
+  for (const t of tasks) {
+    const tz = taskZonePre.get(t.slug);
+    if (!tz) continue;
+    for (const f of new Set(t.files)) {
+      let m = fileZones.get(f);
+      if (!m) fileZones.set(f, m = /* @__PURE__ */ new Map());
+      bump(m, tz);
+    }
+  }
+  const spineSet = /* @__PURE__ */ new Set();
+  for (const [file, seen] of fileTasks) {
+    if (seen < o.spineMinTasks) continue;
+    const zonesOfFile = fileZones.get(file);
+    const dominant = zonesOfFile ? topKey(zonesOfFile) : null;
+    if ((zonesOfFile?.size ?? 0) < o.spineMinZones) continue;
+    if (dominant && dominant.share >= o.spineDominantShare) continue;
+    spineSet.add(file);
+  }
+  const fileZone = /* @__PURE__ */ new Map();
+  for (const [f, z2] of zoneOf) if (!spineSet.has(f)) fileZone.set(f, z2);
+  const taskZone = /* @__PURE__ */ new Map();
+  for (const t of tasks) {
+    const votes = /* @__PURE__ */ new Map();
+    for (const f of new Set(t.files)) {
+      const z2 = fileZone.get(f);
+      if (z2) bump(votes, z2, voteWeight(f));
+    }
+    const top = topKey(votes);
+    taskZone.set(t.slug, top ? top.key : SPINE_ZONE);
+  }
+  const labelVotes = /* @__PURE__ */ new Map();
+  for (const t of tasks) {
+    const manual = normalizeZoneName(t.area);
+    const z2 = taskZone.get(t.slug);
+    if (!manual || !z2 || z2 === SPINE_ZONE || manual === SPINE_ZONE) continue;
+    let m = labelVotes.get(z2);
+    if (!m) labelVotes.set(z2, m = /* @__PURE__ */ new Map());
+    bump(m, manual);
+  }
+  const rename = /* @__PURE__ */ new Map();
+  const takenNames = /* @__PURE__ */ new Set([SPINE_ZONE]);
+  const clustersByEvidence = [...labelVotes.entries()].sort((a, b) => {
+    const sum = (m) => [...m.values()].reduce((x, y) => x + y, 0);
+    return sum(b[1]) - sum(a[1]) || a[0].localeCompare(b[0]);
+  });
+  for (const [zone, votes] of clustersByEvidence) {
+    const top = topKey(votes);
+    if (!top || top.share < 0.6 || takenNames.has(top.key) || top.key === zone) continue;
+    rename.set(zone, top.key);
+    takenNames.add(top.key);
+  }
+  const renamed = (z2) => rename.get(z2) ?? z2;
+  if (rename.size) {
+    for (const [f, z2] of fileZone) fileZone.set(f, renamed(z2));
+    for (const [s, z2] of taskZone) taskZone.set(s, renamed(z2));
+  }
+  const zoneTerms = /* @__PURE__ */ new Map();
+  const addTerm = (zone, term, w) => {
+    let m = zoneTerms.get(zone);
+    if (!m) zoneTerms.set(zone, m = /* @__PURE__ */ new Map());
+    bump(m, term, w);
+  };
+  for (const [f, z2] of fileZone) for (const term of tokenize(f)) addTerm(z2, term, 1);
+  for (const f of spineSet) for (const term of tokenize(f)) addTerm(SPINE_ZONE, term, 1);
+  for (const t of tasks) {
+    const z2 = taskZone.get(t.slug);
+    if (!z2 || !t.text) continue;
+    for (const term of tokenize(t.text)) addTerm(z2, term, 2);
+  }
+  const termZones = /* @__PURE__ */ new Map();
+  for (const terms of zoneTerms.values()) for (const term of terms.keys()) bump(termZones, term);
+  const zoneFiles = /* @__PURE__ */ new Map();
+  for (const [f, z2] of fileZone) {
+    const arr = zoneFiles.get(z2) ?? [];
+    arr.push(f);
+    zoneFiles.set(z2, arr);
+  }
+  const zoneTaskCount = /* @__PURE__ */ new Map();
+  for (const z2 of taskZone.values()) bump(zoneTaskCount, z2);
+  const byFreq = (a, b) => (fileTasks.get(b) ?? 0) - (fileTasks.get(a) ?? 0) || a.localeCompare(b);
+  const zones = [...zoneFiles.entries()].map(([zone, files]) => ({ zone, tasks: zoneTaskCount.get(zone) ?? 0, files: files.sort(byFreq) })).sort((a, b) => b.tasks - a.tasks || a.zone.localeCompare(b.zone));
+  const spine = [...spineSet].sort(byFreq);
+  if (spineSet.size) zones.push({ zone: SPINE_ZONE, tasks: zoneTaskCount.get(SPINE_ZONE) ?? 0, files: spine });
+  const entryTerms = tasks.map((t) => new Set(t.text ? tokenize(t.text) : []));
+  return { tasks: tasks.length, zones, fileZone, spine, taskZone, zoneTerms, termZones, entries: tasks, entryTerms };
+}
+function zoneForFiles(model, files) {
+  if (!hasZoneModel(model) || !files.length) return null;
+  const spineSet = new Set(model.spine);
+  const touchedSpine = files.filter((f) => spineSet.has(f));
+  const votes = /* @__PURE__ */ new Map();
+  for (const f of new Set(files)) {
+    const z2 = model.fileZone.get(f) ?? (spineSet.has(f) ? null : pathZoneCandidate(f));
+    if (z2) bump(votes, z2);
+  }
+  const top = topKey(votes);
+  if (!top) {
+    return {
+      zone: SPINE_ZONE,
+      confidence: 1,
+      why: `\u0432\u0441\u0435 \u0444\u0430\u0439\u043B\u044B \u2014 \u043E\u0431\u0449\u0438\u0439 \u0445\u0440\u0435\u0431\u0435\u0442 (${touchedSpine.slice(0, 3).join(", ")})`,
+      spine: true
+    };
+  }
+  return {
+    zone: top.key,
+    confidence: top.share,
+    why: `${top.count} \u0438\u0437 ${[...votes.values()].reduce((a, b) => a + b, 0)} \u0444\u0430\u0439\u043B\u043E\u0432 \u2014 \u0437\u043E\u043D\u0430 ${top.key}`,
+    spine: touchedSpine.length > 0
+  };
+}
+function suggestZonesFromText(model, text, limit = 3) {
+  if (!hasZoneModel(model)) return [];
+  const terms = tokenize(text);
+  if (!terms.length) return [];
+  const zoneCount = model.zoneTerms.size || 1;
+  const idf = (term) => Math.log(1 + zoneCount / (model.termZones.get(term) ?? 1));
+  const scores = /* @__PURE__ */ new Map();
+  const hits = /* @__PURE__ */ new Map();
+  const tasksOfZone = new Map(model.zones.map((z2) => [z2.zone, z2.tasks]));
+  for (const [zone, dict] of model.zoneTerms) {
+    if ((tasksOfZone.get(zone) ?? 0) < 2) continue;
+    let dot = 0;
+    let norm = 0;
+    const matched = [];
+    for (const [term, w] of dict) {
+      const v = Math.log(1 + w) * idf(term);
+      norm += v * v;
+    }
+    if (!norm) continue;
+    for (const term of new Set(terms)) {
+      const w = dict.get(term);
+      if (!w) continue;
+      dot += Math.log(1 + w) * idf(term) * idf(term);
+      matched.push(term);
+    }
+    const score = dot / Math.sqrt(norm) * Math.log(1 + (tasksOfZone.get(zone) ?? 1));
+    if (score > 0) {
+      scores.set(zone, score);
+      hits.set(zone, matched);
+    }
+  }
+  const total = [...scores.values()].reduce((a, b) => a + b, 0);
+  if (!total) return [];
+  return [...scores.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, limit).map(([zone, s]) => ({
+    zone,
+    confidence: s / total,
+    why: `\u0441\u043E\u0432\u043F\u0430\u043B\u043E \u043F\u043E \u0441\u043B\u043E\u0432\u0430\u043C: ${(hits.get(zone) ?? []).slice(0, 5).join(", ")}`,
+    spine: zone === SPINE_ZONE
+  }));
+}
+function similarTasks(model, text, limit = 5) {
+  const terms = new Set(tokenize(text));
+  if (!terms.size) return [];
+  const scored = [];
+  for (const [i, e] of model.entries.entries()) {
+    const other = model.entryTerms[i];
+    if (!other?.size) continue;
+    let inter = 0;
+    for (const t of terms) if (other.has(t)) inter += Math.log(1 + (model.zoneTerms.size || 1) / (model.termZones.get(t) ?? 1));
+    if (inter <= 0) continue;
+    scored.push({ entry: e, score: inter / Math.sqrt(terms.size * other.size) });
+  }
+  return scored.sort((a, b) => b.score - a.score).slice(0, limit);
+}
+function predictFiles(model, opts) {
+  if (!hasZoneModel(model)) return [];
+  const limit = opts.limit ?? 40;
+  const best = /* @__PURE__ */ new Map();
+  const put = (path, weight, why) => {
+    const cur = best.get(path);
+    if (!cur || cur.weight < weight) best.set(path, { path, weight, why });
+  };
+  if (opts.text) {
+    const sim = similarTasks(model, opts.text, opts.similar ?? 5);
+    const topScore = sim[0]?.score ?? 0;
+    for (const { entry, score } of sim) {
+      const w = topScore > 0 ? Math.min(1, score / topScore) : 0;
+      for (const f of new Set(entry.files)) put(f, Math.max(0.35, w * 0.9), `\u043F\u043E\u0445\u043E\u0436\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 ${entry.slug}`);
+    }
+  }
+  const zone = normalizeZoneName(opts.zone) ?? (opts.text ? suggestZonesFromText(model, opts.text)[0]?.zone ?? null : null);
+  if (zone) {
+    const stat = model.zones.find((z2) => z2.zone === zone);
+    if (stat) stat.files.slice(0, limit).forEach((f, i) => put(f, Math.max(0.12, 0.45 - i * 0.02), `\u0437\u043E\u043D\u0430 ${zone}`));
+  }
+  return [...best.values()].sort((a, b) => b.weight - a.weight || a.path.localeCompare(b.path)).slice(0, limit);
+}
+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: [] };
+  let hit = 0;
+  let strong = false;
+  const sharedFiles = [];
+  const sharedDirs = /* @__PURE__ */ new Set();
+  for (const p of predicted) {
+    if (actualSet.has(p.path)) {
+      hit += p.weight;
+      sharedFiles.push(p.path);
+      if (p.weight >= o.strongFile) strong = true;
+      continue;
+    }
+    const d = dirOf(p.path);
+    if (d && actualDirs.has(d)) {
+      hit += p.weight * 0.25;
+      sharedDirs.add(d);
+    }
+  }
+  const score = Math.min(1, hit / totalWeight);
+  return {
+    overlap: strong || score >= o.threshold,
+    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 init_codeZones = __esm({
+  "../swarm-core/src/codeZones.ts"() {
+    "use strict";
+    SPINE_ZONE = "core";
+    DEFAULTS = {
+      minTasks: 5,
+      spineMinTasks: 3,
+      spineMinZones: 3,
+      spineDominantShare: 0.6
+    };
+    EMPTY_ZONE_MODEL = {
+      tasks: 0,
+      zones: [],
+      fileZone: /* @__PURE__ */ new Map(),
+      spine: [],
+      taskZone: /* @__PURE__ */ new Map(),
+      zoneTerms: /* @__PURE__ */ new Map(),
+      termZones: /* @__PURE__ */ new Map(),
+      entries: [],
+      entryTerms: []
+    };
+    GENERIC_DIRS = /* @__PURE__ */ new Set([
+      "src",
+      "source",
+      "lib",
+      "libs",
+      "util",
+      "utils",
+      "common",
+      "internal",
+      "app",
+      "test",
+      "tests",
+      "__tests__",
+      "spec",
+      "specs",
+      "index"
+    ]);
+    WORKSPACE_DIRS = /* @__PURE__ */ new Set(["packages", "apps", "services", "libs", "modules"]);
+    GENERIC_TEST_DIRS = /* @__PURE__ */ new Set(["tests", "test", "__tests__", "spec"]);
+    STOP_TERMS = /* @__PURE__ */ new Set([
+      "the",
+      "and",
+      "for",
+      "with",
+      "from",
+      "into",
+      "src",
+      "test",
+      "tests",
+      "index",
+      "packages",
+      "package",
+      "json",
+      "yml",
+      "yaml",
+      "tsx",
+      "mjs",
+      "cjs",
+      "\u0447\u0442\u043E",
+      "\u043A\u0430\u043A",
+      "\u0434\u043B\u044F",
+      "\u043F\u0440\u0438",
+      "\u044D\u0442\u043E",
+      "\u0438\u043B\u0438",
+      "\u0435\u0441\u043B\u0438",
+      "\u0447\u0442\u043E\u0431\u044B",
+      "\u0442\u043E\u0436\u0435",
+      "\u0435\u0433\u043E",
+      "\u0432\u0441\u0435",
+      "feat",
+      "fix",
+      "chore",
+      "docs",
+      "refactor",
+      "\u043F\u0435\u0440\u0444",
+      "wip"
+    ]);
+    OVERLAP_DEFAULTS = { threshold: 0.2, strongFile: 0.35 };
+  }
+});
+
 // ../swarm-core/src/index.ts
 var init_src = __esm({
   "../swarm-core/src/index.ts"() {
@@ -790,8 +1234,483 @@ var init_src = __esm({
     init_names();
     init_baseBranch();
     init_hosts();
+    init_hostPool();
     init_hostCommands();
     init_relief();
+    init_cost();
+    init_runGuards();
+    init_codeZones();
+  }
+});
+
+// src/claudeBin.ts
+import { existsSync as existsSync2, readdirSync } from "fs";
+import { win32 as winPath } from "path";
+function compareVersionDirs(a, b) {
+  const parts = (s) => s.split(".").map((p) => Number.isFinite(Number(p)) ? Number(p) : -1);
+  const pa = parts(a);
+  const pb = parts(b);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const d = (pa[i] ?? 0) - (pb[i] ?? 0);
+    if (d !== 0) return d;
+  }
+  return 0;
+}
+function realListDir(dir) {
+  try {
+    return readdirSync(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+  } catch {
+    return [];
+  }
+}
+function winVersionRoots(env, listDir) {
+  const roots = [];
+  const appData = env.APPDATA;
+  if (appData) roots.push(winPath.join(appData, "Claude", "claude-code"));
+  const localAppData = env.LOCALAPPDATA;
+  if (localAppData) {
+    const packages = winPath.join(localAppData, "Packages");
+    for (const name of listDir(packages)) {
+      if (!name.startsWith("Claude")) continue;
+      roots.push(winPath.join(packages, name, "LocalCache", "Roaming", "Claude", "claude-code"));
+    }
+  }
+  return roots;
+}
+function findWindowsClaude(opts = {}) {
+  const env = opts.env ?? process.env;
+  const listDir = opts.listDir ?? realListDir;
+  const fileExists = opts.fileExists ?? existsSync2;
+  let best = null;
+  for (const root of winVersionRoots(env, listDir)) {
+    for (const version of listDir(root)) {
+      const candidate = winPath.join(root, version, "claude.exe");
+      if (!fileExists(candidate)) continue;
+      if (!best || compareVersionDirs(version, best.version) > 0) best = { version, path: candidate };
+    }
+  }
+  return best?.path ?? null;
+}
+function resolveClaudeBin(opts = {}) {
+  const env = opts.env ?? process.env;
+  const platform = opts.platform ?? process.platform;
+  const explicit = (env.SWARM_CLAUDE_BIN ?? "").trim();
+  if (explicit) return explicit;
+  if (platform !== "win32") return CLAUDE_FALLBACK;
+  if (windowsScanDone) return cachedWindowsBin ?? CLAUDE_FALLBACK;
+  windowsScanDone = true;
+  const found = findWindowsClaude({ ...opts, env });
+  cachedWindowsBin = found;
+  if (found) return found;
+  if (!warnedNoWindowsClaude) {
+    warnedNoWindowsClaude = true;
+    console.warn(
+      "[overmind] claude.exe \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u043D\u0438 \u0432 %APPDATA%\\Claude\\claude-code, \u043D\u0438 \u0432 MSIX-\u043A\u043E\u043F\u0438\u0438 \u043F\u043E\u0434 %LOCALAPPDATA%\\Packages\\Claude* \u2014 \u0441\u043F\u0430\u0432\u043D\u044E \u0433\u043E\u043B\u043E\u0435 \xABclaude\xBB (\u043F\u043E\u0438\u0441\u043A \u043F\u043E PATH+PATHEXT). \u0423\u043F\u0430\u0434\u0451\u0442 ENOENT (bash-\u043E\u0431\u0451\u0440\u0442\u043A\u0430 \u0431\u0435\u0437 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0432 PATH \u043D\u0435 \u0432\u0438\u0434\u043D\u0430 spawn'\u0443) \u2014 \u0437\u0430\u0434\u0430\u0439\u0442\u0435 SWARM_CLAUDE_BIN \u043F\u0443\u0442\u0451\u043C \u043A \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u043C\u0443 claude.exe."
+    );
+  }
+  return CLAUDE_FALLBACK;
+}
+var CLAUDE_FALLBACK, warnedNoWindowsClaude, cachedWindowsBin, windowsScanDone;
+var init_claudeBin = __esm({
+  "src/claudeBin.ts"() {
+    "use strict";
+    CLAUDE_FALLBACK = "claude";
+    warnedNoWindowsClaude = false;
+    cachedWindowsBin = null;
+    windowsScanDone = false;
+  }
+});
+
+// src/pricing.ts
+function costFromUsage(usage, model, table = MODEL_PRICING) {
+  const pricing = model ? table[model] : void 0;
+  if (!pricing) {
+    return { costUsd: 0, warning: `\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043C\u043E\u0434\u0435\u043B\u044C \u0434\u043B\u044F \u043F\u0440\u0430\u0439\u0441\u0438\u043D\u0433\u0430: "${model ?? ""}" \u2014 cost \u043D\u0435 \u043F\u043E\u0441\u0447\u0438\u0442\u0430\u043D` };
+  }
+  const input = usage.input_tokens ?? 0;
+  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;
+  return { costUsd };
+}
+var MODEL_PRICING, CACHE_READ_FACTOR, CACHE_WRITE_5M_FACTOR;
+var init_pricing = __esm({
+  "src/pricing.ts"() {
+    "use strict";
+    MODEL_PRICING = {
+      // Вводная цена Sonnet 5 действует до 31.08.2026, после чего вернётся к 3/15.
+      // Дата не автоматизируется намеренно: одна строка раз в жизни дешевле, чем
+      // ветвление по времени внутри расчёта стоимости.
+      "claude-sonnet-5": { inputPerMTok: 2, outputPerMTok: 10 },
+      "claude-opus-5": { inputPerMTok: 5, outputPerMTok: 25 },
+      // Прогоны на 4.8 остаются в истории — строку держим ради их стоимости.
+      "claude-opus-4-8": { inputPerMTok: 5, outputPerMTok: 25 },
+      "claude-haiku-4-5": { inputPerMTok: 1, outputPerMTok: 5 }
+    };
+    CACHE_READ_FACTOR = 0.1;
+    CACHE_WRITE_5M_FACTOR = 1.25;
+  }
+});
+
+// src/claudeResult.ts
+function parseClaudeResultJson(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  try {
+    const parsed = JSON.parse(trimmed);
+    return typeof parsed === "object" && parsed !== null ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function launchCostUsd(result, model) {
+  if (typeof result.total_cost_usd === "number" && result.total_cost_usd > 0) {
+    return { costUsd: result.total_cost_usd };
+  }
+  if (!result.usage) return { costUsd: 0 };
+  return costFromUsage(result.usage, model);
+}
+function launchSpend(result) {
+  const u = result.usage ?? {};
+  const num = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
+  return {
+    tokensIn: num(u.input_tokens) + num(u.cache_creation_input_tokens) + num(u.cache_read_input_tokens),
+    tokensOut: num(u.output_tokens),
+    durationMs: num(result.duration_ms)
+  };
+}
+var init_claudeResult = __esm({
+  "src/claudeResult.ts"() {
+    "use strict";
+    init_pricing();
+  }
+});
+
+// src/executors/claudeCode.ts
+import { readdirSync as readdirSync2, statSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
+function claudeArgs(cfgPath, prompt, continueSession = false, model, pluginDirs = [], settings) {
+  const pluginFlags = pluginDirs.flatMap((dir) => ["--plugin-dir", dir]);
+  const base3 = [
+    "--dangerously-skip-permissions",
+    ...ISOLATION_FLAGS,
+    "--mcp-config",
+    cfgPath,
+    ...settings ? ["--settings", settings] : [],
+    ...pluginFlags,
+    "--output-format",
+    "json",
+    "-p",
+    prompt
+  ];
+  const withModel = model ? ["--model", model, ...base3] : base3;
+  return continueSession ? ["--continue", ...withModel] : withModel;
+}
+function droneDenyRules(paths) {
+  const abs = (p) => `//${p.replace(/^\/+/, "")}`;
+  return paths.flatMap((p) => [`Read(${abs(p)})`, `Edit(${abs(p)})`]);
+}
+function droneSettingsJson(paths) {
+  return JSON.stringify({ permissions: { deny: droneDenyRules(paths) } });
+}
+function transcriptDir(worktree, projectsDir) {
+  return join2(projectsDir, worktree.replace(/[/.]/g, "-"));
+}
+function sessionTranscriptExists(worktree, projectsDir = join2(homedir(), ".claude", "projects")) {
+  try {
+    return readdirSync2(transcriptDir(worktree, projectsDir)).some((f) => f.endsWith(".jsonl"));
+  } catch {
+    return false;
+  }
+}
+function transcriptMtimeMs(worktree, projectsDir = join2(homedir(), ".claude", "projects")) {
+  const dir = transcriptDir(worktree, projectsDir);
+  let files;
+  try {
+    files = readdirSync2(dir);
+  } catch {
+    return null;
+  }
+  let latest = null;
+  for (const f of files) {
+    if (!f.endsWith(".jsonl")) continue;
+    try {
+      const mtime2 = statSync(join2(dir, f)).mtimeMs;
+      if (latest === null || mtime2 > latest) latest = mtime2;
+    } catch {
+    }
+  }
+  return latest;
+}
+function writeMcpConfig(spec) {
+  const cfg = {
+    mcpServers: {
+      [spec.mcp.name]: { command: spec.mcp.command, args: spec.mcp.args, env: spec.mcp.env }
+    }
+  };
+  const path = join2(spec.worktree, MCP_CONFIG_FILE);
+  writeFileSync2(path, JSON.stringify(cfg, null, 2));
+  return path;
+}
+var ISOLATION_FLAGS, MCP_CONFIG_FILE, claudeCodeExecutor;
+var init_claudeCode = __esm({
+  "src/executors/claudeCode.ts"() {
+    "use strict";
+    init_claudeBin();
+    init_claudeResult();
+    ISOLATION_FLAGS = ["--setting-sources", "project", "--strict-mcp-config"];
+    MCP_CONFIG_FILE = ".swarm-mcp.json";
+    claudeCodeExecutor = {
+      id: "claude-code",
+      title: "Claude Code (claude)",
+      binEnv: "SWARM_CLAUDE_BIN",
+      install: { what: "Claude Code CLI \u2014 \u0438\u043C \u0434\u0440\u043E\u043D \u043F\u0438\u0448\u0435\u0442 \u043A\u043E\u0434", pkg: "@anthropic-ai/claude-code" },
+      resolveBin: () => resolveClaudeBin(),
+      // Стрелка, а не метод: `plan` могут вызвать в отрыве от объекта (деструктуризация в тестах,
+      // проброс колбэком), и `this` тогда уедет в undefined.
+      plan: (spec) => {
+        const cfgPath = writeMcpConfig(spec);
+        const settings = spec.denyPaths.length > 0 ? droneSettingsJson(spec.denyPaths) : void 0;
+        return {
+          bin: resolveClaudeBin(),
+          args: claudeArgs(cfgPath, spec.prompt, spec.continueSession, spec.model, spec.skillDirs, settings)
+        };
+      },
+      parseResult(raw, model) {
+        const result = parseClaudeResultJson(raw);
+        if (!result) return null;
+        const est = launchCostUsd(result, model);
+        const spend = launchSpend(result);
+        return {
+          costUsd: est.costUsd,
+          ...est.warning ? { warning: est.warning } : {},
+          tokensIn: spend.tokensIn,
+          tokensOut: spend.tokensOut,
+          durationMs: spend.durationMs
+        };
+      },
+      session: {
+        exists: (worktree) => sessionTranscriptExists(worktree),
+        mtimeMs: (worktree) => transcriptMtimeMs(worktree)
+      },
+      // `claude -p "ok" --max-turns 1` (TASWM-23) — прямее, чем HEAD на статус-хост: дёргает ТОТ
+      // ЖЕ путь (auth + реальный ответ модели), что и дрон. ISOLATION_FLAGS те же, что у дрона
+      // (TASWM-90): SessionStart-хуки юзера могли бы подвесить пробу и дать ложный шторм.
+      probe: {
+        args: [...ISOLATION_FLAGS, "-p", "ok", "--max-turns", "1"],
+        // TASWM-214: исчерпанный лимит подписки — НЕ шторм провайдера, и путать их нельзя.
+        limitPattern: /(weekly limit|usage limit|hit your .*limit)/i
+      }
+    };
+  }
+});
+
+// src/swarmHome.ts
+import { homedir as homedir2 } from "os";
+import { join as join3 } from "path";
+import { mkdirSync } from "fs";
+var SWARM_HOME;
+var init_swarmHome = __esm({
+  "src/swarmHome.ts"() {
+    "use strict";
+    SWARM_HOME = process.env.SWARM_HOME || join3(homedir2(), ".taskless-swarm");
+    mkdirSync(SWARM_HOME, { recursive: true });
+  }
+});
+
+// src/executors/codex.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readdirSync as readdirSync3, statSync as statSync2, symlinkSync } from "fs";
+import { join as join4 } from "path";
+function resolveCodexBin(env = process.env) {
+  return (env.SWARM_CODEX_BIN ?? "").trim() || "codex";
+}
+function codexHomePath(worktree, swarmHome = SWARM_HOME) {
+  return join4(swarmHome, "executor-state", "codex", worktree.replace(/[/.]/g, "-"));
+}
+function ensureCodexHome(worktree, realHome, env = process.env, swarmHome = SWARM_HOME) {
+  const home = codexHomePath(worktree, swarmHome);
+  mkdirSync2(home, { recursive: true });
+  const real = (env.CODEX_HOME ?? "").trim() || join4(realHome, ".codex");
+  for (const file of ["auth.json", "config.toml"]) {
+    const target = join4(real, file);
+    const link = join4(home, file);
+    if (!existsSync3(target) || existsSync3(link)) continue;
+    try {
+      symlinkSync(target, link);
+    } catch {
+    }
+  }
+  return home;
+}
+function tomlValue(v) {
+  if (typeof v === "string") {
+    const escaped = v.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+    return `"${escaped}"`;
+  }
+  if (Array.isArray(v)) return `[${v.map((x) => tomlValue(x)).join(", ")}]`;
+  return `{${Object.entries(v).map(([k, val]) => `${k} = ${tomlValue(val)}`).join(", ")}}`;
+}
+function mcpConfigArgs(spec) {
+  const inline = `{command = ${tomlValue(spec.mcp.command)}, args = ${tomlValue(spec.mcp.args)}, env = ${tomlValue(spec.mcp.env)}}`;
+  return ["-c", `mcp_servers.${spec.mcp.name}=${inline}`];
+}
+function skillsNotice(skillDirs) {
+  if (skillDirs.length === 0) return "";
+  return "\u0421\u043A\u0438\u043B\u043B\u044B \u0440\u043E\u043B\u0438 \u043B\u0435\u0436\u0430\u0442 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430\u043C\u0438 \u043D\u0430 \u0434\u0438\u0441\u043A\u0435 (\u044D\u0442\u043E\u0442 \u0438\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C \u043D\u0435 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u0442 \u0438\u0445 \u0441\u0430\u043C): " + skillDirs.join(", ") + ". \u041F\u0440\u043E\u0447\u0438\u0442\u0430\u0439 \u0438\u0445 SKILL.md \u041F\u0415\u0420\u0415\u0414 \u0440\u0430\u0431\u043E\u0442\u043E\u0439 \u2014 \u0442\u0430\u043C \u0434\u0438\u0441\u0446\u0438\u043F\u043B\u0438\u043D\u0430 \u0440\u043E\u044F \u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u0430.";
+}
+function readUsage(node) {
+  if (typeof node !== "object" || node === null) return null;
+  const rec = node;
+  const direct = rec.total_token_usage ?? rec.usage ?? rec.token_usage;
+  if (direct && typeof direct === "object") return direct;
+  const info = rec.info;
+  if (info && typeof info === "object") return readUsage(info);
+  return null;
+}
+function parseCodexStream(raw) {
+  let usage = null;
+  let completed = false;
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(trimmed);
+    } catch {
+      continue;
+    }
+    if (typeof parsed !== "object" || parsed === null) continue;
+    const rec = parsed;
+    const msg = typeof rec.msg === "object" && rec.msg !== null ? rec.msg : rec;
+    const type = typeof msg.type === "string" ? msg.type : null;
+    const found = readUsage(msg);
+    if (found) usage = found;
+    if (type && TERMINAL_EVENTS.has(type)) completed = true;
+  }
+  return { usage, completed };
+}
+function newestRolloutMtime(dir, depth = 4) {
+  let entries;
+  try {
+    entries = readdirSync3(dir);
+  } catch {
+    return null;
+  }
+  let latest = null;
+  for (const name of entries) {
+    const full = join4(dir, name);
+    let st;
+    try {
+      st = statSync2(full);
+    } catch {
+      continue;
+    }
+    if (st.isDirectory()) {
+      if (depth <= 0) continue;
+      const nested = newestRolloutMtime(full, depth - 1);
+      if (nested !== null && (latest === null || nested > latest)) latest = nested;
+    } else if (name.endsWith(".jsonl")) {
+      if (latest === null || st.mtimeMs > latest) latest = st.mtimeMs;
+    }
+  }
+  return latest;
+}
+var BYPASS_FLAG, SKIP_GIT_CHECK_FLAG, CODEX_MODEL_PRICING, TERMINAL_EVENTS, codexExecutor;
+var init_codex = __esm({
+  "src/executors/codex.ts"() {
+    "use strict";
+    init_swarmHome();
+    init_pricing();
+    BYPASS_FLAG = "--dangerously-bypass-approvals-and-sandbox";
+    SKIP_GIT_CHECK_FLAG = "--skip-git-repo-check";
+    CODEX_MODEL_PRICING = {};
+    TERMINAL_EVENTS = /* @__PURE__ */ new Set(["task_complete", "turn.completed", "thread.completed", "session.completed"]);
+    codexExecutor = {
+      id: "codex",
+      title: "Codex CLI (codex)",
+      binEnv: "SWARM_CODEX_BIN",
+      install: { what: "Codex CLI \u2014 \u0430\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u0438\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C \u0434\u0440\u043E\u043D\u0430", pkg: "@openai/codex" },
+      resolveBin: () => resolveCodexBin(),
+      // Стрелка, а не метод — см. тот же комментарий в claudeCode.ts.
+      plan: (spec) => {
+        const notice = skillsNotice(spec.skillDirs);
+        const prompt = notice ? `${spec.prompt}
+
+${notice}` : spec.prompt;
+        const args = [
+          "exec",
+          // Продолжение оборванной сессии — ПОДКОМАНДА, а не флаг: `exec resume --last` берёт
+          // последнюю сессию этого CODEX_HOME (то есть этого worktree, см. codexHome).
+          ...spec.continueSession ? ["resume", "--last"] : [],
+          "--json",
+          SKIP_GIT_CHECK_FLAG,
+          BYPASS_FLAG,
+          ...spec.model ? ["-m", spec.model] : [],
+          ...mcpConfigArgs(spec),
+          prompt
+        ];
+        return { bin: resolveCodexBin(), args, env: { CODEX_HOME: ensureCodexHome(spec.worktree, spec.realHome) } };
+      },
+      parseResult(raw, model) {
+        const { usage, completed } = parseCodexStream(raw);
+        if (!completed) return null;
+        if (!usage) return { costUsd: 0, warning: "codex: \u043F\u043E\u0442\u043E\u043A \u0431\u0435\u0437 usage \u2014 cost \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0435 \u043F\u043E\u0441\u0447\u0438\u0442\u0430\u043D" };
+        const cached = usage.cached_input_tokens ?? 0;
+        const common = {
+          input_tokens: Math.max(0, (usage.input_tokens ?? 0) - cached),
+          output_tokens: usage.output_tokens ?? 0,
+          cache_read_input_tokens: cached
+        };
+        const est = costFromUsage(common, model, CODEX_MODEL_PRICING);
+        return est.warning ? { costUsd: est.costUsd, warning: est.warning } : { costUsd: est.costUsd };
+      },
+      session: {
+        exists: (worktree) => newestRolloutMtime(join4(codexHomePath(worktree), "sessions")) !== null,
+        mtimeMs: (worktree) => newestRolloutMtime(join4(codexHomePath(worktree), "sessions"))
+      },
+      probe: {
+        // Тот же принцип, что у claude: дешёвый реальный прогон — он проверяет и auth, и живость
+        // провайдера разом. Один короткий ответ, без тулов и без сети сверх модели.
+        args: ["exec", "--json", SKIP_GIT_CHECK_FLAG, BYPASS_FLAG, "ok"],
+        limitPattern: /(usage limit|rate limit|quota exceeded|insufficient_quota)/i
+      }
+    };
+  }
+});
+
+// src/executors/types.ts
+var init_types2 = __esm({
+  "src/executors/types.ts"() {
+    "use strict";
+  }
+});
+
+// src/executors/index.ts
+function resolveExecutor(id) {
+  const key = (id ?? "").trim();
+  if (!key) return EXECUTORS[DEFAULT_EXECUTOR_ID];
+  const found = EXECUTORS[key];
+  if (!found) {
+    throw new Error(`\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u0439 \u0438\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C "${key}" (SWARM_EXECUTOR). \u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B: ${Object.keys(EXECUTORS).join(", ")}`);
+  }
+  return found;
+}
+var DEFAULT_EXECUTOR_ID, EXECUTORS;
+var init_executors = __esm({
+  "src/executors/index.ts"() {
+    "use strict";
+    init_claudeCode();
+    init_codex();
+    init_types2();
+    init_claudeCode();
+    init_codex();
+    DEFAULT_EXECUTOR_ID = "claude-code";
+    EXECUTORS = {
+      [claudeCodeExecutor.id]: claudeCodeExecutor,
+      [codexExecutor.id]: codexExecutor
+    };
   }
 });
 
@@ -811,6 +1730,7 @@ __export(config_exports, {
   DRONE_HOME: () => DRONE_HOME,
   DRONE_HOME_ISOLATION: () => DRONE_HOME_ISOLATION,
   DRONE_ISOLATION: () => DRONE_ISOLATION,
+  EXECUTOR: () => EXECUTOR,
   HEARTBEAT_PATH: () => HEARTBEAT_PATH,
   HEARTBEAT_STALE_MS: () => HEARTBEAT_STALE_MS,
   REPO_MAP_PATH: () => REPO_MAP_PATH,
@@ -880,9 +1800,8 @@ __export(config_exports, {
   resolveEffectiveWorktreesDir: () => resolveEffectiveWorktreesDir,
   reviewCutoffAt: () => reviewCutoffAt
 });
-import { homedir } from "os";
-import { basename, join as join2, resolve } from "path";
-import { mkdirSync, readFileSync as readFileSync2, realpathSync, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "fs";
+import { basename, join as join5, resolve } from "path";
+import { readFileSync as readFileSync2, realpathSync, renameSync as renameSync2, writeFileSync as writeFileSync3 } from "fs";
 function normalizeRepo(repo) {
   const r = (repo ?? "").trim();
   if (!r) return "";
@@ -893,7 +1812,7 @@ function normalizeRepo(repo) {
   }
 }
 function droneWorktreePath(worktreesDir, repo, slug) {
-  return join2(worktreesDir, basename(normalizeRepo(repo)), slug);
+  return join5(worktreesDir, basename(normalizeRepo(repo)), slug);
 }
 function resolveEffectiveWorktreesDir(deps) {
   if (deps.envOverride) return deps.envOverride;
@@ -935,7 +1854,7 @@ function mcpEndpoint(api, path = TASKLESS_MCP_PATH) {
 }
 function tokenFromFile() {
   try {
-    return readFileSync2(join2(SWARM_HOME, "token"), "utf8").trim();
+    return readFileSync2(join5(SWARM_HOME, "token"), "utf8").trim();
   } catch {
     return "";
   }
@@ -949,34 +1868,36 @@ function reviewCutoffAt() {
   const at = stamp();
   try {
     const tmp = `${REVIEW_CUTOFF_PATH}.tmp`;
-    writeFileSync2(tmp, JSON.stringify({ at }));
+    writeFileSync3(tmp, JSON.stringify({ at }));
     renameSync2(tmp, REVIEW_CUTOFF_PATH);
   } catch {
   }
   return at;
 }
-var SWARM_HOME, DB_PATH, 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_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, 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, 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_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_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, 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, 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_WATCHDOG_STALL_MS;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     init_src();
-    SWARM_HOME = process.env.SWARM_HOME || join2(homedir(), ".taskless-swarm");
-    mkdirSync(SWARM_HOME, { recursive: true });
-    DB_PATH = process.env.SWARM_DB || join2(SWARM_HOME, "swarm.db");
-    DRONE_HOME = process.env.SWARM_DRONE_HOME || join2(SWARM_HOME, "drone-home");
+    init_executors();
+    init_swarmHome();
+    init_swarmHome();
+    DB_PATH = process.env.SWARM_DB || join5(SWARM_HOME, "swarm.db");
+    EXECUTOR = resolveExecutor(process.env.SWARM_EXECUTOR);
+    DRONE_HOME = process.env.SWARM_DRONE_HOME || join5(SWARM_HOME, "drone-home");
     DRONE_HOME_ISOLATION = process.env.SWARM_DRONE_ISOLATE_HOME !== "0" && process.platform !== "win32";
     DRONE_ISOLATION = DRONE_HOME_ISOLATION ? { home: DRONE_HOME, swarmHome: SWARM_HOME } : void 0;
-    WORKTREES_NOINDEX_DIR = join2(SWARM_HOME, "worktrees.noindex");
-    WORKTREES_LEGACY_DIR = join2(SWARM_HOME, "worktrees");
+    WORKTREES_NOINDEX_DIR = join5(SWARM_HOME, "worktrees.noindex");
+    WORKTREES_LEGACY_DIR = join5(SWARM_HOME, "worktrees");
     WORKTREES_DIR = process.env.SWARM_WORKTREES || WORKTREES_NOINDEX_DIR;
-    RUN_LOGS_DIR = process.env.SWARM_RUN_LOGS || join2(SWARM_HOME, "run-logs");
-    DAEMON_LOG_PATH = process.env.SWARM_DAEMON_LOG || join2(SWARM_HOME, "overmind.log");
+    RUN_LOGS_DIR = process.env.SWARM_RUN_LOGS || join5(SWARM_HOME, "run-logs");
+    DAEMON_LOG_PATH = process.env.SWARM_DAEMON_LOG || join5(SWARM_HOME, "overmind.log");
     DAEMON_LOG_MAX_BYTES = envNum("SWARM_DAEMON_LOG_MAX_BYTES", 16 * 1024 * 1024);
     DAEMON_LOG_KEEP = envNum("SWARM_DAEMON_LOG_KEEP", 2);
     DAEMON_LOG_CHECK_MS = envNum("SWARM_DAEMON_LOG_CHECK_MS", 6e4);
     DIST_BUILD = true;
     SWARM_BACKEND = process.env.SWARM_BACKEND === "client" ? "client" : process.env.SWARM_BACKEND === "sqlite" ? "sqlite" : DIST_BUILD ? "client" : "sqlite";
-    SWARM_OUTBOX = process.env.SWARM_OUTBOX || join2(SWARM_HOME, "outbox.jsonl");
+    SWARM_OUTBOX = process.env.SWARM_OUTBOX || join5(SWARM_HOME, "outbox.jsonl");
     SWARM_MAX_IN_FLIGHT = Math.trunc(envNum("SWARM_MAX_IN_FLIGHT", 3));
     SWARM_CLAIM_INTERVAL_MS = envNum("SWARM_CLAIM_INTERVAL_MS", 6e4);
     SWARM_MAX_LOAD_FACTOR = envNum("SWARM_MAX_LOAD_FACTOR", 0.9);
@@ -1001,15 +1922,15 @@ var init_config = __esm({
     DRONE_CHANNEL_ENABLED = process.env.SWARM_DRONE_CHANNEL !== "0";
     DRONE_CHANNEL_PORT = Number(process.env.SWARM_DRONE_CHANNEL_PORT) || 7421;
     DRONE_CHANNEL_URL = process.env.SWARM_DRONE_CHANNEL_URL || `http://127.0.0.1:${DRONE_CHANNEL_PORT}`;
-    DRONE_CHANNEL_SECRET_PATH = process.env.SWARM_DRONE_CHANNEL_SECRET || join2(SWARM_HOME, "drone-channel.key");
+    DRONE_CHANNEL_SECRET_PATH = process.env.SWARM_DRONE_CHANNEL_SECRET || join5(SWARM_HOME, "drone-channel.key");
     DRONE_CHANNEL_GRACE_MS = envNum("SWARM_DRONE_CHANNEL_GRACE_MS", 12e4);
-    HEARTBEAT_PATH = process.env.SWARM_HEARTBEAT || join2(SWARM_HOME, "overmind.heartbeat");
+    HEARTBEAT_PATH = process.env.SWARM_HEARTBEAT || join5(SWARM_HOME, "overmind.heartbeat");
     HEARTBEAT_STALE_MS = Number(process.env.SWARM_HEARTBEAT_STALE_MS) || 3e4;
     SWARM_REPO = process.env.SWARM_REPO || "";
     SWARM_SCAN_DEPTH = Number(process.env.SWARM_SCAN_DEPTH) || 3;
     SWARM_REPO_PATHS = (process.env.SWARM_REPOS || SWARM_REPO).split(",").map((s) => s.trim()).filter(Boolean);
     SWARM_SCAN_ROOTS_RAW = process.env.SWARM_SCAN_ROOTS || "";
-    REPO_MAP_PATH = process.env.SWARM_REPO_MAP || join2(SWARM_HOME, "repo-map.json");
+    REPO_MAP_PATH = process.env.SWARM_REPO_MAP || join5(SWARM_HOME, "repo-map.json");
     SWARM_REPO_MAP_MS = envNum("SWARM_REPO_MAP_MS", 15 * 6e4);
     TASKLESS_API = process.env.TASKLESS_API || "https://taskless.ru";
     SWARM_SHOT_TIMEOUT_MS = envNum("SWARM_SHOT_TIMEOUT_MS", 2e4);
@@ -1020,7 +1941,7 @@ var init_config = __esm({
     TASKLESS_TASK_URL_BASE = process.env.TASKLESS_TASK_URL_BASE || (TASKLESS_WORKSPACE_SLUG ? `${TASKLESS_API.replace(/\/$/, "")}/app/${TASKLESS_WORKSPACE_SLUG}` : "");
     SWARM_VERIFY = process.env.SWARM_VERIFY === "ci" ? "ci" : "local";
     SWARM_AUTO_REVIEW = process.env.SWARM_AUTO_REVIEW !== "0";
-    REVIEW_CUTOFF_PATH = process.env.SWARM_REVIEW_CUTOFF || join2(SWARM_HOME, "review-cutoff.json");
+    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 || "";
     WEB_PORT = Number(process.env.SWARM_WEB_PORT) || 7420;
@@ -1377,10 +2298,10 @@ var init_storm = __esm({
 });
 
 // src/heartbeat.ts
-import { readFileSync as readFileSync5, renameSync as renameSync3, writeFileSync as writeFileSync4 } from "fs";
+import { readFileSync as readFileSync5, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "fs";
 function writeHeartbeat(path, now) {
   const tmp = `${path}.tmp`;
-  writeFileSync4(tmp, String(now));
+  writeFileSync5(tmp, String(now));
   renameSync3(tmp, path);
 }
 function readHeartbeat(path) {
@@ -1721,16 +2642,21 @@ var init_procCleanup = __esm({
 });
 
 // src/git.ts
-import { existsSync as existsSync8, readdirSync as readdirSync8, statSync as statSync6 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync10, statSync as statSync7 } from "fs";
 import { appendFile, mkdir, readFile, rm } from "fs/promises";
-import { isAbsolute as isAbsolute2, join as join12 } from "path";
+import { isAbsolute as isAbsolute2, join as join15 } from "path";
 import { $ as $2 } from "execa";
+function isUnrecoverableRefError(e) {
+  if (e instanceof MissingRefError) return true;
+  const msg = e instanceof Error ? `${e.name}: ${e.message}` : String(e);
+  return MISSING_REF_RE.test(msg);
+}
 async function reclaimStaleWorktree(repo, worktree) {
   await detachWorktree(repo, worktree);
 }
 function isLinkedWorktree(dir) {
   try {
-    return statSync6(join12(dir, ".git")).isFile();
+    return statSync7(join15(dir, ".git")).isFile();
   } catch {
     return false;
   }
@@ -1742,7 +2668,7 @@ async function detachWorktree(repo, worktree) {
   }
 }
 async function ensureWorktreeDirGone(worktree) {
-  if (!existsSync8(worktree)) return false;
+  if (!existsSync9(worktree)) return false;
   if (!isLinkedWorktree(worktree)) {
     console.error(
       `[git] ${worktree} \u2014 \u043D\u0435 \u043F\u0440\u0438\u0441\u0442\u0451\u0433\u043D\u0443\u0442\u044B\u0439 worktree (.git \u043D\u0435 \u0444\u0430\u0439\u043B): \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u041D\u0415 \u0442\u0440\u043E\u0433\u0430\u044E. \u0415\u0441\u043B\u0438 \u044D\u0442\u043E \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E worktree \u0434\u0440\u043E\u043D\u0430 \u2014 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u0435\u0433\u043E \u0440\u0443\u043A\u0430\u043C\u0438; \u0435\u0441\u043B\u0438 \u044D\u0442\u043E \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u0439 \u0447\u0435\u043A\u0430\u0443\u0442, \u0437\u043D\u0430\u0447\u0438\u0442 \u0432\u0435\u0442\u043A\u0430 \u0441\u043B\u0430\u0433\u0430 \u0447\u0435\u043A\u043D\u0443\u0442\u0430 \u0432 \u043D\u0451\u043C (git checkout <slug>) \u2014 \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u0435 \u0435\u0433\u043E \u043D\u0430 \u0434\u0440\u0443\u0433\u0443\u044E \u0432\u0435\u0442\u043A\u0443.`
@@ -1757,7 +2683,7 @@ async function ensureWorktreeDirGone(worktree) {
     );
     return true;
   }
-  if (existsSync8(worktree)) {
+  if (existsSync9(worktree)) {
     console.error(`[git] \u043A\u0430\u0442\u0430\u043B\u043E\u0433 worktree ${worktree} \u043F\u0435\u0440\u0435\u0436\u0438\u043B rm \u2014 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0443\u043A\u0430\u043C\u0438, \u0438\u043D\u0430\u0447\u0435 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0441\u043F\u0430\u0432\u043D \u0441\u043B\u0430\u0433\u0430 \u0432\u0441\u0442\u0430\u043D\u0435\u0442.`);
   }
   return true;
@@ -1800,7 +2726,7 @@ async function addWorktree(repo, path, branch, opts = {}) {
   }
   const busyAt = await worktreeForBranch(repo, branch);
   if (busyAt) {
-    const exists = existsSync8(busyAt);
+    const exists = existsSync9(busyAt);
     const live = exists && (opts.isWorktreeHeldLive ? await opts.isWorktreeHeldLive(busyAt) : true);
     if (live) throw new WorktreeBusyError(branch, busyAt);
     if (exists && await worktreeDirty(busyAt)) throw new WorktreeBusyError(branch, busyAt);
@@ -1836,9 +2762,9 @@ async function ensureGitExcluded(worktree, pattern) {
     const out = await $2({ reject: false })`git -C ${worktree} rev-parse --git-common-dir`;
     const raw = out.stdout.trim();
     if (out.exitCode !== 0 || !raw) return false;
-    const commonDir = isAbsolute2(raw) ? raw : join12(worktree, raw);
-    const infoDir = join12(commonDir, "info");
-    const excludeFile = join12(infoDir, "exclude");
+    const commonDir = isAbsolute2(raw) ? raw : join15(worktree, raw);
+    const infoDir = join15(commonDir, "info");
+    const excludeFile = join15(infoDir, "exclude");
     let current = "";
     try {
       current = await readFile(excludeFile, "utf8");
@@ -1871,7 +2797,7 @@ async function worktreeDirty(path) {
 async function repairMovedWorktrees(targetDir) {
   const subdirs = (dir) => {
     try {
-      return readdirSync8(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join12(dir, d.name));
+      return readdirSync10(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join15(dir, d.name));
     } catch {
       return [];
     }
@@ -1915,7 +2841,9 @@ async function journalForBranch(repo, branch, slug) {
 }
 async function prepareDetachedWorktree(repo, branch, worktree) {
   await $2`git -C ${repo} fetch --quiet origin`;
-  await $2`git -C ${repo} worktree add --detach --force ${worktree} ${`origin/${branch}`}`;
+  const ref = `origin/${branch}`;
+  if (!await revParse(repo, `${ref}^{commit}`)) throw new MissingRefError(ref, repo);
+  await $2`git -C ${repo} worktree add --detach --force ${worktree} ${ref}`;
 }
 async function mergeRef(worktree, ref) {
   const before = (await $2`git -C ${worktree} rev-parse HEAD`).stdout.trim();
@@ -1948,7 +2876,7 @@ async function worktreeLastCommitMs(worktree) {
   const sec = Number(out);
   return Number.isInteger(sec) && sec > 0 ? sec * 1e3 : null;
 }
-var WorktreeBusyError, GITHUB_REMOTE_RE;
+var WorktreeBusyError, MissingRefError, MISSING_REF_RE, GITHUB_REMOTE_RE;
 var init_git = __esm({
   "src/git.ts"() {
     "use strict";
@@ -1963,6 +2891,17 @@ var init_git = __esm({
       branch;
       worktreePath;
     };
+    MissingRefError = class extends Error {
+      constructor(ref, repo) {
+        super(`ref ${ref} \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0432 ${repo} \u2014 \u0432\u0435\u0442\u043A\u0443 \u043D\u0435\u043B\u044C\u0437\u044F \u0432\u044B\u0447\u0435\u043A\u0430\u0442\u044C (\u043F\u0440\u043E\u0432\u0435\u0440\u044C, \u0438\u0437 \u043A\u0430\u043A\u043E\u0439 \u0432\u0435\u0442\u043A\u0438 \u043E\u0442\u043A\u0440\u044B\u0442 PR)`);
+        this.ref = ref;
+        this.repo = repo;
+        this.name = "MissingRefError";
+      }
+      ref;
+      repo;
+    };
+    MISSING_REF_RE = /invalid reference|unknown revision|not a valid object name|couldn't find remote ref/i;
     GITHUB_REMOTE_RE = /github\.com[:/]([^/]+\/[^/]+?)(?:\.git)?\/?$/i;
   }
 });
@@ -1983,7 +2922,7 @@ __export(droneChannel_exports, {
   verifyLocalCliToken: () => verifyLocalCliToken
 });
 import { createHmac, randomBytes, timingSafeEqual } from "crypto";
-import { chmodSync, mkdirSync as mkdirSync5, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "fs";
+import { chmodSync, mkdirSync as mkdirSync7, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "fs";
 import { dirname as dirname3 } from "path";
 import { serve } from "@hono/node-server";
 function loadChannelSecret(path) {
@@ -1993,7 +2932,7 @@ function loadChannelSecret(path) {
   } catch {
   }
   const secret = randomBytes(32).toString("hex");
-  mkdirSync5(dirname3(path), { recursive: true });
+  mkdirSync7(dirname3(path), { recursive: true });
   writeFileSync9(path, secret, { mode: 384 });
   try {
     chmodSync(path, 384);
@@ -2324,7 +3263,7 @@ var init_droneChannel = __esm({
 
 // src/attachments.ts
 import { mkdir as mkdir2, rm as rm2, writeFile } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join17 } from "path";
 function attachmentsFromDoc(doc, origin) {
   const out = [];
   const walk2 = (node) => {
@@ -2415,7 +3354,7 @@ async function materializeAttachments(opts) {
   };
   const result = { files: [], skipped: [] };
   if (opts.refs.length === 0) return result;
-  const dir = join14(opts.worktree, ATTACHMENTS_DIR);
+  const dir = join17(opts.worktree, ATTACHMENTS_DIR);
   await io.removeDir(dir);
   let dirReady = false;
   let total = 0;
@@ -2461,7 +3400,7 @@ async function materializeAttachments(opts) {
         await io.mkdir(dir);
         dirReady = true;
       }
-      await io.writeFile(join14(dir, name), file.bytes);
+      await io.writeFile(join17(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)})`);
       continue;
@@ -2614,7 +3553,7 @@ var init_attachments = __esm({
 
 // src/shotUpload.ts
 import { readFile as fsReadFile } from "fs/promises";
-import { basename as basename2, isAbsolute as isAbsolute3, join as join15 } from "path";
+import { basename as basename2, isAbsolute as isAbsolute3, join as join18 } from "path";
 function shotMimetype(path) {
   const dot = path.lastIndexOf(".");
   if (dot < 0) return null;
@@ -2640,7 +3579,7 @@ async function readShots(paths, opts) {
     }
     let bytes;
     try {
-      bytes = await read(isAbsolute3(path) ? path : join15(opts.worktree, path));
+      bytes = await read(isAbsolute3(path) ? path : join18(opts.worktree, path));
     } catch (e) {
       skipped.push({ path, reason: `\u043D\u0435 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D: ${e instanceof Error ? e.message : String(e)}` });
       continue;
@@ -2719,7 +3658,7 @@ var init_shotUpload = __esm({
 // src/oauth.ts
 import { createHash, randomBytes as randomBytes2 } from "crypto";
 import { readFileSync as readFileSync14, writeFileSync as writeFileSync10, unlinkSync as unlinkSync3 } from "fs";
-import { join as join16 } from "path";
+import { join as join19 } from "path";
 function makePkce() {
   const verifier = randomBytes2(48).toString("base64url");
   const challenge = createHash("sha256").update(verifier).digest("base64url");
@@ -2854,15 +3793,15 @@ var init_oauth = __esm({
     AUTHORIZE = "/api/oauth/authorize";
     TOKEN = "/api/oauth/token";
     SCOPE = "openid profile email taskless:full";
-    STORE_PATH = join16(SWARM_HOME, "oauth.json");
-    CLIENT_PATH = join16(SWARM_HOME, "oauth-client.json");
+    STORE_PATH = join19(SWARM_HOME, "oauth.json");
+    CLIENT_PATH = join19(SWARM_HOME, "oauth-client.json");
     base = (api) => api.replace(/\/$/, "");
   }
 });
 
 // src/agentToken.ts
 import { readFileSync as readFileSync15, writeFileSync as writeFileSync11, unlinkSync as unlinkSync4 } from "fs";
-import { join as join17 } from "path";
+import { join as join20 } from "path";
 function loadAgentToken() {
   try {
     const s = JSON.parse(readFileSync15(STORE_PATH2, "utf8"));
@@ -2902,14 +3841,14 @@ var init_agentToken = __esm({
   "src/agentToken.ts"() {
     "use strict";
     init_config();
-    STORE_PATH2 = join17(SWARM_HOME, "agent.json");
+    STORE_PATH2 = join20(SWARM_HOME, "agent.json");
     base2 = (api) => api.replace(/\/$/, "");
   }
 });
 
 // src/workspace.ts
 import { readFileSync as readFileSync16, writeFileSync as writeFileSync12, unlinkSync as unlinkSync5 } from "fs";
-import { join as join18 } from "path";
+import { join as join21 } from "path";
 function loadWorkspace() {
   try {
     const w = JSON.parse(readFileSync16(WORKSPACE_PATH, "utf8"));
@@ -2926,7 +3865,7 @@ var init_workspace = __esm({
   "src/workspace.ts"() {
     "use strict";
     init_config();
-    WORKSPACE_PATH = join18(SWARM_HOME, "workspace.json");
+    WORKSPACE_PATH = join21(SWARM_HOME, "workspace.json");
   }
 });
 
@@ -3009,6 +3948,11 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
     if (!doc) return null;
     return { title: doc.title ?? "", body: extractText(doc.body) };
   }
+  async function getTaskContext(idOrSlug) {
+    const res = await safeCall("get_task_context", { id: idOrSlug });
+    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;
@@ -3076,6 +4020,7 @@ function makeTasklessClient(call, workspaceId, taskUrlBase, fetchFile, fetchImpl
     },
     backlogStatusId,
     getDocument,
+    getTaskContext,
     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)");
@@ -3115,7 +4060,19 @@ function requireTaskBody(task, slug, workspaceId) {
   if (!task) throw new TaskBodyUnavailableError(slug, workspaceId);
   return task;
 }
+function wrapUntrusted(parts) {
+  if (parts.length === 0) return "";
+  return [
+    UNTRUSTED_TASK_INPUT_NOTICE,
+    "",
+    "\u2500\u2500\u2500\u2500\u2500 \u041D\u0415\u0414\u041E\u0412\u0415\u0420\u0415\u041D\u041D\u042B\u0419 \u0412\u0412\u041E\u0414: \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438/\u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0437\u0430\u0434\u0430\u0447\u0438 \u2500\u2500\u2500\u2500\u2500",
+    parts.join("\n\n"),
+    "\u2500\u2500\u2500\u2500\u2500 \u041A\u041E\u041D\u0415\u0426 \u041D\u0415\u0414\u041E\u0412\u0415\u0420\u0415\u041D\u041D\u041E\u0413\u041E \u0412\u0412\u041E\u0414\u0410 \u2500\u2500\u2500\u2500\u2500"
+  ].join("\n");
+}
 async function fetchTaskContext(client, task) {
+  const brief = await client.getTaskContext(task.id);
+  if (brief) return wrapUntrusted([brief]);
   const parts = [];
   const comments = task.comments ?? [];
   if (comments.length > 0) {
@@ -3151,14 +4108,7 @@ ${text || "(\u043F\u0443\u0441\u0442\u043E)"}`;
       )
     );
   }
-  if (parts.length === 0) return "";
-  return [
-    UNTRUSTED_TASK_INPUT_NOTICE,
-    "",
-    "\u2500\u2500\u2500\u2500\u2500 \u041D\u0415\u0414\u041E\u0412\u0415\u0420\u0415\u041D\u041D\u042B\u0419 \u0412\u0412\u041E\u0414: \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438/\u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0437\u0430\u0434\u0430\u0447\u0438 \u2500\u2500\u2500\u2500\u2500",
-    parts.join("\n\n"),
-    "\u2500\u2500\u2500\u2500\u2500 \u041A\u041E\u041D\u0415\u0426 \u041D\u0415\u0414\u041E\u0412\u0415\u0420\u0415\u041D\u041D\u041E\u0413\u041E \u0412\u0412\u041E\u0414\u0410 \u2500\u2500\u2500\u2500\u2500"
-  ].join("\n");
+  return wrapUntrusted(parts);
 }
 function commentIdOf(res) {
   const comment = res?.structuredContent?.comment;
@@ -3353,7 +4303,7 @@ __export(db_exports, {
   SwarmDb: () => SwarmDb
 });
 import { createRequire as createRequire2 } from "module";
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { resolve as resolve3 } from "path";
 function rowToQuestion(row) {
   return {
@@ -3387,6 +4337,10 @@ function rowToRun(row) {
     depends_on: row.depends_on ? JSON.parse(row.depends_on) : [],
     model: row.model ?? null,
     cost_usd: row.cost_usd ?? 0,
+    // Токены/время работы (TASWM-353) — старые прогоны без колонок → 0.
+    tokens_in: row.tokens_in ?? 0,
+    tokens_out: row.tokens_out ?? 0,
+    duration_ms: row.duration_ms ?? 0,
     pr_url: row.pr_url ?? null,
     superseded_by: row.superseded_by ?? null,
     decision: row.decision ? JSON.parse(row.decision) : null,
@@ -3452,6 +4406,9 @@ CREATE TABLE IF NOT EXISTS runs (
   depends_on TEXT,
   model TEXT,
   cost_usd REAL NOT NULL DEFAULT 0,
+  tokens_in INTEGER NOT NULL DEFAULT 0,
+  tokens_out INTEGER NOT NULL DEFAULT 0,
+  duration_ms INTEGER NOT NULL DEFAULT 0,
   pr_url TEXT,
   superseded_by INTEGER,
   decision TEXT,
@@ -3545,7 +4502,11 @@ CREATE TABLE IF NOT EXISTS imports (
           // Базовая ветка PR (TASWM-285): куда дрон открывает PR и от чего ответвляется.
           "ALTER TABLE runs ADD COLUMN base_branch TEXT",
           // Воркспейс задачи прогона (TASWM-288): им пинятся задачные MCP-вызовы прогона.
-          "ALTER TABLE runs ADD COLUMN workspace_id TEXT"
+          "ALTER TABLE runs ADD COLUMN workspace_id TEXT",
+          // Чем обошёлся прогон, кроме денег (TASWM-353): токены вход/выход и время работы.
+          "ALTER TABLE runs ADD COLUMN tokens_in INTEGER NOT NULL DEFAULT 0",
+          "ALTER TABLE runs ADD COLUMN tokens_out INTEGER NOT NULL DEFAULT 0",
+          "ALTER TABLE runs ADD COLUMN duration_ms INTEGER NOT NULL DEFAULT 0"
         ]) {
           try {
             this.db.exec(alter);
@@ -3838,7 +4799,7 @@ CREATE TABLE IF NOT EXISTS imports (
         const repoN = normalizeRepo(repo);
         const already = this.db.prepare("SELECT run_count FROM imports WHERE source = ?").get(abs);
         if (already) return { imported: false, runs: already.run_count };
-        if (!existsSync10(abs)) throw new Error(`import-db: \u0444\u0430\u0439\u043B\u0430 \u043D\u0435\u0442: ${abs}`);
+        if (!existsSync11(abs)) throw new Error(`import-db: \u0444\u0430\u0439\u043B\u0430 \u043D\u0435\u0442: ${abs}`);
         const src = new this.databaseCtor(abs);
         try {
           const runs = src.prepare("SELECT * FROM runs ORDER BY id").all();
@@ -4206,9 +5167,9 @@ var init_droneStore = __esm({
 });
 
 // src/overmind.ts
-import { homedir as homedir4 } from "os";
-import { existsSync as existsSync15, readFileSync as readFileSync20, readdirSync as readdirSync10, renameSync as renameSync10 } from "fs";
-import { basename as basename4, dirname as dirname5, join as join25 } from "path";
+import { homedir as homedir5 } from "os";
+import { existsSync as existsSync16, readFileSync as readFileSync20, readdirSync as readdirSync12, renameSync as renameSync10 } from "fs";
+import { basename as basename4, dirname as dirname5, join as join28 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
 import { spawn as spawn3 } from "child_process";
 
@@ -4288,13 +5249,13 @@ init_config();
 init_resources();
 init_names2();
 init_storm();
-import { appendFileSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { appendFileSync, existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
 import { dirname } from "path";
 import { randomUUID } from "crypto";
 
 // src/logTail.ts
-import { closeSync, existsSync as existsSync2, openSync, readSync, readdirSync, statSync } from "fs";
-import { join as join3 } from "path";
+import { closeSync, existsSync as existsSync4, openSync, readSync, readdirSync as readdirSync4, statSync as statSync3 } from "fs";
+import { join as join6 } from "path";
 var TAIL_LINES_FALLBACK = 200;
 var TAIL_MAX_BYTES_FALLBACK = 64 * 1024;
 function fileHeader(name, size, shown) {
@@ -4304,7 +5265,7 @@ function fileHeader(name, size, shown) {
 function readTail(path, opts) {
   let size;
   try {
-    size = statSync(path).size;
+    size = statSync3(path).size;
   } catch {
     return null;
   }
@@ -4335,10 +5296,10 @@ function readTail(path, opts) {
   return { text, size, shown: Buffer.byteLength(text, "utf8") };
 }
 function latestRunLaunch(runLogsDir, localRunId) {
-  const dir = join3(runLogsDir, String(localRunId));
+  const dir = join6(runLogsDir, String(localRunId));
   let files;
   try {
-    files = readdirSync(dir);
+    files = readdirSync4(dir);
   } catch {
     return null;
   }
@@ -4349,13 +5310,13 @@ function latestRunLaunch(runLogsDir, localRunId) {
   }
   if (indexes.size === 0) return null;
   const index = Math.max(...indexes);
-  const out = [join3(dir, `${index}.json`), join3(dir, `${index}.json.done`)].find((p) => existsSync2(p)) ?? null;
-  const err = existsSync2(join3(dir, `${index}.err.log`)) ? join3(dir, `${index}.err.log`) : null;
+  const out = [join6(dir, `${index}.json`), join6(dir, `${index}.json.done`)].find((p) => existsSync4(p)) ?? null;
+  const err = existsSync4(join6(dir, `${index}.err.log`)) ? join6(dir, `${index}.err.log`) : null;
   return { index, total: indexes.size, out, err };
 }
 function runLogTail(runLogsDir, localRunId, opts) {
   const launch = latestRunLaunch(runLogsDir, localRunId);
-  if (!launch) return { error: `\u043B\u043E\u0433\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0430 \u044D\u0442\u043E\u0439 \u043C\u0430\u0448\u0438\u043D\u0435 \u043D\u0435\u0442 (${join3(runLogsDir, String(localRunId))} \u043F\u0443\u0441\u0442 \u0438\u043B\u0438 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442)` };
+  if (!launch) return { error: `\u043B\u043E\u0433\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0430 \u044D\u0442\u043E\u0439 \u043C\u0430\u0448\u0438\u043D\u0435 \u043D\u0435\u0442 (${join6(runLogsDir, String(localRunId))} \u043F\u0443\u0441\u0442 \u0438\u043B\u0438 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442)` };
   const parts = [];
   let budget = opts.maxBytes;
   if (launch.err) {
@@ -4488,6 +5449,15 @@ var SwarmClient = class _SwarmClient {
   nextRunId = 1;
   nextEventId = 1;
   nextQuestionId = 1;
+  // TASWM-350: ключ НЕЗАКРЫТОЙ попытки взять работу. Живёт от первого вызова claim до
+  // первого настоящего ответа прода; всё это время ретраи идут с ним, и повтор после
+  // обрыва связи не превращается во второе взятие. См. claim().
+  pendingClaimKey = null;
+  // TASWM-357: последнее НАПЕЧАТАННОЕ про пропущенные claim'ом задачи (родители и
+  // заблокированные). Дедуп по тексту: claim идёт раз в ~60 c, а набор пропущенных меняется
+  // редко — без этого лог был бы простынёй из одной и той же строки, и в ней потонуло бы
+  // всё остальное. Меняется набор (эпик закрыли / блокер прошли) → печатаем снова.
+  lastClaimSkipLog = null;
   // Зависимости, подтверждённые ПРОДОМ (TASWM-300): слаг → «прогон этой задачи уже done».
   // Монотонно (done не откатывается) → положительный ответ не протухает; отрицательный
   // переспрашивается по TTL. Живёт в памяти: рестарт демона просто переспросит прод.
@@ -4498,6 +5468,9 @@ var SwarmClient = class _SwarmClient {
   // ровно один раз (первой отвергнутой нотификацией) и держится всю жизнь процесса — иначе
   // каждый сигнал платил бы за это лишним отвергнутым вызовом. См. notifyAnomaly.
   notifyLevelUnsupported = false;
+  // TAS-485: то же для гашения разрешившихся тревог (swarm_notify_resolve) — прод старее
+  // демона не знает тула; ретраить это каждый тик бессмысленно, см. resolveAnomalies.
+  notifyResolveUnsupported = false;
   // Корреляция с продом.
   keyByLocal = /* @__PURE__ */ new Map();
   // local run id → runKey
@@ -4540,24 +5513,24 @@ var SwarmClient = class _SwarmClient {
     this.repoFullNames = registry.map((e) => e.repoFullName);
     this.repoPathByFullName = new Map(registry.map((e) => [e.repoFullName, normalizeRepo(e.path)]));
     this.host = opts.host ?? null;
-    this.repoExists = opts.repoExists ?? existsSync3;
+    this.repoExists = opts.repoExists ?? existsSync5;
     this.questionSyncMs = opts.questionSyncMs ?? 3e3;
     this.outboxPath = opts.outboxPath;
     this.mapPath = `${opts.outboxPath}.prodmap.json`;
     this.stormPath = `${opts.outboxPath}.storm.jsonl`;
-    mkdirSync2(dirname(this.outboxPath), { recursive: true });
+    mkdirSync4(dirname(this.outboxPath), { recursive: true });
     this.recover();
   }
   // ── рестарт: поднять outbox (незаписанные операции) и карту runKey→prodId ─────
   recover() {
-    if (existsSync3(this.mapPath)) {
+    if (existsSync5(this.mapPath)) {
       try {
         const obj = JSON.parse(readFileSync4(this.mapPath, "utf8"));
         for (const [k, v] of Object.entries(obj)) this.prodIdByKey.set(k, v);
       } catch {
       }
     }
-    if (existsSync3(this.outboxPath)) {
+    if (existsSync5(this.outboxPath)) {
       const txt = readFileSync4(this.outboxPath, "utf8");
       for (const line of txt.split("\n")) {
         const s = line.trim();
@@ -4578,7 +5551,7 @@ var SwarmClient = class _SwarmClient {
   // eventsLog ПЕРВЫМИ (до hydrate), в порядке файла (= хронологический); id
   // переприсваиваем локально (id событий — только порядок, не корреляция с продом).
   replayGlobalEvents() {
-    if (!existsSync3(this.stormPath)) return;
+    if (!existsSync5(this.stormPath)) return;
     let txt;
     try {
       txt = readFileSync4(this.stormPath, "utf8");
@@ -4647,8 +5620,8 @@ var SwarmClient = class _SwarmClient {
     this.scheduleFlush();
   }
   // Прод-патч прогона: локальные поля Run → поля swarm_run_upsert (см. TASWM-74).
-  // pid/worktree_path (рантайм), respawns (нет в схеме тула), снимок задачи (task_*,
-  // прод берёт join'ом из Task) и priority (локальная очередь ЭТОГО демона, TASWM-269)
+  // pid/worktree_path (рантайм), снимок задачи (task_*, прод берёт join'ом из Task)
+  // и priority (локальная очередь ЭТОГО демона, TASWM-269)
   // в прод НЕ уходят. kind → role (плоский enum). Self-ref
   // прогонов hero_run_id/resolves_run_id/superseded_by → heroId/resolvesRunId/
   // supersededById как ОТЛОЖЕННЫЕ ссылки (RunRef) — cuid резолвится на флаше.
@@ -4659,6 +5632,10 @@ var SwarmClient = class _SwarmClient {
     if ("model" in patch) out.model = patch.model ?? null;
     if ("name" in patch) out.droneName = patch.name ?? null;
     if ("cost_usd" in patch && patch.cost_usd !== void 0) out.costUsd = patch.cost_usd;
+    if ("tokens_in" in patch && patch.tokens_in !== void 0) out.tokensIn = patch.tokens_in;
+    if ("tokens_out" in patch && patch.tokens_out !== void 0) out.tokensOut = patch.tokens_out;
+    if ("duration_ms" in patch && patch.duration_ms !== void 0) out.durationMs = patch.duration_ms;
+    if ("respawns" in patch && patch.respawns !== void 0) out.respawns = patch.respawns;
     if ("pr_url" in patch) out.prUrl = patch.pr_url ?? null;
     if ("branch" in patch) out.branch = patch.branch ?? null;
     if ("repo" in patch) out.repo = patch.repo ?? null;
@@ -4724,6 +5701,10 @@ var SwarmClient = class _SwarmClient {
       depends_on: input.depends_on && input.depends_on.length ? input.depends_on : [],
       model: input.model ?? null,
       cost_usd: 0,
+      tokens_in: 0,
+      // копятся учётом запусков claude (cost.ts), как cost_usd — TASWM-353
+      tokens_out: 0,
+      duration_ms: 0,
       pr_url: null,
       superseded_by: null,
       decision: input.decision ?? null,
@@ -4846,6 +5827,7 @@ var SwarmClient = class _SwarmClient {
     if (!d) return 0;
     d.respawns += 1;
     d.updated_at = stamp();
+    this.enqueueRun(d, this.runFields({ respawns: d.respawns }));
     return d.respawns;
   }
   cancel(id, reason) {
@@ -5261,7 +6243,7 @@ var SwarmClient = class _SwarmClient {
    * транзиентным сбоем ОС, который этот PR должен переживать, а не превращать в мор.
    */
   reconcileRuntime(opts) {
-    const wtExists = opts.worktreeExists ?? existsSync3;
+    const wtExists = opts.worktreeExists ?? existsSync5;
     const pidByWorktree = /* @__PURE__ */ new Map();
     try {
       for (const p of opts.listProcesses()) if (p.worktree) pidByWorktree.set(p.worktree, p.pid);
@@ -5349,23 +6331,69 @@ var SwarmClient = class _SwarmClient {
    * шлём — прод фолбэкается на последнюю heartbeat-декларацию (или без фильтра).
    */
   async claim() {
+    this.pendingClaimKey ??= randomUUID();
     let res;
     try {
       res = await this.call("swarm_claim_work", {
         ...this.repoFullNames.length ? { repoFullNames: this.repoFullNames } : {},
         // TASWM-281: взятая из общей очереди задача сразу принадлежит ЭТОЙ машине —
         // прод помечает созданный прогон hostId, чужой демон его не увидит.
-        ...this.host ? { hostId: this.host.hostId } : {}
+        ...this.host ? { hostId: this.host.hostId } : {},
+        idempotencyKey: this.pendingClaimKey
       });
     } catch {
       return null;
     }
     if (res?.isError) return null;
+    this.pendingClaimKey = null;
     const sc = res.structuredContent ?? {};
+    this.logClaimSkips(sc);
     if (!sc.claimed || typeof sc.run !== "object" || sc.run === null) return null;
     const local = this.hydrateRun(sc.run);
     return local ? this.mat(local) : null;
   }
+  /**
+   * TASWM-357: назвать в логе задачи, которые прод НЕ отдал в работу осознанно — родителей с
+   * незавершёнными подзадачами (работа всегда в листьях) и листья с незакрытым блокером
+   * (явный порядок, связь задач «блокирует»). Печатаем ЗДЕСЬ, а не на проде: оба фильтра
+   * живут SQL-условиями и молчат по природе, а `display` claim'а демон не логирует — без
+   * этой строки «почему эпик стоит нетронутым» не видно ниоткуда, и оператор ровно так же
+   * гадает, как гадал, пока дрон вставал на эпике с вопросом «меня спавнили на родителя».
+   *
+   * Формат прода — `data.skippedParents: [{slug,title,openChildren}]` и
+   * `data.skippedBlocked: [{slug,title,blockers[]}]`. Читаем защищённо: у старого прода
+   * полей нет вовсе (тогда молчим), а разбирать чужую строку `display` вместо структуры —
+   * тот же класс хрупкости, что уже кусал нас в notifyAnomaly.
+   */
+  logClaimSkips(sc) {
+    const rows = (raw) => (Array.isArray(raw) ? raw : []).map((p) => typeof p === "object" && p !== null ? p : null).filter((p) => p !== null && typeof p.slug === "string");
+    const others = (flag) => flag === true ? " \u0438 \u0434\u0440\u0443\u0433\u0438\u0435" : "";
+    const lines = [];
+    const parents = rows(sc.skippedParents).map(
+      (p) => `${p.slug} (${typeof p.openChildren === "number" ? p.openChildren : "?"} \u043D\u0435\u0437\u0430\u043A\u0440\u044B\u0442\u044B\u0445 \u043F\u043E\u0434\u0437\u0430\u0434\u0430\u0447)`
+    );
+    if (parents.length > 0) {
+      lines.push(
+        `[swarm-client] claim \u043F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u043B \u0437\u0430\u0434\u0430\u0447\u0438-\u0440\u043E\u0434\u0438\u0442\u0435\u043B\u0438 \u2014 \u0440\u0430\u0431\u043E\u0442\u0430 \u0431\u0435\u0440\u0451\u0442\u0441\u044F \u0432 \u043B\u0438\u0441\u0442\u044C\u044F\u0445, \u0434\u0440\u043E\u043D\u0430 \u043D\u0430 \u043D\u0438\u0445 \u043D\u0435 \u0441\u043F\u0430\u0432\u043D\u0438\u043C: ${parents.join(", ")}${others(sc.skippedParentsMore)}`
+      );
+    }
+    const blocked = rows(sc.skippedBlocked).map(
+      (b) => `${b.slug} \u0436\u0434\u0451\u0442 ${Array.isArray(b.blockers) && b.blockers.length > 0 ? b.blockers.join(", ") : "\u0431\u043B\u043E\u043A\u0435\u0440\u0430"}`
+    );
+    if (blocked.length > 0) {
+      lines.push(
+        `[swarm-client] claim \u043F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u043B \u0437\u0430\u0434\u0430\u0447\u0438 \u0441 \u043D\u0435\u0437\u0430\u043A\u0440\u044B\u0442\u044B\u043C \u0431\u043B\u043E\u043A\u0435\u0440\u043E\u043C \u2014 \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u0437\u0430\u0434\u0430\u043D \u0441\u0432\u044F\u0437\u044C\u044E \xAB\u0431\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442\xBB, \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u0438\u0442\u044C \u043D\u0435 \u0431\u0443\u0434\u0443: ${blocked.join("; ")}${others(sc.skippedBlockedMore)}`
+      );
+    }
+    const text = lines.join("\n");
+    if (text.length === 0) {
+      this.lastClaimSkipLog = null;
+      return;
+    }
+    if (text === this.lastClaimSkipLog) return;
+    this.lastClaimSkipLog = text;
+    for (const line of lines) console.log(line);
+  }
   /**
    * TASWM-281: пометить своими прогоны, под которыми на ЭТОЙ машине нашёлся ЖИВОЙ
    * процесс (после reconcileRuntime на старте). Это ровно те прогоны, где сомнений в
@@ -5639,12 +6667,20 @@ var SwarmClient = class _SwarmClient {
    * Шлём ВСЕГДА (в т.ч. `paused:false`): это состояние, а не команда, и молчание тут
    * означало бы «прод помнит вчерашнюю паузу», когда рой давно работает.
    *
+   * TASWM-352: тем же пульсом уходит ЁМКОСТЬ этой машины (`capacity` — живой потолок
+   * дронов ЭТОГО демона: машинный оверрайд, иначе общая настройка владельца). По ней
+   * планировщик роя раскладывает очередь между машинами: до этого у прода было ОДНО
+   * число на владельца, и ноутбук с рабочей станцией делили его поровну, хотя тянут
+   * разное. Не знаем своего потолка (ещё не читали / sqlite) → ключ не шлём, прод не
+   * трогает прошлое значение — та же логика, что у repoFullNames.
+   *
    * Прод недоступен / ответ без поручений → пустые списки (демон работает дальше).
    */
-  async heartbeat(daemonVersion, pause) {
+  async heartbeat(daemonVersion, pause, capacity) {
     try {
       const args = this.repoFullNames.length ? { repoFullNames: this.repoFullNames } : {};
       if (daemonVersion) args.daemonVersion = daemonVersion;
+      if (capacity != null && Number.isFinite(capacity) && capacity > 0) args.capacity = Math.trunc(capacity);
       if (pause !== void 0) {
         args.paused = !!pause?.paused;
         if (pause?.reason) args.pauseReason = pause.reason;
@@ -5750,6 +6786,35 @@ var SwarmClient = class _SwarmClient {
     const res = await this.call("swarm_notify", base3);
     if (res?.isError) throw new Error(`swarm_notify \u043E\u0442\u0432\u0435\u0440\u0433 \xAB${signal.key}\xBB`);
   }
+  /**
+   * TAS-485: погасить в инбоксе владельца тревоги, чьё условие ушло. Ключи — те же, с
+   * которыми уходил notifyAnomaly (прод сам ставит им префикс `swarm:`).
+   *
+   * Бросает при сбое — СОЗНАТЕЛЬНО, как notifyAnomaly: вызывающий (tickOnce) вычёркивает
+   * ключи из durable-очереди только после успеха, иначе «погашено» разошлось бы с тем,
+   * что человек видит в инбоксе, и разошлось бы навсегда — повторить будет некому.
+   *
+   * ДЕПЛОЙ-ОКНО. Демон из свежего чекаута против ещё не задеплоенного прода получит
+   * «неизвестный тул». Это не ошибка доставки, а отсутствие фичи на той стороне: ретраить
+   * её каждые ~4 секунды бессмысленно, поэтому первую такую осечку запоминаем на жизнь
+   * процесса и дальше молча пропускаем гашение (надзор в остальном работает как раньше).
+   * Тот же приём, что у notifyAnomaly с аргументом `level`.
+   */
+  async resolveAnomalies(keys) {
+    const tags = [...new Set(keys.filter((k) => k.length > 0 && k.length <= 120))];
+    if (tags.length === 0 || this.notifyResolveUnsupported) return;
+    const res = await this.call("swarm_notify_resolve", { tags });
+    if (!res?.isError) return;
+    const text = JSON.stringify(res);
+    if (text.includes("swarm_notify_resolve") && (text.includes("Unknown tool") || text.includes("\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D"))) {
+      this.notifyResolveUnsupported = true;
+      console.warn(
+        "[swarm-client] \u043F\u0440\u043E\u0434 \u0441\u0442\u0430\u0440\u0435\u0435 \u0434\u0435\u043C\u043E\u043D\u0430 (\u043D\u0435\u0442 swarm_notify_resolve) \u2014 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0432\u0448\u0438\u0435\u0441\u044F \u0442\u0440\u0435\u0432\u043E\u0433\u0438 \u0440\u043E\u044F \u043F\u0440\u0438\u0434\u0451\u0442\u0441\u044F \u0433\u0430\u0441\u0438\u0442\u044C \u0432 \u0438\u043D\u0431\u043E\u043A\u0441\u0435 \u0440\u0443\u043A\u0430\u043C\u0438. \u041E\u0431\u043D\u043E\u0432\u0438 \u043F\u0440\u043E\u0434 \u0438 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u0442\u0438 \u0434\u0435\u043C\u043E\u043D."
+      );
+      return;
+    }
+    throw new Error(`swarm_notify_resolve \u043E\u0442\u0432\u0435\u0440\u0433 ${tags.length} \u043A\u043B\u044E\u0447(\u0435\u0439)`);
+  }
   /**
    * TASWM-169: прод присылает run.repo как GitHub `owner/repo` для задач, взятых
    * через claim-фильтр (matchedRepo в swarm_claim_work, см. api/mcp/tools/swarm.ts) —
@@ -5814,6 +6879,10 @@ var SwarmClient = class _SwarmClient {
         depends_on: [],
         model: null,
         cost_usd: 0,
+        tokens_in: 0,
+        // токены и время работы (TASWM-353) — прод-поля, заполняются ниже
+        tokens_out: 0,
+        duration_ms: 0,
         pr_url: null,
         superseded_by: null,
         decision: null,
@@ -5824,9 +6893,9 @@ var SwarmClient = class _SwarmClient {
         review_verdict: null,
         review_phase: null,
         // вычисляемая фаза ревью (TASWM-230) — прод хранит и раздаёт
-        // Локальная бухгалтерия (в прод-схему не уходит, как respawns) — на гидрации из
-        // прода дефолт 0; существующая локальная запись НЕ перетирается (поле не в field-copy
-        // ниже), в отличие от respawns, — авто-ревью v2, TASWM-162.
+        // Локальная бухгалтерия (в прод-схему не уходит) — на гидрации из прода дефолт 0;
+        // существующая локальная запись НЕ перетирается (поле не в field-copy ниже),
+        // в отличие от respawns, — авто-ревью v2, TASWM-162.
         review_cycle: 0,
         task_title: null,
         task_desc: null,
@@ -5878,6 +6947,9 @@ var SwarmClient = class _SwarmClient {
     local.depends_on = Array.isArray(pr.dependsOn) ? pr.dependsOn : [];
     local.model = pr.model ?? null;
     local.cost_usd = typeof pr.costUsd === "number" ? pr.costUsd : 0;
+    local.tokens_in = typeof pr.tokensIn === "number" ? pr.tokensIn : 0;
+    local.tokens_out = typeof pr.tokensOut === "number" ? pr.tokensOut : 0;
+    local.duration_ms = typeof pr.durationMs === "number" ? pr.durationMs : 0;
     local.pr_url = pr.prUrl ?? null;
     local.stop_reason = pr.stopReason ?? null;
     local.respawns = typeof pr.respawns === "number" ? pr.respawns : 0;
@@ -6135,13 +7207,13 @@ var SwarmClient = class _SwarmClient {
   }
   persistPending() {
     try {
-      writeFileSync3(this.outboxPath, this.pending.map((e) => JSON.stringify(e)).join("\n") + (this.pending.length ? "\n" : ""));
+      writeFileSync4(this.outboxPath, this.pending.map((e) => JSON.stringify(e)).join("\n") + (this.pending.length ? "\n" : ""));
     } catch {
     }
   }
   persistMap() {
     try {
-      writeFileSync3(this.mapPath, JSON.stringify(Object.fromEntries(this.prodIdByKey)));
+      writeFileSync4(this.mapPath, JSON.stringify(Object.fromEntries(this.prodIdByKey)));
     } catch {
     }
   }
@@ -6171,11 +7243,11 @@ init_config();
 init_heartbeat();
 
 // src/logRotate.ts
-import { copyFileSync, renameSync as renameSync4, statSync as statSync2, fstatSync, truncateSync, unlinkSync as unlinkSync2, existsSync as existsSync4 } from "fs";
+import { copyFileSync, renameSync as renameSync4, statSync as statSync4, fstatSync, truncateSync, unlinkSync as unlinkSync2, existsSync as existsSync6 } from "fs";
 var realIo = {
   size: (path) => {
     try {
-      return statSync2(path).size;
+      return statSync4(path).size;
     } catch {
       return null;
     }
@@ -6184,7 +7256,7 @@ var realIo = {
   rename: renameSync4,
   truncate: (path) => truncateSync(path, 0),
   unlink: unlinkSync2,
-  exists: existsSync4
+  exists: existsSync6
 };
 var realOwnerIo = {
   statFd: (fd) => {
@@ -6197,7 +7269,7 @@ var realOwnerIo = {
   },
   statPath: (path) => {
     try {
-      const s = statSync2(path);
+      const s = statSync4(path);
       return { dev: s.dev, ino: s.ino };
     } catch {
       return null;
@@ -6268,13 +7340,13 @@ async function buildRepoRegistry(paths) {
 }
 
 // src/repoMemory.ts
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join4 } from "path";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
+import { join as join7 } from "path";
 var FILE = "repos.json";
 function loadRememberedRepos(home) {
   let raw;
   try {
-    raw = readFileSync6(join4(home, FILE), "utf8");
+    raw = readFileSync6(join7(home, FILE), "utf8");
   } catch {
     return [];
   }
@@ -6289,7 +7361,7 @@ function loadRememberedRepos(home) {
 function rememberRepos(home, paths, now = () => /* @__PURE__ */ new Date()) {
   const clean = paths.filter((p) => p.trim().length > 0);
   if (clean.length === 0) return;
-  writeFileSync5(join4(home, FILE), `${JSON.stringify({ paths: clean, at: now().toISOString() }, null, 2)}
+  writeFileSync6(join7(home, FILE), `${JSON.stringify({ paths: clean, at: now().toISOString() }, null, 2)}
 `);
 }
 function pickRepoPaths(args) {
@@ -6302,13 +7374,13 @@ function pickRepoPaths(args) {
 // src/repoDiscovery.ts
 init_src();
 init_config();
-import { homedir as homedir2 } from "os";
-import { readFileSync as readFileSync8, renameSync as renameSync5, writeFileSync as writeFileSync6 } from "fs";
-import { isAbsolute, join as join6, resolve as resolve2 } from "path";
+import { homedir as homedir3 } from "os";
+import { readFileSync as readFileSync8, renameSync as renameSync5, writeFileSync as writeFileSync7 } from "fs";
+import { isAbsolute, join as join9, resolve as resolve2 } from "path";
 
 // src/repoScan.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync7, statSync as statSync3 } from "fs";
-import { join as join5 } from "path";
+import { readdirSync as readdirSync5, readFileSync as readFileSync7, statSync as statSync5 } from "fs";
+import { join as join8 } from "path";
 var SKIP = /* @__PURE__ */ new Set([
   "node_modules",
   "vendor",
@@ -6338,7 +7410,7 @@ function parseOriginFromGitConfig(text) {
 }
 function originOf(dir) {
   try {
-    return parseOriginFromGitConfig(readFileSync7(join5(dir, ".git", "config"), "utf8"));
+    return parseOriginFromGitConfig(readFileSync7(join8(dir, ".git", "config"), "utf8"));
   } catch {
     return null;
   }
@@ -6367,15 +7439,15 @@ function walk(dir, depth, maxDepth, found) {
   }
   let entries;
   try {
-    entries = readdirSync2(dir);
+    entries = readdirSync5(dir);
   } catch {
     return;
   }
   for (const name of entries) {
     if (name.startsWith(".") || SKIP.has(name)) continue;
-    const child = join5(dir, name);
+    const child = join8(dir, name);
     try {
-      if (!statSync3(child).isDirectory()) continue;
+      if (!statSync5(child).isDirectory()) continue;
     } catch {
       continue;
     }
@@ -6395,13 +7467,13 @@ function defaultScanRoots(home, knownPaths = []) {
     if (parent && parent !== p) add(parent);
   }
   for (const name of ["projects", "code", "src", "dev", "work", "repos", "git", "Projects", "Code", "Developer", "Documents/GitHub", "go/src"]) {
-    add(join5(home, name));
+    add(join8(home, name));
   }
   return out;
 }
 
 // src/repoDiscovery.ts
-function resolveScanRoots(raw, home = homedir2(), knownPaths = []) {
+function resolveScanRoots(raw, home = homedir3(), knownPaths = []) {
   const v = (raw ?? "").trim();
   if (!v) return defaultScanRoots(home, knownPaths);
   if (["off", "none", "0"].includes(v.toLowerCase())) return [];
@@ -6409,7 +7481,7 @@ function resolveScanRoots(raw, home = homedir2(), knownPaths = []) {
   for (const part of v.split(",")) {
     const p = part.trim();
     if (!p) continue;
-    const abs = p === "~" ? home : p.startsWith("~/") ? join6(home, p.slice(2)) : isAbsolute(p) ? p : resolve2(home, p);
+    const abs = p === "~" ? home : p.startsWith("~/") ? join9(home, p.slice(2)) : isAbsolute(p) ? p : resolve2(home, p);
     if (!out.includes(abs)) out.push(abs);
   }
   return out;
@@ -6547,7 +7619,7 @@ function readRepoMapCache(path) {
 function writeRepoMapCache(path, entries) {
   try {
     const tmp = `${path}.tmp`;
-    writeFileSync6(tmp, JSON.stringify({ at: stamp(), entries }, null, 2));
+    writeFileSync7(tmp, JSON.stringify({ at: stamp(), entries }, null, 2));
     renameSync5(tmp, path);
   } catch {
   }
@@ -6555,17 +7627,17 @@ function writeRepoMapCache(path, entries) {
 
 // src/hostIdentity.ts
 import { hostname } from "os";
-import { existsSync as existsSync5, readFileSync as readFileSync9, renameSync as renameSync6, writeFileSync as writeFileSync7 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync9, renameSync as renameSync6, writeFileSync as writeFileSync8 } from "fs";
+import { join as join10 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 function hostIdentityPath(home) {
-  return join7(home, "host.json");
+  return join10(home, "host.json");
 }
 function loadHostIdentity(deps) {
-  const exists = deps.exists ?? existsSync5;
+  const exists = deps.exists ?? existsSync7;
   const readFile2 = deps.readFile ?? ((p) => readFileSync9(p, "utf8"));
   const writeFile2 = deps.writeFile ?? ((p, data) => {
-    writeFileSync7(`${p}.tmp`, data);
+    writeFileSync8(`${p}.tmp`, data);
     renameSync6(`${p}.tmp`, p);
   });
   const host = deps.hostname ?? hostname;
@@ -6706,129 +7778,57 @@ function capList(items) {
 }
 function reliefAdvice(ctx) {
   const steps = [];
-  if (!Number.isFinite(ctx.maxDrones)) steps.push("\u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C \u0440\u043E\u0439 \u043E\u0434\u043D\u0438\u043C \u0434\u0440\u043E\u043D\u043E\u043C (maxDrones=1) \u2014 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0440\u043E\u044F \u0432 /swarm");
-  else if (ctx.maxDrones > 1) steps.push(`\u0441\u043D\u0438\u0437\u0438\u0442\u044C maxDrones \u0434\u043E 1 (\u0441\u0435\u0439\u0447\u0430\u0441 ${ctx.maxDrones}) \u2014 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0440\u043E\u044F \u0432 /swarm`);
-  if (ctx.exclusiveRepos.length) steps.push(`\u043F\u043E\u043C\u0435\u0442\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u043C (\u043E\u0434\u0438\u043D \u0434\u0440\u043E\u043D \u043D\u0430 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0439): ${capList(ctx.exclusiveRepos)}`);
-  if (ctx.otherHosts.length) steps.push(`\u0443\u0432\u0435\u0437\u0442\u0438 \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043D\u0430 \u0434\u0440\u0443\u0433\u0443\u044E \u043C\u0430\u0448\u0438\u043D\u0443 \u0440\u043E\u044F (spawn --host): ${capList(ctx.otherHosts)}`);
-  steps.push(
-    ctx.totalGb > 0 ? `\u043C\u0430\u0448\u0438\u043D\u0430 \u043C\u043E\u0449\u043D\u0435\u0435: ${ctx.totalGb.toFixed(0)} \u0413\u0411 \u043D\u0430 ${Math.max(ctx.activeDrones, 2)} \u0434\u0440\u043E\u043D\u0430 Claude Code \u043F\u043B\u044E\u0441 \u0441\u0431\u043E\u0440\u043A\u0438 \u2014 \u0432\u043F\u0440\u0438\u0442\u044B\u043A` : `\u043C\u0430\u0448\u0438\u043D\u0430 \u043C\u043E\u0449\u043D\u0435\u0435: ${Math.max(ctx.activeDrones, 2)} \u0434\u0440\u043E\u043D\u0430 Claude Code \u043F\u043B\u044E\u0441 \u0441\u0431\u043E\u0440\u043A\u0438 \u044D\u0442\u0430 \u043C\u0430\u0448\u0438\u043D\u0430 \u043D\u0435 \u0442\u044F\u043D\u0435\u0442`
-  );
-  return steps;
-}
-function humanMinutes(ms) {
-  const total = Math.round(ms / 6e4);
-  if (total < 60) return `${total} \u043C\u0438\u043D`;
-  return `${Math.floor(total / 60)} \u0447 ${String(total % 60).padStart(2, "0")} \u043C\u0438\u043D`;
-}
-function reliefAlertBody(cost, pressure, advice, windowMs, minSteps) {
-  const window = humanMinutes(windowMs);
-  const perPause = cost.pauses > 0 ? humanMinutes(cost.lostMs / cost.pauses) : null;
-  const parts = [
-    `\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 ${window} \u0434\u0440\u043E\u043D\u043E\u0432 \u043F\u0440\u0438\u043E\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u043B\u0438 ${cost.pauses} \u0440\u0430\u0437${cost.runs > 1 ? ` (${cost.runs} \u043F\u0440\u043E\u0433\u043E\u043D\u0430)` : ""}, \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u043E \u043E\u043A\u043E\u043B\u043E ${humanMinutes(cost.lostMs)}${perPause ? `, \u0432 \u0441\u0440\u0435\u0434\u043D\u0435\u043C ${perPause} \u043C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u043E\u0439 \u0438 \u0432\u043E\u0437\u0432\u0440\u0430\u0442\u043E\u043C` : ""}.`
-  ];
-  if (cost.stepsBetween != null) {
-    parts.push(
-      cost.stepsBetween < minSteps ? `\u041C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u0430\u043C\u0438 \u0434\u0440\u043E\u043D \u043D\u0435 \u0443\u0441\u043F\u0435\u0432\u0430\u0435\u0442 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0448\u0430\u0433 (\u043C\u0435\u0434\u0438\u0430\u043D\u0430 ${cost.stepsBetween}) \u2014 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0435 \u0438\u0434\u0451\u0442, \u0434\u0440\u043E\u043D \u043A\u0440\u0443\u0442\u0438\u0442\u0441\u044F \u043D\u0430 \u043C\u0435\u0441\u0442\u0435.` : `\u041C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u0430\u043C\u0438 \u0434\u0440\u043E\u043D \u0443\u0441\u043F\u0435\u0432\u0430\u0435\u0442 ${cost.stepsBetween} \u0448\u0430\u0433(\u0430).`
-    );
-  }
-  if (cost.worst && cost.runs > 1) parts.push(`\u0411\u043E\u043B\u044C\u0448\u0435 \u0432\u0441\u0435\u0445 \u0434\u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C ${cost.worst.label} \u2014 ${cost.worst.pauses} \u0440\u0430\u0437.`);
-  if (pressure.culprits.length) parts.push(`\u0423\u043F\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0432: ${pressure.culprits.join("; ")}.`);
-  parts.push(`\u041F\u043E\u043A\u0430\u0437\u0430\u043D\u0438\u044F \u0445\u043E\u0441\u0442\u0430 \u2014 ${pressure.readings.join("; ")}.`);
-  parts.push(`\u0427\u0442\u043E \u0434\u0435\u043B\u0430\u0442\u044C \u043F\u043E \u043F\u043E\u0440\u044F\u0434\u043A\u0443: ${advice.map((s, i) => `${i + 1}) ${s}`).join("; ")}.`);
-  const body = parts.join(" ");
-  return body.length <= MAX_ALERT_BODY_CHARS ? body : `${body.slice(0, MAX_ALERT_BODY_CHARS - 1)}\u2026`;
-}
-function reliefAlertTitle(cost, windowMs) {
-  return `\u041C\u0430\u0448\u0438\u043D\u0430 \u043D\u0435 \u0442\u044F\u043D\u0435\u0442 \u0440\u043E\u0439: ${cost.pauses} \u043F\u0440\u0438\u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043E\u043A \u0437\u0430 ${humanMinutes(windowMs)}, \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u043E ${humanMinutes(cost.lostMs)}`;
-}
-function buildReliefCostCandidates(cost, t, sustainMs, build) {
-  if (!reliefAlertDue(cost, t)) return [];
-  return [{ key: "relief_cost", minDurationMs: sustainMs, build }];
-}
-
-// src/launcher.ts
-import { spawn } from "child_process";
-import { closeSync as closeSync2, existsSync as existsSync7, mkdirSync as mkdirSync4, openSync as openSync2, readdirSync as readdirSync5, statSync as statSync5, writeFileSync as writeFileSync8 } from "fs";
-import { createRequire } from "module";
-import { homedir as homedir3 } from "os";
-import { dirname as dirname2, join as join9 } from "path";
-import { fileURLToPath } from "url";
-
-// src/claudeBin.ts
-import { existsSync as existsSync6, readdirSync as readdirSync3 } from "fs";
-import { win32 as winPath } from "path";
-var CLAUDE_FALLBACK = "claude";
-function compareVersionDirs(a, b) {
-  const parts = (s) => s.split(".").map((p) => Number.isFinite(Number(p)) ? Number(p) : -1);
-  const pa = parts(a);
-  const pb = parts(b);
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const d = (pa[i] ?? 0) - (pb[i] ?? 0);
-    if (d !== 0) return d;
-  }
-  return 0;
-}
-function realListDir(dir) {
-  try {
-    return readdirSync3(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
-  } catch {
-    return [];
-  }
-}
-function winVersionRoots(env, listDir) {
-  const roots = [];
-  const appData = env.APPDATA;
-  if (appData) roots.push(winPath.join(appData, "Claude", "claude-code"));
-  const localAppData = env.LOCALAPPDATA;
-  if (localAppData) {
-    const packages = winPath.join(localAppData, "Packages");
-    for (const name of listDir(packages)) {
-      if (!name.startsWith("Claude")) continue;
-      roots.push(winPath.join(packages, name, "LocalCache", "Roaming", "Claude", "claude-code"));
-    }
-  }
-  return roots;
-}
-function findWindowsClaude(opts = {}) {
-  const env = opts.env ?? process.env;
-  const listDir = opts.listDir ?? realListDir;
-  const fileExists = opts.fileExists ?? existsSync6;
-  let best = null;
-  for (const root of winVersionRoots(env, listDir)) {
-    for (const version of listDir(root)) {
-      const candidate = winPath.join(root, version, "claude.exe");
-      if (!fileExists(candidate)) continue;
-      if (!best || compareVersionDirs(version, best.version) > 0) best = { version, path: candidate };
-    }
-  }
-  return best?.path ?? null;
+  if (!Number.isFinite(ctx.maxDrones)) steps.push("\u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C \u0440\u043E\u0439 \u043E\u0434\u043D\u0438\u043C \u0434\u0440\u043E\u043D\u043E\u043C (maxDrones=1) \u2014 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0440\u043E\u044F \u0432 /swarm");
+  else if (ctx.maxDrones > 1) steps.push(`\u0441\u043D\u0438\u0437\u0438\u0442\u044C maxDrones \u0434\u043E 1 (\u0441\u0435\u0439\u0447\u0430\u0441 ${ctx.maxDrones}) \u2014 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0440\u043E\u044F \u0432 /swarm`);
+  if (ctx.exclusiveRepos.length) steps.push(`\u043F\u043E\u043C\u0435\u0442\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u043C (\u043E\u0434\u0438\u043D \u0434\u0440\u043E\u043D \u043D\u0430 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0439): ${capList(ctx.exclusiveRepos)}`);
+  if (ctx.otherHosts.length) steps.push(`\u0443\u0432\u0435\u0437\u0442\u0438 \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043D\u0430 \u0434\u0440\u0443\u0433\u0443\u044E \u043C\u0430\u0448\u0438\u043D\u0443 \u0440\u043E\u044F (spawn --host): ${capList(ctx.otherHosts)}`);
+  steps.push(
+    ctx.totalGb > 0 ? `\u043C\u0430\u0448\u0438\u043D\u0430 \u043C\u043E\u0449\u043D\u0435\u0435: ${ctx.totalGb.toFixed(0)} \u0413\u0411 \u043D\u0430 ${Math.max(ctx.activeDrones, 2)} \u0434\u0440\u043E\u043D\u0430 Claude Code \u043F\u043B\u044E\u0441 \u0441\u0431\u043E\u0440\u043A\u0438 \u2014 \u0432\u043F\u0440\u0438\u0442\u044B\u043A` : `\u043C\u0430\u0448\u0438\u043D\u0430 \u043C\u043E\u0449\u043D\u0435\u0435: ${Math.max(ctx.activeDrones, 2)} \u0434\u0440\u043E\u043D\u0430 Claude Code \u043F\u043B\u044E\u0441 \u0441\u0431\u043E\u0440\u043A\u0438 \u044D\u0442\u0430 \u043C\u0430\u0448\u0438\u043D\u0430 \u043D\u0435 \u0442\u044F\u043D\u0435\u0442`
+  );
+  return steps;
 }
-var warnedNoWindowsClaude = false;
-var cachedWindowsBin = null;
-var windowsScanDone = false;
-function resolveClaudeBin(opts = {}) {
-  const env = opts.env ?? process.env;
-  const platform = opts.platform ?? process.platform;
-  const explicit = (env.SWARM_CLAUDE_BIN ?? "").trim();
-  if (explicit) return explicit;
-  if (platform !== "win32") return CLAUDE_FALLBACK;
-  if (windowsScanDone) return cachedWindowsBin ?? CLAUDE_FALLBACK;
-  windowsScanDone = true;
-  const found = findWindowsClaude({ ...opts, env });
-  cachedWindowsBin = found;
-  if (found) return found;
-  if (!warnedNoWindowsClaude) {
-    warnedNoWindowsClaude = true;
-    console.warn(
-      "[overmind] claude.exe \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u043D\u0438 \u0432 %APPDATA%\\Claude\\claude-code, \u043D\u0438 \u0432 MSIX-\u043A\u043E\u043F\u0438\u0438 \u043F\u043E\u0434 %LOCALAPPDATA%\\Packages\\Claude* \u2014 \u0441\u043F\u0430\u0432\u043D\u044E \u0433\u043E\u043B\u043E\u0435 \xABclaude\xBB (\u043F\u043E\u0438\u0441\u043A \u043F\u043E PATH+PATHEXT). \u0423\u043F\u0430\u0434\u0451\u0442 ENOENT (bash-\u043E\u0431\u0451\u0440\u0442\u043A\u0430 \u0431\u0435\u0437 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0432 PATH \u043D\u0435 \u0432\u0438\u0434\u043D\u0430 spawn'\u0443) \u2014 \u0437\u0430\u0434\u0430\u0439\u0442\u0435 SWARM_CLAUDE_BIN \u043F\u0443\u0442\u0451\u043C \u043A \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u043C\u0443 claude.exe."
+function humanMinutes(ms) {
+  const total = Math.round(ms / 6e4);
+  if (total < 60) return `${total} \u043C\u0438\u043D`;
+  return `${Math.floor(total / 60)} \u0447 ${String(total % 60).padStart(2, "0")} \u043C\u0438\u043D`;
+}
+function reliefAlertBody(cost, pressure, advice, windowMs, minSteps) {
+  const window = humanMinutes(windowMs);
+  const perPause = cost.pauses > 0 ? humanMinutes(cost.lostMs / cost.pauses) : null;
+  const parts = [
+    `\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 ${window} \u0434\u0440\u043E\u043D\u043E\u0432 \u043F\u0440\u0438\u043E\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u043B\u0438 ${cost.pauses} \u0440\u0430\u0437${cost.runs > 1 ? ` (${cost.runs} \u043F\u0440\u043E\u0433\u043E\u043D\u0430)` : ""}, \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u043E \u043E\u043A\u043E\u043B\u043E ${humanMinutes(cost.lostMs)}${perPause ? `, \u0432 \u0441\u0440\u0435\u0434\u043D\u0435\u043C ${perPause} \u043C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u043E\u0439 \u0438 \u0432\u043E\u0437\u0432\u0440\u0430\u0442\u043E\u043C` : ""}.`
+  ];
+  if (cost.stepsBetween != null) {
+    parts.push(
+      cost.stepsBetween < minSteps ? `\u041C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u0430\u043C\u0438 \u0434\u0440\u043E\u043D \u043D\u0435 \u0443\u0441\u043F\u0435\u0432\u0430\u0435\u0442 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0448\u0430\u0433 (\u043C\u0435\u0434\u0438\u0430\u043D\u0430 ${cost.stepsBetween}) \u2014 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0435 \u0438\u0434\u0451\u0442, \u0434\u0440\u043E\u043D \u043A\u0440\u0443\u0442\u0438\u0442\u0441\u044F \u043D\u0430 \u043C\u0435\u0441\u0442\u0435.` : `\u041C\u0435\u0436\u0434\u0443 \u043F\u0430\u0443\u0437\u0430\u043C\u0438 \u0434\u0440\u043E\u043D \u0443\u0441\u043F\u0435\u0432\u0430\u0435\u0442 ${cost.stepsBetween} \u0448\u0430\u0433(\u0430).`
     );
   }
-  return CLAUDE_FALLBACK;
+  if (cost.worst && cost.runs > 1) parts.push(`\u0411\u043E\u043B\u044C\u0448\u0435 \u0432\u0441\u0435\u0445 \u0434\u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C ${cost.worst.label} \u2014 ${cost.worst.pauses} \u0440\u0430\u0437.`);
+  if (pressure.culprits.length) parts.push(`\u0423\u043F\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0432: ${pressure.culprits.join("; ")}.`);
+  parts.push(`\u041F\u043E\u043A\u0430\u0437\u0430\u043D\u0438\u044F \u0445\u043E\u0441\u0442\u0430 \u2014 ${pressure.readings.join("; ")}.`);
+  parts.push(`\u0427\u0442\u043E \u0434\u0435\u043B\u0430\u0442\u044C \u043F\u043E \u043F\u043E\u0440\u044F\u0434\u043A\u0443: ${advice.map((s, i) => `${i + 1}) ${s}`).join("; ")}.`);
+  const body = parts.join(" ");
+  return body.length <= MAX_ALERT_BODY_CHARS ? body : `${body.slice(0, MAX_ALERT_BODY_CHARS - 1)}\u2026`;
+}
+function reliefAlertTitle(cost, windowMs) {
+  return `\u041C\u0430\u0448\u0438\u043D\u0430 \u043D\u0435 \u0442\u044F\u043D\u0435\u0442 \u0440\u043E\u0439: ${cost.pauses} \u043F\u0440\u0438\u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043E\u043A \u0437\u0430 ${humanMinutes(windowMs)}, \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u043E ${humanMinutes(cost.lostMs)}`;
+}
+function buildReliefCostCandidates(cost, t, sustainMs, build) {
+  if (!reliefAlertDue(cost, t)) return [];
+  return [{ key: "relief_cost", minDurationMs: sustainMs, build }];
 }
 
+// src/launcher.ts
+import { spawn } from "child_process";
+import { closeSync as closeSync2, existsSync as existsSync8, mkdirSync as mkdirSync6, openSync as openSync2, readdirSync as readdirSync7 } from "fs";
+import { createRequire } from "module";
+import { homedir as homedir4 } from "os";
+import { dirname as dirname2, join as join12 } from "path";
+import { fileURLToPath } from "url";
+
 // src/droneHome.ts
-import { lstatSync, mkdirSync as mkdirSync3, readdirSync as readdirSync4, rmSync, statSync as statSync4, symlinkSync } from "fs";
-import { join as join8, relative, sep } from "path";
+import { lstatSync, mkdirSync as mkdirSync5, readdirSync as readdirSync6, rmSync, statSync as statSync6, symlinkSync as symlinkSync2 } from "fs";
+import { join as join11, relative, sep } from "path";
 var DRONE_HOME_DENY_DEFAULT = [".taskless-swarm", ".bash_history", ".zsh_history"];
 function droneHomeDeny(env = process.env) {
   const extra = (env.SWARM_DRONE_HOME_DENY || "").split(",").map((s) => s.trim()).filter(Boolean);
@@ -6846,34 +7846,34 @@ function buildDroneHome(opts) {
   const { realHome, droneHome } = opts;
   const deny = opts.deny ?? droneHomeDeny();
   const platform = opts.platform ?? process.platform;
-  mkdirSync3(droneHome, { recursive: true, mode: 448 });
-  const wanted = new Set(mirroredEntries(readdirSync4(realHome), deny, platform));
+  mkdirSync5(droneHome, { recursive: true, mode: 448 });
+  const wanted = new Set(mirroredEntries(readdirSync6(realHome), deny, platform));
   const rel = relative(realHome, droneHome);
   if (rel && !rel.startsWith("..") && !rel.includes(sep)) wanted.delete(rel);
-  for (const existing of readdirSync4(droneHome)) {
+  for (const existing of readdirSync6(droneHome)) {
     if (wanted.has(existing)) continue;
-    const p = join8(droneHome, existing);
+    const p = join11(droneHome, existing);
     try {
       if (lstatSync(p).isSymbolicLink()) rmSync(p);
     } catch {
     }
   }
   for (const name of wanted) {
-    const link = join8(droneHome, name);
+    const link = join11(droneHome, name);
     try {
       lstatSync(link);
       continue;
     } catch {
     }
-    const target = join8(realHome, name);
+    const target = join11(realHome, name);
     let isDir;
     try {
-      isDir = statSync4(target).isDirectory();
+      isDir = statSync6(target).isDirectory();
     } catch {
       continue;
     }
     try {
-      symlinkSync(target, link, isDir ? "junction" : "file");
+      symlinkSync2(target, link, isDir ? "junction" : "file");
     } catch (e) {
       if (e.code !== "EEXIST") throw e;
     }
@@ -6886,10 +7886,10 @@ var REAL_PATH_ENV_PINS = [
   { env: "YARN_GLOBAL_FOLDER", segments: [".yarn", "berry"] }
 ];
 function realPathEnvPins(realHome) {
-  return Object.fromEntries(REAL_PATH_ENV_PINS.map(({ env, segments }) => [env, join8(realHome, ...segments)]));
+  return Object.fromEntries(REAL_PATH_ENV_PINS.map(({ env, segments }) => [env, join11(realHome, ...segments)]));
 }
-function droneDenyRules(realHome, swarmHome) {
-  const paths = [
+function dronePrivatePaths(realHome, swarmHome) {
+  return [
     // НЕ `${swarmHome}/**`. Worktree дрона живёт ВНУТРИ swarmHome
     // (`<swarmHome>/worktrees.noindex/<repo>/<slug>`), и правило на весь каталог закрывало
     // дрону его собственный рабочий каталог: Read/Write/Edit отвечали «File is in a directory
@@ -6910,11 +7910,6 @@ function droneDenyRules(realHome, swarmHome) {
     `${realHome}/.claude/.credentials.json`,
     `${realHome}/.npmrc`
   ];
-  const abs = (p) => `//${p.replace(/^\/+/, "")}`;
-  return paths.flatMap((p) => [`Read(${abs(p)})`, `Edit(${abs(p)})`]);
-}
-function droneSettingsJson(realHome, swarmHome) {
-  return JSON.stringify({ permissions: { deny: droneDenyRules(realHome, swarmHome) } });
 }
 
 // src/testForks.ts
@@ -6946,6 +7941,7 @@ function droneTestEnv(droneCap, base3 = process.env, host = hostForkSpec()) {
 }
 
 // src/launcher.ts
+init_executors();
 var requireFromHere = createRequire(import.meta.url);
 function resolveTsxCli() {
   try {
@@ -6956,29 +7952,12 @@ function resolveTsxCli() {
     );
   }
 }
-var ISOLATION_FLAGS = ["--setting-sources", "project", "--strict-mcp-config"];
-function claudeArgs(cfgPath, prompt, continueSession = false, model, pluginDirs = [], settings) {
-  const pluginFlags = pluginDirs.flatMap((dir) => ["--plugin-dir", dir]);
-  const base3 = [
-    "--dangerously-skip-permissions",
-    ...ISOLATION_FLAGS,
-    "--mcp-config",
-    cfgPath,
-    ...settings ? ["--settings", settings] : [],
-    ...pluginFlags,
-    "--output-format",
-    "json",
-    "-p",
-    prompt
-  ];
-  const withModel = model ? ["--model", model, ...base3] : base3;
-  return continueSession ? ["--continue", ...withModel] : withModel;
-}
+var MCP_SERVER_NAME = "overmind";
 function droneEnv(worktree, base3 = process.env, isolation, droneCap = null) {
   const env = { ...base3 };
   const isolate = base3.SWARM_TURBO_ISOLATE !== "0";
   if (isolate && !base3.TURBO_CACHE_DIR) {
-    env.TURBO_CACHE_DIR = join9(worktree, ".turbo", "cache");
+    env.TURBO_CACHE_DIR = join12(worktree, ".turbo", "cache");
   }
   Object.assign(env, droneTestEnv(droneCap, base3));
   for (const key of DAEMON_STATE_ENV) delete env[key];
@@ -7006,49 +7985,20 @@ var DAEMON_STATE_ENV = [
   "TASKLESS_TOKEN"
 ];
 function bundledRoleDir(kind) {
-  return join9(dirname2(fileURLToPath(import.meta.url)), "..", "roles", kind);
+  return join12(dirname2(fileURLToPath(import.meta.url)), "..", "roles", kind);
 }
 function roleDir(worktree, kind) {
-  return join9(worktree, ".claude", "roles", kind);
+  return join12(worktree, ".claude", "roles", kind);
 }
 function roleDirs(worktree, kind) {
-  return [bundledRoleDir(kind), roleDir(worktree, kind)].filter((dir) => existsSync7(dir));
-}
-function transcriptDir(worktree, projectsDir) {
-  return join9(projectsDir, worktree.replace(/[/.]/g, "-"));
-}
-function sessionTranscriptExists(worktree, projectsDir = join9(homedir3(), ".claude", "projects")) {
-  try {
-    return readdirSync5(transcriptDir(worktree, projectsDir)).some((f) => f.endsWith(".jsonl"));
-  } catch {
-    return false;
-  }
-}
-function transcriptMtimeMs(worktree, projectsDir = join9(homedir3(), ".claude", "projects")) {
-  const dir = transcriptDir(worktree, projectsDir);
-  let files;
-  try {
-    files = readdirSync5(dir);
-  } catch {
-    return null;
-  }
-  let latest = null;
-  for (const f of files) {
-    if (!f.endsWith(".jsonl")) continue;
-    try {
-      const mtime2 = statSync5(join9(dir, f)).mtimeMs;
-      if (latest === null || mtime2 > latest) latest = mtime2;
-    } catch {
-    }
-  }
-  return latest;
+  return [bundledRoleDir(kind), roleDir(worktree, kind)].filter((dir) => existsSync8(dir));
 }
 function nextRunLogPath(runLogsDir, runId) {
-  const dir = join9(runLogsDir, String(runId));
-  mkdirSync4(dir, { recursive: true });
+  const dir = join12(runLogsDir, String(runId));
+  mkdirSync6(dir, { recursive: true });
   let files = [];
   try {
-    files = readdirSync5(dir);
+    files = readdirSync7(dir);
   } catch {
   }
   let next = 0;
@@ -7056,7 +8006,7 @@ function nextRunLogPath(runLogsDir, runId) {
     const m = /^(\d+)\.json/.exec(f);
     if (m) next = Math.max(next, Number(m[1]) + 1);
   }
-  return join9(dir, `${next}.json`);
+  return join12(dir, `${next}.json`);
 }
 function openNextRunLog(runLogsDir, runId) {
   for (let attempt = 0; attempt < 50; attempt++) {
@@ -7091,57 +8041,63 @@ function makeLauncher(cfg) {
       );
     }
     const channelEnv = cfg.channel && channelToken ? { SWARM_DRONE_CHANNEL_URL: cfg.channel.url, SWARM_DRONE_CHANNEL_TOKEN: channelToken } : { SWARM_DB: cfg.dbPath };
-    const mcpConfig = {
-      mcpServers: {
-        overmind: {
-          command: process.execPath,
-          args: isCompiled ? [cfg.overmindEntry, "--drone", "--run", String(run.id)] : ["--conditions=development", resolveTsxCli(), cfg.overmindEntry, "--drone", "--run", String(run.id)],
-          // SWARM_DRONE_CHANNEL_URL/TOKEN (TASWM-295) ИЛИ SWARM_DB (откат) — см. channelEnv выше.
-          // Канал: дрон говорит только с демоном, файл базы ему не отдаётся вовсе. Токен подписан
-          // на СТАБИЛЬНЫЙ ключ прогона, поэтому переживает рестарт демона.
-          // SWARM_TASK_SLUG (TASWM-211): task_slug зафиксирован ЗДЕСЬ, на спавне — доверенный
-          // источник «чья это сессия» (read_task и отчёт о сдаче доверяют ему, а не строке,
-          // найденной по номеру прогона).
-          // SWARM_RUN_KIND/SWARM_REVIEWS_RUN_ID/SWARM_HERO_RUN_ID (TASWM-263) и SWARM_RUN_NAME
-          // (TASWM-265): роль, связи и имя прогона той же спавн-фиксацией. Нужны РЕЖИМУ ОТКАТА —
-          // ensureRunHydrated заводит ими стаб-строку в sqlite, если демон в client-режиме её там
-          // не заводил. На канале прогон отдаёт демон целиком, и стаб не нужен.
-          // SWARM_WORKSPACE_ID (TASWM-288): ВОРКСПЕЙС прогона — той же спавн-фиксацией: задачные
-          // вызовы (read_task, отчёт, тулы Героя) дрон делает НЕ через канал, а прямо в Taskless,
-          // и воркспейс им нужен верно сразу. Без него read_task/отчёт дрона
-          // ушли бы с глобальным пином демона — ровно то, что чинит эта задача. Пусто
-          // (прогон до фичи / sqlite-бэкенд) → ключ не кладём, дрон берёт глобальный пин.
-          // SWARM_HOME (TASWM-289): дрон едет с ТЕНЕВЫМ HOME, в котором `.taskless-swarm`
-          // нет вовсе, — а дрон-MCP из этого же дерева процессов читает oauth.json
-          // (connectTaskless в runDroneServer), пульс овермайнда и workspace.json. Наследовать
-          // ему нечего, поэтому реальный SWARM_HOME кладём явно. Дрон этот конфиг прочитать
-          // может, но нового ему это не даёт: его собственный worktree лежит ВНУТРИ
-          // SWARM_HOME, путь он и так знает (см. «чего этот модуль не делает» в droneHome.ts).
-          env: {
-            ...channelEnv,
-            ...cfg.droneIsolation ? { SWARM_HOME: cfg.droneIsolation.swarmHome } : {},
-            SWARM_TASK_SLUG: run.task_slug,
-            SWARM_RUN_KIND: run.kind,
-            SWARM_RUN_NAME: run.name,
-            ...run.workspace_id ? { SWARM_WORKSPACE_ID: run.workspace_id } : {},
-            ...run.reviews_run_id != null ? { SWARM_REVIEWS_RUN_ID: String(run.reviews_run_id) } : {},
-            ...run.hero_run_id != null ? { SWARM_HERO_RUN_ID: String(run.hero_run_id) } : {}
-          }
-        }
+    const mcp = {
+      name: MCP_SERVER_NAME,
+      command: process.execPath,
+      args: isCompiled ? [cfg.overmindEntry, "--drone", "--run", String(run.id)] : ["--conditions=development", resolveTsxCli(), cfg.overmindEntry, "--drone", "--run", String(run.id)],
+      // SWARM_DRONE_CHANNEL_URL/TOKEN (TASWM-295) ИЛИ SWARM_DB (откат) — см. channelEnv выше.
+      // Канал: дрон говорит только с демоном, файл базы ему не отдаётся вовсе. Токен подписан
+      // на СТАБИЛЬНЫЙ ключ прогона, поэтому переживает рестарт демона.
+      // SWARM_TASK_SLUG (TASWM-211): task_slug зафиксирован ЗДЕСЬ, на спавне — доверенный
+      // источник «чья это сессия» (read_task и отчёт о сдаче доверяют ему, а не строке,
+      // найденной по номеру прогона).
+      // SWARM_RUN_KIND/SWARM_REVIEWS_RUN_ID/SWARM_HERO_RUN_ID (TASWM-263) и SWARM_RUN_NAME
+      // (TASWM-265): роль, связи и имя прогона той же спавн-фиксацией. Нужны РЕЖИМУ ОТКАТА —
+      // ensureRunHydrated заводит ими стаб-строку в sqlite, если демон в client-режиме её там
+      // не заводил. На канале прогон отдаёт демон целиком, и стаб не нужен.
+      // SWARM_WORKSPACE_ID (TASWM-288): ВОРКСПЕЙС прогона — той же спавн-фиксацией: задачные
+      // вызовы (read_task, отчёт, тулы Героя) дрон делает НЕ через канал, а прямо в Taskless,
+      // и воркспейс им нужен верно сразу. Без него read_task/отчёт дрона
+      // ушли бы с глобальным пином демона — ровно то, что чинит эта задача. Пусто
+      // (прогон до фичи / sqlite-бэкенд) → ключ не кладём, дрон берёт глобальный пин.
+      // SWARM_HOME (TASWM-289): дрон едет с ТЕНЕВЫМ HOME, в котором `.taskless-swarm`
+      // нет вовсе, — а дрон-MCP из этого же дерева процессов читает oauth.json
+      // (connectTaskless в runDroneServer), пульс овермайнда и workspace.json. Наследовать
+      // ему нечего, поэтому реальный SWARM_HOME кладём явно. Дрон этот конфиг прочитать
+      // может, но нового ему это не даёт: его собственный worktree лежит ВНУТРИ
+      // SWARM_HOME, путь он и так знает (см. «чего этот модуль не делает» в droneHome.ts).
+      env: {
+        ...channelEnv,
+        ...cfg.droneIsolation ? { SWARM_HOME: cfg.droneIsolation.swarmHome } : {},
+        SWARM_TASK_SLUG: run.task_slug,
+        SWARM_RUN_KIND: run.kind,
+        SWARM_RUN_NAME: run.name,
+        ...run.workspace_id ? { SWARM_WORKSPACE_ID: run.workspace_id } : {},
+        ...run.reviews_run_id != null ? { SWARM_REVIEWS_RUN_ID: String(run.reviews_run_id) } : {},
+        ...run.hero_run_id != null ? { SWARM_HERO_RUN_ID: String(run.hero_run_id) } : {}
       }
     };
-    const cfgPath = join9(worktree, ".swarm-mcp.json");
-    writeFileSync8(cfgPath, JSON.stringify(mcpConfig, null, 2));
-    const model = run.model ?? process.env.SWARM_DRONE_MODEL ?? void 0;
-    const pluginDirs = roleDirs(worktree, run.kind);
-    const realHome = cfg.droneIsolation?.realHome ?? homedir3();
+    const model = run.model ?? process.env.SWARM_DRONE_MODEL ?? null;
+    const realHome = cfg.droneIsolation?.realHome ?? homedir4();
     const home = cfg.droneIsolation ? buildDroneHome({ realHome, droneHome: cfg.droneIsolation.home }) : void 0;
-    const settings = cfg.droneIsolation ? droneSettingsJson(realHome, cfg.droneIsolation.swarmHome) : void 0;
-    if (cfg.droneIsolation && process.env.TASKLESS_TOKEN && !existsSync7(join9(cfg.droneIsolation.swarmHome, "token"))) {
+    if (cfg.droneIsolation && process.env.TASKLESS_TOKEN && !existsSync8(join12(cfg.droneIsolation.swarmHome, "token"))) {
       console.error(
-        `[launcher] TASKLESS_TOKEN \u0437\u0430\u0434\u0430\u043D \u0442\u043E\u043B\u044C\u043A\u043E \u0432 env \u0434\u0435\u043C\u043E\u043D\u0430 \u2014 \u0434\u0440\u043E\u043D\u0443 \u043E\u043D \u043D\u0435 \u043D\u0430\u0441\u043B\u0435\u0434\u0443\u0435\u0442\u0441\u044F (TASWM-289), \u0430 \u0444\u0430\u0439\u043B\u0430 ${join9(cfg.droneIsolation.swarmHome, "token")} \u043D\u0435\u0442. read_task \u0434\u0440\u043E\u043D\u0430 \u0431\u0443\u0434\u0435\u0442 slug-only. \u041F\u043E\u0447\u0438\u043D\u0438: \`swarm login\` (oauth.json) \u0438\u043B\u0438 \u043F\u043E\u043B\u043E\u0436\u0438 \u0442\u043E\u043A\u0435\u043D \u0432 \u044D\u0442\u043E\u0442 \u0444\u0430\u0439\u043B.`
+        `[launcher] TASKLESS_TOKEN \u0437\u0430\u0434\u0430\u043D \u0442\u043E\u043B\u044C\u043A\u043E \u0432 env \u0434\u0435\u043C\u043E\u043D\u0430 \u2014 \u0434\u0440\u043E\u043D\u0443 \u043E\u043D \u043D\u0435 \u043D\u0430\u0441\u043B\u0435\u0434\u0443\u0435\u0442\u0441\u044F (TASWM-289), \u0430 \u0444\u0430\u0439\u043B\u0430 ${join12(cfg.droneIsolation.swarmHome, "token")} \u043D\u0435\u0442. read_task \u0434\u0440\u043E\u043D\u0430 \u0431\u0443\u0434\u0435\u0442 slug-only. \u041F\u043E\u0447\u0438\u043D\u0438: \`swarm login\` (oauth.json) \u0438\u043B\u0438 \u043F\u043E\u043B\u043E\u0436\u0438 \u0442\u043E\u043A\u0435\u043D \u0432 \u044D\u0442\u043E\u0442 \u0444\u0430\u0439\u043B.`
       );
     }
+    const executor = cfg.executor ?? resolveExecutor();
+    const plan = executor.plan({
+      worktree,
+      prompt,
+      continueSession: !!continueSession,
+      model,
+      mcp,
+      skillDirs: roleDirs(worktree, run.kind),
+      // Закрытые дрону пути имеют смысл только при теневом HOME: без него дрон и так
+      // сидит в HOME демона, и запирать половину дверей — самообман.
+      denyPaths: cfg.droneIsolation ? dronePrivatePaths(realHome, cfg.droneIsolation.swarmHome) : [],
+      realHome
+    });
     let stdio = "ignore";
     let outFd;
     let errFd;
@@ -7151,15 +8107,16 @@ function makeLauncher(cfg) {
       errFd = fds.err ?? void 0;
       stdio = ["ignore", outFd, errFd ?? "ignore"];
     }
-    const child = spawn(cfg.claudeBin ?? resolveClaudeBin(), claudeArgs(cfgPath, prompt, continueSession, model, pluginDirs, settings), {
+    const child = spawn(cfg.bin ?? plan.bin, plan.args, {
       cwd: worktree,
       detached: true,
       stdio,
       // Пер-worktree TURBO_CACHE_DIR (TASWM-232): дрон не отыгрывает кеш соседнего
       // worktree, проверки исполняются реально. Теневой HOME + чистка env от состояния
       // демона (TASWM-289). Доля тестовых форков от числа дронов на хосте (TASWM-246).
-      // Остальной env демона наследуется, как раньше.
-      env: droneEnv(worktree, process.env, home ? { droneHome: home, realHome } : void 0, cfg.droneCap?.() ?? null)
+      // Остальной env демона наследуется, как раньше. Добавки адаптера — последними:
+      // они про его собственное состояние, и перебивать их ройным нечем.
+      env: { ...droneEnv(worktree, process.env, home ? { droneHome: home, realHome } : void 0, cfg.droneCap?.() ?? null), ...plan.env }
     });
     if (outFd !== void 0) closeSync2(outFd);
     if (errFd !== void 0) closeSync2(errFd);
@@ -7173,89 +8130,56 @@ function makeLauncher(cfg) {
 init_procCleanup();
 
 // src/cost.ts
-import { readFileSync as readFileSync10, readdirSync as readdirSync6, renameSync as renameSync7 } from "fs";
-import { join as join10 } from "path";
-
-// src/pricing.ts
-var MODEL_PRICING = {
-  // Вводная цена Sonnet 5 действует до 31.08.2026, после чего вернётся к 3/15.
-  // Дата не автоматизируется намеренно: одна строка раз в жизни дешевле, чем
-  // ветвление по времени внутри расчёта стоимости.
-  "claude-sonnet-5": { inputPerMTok: 2, outputPerMTok: 10 },
-  "claude-opus-5": { inputPerMTok: 5, outputPerMTok: 25 },
-  // Прогоны на 4.8 остаются в истории — строку держим ради их стоимости.
-  "claude-opus-4-8": { inputPerMTok: 5, outputPerMTok: 25 },
-  "claude-haiku-4-5": { inputPerMTok: 1, outputPerMTok: 5 }
-};
-var CACHE_READ_FACTOR = 0.1;
-var CACHE_WRITE_5M_FACTOR = 1.25;
-function costFromUsage(usage, model) {
-  const pricing = model ? MODEL_PRICING[model] : void 0;
-  if (!pricing) {
-    return { costUsd: 0, warning: `\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043C\u043E\u0434\u0435\u043B\u044C \u0434\u043B\u044F \u043F\u0440\u0430\u0439\u0441\u0438\u043D\u0433\u0430: "${model ?? ""}" \u2014 cost \u043D\u0435 \u043F\u043E\u0441\u0447\u0438\u0442\u0430\u043D` };
-  }
-  const input = usage.input_tokens ?? 0;
-  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;
-  return { costUsd };
-}
-
-// src/claudeResult.ts
-function parseClaudeResultJson(raw) {
-  const trimmed = raw.trim();
-  if (!trimmed) return null;
-  try {
-    const parsed = JSON.parse(trimmed);
-    return typeof parsed === "object" && parsed !== null ? parsed : null;
-  } catch {
-    return null;
-  }
-}
-function launchCostUsd(result, model) {
-  if (typeof result.total_cost_usd === "number" && result.total_cost_usd > 0) {
-    return { costUsd: result.total_cost_usd };
-  }
-  if (!result.usage) return { costUsd: 0 };
-  return costFromUsage(result.usage, model);
-}
-
-// src/cost.ts
+init_executors();
+import { readFileSync as readFileSync10, readdirSync as readdirSync8, renameSync as renameSync7 } from "fs";
+import { join as join13 } from "path";
 var UNPROCESSED_LOG_RE = /^\d+\.json$/;
 function unprocessedLogFiles(dir) {
   try {
-    return readdirSync6(dir).filter((f) => UNPROCESSED_LOG_RE.test(f));
+    return readdirSync8(dir).filter((f) => UNPROCESSED_LOG_RE.test(f));
   } catch {
     return [];
   }
 }
 function accountRunCost(deps, run) {
-  const dir = join10(deps.runLogsDir, String(run.id));
+  const dir = join13(deps.runLogsDir, String(run.id));
   const files = unprocessedLogFiles(dir);
   if (files.length === 0) return;
   const model = run.model ?? process.env.SWARM_DRONE_MODEL ?? null;
+  const executor = deps.executor ?? resolveExecutor();
   let added = 0;
+  let tokensIn = 0;
+  let tokensOut = 0;
+  let durationMs = 0;
   const processed = [];
   for (const f of files) {
-    const full = join10(dir, f);
+    const full = join13(dir, f);
     let raw = null;
     try {
       raw = readFileSync10(full, "utf8");
     } catch {
       continue;
     }
-    const result = parseClaudeResultJson(raw);
+    const result = executor.parseResult(raw, model);
     if (!result) {
       console.warn(`[overmind] cost \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id}: \u043D\u0435 \u0440\u0430\u0441\u043F\u0430\u0440\u0441\u0438\u043B\u0441\u044F ${full} (\u043F\u0440\u043E\u0433\u043E\u043D \u0443\u043C\u0435\u0440 \u0434\u043E \u0437\u0430\u043F\u0438\u0441\u0438 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0430?)`);
     } else {
-      const est = launchCostUsd(result, model);
-      if (est.warning) console.warn(`[overmind] cost \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id}: ${est.warning}`);
-      added += est.costUsd;
+      if (result.warning) console.warn(`[overmind] cost \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id}: ${result.warning}`);
+      added += result.costUsd;
+      tokensIn += result.tokensIn ?? 0;
+      tokensOut += result.tokensOut ?? 0;
+      durationMs += result.durationMs ?? 0;
     }
     processed.push(full);
   }
-  if (added > 0) deps.db.updateRun(run.id, { cost_usd: run.cost_usd + added });
+  if (added > 0 || tokensIn > 0 || tokensOut > 0 || durationMs > 0) {
+    deps.db.updateRun(run.id, {
+      cost_usd: run.cost_usd + added,
+      tokens_in: run.tokens_in + tokensIn,
+      tokens_out: run.tokens_out + tokensOut,
+      duration_ms: run.duration_ms + durationMs
+    });
+  }
   for (const full of processed) {
     try {
       renameSync7(full, `${full}.done`);
@@ -7268,14 +8192,15 @@ function makeCostAccountant(deps) {
 }
 
 // src/runOutcome.ts
-import { readdirSync as readdirSync7, readFileSync as readFileSync11 } from "fs";
-import { join as join11 } from "path";
+init_executors();
+import { readdirSync as readdirSync9, readFileSync as readFileSync11 } from "fs";
+import { join as join14 } from "path";
 var RESULT_FILE_RE = /^(\d+)\.json(\.done)?$/;
-function classifyExit(runLogsDir, runId) {
-  const dir = join11(runLogsDir, String(runId));
+function classifyExit(runLogsDir, runId, executor = resolveExecutor()) {
+  const dir = join14(runLogsDir, String(runId));
   let files;
   try {
-    files = readdirSync7(dir);
+    files = readdirSync9(dir);
   } catch {
     return "unknown";
   }
@@ -7289,14 +8214,15 @@ function classifyExit(runLogsDir, runId) {
   if (!latest) return "unknown";
   let raw;
   try {
-    raw = readFileSync11(join11(dir, latest.name), "utf8");
+    raw = readFileSync11(join14(dir, latest.name), "utf8");
   } catch {
     return "unknown";
   }
-  return parseClaudeResultJson(raw) ? "graceful" : "crash";
+  return executor.parseResult(raw, null) ? "graceful" : "crash";
 }
-function makeExitClassifier(runLogsDir) {
-  return (run) => classifyExit(runLogsDir, run.id);
+function makeExitClassifier(runLogsDir, executor) {
+  const exec = executor ?? resolveExecutor();
+  return (run) => classifyExit(runLogsDir, run.id, exec);
 }
 
 // src/orchestrator.ts
@@ -7304,8 +8230,8 @@ init_src();
 init_git();
 
 // src/deps.ts
-import { existsSync as existsSync9, readdirSync as readdirSync9, readFileSync as readFileSync12 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync10, readdirSync as readdirSync11, readFileSync as readFileSync12 } from "fs";
+import { join as join16 } from "path";
 import { execa } from "execa";
 var PREPARE_TIMEOUT_MS = 15 * 6e4;
 var MAX_PLAN_COMMANDS = 12;
@@ -7328,14 +8254,14 @@ function safeReadText(p) {
 }
 function safeListDirs(p) {
   try {
-    return readdirSync9(p, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+    return readdirSync11(p, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
   } catch {
     return [];
   }
 }
 function safeListFiles(p) {
   try {
-    return readdirSync9(p, { withFileTypes: true }).filter((e) => e.isFile()).map((e) => e.name);
+    return readdirSync11(p, { withFileTypes: true }).filter((e) => e.isFile()).map((e) => e.name);
   } catch {
     return [];
   }
@@ -7361,21 +8287,21 @@ function overridePlan(override) {
   };
 }
 function detectPackageManager(worktree, io = {}) {
-  const exists = io.exists ?? existsSync9;
+  const exists = io.exists ?? existsSync10;
   const readText = io.readText ?? safeReadText;
-  const hasPkgJson = exists(join13(worktree, "package.json"));
+  const hasPkgJson = exists(join16(worktree, "package.json"));
   if (!hasPkgJson) {
-    if (exists(join13(worktree, "deno.json")) || exists(join13(worktree, "deno.jsonc")) || exists(join13(worktree, "deno.lock"))) return "deno";
+    if (exists(join16(worktree, "deno.json")) || exists(join16(worktree, "deno.jsonc")) || exists(join16(worktree, "deno.lock"))) return "deno";
     return null;
   }
-  const pkg = readJson(readText, join13(worktree, "package.json"));
+  const pkg = readJson(readText, join16(worktree, "package.json"));
   const declared = typeof pkg?.packageManager === "string" ? pkg.packageManager.split("@")[0] : void 0;
   if (declared === "pnpm" || declared === "bun" || declared === "npm" || declared === "yarn") return declared;
-  if (exists(join13(worktree, "bun.lock")) || exists(join13(worktree, "bun.lockb"))) return "bun";
-  if (exists(join13(worktree, "pnpm-lock.yaml"))) return "pnpm";
-  if (exists(join13(worktree, "yarn.lock"))) return "yarn";
-  if (exists(join13(worktree, "package-lock.json"))) return "npm";
-  if (exists(join13(worktree, "deno.lock"))) return "deno";
+  if (exists(join16(worktree, "bun.lock")) || exists(join16(worktree, "bun.lockb"))) return "bun";
+  if (exists(join16(worktree, "pnpm-lock.yaml"))) return "pnpm";
+  if (exists(join16(worktree, "yarn.lock"))) return "yarn";
+  if (exists(join16(worktree, "package-lock.json"))) return "npm";
+  if (exists(join16(worktree, "deno.lock"))) return "deno";
   return "npm";
 }
 function jsInstallCommand(pm) {
@@ -7428,7 +8354,7 @@ var ECOSYSTEM_MARKERS = [
   // конфигурация — дело сборки, не подготовки
 ];
 function detectPlan(worktree, io) {
-  const exists = io.exists ?? existsSync9;
+  const exists = io.exists ?? existsSync10;
   const listFiles = io.listFiles ?? safeListFiles;
   const pm = detectPackageManager(worktree, io);
   if (pm) {
@@ -7436,7 +8362,7 @@ function detectPlan(worktree, io) {
       // node_modules на месте — установку пропускаем (быстрый путь переиспользованного worktree).
       // У deno каталога может не быть вовсе (кэш в DENO_DIR) — тогда `deno install` отработает
       // заново, но он дешёвый: тянет из того же общего кэша.
-      { label: `${pm} install`, run: jsInstallCommand(pm), skipIfExists: join13(worktree, "node_modules"), source: "detect" }
+      { label: `${pm} install`, run: jsInstallCommand(pm), skipIfExists: join16(worktree, "node_modules"), source: "detect" }
     ];
     for (const target of workspaceBuildTargets(worktree, io)) {
       commands.push({ label: `\u0441\u0431\u043E\u0440\u043A\u0430 ${target.name}`, run: jsRunScript(pm, "build"), cwd: target.dir, source: "detect" });
@@ -7444,12 +8370,12 @@ function detectPlan(worktree, io) {
     return { source: "detect", ecosystem: `node/${pm}`, commands };
   }
   for (const marker of ECOSYSTEM_MARKERS) {
-    const hit = marker.files.some((f) => exists(join13(worktree, f))) || marker.ext !== void 0 && listFiles(worktree).some((n) => n.endsWith(marker.ext));
+    const hit = marker.files.some((f) => exists(join16(worktree, f))) || marker.ext !== void 0 && listFiles(worktree).some((n) => n.endsWith(marker.ext));
     if (!hit) continue;
     let ecosystem = marker.ecosystem;
     let command = marker.command;
     for (const refine of marker.refine ?? []) {
-      if (!exists(join13(worktree, refine.file))) continue;
+      if (!exists(join16(worktree, refine.file))) continue;
       ecosystem = refine.ecosystem;
       command = refine.command;
       break;
@@ -7506,12 +8432,12 @@ var CI_INSTALL_PATTERNS = [
 function ciWorkflowPlan(worktree, io) {
   const readText = io.readText ?? safeReadText;
   const listFiles = io.listFiles ?? safeListFiles;
-  const dir = join13(worktree, ".github", "workflows");
+  const dir = join16(worktree, ".github", "workflows");
   const files = listFiles(dir).filter((n) => n.endsWith(".yml") || n.endsWith(".yaml"));
   const seen = /* @__PURE__ */ new Set();
   const commands = [];
   for (const name of files.sort()) {
-    const yaml = readText(join13(dir, name));
+    const yaml = readText(join16(dir, name));
     if (yaml === null) continue;
     for (const raw of workflowRunLines(yaml)) {
       const line = raw.replace(/\s+/g, " ").trim();
@@ -7526,7 +8452,7 @@ function ciWorkflowPlan(worktree, io) {
   return commands.length ? { source: "ci-workflow", ecosystem: "ci-\u043A\u043E\u043D\u0444\u0438\u0433", commands } : null;
 }
 function workspaceGlobs(worktree, readText) {
-  const yaml = readText(join13(worktree, "pnpm-workspace.yaml"));
+  const yaml = readText(join16(worktree, "pnpm-workspace.yaml"));
   if (yaml !== null) {
     const globs = [];
     let inPackages = false;
@@ -7546,7 +8472,7 @@ function workspaceGlobs(worktree, readText) {
     }
     if (globs.length) return globs;
   }
-  const pkg = readJson(readText, join13(worktree, "package.json"));
+  const pkg = readJson(readText, join16(worktree, "package.json"));
   const ws = pkg?.workspaces;
   const list = Array.isArray(ws) ? ws : Array.isArray(ws?.packages) ? ws.packages : [];
   return list.filter((g) => typeof g === "string");
@@ -7557,14 +8483,14 @@ function workspaceDirs(worktree, globs, io) {
     if (glob.startsWith("!")) continue;
     const star = glob.indexOf("*");
     if (star === -1) {
-      const dir = join13(worktree, glob);
-      if (io.exists(join13(dir, "package.json"))) dirs.add(dir);
+      const dir = join16(worktree, glob);
+      if (io.exists(join16(dir, "package.json"))) dirs.add(dir);
       continue;
     }
-    const base3 = join13(worktree, glob.slice(0, star).replace(/\/$/, ""));
+    const base3 = join16(worktree, glob.slice(0, star).replace(/\/$/, ""));
     for (const name of io.listDirs(base3)) {
-      const dir = join13(base3, name);
-      if (io.exists(join13(dir, "package.json"))) dirs.add(dir);
+      const dir = join16(base3, name);
+      if (io.exists(join16(dir, "package.json"))) dirs.add(dir);
     }
   }
   return [...dirs];
@@ -7585,18 +8511,18 @@ function entryPaths(pkg) {
   return out;
 }
 function workspaceBuildTargets(worktree, io = {}) {
-  const exists = io.exists ?? existsSync9;
+  const exists = io.exists ?? existsSync10;
   const readText = io.readText ?? safeReadText;
   const listDirs = io.listDirs ?? safeListDirs;
   const globs = workspaceGlobs(worktree, readText);
   if (!globs.length) return [];
   const pkgs = [];
   for (const dir of workspaceDirs(worktree, globs, { exists, listDirs })) {
-    const pkg = readJson(readText, join13(dir, "package.json"));
+    const pkg = readJson(readText, join16(dir, "package.json"));
     if (!pkg || typeof pkg.name !== "string") continue;
     const scripts = pkg.scripts ?? {};
     const entries = entryPaths(pkg);
-    const needsBuild = typeof scripts.build === "string" && entries.length > 0 && entries.some((e) => !exists(join13(dir, e)));
+    const needsBuild = typeof scripts.build === "string" && entries.length > 0 && entries.some((e) => !exists(join16(dir, e)));
     const deps = Object.keys({ ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} });
     pkgs.push({ name: pkg.name, dir, deps, needsBuild });
   }
@@ -7624,7 +8550,7 @@ function planPrepare(worktree, io = {}) {
   return { ...plan, commands: plan.commands.slice(0, MAX_PLAN_COMMANDS) };
 }
 async function ensureWorktreeDeps(worktree, io = {}) {
-  const exists = io.exists ?? existsSync9;
+  const exists = io.exists ?? existsSync10;
   const exec = io.exec ?? ((cmd) => runCommand(cmd, worktree));
   const approve = io.approve ?? (() => true);
   const plan = planPrepare(worktree, io);
@@ -7715,7 +8641,9 @@ var BaseBranchMissingError = class extends Error {
   branch;
   repo;
 };
-var AreaBusyError = class extends Error {
+var SpawnDeferredError = class extends Error {
+};
+var AreaBusyError = class extends SpawnDeferredError {
   constructor(area) {
     super(`\u0437\u043E\u043D\u0430 ${area} \u0437\u0430\u043D\u044F\u0442\u0430 \u0434\u0440\u0443\u0433\u0438\u043C \u0434\u0440\u043E\u043D\u043E\u043C \u2014 \u0437\u0430\u0434\u0430\u0447\u0430 \u043E\u0441\u0442\u0430\u0451\u0442\u0441\u044F \u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u0438`);
     this.area = area;
@@ -7723,6 +8651,14 @@ var AreaBusyError = class extends Error {
   }
   area;
 };
+var FileOverlapError = class extends SpawnDeferredError {
+  constructor(message, blockedByRunId) {
+    super(message);
+    this.blockedByRunId = blockedByRunId;
+    this.name = "FileOverlapError";
+  }
+  blockedByRunId;
+};
 function healTaskSlug(db, run, task) {
   const slug = task?.slug;
   if (!slug || slug === run.task_slug || !isTaskSlug(slug) || isTaskSlug(run.task_slug)) return run;
@@ -7732,7 +8668,9 @@ function healTaskSlug(db, run, task) {
 async function spawnDrone(deps, run) {
   const repo = normalizeRepo(run.repo || deps.repo || "");
   if (!repo) throw new Error(`\u0443 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id} (${run.task_slug}) \u043D\u0435\u0442 repo \u0438 \u043D\u0435\u0442 \u0434\u0435\u0444\u043E\u043B\u0442\u0430 SWARM_REPO`);
-  if (run.area && deps.db.runningAreas(repo).includes(run.area)) {
+  const conflict = deps.conflicts ? await deps.conflicts(run, repo) : { kind: "unknown" };
+  if (conflict.kind === "wait") throw new FileOverlapError(conflict.message, conflict.blockedBy.id);
+  if (conflict.kind === "unknown" && run.area && deps.db.runningAreas(repo).includes(run.area)) {
     throw new AreaBusyError(run.area);
   }
   const branch = run.task_slug;
@@ -7783,13 +8721,13 @@ function isGithubPrUrl(url) {
   return GH_PR_RE.test(url.trim());
 }
 function softStatus() {
-  return { merged: false, state: "UNKNOWN", mergeable: "UNKNOWN", mergeStateStatus: "UNKNOWN", conflicting: false, isDraft: false, files: [] };
+  return { merged: false, state: "UNKNOWN", mergeable: "UNKNOWN", mergeStateStatus: "UNKNOWN", conflicting: false, isDraft: false, files: [], headBranch: null };
 }
 async function prStatus(prUrl, run = realRunner) {
   if (!isGithubPrUrl(prUrl)) return softStatus();
   let out;
   try {
-    out = await run(["pr", "view", prUrl, "--json", "state,mergedAt,mergeable,mergeStateStatus,isDraft,files"]);
+    out = await run(["pr", "view", prUrl, "--json", "state,mergedAt,mergeable,mergeStateStatus,isDraft,files,headRefName"]);
   } catch {
     return softStatus();
   }
@@ -7810,9 +8748,20 @@ async function prStatus(prUrl, run = realRunner) {
     // не смержен, открыт и GitHub уверенно говорит CONFLICTING
     conflicting: !merged && state === "OPEN" && mergeable === "CONFLICTING",
     isDraft: j.isDraft === true,
-    files: Array.isArray(j.files) ? j.files.map((f) => f.path).filter((p) => typeof p === "string") : []
+    files: Array.isArray(j.files) ? j.files.map((f) => f.path).filter((p) => typeof p === "string") : [],
+    headBranch: typeof j.headRefName === "string" && j.headRefName ? j.headRefName : null
   };
 }
+async function prHeadBranch(prUrl, run = realRunner) {
+  if (!isGithubPrUrl(prUrl)) return null;
+  try {
+    const out = await run(["pr", "view", prUrl, "--json", "headRefName"]);
+    const j = JSON.parse(out);
+    return typeof j.headRefName === "string" && j.headRefName ? j.headRefName : null;
+  } catch {
+    return null;
+  }
+}
 async function openPrsForBranch(branch, repoDir, run = realRepoRunner) {
   if (!branch || !repoDir) return [];
   try {
@@ -8020,6 +8969,13 @@ function reviewTransitionPatch(run, prUrl) {
   }
   return { isFixIteration: false, cycle: null, patch: { status: "review", pr_url: prUrl } };
 }
+function branchFromPrPatch(currentBranch, headBranch) {
+  if (!headBranch || headBranch === currentBranch) return null;
+  return {
+    patch: { branch: headBranch },
+    event: currentBranch ? `\u0432\u0435\u0442\u043A\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0432\u0437\u044F\u0442\u0430 \u0443 PR: ${currentBranch} \u2192 ${headBranch} (\u043F\u043E\u043B\u0435 \u0431\u044B\u043B\u043E \u0441\u043E\u0431\u0440\u0430\u043D\u043E \u0438\u0437 \u0441\u043B\u0430\u0433\u0430 \u2014 TASWM-356)` : `\u0432\u0435\u0442\u043A\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0432\u0437\u044F\u0442\u0430 \u0443 PR: ${headBranch} (TASWM-356)`
+  };
+}
 function applyReviewTransition(db, run, prUrl) {
   const { patch, ...t } = reviewTransitionPatch(run, prUrl);
   db.updateRun(run.id, patch);
@@ -8028,14 +8984,14 @@ function applyReviewTransition(db, run, prUrl) {
 
 // src/droneServer.ts
 init_src();
-function freezeInstruction(slug, reason = "\u0435\u0433\u043E \u043F\u0443\u043B\u044C\u0441 (heartbeat) \u0443\u0441\u0442\u0430\u0440\u0435\u043B") {
+function freezeInstruction(branch, reason = "\u0435\u0433\u043E \u043F\u0443\u043B\u044C\u0441 (heartbeat) \u0443\u0441\u0442\u0430\u0440\u0435\u043B") {
   return [
     `\u26D4 OVERMIND \u041D\u0415\u0414\u041E\u0421\u0422\u0423\u041F\u0415\u041D \u2014 ${reason}. \u041D\u0430\u0434\u0437\u043E\u0440\u0430 \u043D\u0430\u0434 \u0442\u043E\u0431\u043E\u0439 \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0435\u0442: \u043D\u0435\u043A\u043E\u043C\u0443`,
     "\u043F\u0440\u0438\u043D\u044F\u0442\u044C \u0442\u0432\u043E\u0439 \u0432\u043E\u043F\u0440\u043E\u0441, \u0437\u0430\u043C\u0435\u0442\u0438\u0442\u044C \u0441\u043C\u0435\u0440\u0442\u044C, \u0441\u043C\u0435\u0440\u0436\u0438\u0442\u044C PR \u0438\u043B\u0438 \u0440\u0430\u0437\u0440\u0443\u043B\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442. \u0420\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0432\u0441\u043B\u0435\u043F\u0443\u044E \u043D\u0435\u043B\u044C\u0437\u044F.",
     "\u0417\u0410\u041C\u0420\u0418 \u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0441\u044C, \u0447\u0442\u043E\u0431\u044B \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0435 \u043F\u0440\u043E\u043F\u0430\u043B\u0430:",
     "1. \u0417\u0430\u043A\u043E\u043C\u043C\u0438\u0442\u044C \u0412\u0421\u042E \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u0440\u0430\u0431\u043E\u0442\u0443 \u043A\u0430\u043A \u0435\u0441\u0442\u044C: `git add -A && git commit` (\u0442\u0440\u0435\u0439\u043B\u0435\u0440 \u043F\u0440\u043E \u0434\u0440\u043E\u043D\u0430 \u2014 \u043A\u0430\u043A \u043E\u0431\u044B\u0447\u043D\u043E).",
     "   \u041D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u041D\u0415 \u043F\u0438\u0448\u0438, \u0437\u0430\u0434\u0430\u0447\u0443 \u0434\u0430\u043B\u044C\u0448\u0435 \u041D\u0415 \u0434\u0435\u043B\u0430\u0439 \u2014 \u0442\u043E\u043B\u044C\u043A\u043E \u0441\u043E\u0445\u0440\u0430\u043D\u0438 \u0443\u0436\u0435 \u0441\u0434\u0435\u043B\u0430\u043D\u043D\u043E\u0435, \u0431\u0435\u0437 \u043C\u0443\u0441\u043E\u0440\u043D\u044B\u0445 \u043A\u043E\u043C\u043C\u0438\u0442\u043E\u0432.",
-    `2. \u0417\u0430\u043F\u0443\u0448\u044C \u0432\u0435\u0442\u043A\u0443: \`git push -u origin ${slug}\` \u2014 \u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u0443\u043C\u0440\u0451\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u043C.`,
+    `2. \u0417\u0430\u043F\u0443\u0448\u044C \u0432\u0435\u0442\u043A\u0443: \`git push -u origin ${branch}\` \u2014 \u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u0443\u043C\u0440\u0451\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u043C.`,
     "3. \u0417\u0430\u0432\u0435\u0440\u0448\u0438 \u0440\u0430\u0431\u043E\u0442\u0443 \u2014 \u0431\u043E\u043B\u044C\u0448\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432 \u041D\u0415 \u0437\u043E\u0432\u0438 (\u043D\u0438 report_step, \u043D\u0438 ask, \u043D\u0438 done). \u041F\u0440\u043E\u0441\u0442\u043E \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u0438 \u0441\u0435\u0441\u0441\u0438\u044E.",
     "\u041F\u0440\u043E\u0433\u043E\u043D \u043F\u043E\u043C\u0435\u0447\u0435\u043D \xABpaused\xBB. \u041A\u043E\u0433\u0434\u0430 \u043F\u043E\u0434\u043D\u0438\u043C\u0435\u0442\u0441\u044F \u043D\u043E\u0432\u044B\u0439 overmind, \u043E\u043D \u0440\u0430\u0437\u0431\u0443\u0434\u0438\u0442 \u0442\u0435\u0431\u044F \u0441 \u044D\u0442\u043E\u0433\u043E \u043C\u0435\u0441\u0442\u0430 (--continue) \u2014",
     "\u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0448\u044C \u043E\u0442\u0442\u0443\u0434\u0430. \u041D\u0435 \u043F\u0435\u0440\u0435\u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0439 \u0438 \u043D\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u0437\u0430\u0434\u0430\u0447\u0443 \u0441\u0435\u0439\u0447\u0430\u0441."
@@ -8068,10 +9024,12 @@ async function buildDroneServer(store, opts = {}) {
   const slugForInstruction = (fallback) => opts.expectedTaskSlug ?? fallback ?? "<slug>";
   const freeze = async (withdraw = false) => {
     let slug;
+    let branch;
     try {
       if (withdraw) await store.withdrawMyQuestion("overmind \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u2014 \u0434\u0440\u043E\u043D \u0437\u0430\u043C\u0435\u0440, \u0432\u043E\u043F\u0440\u043E\u0441 \u0441\u043D\u044F\u0442");
       const run = await store.myRun();
       slug = run?.task_slug;
+      branch = !opts.expectedTaskSlug || opts.expectedTaskSlug === run?.task_slug ? run?.branch : null;
       if (run && run.status !== "paused") {
         await store.updateRun(null, { status: "paused" });
         await store.addEvent(null, "paused", "overmind \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u2014 \u0434\u0440\u043E\u043D \u0437\u0430\u043C\u0435\u0440, \u0440\u0430\u0431\u043E\u0442\u0430 \u0432 origin, \u0436\u0434\u0451\u0442 \u043F\u0435\u0440\u0435\u043F\u043E\u0434\u044A\u0451\u043C\u0430");
@@ -8079,7 +9037,7 @@ async function buildDroneServer(store, opts = {}) {
     } catch (e) {
       console.error("[overmind-drone] \u043F\u043E\u043C\u0435\u0442\u0438\u0442\u044C \u043F\u0440\u043E\u0433\u043E\u043D paused \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C (\u043D\u0430\u0434\u0437\u043E\u0440 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D):", e);
     }
-    return { content: [{ type: "text", text: freezeInstruction(slugForInstruction(slug), opts.deadReason) }] };
+    return { content: [{ type: "text", text: freezeInstruction(branch || slugForInstruction(slug), opts.deadReason) }] };
   };
   const guard = (fn) => async (a) => {
     try {
@@ -8103,7 +9061,7 @@ async function buildDroneServer(store, opts = {}) {
   );
   server.tool(
     "read_task",
-    "\u0421\u0432\u0435\u0436\u0438\u0439 \u0441\u043D\u0430\u043F\u0448\u043E\u0442 \u0442\u0432\u043E\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u041F\u0420\u042F\u041C\u041E \u0421\u0415\u0419\u0427\u0410\u0421: \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 + \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 (\u0430\u0432\u0442\u043E\u0440+\u0432\u0440\u0435\u043C\u044F+\u0442\u0435\u043A\u0441\u0442) + \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432 (\u0441\u043F\u0435\u043A\u0438 \u043E\u0431\u044B\u0447\u043D\u043E \u043B\u0435\u0436\u0430\u0442 \u0438\u043C\u0435\u043D\u043D\u043E \u0442\u0430\u043C). \u0411\u0435\u0437 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432. \u0417\u043E\u0432\u0438 \u043F\u0435\u0440\u0435\u0434 done() \u2014 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u043C\u043E\u0433 \u0434\u043E\u043F\u0438\u0441\u0430\u0442\u044C \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u0435 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u043E\u043C \u0443\u0436\u0435 \u043F\u043E\u0441\u043B\u0435 \u0442\u0432\u043E\u0435\u0433\u043E \u0441\u0442\u0430\u0440\u0442\u0430, \u0430 \u0441\u0442\u0430\u0440\u0442\u043E\u0432\u044B\u0439 \u043F\u0440\u043E\u043C\u043F\u0442 \u044D\u0442\u043E\u0433\u043E \u043D\u0435 \u0443\u0432\u0438\u0434\u0438\u0442 (\u043E\u043D \u0441\u043E\u0431\u0440\u0430\u043D \u043E\u0434\u0438\u043D \u0440\u0430\u0437 \u043F\u0440\u0438 \u0441\u043F\u0430\u0432\u043D\u0435).",
+    "\u0421\u0432\u0435\u0436\u0438\u0439 \u0441\u043D\u0430\u043F\u0448\u043E\u0442 \u0442\u0432\u043E\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u041F\u0420\u042F\u041C\u041E \u0421\u0415\u0419\u0427\u0410\u0421: \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 + \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u0433\u043E\u0442\u043E\u0432\u043D\u043E\u0441\u0442\u0438 + \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 (\u0430\u0432\u0442\u043E\u0440+\u0432\u0440\u0435\u043C\u044F+\u0442\u0435\u043A\u0441\u0442) + \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432 (\u0441\u043F\u0435\u043A\u0438 \u043E\u0431\u044B\u0447\u043D\u043E \u043B\u0435\u0436\u0430\u0442 \u0438\u043C\u0435\u043D\u043D\u043E \u0442\u0430\u043C) + \u0447\u0435\u043C \u043A\u043E\u043D\u0447\u0438\u043B\u0438\u0441\u044C \u0441\u043E\u0441\u0435\u0434\u043D\u0438\u0435 \u0437\u0430\u0434\u0430\u0447\u0438 \u0432 \u0442\u043E\u0439 \u0436\u0435 \u0437\u043E\u043D\u0435 \u043A\u043E\u0434\u0430 \u0438 \u043A\u0442\u043E \u0438\u0437 \u0440\u043E\u044F \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u0440\u044F\u0434\u043E\u043C. \u0411\u0435\u0437 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432. \u0417\u043E\u0432\u0438 \u043F\u0435\u0440\u0435\u0434 done() \u2014 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u043C\u043E\u0433 \u0434\u043E\u043F\u0438\u0441\u0430\u0442\u044C \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u0435 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u043E\u043C \u0443\u0436\u0435 \u043F\u043E\u0441\u043B\u0435 \u0442\u0432\u043E\u0435\u0433\u043E \u0441\u0442\u0430\u0440\u0442\u0430, \u0430 \u0441\u0442\u0430\u0440\u0442\u043E\u0432\u044B\u0439 \u043F\u0440\u043E\u043C\u043F\u0442 \u044D\u0442\u043E\u0433\u043E \u043D\u0435 \u0443\u0432\u0438\u0434\u0438\u0442 (\u043E\u043D \u0441\u043E\u0431\u0440\u0430\u043D \u043E\u0434\u0438\u043D \u0440\u0430\u0437 \u043F\u0440\u0438 \u0441\u043F\u0430\u0432\u043D\u0435).",
     {},
     async () => {
       if (!opts.taskless) {
@@ -8316,9 +9274,12 @@ ${report}${shots.warning}`,
             await store.addEvent(null, "step", `\u043E\u0442\u0447\u0451\u0442 \u0432 \u0437\u0430\u0434\u0430\u0447\u0443 ${taskSlug} \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D: ${e instanceof Error ? e.message : String(e)}`);
           }
         };
+        const headBranch = opts.prHeadBranch ? await opts.prHeadBranch(pr_url).catch(() => null) : null;
+        const branchFix = branchFromPrPatch(run?.branch, headBranch);
+        if (branchFix) await store.addEvent(null, "step", branchFix.event);
         if (run) {
           const t = reviewTransitionPatch(run, pr_url);
-          await store.updateRun(null, t.patch);
+          await store.updateRun(null, { ...t.patch, ...branchFix?.patch ?? {} });
           await store.addEvent(null, "pr_opened", pr_url);
           await postReport(reportSlug(run.task_slug), t.cycle ?? run.review_cycle ?? 0);
           if (t.isFixIteration) {
@@ -8331,7 +9292,7 @@ ${report}${shots.warning}`,
           }
           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)}` }] };
         }
-        await store.updateRun(null, { status: "review", pr_url });
+        await store.updateRun(null, { status: "review", pr_url, ...branchFix?.patch ?? {} });
         await store.addEvent(null, "pr_opened", pr_url);
         const fallbackSlug = reportSlug(void 0);
         if (fallbackSlug) await postReport(fallbackSlug, void 0);
@@ -8496,7 +9457,7 @@ async function runDroneServer(runId) {
   );
   const expectedTaskSlug = process.env.SWARM_TASK_SLUG || void 0;
   const expectedKind = toRunKind(process.env.SWARM_RUN_KIND);
-  const common = { taskless, runKind: expectedKind, ...expectedTaskSlug ? { expectedTaskSlug } : {} };
+  const common = { taskless, runKind: expectedKind, prHeadBranch, ...expectedTaskSlug ? { expectedTaskSlug } : {} };
   const channelUrl = process.env.SWARM_DRONE_CHANNEL_URL;
   const channelToken = process.env.SWARM_DRONE_CHANNEL_TOKEN;
   if (channelUrl && channelToken) {
@@ -8589,12 +9550,15 @@ var AnomalyTracker = class {
       for (const [k, v] of Object.entries(restored.since)) this.since.set(k, v);
       for (const [k, v] of Object.entries(restored.lastFiredAt)) this.lastFiredAt.set(k, v);
       for (const [k, v] of Object.entries(restored.fires)) this.fires.set(k, v);
+      for (const k of restored.resolved ?? []) this.resolved.add(k);
     }
   }
   renotifyCooldownMs;
   since = /* @__PURE__ */ new Map();
   lastFiredAt = /* @__PURE__ */ new Map();
   fires = /* @__PURE__ */ new Map();
+  /** TAS-485: очередь «уже звонили, а условие ушло» — к гашению в инбоксе. */
+  resolved = /* @__PURE__ */ new Set();
   maxRepeats;
   io;
   /** Кандидаты, готовые к сигналу (отлежали minDurationMs, не в кулдауне) — НИЧЕГО не коммитит. */
@@ -8615,6 +9579,7 @@ var AnomalyTracker = class {
     for (const map of [this.since, this.lastFiredAt, this.fires]) {
       for (const k of [...map.keys()]) {
         if (!seen.has(k)) {
+          if (map === this.lastFiredAt) this.resolved.add(k);
           map.delete(k);
           pruned = true;
         }
@@ -8627,8 +9592,25 @@ var AnomalyTracker = class {
   commit(key, now) {
     this.lastFiredAt.set(key, now);
     this.fires.set(key, (this.fires.get(key) ?? 0) + 1);
+    this.resolved.delete(key);
     this.persist();
   }
+  /**
+   * TAS-485: ключи, чьё условие ушло ПОСЛЕ того, как о нём звонили, — их записи
+   * в инбоксе пора погасить. Список только ЧИТАЕТСЯ: вычёркивает доставленное
+   * вызывающий (`forgetResolved`) и только после успеха — та же дисциплина, что
+   * у eligible/commit. Проглоти мы сбой доставки как успех, тревога о том, чего
+   * нет, осталась бы висеть навсегда и молча.
+   */
+  pendingResolved() {
+    return [...this.resolved];
+  }
+  /** Гашение по этим ключам доставлено — забываем их. */
+  forgetResolved(keys) {
+    let changed = false;
+    for (const k of keys) changed = this.resolved.delete(k) || changed;
+    if (changed) this.persist();
+  }
   /**
    * Следующий сигнал по этому ключу — ПОСЛЕДНИЙ разрешённый в эпизоде: вызывающий меняет
    * формулировку (LAST_REMINDER_SUFFIX), чтобы затихание не выглядело как «рой забыл».
@@ -8644,7 +9626,8 @@ var AnomalyTracker = class {
       this.io.save({
         since: Object.fromEntries(this.since),
         lastFiredAt: Object.fromEntries(this.lastFiredAt),
-        fires: Object.fromEntries(this.fires)
+        fires: Object.fromEntries(this.fires),
+        resolved: [...this.resolved]
       });
     } catch (e) {
       console.error("[anomalies] \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u043D\u0430\u0434\u0437\u043E\u0440\u0430 \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u043E \u043D\u0430 \u0434\u0438\u0441\u043A:", e);
@@ -8698,8 +9681,9 @@ function buildAnomalyCandidates(db, now, thresholds, opts) {
     const changedAt = sqliteMs(run.updated_at);
     return changedAt >= q.from && (q.to == null || changedAt <= q.to);
   };
+  const closedBeforeStart = (run) => opts.daemonStartedAt != null && sqliteMs(run.updated_at) < opts.daemonStartedAt;
   const recentFailed = allRuns.filter(
-    (r) => r.status === "failed" && ageMs(now, r.updated_at) <= thresholds.failedSpikeWindowMs && !killedByOperator(r)
+    (r) => r.status === "failed" && ageMs(now, r.updated_at) <= thresholds.failedSpikeWindowMs && !killedByOperator(r) && !closedBeforeStart(r)
   );
   if (recentFailed.length >= thresholds.failedSpikeCount) {
     candidates.push({
@@ -8736,6 +9720,7 @@ function buildAnomalyCandidates(db, now, thresholds, opts) {
     if (run.resolves_run_id != null || run.reviews_run_id != null) continue;
     if (ageMs(now, run.updated_at) > thresholds.runDownWindowMs) continue;
     if (killedByOperator(run)) continue;
+    if (closedBeforeStart(run)) continue;
     const repeat = isRepeatDown(run);
     candidates.push({
       key: `run_stalled:${run.id}`,
@@ -8756,6 +9741,7 @@ function buildAnomalyCandidates(db, now, thresholds, opts) {
     if (run.resolves_run_id != null || run.reviews_run_id != null) continue;
     if (ageMs(now, run.updated_at) > thresholds.runDownWindowMs) continue;
     if (killedByOperator(run)) continue;
+    if (closedBeforeStart(run)) continue;
     const repeat = isRepeatDown(run);
     candidates.push({
       key: `run_failed:${run.id}`,
@@ -9175,22 +10161,22 @@ function makeExclusiveReader(opts) {
 }
 
 // src/envGate.ts
-import { existsSync as existsSync12 } from "fs";
-import { join as join20 } from "path";
+import { existsSync as existsSync13 } from "fs";
+import { join as join23 } from "path";
 import { createConnection } from "net";
 import { execa as execa2 } from "execa";
 
 // src/platform.ts
-import { existsSync as existsSync11, readFileSync as readFileSync17 } from "fs";
-import { delimiter, join as join19 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync17 } from "fs";
+import { delimiter, join as join22 } from "path";
 function resolveCommandPath(name, env = process.env, platform = process.platform) {
-  if (name.includes("/") || name.includes("\\")) return existsSync11(name) ? name : null;
+  if (name.includes("/") || name.includes("\\")) return existsSync12(name) ? name : null;
   const dirs = (env.PATH ?? env.Path ?? "").split(delimiter).filter(Boolean);
   const exts = platform === "win32" ? (env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";").filter(Boolean) : [""];
   for (const dir of dirs) {
     for (const ext of exts) {
-      const candidate = join19(dir, name + ext);
-      if (existsSync11(candidate)) return candidate;
+      const candidate = join22(dir, name + ext);
+      if (existsSync12(candidate)) return candidate;
     }
   }
   return null;
@@ -9248,8 +10234,8 @@ var COMPOSE_MARKERS = [
   "compose.yaml"
 ];
 function detectRequirements(repo, io = {}) {
-  const exists = io.exists ?? existsSync12;
-  const marker = COMPOSE_MARKERS.find((f) => exists(join20(repo, f)));
+  const exists = io.exists ?? existsSync13;
+  const marker = COMPOSE_MARKERS.find((f) => exists(join23(repo, f)));
   return marker ? [{ kind: "docker", raw: `docker (\u0434\u0435\u0442\u0435\u043A\u0442: ${marker})` }] : [];
 }
 function resolveRequirements(repo, declared, io = {}) {
@@ -9385,8 +10371,8 @@ import { basename as basename3 } from "path";
 import { serve as serve2 } from "@hono/node-server";
 
 // src/diff.ts
-import { statSync as statSync7 } from "fs";
-import { join as join21 } from "path";
+import { statSync as statSync8 } from "fs";
+import { join as join24 } from "path";
 import { $ as $4 } from "execa";
 var MAX_FILES = 200;
 var MAX_LINES_PER_FILE = 1500;
@@ -9529,7 +10515,7 @@ async function resolveBase(wt, baseBranch) {
 }
 function mtime(path) {
   try {
-    return statSync7(path).mtimeMs;
+    return statSync8(path).mtimeMs;
   } catch {
     return 0;
   }
@@ -9554,7 +10540,7 @@ async function collectRunDiff(worktree, opts = {}) {
       files.push(pf);
     }
   }
-  files.sort((a, b) => mtime(join21(worktree, b.path)) - mtime(join21(worktree, a.path)));
+  files.sort((a, b) => mtime(join24(worktree, b.path)) - mtime(join24(worktree, a.path)));
   const truncatedFiles = files.length > MAX_FILES;
   if (truncatedFiles) files = files.slice(0, MAX_FILES);
   const added = files.reduce((s, f) => s + f.added, 0);
@@ -9569,11 +10555,25 @@ async function collectRunDiff(worktree, opts = {}) {
     ...truncatedFiles ? { truncated: true } : {}
   };
 }
+async function changedPaths(worktree, opts = {}) {
+  if (!worktree) return [];
+  try {
+    const isWt = (await $4({ reject: false })`git -C ${worktree} rev-parse --is-inside-work-tree`).stdout.trim();
+    if (isWt !== "true") return [];
+    const from = await resolveBase(worktree, opts.baseBranch) ?? "HEAD";
+    const tracked = (await $4({ reject: false })`git -C ${worktree} diff --name-only --find-renames ${from} --`).stdout;
+    const untracked = (await $4({ reject: false })`git -C ${worktree} ls-files --others --exclude-standard -z`).stdout;
+    const all = [...tracked.split("\n"), ...untracked.split("\0")].map((s) => s.trim()).filter(Boolean);
+    return [...new Set(all)].sort();
+  } catch {
+    return [];
+  }
+}
 
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.5.0",
+  version: "0.6.0",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -9690,6 +10690,10 @@ function roySnapshot(db, now = Date.now(), overmindLog = [], paused = false, dae
         stopReason: r.stop_reason,
         reason,
         updated: r.updated_at,
+        startedAt: r.created_at,
+        // TASWM-351: возраст прогона на карточке
+        costUsd: r.cost_usd || 0,
+        // TASWM-351: то же поле, что уходит в прод (swarm_run_upsert{costUsd})
         step,
         hasDecision: withQ.has(r.id),
         rescued: evs.some((e) => e.kind === "rescued"),
@@ -11237,6 +12241,7 @@ async function checkDaemonVersion(start, now = () => /* @__PURE__ */ new Date())
 }
 
 // src/release.ts
+init_claudeBin();
 var SWARM_PACKAGE = "@taskless-app/swarm";
 var LATEST_TIMEOUT_MS = 4e3;
 async function fetchLatestVersion(opts = {}) {
@@ -11271,9 +12276,9 @@ function outdatedLine(current, latest, updateCommand = "swarm update") {
 // src/hostCommands.ts
 init_src();
 import { readFileSync as readFileSync18, renameSync as renameSync8, writeFileSync as writeFileSync13 } from "fs";
-import { join as join22 } from "path";
+import { join as join25 } from "path";
 function hostCommandStatePath(home) {
-  return join22(home, "host-command.json");
+  return join25(home, "host-command.json");
 }
 function readState(path) {
   try {
@@ -11383,6 +12388,28 @@ async function executeOne(cmd, opts) {
         await ack(cmd.id, "done", { result: `\u043F\u0440\u043E\u0433\u043E\u043D ${slug} \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D` });
         return false;
       }
+      // TASWM-351: «перезапустить с того же места». Отказ побудки (дрон уже работает,
+      // продолжать нечем) уезжает как `rejected` с ЕЁ формулировкой — повторять такую
+      // команду бессмысленно, и это ровно та разница между rejected и failed, ради
+      // которой они разделены (см. HOST_COMMAND_STATUSES).
+      case "wake_run": {
+        const slug = cmd.runSlug?.trim();
+        if (!slug) {
+          await ack(cmd.id, "rejected", { result: "\u043D\u0435 \u0441\u043A\u0430\u0437\u0430\u043D\u043E, \u043A\u0430\u043A\u043E\u0439 \u043F\u0440\u043E\u0433\u043E\u043D \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A\u0430\u0442\u044C" });
+          return false;
+        }
+        const woken = await effects.wakeRun(slug);
+        if (!woken) {
+          await ack(cmd.id, "rejected", { result: `\u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043F\u043E ${slug} \u0443 \u043C\u0435\u043D\u044F \u043D\u0435\u0442` });
+          return false;
+        }
+        if (!woken.ok) {
+          await ack(cmd.id, "rejected", { result: woken.why });
+          return false;
+        }
+        await ack(cmd.id, "done", { result: woken.why });
+        return false;
+      }
       case "restart":
         return await doRestart(cmd, opts, "\u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u0442\u0438\u043B\u0441\u044F \u043F\u043E \u043A\u043E\u043C\u0430\u043D\u0434\u0435 \u0438\u0437 Taskless");
       case "update": {
@@ -11420,8 +12447,8 @@ async function doRestart(cmd, opts, note) {
 
 // src/selfUpdate.ts
 init_git();
-import { existsSync as existsSync13 } from "fs";
-import { join as join23 } from "path";
+import { existsSync as existsSync14 } from "fs";
+import { join as join26 } from "path";
 import { $ as $6 } from "execa";
 var DAEMON_PACKAGE = "@taskless-app/swarm";
 var defaultRun = async (cmd, args, cwd) => {
@@ -11434,7 +12461,7 @@ function tail(text, max = 400) {
 }
 async function runSelfUpdate(io) {
   const run = io.run ?? defaultRun;
-  const exists = io.exists ?? existsSync13;
+  const exists = io.exists ?? existsSync14;
   const repo = io.repo;
   await io.onStep("fetch", "\u0442\u044F\u043D\u0443 \u0441\u0432\u0435\u0436\u0438\u0439 \u043A\u043E\u0434");
   const fetched = await run("git", ["-C", repo, "fetch", "--quiet", "origin"], repo);
@@ -11463,7 +12490,7 @@ async function runSelfUpdate(io) {
     };
   }
   await io.onStep("install", "\u0441\u0442\u0430\u0432\u043B\u044E \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438");
-  if (!exists(join23(repo, "pnpm-lock.yaml"))) {
+  if (!exists(join26(repo, "pnpm-lock.yaml"))) {
     return { ok: false, step: "install", message: "\u0432 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0438 \u0434\u0435\u043C\u043E\u043D\u0430 \u043D\u0435\u0442 pnpm-lock.yaml \u2014 \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u0435\u0433\u043E \u044D\u0442\u0438\u043C \u043F\u0443\u0442\u0451\u043C \u043D\u0435 \u0431\u0435\u0440\u0443\u0441\u044C" };
   }
   const installed = await run("pnpm", ["install", "--frozen-lockfile"], repo);
@@ -11497,11 +12524,12 @@ function makeOvermindNarrator() {
 }
 
 // src/probe.ts
+init_executors();
 import { spawn as spawn2 } from "child_process";
-var LIMIT_RE = /(weekly limit|usage limit|hit your .*limit)/i;
 var RESET_RE = /resets[^\n]*/i;
-function anthropicHealthy(opts = {}) {
-  const bin = opts.claudeBin ?? resolveClaudeBin();
+function executorHealthy(opts = {}) {
+  const executor = opts.executor ?? resolveExecutor();
+  const bin = opts.bin ?? executor.resolveBin();
   const timeoutMs = opts.timeoutMs ?? 2e4;
   return new Promise((resolve4) => {
     let done = false;
@@ -11516,7 +12544,7 @@ function anthropicHealthy(opts = {}) {
       }
       resolve4(r);
     };
-    const child = spawn2(bin, [...ISOLATION_FLAGS, "-p", "ok", "--max-turns", "1"], { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn2(bin, [...executor.probe.args], { stdio: ["ignore", "pipe", "pipe"] });
     child.stdout?.on("data", (d) => {
       out += d.toString();
     });
@@ -11527,7 +12555,9 @@ function anthropicHealthy(opts = {}) {
     child.on("error", () => finish({ ok: false, reason: "exec", resetHint: null }));
     child.on("exit", (code) => {
       if (code === 0) return finish({ ok: true, reason: "ok", resetHint: null });
-      if (LIMIT_RE.test(out)) return finish({ ok: false, reason: "limit", resetHint: out.match(RESET_RE)?.[0]?.trim() ?? null });
+      if (executor.probe.limitPattern.test(out)) {
+        return finish({ ok: false, reason: "limit", resetHint: out.match(RESET_RE)?.[0]?.trim() ?? null });
+      }
       finish({ ok: false, reason: "provider", resetHint: null });
     });
   });
@@ -11553,18 +12583,21 @@ async function fetchExternalStorm(url, opts = {}) {
 }
 
 // src/anomalyState.ts
-import { existsSync as existsSync14, readFileSync as readFileSync19, renameSync as renameSync9, writeFileSync as writeFileSync14 } from "fs";
-import { join as join24 } from "path";
+import { existsSync as existsSync15, readFileSync as readFileSync19, renameSync as renameSync9, writeFileSync as writeFileSync14 } from "fs";
+import { join as join27 } from "path";
 var KEY_TTL_MS = 7 * 24 * 60 * 6e4;
-var EMPTY = { since: {}, lastFiredAt: {}, fires: {}, stopQuiet: null };
+var MAX_RESOLVED = 200;
+function emptyState() {
+  return { since: {}, lastFiredAt: {}, fires: {}, resolved: [], stopQuiet: null };
+}
 function anomalyStatePath(home) {
-  return join24(home, "anomaly-state.json");
+  return join27(home, "anomaly-state.json");
 }
 function loadAnomalyState(home, now = Date.now(), io = {}) {
-  const exists = io.exists ?? existsSync14;
+  const exists = io.exists ?? existsSync15;
   const readFile2 = io.readFile ?? ((p) => readFileSync19(p, "utf8"));
   const path = anomalyStatePath(home);
-  if (!exists(path)) return { ...EMPTY };
+  if (!exists(path)) return emptyState();
   try {
     const raw = JSON.parse(readFile2(path));
     const since = numbers(raw.since);
@@ -11579,10 +12612,14 @@ function loadAnomalyState(home, now = Date.now(), io = {}) {
       since: pick(since, fresh),
       lastFiredAt: pick(lastFiredAt, fresh),
       fires: pick(fires, fresh),
+      // TAS-485: очередь гашения НЕ фильтруем тем же TTL, что ключи. Она про
+      // уведомление, которое УЖЕ висит у человека в инбоксе: пролежав неделю
+      // недоставленным, гашение не становится лишним — оно становится нужнее.
+      resolved: strings(raw.resolved).slice(0, MAX_RESOLVED),
       stopQuiet: parseQuiet(raw.stopQuiet)
     };
   } catch {
-    return { ...EMPTY };
+    return emptyState();
   }
 }
 function saveAnomalyState(home, state, io = {}) {
@@ -11605,9 +12642,14 @@ var AnomalyStateStore = class {
   /** Инъекция в AnomalyTracker (см. AnomalyTrackerOpts.io). */
   trackerIo() {
     return {
-      load: () => ({ since: this.state.since, lastFiredAt: this.state.lastFiredAt, fires: this.state.fires }),
+      load: () => ({
+        since: this.state.since,
+        lastFiredAt: this.state.lastFiredAt,
+        fires: this.state.fires,
+        resolved: this.state.resolved
+      }),
       save: (snapshot) => {
-        this.state = { ...snapshot, stopQuiet: this.state.stopQuiet };
+        this.state = { ...snapshot, resolved: (snapshot.resolved ?? []).slice(0, MAX_RESOLVED), stopQuiet: this.state.stopQuiet };
         this.flush();
       }
     };
@@ -11649,6 +12691,10 @@ function numbers(raw) {
   }
   return out;
 }
+function strings(raw) {
+  if (!Array.isArray(raw)) return [];
+  return raw.filter((v) => typeof v === "string" && v.length > 0);
+}
 function pick(src, keys) {
   const out = {};
   for (const k of keys) if (src[k] != null) out[k] = src[k];
@@ -11681,7 +12727,7 @@ function isRepeatEvent(prev, cur) {
 }
 function swarmLastActivityMs(db) {
   let latest = null;
-  const bump = (iso) => {
+  const bump2 = (iso) => {
     const ms = sqliteMs(iso);
     if (latest == null || ms > latest) latest = ms;
   };
@@ -11689,12 +12735,12 @@ function swarmLastActivityMs(db) {
     if (isTerminalStatus(run.status)) continue;
     const evs = db.events(run.id);
     if (!evs.length) {
-      bump(run.updated_at);
+      bump2(run.updated_at);
       continue;
     }
     let i = evs.length - 1;
     while (i > 0 && isRepeatEvent(evs[i - 1], evs[i])) i--;
-    bump(evs[i].at);
+    bump2(evs[i].at);
   }
   return latest;
 }
@@ -11820,7 +12866,193 @@ function decideWatchdogAction(db, now, state, thresholds, droneCap, wt, exclusiv
 // src/overmind.ts
 init_storm();
 init_src();
+
+// src/zones.ts
+init_src();
+
+// src/gitHistory.ts
+import { $ as $7 } from "execa";
+var REC = "";
+var FIELD = "";
+var LOG_FORMAT = `${REC}%H${FIELD}%s`;
+var SLUG_IN_SUBJECT = /\b([A-Z][A-Z0-9]{0,7}-\d+)\b/;
+function slugFromSubject(subject) {
+  return SLUG_IN_SUBJECT.exec(subject)?.[1] ?? null;
+}
+function unquotePath(raw) {
+  const p = raw.trim();
+  return p.length >= 2 && p.startsWith('"') && p.endsWith('"') ? p.slice(1, -1) : p;
+}
+function parseGitLog(out) {
+  const commits = [];
+  for (const chunk of out.split(REC)) {
+    if (!chunk.trim()) continue;
+    const [head, ...rest] = chunk.split("\n");
+    const [sha, subject] = (head ?? "").split(FIELD);
+    if (!sha) continue;
+    const files = rest.map(unquotePath).filter(Boolean);
+    commits.push({ sha, subject: subject ?? "", files });
+  }
+  return commits;
+}
+var NOISE_RE = /^(journal\/|changelog\/|docs\/|design\/|scratch\/|\.claude\/|.*\.lock$|pnpm-lock\.yaml$)/;
+function isNoisePath(path) {
+  return NOISE_RE.test(path);
+}
+var GROUP_DEFAULTS = { maxFilesPerCommit: 120, ignore: isNoisePath };
+function groupTaskHistory(commits, opts = {}) {
+  const o = { ...GROUP_DEFAULTS, ...opts };
+  const bySlug = /* @__PURE__ */ new Map();
+  for (const c of commits) {
+    const slug = slugFromSubject(c.subject);
+    if (!slug) continue;
+    if (c.files.length > o.maxFilesPerCommit) continue;
+    const files = c.files.filter((f) => !o.ignore(f));
+    if (!files.length) continue;
+    let acc = bySlug.get(slug);
+    if (!acc) bySlug.set(slug, acc = { files: /* @__PURE__ */ new Set(), texts: [] });
+    for (const f of files) acc.files.add(f);
+    acc.texts.push(c.subject);
+  }
+  return [...bySlug.entries()].map(([slug, acc]) => ({
+    slug,
+    files: [...acc.files],
+    text: acc.texts.join(" \xB7 ")
+  }));
+}
+async function readCommitLog(repo, opts = {}) {
+  const max = opts.maxCommits ?? 1500;
+  try {
+    const { stdout } = await $7({ cwd: repo, reject: false })`git log --no-merges --name-only --pretty=format:${LOG_FORMAT} -n ${String(max)} ${opts.ref ?? "HEAD"}`;
+    return parseGitLog(stdout ?? "");
+  } catch {
+    return [];
+  }
+}
+async function readTaskHistory(repo, opts = {}) {
+  return groupTaskHistory(await readCommitLog(repo, opts), opts);
+}
+async function headSha(repo) {
+  try {
+    const { stdout, exitCode } = await $7({ cwd: repo, reject: false })`git rev-parse HEAD`;
+    return exitCode === 0 ? stdout.trim() : null;
+  } catch {
+    return null;
+  }
+}
+
+// src/zones.ts
+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 short(files, n = 3) {
+  return files.slice(0, n).join(", ") + (files.length > n ? ` \u0438 \u0435\u0449\u0451 ${files.length - n}` : "");
+}
+var SPINE_PREDICTION_WEIGHT = 0.7;
+function decideConflict({ model, candidate, active }) {
+  if ((candidate.kind ?? "drone") !== "drone") return { kind: "clear" };
+  if (!hasZoneModel(model)) return { kind: "unknown" };
+  const predicted = predictForRun(model, candidate);
+  if (!predicted.length) return { kind: "unknown" };
+  if (!active.length) return { kind: "clear" };
+  const spine = new Set(model.spine);
+  const candidateSpine = predicted.filter((p) => spine.has(p.path) && p.weight >= SPINE_PREDICTION_WEIGHT).map((p) => p.path);
+  if (candidateSpine.length) {
+    const blocker = active[0];
+    return {
+      kind: "wait",
+      blockedBy: blocker.run,
+      message: `\u0437\u0430\u0434\u0430\u0447\u0430 \u0442\u0440\u043E\u0433\u0430\u0435\u0442 \u043E\u0431\u0449\u0438\u0439 \u0445\u0440\u0435\u0431\u0435\u0442 (${short(candidateSpine)}) \u2014 \u0442\u0430\u043A\u0438\u0435 \u0438\u0434\u0443\u0442 \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E \u043E\u0442 \u0437\u043E\u043D\u044B; \u0436\u0434\u0443 ${blocker.run.task_slug} (#${blocker.run.id})`
+    };
+  }
+  for (const w of active) {
+    if (!w.actual) continue;
+    const theirSpine = w.files.filter((f) => spine.has(f));
+    if (theirSpine.length && zoneForFiles(model, w.files)?.zone === SPINE_ZONE) {
+      return {
+        kind: "wait",
+        blockedBy: w.run,
+        message: `${w.run.task_slug} (#${w.run.id}) \u043F\u0440\u044F\u043C\u043E \u0441\u0435\u0439\u0447\u0430\u0441 \u043F\u0440\u0430\u0432\u0438\u0442 \u043E\u0431\u0449\u0438\u0439 \u0445\u0440\u0435\u0431\u0435\u0442 (${short(theirSpine)}) \u2014 \u043E\u0442\u0432\u0435\u0442\u0432\u043B\u044F\u0442\u044C\u0441\u044F \u043E\u0442 \u043D\u0435\u0433\u043E \u0440\u0430\u043D\u043E, \u0436\u0434\u0443`
+      };
+    }
+  }
+  for (const w of active) {
+    const risk = overlapRisk(predicted, w.files);
+    if (!risk.overlap) continue;
+    const what = risk.sharedFiles.length ? `\u043E\u0434\u043D\u0438 \u0444\u0430\u0439\u043B\u044B (${short(risk.sharedFiles)})` : `\u043E\u0434\u0438\u043D \u043A\u0430\u0442\u0430\u043B\u043E\u0433 (${short(risk.sharedDirs)})`;
+    return {
+      kind: "wait",
+      blockedBy: w.run,
+      message: `\u044D\u0442\u0438 \u0434\u0432\u0435 \u0437\u0430\u0434\u0430\u0447\u0438 \u0442\u0440\u043E\u0433\u0430\u044E\u0442 ${what} \u2014 \u0441\u0442\u0430\u0432\u0438\u043C \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E: \u0436\u0434\u0443 ${w.run.task_slug} (#${w.run.id})` + (w.actual ? "" : " (\u043F\u043E \u043F\u0440\u0435\u0434\u0441\u043A\u0430\u0437\u0430\u043D\u0438\u044E \u2014 \u0434\u0440\u043E\u043D \u0435\u0449\u0451 \u043D\u0435 \u043D\u0430\u0447\u0430\u043B \u043F\u0438\u0441\u0430\u0442\u044C \u043A\u043E\u0434)")
+    };
+  }
+  return { kind: "clear" };
+}
+function suggestAreaForRun(model, run) {
+  if (!hasZoneModel(model)) return null;
+  const text = runText(run);
+  if (!text) return null;
+  const top = suggestZonesFromText(model, text)[0];
+  return top && top.confidence >= 0.3 ? { zone: top.zone, confidence: top.confidence, why: top.why } : null;
+}
+var DEFAULT_TTL_MS = 10 * 6e4;
+var ZoneModels = class {
+  constructor(opts = {}) {
+    this.opts = opts;
+  }
+  opts;
+  cache = /* @__PURE__ */ new Map();
+  /** Модель репо. Истории нет / это не git — EMPTY_ZONE_MODEL (раздача на старом локе). */
+  async forRepo(repo, now = Date.now()) {
+    if (!repo) return EMPTY_ZONE_MODEL;
+    const head = await headSha(repo);
+    const hit = this.cache.get(repo);
+    if (hit && hit.head === head && now - hit.builtAt < (this.opts.ttlMs ?? DEFAULT_TTL_MS)) return hit.model;
+    const model = await this.build(repo);
+    this.cache.set(repo, { head, builtAt: now, model });
+    return model;
+  }
+  /** Сбросить кэш (тесты, `swarm zones --refresh`). */
+  clear() {
+    this.cache.clear();
+  }
+  async build(repo) {
+    const history = await readTaskHistory(repo, { ...this.opts.maxCommits ? { maxCommits: this.opts.maxCommits } : {} });
+    return buildZoneModel(withManualAreas(history, this.opts.manualAreas?.() ?? /* @__PURE__ */ new Map()));
+  }
+};
+var ActiveFilesCache = class {
+  constructor(read, ttlMs = 3e4) {
+    this.read = read;
+    this.ttlMs = ttlMs;
+  }
+  read;
+  ttlMs;
+  cache = /* @__PURE__ */ new Map();
+  async filesOf(run, now = Date.now()) {
+    const hit = this.cache.get(run.id);
+    if (hit && now - hit.at < this.ttlMs) return hit.files;
+    const files = await this.read(run);
+    this.cache.set(run.id, { at: now, files });
+    return files;
+  }
+  /** Забыть всех, кого нет среди живых (дрон закончил — его файлы больше не заняты). */
+  prune(liveIds) {
+    const live = new Set(liveIds);
+    for (const id of [...this.cache.keys()]) if (!live.has(id)) this.cache.delete(id);
+  }
+};
+function withManualAreas(history, areas) {
+  return history.map((e) => ({ ...e, area: normalizeZoneName(areas.get(e.slug) ?? null) }));
+}
+
+// src/overmind.ts
+var ANOMALY_RESOLVE_BATCH = 50;
 var THIS_FILE = fileURLToPath2(import.meta.url);
+var executorHasSession = (p) => EXECUTOR.session.exists(p);
 var OVERMIND_ENTRY = THIS_FILE;
 var STALL_MS = Number(process.env.SWARM_STALL_MS) || 10 * 60 * 1e3;
 var STALL_FLOOR_MS = Number(process.env.SWARM_STALL_FLOOR_MS) || 30 * 60 * 1e3;
@@ -11834,6 +13066,10 @@ var RESOLVE_LIMIT = Number(process.env.SWARM_RESOLVE_LIMIT) || 3;
 var RESOLVE_ESCALATION_MARK = "\u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442 \u043D\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0451\u043D";
 var REVIEW_SPAWN_LIMIT = Number(process.env.SWARM_REVIEW_SPAWN_LIMIT) || 3;
 var REVIEW_ESCALATION_MARK = "\u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u0441\u043C\u043E\u0433\u043B\u043E \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C\u0441\u044F";
+var REVIEW_UNRECOVERABLE_MARK = "\u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u0442\u044C";
+function reviewUnrecoverableMark(branch) {
+  return `${REVIEW_UNRECOVERABLE_MARK} (\u0432\u0435\u0442\u043A\u0430 ${branch})`;
+}
 var REVIEW_CYCLE_LIMIT = Number(process.env.SWARM_REVIEW_CYCLE_LIMIT) || 3;
 var REVIEW_CYCLE_ESCALATION_MARK = "\u0440\u0435-\u0440\u0435\u0432\u044C\u044E \u0437\u0430\u0446\u0438\u043A\u043B\u0438\u043B\u043E\u0441\u044C";
 var CI_WAKE_LIMIT = Number(process.env.SWARM_CI_WAKE_LIMIT) || 3;
@@ -11860,6 +13096,7 @@ var CHANGES_WAKE_ESCALATION_MARK = "\u0444\u0438\u043A\u0441-\u0438\u0442\u0435\
 var NEEDS_HUMAN_MARKS = [
   RESOLVE_ESCALATION_MARK,
   REVIEW_ESCALATION_MARK,
+  REVIEW_UNRECOVERABLE_MARK,
   REVIEW_CYCLE_ESCALATION_MARK,
   CI_WAKE_ESCALATION_MARK,
   CHANGES_WAKE_ESCALATION_MARK
@@ -12188,8 +13425,12 @@ ${task.description}` : `\u0417\u0430\u0434\u0430\u0447\u0430 ${run.task_slug} (\
     // авторские подписи внутри него уже приведены к одной строке (renderAttachmentsBlock).
     ...attachmentsBlock ? ["", attachmentsBlock] : [],
     "",
-    "\u0422\u044B \u2014 \u0434\u0440\u043E\u043D \u0440\u043E\u044F. \u0420\u0430\u0431\u043E\u0442\u0430\u0435\u0448\u044C \u0432 \u044D\u0442\u043E\u043C git-worktree, \u0432\u0435\u0442\u043A\u0430 \u0443\u0436\u0435 \u0441\u043E\u0437\u0434\u0430\u043D\u0430 \u043F\u043E slug \u0437\u0430\u0434\u0430\u0447\u0438.",
-    "\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B overmind (MCP): report_step(text) \u2014 \u043B\u043E\u0433\u0438\u0440\u0443\u0439 \u0445\u043E\u0434 \u0440\u0430\u0431\u043E\u0442\u044B; read_task() \u2014 \u0441\u0432\u0435\u0436\u0438\u0439 \u0441\u043D\u0430\u043F\u0448\u043E\u0442 \u0437\u0430\u0434\u0430\u0447\u0438 (\u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435+\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u044B+\u0434\u043E\u043A\u0438) \u0431\u0435\u0437 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432, \u0435\u0441\u043B\u0438 \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u044F \u043C\u043E\u0433\u043B\u0438 \u0434\u043E\u043F\u0438\u0441\u0430\u0442\u044C \u043F\u043E\u0441\u043B\u0435 \u0441\u0442\u0430\u0440\u0442\u0430; ask(question, options?) \u2014 \u0435\u0441\u043B\u0438 \u0443\u043F\u0451\u0440\u0441\u044F \u0432 \u0420\u0415\u0428\u0415\u041D\u0418\u0415, \u0441\u043F\u0440\u043E\u0441\u0438 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u0430 (\u0434\u0430\u0439 2\u20134 \u0432\u0430\u0440\u0438\u0430\u043D\u0442\u0430 \u0432 options, \u0435\u0441\u043B\u0438 \u0440\u0430\u0437\u0432\u0438\u043B\u043A\u0430 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u043D\u0430\u044F) \u0438 \u0434\u043E\u0436\u0434\u0438\u0441\u044C \u043E\u0442\u0432\u0435\u0442\u0430 (\u041D\u0415 \u0443\u0433\u0430\u0434\u044B\u0432\u0430\u0439); done(pr_url) \u2014 \u043A\u043E\u0433\u0434\u0430 \u043E\u0442\u043A\u0440\u043E\u0435\u0448\u044C PR; note(text) \u2014 \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \xAB\u0437\u0430\u043C\u0435\u0447\u0435\u043D\u043E \u043F\u043E \u043F\u0443\u0442\u0438\xBB \u0411\u0415\u0417 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0438: \u043D\u0430\u0442\u043A\u043D\u0443\u043B\u0441\u044F \u043D\u0430 \u043F\u0440\u043E\u0431\u0435\u043B \u0432 \u0434\u0438\u0437\u0430\u0439\u043D-\u0441\u0438\u0441\u0442\u0435\u043C\u0435, \u043F\u0440\u043E\u0442\u0443\u0445\u0448\u0443\u044E \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u044E, \u0431\u0430\u0433 \u0440\u044F\u0434\u043E\u043C \u0441\u043E \u0441\u0432\u043E\u0438\u043C \u0434\u0438\u0444\u0444\u043E\u043C \u2014 \u0441\u043A\u0430\u0436\u0438 \u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u0439 \u0434\u0430\u043B\u044C\u0448\u0435, \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u0443\u0432\u0438\u0434\u0438\u0442 \u0438 \u0441\u0430\u043C \u0440\u0435\u0448\u0438\u0442, \u0437\u0430\u0432\u043E\u0434\u0438\u0442\u044C \u043B\u0438 \u0437\u0430\u0434\u0430\u0447\u0443 (\u043D\u0435 \u043F\u0440\u0435\u0432\u0440\u0430\u0449\u0430\u0439 \u0442\u0430\u043A\u043E\u0435 \u0432 \u0434\u043E\u0440\u043E\u0433\u043E\u0439 \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u044E\u0449\u0438\u0439 ask \u0438 \u043D\u0435 \u0445\u043E\u0440\u043E\u043D\u0438 \u0432 \u043E\u0442\u0447\u0451\u0442\u0435 \u043E \u0441\u0434\u0430\u0447\u0435).",
+    // TASWM-356: ветка worktree — НЕ обязательно слаг. У продолжения чужого PR она своя
+    // (её завёл прошлый дрон), и `git push -u origin <slug>` оттуда либо откажет, либо заведёт
+    // вторую ветку мимо PR. Пишем ту, что реально записана на прогоне; пусто (первый спавн —
+    // ветку заводит spawnDrone из слага) — прежняя формулировка.
+    `\u0422\u044B \u2014 \u0434\u0440\u043E\u043D \u0440\u043E\u044F. \u0420\u0430\u0431\u043E\u0442\u0430\u0435\u0448\u044C \u0432 \u044D\u0442\u043E\u043C git-worktree, \u0432\u0435\u0442\u043A\u0430 \`${run.branch || run.task_slug}\`${run.branch && run.branch !== run.task_slug ? " (\u043E\u043D\u0430 \u041D\u0415 \u0440\u0430\u0432\u043D\u0430 \u0441\u043B\u0430\u0433\u0443 \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u044D\u0442\u043E \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u0435 \u0443\u0436\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u043E\u0433\u043E PR, \u043F\u0443\u0448 \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u043D\u0435\u0451)" : " \u0441\u043E\u0437\u0434\u0430\u043D\u0430 \u043F\u043E slug \u0437\u0430\u0434\u0430\u0447\u0438"}.`,
+    "\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B overmind (MCP): report_step(text) \u2014 \u043B\u043E\u0433\u0438\u0440\u0443\u0439 \u0445\u043E\u0434 \u0440\u0430\u0431\u043E\u0442\u044B; read_task() \u2014 \u0441\u0432\u0435\u0436\u0438\u0439 \u0441\u043D\u0430\u043F\u0448\u043E\u0442 \u0437\u0430\u0434\u0430\u0447\u0438 (\u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435+\u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u0433\u043E\u0442\u043E\u0432\u043D\u043E\u0441\u0442\u0438+\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u044B+\u0434\u043E\u043A\u0438+\u0438\u0441\u0445\u043E\u0434\u044B \u0441\u043E\u0441\u0435\u0434\u043D\u0438\u0445 \u0437\u0430\u0434\u0430\u0447 \u043F\u043E \u0437\u043E\u043D\u0435 \u043A\u043E\u0434\u0430) \u0431\u0435\u0437 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432, \u0435\u0441\u043B\u0438 \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u044F \u043C\u043E\u0433\u043B\u0438 \u0434\u043E\u043F\u0438\u0441\u0430\u0442\u044C \u043F\u043E\u0441\u043B\u0435 \u0441\u0442\u0430\u0440\u0442\u0430; ask(question, options?) \u2014 \u0435\u0441\u043B\u0438 \u0443\u043F\u0451\u0440\u0441\u044F \u0432 \u0420\u0415\u0428\u0415\u041D\u0418\u0415, \u0441\u043F\u0440\u043E\u0441\u0438 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u0430 (\u0434\u0430\u0439 2\u20134 \u0432\u0430\u0440\u0438\u0430\u043D\u0442\u0430 \u0432 options, \u0435\u0441\u043B\u0438 \u0440\u0430\u0437\u0432\u0438\u043B\u043A\u0430 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u043D\u0430\u044F) \u0438 \u0434\u043E\u0436\u0434\u0438\u0441\u044C \u043E\u0442\u0432\u0435\u0442\u0430 (\u041D\u0415 \u0443\u0433\u0430\u0434\u044B\u0432\u0430\u0439); done(pr_url) \u2014 \u043A\u043E\u0433\u0434\u0430 \u043E\u0442\u043A\u0440\u043E\u0435\u0448\u044C PR; note(text) \u2014 \u0437\u0430\u043C\u0435\u0442\u043A\u0430 \xAB\u0437\u0430\u043C\u0435\u0447\u0435\u043D\u043E \u043F\u043E \u043F\u0443\u0442\u0438\xBB \u0411\u0415\u0417 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0438: \u043D\u0430\u0442\u043A\u043D\u0443\u043B\u0441\u044F \u043D\u0430 \u043F\u0440\u043E\u0431\u0435\u043B \u0432 \u0434\u0438\u0437\u0430\u0439\u043D-\u0441\u0438\u0441\u0442\u0435\u043C\u0435, \u043F\u0440\u043E\u0442\u0443\u0445\u0448\u0443\u044E \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u044E, \u0431\u0430\u0433 \u0440\u044F\u0434\u043E\u043C \u0441\u043E \u0441\u0432\u043E\u0438\u043C \u0434\u0438\u0444\u0444\u043E\u043C \u2014 \u0441\u043A\u0430\u0436\u0438 \u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u0439 \u0434\u0430\u043B\u044C\u0448\u0435, \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u0443\u0432\u0438\u0434\u0438\u0442 \u0438 \u0441\u0430\u043C \u0440\u0435\u0448\u0438\u0442, \u0437\u0430\u0432\u043E\u0434\u0438\u0442\u044C \u043B\u0438 \u0437\u0430\u0434\u0430\u0447\u0443 (\u043D\u0435 \u043F\u0440\u0435\u0432\u0440\u0430\u0449\u0430\u0439 \u0442\u0430\u043A\u043E\u0435 \u0432 \u0434\u043E\u0440\u043E\u0433\u043E\u0439 \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u044E\u0449\u0438\u0439 ask \u0438 \u043D\u0435 \u0445\u043E\u0440\u043E\u043D\u0438 \u0432 \u043E\u0442\u0447\u0451\u0442\u0435 \u043E \u0441\u0434\u0430\u0447\u0435).",
     "\u041F\u0440\u0430\u0432\u0438\u043B\u0430: \u0442\u0440\u043E\u0433\u0430\u0435\u0448\u044C UI \u2014 \u0421\u041D\u0410\u0427\u0410\u041B\u0410 \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0438, \u0435\u0441\u0442\u044C \u043B\u0438 \u0432 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0438 \u0441\u043A\u0438\u043B\u043B \u0441 UI-\u043F\u0440\u0430\u0432\u0438\u043B\u0430\u043C\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430, \u0438 \u0441\u043B\u0435\u0434\u0443\u0439 \u0435\u0433\u043E \u0434\u0438\u0437\u0430\u0439\u043D-\u0441\u0438\u0441\u0442\u0435\u043C\u0435 (\u043D\u0435\u0442 \u043D\u0443\u0436\u043D\u043E\u0433\u043E \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u0430 \u2014 \u0437\u0430\u0432\u0435\u0434\u0438 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u0443\u044E \u0437\u0430\u0434\u0430\u0447\u0443, \u043D\u0435 \u0445\u0430\u0440\u0434\u043A\u043E\u0434\u044C \u043E\u0434\u043D\u043E\u0440\u0430\u0437\u043E\u0432\u043E\u0435); \u043A\u043E\u043C\u043C\u0438\u0442\u044B \u0441\u043E slug \u0437\u0430\u0434\u0430\u0447\u0438 \u0432 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0438; \u043F\u043E\u0441\u043B\u0435 UI-\u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u043F\u0440\u0438\u043B\u043E\u0436\u0438 \u0441\u043A\u0440\u0438\u043D\u044B mobile+desktop \u041A \u0417\u0410\u0414\u0410\u0427\u0415 (\u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 screenshots \u0443 done); \u043E\u0442\u043A\u0440\u043E\u0439 PR \u0447\u0435\u0440\u0435\u0437 gh \u0438 \u0432\u044B\u0437\u043E\u0432\u0438 done(pr_url).",
     // TASWM-293: живой случай SCE-5 — ревьюер заблокировал PR за отсутствие CI (у проекта
     // его нет и не предполагается), автора разбудили «закрывать замечания», замечаний по коду
@@ -12206,7 +13447,7 @@ ${task.description}` : `\u0417\u0430\u0434\u0430\u0447\u0430 ${run.task_slug} (\
     `\u0412\u0435\u0434\u0438 \u0434\u043D\u0435\u0432\u043D\u0438\u043A \u0437\u0430\u0434\u0430\u0447\u0438: \u0437\u0430\u0432\u0435\u0434\u0438 \`journal/${run.task_slug}.md\` \u0438 \u043F\u043E \u0445\u043E\u0434\u0443 \u0440\u0430\u0431\u043E\u0442\u044B (\u043D\u0435 \u043E\u0434\u043D\u0438\u043C \u043C\u0430\u0445\u043E\u043C \u0432 \u043A\u043E\u043D\u0446\u0435) \u0434\u043E\u043F\u0438\u0441\u044B\u0432\u0430\u0439 \u0442\u0443\u0434\u0430 \u0448\u0430\u0433\u0438 \u0438 \u043F\u0440\u0438\u043D\u044F\u0442\u044B\u0435 \u0440\u0435\u0448\u0435\u043D\u0438\u044F \u2014 \u044D\u0442\u043E \u0445\u0440\u043E\u043D\u0438\u043A\u0430 \u0434\u043B\u044F \u0440\u0435\u0442\u0440\u043E\u0441\u043F\u0435\u043A\u0442\u0438\u0432\u044B, \u0441\u0432\u043E\u0439 \u0444\u0430\u0439\u043B \u043D\u0430 \u0437\u0430\u0434\u0430\u0447\u0443, \u0447\u0442\u043E\u0431\u044B \u043D\u0435 \u0434\u0440\u0430\u0442\u044C\u0441\u044F \u0437\u0430 \u043E\u0431\u0449\u0438\u0439 \u0441 \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u044B\u043C\u0438 \u0434\u0440\u043E\u043D\u0430\u043C\u0438. \u041A\u043E\u043C\u043C\u0438\u0442\u044C \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u043C\u0438 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F\u043C\u0438 PR, \u043E\u0431\u044B\u0447\u043D\u044B\u043C \u043A\u043E\u043C\u043C\u0438\u0442\u043E\u043C. \u041D\u0435 \u0434\u0443\u0431\u043B\u0438\u0440\u0443\u0439 \u0441 summary \u0432 done(): \u0434\u043D\u0435\u0432\u043D\u0438\u043A \u2014 \u0441\u044B\u0440\u0430\u044F \u0445\u0440\u043E\u043D\u0438\u043A\u0430 (\u0447\u0442\u043E \u043F\u0440\u043E\u0431\u043E\u0432\u0430\u043B, \u0447\u0442\u043E \u043E\u0442\u0431\u0440\u043E\u0441\u0438\u043B \u0438 \u043F\u043E\u0447\u0435\u043C\u0443), summary \u2014 \u043A\u043E\u0440\u043E\u0442\u043A\u0438\u0439 \u0438\u0442\u043E\u0433 \u0434\u043B\u044F \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430; \u0435\u0441\u043B\u0438 \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0443\u0436\u0435 \u0440\u0430\u0441\u043F\u0438\u0441\u0430\u043D\u043E \u0432 \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0435, \u0432 summary \u043F\u0440\u043E\u0441\u0442\u043E \u0441\u043E\u0448\u043B\u0438\u0441\u044C \u043D\u0430 \u043D\u0435\u0433\u043E.`,
     "",
     "\u0421\u041E\u0425\u0420\u0410\u041D\u042F\u0419 \u0420\u0410\u0411\u041E\u0422\u0423 \u041F\u041E \u0425\u041E\u0414\u0423 \u2014 \u0438\u043D\u0430\u0447\u0435 \u043E\u043D\u0430 \u043F\u0440\u043E\u043F\u0430\u0434\u0451\u0442, \u0435\u0441\u043B\u0438 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u0443\u0431\u044C\u044E\u0442:",
-    `\u2022 \u041F\u043E\u0441\u043B\u0435 \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0437\u043D\u0430\u0447\u0438\u043C\u043E\u0433\u043E \u0448\u0430\u0433\u0430 \u043A\u043E\u043C\u043C\u0438\u0442\u044C \u0438 \u0441\u0440\u0430\u0437\u0443 \u043F\u0443\u0448\u044C: git push -u origin ${run.task_slug} (\u0432\u0435\u0442\u043A\u0430 = slug). \u041D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u0443\u043C\u0438\u0440\u0430\u0435\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0434\u0440\u043E\u043D\u043E\u043C \u2014 \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u043A\u043E\u043C\u043C\u0438\u0442\u044B \u0438 \u043F\u0440\u0430\u0432\u043A\u0438 \u0432 worktree \u043D\u0435 \u043F\u0435\u0440\u0435\u0436\u0438\u0432\u0443\u0442 \u0441\u043C\u0435\u0440\u0442\u044C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430.`,
+    `\u2022 \u041F\u043E\u0441\u043B\u0435 \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0437\u043D\u0430\u0447\u0438\u043C\u043E\u0433\u043E \u0448\u0430\u0433\u0430 \u043A\u043E\u043C\u043C\u0438\u0442\u044C \u0438 \u0441\u0440\u0430\u0437\u0443 \u043F\u0443\u0448\u044C: git push -u origin ${run.branch || run.task_slug}. \u041D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u0443\u043C\u0438\u0440\u0430\u0435\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0434\u0440\u043E\u043D\u043E\u043C \u2014 \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u043A\u043E\u043C\u043C\u0438\u0442\u044B \u0438 \u043F\u0440\u0430\u0432\u043A\u0438 \u0432 worktree \u043D\u0435 \u043F\u0435\u0440\u0435\u0436\u0438\u0432\u0443\u0442 \u0441\u043C\u0435\u0440\u0442\u044C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430.`,
     "\u2022 \u041D\u0435 \u0437\u0430\u043F\u0443\u0441\u043A\u0430\u0439 \u0434\u043E\u043B\u0433\u0438\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u0432 \u0444\u043E\u043D\u0435 \xAB\u0447\u0442\u043E\u0431\u044B \u043F\u043E\u0434\u043E\u0436\u0434\u0430\u0442\u044C\xBB: \u0441\u0435\u0441\u0441\u0438\u044F \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442\u0441\u044F, \u043A\u0430\u043A \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0435\u0440\u0435\u0441\u0442\u0430\u0451\u0448\u044C \u0437\u0432\u0430\u0442\u044C \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B, \u0438 \u0444\u043E\u043D\u043E\u0432\u044B\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u043D\u0435 \u0441\u043F\u0430\u0441\u0451\u0442. \u0414\u043E\u043B\u0433\u043E\u0435 \u0434\u0435\u0440\u0436\u0438 \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u044E\u0449\u0438\u043C \u0432\u044B\u0437\u043E\u0432\u043E\u043C; \u0434\u043B\u0438\u043D\u043D\u0443\u044E \u0441\u0435\u0440\u0438\u044E \u0434\u0440\u043E\u0431\u0438 \u043D\u0430 \u0447\u0430\u0441\u0442\u0438 \u0438 \u043A\u043E\u043C\u043C\u0438\u0442\u044C+\u043F\u0443\u0448\u044C \u043C\u0435\u0436\u0434\u0443 \u043D\u0438\u043C\u0438.",
     '\u2022 \u041F\u0435\u0440\u0435\u0434 \u0434\u043E\u043B\u0433\u043E\u0439 \u043A\u043E\u043C\u0430\u043D\u0434\u043E\u0439 (\u0442\u0435\u0441\u0442\u044B, \u0441\u0431\u043E\u0440\u043A\u0430 \u2014 \u043C\u0438\u043D\u0443\u0442\u044B \u0431\u0435\u0437 \u0432\u044B\u0432\u043E\u0434\u0430) \u043A\u0438\u043D\u044C report_step("\u0433\u043E\u043D\u044E \u0442\u0435\u0441\u0442\u044B\u2026") \u2014 \u043D\u0435\u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E (\u0440\u043E\u0439 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u0435\u0442 \u0436\u0438\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u043A\u043E\u043C\u0430\u043D\u0434\u044B), \u043D\u043E \u043F\u043E\u043B\u0435\u0437\u043D\u0435\u0435 \u0434\u043B\u044F \u0432\u0438\u0434\u0438\u043C\u043E\u0441\u0442\u0438 \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0430 \u0432 \u0434\u0430\u0448\u0431\u043E\u0440\u0434\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u0430.',
     "",
@@ -12231,7 +13472,7 @@ ${task.description}` : `\u0417\u0430\u0434\u0430\u0447\u0430 ${run.task_slug} (\
   }
   return parts.join("\n");
 }
-var HERO_CHARTER_PATH = join25(dirname5(THIS_FILE), "..", "docs", "HERO.md");
+var HERO_CHARTER_PATH = join28(dirname5(THIS_FILE), "..", "docs", "HERO.md");
 function buildHeroPrompt(task, run, taskContext, attachmentsBlock) {
   const name = run.name || `#${run.id}`;
   const charter = readFileSync20(HERO_CHARTER_PATH, "utf8");
@@ -12485,8 +13726,8 @@ async function wakeRun(deps, runId) {
   if (!run) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0432 \u0437\u0435\u0440\u043A\u0430\u043B\u0435 \u0440\u043E\u044F` };
   if (run.pid != null && deps.isAlive(run.pid)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0443\u0436\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 (pid ${run.pid}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
   if (isTerminalStatus(run.status)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B\u0435\u043D (${run.status}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
-  const worktreeExists = deps.worktreeExists ?? existsSync15;
-  const hasTranscript = deps.hasTranscript ?? sessionTranscriptExists;
+  const worktreeExists = deps.worktreeExists ?? existsSync16;
+  const hasTranscript = deps.hasTranscript ?? executorHasSession;
   const wt = run.worktree_path;
   const canContinue = !!wt && worktreeExists(wt) && hasTranscript(wt);
   const isService = run.reviews_run_id != null || run.resolves_run_id != null;
@@ -12570,9 +13811,9 @@ function repoHasCi(deps, run) {
 function repoHasCiWorkflows(worktreePath, repo) {
   for (const base3 of [worktreePath, repo]) {
     if (!base3) continue;
-    const dir = join25(base3, ".github", "workflows");
+    const dir = join28(base3, ".github", "workflows");
     try {
-      if (readdirSync10(dir).some((f) => f.endsWith(".yml") || f.endsWith(".yaml"))) return true;
+      if (readdirSync12(dir).some((f) => f.endsWith(".yml") || f.endsWith(".yaml"))) return true;
     } catch {
     }
   }
@@ -12719,8 +13960,8 @@ async function wakeReviewerOnCiReady(deps, run, over) {
   return true;
 }
 function worktreeAndTranscriptAlive(deps, worktree) {
-  const exists = deps.worktreeExists ?? existsSync15;
-  const transcript = deps.hasTranscript ?? sessionTranscriptExists;
+  const exists = deps.worktreeExists ?? existsSync16;
+  const transcript = deps.hasTranscript ?? executorHasSession;
   return exists(worktree) && transcript(worktree);
 }
 async function spawnFreshReviewerAfterStall(deps, run, why) {
@@ -12823,6 +14064,22 @@ async function envGateAllows(deps, run) {
 function effectiveRepo(deps, run) {
   return normalizeRepo(run.repo || deps.repoFallback || "");
 }
+async function zoneConflictFor(db, models, activeFiles, run, repo, repoFallback) {
+  const model = await models.forRepo(repo);
+  if (!hasZoneModel(model)) return { kind: "unknown" };
+  const live = db.listRuns().filter((r) => (r.kind ?? "drone") === "drone" && ACTIVE_DRONE_STATUSES.has(r.status));
+  activeFiles.prune(live.map((r) => r.id));
+  const active = [];
+  for (const r of live) {
+    if (r.id === run.id) continue;
+    if (normalizeRepo(r.repo || repoFallback || "") !== repo) continue;
+    const files = await activeFiles.filesOf(r);
+    active.push(
+      files.length ? { run: r, files, actual: true } : { run: r, files: predictForRun(model, r).map((p) => p.path), actual: false }
+    );
+  }
+  return decideConflict({ model, candidate: run, active });
+}
 function activeDronesOnRepo(deps, repo, exceptRunId) {
   return deps.db.listRuns().filter(
     (r) => r.id !== exceptRunId && (r.kind ?? "drone") === "drone" && ACTIVE_DRONE_STATUSES.has(r.status) && effectiveRepo(deps, r) === repo
@@ -12863,10 +14120,10 @@ async function exclusiveGateAllows(deps, run) {
   return true;
 }
 function pruneGateLogs(deps) {
-  if (!deps.envGateLogged?.size && !deps.exclusiveLogged?.size) return;
+  if (!deps.envGateLogged?.size && !deps.exclusiveLogged?.size && !deps.overlapLogged?.size) return;
   const open = /* @__PURE__ */ new Set();
   for (const run of deps.db.listRuns()) if (!isTerminalStatus(run.status)) open.add(run.id);
-  for (const map of [deps.envGateLogged, deps.exclusiveLogged]) {
+  for (const map of [deps.envGateLogged, deps.exclusiveLogged, deps.overlapLogged]) {
     if (!map) continue;
     for (const id of [...map.keys()]) if (!open.has(id)) map.delete(id);
   }
@@ -12887,6 +14144,18 @@ async function exclusivityBlockedRunIds(deps) {
   }
   return blocked;
 }
+async function fillSuggestedArea(deps, run) {
+  if (run.area || !deps.suggestArea) return;
+  const guess = await deps.suggestArea(run).catch(() => null);
+  if (!guess) return;
+  deps.db.updateRun(run.id, { area: guess.zone });
+  run.area = guess.zone;
+  deps.db.addEvent(
+    run.id,
+    "step",
+    `\u0437\u043E\u043D\u0430 \u0437\u0430\u0434\u0430\u0447\u0438 \u0438\u0437 \u0438\u0441\u0442\u043E\u0440\u0438\u0438 \u0440\u0435\u043F\u043E: ${guess.zone} (${Math.round(guess.confidence * 100)}% \u2014 ${guess.why}) \u2014 TASWM-348`
+  );
+}
 async function trySpawnQueuedRun(deps, run) {
   if (deps.control?.paused) return "skipped";
   const mergedUrl = doneMergedPrForSlug(deps.db, run.task_slug) ?? (deps.mergedPrForBranch ? await deps.mergedPrForBranch(run.task_slug, run.repo || "").catch(() => null) : null);
@@ -12902,11 +14171,21 @@ async function trySpawnQueuedRun(deps, run) {
   if (!await exclusiveGateAllows(deps, run)) return "skipped";
   if (!await prodStillAllows(deps, run, ["queued"])) return "skipped";
   if (deps.db.takeRun && !await deps.db.takeRun(run.id)) return "skipped";
+  await fillSuggestedArea(deps, run);
   try {
     await deps.spawn(run);
     narrate(deps, `\u0411\u0435\u0440\u0443 ${run.task_slug} \u0438\u0437 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u2014 \u0441\u043F\u0430\u0432\u043D\u044E ${droneLabel(run)}.`);
     return "spawned";
   } catch (e) {
+    if (e instanceof FileOverlapError) {
+      const logged = deps.overlapLogged ??= /* @__PURE__ */ new Map();
+      if (logged.get(run.id) !== e.message) {
+        logged.set(run.id, e.message);
+        deps.db.addEvent(run.id, "step", `${e.message} \u2014 \u0437\u0430\u0434\u0430\u0447\u0430 \u043E\u0441\u0442\u0430\u0451\u0442\u0441\u044F \u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 (TASWM-348)`);
+        narrate(deps, `${droneLabel(run)} \u2014 ${e.message}. \u041D\u0435 \u0441\u043F\u0430\u0432\u043D\u044E \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u043E.`);
+      }
+      return "skipped";
+    }
     if (e instanceof AreaBusyError) return "skipped";
     deps.db.updateRun(run.id, { status: "failed" });
     deps.db.addEvent(run.id, "failed", String(e));
@@ -12933,8 +14212,8 @@ async function resumeWatchdogParked(deps, droneCap) {
   }
   if (!candidate) return;
   if (candidate.pid != null && deps.isAlive(candidate.pid)) return;
-  const worktreeExists = deps.worktreeExists ?? existsSync15;
-  const hasTranscript = deps.hasTranscript ?? sessionTranscriptExists;
+  const worktreeExists = deps.worktreeExists ?? existsSync16;
+  const hasTranscript = deps.hasTranscript ?? executorHasSession;
   const wt = candidate.worktree_path;
   const canContinue = !!wt && worktreeExists(wt) && hasTranscript(wt);
   const mode = canContinue ? "continue" : "fresh";
@@ -13102,8 +14381,8 @@ async function manageRelief(deps, now, droneCap, stormActive) {
     if (resumeCandidate.pid != null && deps.isAlive(resumeCandidate.pid)) return;
     if (!deps.respawn) return;
     const wt = resumeCandidate.worktree_path;
-    const worktreeExists = deps.worktreeExists ?? existsSync15;
-    const hasTranscript = deps.hasTranscript ?? sessionTranscriptExists;
+    const worktreeExists = deps.worktreeExists ?? existsSync16;
+    const hasTranscript = deps.hasTranscript ?? executorHasSession;
     const canContinue = !!wt && worktreeExists(wt) && hasTranscript(wt);
     const mode = canContinue ? "continue" : "fresh";
     if (mode === "continue" && wt && deps.reclaimWorktree) {
@@ -13226,15 +14505,28 @@ ${journal}`);
     deps.db.addEvent(run.id, "step", `\u0434\u0435\u043C\u043E\u043D-\u043E\u0442\u0447\u0451\u0442 \u0432 \u0437\u0430\u0434\u0430\u0447\u0443 ${run.task_slug} \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D: ${e instanceof Error ? e.message : String(e)}`);
   });
 }
+function syncBranchFromPr(db, run, headBranch) {
+  const fix = branchFromPrPatch(run.branch, headBranch);
+  if (!fix) return run;
+  const updated = db.updateRun(run.id, fix.patch) ?? run;
+  db.addEvent(run.id, "step", fix.event);
+  return updated;
+}
+async function worktreeBranchFor(run, prHead) {
+  if (run.branch) return run.branch;
+  const fromPr = run.pr_url && prHead ? await prHead(run.pr_url).catch(() => null) : null;
+  return fromPr || run.task_slug;
+}
 async function adoptDroneToReview(deps, run, prUrl) {
   const t = applyReviewTransition(deps.db, run, prUrl);
+  const adopted = syncBranchFromPr(deps.db, run, deps.prHeadBranch ? await deps.prHeadBranch(prUrl).catch(() => null) : null);
   deps.db.addEvent(run.id, "pr_opened", prUrl);
   deps.db.addEvent(
     run.id,
     "step",
     t.isFixIteration ? `\u0434\u0440\u043E\u043D \u043E\u0442\u043A\u0440\u044B\u043B PR \u043D\u0430 \u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438 \u0438 \u0443\u043C\u0435\u0440 \u0434\u043E done() \u2014 \u0443\u0441\u044B\u043D\u043E\u0432\u043B\u0451\u043D \u043D\u0430 \u0440\u0435-\u0440\u0435\u0432\u044C\u044E #${t.cycle} (\u0432\u0435\u0440\u0434\u0438\u043A\u0442 \xAB\u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438\xBB \u0441\u0431\u0440\u043E\u0448\u0435\u043D, pr_url \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0438\u0437 gh): ${prUrl}` : `\u0434\u0440\u043E\u043D \u043E\u0442\u043A\u0440\u044B\u043B PR \u043F\u0435\u0440\u0435\u0434 \u0441\u043C\u0435\u0440\u0442\u044C\u044E \u2014 \u0443\u0441\u044B\u043D\u043E\u0432\u043B\u0451\u043D \u043D\u0430 \u0440\u0435\u0432\u044C\u044E (pr_url \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0438\u0437 gh): ${prUrl}`
   );
-  await postAdoptionReport(deps, run, prUrl, t.cycle ?? run.review_cycle ?? 0);
+  await postAdoptionReport(deps, adopted, prUrl, t.cycle ?? run.review_cycle ?? 0);
 }
 async function postScrapedVerdictReport(deps, runId, taskSlug, verdict, droneName, workspaceId, cycle) {
   if (!deps.reportComment) return;
@@ -13264,8 +14556,8 @@ function buildEscalationCandidates(db) {
 }
 async function tickOnce(deps) {
   const now = deps.now ? deps.now() : Date.now();
-  const worktreeExists = deps.worktreeExists ?? existsSync15;
-  const hasTranscript = deps.hasTranscript ?? sessionTranscriptExists;
+  const worktreeExists = deps.worktreeExists ?? existsSync16;
+  const hasTranscript = deps.hasTranscript ?? executorHasSession;
   if (deps.rehydrate) {
     const rh = deps.rehydrate;
     const sinceLast = rh.lastAt == null ? Infinity : now - rh.lastAt;
@@ -13391,7 +14683,7 @@ async function tickOnce(deps) {
   if (!stormActive) {
     await resumeWatchdogParked(deps, droneCap);
   }
-  for (const run of deps.db.listRuns("review")) {
+  for (let run of deps.db.listRuns("review")) {
     try {
       if (run.resolves_run_id != null) {
         if (run.worktree_path) await deps.removeWorktree(run.repo, run.worktree_path).catch(() => {
@@ -13410,7 +14702,9 @@ async function tickOnce(deps) {
         continue;
       }
       if (!run.pr_url) continue;
-      const st = await deps.prStatus(run.pr_url);
+      const prUrl = run.pr_url;
+      const st = await deps.prStatus(prUrl);
+      run = syncBranchFromPr(deps.db, run, st.headBranch);
       if (st.merged) {
         await finalizeMergedReview(deps, run);
         narrate(deps, `PR ${droneLabel(run)} \u0441\u043C\u0435\u0440\u0436\u0435\u043D \u2014 ${run.task_slug} \u0437\u0430\u043A\u0440\u044B\u0442\u0430, \u0441\u043B\u043E\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u0435\u043D.`);
@@ -13479,11 +14773,13 @@ async function tickOnce(deps) {
           continue;
         }
         const attempts = deps.db.reviewerAttemptCountFor(run.id);
+        const runEvents = deps.db.events(run.id);
+        const unrecoverableMark = reviewUnrecoverableMark(run.branch || run.task_slug);
         let verdictFromComment = null;
         let lastAttempt = null;
         if (attempts > 0 && deps.verdictComment) {
           lastAttempt = deps.db.lastReviewerAttemptFor(run.id);
-          verdictFromComment = await deps.verdictComment(run.pr_url, lastAttempt?.created_at ?? run.created_at).catch(() => null);
+          verdictFromComment = await deps.verdictComment(prUrl, lastAttempt?.created_at ?? run.created_at).catch(() => null);
         }
         if (verdictFromComment) {
           const mark = verdictCommentMark(verdictFromComment.createdAt);
@@ -13498,15 +14794,16 @@ async function tickOnce(deps) {
               await wakeAuthorOnChanges(deps, run, now, droneCap);
             }
           }
+        } else if (runEvents.some((e) => (e.text ?? "").includes(unrecoverableMark))) {
         } else if (attempts >= REVIEW_SPAWN_LIMIT) {
-          if (!deps.db.events(run.id).some((e) => e.kind === "step" && (e.text ?? "").includes(REVIEW_ESCALATION_MARK))) {
+          if (!runEvents.some((e) => e.kind === "step" && (e.text ?? "").includes(REVIEW_ESCALATION_MARK))) {
             deps.db.addEvent(run.id, "step", `${REVIEW_ESCALATION_MARK}: ${attempts} \u043F\u043E\u043F\u044B\u0442(\u043E\u043A) \u0440\u0435\u0432\u044C\u044E \u0431\u0435\u0437 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`);
             narrate(deps, `\u0420\u0435\u0432\u044C\u044E ${droneLabel(run)} \u043D\u0435 \u0441\u043C\u043E\u0433\u043B\u043E \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C\u0441\u044F \u0437\u0430 ${attempts} \u043F\u043E\u043F\u044B\u0442(\u043E\u043A) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A.`);
           }
         } else {
           const reviewersCapOk = deps.reviewCap === void 0 || countActiveReviewers(deps.db) < deps.reviewCap;
           if ((!deps.resourcesOk || deps.resourcesOk()) && reviewersCapOk) {
-            const freshSt = await deps.prStatus(run.pr_url);
+            const freshSt = await deps.prStatus(prUrl);
             if (freshSt.merged) {
               await finalizeMergedReview(deps, run);
               narrate(deps, `PR ${droneLabel(run)} \u0441\u043C\u0435\u0440\u0436\u0435\u043D, \u043F\u043E\u043A\u0430 \u0436\u0434\u0430\u043B \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430 \u2014 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u044E, \u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u043D\u0443\u0436\u043D\u043E.`);
@@ -13519,11 +14816,21 @@ async function tickOnce(deps) {
             } else if (freshSt.conflicting || freshSt.isDraft) {
               deps.db.addEvent(run.id, "step", "PR \u0441\u0442\u0430\u043B \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u044E\u0449\u0438\u043C/\u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A\u043E\u043C, \u043F\u043E\u043A\u0430 \u0436\u0434\u0430\u043B \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430 \u2014 \u0441\u043F\u0430\u0432\u043D \u043E\u0442\u043B\u043E\u0436\u0435\u043D \u0434\u043E \u0441\u043B\u0435\u0434. \u0442\u0438\u043A\u0430");
             } else {
+              run = syncBranchFromPr(deps.db, run, freshSt.headBranch);
               try {
                 await deps.spawnReviewer(run, st.files ?? []);
                 narrate(deps, `PR ${droneLabel(run)} \u0433\u043E\u0442\u043E\u0432 \u2014 \u043F\u043E\u0434\u043D\u0438\u043C\u0430\u044E \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0433\u043E \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430.`);
               } catch (e) {
-                deps.db.addEvent(run.id, "step", `\u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u043E\u0441\u044C: ${String(e)}`);
+                if (isUnrecoverableRefError(e)) {
+                  deps.db.addEvent(
+                    run.id,
+                    "step",
+                    `${unrecoverableMark}: ${String(e)} \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u043C \u043D\u0435 \u043B\u0435\u0447\u0438\u0442\u0441\u044F, \u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u0434\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`
+                  );
+                  narrate(deps, `\u0420\u0435\u0432\u044C\u044E\u0435\u0440\u0430 ${droneLabel(run)} \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u0442\u044C: \u0432\u0435\u0442\u043A\u0438 PR \u043D\u0435\u0442 \u043D\u0430 origin \u2014 \u0437\u043E\u0432\u0443 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0441\u0440\u0430\u0437\u0443, \u043F\u043E\u043F\u044B\u0442\u043A\u0438 \u043D\u0435 \u0436\u0433\u0443.`);
+                } else {
+                  deps.db.addEvent(run.id, "step", `\u0430\u0432\u0442\u043E-\u0440\u0435\u0432\u044C\u044E \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u043E\u0441\u044C: ${String(e)}`);
+                }
               }
             }
           }
@@ -13790,7 +15097,9 @@ async function tickOnce(deps) {
           // resource-gate-stall (TASWM-212): та же причина, что видит лог manageRelief — один
           // deps.gateReason() на тик (кэш hostReading() внутри resources.ts, лишнего спавна нет).
           ...deps.gateReason ? { gateReason: deps.gateReason() } : {},
-          ...az.stopQuiet ? { stopQuiet: az.stopQuiet() } : {}
+          ...az.stopQuiet ? { stopQuiet: az.stopQuiet() } : {},
+          // Рестарт не переигрывает падения (TAS-485) — см. closedBeforeStart в anomalies.ts.
+          ...az.startedAt != null ? { daemonStartedAt: az.startedAt } : {}
         }),
         ...buildEscalationCandidates(deps.db),
         // ЦЕНА РАЗГРУЗКИ (TASWM-316): «машина не тянет» с числами и рекомендацией — та же
@@ -13820,6 +15129,20 @@ async function tickOnce(deps) {
       }
       narrate(deps, `\u26A0\uFE0F ${signal.title}`);
     }
+    const stale = az.tracker.pendingResolved();
+    if (stale.length > 0) {
+      if (!az.resolve) {
+        az.tracker.forgetResolved(stale);
+      } else {
+        const batch = stale.slice(0, ANOMALY_RESOLVE_BATCH);
+        try {
+          await az.resolve(batch);
+          az.tracker.forgetResolved(batch);
+        } catch (e) {
+          console.error("[overmind] \u043D\u0430\u0434\u0437\u043E\u0440: \u0433\u0430\u0448\u0435\u043D\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0432\u0448\u0438\u0445\u0441\u044F \u0430\u043D\u043E\u043C\u0430\u043B\u0438\u0439 \u043D\u0435 \u0434\u043E\u043B\u0435\u0442\u0435\u043B\u043E, \u043F\u043E\u0432\u0442\u043E\u0440\u044E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C:", e);
+        }
+      }
+    }
   }
   if (deps.watchdog) {
     try {
@@ -13885,7 +15208,7 @@ async function cancelRun(deps, slug, reason) {
 }
 async function resolveConflict(deps, reviewRun) {
   const repo = normalizeRepo(reviewRun.repo || deps.repoFallback);
-  const branch = reviewRun.branch || reviewRun.task_slug;
+  const branch = await worktreeBranchFor(reviewRun, deps.prHeadBranch);
   const resolver = deps.db.createRun({
     task_slug: reviewRun.task_slug,
     repo,
@@ -13895,7 +15218,7 @@ async function resolveConflict(deps, reviewRun) {
     workspace_id: reviewRun.workspace_id
     // та же задача, тот же воркспейс (TASWM-288)
   });
-  const wt = join25(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-resolve-${resolver.id}`);
+  const wt = join28(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-resolve-${resolver.id}`);
   try {
     await deps.git.prepareDetachedWorktree(repo, branch, wt);
     await deps.git.setWorktreeIdentity(wt, resolver.name);
@@ -13925,14 +15248,14 @@ async function resolveConflict(deps, reviewRun) {
     await deps.git.removeWorktree(repo, wt).catch(() => {
     });
     deps.db.updateRun(resolver.id, { status: "failed" });
-    const marker = isTransientResourceError(e) ? "\u041E\u0421 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u044C git-\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B (\u0440\u0435\u0441\u0443\u0440\u0441, \u043D\u0435 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442)" : "merge-main-in \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F";
+    const marker = isUnrecoverableRefError(e) ? "\u0432\u0435\u0442\u043A\u0438 PR \u043D\u0435\u0442 \u043D\u0430 origin \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u043C \u043D\u0435 \u043B\u0435\u0447\u0438\u0442\u0441\u044F, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A" : isTransientResourceError(e) ? "\u041E\u0421 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u044C git-\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B (\u0440\u0435\u0441\u0443\u0440\u0441, \u043D\u0435 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442)" : "merge-main-in \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F";
     deps.db.addEvent(resolver.id, "failed", `${marker}: ${String(e)}`);
     throw e;
   }
 }
 async function spawnReviewer(deps, reviewRun, files) {
   const repo = normalizeRepo(reviewRun.repo || deps.repoFallback);
-  const branch = reviewRun.branch || reviewRun.task_slug;
+  const branch = await worktreeBranchFor(reviewRun, deps.prHeadBranch);
   const priorReview = reviewRun.review_cycle > 0 ? lastChangesSummary(deps.db, reviewRun.id) : null;
   const verifyMode = deps.verifyMode ? await deps.verifyMode(repo).catch(() => void 0) : void 0;
   const checklist = buildReviewChecklist(reviewRun, files, priorReview, verifyMode);
@@ -13947,7 +15270,7 @@ async function spawnReviewer(deps, reviewRun, files) {
     // (своей у ревьюера нет, TASWM-204), и коммент с вердиктом должен уехать именно туда.
     workspace_id: reviewRun.workspace_id
   });
-  const wt = join25(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-review-${reviewer.id}`);
+  const wt = join28(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-review-${reviewer.id}`);
   try {
     await deps.git.prepareDetachedWorktree(repo, branch, wt);
     await deps.git.setWorktreeIdentity(wt, reviewer.name);
@@ -13982,7 +15305,7 @@ async function respawnRun(deps, run, mode, nudge) {
   ]);
   const base3 = effectiveBaseBranch(run.base_branch, projectBase);
   const runToSpawn = base3 && run.base_branch !== base3 ? deps.db.updateRun(run.id, { base_branch: base3 }) ?? run : run;
-  if (!existsSync15(wt)) {
+  if (!existsSync16(wt)) {
     const branch = runToSpawn.branch || runToSpawn.task_slug;
     const source = await addWorktree(repo, wt, branch, {
       ...base3 ? { base: await remoteBaseRef(repo, base3) } : {},
@@ -14011,7 +15334,7 @@ ${notice}` : freshPrompt;
   deps.db.updateRun(run.id, { status: "running", pid });
 }
 async function syncCrashedOnStartup(deps) {
-  const worktreeExists = deps.worktreeExists ?? existsSync15;
+  const worktreeExists = deps.worktreeExists ?? existsSync16;
   let orphaned = 0;
   let merged = 0;
   let requeued = 0;
@@ -14074,7 +15397,7 @@ async function makeStore(repo, worktreesDir, repoFlag) {
       console.warn(`[overmind] \u043D\u0435 \u0441\u043C\u043E\u0433 \u0437\u0430\u043F\u043E\u043C\u043D\u0438\u0442\u044C \u043F\u0443\u0442\u044C \u043A \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044E (${e instanceof Error ? e.message : e}) \u2014 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0437\u0430\u043F\u0443\u0441\u043A \u0441\u043D\u043E\u0432\u0430 \u043F\u043E\u043F\u0440\u043E\u0441\u0438\u0442 --repo`);
     }
   }
-  const scanRootsList = resolveScanRoots(SWARM_SCAN_ROOTS_RAW, homedir4(), repoPaths);
+  const scanRootsList = resolveScanRoots(SWARM_SCAN_ROOTS_RAW, homedir5(), repoPaths);
   const repoMap = emptyRepoMapState(scanRootsList);
   if (SWARM_BACKEND !== "client") {
     const { SwarmDb: SwarmDb2 } = await loadSqlite();
@@ -14148,10 +15471,10 @@ async function migrateWorktreesAtStartup() {
       legacyDir: WORKTREES_LEGACY_DIR,
       targetDir: WORKTREES_DIR,
       envOverride: process.env.SWARM_WORKTREES || "",
-      exists: (d) => existsSync15(d),
+      exists: (d) => existsSync16(d),
       isNonEmptyDir: (d) => {
         try {
-          return readdirSync10(d).length > 0;
+          return readdirSync12(d).length > 0;
         } catch {
           return false;
         }
@@ -14163,7 +15486,7 @@ async function migrateWorktreesAtStartup() {
     });
   } catch (e) {
     console.error("[migrate] \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u044F worktrees \u0441\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C \u2014 \u0444\u043E\u043B\u0431\u044D\u043A:", e);
-    return existsSync15(WORKTREES_DIR) ? WORKTREES_DIR : WORKTREES_LEGACY_DIR;
+    return existsSync16(WORKTREES_DIR) ? WORKTREES_DIR : WORKTREES_LEGACY_DIR;
   }
 }
 async function reportWorkspaceAccess(tl, db) {
@@ -14233,18 +15556,23 @@ async function runDaemon(opts) {
     overmindEntry: THIS_FILE,
     dbPath: DB_PATH,
     runLogsDir: RUN_LOGS_DIR,
+    // Кем исполнять (TASWM-349) — настройка SWARM_EXECUTOR, один резолв на весь демон.
+    executor: EXECUTOR,
     droneIsolation: DRONE_ISOLATION,
     channel: droneChannelLaunch,
     droneCap: () => lastDroneCap
   });
   let prepareReader;
+  const zoneModels = new ZoneModels({ manualAreas: () => new Map(db.listRuns().map((r) => [r.task_slug, r.area])) });
+  const activeFiles = new ActiveFilesCache((r) => changedPaths(r.worktree_path, { baseBranch: r.base_branch ?? null }));
   const baseSpawn = {
     db,
     repo: opts.repo,
     // фолбэк, если у прогона repo пуст
     worktreesDir,
     launch,
-    prepare: (repo) => prepareReader ? prepareReader(repo) : Promise.resolve(null)
+    prepare: (repo) => prepareReader ? prepareReader(repo) : Promise.resolve(null),
+    conflicts: (run, repo) => zoneConflictFor(db, zoneModels, activeFiles, run, repo, opts.repo)
   };
   let intake;
   if (SWARM_BACKEND === "client" && db instanceof SwarmClient && SWARM_MAX_IN_FLIGHT > 0) {
@@ -14278,7 +15606,7 @@ async function runDaemon(opts) {
     const client = db;
     heartbeat = {
       push: async () => {
-        const reply = await client.heartbeat(daemonVersion?.get() ?? null, control.state ?? null);
+        const reply = await client.heartbeat(daemonVersion?.get() ?? null, control.state ?? null, lastDroneCap);
         if (reply.commands.length) onHostCommands(reply.commands);
         if (reply.logRequests.length) {
           await serveLogRequests(
@@ -14348,7 +15676,14 @@ async function runDaemon(opts) {
       autoReviewEnabled: SWARM_AUTO_REVIEW,
       outboxPendingCount: () => client.pendingCount(),
       notify: (signal) => client.notifyAnomaly(signal),
-      stopQuiet: () => anomalyState.stopQuiet()
+      // TAS-485: условие ушло → гасим свою же тревогу в инбоксе.
+      resolve: (keys) => client.resolveAnomalies(keys),
+      stopQuiet: () => anomalyState.stopQuiet(),
+      // TAS-485: этот демон отвечает за то, что случилось ПРИ НЁМ. Прогон, закрытый до
+      // старта, он не переоткрывает — иначе каждый перезапуск начинает волну заново
+      // (id прогонов в зеркале свои у каждой жизни процесса, durable-кулдаун по ним не
+      // совпадает — см. closedBeforeStart в anomalies.ts).
+      startedAt: Date.now()
     };
   }
   const watchdog = {
@@ -14421,6 +15756,9 @@ async function runDaemon(opts) {
         worktreesDir,
         launch,
         git: { prepareDetachedWorktree, setWorktreeIdentity, removeWorktree },
+        // TASWM-356: ветка ревьюера — фактическая ветка PR. Штатно она уже в поле прогона
+        // (реконсайл синхронит её из headBranch), этот ридер — для прогонов без неё.
+        prHeadBranch,
         // TASWM-293: ТОТ ЖЕ живой ридер verifyMode, что у исполнителя (spawnDrone) —
         // иначе ревьюер судит проект с verifyMode=local по правилам ci и блокирует PR
         // за отсутствие CI, которого у проекта нет и не предполагается.
@@ -14513,7 +15851,7 @@ async function runDaemon(opts) {
       if (task) db.updateRun(run.id, { task_title: task.title, task_desc: task.description, task_url: task.url });
       if (taskClient) await taskClient.startTask(runToSpawn.task_slug);
     },
-    prStatus: (url) => prStatus(url).then((s) => ({ merged: s.merged, conflicting: s.conflicting, isDraft: s.isDraft, files: s.files, state: s.state })),
+    prStatus: (url) => prStatus(url).then((s) => ({ merged: s.merged, conflicting: s.conflicting, isDraft: s.isDraft, files: s.files, state: s.state, headBranch: s.headBranch })),
     // Открытые PR ветки прогона (готча №14): gh pr list --head <slug> в репо прогона
     // (фолбэк — дефолт-репо роя). Реальный gh; логика усыновления — в tickOnce (тестируется).
     openPrsForBranch: (branch, repoDir) => openPrsForBranch(branch, repoDir || opts.repo),
@@ -14537,6 +15875,8 @@ async function runDaemon(opts) {
       reportComment: (slug, body, label, ws) => tl.forWorkspace(ws).addComment(slug, body, label)
     } : {},
     prCommitTitles: (prUrl) => prCommitTitles(prUrl),
+    prHeadBranch: (prUrl) => prHeadBranch(prUrl),
+    // TASWM-356: ветка PR на усыновлении, узким запросом
     journalForBranch: (repo, branch, slug) => journalForBranch(repo || opts.repo, branch, slug),
     removeWorktree: (repo, p) => removeWorktree(repo || opts.repo, p),
     // TASWM-303: тот же фолбэк repo, что у removeWorktree/journalForBranch — run.repo пуст
@@ -14546,15 +15886,17 @@ async function runDaemon(opts) {
     repoHasCi: (run) => repoHasCiWorkflows(run.worktree_path, run.repo || opts.repo),
     isAlive: pidAlive,
     // Учёт cost/usage (TASWM-188): реальный аккаунтант поверх RUN_LOGS_DIR + db.
-    accountCost: makeCostAccountant({ runLogsDir: RUN_LOGS_DIR, db }),
+    accountCost: makeCostAccountant({ runLogsDir: RUN_LOGS_DIR, db, executor: EXECUTOR }),
     // Классификация выхода прогона (TASWM-229): result-файл того же RUN_LOGS_DIR — «вышел сам»
     // (graceful) vs «убит на полпути» (crash). Тот же каталог, что читает accountCost.
-    exitOutcome: makeExitClassifier(RUN_LOGS_DIR),
+    exitOutcome: makeExitClassifier(RUN_LOGS_DIR, EXECUTOR),
     // Живой child-процесс (TASWM-89): долгая Bash-команда (тесты/сборка) — не «завис».
     livePpids,
     // Погасить дрона (SIGTERM) — reap внешне-остановленных прогонов (kill из дашборда:
     // POST /swarm/kill → stopped в проде → overmind гасит живой pid на реконсайле).
-    kill: (pid) => killProcessGroup(pid, "SIGTERM"),
+    // TASWM-349: свой способ остановки — за адаптером; не задан (оба сегодняшних) → общий
+    // групповой SIGTERM.
+    kill: (pid) => EXECUTOR.stop ? EXECUTOR.stop(pid, "SIGTERM") : killProcessGroup(pid, "SIGTERM"),
     // Реклейм worktree паузнутого/возвращаемого дрона (TASWM-228): тот же cwd-скан, что и
     // очистка перед сносом worktree, но БЕЗ сноса каталога — worktree остаётся под
     // --continue. Гасит тяжёлую работу дрона, ушедшую из его process group (Bash-тул
@@ -14593,7 +15935,7 @@ async function runDaemon(opts) {
     lastCommitMs: (p) => worktreeLastCommitMs(p),
     // mtime транскрипта claude-сессии как liveness (TASWM-136): точнее коммитов — обновляется
     // на каждое действие дрона (Edit/Read/tool-use), не только на коммит.
-    transcriptMtimeMs: (p) => transcriptMtimeMs(p),
+    transcriptMtimeMs: (p) => EXECUTOR.session.mtimeMs(p),
     // Ресурс-гейт спавна (TASWM-130): реальные показания хоста (load1 / free RAM).
     resourcesOk: hostResourcesOk,
     // Ресурс-гейт v2 (TASWM-151): жёсткий порог активной разгрузки — те же сырые показания
@@ -14624,6 +15966,13 @@ async function runDaemon(opts) {
     ...exclusiveProject ? { exclusiveProject } : {},
     repoFallback: opts.repo,
     exclusiveLogged: /* @__PURE__ */ new Map(),
+    // Зона задачи из истории репо (TASWM-348) — предлагаем сами, если постановщик
+    // её не проставил. Дедуп событий отдельной мапой, как у гейтов выше.
+    suggestArea: async (run) => {
+      const repo = normalizeRepo(run.repo || opts.repo || "");
+      return repo ? suggestAreaForRun(await zoneModels.forRepo(repo), run) : null;
+    },
+    overlapLogged: /* @__PURE__ */ new Map(),
     // Ротация своего лога (TASWM-330): демон пишет в него неделями, а до этого ротация была
     // только при старте. Итог ротации печатаем в сам лог — первой строкой нового поколения
     // видно, что история не потерялась, а уехала в `.1`.
@@ -14648,7 +15997,9 @@ async function runDaemon(opts) {
         repoFallback: opts.repo,
         worktreesDir,
         launch,
-        git: { prepareDetachedWorktree, setWorktreeIdentity, remoteMainRef, remoteBaseRef, mergeRef, pushHeadTo, removeWorktree }
+        git: { prepareDetachedWorktree, setWorktreeIdentity, remoteMainRef, remoteBaseRef, mergeRef, pushHeadTo, removeWorktree },
+        prHeadBranch
+        // TASWM-356: ветка PR для прогонов без записанного поля branch
       },
       reviewRun
     ).then(() => {
@@ -14679,8 +16030,8 @@ async function runDaemon(opts) {
       mode,
       nudge
     ),
-    worktreeExists: (p) => existsSync15(p),
-    hasTranscript: (p) => sessionTranscriptExists(p),
+    worktreeExists: (p) => existsSync16(p),
+    hasTranscript: executorHasSession,
     // CI-осведомлённость review-PR (TASWM-102): реальный `gh pr checks`/`gh run view --log-failed`
     // (gh.ts) — решение (будить ли дрона) и гейты живут в tickOnce/handleCiRed. failureSummary
     // строится над failing/failingRunIds ИЗ checks — без повторного `gh pr checks`.
@@ -14691,7 +16042,7 @@ async function runDaemon(opts) {
     // Штормовой режим (TASWM-23): health-probe на отбой (реальный claude) + внешний
     // сигнал SWARM_STORM_URL (2-й слой, если задан). Логика/пороги — в manageStorm/storm.ts.
     storm: {
-      probe: () => anthropicHealthy({ timeoutMs: resolveStormConfig().probeTimeoutMs }),
+      probe: () => executorHealthy({ executor: EXECUTOR, timeoutMs: resolveStormConfig().probeTimeoutMs }),
       // externalDown опционален (exactOptionalPropertyTypes): ключ есть только при
       // заданном SWARM_STORM_URL, иначе опускаем — не передаём undefined.
       ...SWARM_STORM_URL ? { externalDown: () => fetchExternalStorm(SWARM_STORM_URL) } : {}
@@ -14837,6 +16188,17 @@ async function runDaemon(opts) {
         );
         return run ? { id: run.id } : null;
       },
+      // TASWM-351: «перезапустить с того же места» из продукта. Тот же вход, что у
+      // `swarm wake <id>` и у POST /wake локальной морды, — сознательно, чтобы у
+      // побудки была ОДНА реализация: она умеет отличать «сессию можно продолжить»
+      // от «продолжать нечем» и не будит служебные прогоны вслепую (см. wakeRun).
+      // Слаг → прогон резолвим тем же activeRunForSlug, что и остановка: у команды
+      // из веба нет и не будет локального id прогона (он живёт только в этом процессе).
+      wakeRun: async (slug) => {
+        const run = db.activeRunForSlug(slug);
+        if (!run) return null;
+        return wakeRun({ db, isAlive: pidAlive, respawn: deps.respawn, narrate: narrator.narrate }, run.id);
+      },
       update: async (onStep) => {
         if (!daemonStart) {
           return { ok: false, step: "fetch", message: "\u043A\u043E\u0434 \u0434\u0435\u043C\u043E\u043D\u0430 \u043B\u0435\u0436\u0438\u0442 \u043D\u0435 \u0432 git-\u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0438 \u2014 \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E" };
@@ -15048,6 +16410,7 @@ export {
   REVIEW_CYCLE_LIMIT,
   REVIEW_ESCALATION_MARK,
   REVIEW_SPAWN_LIMIT,
+  REVIEW_UNRECOVERABLE_MARK,
   SELF_REFERENCE_MARK,
   STALL_FLOOR_MS,
   STALL_MS,
@@ -15070,6 +16433,7 @@ export {
   repoHasCiWorkflows,
   resolveConflict,
   respawnRun,
+  reviewUnrecoverableMark,
   reviveStuck,
   runDaemon,
   spawnReviewer,