@taskless-app/swarm 0.6.39 → 0.6.40

package/dist/cli.js

@@ -1366,7 +1366,7 @@ function buildZoneModel(entries, opts = {}) {
     if (!m) labelVotes.set(z, m = /* @__PURE__ */ new Map());
     bump(m, manual);
   }
-  const rename = /* @__PURE__ */ new Map();
+  const rename2 = /* @__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);
@@ -1375,11 +1375,11 @@ function buildZoneModel(entries, opts = {}) {
   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);
+    rename2.set(zone, top.key);
     takenNames.add(top.key);
   }
-  const renamed = (z) => rename.get(z) ?? z;
-  if (rename.size) {
+  const renamed = (z) => rename2.get(z) ?? z;
+  if (rename2.size) {
     for (const [f, z] of fileZone) fileZone.set(f, renamed(z));
     for (const [s, z] of taskZone) taskZone.set(s, renamed(z));
   }
@@ -3191,7 +3191,7 @@ var init_procList = __esm({
 
 // src/procCleanup.ts
 function sleep(ms) {
-  return new Promise((resolve4) => setTimeout(resolve4, ms));
+  return new Promise((resolve5) => setTimeout(resolve5, ms));
 }
 function parseLsofCwd(output) {
   const rows = [];
@@ -3390,7 +3390,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.39",
+      version: "0.6.40",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3441,7 +3441,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "0c0b1bc0ee05add0d2b5b5d503a05ed7b7834dd8"
+      gitHead: "b58ef18678e8c0e03e0602a40bf76d6f0a6975c8"
     };
   }
 });
@@ -3838,9 +3838,9 @@ var init_oauth = __esm({
 });
 
 // src/git.ts
-import { existsSync as existsSync10, readdirSync as readdirSync9, statSync as statSync9 } from "fs";
-import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
-import { isAbsolute, join as join15, sep as sep2 } from "path";
+import { existsSync as existsSync10, readdirSync as readdirSync9, realpathSync as realpathSync2, statSync as statSync9 } from "fs";
+import { appendFile, chmod, mkdir, readFile, rename, rm, writeFile } from "fs/promises";
+import { isAbsolute, join as join15, resolve as resolve2, sep as sep2 } from "path";
 import { $ as $5 } from "execa";
 function gitNet(repo, args, timeoutMs) {
   return withHardTimeout(
@@ -3853,6 +3853,72 @@ function gitNet(repo, args, timeoutMs) {
 async function reclaimStaleWorktree(repo, worktree) {
   await detachWorktree(repo, worktree);
 }
+async function inspectWorktreePath(path) {
+  if (!existsSync10(path)) return "free";
+  try {
+    if (readdirSync9(path).length === 0) return "free";
+  } catch {
+    return "orphan";
+  }
+  try {
+    if (statSync9(join15(path, ".git")).isDirectory()) return "main-checkout";
+  } catch {
+  }
+  const top = await $5({ reject: false })`git -C ${path} rev-parse --show-toplevel`;
+  return top.exitCode === 0 && samePath(top.stdout.trim(), path) ? "worktree" : "orphan";
+}
+function samePath(a, b) {
+  const norm = (p) => {
+    try {
+      return realpathSync2(p);
+    } catch {
+      return resolve2(p);
+    }
+  };
+  const [x, y] = [norm(a), norm(b)];
+  return process.platform === "win32" ? posix(x).toLowerCase() === posix(y).toLowerCase() : x === y;
+}
+async function clearWorktreePath(repo, path, branch, opts = {}) {
+  const holder = await inspectWorktreePath(path);
+  if (holder === "free") return;
+  if (holder === "main-checkout") {
+    throw new WorktreeBusyError(
+      branch,
+      path,
+      `\u043F\u043E \u043F\u0443\u0442\u0438 worktree ${path} \u043B\u0435\u0436\u0438\u0442 \u041E\u0421\u041D\u041E\u0412\u041D\u041E\u0419 \u0447\u0435\u043A\u0430\u0443\u0442 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F (\`.git\` \u2014 \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u0430 \u043D\u0435 \u0444\u0430\u0439\u043B) \u2014 \u044F \u0435\u0433\u043E \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u044E. \u041F\u043E\u0445\u043E\u0436\u0435, \u043A\u0430\u0442\u0430\u043B\u043E\u0433 worktree'\u0435\u0432 \u0440\u043E\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D \u043D\u0430 \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u043A\u043E\u043F\u0438\u044E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430; \u043F\u043E\u043F\u0440\u0430\u0432\u044C\u0442\u0435 \u043F\u0443\u0442\u044C, \u0441\u043F\u0430\u0432\u043D \u0442\u0443\u0434\u0430 \u0437\u0430\u0441\u0435\u043B\u044F\u0442\u044C\u0441\u044F \u043D\u0435 \u0431\u0443\u0434\u0435\u0442.`
+    );
+  }
+  if (holder === "worktree") {
+    if (opts.isWorktreeHeldLive ? await opts.isWorktreeHeldLive(path) : true) throw new WorktreeBusyError(branch, path);
+    if (await worktreeDirty(path)) {
+      throw new WorktreeBusyError(
+        branch,
+        path,
+        `worktree ${path} \u043E\u0441\u0438\u0440\u043E\u0442\u0435\u043B, \u043D\u043E \u0432\u043D\u0443\u0442\u0440\u0438 \u0435\u0441\u0442\u044C \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 (\u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u043E\u0435 \u0438\u043B\u0438 \u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435) \u2014 \u043D\u0435 \u0441\u043D\u043E\u0448\u0443. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u0441\u0430\u043C\u0438 (\`git -C ${path} status --untracked-files=all\`) \u0438 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u043A\u043E\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u043D\u0435 \u0436\u0430\u043B\u043A\u043E.`
+      );
+    }
+    await detachWorktree(repo, path);
+    opts.onStaleReclaim?.(path);
+  }
+  if (!existsSync10(path)) return;
+  await parkOrphanDir(repo, path, branch);
+}
+async function parkOrphanDir(repo, path, branch) {
+  const parked = `${path}.orphan-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
+  try {
+    await rename(path, parked);
+  } catch (e) {
+    throw new WorktreeBusyError(
+      branch,
+      path,
+      `\u043F\u0443\u0442\u044C ${path} \u0437\u0430\u043D\u044F\u0442 \u043F\u043E\u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0438\u043C \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u043E\u043C, \u0438 \u043E\u0442\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044C \u0435\u0433\u043E \u043D\u0435 \u0432\u044B\u0448\u043B\u043E (${String(e)}) \u2014 \u0441\u043F\u0430\u0432\u043D ${branch} \u0442\u0443\u0434\u0430 \u043D\u0435 \u0432\u0441\u0442\u0430\u043D\u0435\u0442. \u0423\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0440\u0443\u043A\u0430\u043C\u0438 \u0438 \u0441\u0434\u0435\u043B\u0430\u0439\u0442\u0435 \`git -C ${repo} worktree prune\`.`
+    );
+  }
+  console.error(
+    `[git] \u043F\u043E \u043F\u0443\u0442\u0438 worktree ${path} \u043B\u0435\u0436\u0430\u043B \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 git \u0441\u0432\u043E\u0438\u043C \u0440\u0430\u0431\u043E\u0447\u0438\u043C \u0434\u0435\u0440\u0435\u0432\u043E\u043C \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u0442 \u2014 \u043E\u0442\u043E\u0434\u0432\u0438\u043D\u0443\u043B \u0432 ${parked}, \u0447\u0442\u043E\u0431\u044B \u0441\u043F\u0430\u0432\u043D ${branch} \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435, \u0447\u0442\u043E \u0432\u043D\u0443\u0442\u0440\u0438, \u0438 \u0443\u0434\u0430\u043B\u0438\u0442\u0435, \u0435\u0441\u043B\u0438 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E.`
+  );
+  await $5({ reject: false })`git -C ${repo} worktree prune`;
+}
 function isLinkedWorktree(dir) {
   try {
     return statSync9(join15(dir, ".git")).isFile();
@@ -3925,6 +3991,7 @@ async function checkoutWorktree(repo, path, branch, opts) {
   const originSha = await revParse(repo, `refs/remotes/origin/${branch}`);
   if (!localSha && !originSha) {
     const freshBase = opts.base ?? await freshWorktreeBase(repo);
+    await clearWorktreePath(repo, path, branch, opts);
     await $5`git -C ${repo} worktree add -b ${branch} ${path} ${freshBase}`;
     return { reused: false };
   }
@@ -3937,6 +4004,7 @@ async function checkoutWorktree(repo, path, branch, opts) {
     await reclaimStaleWorktree(repo, busyAt);
     opts.onStaleReclaim?.(busyAt);
   }
+  await clearWorktreePath(repo, path, branch, opts);
   if (originSha) {
     await $5`git -C ${repo} worktree add -B ${branch} ${path} ${`origin/${branch}`}`;
     return { reused: true, from: "origin", sha: originSha };
@@ -4057,8 +4125,14 @@ var init_git = __esm({
     init_netTimeout();
     init_swarmFiles();
     WorktreeBusyError = class extends Error {
-      constructor(branch, worktreePath) {
-        super(`worktree \u0437\u0430\u043D\u044F\u0442: ${worktreePath} (\u0432\u0435\u0442\u043A\u0430 ${branch}) \u2014 \u043F\u0440\u0438\u0431\u0435\u0440\u0438 worktree \u0438\u043B\u0438 \u043E\u0442\u043C\u0435\u043D\u0438 \u043F\u0440\u043E\u0433\u043E\u043D (swarm cancel ${branch})`);
+      /**
+       * `why` (TASWM-553) — ПОЧЕМУ путь не отдали, если причина не «его держит живой прогон»:
+       * основной чекаут по пути worktree, каталог с несданной работой, каталог, который не
+       * получилось убрать. Дефолтная формулировка («прибери worktree или отмени прогон»)
+       * человеку в таких случаях не помогает — она отправляет его не туда.
+       */
+      constructor(branch, worktreePath, why) {
+        super(why ?? `worktree \u0437\u0430\u043D\u044F\u0442: ${worktreePath} (\u0432\u0435\u0442\u043A\u0430 ${branch}) \u2014 \u043F\u0440\u0438\u0431\u0435\u0440\u0438 worktree \u0438\u043B\u0438 \u043E\u0442\u043C\u0435\u043D\u0438 \u043F\u0440\u043E\u0433\u043E\u043D (swarm cancel ${branch})`);
         this.branch = branch;
         this.worktreePath = worktreePath;
         this.name = "WorktreeBusyError";
@@ -4353,14 +4427,14 @@ function createNetworkSettleTracker(target) {
   });
   target.on("requestfinished", onDone);
   target.on("requestfailed", onDone);
-  const settleOnce = (quietMs, budgetMs) => new Promise((resolve4) => {
+  const settleOnce = (quietMs, budgetMs) => new Promise((resolve5) => {
     let quietTimer;
     const hardTimer = setTimeout(finish, Math.max(0, budgetMs));
     function finish() {
       clearTimeout(quietTimer);
       clearTimeout(hardTimer);
       onChange.delete(check);
-      resolve4();
+      resolve5();
     }
     function check() {
       clearTimeout(quietTimer);
@@ -4637,7 +4711,7 @@ __export(db_exports, {
 import { createRequire as createRequire2 } from "module";
 import { randomUUID as randomUUID3 } from "crypto";
 import { existsSync as existsSync12 } from "fs";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve3 } from "path";
 function rowToQuestion(row) {
   return {
     id: row.id,
@@ -5266,7 +5340,7 @@ CREATE TABLE IF NOT EXISTS imports (
        * транзакции: прервётся — маркер не встанет, повтор безопасен.
        */
       importDb(sourcePath, repo) {
-        const abs = resolve2(sourcePath);
+        const abs = resolve3(sourcePath);
         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 };
@@ -5609,7 +5683,7 @@ var init_repoScan = __esm({
 // src/repoDiscovery.ts
 import { homedir as homedir6 } from "os";
 import { readFileSync as readFileSync15, renameSync as renameSync7, writeFileSync as writeFileSync12 } from "fs";
-import { isAbsolute as isAbsolute3, join as join21, resolve as resolve3 } from "path";
+import { isAbsolute as isAbsolute3, join as join21, resolve as resolve4 } from "path";
 function repoMapLines(rows) {
   if (!rows?.length) return [];
   const missing = rows.filter((r) => !r.path).length;
@@ -11784,14 +11858,14 @@ function makeHandler(deps) {
       const ref = url.searchParams.get("pr") ?? "";
       if (!ref.trim()) return Response.json({ error: "\u043D\u0443\u0436\u0435\u043D \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 pr=<url|\u043D\u043E\u043C\u0435\u0440>" }, { status: 400 });
       const ctxRepo = url.searchParams.get("repo");
-      const resolve4 = deps.mergeGate ?? makeMergeGateResolver({
+      const resolve5 = deps.mergeGate ?? makeMergeGateResolver({
         listRuns: () => deps.db.listRuns(),
         fallbackAutoReview: SWARM_AUTO_REVIEW,
         autoVerify: SWARM_AUTO_VERIFY,
         // TASWM-344
         ...defaultRepo ? { repoFallback: defaultRepo } : {}
       });
-      return Response.json(await resolve4(ref, ctxRepo));
+      return Response.json(await resolve5(ref, ctxRepo));
     }
     if (p === "/resources") return Response.json(hostResourceSnapshot());
     if (p === "/timeline") return Response.json(timelineState(deps.db, Date.now(), readNarratorLog(deps.narratorLog)));
@@ -12678,10 +12752,10 @@ async function restoreDaemon(d, loginOk) {
   d.err("\u0434\u0435\u043C\u043E\u043D \u043E\u0431\u0440\u0430\u0442\u043D\u043E \u041D\u0415 \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F (\u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u0432\u044B\u0448\u0435) \u2014 \u0440\u043E\u0439 \u0441\u0442\u043E\u0438\u0442. \u041F\u043E\u0434\u043D\u0438\u043C\u0438 \u0432\u0440\u0443\u0447\u043D\u0443\u044E: swarm start");
 }
 function isPortFree(port, host = "127.0.0.1") {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const probe = createServer();
-    probe.once("error", () => resolve4(false));
-    probe.listen(port, host, () => probe.close(() => resolve4(true)));
+    probe.once("error", () => resolve5(false));
+    probe.listen(port, host, () => probe.close(() => resolve5(true)));
   });
 }
 async function chooseWorkspace(d) {
@@ -13511,7 +13585,7 @@ async function scoutRepo(repo) {
       mkdirSync10(dirname5(abs(rel)), { recursive: true });
       writeFileSync14(abs(rel), text);
     },
-    runScout: (prompt) => new Promise((resolve4) => {
+    runScout: (prompt) => new Promise((resolve5) => {
       const child = spawn3(bin, [...ISOLATION_FLAGS, "--dangerously-skip-permissions", "-p", prompt], {
         cwd: worktree,
         stdio: ["ignore", "inherit", "inherit"]
@@ -13519,9 +13593,9 @@ async function scoutRepo(repo) {
       });
       child.on("error", (e) => {
         console.error(`\u043D\u0435 \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u043B\u0441\u044F \u0438\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C (${bin}): ${e.message}`);
-        resolve4(1);
+        resolve5(1);
       });
-      child.on("exit", (c) => resolve4(c ?? 1));
+      child.on("exit", (c) => resolve5(c ?? 1));
     }),
     publish: (files) => publishScoutPr({ worktree, repo, files, name, baseBranch, openPr: openPr.url, fresh: openPr.known && !openPr.url }),
     log: (line) => console.log(line)
@@ -14059,6 +14133,11 @@ switch (cmd) {
       {
         db,
         kill: (pid) => process.kill(pid, "SIGTERM"),
+        // TASWM-553: тот же порядок, что у демона (stop_run / POST /cancel) — снос worktree
+        // ПОСЛЕ смерти процесса, а не следом за просьбой умереть. Здесь это нужнее всего:
+        // сюда попадают ровно тогда, когда демон не ответил, и подчистить за собой некому.
+        isAlive: pidAlive,
+        hardKill: (pid) => process.kill(pid, "SIGKILL"),
         removeWorktree: (repo, p) => {
           const r = repo || SWARM_REPO;
           return r ? removeWorktree(r, p) : Promise.resolve();

package/dist/overmind.js

@@ -1593,7 +1593,7 @@ function buildZoneModel(entries, opts = {}) {
     if (!m) labelVotes.set(z2, m = /* @__PURE__ */ new Map());
     bump(m, manual);
   }
-  const rename2 = /* @__PURE__ */ new Map();
+  const rename3 = /* @__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);
@@ -1602,11 +1602,11 @@ function buildZoneModel(entries, opts = {}) {
   for (const [zone, votes] of clustersByEvidence) {
     const top = topKey(votes);
     if (!top || top.share < 0.6 || takenNames.has(top.key) || top.key === zone) continue;
-    rename2.set(zone, top.key);
+    rename3.set(zone, top.key);
     takenNames.add(top.key);
   }
-  const renamed = (z2) => rename2.get(z2) ?? z2;
-  if (rename2.size) {
+  const renamed = (z2) => rename3.get(z2) ?? z2;
+  if (rename3.size) {
     for (const [f, z2] of fileZone) fileZone.set(f, renamed(z2));
     for (const [s, z2] of taskZone) taskZone.set(s, renamed(z2));
   }
@@ -3895,7 +3895,7 @@ var init_procList = __esm({
 
 // src/procCleanup.ts
 function sleep(ms) {
-  return new Promise((resolve4) => setTimeout(resolve4, ms));
+  return new Promise((resolve5) => setTimeout(resolve5, ms));
 }
 function parseLsofCwd(output) {
   const rows = [];
@@ -4113,9 +4113,9 @@ var init_procCleanup = __esm({
 });
 
 // src/git.ts
-import { existsSync as existsSync12, readdirSync as readdirSync12, statSync as statSync10 } from "fs";
-import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
-import { isAbsolute as isAbsolute2, join as join20, sep as sep2 } from "path";
+import { existsSync as existsSync12, readdirSync as readdirSync12, realpathSync as realpathSync2, statSync as statSync10 } from "fs";
+import { appendFile, chmod, mkdir, readFile, rename, rm, writeFile } from "fs/promises";
+import { isAbsolute as isAbsolute2, join as join20, resolve as resolve3, sep as sep2 } from "path";
 import { $ as $2 } from "execa";
 function gitNet(repo, args, timeoutMs) {
   return withHardTimeout(
@@ -4136,6 +4136,72 @@ function isUnrecoverableRefError(e) {
 async function reclaimStaleWorktree(repo, worktree) {
   await detachWorktree(repo, worktree);
 }
+async function inspectWorktreePath(path) {
+  if (!existsSync12(path)) return "free";
+  try {
+    if (readdirSync12(path).length === 0) return "free";
+  } catch {
+    return "orphan";
+  }
+  try {
+    if (statSync10(join20(path, ".git")).isDirectory()) return "main-checkout";
+  } catch {
+  }
+  const top = await $2({ reject: false })`git -C ${path} rev-parse --show-toplevel`;
+  return top.exitCode === 0 && samePath(top.stdout.trim(), path) ? "worktree" : "orphan";
+}
+function samePath(a, b) {
+  const norm = (p) => {
+    try {
+      return realpathSync2(p);
+    } catch {
+      return resolve3(p);
+    }
+  };
+  const [x, y] = [norm(a), norm(b)];
+  return process.platform === "win32" ? posix(x).toLowerCase() === posix(y).toLowerCase() : x === y;
+}
+async function clearWorktreePath(repo, path, branch, opts = {}) {
+  const holder = await inspectWorktreePath(path);
+  if (holder === "free") return;
+  if (holder === "main-checkout") {
+    throw new WorktreeBusyError(
+      branch,
+      path,
+      `\u043F\u043E \u043F\u0443\u0442\u0438 worktree ${path} \u043B\u0435\u0436\u0438\u0442 \u041E\u0421\u041D\u041E\u0412\u041D\u041E\u0419 \u0447\u0435\u043A\u0430\u0443\u0442 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F (\`.git\` \u2014 \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u0430 \u043D\u0435 \u0444\u0430\u0439\u043B) \u2014 \u044F \u0435\u0433\u043E \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u044E. \u041F\u043E\u0445\u043E\u0436\u0435, \u043A\u0430\u0442\u0430\u043B\u043E\u0433 worktree'\u0435\u0432 \u0440\u043E\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D \u043D\u0430 \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u043A\u043E\u043F\u0438\u044E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430; \u043F\u043E\u043F\u0440\u0430\u0432\u044C\u0442\u0435 \u043F\u0443\u0442\u044C, \u0441\u043F\u0430\u0432\u043D \u0442\u0443\u0434\u0430 \u0437\u0430\u0441\u0435\u043B\u044F\u0442\u044C\u0441\u044F \u043D\u0435 \u0431\u0443\u0434\u0435\u0442.`
+    );
+  }
+  if (holder === "worktree") {
+    if (opts.isWorktreeHeldLive ? await opts.isWorktreeHeldLive(path) : true) throw new WorktreeBusyError(branch, path);
+    if (await worktreeDirty(path)) {
+      throw new WorktreeBusyError(
+        branch,
+        path,
+        `worktree ${path} \u043E\u0441\u0438\u0440\u043E\u0442\u0435\u043B, \u043D\u043E \u0432\u043D\u0443\u0442\u0440\u0438 \u0435\u0441\u0442\u044C \u043D\u0435\u0441\u0434\u0430\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 (\u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u043E\u0435 \u0438\u043B\u0438 \u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435) \u2014 \u043D\u0435 \u0441\u043D\u043E\u0448\u0443. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u0441\u0430\u043C\u0438 (\`git -C ${path} status --untracked-files=all\`) \u0438 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u043A\u043E\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u043D\u0435 \u0436\u0430\u043B\u043A\u043E.`
+      );
+    }
+    await detachWorktree(repo, path);
+    opts.onStaleReclaim?.(path);
+  }
+  if (!existsSync12(path)) return;
+  await parkOrphanDir(repo, path, branch);
+}
+async function parkOrphanDir(repo, path, branch) {
+  const parked = `${path}.orphan-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
+  try {
+    await rename(path, parked);
+  } catch (e) {
+    throw new WorktreeBusyError(
+      branch,
+      path,
+      `\u043F\u0443\u0442\u044C ${path} \u0437\u0430\u043D\u044F\u0442 \u043F\u043E\u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0438\u043C \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u043E\u043C, \u0438 \u043E\u0442\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044C \u0435\u0433\u043E \u043D\u0435 \u0432\u044B\u0448\u043B\u043E (${String(e)}) \u2014 \u0441\u043F\u0430\u0432\u043D ${branch} \u0442\u0443\u0434\u0430 \u043D\u0435 \u0432\u0441\u0442\u0430\u043D\u0435\u0442. \u0423\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0440\u0443\u043A\u0430\u043C\u0438 \u0438 \u0441\u0434\u0435\u043B\u0430\u0439\u0442\u0435 \`git -C ${repo} worktree prune\`.`
+    );
+  }
+  console.error(
+    `[git] \u043F\u043E \u043F\u0443\u0442\u0438 worktree ${path} \u043B\u0435\u0436\u0430\u043B \u043A\u0430\u0442\u0430\u043B\u043E\u0433, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 git \u0441\u0432\u043E\u0438\u043C \u0440\u0430\u0431\u043E\u0447\u0438\u043C \u0434\u0435\u0440\u0435\u0432\u043E\u043C \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u0442 \u2014 \u043E\u0442\u043E\u0434\u0432\u0438\u043D\u0443\u043B \u0432 ${parked}, \u0447\u0442\u043E\u0431\u044B \u0441\u043F\u0430\u0432\u043D ${branch} \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435, \u0447\u0442\u043E \u0432\u043D\u0443\u0442\u0440\u0438, \u0438 \u0443\u0434\u0430\u043B\u0438\u0442\u0435, \u0435\u0441\u043B\u0438 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E.`
+  );
+  await $2({ reject: false })`git -C ${repo} worktree prune`;
+}
 function isLinkedWorktree(dir) {
   try {
     return statSync10(join20(dir, ".git")).isFile();
@@ -4208,6 +4274,7 @@ async function checkoutWorktree(repo, path, branch, opts) {
   const originSha = await revParse(repo, `refs/remotes/origin/${branch}`);
   if (!localSha && !originSha) {
     const freshBase = opts.base ?? await freshWorktreeBase(repo);
+    await clearWorktreePath(repo, path, branch, opts);
     await $2`git -C ${repo} worktree add -b ${branch} ${path} ${freshBase}`;
     return { reused: false };
   }
@@ -4220,6 +4287,7 @@ async function checkoutWorktree(repo, path, branch, opts) {
     await reclaimStaleWorktree(repo, busyAt);
     opts.onStaleReclaim?.(busyAt);
   }
+  await clearWorktreePath(repo, path, branch, opts);
   if (originSha) {
     await $2`git -C ${repo} worktree add -B ${branch} ${path} ${`origin/${branch}`}`;
     return { reused: true, from: "origin", sha: originSha };
@@ -4371,10 +4439,11 @@ async function journalForBranch(repo, branch, slug) {
   const out = await $2({ reject: false })`git -C ${repo} show ${`origin/${branch}:journal/${slug}.md`}`;
   return out.exitCode === 0 && out.stdout ? out.stdout : null;
 }
-async function prepareDetachedWorktree(repo, branch, worktree) {
+async function prepareDetachedWorktree(repo, branch, worktree, opts = {}) {
   await gitNetStrict(repo, ["fetch", "--quiet", "origin"], GIT_HEAVY_NET_TIMEOUT_MS);
   const ref = `origin/${branch}`;
   if (!await revParse(repo, `${ref}^{commit}`)) throw new MissingRefError(ref, repo);
+  await clearWorktreePath(repo, worktree, branch, opts);
   await $2`git -C ${repo} worktree add --detach --force ${worktree} ${ref}`;
   await ensureWorktreeHygiene(worktree);
 }
@@ -4417,8 +4486,14 @@ var init_git = __esm({
     init_netTimeout();
     init_swarmFiles();
     WorktreeBusyError = class extends Error {
-      constructor(branch, worktreePath) {
-        super(`worktree \u0437\u0430\u043D\u044F\u0442: ${worktreePath} (\u0432\u0435\u0442\u043A\u0430 ${branch}) \u2014 \u043F\u0440\u0438\u0431\u0435\u0440\u0438 worktree \u0438\u043B\u0438 \u043E\u0442\u043C\u0435\u043D\u0438 \u043F\u0440\u043E\u0433\u043E\u043D (swarm cancel ${branch})`);
+      /**
+       * `why` (TASWM-553) — ПОЧЕМУ путь не отдали, если причина не «его держит живой прогон»:
+       * основной чекаут по пути worktree, каталог с несданной работой, каталог, который не
+       * получилось убрать. Дефолтная формулировка («прибери worktree или отмени прогон»)
+       * человеку в таких случаях не помогает — она отправляет его не туда.
+       */
+      constructor(branch, worktreePath, why) {
+        super(why ?? `worktree \u0437\u0430\u043D\u044F\u0442: ${worktreePath} (\u0432\u0435\u0442\u043A\u0430 ${branch}) \u2014 \u043F\u0440\u0438\u0431\u0435\u0440\u0438 worktree \u0438\u043B\u0438 \u043E\u0442\u043C\u0435\u043D\u0438 \u043F\u0440\u043E\u0433\u043E\u043D (swarm cancel ${branch})`);
         this.branch = branch;
         this.worktreePath = worktreePath;
         this.name = "WorktreeBusyError";
@@ -4705,8 +4780,8 @@ function startDroneChannel(deps, port) {
   return { port, server };
 }
 function closeDroneChannel(server) {
-  return new Promise((resolve4) => {
-    server.close(() => resolve4());
+  return new Promise((resolve5) => {
+    server.close(() => resolve5());
     server.closeAllConnections?.();
   });
 }
@@ -6061,7 +6136,7 @@ __export(db_exports, {
 import { createRequire as createRequire2 } from "module";
 import { randomUUID as randomUUID3 } from "crypto";
 import { existsSync as existsSync15 } from "fs";
-import { resolve as resolve3 } from "path";
+import { resolve as resolve4 } from "path";
 function rowToQuestion(row) {
   return {
     id: row.id,
@@ -6690,7 +6765,7 @@ CREATE TABLE IF NOT EXISTS imports (
        * транзакции: прервётся — маркер не встанет, повтор безопасен.
        */
       importDb(sourcePath, repo) {
-        const abs = resolve3(sourcePath);
+        const abs = resolve4(sourcePath);
         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 };
@@ -11327,7 +11402,7 @@ init_config();
 // src/envCache.ts
 init_config();
 import { createHash as createHash2 } from "crypto";
-import { cp, link, lstat, mkdir as mkdir2, readdir, readlink, rename, rm as rm2, stat, symlink, utimes, writeFile as writeFile2 } from "fs/promises";
+import { cp, link, lstat, mkdir as mkdir2, readdir, readlink, rename as rename2, rm as rm2, stat, symlink, utimes, writeFile as writeFile2 } from "fs/promises";
 import { existsSync as existsSync13, readFileSync as readFileSync17 } from "fs";
 import { join as join22 } from "path";
 function fingerprint(parts) {
@@ -11418,7 +11493,7 @@ async function saveEnvSnapshot(worktree, key, dirs, io = {}) {
     for (let i = 0; i < present.length; i++) await clone(join22(worktree, present[i] ?? ""), join22(tmp, "trees", String(i)));
     const manifest = { key, dirs: present, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     await writeFile2(join22(tmp, "manifest.json"), JSON.stringify(manifest, null, 2));
-    await rename(tmp, snapshotDir(io, key));
+    await rename2(tmp, snapshotDir(io, key));
     return true;
   } catch {
     await rm2(tmp, { recursive: true, force: true }).catch(() => {
@@ -12219,7 +12294,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.39",
+  version: "0.6.40",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12270,7 +12345,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "0c0b1bc0ee05add0d2b5b5d503a05ed7b7834dd8"
+  gitHead: "b58ef18678e8c0e03e0602a40bf76d6f0a6975c8"
 };
 
 // src/version.ts
@@ -15307,11 +15382,11 @@ async function hasCommand(name, env) {
   return hasCommandInPath(name, env);
 }
 async function portOpen(host, port) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const socket = createConnection({ host, port });
     const finish = (ok) => {
       socket.destroy();
-      resolve4(ok);
+      resolve5(ok);
     };
     socket.setTimeout(PORT_TIMEOUT_MS);
     socket.once("connect", () => finish(true));
@@ -16860,14 +16935,14 @@ function makeHandler(deps) {
       const ref = url.searchParams.get("pr") ?? "";
       if (!ref.trim()) return Response.json({ error: "\u043D\u0443\u0436\u0435\u043D \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 pr=<url|\u043D\u043E\u043C\u0435\u0440>" }, { status: 400 });
       const ctxRepo = url.searchParams.get("repo");
-      const resolve4 = deps.mergeGate ?? makeMergeGateResolver({
+      const resolve5 = deps.mergeGate ?? makeMergeGateResolver({
         listRuns: () => deps.db.listRuns(),
         fallbackAutoReview: SWARM_AUTO_REVIEW,
         autoVerify: SWARM_AUTO_VERIFY,
         // TASWM-344
         ...defaultRepo ? { repoFallback: defaultRepo } : {}
       });
-      return Response.json(await resolve4(ref, ctxRepo));
+      return Response.json(await resolve5(ref, ctxRepo));
     }
     if (p === "/resources") return Response.json(hostResourceSnapshot());
     if (p === "/timeline") return Response.json(timelineState(deps.db, Date.now(), readNarratorLog(deps.narratorLog)));
@@ -17020,8 +17095,8 @@ function startWeb(deps, port = WEB_PORT) {
   return { port, server };
 }
 function closeWebServer(server) {
-  return new Promise((resolve4) => {
-    server.close(() => resolve4());
+  return new Promise((resolve5) => {
+    server.close(() => resolve5());
     server.closeAllConnections?.();
   });
 }
@@ -17355,7 +17430,7 @@ function executorHealthy(opts = {}) {
   const executor = opts.executor ?? resolveExecutor();
   const bin = opts.bin ?? executor.resolveBin();
   const timeoutMs = opts.timeoutMs ?? 2e4;
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let done = false;
     let out = "";
     const finish = (r) => {
@@ -17366,7 +17441,7 @@ function executorHealthy(opts = {}) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve4(r);
+      resolve5(r);
     };
     const child = spawn3(bin, [...executor.probe.args], { stdio: ["ignore", "pipe", "pipe"] });
     child.stdout?.on("data", (d) => {
@@ -21160,6 +21235,27 @@ async function replayDecision(deps, qid, chosen, by = "human") {
   deps.db.supersede(old.id, fresh.id, by);
   return fresh;
 }
+var STOP_POLL_MS = 200;
+var STOP_TERM_GRACE_MS = 1e4;
+var STOP_KILL_GRACE_MS = 3e3;
+async function awaitDroneDeath(deps, pid) {
+  const isAlive = deps.isAlive;
+  if (!isAlive) return false;
+  const wait = deps.wait ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const poll = async (budgetMs) => {
+    for (let spent = 0; spent < budgetMs; spent += STOP_POLL_MS) {
+      if (!isAlive(pid)) return true;
+      await wait(STOP_POLL_MS);
+    }
+    return !isAlive(pid);
+  };
+  if (await poll(STOP_TERM_GRACE_MS)) return true;
+  try {
+    (deps.hardKill ?? deps.kill)(pid);
+  } catch {
+  }
+  return await poll(STOP_KILL_GRACE_MS);
+}
 async function cancelRun(deps, slug, reason) {
   const run = deps.db.activeRunForSlug(slug);
   if (!run) return null;
@@ -21168,11 +21264,21 @@ async function cancelRun(deps, slug, reason) {
       deps.kill(run.pid);
     } catch {
     }
+    if (deps.isAlive && !await awaitDroneDeath(deps, run.pid)) {
+      deps.db.addEvent(
+        run.id,
+        "anomaly",
+        `\u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u0434\u0440\u043E\u043D\u0430 (pid ${run.pid}) \u043F\u0435\u0440\u0435\u0436\u0438\u043B \u0438 SIGTERM, \u0438 SIGKILL \u2014 worktree ${run.worktree_path ?? ""} \u0441\u043D\u043E\u0448\u0443 \u043F\u043E\u0432\u0435\u0440\u0445 \u0436\u0438\u0432\u043E\u0433\u043E. \u0415\u0441\u043B\u0438 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u0441\u043F\u0430\u0432\u043D \u044D\u0442\u043E\u0433\u043E \u0441\u043B\u0430\u0433\u0430 \u0443\u043F\u0440\u0451\u0442\u0441\u044F \u0432 \u0437\u0430\u043D\u044F\u0442\u044B\u0439 \u043F\u0443\u0442\u044C, \u043D\u0430\u0447\u043D\u0438\u0442\u0435 \u043E\u0442\u0441\u044E\u0434\u0430.`
+      );
+    }
   }
   if (run.worktree_path) await deps.removeWorktree(run.repo, run.worktree_path).catch(() => {
   });
   return deps.db.cancel(run.id, reason);
 }
+function detachedHelperWorktree(db) {
+  return (repo, branch, wt) => prepareDetachedWorktree(repo, branch, wt, { isWorktreeHeldLive: (p) => worktreePathHeldLive(db, p) });
+}
 async function resolveConflict(deps, reviewRun) {
   const repo = normalizeRepo(reviewRun.repo || deps.repoFallback);
   const branch = await worktreeBranchFor(reviewRun, deps.prHeadBranch);
@@ -21987,7 +22093,7 @@ async function runDaemon(opts) {
         repoFallback: opts.repo,
         worktreesDir,
         launch,
-        git: { prepareDetachedWorktree, setWorktreeIdentity, removeWorktree },
+        git: { prepareDetachedWorktree: detachedHelperWorktree(db), setWorktreeIdentity, removeWorktree },
         // TASWM-356: ветка ревьюера — фактическая ветка PR. Штатно она уже в поле прогона
         // (реконсайл синхронит её из headBranch), этот ридер — для прогонов без неё.
         prHeadBranch,
@@ -22022,7 +22128,7 @@ async function runDaemon(opts) {
         repoFallback: opts.repo,
         worktreesDir,
         launch,
-        git: { prepareDetachedWorktree, setWorktreeIdentity, removeWorktree },
+        git: { prepareDetachedWorktree: detachedHelperWorktree(db), setWorktreeIdentity, removeWorktree },
         prHeadBranch,
         ...verifyModeReader ? { verifyMode: verifyModeReader } : {},
         ...checkerAttachments ? { taskAttachments: checkerAttachments } : {}
@@ -22366,7 +22472,7 @@ async function runDaemon(opts) {
         repoFallback: opts.repo,
         worktreesDir,
         launch,
-        git: { prepareDetachedWorktree, setWorktreeIdentity, remoteMainRef, remoteBaseRef, mergeRef, pushHeadTo, removeWorktree },
+        git: { prepareDetachedWorktree: detachedHelperWorktree(db), setWorktreeIdentity, remoteMainRef, remoteBaseRef, mergeRef, pushHeadTo, removeWorktree },
         prHeadBranch
         // TASWM-356: ветка PR для прогонов без записанного поля branch
       },
@@ -22564,6 +22670,10 @@ async function runDaemon(opts) {
           {
             db,
             kill: (pid) => killProcessGroup(pid, "SIGTERM"),
+            // TASWM-553: остановка обязана ОСВОБОДИТЬ машину — значит, дождаться смерти
+            // процесса и только потом сносить worktree (иначе платит следующий спавн).
+            isAlive: pidAlive,
+            hardKill: (pid) => killProcessGroup(pid, "SIGKILL"),
             removeWorktree: (repo, p) => removeWorktree(repo || opts.repo, p)
           },
           slug,
@@ -22749,6 +22859,9 @@ async function runDaemon(opts) {
       {
         db,
         kill: (pid) => killProcessGroup(pid, "SIGTERM"),
+        isAlive: pidAlive,
+        // TASWM-553: снос worktree — после смерти процесса, не следом за SIGTERM
+        hardKill: (pid) => killProcessGroup(pid, "SIGKILL"),
         removeWorktree: (repo, p) => removeWorktree(repo || opts.repo, p)
       },
       slug,

package/package.json

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