@taskless-app/swarm 0.6.22 → 0.6.23

package/dist/cli.js

@@ -1131,8 +1131,8 @@ var init_runGuards = __esm({
 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();
+function testFileFeature(basename7) {
+  const head = basename7.replace(/\.(test|spec)\.[a-z]+$/i, "").split(".")[0].toLowerCase();
   return head && !GENERIC_DIRS.has(head) ? head : null;
 }
 function pathZoneCandidate(path) {
@@ -2393,7 +2393,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.22",
+      version: "0.6.23",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -2443,7 +2443,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "b8eaac4a5562ffcf45a02af338267620e0a7843f"
+      gitHead: "af6c4af0f523891b5db805d9b4583021688ed1f5"
     };
   }
 });
@@ -5250,7 +5250,7 @@ var init_updateCli = __esm({
 
 // src/cli.ts
 init_cliIo();
-import { basename as basename4, dirname as dirname4, join as join24 } from "path";
+import { basename as basename6, dirname as dirname4, join as join24 } from "path";
 import { existsSync as existsSync16, readFileSync as readFileSync17, writeFileSync as writeFileSync13, mkdirSync as mkdirSync9, readdirSync as readdirSync10, statSync as statSync10, openSync as openSync4, readSync as readSync2, closeSync as closeSync4 } from "fs";
 import { setTimeout as sleep2 } from "timers/promises";
 
@@ -8322,7 +8322,7 @@ function hostLines(hosts, opts = {}) {
 // src/web.ts
 init_src();
 import { randomBytes as randomBytes3 } from "crypto";
-import { basename as basename2 } from "path";
+import { basename as basename4 } from "path";
 import { serve as serve2 } from "@hono/node-server";
 
 // src/diff.ts
@@ -8518,7 +8518,123 @@ init_storm();
 // src/gh.ts
 init_src();
 import { $ as $4 } from "execa";
-var realRepoRunner = async (args, cwd) => (await $4({ cwd })`gh ${args}`).stdout;
+import { basename as basename3 } from "path";
+
+// src/logNoise.ts
+var DEFAULT_REMIND_MS = 10 * 6e4;
+function timesWord(n) {
+  const tens = n % 100;
+  if (tens >= 11 && tens <= 14) return "\u0440\u0430\u0437";
+  return n % 10 >= 2 && n % 10 <= 4 ? "\u0440\u0430\u0437\u0430" : "\u0440\u0430\u0437";
+}
+function makeRepeatFilter(opts = {}) {
+  const remindAfterMs = opts.remindAfterMs ?? DEFAULT_REMIND_MS;
+  const streaks = /* @__PURE__ */ new Map();
+  return {
+    say(key, message, now) {
+      const prev = streaks.get(key);
+      if (!prev || prev.message !== message) {
+        const tail = prev && prev.hidden > 0 ? ` (\u0434\u043E \u044D\u0442\u043E\u0433\u043E \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 \u043C\u043E\u043B\u0447\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0438\u043B\u043E\u0441\u044C \u0435\u0449\u0451 ${prev.hidden} ${timesWord(prev.hidden)})` : "";
+        streaks.set(key, { message, since: now, saidAt: now, hidden: 0 });
+        return `${message}${tail}`;
+      }
+      prev.hidden += 1;
+      if (now - prev.saidAt < remindAfterMs) return null;
+      const hidden = prev.hidden;
+      const minutes = Math.max(1, Math.round((now - prev.since) / 6e4));
+      prev.saidAt = now;
+      prev.hidden = 0;
+      return `${message} \u2014 \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 ${hidden} ${timesWord(hidden)} \u043F\u043E\u0434\u0440\u044F\u0434, \u0442\u044F\u043D\u0435\u0442\u0441\u044F ${minutes} \u043C\u0438\u043D`;
+    },
+    forget(key) {
+      streaks.delete(key);
+    }
+  };
+}
+
+// src/netTimeout.ts
+import { basename as basename2 } from "path";
+var GH_CALL_TIMEOUT_MS = 15e3;
+var GIT_LOCAL_TIMEOUT_MS = 5e3;
+var HARD_CAP_GRACE_MS = 2e3;
+var CallTimedOutError = class extends Error {
+  timedOut = true;
+  constructor(call, timeoutMs) {
+    super(`\u0432\u044B\u0437\u043E\u0432 \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs}\u043C\u0441 \u0438 \u043F\u0440\u0435\u0440\u0432\u0430\u043D: ${call}`);
+    this.name = "CallTimedOutError";
+  }
+};
+function isTimedOut(outcome) {
+  return typeof outcome === "object" && outcome !== null && outcome.timedOut === true;
+}
+function noteTimedOut(scope, call, timeoutMs, outcome, warn = console.warn) {
+  const line = `[${scope}] \u23F1 \u0432\u044B\u0437\u043E\u0432 \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${humanMs(timeoutMs)} \u0438 \u043F\u0440\u0435\u0440\u0432\u0430\u043D: ${call} \u2014 \u0440\u0435\u043A\u043E\u043D\u0441\u0430\u0439\u043B \u0438\u0434\u0451\u0442 \u0434\u0430\u043B\u044C\u0448\u0435`;
+  if (!isTimedOut(outcome)) {
+    timeoutNoise.forget(noiseKey(scope, call));
+    return false;
+  }
+  const say = timeoutNoise.say(noiseKey(scope, call), line, Date.now());
+  if (say) warn(say);
+  return true;
+}
+function noiseKey(scope, call) {
+  return `timeout:${scope}:${call}`;
+}
+var timeoutNoise = makeRepeatFilter();
+function humanMs(ms) {
+  return ms >= 1e3 ? `${Math.round(ms / 1e3)}\u0441` : `${ms}\u043C\u0441`;
+}
+function destroyPipes(child) {
+  for (const pipe of [child.stdout, child.stderr, child.stdin]) {
+    try {
+      pipe?.destroy?.();
+    } catch {
+    }
+  }
+}
+async function withHardTimeout(child, scope, call, timeoutMs, warn = console.warn) {
+  let timer;
+  const capped = new Promise((_, reject) => {
+    timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      destroyPipes(child);
+      reject(new CallTimedOutError(call, timeoutMs));
+    }, timeoutMs + HARD_CAP_GRACE_MS);
+    timer.unref?.();
+  });
+  try {
+    const res = await Promise.race([child, capped]);
+    noteTimedOut(scope, call, timeoutMs, res, warn);
+    return res;
+  } catch (e) {
+    noteTimedOut(scope, call, timeoutMs, e, warn);
+    throw e;
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+function callLabel(cmd2, args, head = 4) {
+  const shown = args.slice(0, head).join(" ");
+  return `${cmd2} ${shown}${args.length > head ? " \u2026" : ""}`.trim();
+}
+function gitCallLabel(repo, args) {
+  return `git -C ${basename2(repo) || repo} ${args.join(" ")}`;
+}
+
+// src/gh.ts
+async function runGh(args, timeoutMs, cwd) {
+  const label2 = callLabel("gh", args) + (cwd ? ` (repo ${basename3(cwd)})` : "");
+  const child = cwd ? $4({ cwd, timeout: timeoutMs })`gh ${args}` : $4({ timeout: timeoutMs })`gh ${args}`;
+  return (await withHardTimeout(child, "gh", label2, timeoutMs)).stdout;
+}
+function ghRunner(timeoutMs = GH_CALL_TIMEOUT_MS) {
+  return (args) => runGh(args, timeoutMs);
+}
+function ghRepoRunner(timeoutMs = GH_CALL_TIMEOUT_MS) {
+  return (args, cwd) => runGh(args, timeoutMs, cwd);
+}
+var realRunner = ghRunner();
+var realRepoRunner = ghRepoRunner();
 async function openPrsForBranch(branch, repoDir, run = realRepoRunner) {
   if (!branch || !repoDir) return [];
   try {
@@ -8543,7 +8659,12 @@ function firstLine(s) {
   return s.split("\n").map((l) => l.trim()).find((l) => l.length > 0) ?? "gh \u0432\u0435\u0440\u043D\u0443\u043B 403";
 }
 var realChecksRunner = async (pr) => {
-  const r = await $4({ reject: false, timeout: 15e3 })`gh pr checks ${pr} --json state,name,bucket,link`;
+  const r = await withHardTimeout(
+    $4({ reject: false, timeout: 15e3 })`gh pr checks ${pr} --json state,name,bucket,link`,
+    "gh",
+    callLabel("gh", ["pr", "checks", pr]),
+    15e3
+  );
   const stdout = r.stdout ?? "";
   const stderr = r.stderr ?? "";
   if (!stdout.trim() && NO_CHECKS_STDERR.test(stderr)) return "[]";
@@ -9105,7 +9226,7 @@ function timelineState(db2, now = Date.now(), overmindLog = []) {
       id: r.id,
       name: r.name,
       slug: r.task_slug,
-      repo: basename2(r.repo || "") || "?",
+      repo: basename4(r.repo || "") || "?",
       status: r.status,
       area: r.area,
       start: sqliteIso(r.created_at),
@@ -10882,6 +11003,14 @@ import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
 import { isAbsolute, join as join13, sep as sep2 } from "path";
 import { $ as $5 } from "execa";
 init_swarmFiles();
+function gitNet(repo, args, timeoutMs) {
+  return withHardTimeout(
+    $5({ reject: false, timeout: timeoutMs })`git -C ${repo} ${args}`,
+    "git",
+    gitCallLabel(repo, args),
+    timeoutMs
+  ).catch(() => null);
+}
 var 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})`);
@@ -11086,8 +11215,9 @@ async function remoteMainRef(repo) {
   throw new Error(`\u043D\u0435 \u043D\u0430\u0448\u0451\u043B \u0434\u0435\u0444\u043E\u043B\u0442-\u0432\u0435\u0442\u043A\u0443 origin \u0432 ${repo} (\u043D\u0435\u0442 origin/HEAD, origin/main, origin/master)`);
 }
 var GITHUB_REMOTE_RE = /github\.com[:/]([^/]+\/[^/]+?)(?:\.git)?\/?$/i;
-async function remoteRepoFullName(repo) {
-  const url = (await $5({ reject: false })`git -C ${repo} remote get-url origin`).stdout.trim();
+async function remoteRepoFullName(repo, timeoutMs = GIT_LOCAL_TIMEOUT_MS) {
+  const res = await gitNet(repo, ["remote", "get-url", "origin"], timeoutMs);
+  const url = res?.stdout.trim() ?? "";
   const m = url.match(GITHUB_REMOTE_RE);
   return m ? m[1] : null;
 }
@@ -11114,7 +11244,7 @@ var KNOWN_EXT = /* @__PURE__ */ new Set([...IMAGE_EXT, ...DOC_EXT, ...TEXT_EXT])
 
 // src/shotUpload.ts
 import { readFile as fsReadFile } from "fs/promises";
-import { basename as basename3, isAbsolute as isAbsolute2, join as join15 } from "path";
+import { basename as basename5, isAbsolute as isAbsolute2, join as join15 } from "path";
 var SHOT_MAX_FILE_BYTES = 10 * 1024 * 1024;
 
 // src/taskless.ts
@@ -12214,7 +12344,7 @@ var thisHost = loadHostIdentity({ home: SWARM_HOME, envHostId: process.env.SWARM
 function fmtRun(r, opts = {}) {
   const mark = STATUS_MARK[r.status] ?? "?";
   const area = r.area ? ` [${r.area}]` : "";
-  const repo = r.repo ? ` (${basename4(r.repo)})` : "";
+  const repo = r.repo ? ` (${basename6(r.repo)})` : "";
   const q = r.status === "blocked" ? "  \u2190 \u0436\u0434\u0451\u0442 \u043E\u0442\u0432\u0435\u0442\u0430" : "";
   const why = r.status === "stopped" && r.stop_reason ? `  \u2014 ${r.stop_reason}` : "";
   const priority = r.priority ? `  \u2691${r.priority > 0 ? "+" : ""}${r.priority}` : "";
@@ -12972,7 +13102,7 @@ switch (cmd) {
       process.exit(1);
     }
     const run = db.getRun(runId);
-    if (run) console.log(`#${run.id} ${run.name}  ${run.task_slug}${run.repo ? ` (${basename4(run.repo)})` : ""}`);
+    if (run) console.log(`#${run.id} ${run.name}  ${run.task_slug}${run.repo ? ` (${basename6(run.repo)})` : ""}`);
     const events = db.events(runId);
     if (events.length === 0) console.log("\u0441\u043E\u0431\u044B\u0442\u0438\u0439 \u043D\u0435\u0442");
     else events.forEach((e) => console.log(`${e.at}  ${e.kind}${e.text ? "  " + e.text : ""}`));

package/dist/overmind.js

@@ -1212,8 +1212,8 @@ var init_runGuards = __esm({
 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();
+function testFileFeature(basename7) {
+  const head = basename7.replace(/\.(test|spec)\.[a-z]+$/i, "").split(".")[0].toLowerCase();
   return head && !GENERIC_DIRS.has(head) ? head : null;
 }
 function pathZoneCandidate(path) {
@@ -2907,6 +2907,44 @@ var init_heartbeat = __esm({
   }
 });
 
+// src/logNoise.ts
+function timesWord(n) {
+  const tens = n % 100;
+  if (tens >= 11 && tens <= 14) return "\u0440\u0430\u0437";
+  return n % 10 >= 2 && n % 10 <= 4 ? "\u0440\u0430\u0437\u0430" : "\u0440\u0430\u0437";
+}
+function makeRepeatFilter(opts = {}) {
+  const remindAfterMs = opts.remindAfterMs ?? DEFAULT_REMIND_MS;
+  const streaks = /* @__PURE__ */ new Map();
+  return {
+    say(key, message, now) {
+      const prev = streaks.get(key);
+      if (!prev || prev.message !== message) {
+        const tail2 = prev && prev.hidden > 0 ? ` (\u0434\u043E \u044D\u0442\u043E\u0433\u043E \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 \u043C\u043E\u043B\u0447\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0438\u043B\u043E\u0441\u044C \u0435\u0449\u0451 ${prev.hidden} ${timesWord(prev.hidden)})` : "";
+        streaks.set(key, { message, since: now, saidAt: now, hidden: 0 });
+        return `${message}${tail2}`;
+      }
+      prev.hidden += 1;
+      if (now - prev.saidAt < remindAfterMs) return null;
+      const hidden = prev.hidden;
+      const minutes = Math.max(1, Math.round((now - prev.since) / 6e4));
+      prev.saidAt = now;
+      prev.hidden = 0;
+      return `${message} \u2014 \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 ${hidden} ${timesWord(hidden)} \u043F\u043E\u0434\u0440\u044F\u0434, \u0442\u044F\u043D\u0435\u0442\u0441\u044F ${minutes} \u043C\u0438\u043D`;
+    },
+    forget(key) {
+      streaks.delete(key);
+    }
+  };
+}
+var DEFAULT_REMIND_MS;
+var init_logNoise = __esm({
+  "src/logNoise.ts"() {
+    "use strict";
+    DEFAULT_REMIND_MS = 10 * 6e4;
+  }
+});
+
 // src/agentToken.ts
 import { readFileSync as readFileSync6, writeFileSync as writeFileSync6, unlinkSync as unlinkSync3 } from "fs";
 import { join as join8 } from "path";
@@ -3324,11 +3362,100 @@ var init_procCleanup = __esm({
   }
 });
 
+// src/netTimeout.ts
+import { basename as basename2 } from "path";
+function isTimedOut(outcome) {
+  return typeof outcome === "object" && outcome !== null && outcome.timedOut === true;
+}
+function noteTimedOut(scope, call, timeoutMs, outcome, warn = console.warn) {
+  const line = `[${scope}] \u23F1 \u0432\u044B\u0437\u043E\u0432 \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${humanMs(timeoutMs)} \u0438 \u043F\u0440\u0435\u0440\u0432\u0430\u043D: ${call} \u2014 \u0440\u0435\u043A\u043E\u043D\u0441\u0430\u0439\u043B \u0438\u0434\u0451\u0442 \u0434\u0430\u043B\u044C\u0448\u0435`;
+  if (!isTimedOut(outcome)) {
+    timeoutNoise.forget(noiseKey(scope, call));
+    return false;
+  }
+  const say = timeoutNoise.say(noiseKey(scope, call), line, Date.now());
+  if (say) warn(say);
+  return true;
+}
+function noiseKey(scope, call) {
+  return `timeout:${scope}:${call}`;
+}
+function humanMs(ms) {
+  return ms >= 1e3 ? `${Math.round(ms / 1e3)}\u0441` : `${ms}\u043C\u0441`;
+}
+function destroyPipes(child) {
+  for (const pipe of [child.stdout, child.stderr, child.stdin]) {
+    try {
+      pipe?.destroy?.();
+    } catch {
+    }
+  }
+}
+async function withHardTimeout(child, scope, call, timeoutMs, warn = console.warn) {
+  let timer;
+  const capped = new Promise((_, reject) => {
+    timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      destroyPipes(child);
+      reject(new CallTimedOutError(call, timeoutMs));
+    }, timeoutMs + HARD_CAP_GRACE_MS);
+    timer.unref?.();
+  });
+  try {
+    const res = await Promise.race([child, capped]);
+    noteTimedOut(scope, call, timeoutMs, res, warn);
+    return res;
+  } catch (e) {
+    noteTimedOut(scope, call, timeoutMs, e, warn);
+    throw e;
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+function callLabel(cmd, args, head = 4) {
+  const shown = args.slice(0, head).join(" ");
+  return `${cmd} ${shown}${args.length > head ? " \u2026" : ""}`.trim();
+}
+function gitCallLabel(repo, args) {
+  return `git -C ${basename2(repo) || repo} ${args.join(" ")}`;
+}
+var GH_CALL_TIMEOUT_MS, GIT_NET_TIMEOUT_MS, GIT_LOCAL_TIMEOUT_MS, GIT_HEAVY_NET_TIMEOUT_MS, HARD_CAP_GRACE_MS, CallTimedOutError, timeoutNoise;
+var init_netTimeout = __esm({
+  "src/netTimeout.ts"() {
+    "use strict";
+    init_logNoise();
+    GH_CALL_TIMEOUT_MS = 15e3;
+    GIT_NET_TIMEOUT_MS = 15e3;
+    GIT_LOCAL_TIMEOUT_MS = 5e3;
+    GIT_HEAVY_NET_TIMEOUT_MS = 6e4;
+    HARD_CAP_GRACE_MS = 2e3;
+    CallTimedOutError = class extends Error {
+      timedOut = true;
+      constructor(call, timeoutMs) {
+        super(`\u0432\u044B\u0437\u043E\u0432 \u043D\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0437\u0430 ${timeoutMs}\u043C\u0441 \u0438 \u043F\u0440\u0435\u0440\u0432\u0430\u043D: ${call}`);
+        this.name = "CallTimedOutError";
+      }
+    };
+    timeoutNoise = makeRepeatFilter();
+  }
+});
+
 // src/git.ts
 import { existsSync as existsSync10, readdirSync as readdirSync11, statSync as statSync8 } from "fs";
 import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
 import { isAbsolute as isAbsolute2, join as join17, sep as sep2 } from "path";
 import { $ as $2 } from "execa";
+function gitNet(repo, args, timeoutMs) {
+  return withHardTimeout(
+    $2({ reject: false, timeout: timeoutMs })`git -C ${repo} ${args}`,
+    "git",
+    gitCallLabel(repo, args),
+    timeoutMs
+  ).catch(() => null);
+}
+function gitNetStrict(repo, args, timeoutMs) {
+  return withHardTimeout($2({ timeout: timeoutMs })`git -C ${repo} ${args}`, "git", gitCallLabel(repo, args), timeoutMs);
+}
 function isUnrecoverableRefError(e) {
   if (e instanceof MissingRefError) return true;
   const msg = e instanceof Error ? `${e.name}: ${e.message}` : String(e);
@@ -3553,26 +3680,27 @@ async function remoteMainRef(repo) {
   throw new Error(`\u043D\u0435 \u043D\u0430\u0448\u0451\u043B \u0434\u0435\u0444\u043E\u043B\u0442-\u0432\u0435\u0442\u043A\u0443 origin \u0432 ${repo} (\u043D\u0435\u0442 origin/HEAD, origin/main, origin/master)`);
 }
 async function remoteBranchExists(repo, branch) {
-  const res = await $2({ reject: false, timeout: 5e3 })`git -C ${repo} ls-remote --heads origin ${`refs/heads/${branch}`}`;
-  if (res.exitCode !== 0) return null;
+  const res = await gitNet(repo, ["ls-remote", "--heads", "origin", `refs/heads/${branch}`], 5e3);
+  if (!res || res.exitCode !== 0) return null;
   return res.stdout.trim().length > 0;
 }
-async function remoteBaseRef(repo, branch) {
-  await $2({ reject: false })`git -C ${repo} fetch --quiet origin ${branch}`;
+async function remoteBaseRef(repo, branch, timeoutMs = GIT_NET_TIMEOUT_MS) {
+  await gitNet(repo, ["fetch", "--quiet", "origin", branch], timeoutMs);
   return `origin/${branch}`;
 }
-async function remoteRepoFullName(repo) {
-  const url = (await $2({ reject: false })`git -C ${repo} remote get-url origin`).stdout.trim();
+async function remoteRepoFullName(repo, timeoutMs = GIT_LOCAL_TIMEOUT_MS) {
+  const res = await gitNet(repo, ["remote", "get-url", "origin"], timeoutMs);
+  const url = res?.stdout.trim() ?? "";
   const m = url.match(GITHUB_REMOTE_RE);
   return m ? m[1] : null;
 }
 async function journalForBranch(repo, branch, slug) {
-  await $2({ reject: false })`git -C ${repo} fetch --quiet origin ${branch}`;
+  await gitNet(repo, ["fetch", "--quiet", "origin", branch], GIT_NET_TIMEOUT_MS);
   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) {
-  await $2`git -C ${repo} fetch --quiet origin`;
+  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 $2`git -C ${repo} worktree add --detach --force ${worktree} ${ref}`;
@@ -3589,7 +3717,7 @@ async function mergeRef(worktree, ref) {
   return { clean: false, conflicts: u ? u.split("\n") : [], changed: false };
 }
 async function pushHeadTo(worktree, branch) {
-  await $2`git -C ${worktree} push origin ${`HEAD:${branch}`}`;
+  await gitNetStrict(worktree, ["push", "origin", `HEAD:${branch}`], GIT_HEAVY_NET_TIMEOUT_MS);
 }
 async function snapshotWorktree(worktree, message) {
   try {
@@ -3598,7 +3726,7 @@ async function snapshotWorktree(worktree, message) {
     await $2({ reject: false })`git -C ${worktree} add -A`;
     const commit = await $2({ reject: false })`git -C ${worktree} commit --no-verify -m ${message}`;
     if (commit.exitCode !== 0) return false;
-    await $2({ reject: false })`git -C ${worktree} push`;
+    await gitNet(worktree, ["push"], GIT_NET_TIMEOUT_MS);
     return true;
   } catch {
     return false;
@@ -3614,6 +3742,7 @@ var init_git = __esm({
   "src/git.ts"() {
     "use strict";
     init_procCleanup();
+    init_netTimeout();
     init_swarmFiles();
     WorktreeBusyError = class extends Error {
       constructor(branch, worktreePath) {
@@ -4301,7 +4430,7 @@ var init_attachments = __esm({
 
 // src/shotUpload.ts
 import { readFile as fsReadFile } from "fs/promises";
-import { basename as basename2, isAbsolute as isAbsolute3, join as join21 } from "path";
+import { basename as basename4, isAbsolute as isAbsolute3, join as join21 } from "path";
 function shotMimetype(path) {
   const dot = path.lastIndexOf(".");
   if (dot < 0) return null;
@@ -4340,7 +4469,7 @@ async function readShots(paths, opts) {
       skipped.push({ path, reason: `${(bytes.byteLength / 1024 / 1024).toFixed(1)} \u041C\u0411 \u2014 \u0431\u043E\u043B\u044C\u0448\u0435 \u043B\u0438\u043C\u0438\u0442\u0430 ${maxBytes / 1024 / 1024} \u041C\u0411` });
       continue;
     }
-    files.push({ path, fileName: basename2(path), mimetype, bytes });
+    files.push({ path, fileName: basename4(path), mimetype, bytes });
   }
   return { files, skipped };
 }
@@ -6237,7 +6366,7 @@ var init_droneStore = __esm({
 // src/overmind.ts
 import { homedir as homedir5 } from "os";
 import { existsSync as existsSync17, readFileSync as readFileSync20, readdirSync as readdirSync13, renameSync as renameSync11 } from "fs";
-import { basename as basename4, dirname as dirname4, join as join30 } from "path";
+import { basename as basename6, dirname as dirname4, join as join30 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
 import { spawn as spawn3 } from "child_process";
 
@@ -8940,39 +9069,8 @@ function installLogStamps(now = () => /* @__PURE__ */ new Date()) {
   };
 }
 
-// src/logNoise.ts
-var DEFAULT_REMIND_MS = 10 * 6e4;
-function timesWord(n) {
-  const tens = n % 100;
-  if (tens >= 11 && tens <= 14) return "\u0440\u0430\u0437";
-  return n % 10 >= 2 && n % 10 <= 4 ? "\u0440\u0430\u0437\u0430" : "\u0440\u0430\u0437";
-}
-function makeRepeatFilter(opts = {}) {
-  const remindAfterMs = opts.remindAfterMs ?? DEFAULT_REMIND_MS;
-  const streaks = /* @__PURE__ */ new Map();
-  return {
-    say(key, message, now) {
-      const prev = streaks.get(key);
-      if (!prev || prev.message !== message) {
-        const tail2 = prev && prev.hidden > 0 ? ` (\u0434\u043E \u044D\u0442\u043E\u0433\u043E \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 \u043C\u043E\u043B\u0447\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0438\u043B\u043E\u0441\u044C \u0435\u0449\u0451 ${prev.hidden} ${timesWord(prev.hidden)})` : "";
-        streaks.set(key, { message, since: now, saidAt: now, hidden: 0 });
-        return `${message}${tail2}`;
-      }
-      prev.hidden += 1;
-      if (now - prev.saidAt < remindAfterMs) return null;
-      const hidden = prev.hidden;
-      const minutes = Math.max(1, Math.round((now - prev.since) / 6e4));
-      prev.saidAt = now;
-      prev.hidden = 0;
-      return `${message} \u2014 \u0442\u043E \u0436\u0435 \u0441\u0430\u043C\u043E\u0435 ${hidden} ${timesWord(hidden)} \u043F\u043E\u0434\u0440\u044F\u0434, \u0442\u044F\u043D\u0435\u0442\u0441\u044F ${minutes} \u043C\u0438\u043D`;
-    },
-    forget(key) {
-      streaks.delete(key);
-    }
-  };
-}
-
 // src/overmind.ts
+init_logNoise();
 init_linkFailure();
 
 // src/repoRegistry.ts
@@ -10830,9 +10928,22 @@ init_git();
 
 // src/gh.ts
 init_src();
+init_netTimeout();
 import { $ as $3 } from "execa";
-var realRunner = async (args) => (await $3`gh ${args}`).stdout;
-var realRepoRunner = async (args, cwd) => (await $3({ cwd })`gh ${args}`).stdout;
+import { basename as basename3 } from "path";
+async function runGh(args, timeoutMs, cwd) {
+  const label2 = callLabel("gh", args) + (cwd ? ` (repo ${basename3(cwd)})` : "");
+  const child = cwd ? $3({ cwd, timeout: timeoutMs })`gh ${args}` : $3({ timeout: timeoutMs })`gh ${args}`;
+  return (await withHardTimeout(child, "gh", label2, timeoutMs)).stdout;
+}
+function ghRunner(timeoutMs = GH_CALL_TIMEOUT_MS) {
+  return (args) => runGh(args, timeoutMs);
+}
+function ghRepoRunner(timeoutMs = GH_CALL_TIMEOUT_MS) {
+  return (args, cwd) => runGh(args, timeoutMs, cwd);
+}
+var realRunner = ghRunner();
+var realRepoRunner = ghRepoRunner();
 var GH_PR_RE = /^(?:https?:\/\/)?(?:www\.)?github\.com\/[^/\s]+\/[^/\s]+\/pull\/\d+(?:[/?#].*)?$/i;
 function isGithubPrUrl(url) {
   return GH_PR_RE.test(url.trim());
@@ -10922,7 +11033,7 @@ async function closePR(prUrl, run = realRunner) {
 async function postPrComment(prUrl, body, run = realRunner) {
   await run(["pr", "comment", prUrl, "--body", body]);
 }
-var realCommentsRunner = async (prUrl) => (await $3`gh pr view ${prUrl} --json comments`).stdout;
+var realCommentsRunner = (prUrl) => runGh(["pr", "view", prUrl, "--json", "comments"], GH_CALL_TIMEOUT_MS);
 var VERDICT_RE = /^[^A-Za-z]*(APPROVED?|LGTM|(?:REQUEST(?:ED)?\s+)?CHANGES(?:\s+REQUESTED)?)\b/i;
 var APPROVE_RE = /^(APPROVE|LGTM)/i;
 function verdictLabel(verdict) {
@@ -10964,7 +11075,7 @@ async function scanPrComments(prUrl, sinceIso, run, pick3) {
 async function latestVerifyVerdictComment(prUrl, sinceIso, run = realCommentsRunner) {
   return scanPrComments(prUrl, sinceIso, run, (body) => parseVerifyVerdictComment(body));
 }
-var realPrCommitsRunner = async (prUrl) => (await $3`gh pr view ${prUrl} --json commits`).stdout;
+var realPrCommitsRunner = (prUrl) => runGh(["pr", "view", prUrl, "--json", "commits"], GH_CALL_TIMEOUT_MS);
 async function prHasCommitsSince(prUrl, sinceIso, run = realPrCommitsRunner) {
   if (!isGithubPrUrl(prUrl)) return false;
   let out;
@@ -10988,7 +11099,7 @@ async function prHasCommitsSince(prUrl, sinceIso, run = realPrCommitsRunner) {
     return Number.isFinite(ms) && (!Number.isFinite(sinceMs) || ms >= sinceMs);
   });
 }
-var realPrCommitTitlesRunner = async (prUrl) => (await $3`gh pr view ${prUrl} --json commits`).stdout;
+var realPrCommitTitlesRunner = (prUrl) => runGh(["pr", "view", prUrl, "--json", "commits"], GH_CALL_TIMEOUT_MS);
 async function prCommitTitles(prUrl, run = realPrCommitTitlesRunner) {
   if (!isGithubPrUrl(prUrl)) return [];
   let out;
@@ -11027,7 +11138,12 @@ function firstLine(s) {
   return s.split("\n").map((l) => l.trim()).find((l) => l.length > 0) ?? "gh \u0432\u0435\u0440\u043D\u0443\u043B 403";
 }
 var realChecksRunner = async (pr) => {
-  const r = await $3({ reject: false, timeout: 15e3 })`gh pr checks ${pr} --json state,name,bucket,link`;
+  const r = await withHardTimeout(
+    $3({ reject: false, timeout: 15e3 })`gh pr checks ${pr} --json state,name,bucket,link`,
+    "gh",
+    callLabel("gh", ["pr", "checks", pr]),
+    15e3
+  );
   const stdout = r.stdout ?? "";
   const stderr = r.stderr ?? "";
   if (!stdout.trim() && NO_CHECKS_STDERR.test(stderr)) return "[]";
@@ -11096,7 +11212,15 @@ async function prCiStatus(pr, run = realChecksRunner) {
   if (rows.some((r) => r.bucket === "pending")) return { bucket: "pending", failing: [], failingRunIds: [], ...counts };
   return { bucket: "pass", failing: [], failingRunIds: [], ...counts };
 }
-var realRunLogRunner = async (runId) => (await $3({ reject: false, timeout: 3e4, maxBuffer: 10 * 1024 * 1024 })`gh run view ${runId} --log-failed`).stdout;
+var realRunLogRunner = async (runId) => {
+  const r = await withHardTimeout(
+    $3({ reject: false, timeout: 3e4, maxBuffer: 10 * 1024 * 1024 })`gh run view ${runId} --log-failed`,
+    "gh",
+    callLabel("gh", ["run", "view", runId]),
+    3e4
+  );
+  return r.stdout;
+};
 var CI_SUMMARY_LOG_CHARS = 4e3;
 var CI_SUMMARY_MAX_RUNS = 2;
 async function ciFailureSummary(failing, failingRunIds, logRun = realRunLogRunner) {
@@ -13371,7 +13495,7 @@ function makeEnvGate(opts) {
 // src/web.ts
 init_src();
 import { randomBytes as randomBytes3 } from "crypto";
-import { basename as basename3 } from "path";
+import { basename as basename5 } from "path";
 import { serve as serve2 } from "@hono/node-server";
 
 // src/diff.ts
@@ -13577,7 +13701,7 @@ async function changedPaths(worktree, opts = {}) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.22",
+  version: "0.6.23",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -13627,7 +13751,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "b8eaac4a5562ffcf45a02af338267620e0a7843f"
+  gitHead: "af6c4af0f523891b5db805d9b4583021688ed1f5"
 };
 
 // src/version.ts
@@ -13841,7 +13965,7 @@ function timelineState(db, now = Date.now(), overmindLog = []) {
       id: r.id,
       name: r.name,
       slug: r.task_slug,
-      repo: basename3(r.repo || "") || "?",
+      repo: basename5(r.repo || "") || "?",
       status: r.status,
       area: r.area,
       start: sqliteIso(r.created_at),
@@ -18045,7 +18169,7 @@ async function buildReliefCostCandidatesFor(deps, now, droneCap) {
       if (deps.exclusiveProject && await deps.exclusiveProject(repo)) continue;
     } catch {
     }
-    exclusiveRepos.push(basename4(repo));
+    exclusiveRepos.push(basename6(repo));
   }
   const otherHosts = [
     ...new Set(
@@ -19016,7 +19140,7 @@ async function resolveConflict(deps, reviewRun) {
     model: reviewRun.model,
     review_model: reviewRun.review_model
   });
-  const wt = join30(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-resolve-${resolver.id}`);
+  const wt = join30(deps.worktreesDir, basename6(repo), `${reviewRun.task_slug}-resolve-${resolver.id}`);
   try {
     await deps.git.prepareDetachedWorktree(repo, branch, wt);
     await deps.git.setWorktreeIdentity(wt, resolver.name);
@@ -19073,7 +19197,7 @@ async function spawnReviewer(deps, reviewRun, files) {
     // (своей у ревьюера нет, TASWM-204), и коммент с вердиктом должен уехать именно туда.
     workspace_id: reviewRun.workspace_id
   });
-  const wt = join30(deps.worktreesDir, basename4(repo), `${reviewRun.task_slug}-review-${reviewer.id}`);
+  const wt = join30(deps.worktreesDir, basename6(repo), `${reviewRun.task_slug}-review-${reviewer.id}`);
   try {
     await deps.git.prepareDetachedWorktree(repo, branch, wt);
     await deps.git.setWorktreeIdentity(wt, reviewer.name);
@@ -19149,7 +19273,7 @@ async function spawnVerifier(deps, verifiedRun, files) {
     // штамп цикла: фикс-итерацию проверяет свежий верификатор
     workspace_id: verifiedRun.workspace_id
   });
-  const wt = join30(deps.worktreesDir, basename4(repo), `${verifiedRun.task_slug}-verify-${verifier.id}`);
+  const wt = join30(deps.worktreesDir, basename6(repo), `${verifiedRun.task_slug}-verify-${verifier.id}`);
   try {
     await deps.git.prepareDetachedWorktree(repo, branch, wt);
     await deps.git.setWorktreeIdentity(wt, verifier.name);
@@ -20017,7 +20141,7 @@ async function runDaemon(opts) {
           worktreesDir,
           activeWorktreePaths: new Set(runsWithWorktree.filter((r) => !isTerminalStatus(r.status)).map((r) => r.worktree_path)),
           containerRunPrefixes: runsWithWorktree.map((r) => ({
-            prefix: composeProjectPrefix(basename4(r.worktree_path)),
+            prefix: composeProjectPrefix(basename6(r.worktree_path)),
             active: !isTerminalStatus(r.status)
           }))
         }).then(() => {

package/package.json

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