@taskless-app/swarm 0.6.2 → 0.6.3

package/README.md

@@ -211,6 +211,24 @@ deny-правил на файловые тулы у него нет — дрон
 (`src/executors/index.ts`). Если для него пришлось тронуть общий код — значит,
 чинить надо интерфейс, а не общий код; на это и стоит `contract.test.ts`.
 
+## Служебные файлы роя в worktree
+
+Кое-что рой кладёт прямо в рабочее дерево дрона: `.swarm-mcp.json` (конфиг
+MCP-сервера роя, в нём **токен прогона**) и `.swarm-task/` (вложения задачи).
+Ваш `.gitignore` про них знать не обязан — это файлы роя, а не проекта, и рой
+прячет их сам, на каждом подготовленном worktree (TASWM-372):
+
+- паттерны уезжают в `.git/info/exclude` — локальный exclude вашего клона, файлы
+  в репозиторий не коммитятся, а сам репозиторий при этом не тронут;
+- `pre-commit`/`pre-push` рвут операцию, если служебный файл всё-таки оказался в
+  индексе (`git add -f`, файл приехал закоммиченным с ветки). Хуки ставятся
+  строго пер-worktree (`git config --worktree core.hooksPath`, каталог —
+  `.git/worktrees/<id>/swarm-hooks`) и в конце **вызывают ваш прежний хук**:
+  husky и прочая дисциплина репозитория продолжают работать.
+
+Список файлов — один, `src/swarmFiles.ts`; оттуда же берут имена те, кто их
+пишет. Кладёте в worktree что-то новое — впишите туда, и оно спрячется само.
+
 ## Windows
 
 Рой работает на Windows, но **рекомендуемый способ — WSL2**: там он ведёт себя ровно

package/dist/cli.js

@@ -1156,6 +1156,17 @@ var init_claudeBin = __esm({
   }
 });
 
+// src/swarmFiles.ts
+var SWARM_MCP_CONFIG_FILE, SWARM_TASK_DIR, SWARM_EXCLUDE_PATTERNS;
+var init_swarmFiles = __esm({
+  "src/swarmFiles.ts"() {
+    "use strict";
+    SWARM_MCP_CONFIG_FILE = ".swarm-mcp.json";
+    SWARM_TASK_DIR = ".swarm-task";
+    SWARM_EXCLUDE_PATTERNS = [`/${SWARM_MCP_CONFIG_FILE}`, `/${SWARM_TASK_DIR}/`];
+  }
+});
+
 // src/pricing.ts
 function costFromUsage(usage2, model, table = MODEL_PRICING) {
   const pricing = model ? table[model] : void 0;
@@ -1294,9 +1305,10 @@ var init_claudeCode = __esm({
   "src/executors/claudeCode.ts"() {
     "use strict";
     init_claudeBin();
+    init_swarmFiles();
     init_claudeResult();
     ISOLATION_FLAGS = ["--setting-sources", "project", "--strict-mcp-config"];
-    MCP_CONFIG_FILE = ".swarm-mcp.json";
+    MCP_CONFIG_FILE = SWARM_MCP_CONFIG_FILE;
     claudeCodeExecutor = {
       id: "claude-code",
       title: "Claude Code (claude)",
@@ -1837,7 +1849,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.2",
+      version: "0.6.3",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -1887,7 +1899,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "e812f35a996b00111f3f535b6b0a45b379e7afb2"
+      gitHead: "298573d4b361b8fc7ea4d6ea9d1e8784906bbd7e"
     };
   }
 });
@@ -5293,6 +5305,26 @@ var SwarmClient = class _SwarmClient {
     const v = sc.config?.exclusive;
     return typeof v === "boolean" ? v : null;
   }
+  /**
+   * Live КВОТА «дронов на проект» из Taskless (TASWM-365): тот же swarm_repo_config по
+   * repoFullName — Project.swarmConfig.maxDrones. Сколько прогонов этого проекта могут идти
+   * одновременно; 0 — без ограничения (дефолт проекта). Отдаём ЧИСЛО КАК ЕСТЬ, включая ноль:
+   * превращать его в «без ограничения» — дело ридера (makeDroneCapReader), клиент здесь только
+   * достаёт настройку. null (прод недоступен / repo не смэплен / поля нет / мусор) → ридер
+   * возьмёт «без ограничения», то есть прежнее поведение.
+   */
+  async repoDroneCap(repoFullName) {
+    let res;
+    try {
+      res = await this.call("swarm_repo_config", { repoFullName });
+    } catch {
+      return null;
+    }
+    if (res?.isError) return null;
+    const sc = res.structuredContent ?? {};
+    const v = sc.config?.maxDrones;
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : null;
+  }
   /**
    * TASWM-291: МАШИНЫ роя владельца (swarm_list_hosts) — чтобы `swarm spawn --host
    * <имя>` резолвил человеческое имя в hostId, а `swarm hosts` показывал, какие
@@ -6404,7 +6436,7 @@ function hostIdentityPath(home) {
 function loadHostIdentity(deps) {
   const exists = deps.exists ?? existsSync6;
   const readFile2 = deps.readFile ?? ((p) => readFileSync7(p, "utf8"));
-  const writeFile2 = deps.writeFile ?? ((p, data) => {
+  const writeFile3 = deps.writeFile ?? ((p, data) => {
     writeFileSync5(`${p}.tmp`, data);
     renameSync4(`${p}.tmp`, p);
   });
@@ -6424,7 +6456,7 @@ function loadHostIdentity(deps) {
   }
   const hostId = newId();
   try {
-    writeFile2(path, JSON.stringify({ hostId, hostName, createdAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
+    writeFile3(path, JSON.stringify({ hostId, hostName, createdAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
   } catch {
     console.warn(`[overmind] \u043D\u0435 \u0441\u043C\u043E\u0433 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C ${path} \u2014 hostId \u0436\u0438\u0432\u0451\u0442 \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043E \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0430 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430`);
   }
@@ -8772,9 +8804,10 @@ init_droneChannel();
 
 // src/git.ts
 import { existsSync as existsSync8, readdirSync as readdirSync8, statSync as statSync8 } from "fs";
-import { appendFile, mkdir, readFile, rm } from "fs/promises";
-import { isAbsolute as isAbsolute2, join as join13 } from "path";
+import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
+import { isAbsolute as isAbsolute2, join as join13, sep as sep2 } from "path";
 import { $ as $5 } from "execa";
+init_swarmFiles();
 function isLinkedWorktree(dir) {
   try {
     return statSync8(join13(dir, ".git")).isFile();
@@ -8825,8 +8858,10 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 
 // src/attachments.ts
-import { mkdir as mkdir2, rm as rm2, writeFile } from "fs/promises";
+import { mkdir as mkdir2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { join as join15 } from "path";
+init_swarmFiles();
+var ATTACHMENTS_DIR = `${SWARM_TASK_DIR}/attachments`;
 var ATTACH_MAX_TOTAL_BYTES = 24 * 1024 * 1024;
 var ATTACH_MAX_FILE_BYTES = 8 * 1024 * 1024;
 var IMAGE_EXT = /* @__PURE__ */ new Set(["png", "jpg", "jpeg", "gif", "webp", "svg", "bmp", "avif", "heic"]);
@@ -9239,11 +9274,11 @@ function savePauseState(home, state, io = {}) {
     remove(path);
     return;
   }
-  const writeFile2 = io.writeFile ?? ((p, data) => {
+  const writeFile3 = io.writeFile ?? ((p, data) => {
     writeFileSync10(`${p}.tmp`, data);
     renameSync5(`${p}.tmp`, p);
   });
-  writeFile2(path, JSON.stringify(state, null, 2));
+  writeFile3(path, JSON.stringify(state, null, 2));
 }
 function makePauseState(source, reason, now = Date.now()) {
   return {

package/dist/overmind.js

@@ -1325,6 +1325,54 @@ var init_claudeBin = __esm({
   }
 });
 
+// src/swarmFiles.ts
+function sq(s) {
+  return `'${s.replace(/'/g, `'\\''`)}'`;
+}
+function guardHookScript(hook, delegate) {
+  const paths = SWARM_WORKTREE_ARTIFACTS.map(sq).join(" ");
+  const lines = [
+    "#!/usr/bin/env sh",
+    `# \u0421\u0442\u0440\u0430\u0445\u043E\u0432\u043A\u0430 \u0440\u043E\u044F (TASWM-372): \u0441\u043B\u0443\u0436\u0435\u0431\u043D\u044B\u0435 \u0444\u0430\u0439\u043B\u044B \u0440\u043E\u044F \u043D\u0435 \u0443\u0435\u0437\u0436\u0430\u044E\u0442 \u0432 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442\u0430.`,
+    "# \u0425\u0443\u043A \u043F\u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D \u041F\u0415\u0420-WORKTREE (git config --worktree core.hooksPath) \u043F\u0440\u0438 \u043F\u043E\u0434\u0433\u043E\u0442\u043E\u0432\u043A\u0435",
+    "# worktree \u0434\u0440\u043E\u043D\u0430; \u0445\u0443\u043A\u0438 \u0441\u0430\u043C\u043E\u0433\u043E \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F \u043D\u0435 \u0442\u0440\u043E\u043D\u0443\u0442\u044B \u2014 \u043F\u0440\u0435\u0436\u043D\u0438\u0439 \u0432\u044B\u0437\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u043D\u0438\u0436\u0435.",
+    `swarm_found=$(git ls-files -- ${paths} 2>/dev/null)`,
+    `if [ -n "$swarm_found" ]; then`,
+    `  echo "\u2716 \u0421\u043B\u0443\u0436\u0435\u0431\u043D\u044B\u0435 \u0444\u0430\u0439\u043B\u044B \u0420\u041E\u042F \u0432 \u0438\u043D\u0434\u0435\u043A\u0441\u0435 git \u2014 ${ACTION[hook]} (TASWM-372):" >&2`,
+    `  printf '%s\\n' "$swarm_found" | sed 's/^/    /' >&2`,
+    `  echo "  \u042D\u0442\u043E \u0444\u0430\u0439\u043B\u044B \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0440\u043E\u044F, \u0430 \u043D\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0430: \u0432 ${SWARM_MCP_CONFIG_FILE} \u043B\u0435\u0436\u0438\u0442 \u0442\u043E\u043A\u0435\u043D," >&2`,
+    `  echo "  \u043A\u043E\u0442\u043E\u0440\u043E\u043C\u0443 \u043D\u0435\u043B\u044C\u0437\u044F \u043E\u043A\u0430\u0437\u0430\u0442\u044C\u0441\u044F \u0432 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0438 (\u0438\u043D\u0446\u0438\u0434\u0435\u043D\u0442 11.08)." >&2`,
+    `  echo "  \u0423\u0431\u0435\u0440\u0438 \u0438\u0445 \u0438\u0437 \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0438:" >&2`,
+    `  echo "    git rm --cached -r --ignore-unmatch ${SWARM_WORKTREE_ARTIFACTS.join(" ")}" >&2`,
+    `  echo "  \u0424\u0430\u0439\u043B\u044B \u043D\u0430 \u0434\u0438\u0441\u043A\u0435 \u043E\u0441\u0442\u0430\u043D\u0443\u0442\u0441\u044F \u2014 \u043E\u043D\u0438 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u043E\u0433\u043E\u043D\u0443." >&2`,
+    "  exit 1",
+    "fi"
+  ];
+  if (delegate) {
+    lines.push(
+      "# \u041F\u0440\u0435\u0436\u043D\u0438\u0439 \u0445\u0443\u043A \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F (husky \u0438 \u0442.\u043F.) \u2014 \u043E\u043D \u043D\u0435 \u0434\u043E\u043B\u0436\u0435\u043D \u043F\u0440\u043E\u043F\u0430\u0441\u0442\u044C \u0438\u0437-\u0437\u0430 \u043D\u0430\u0448\u0435\u0439 \u0441\u0442\u0440\u0430\u0445\u043E\u0432\u043A\u0438.",
+      `if [ -x ${sq(delegate)} ]; then exec ${sq(delegate)} "$@"; fi`
+    );
+  }
+  lines.push("exit 0", "");
+  return lines.join("\n");
+}
+var SWARM_MCP_CONFIG_FILE, SWARM_TASK_DIR, SWARM_WORKTREE_ARTIFACTS, SWARM_EXCLUDE_PATTERNS, GUARD_HOOKS, ACTION;
+var init_swarmFiles = __esm({
+  "src/swarmFiles.ts"() {
+    "use strict";
+    SWARM_MCP_CONFIG_FILE = ".swarm-mcp.json";
+    SWARM_TASK_DIR = ".swarm-task";
+    SWARM_WORKTREE_ARTIFACTS = [SWARM_MCP_CONFIG_FILE, SWARM_TASK_DIR];
+    SWARM_EXCLUDE_PATTERNS = [`/${SWARM_MCP_CONFIG_FILE}`, `/${SWARM_TASK_DIR}/`];
+    GUARD_HOOKS = ["pre-commit", "pre-push"];
+    ACTION = {
+      "pre-commit": "\u043A\u043E\u043C\u043C\u0438\u0442 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D",
+      "pre-push": "\u043F\u0443\u0448 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D"
+    };
+  }
+});
+
 // src/pricing.ts
 function costFromUsage(usage, model, table = MODEL_PRICING) {
   const pricing = model ? table[model] : void 0;
@@ -1463,9 +1511,10 @@ var init_claudeCode = __esm({
   "src/executors/claudeCode.ts"() {
     "use strict";
     init_claudeBin();
+    init_swarmFiles();
     init_claudeResult();
     ISOLATION_FLAGS = ["--setting-sources", "project", "--strict-mcp-config"];
-    MCP_CONFIG_FILE = ".swarm-mcp.json";
+    MCP_CONFIG_FILE = SWARM_MCP_CONFIG_FILE;
     claudeCodeExecutor = {
       id: "claude-code",
       title: "Claude Code (claude)",
@@ -2647,8 +2696,8 @@ var init_procCleanup = __esm({
 
 // src/git.ts
 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 join15 } from "path";
+import { appendFile, chmod, mkdir, readFile, rm, writeFile } from "fs/promises";
+import { isAbsolute as isAbsolute2, join as join15, sep as sep2 } from "path";
 import { $ as $2 } from "execa";
 function isUnrecoverableRefError(e) {
   if (e instanceof MissingRefError) return true;
@@ -2720,6 +2769,11 @@ async function worktreeForBranch(repo, branch) {
   return null;
 }
 async function addWorktree(repo, path, branch, opts = {}) {
+  const res = await checkoutWorktree(repo, path, branch, opts);
+  await ensureWorktreeHygiene(path);
+  return res;
+}
+async function checkoutWorktree(repo, path, branch, opts) {
   await ensureLongPaths(repo);
   const localSha = await revParse(repo, `refs/heads/${branch}`);
   const originSha = await revParse(repo, `refs/remotes/origin/${branch}`);
@@ -2763,10 +2817,8 @@ async function setWorktreeIdentity(worktree, name) {
 }
 async function ensureGitExcluded(worktree, pattern) {
   try {
-    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 : join15(worktree, raw);
+    const commonDir = await gitPath(worktree, "--git-common-dir");
+    if (!commonDir) return false;
     const infoDir = join15(commonDir, "info");
     const excludeFile = join15(infoDir, "exclude");
     let current = "";
@@ -2784,6 +2836,46 @@ async function ensureGitExcluded(worktree, pattern) {
     return false;
   }
 }
+async function gitPath(worktree, flag) {
+  const out = await $2({ reject: false })`git -C ${worktree} rev-parse ${flag}`;
+  const raw = out.stdout.trim();
+  if (out.exitCode !== 0 || !raw) return null;
+  return isAbsolute2(raw) ? raw : join15(worktree, raw);
+}
+async function ensureWorktreeHygiene(worktree) {
+  for (const pattern of SWARM_EXCLUDE_PATTERNS) await ensureGitExcluded(worktree, pattern);
+  await installGuardHooks(worktree);
+}
+async function installGuardHooks(worktree) {
+  try {
+    const gitDir = await gitPath(worktree, "--git-dir");
+    if (!gitDir) return false;
+    const hooksDir = join15(gitDir, "swarm-hooks");
+    const prev = await previousHooksPath(worktree);
+    await mkdir(hooksDir, { recursive: true });
+    for (const hook of GUARD_HOOKS) {
+      await writeFile(join15(hooksDir, hook), guardHookScript(hook, prev ? `${posix(prev)}/${hook}` : null));
+      await chmod(join15(hooksDir, hook), 493);
+    }
+    await $2`git -C ${worktree} config extensions.worktreeConfig true`;
+    await $2`git -C ${worktree} config --worktree core.hooksPath ${posix(hooksDir)}`;
+    return true;
+  } catch {
+    return false;
+  }
+}
+function posix(p) {
+  return (sep2 === "\\" ? p.replace(/\\/g, "/") : p).replace(/\/+$/, "");
+}
+async function previousHooksPath(worktree) {
+  for (const scope of ["--local", "--global", "--system"]) {
+    const out = await $2({ reject: false })`git -C ${worktree} config ${scope} --get core.hooksPath`;
+    const value = out.stdout.trim();
+    if (out.exitCode === 0 && value) return value;
+  }
+  const commonDir = await gitPath(worktree, "--git-common-dir");
+  return commonDir ? join15(commonDir, "hooks") : null;
+}
 async function removeWorktree(repo, path) {
   const branch = (await $2({ reject: false })`git -C ${path} symbolic-ref --quiet --short HEAD`).stdout.trim();
   await cleanupWorktreeProcesses(path);
@@ -2848,6 +2940,7 @@ async function prepareDetachedWorktree(repo, branch, worktree) {
   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}`;
+  await ensureWorktreeHygiene(worktree);
 }
 async function mergeRef(worktree, ref) {
   const before = (await $2`git -C ${worktree} rev-parse HEAD`).stdout.trim();
@@ -2885,6 +2978,7 @@ var init_git = __esm({
   "src/git.ts"() {
     "use strict";
     init_procCleanup();
+    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})`);
@@ -3266,7 +3360,7 @@ var init_droneChannel = __esm({
 });
 
 // src/attachments.ts
-import { mkdir as mkdir2, rm as rm2, writeFile } from "fs/promises";
+import { mkdir as mkdir2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { join as join18 } from "path";
 function attachmentsFromDoc(doc, origin) {
   const out = [];
@@ -3354,7 +3448,7 @@ async function materializeAttachments(opts) {
   const io = opts.io ?? {
     removeDir: async (dir2) => rm2(dir2, { recursive: true, force: true }),
     mkdir: async (dir2) => void await mkdir2(dir2, { recursive: true }),
-    writeFile: async (path, bytes) => writeFile(path, bytes)
+    writeFile: async (path, bytes) => writeFile2(path, bytes)
   };
   const result = { files: [], skipped: [] };
   if (opts.refs.length === 0) return result;
@@ -3486,13 +3580,13 @@ function mb(bytes) {
 function errText(e) {
   return e instanceof Error ? e.message : String(e);
 }
-var ATTACHMENTS_DIR, SWARM_TASK_DIR, ATTACH_MAX_FILES, ATTACH_MAX_TOTAL_BYTES, ATTACH_MAX_FILE_BYTES, IMAGE_EXT, DOC_EXT, TEXT_EXT, KNOWN_EXT, TRANSLIT, EXT_BY_MIME;
+var ATTACHMENTS_DIR, ATTACH_MAX_FILES, ATTACH_MAX_TOTAL_BYTES, ATTACH_MAX_FILE_BYTES, IMAGE_EXT, DOC_EXT, TEXT_EXT, KNOWN_EXT, TRANSLIT, EXT_BY_MIME;
 var init_attachments = __esm({
   "src/attachments.ts"() {
     "use strict";
     init_git();
-    ATTACHMENTS_DIR = ".swarm-task/attachments";
-    SWARM_TASK_DIR = ".swarm-task";
+    init_swarmFiles();
+    ATTACHMENTS_DIR = `${SWARM_TASK_DIR}/attachments`;
     ATTACH_MAX_FILES = 12;
     ATTACH_MAX_TOTAL_BYTES = 24 * 1024 * 1024;
     ATTACH_MAX_FILE_BYTES = 8 * 1024 * 1024;
@@ -5230,11 +5324,11 @@ function savePauseState(home, state, io = {}) {
     remove(path);
     return;
   }
-  const writeFile2 = io.writeFile ?? ((p, data) => {
+  const writeFile3 = io.writeFile ?? ((p, data) => {
     writeFileSync(`${p}.tmp`, data);
     renameSync(`${p}.tmp`, p);
   });
-  writeFile2(path, JSON.stringify(state, null, 2));
+  writeFile3(path, JSON.stringify(state, null, 2));
 }
 function makePauseState(source, reason, now = Date.now()) {
   return {
@@ -6595,6 +6689,26 @@ var SwarmClient = class _SwarmClient {
     const v = sc.config?.exclusive;
     return typeof v === "boolean" ? v : null;
   }
+  /**
+   * Live КВОТА «дронов на проект» из Taskless (TASWM-365): тот же swarm_repo_config по
+   * repoFullName — Project.swarmConfig.maxDrones. Сколько прогонов этого проекта могут идти
+   * одновременно; 0 — без ограничения (дефолт проекта). Отдаём ЧИСЛО КАК ЕСТЬ, включая ноль:
+   * превращать его в «без ограничения» — дело ридера (makeDroneCapReader), клиент здесь только
+   * достаёт настройку. null (прод недоступен / repo не смэплен / поля нет / мусор) → ридер
+   * возьмёт «без ограничения», то есть прежнее поведение.
+   */
+  async repoDroneCap(repoFullName) {
+    let res;
+    try {
+      res = await this.call("swarm_repo_config", { repoFullName });
+    } catch {
+      return null;
+    }
+    if (res?.isError) return null;
+    const sc = res.structuredContent ?? {};
+    const v = sc.config?.maxDrones;
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : null;
+  }
   /**
    * TASWM-291: МАШИНЫ роя владельца (swarm_list_hosts) — чтобы `swarm spawn --host
    * <имя>` резолвил человеческое имя в hostId, а `swarm hosts` показывал, какие
@@ -7661,7 +7775,7 @@ function hostIdentityPath(home) {
 function loadHostIdentity(deps) {
   const exists = deps.exists ?? existsSync7;
   const readFile2 = deps.readFile ?? ((p) => readFileSync9(p, "utf8"));
-  const writeFile2 = deps.writeFile ?? ((p, data) => {
+  const writeFile3 = deps.writeFile ?? ((p, data) => {
     writeFileSync8(`${p}.tmp`, data);
     renameSync6(`${p}.tmp`, p);
   });
@@ -7681,7 +7795,7 @@ function loadHostIdentity(deps) {
   }
   const hostId = newId();
   try {
-    writeFile2(path, JSON.stringify({ hostId, hostName, createdAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
+    writeFile3(path, JSON.stringify({ hostId, hostName, createdAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
   } catch {
     console.warn(`[overmind] \u043D\u0435 \u0441\u043C\u043E\u0433 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C ${path} \u2014 hostId \u0436\u0438\u0432\u0451\u0442 \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043E \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0430 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430`);
   }
@@ -10327,6 +10441,20 @@ function makeExclusiveReader(opts) {
     ...opts.now !== void 0 ? { now: opts.now } : {}
   });
 }
+function makeDroneCapReader(opts) {
+  const read = makeRepoValueReader({
+    fetch: opts.fetch,
+    fallback: 0,
+    // «настройки нет» — ниже станет Infinity, как и записанный оператором 0
+    valid: (v) => typeof v === "number" && Number.isFinite(v) && v >= 0,
+    ...opts.ttlMs !== void 0 ? { ttlMs: opts.ttlMs } : {},
+    ...opts.now !== void 0 ? { now: opts.now } : {}
+  });
+  return async (repo) => {
+    const raw = await read(repo);
+    return raw > 0 ? raw : Number.POSITIVE_INFINITY;
+  };
+}
 
 // src/envGate.ts
 import { existsSync as existsSync13 } from "fs";
@@ -10391,9 +10519,9 @@ function parseRequirements(lines) {
       out.push({ kind: "docker", raw });
       continue;
     }
-    const sep2 = raw.indexOf(":");
-    const prefix = sep2 === -1 ? "" : lower.slice(0, sep2);
-    const rest = sep2 === -1 ? "" : raw.slice(sep2 + 1).trim();
+    const sep3 = raw.indexOf(":");
+    const prefix = sep3 === -1 ? "" : lower.slice(0, sep3);
+    const rest = sep3 === -1 ? "" : raw.slice(sep3 + 1).trim();
     if (!rest) {
       out.push({ kind: "unknown", raw });
       continue;
@@ -10766,7 +10894,7 @@ async function changedPaths(worktree, opts = {}) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.2",
+  version: "0.6.3",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -10816,7 +10944,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "e812f35a996b00111f3f535b6b0a45b379e7afb2"
+  gitHead: "298573d4b361b8fc7ea4d6ea9d1e8784906bbd7e"
 };
 
 // src/version.ts
@@ -12828,11 +12956,11 @@ function loadAnomalyState(home, now = Date.now(), io = {}) {
 }
 function saveAnomalyState(home, state, io = {}) {
   const path = anomalyStatePath(home);
-  const writeFile2 = io.writeFile ?? ((p, data) => {
+  const writeFile3 = io.writeFile ?? ((p, data) => {
     writeFileSync14(`${p}.tmp`, data);
     renameSync9(`${p}.tmp`, p);
   });
-  writeFile2(path, JSON.stringify(state, null, 2));
+  writeFile3(path, JSON.stringify(state, null, 2));
 }
 var AnomalyStateStore = class {
   constructor(home, now = Date.now(), io = {}) {
@@ -13958,7 +14086,7 @@ async function resurrectStormDead(deps, worktreeExists, hasTranscript, opts) {
   let resurrected = 0;
   for (const run of deps.db.listRuns("storm_dead")) {
     if (countActiveDrones(deps.db) >= cap) break;
-    if (!await exclusiveGateAllows(deps, run)) continue;
+    if (!await projectQuotaGateAllows(deps, run)) continue;
     const wt = run.worktree_path;
     const mode = !!wt && worktreeExists(wt) && hasTranscript(wt) ? "continue" : "fresh";
     deps.db.addEvent(run.id, "resumed", mode === "continue" ? STORM_RESUME_CONTINUE_TEXT : STORM_RESUME_FRESH_TEXT);
@@ -14111,7 +14239,7 @@ async function wakeAuthorOnRedCi(deps, run, now, ci, worktreeExists, hasTranscri
   if (run.pid != null && deps.isAlive(run.pid)) return false;
   if (deps.resourcesOk && !deps.resourcesOk()) return false;
   if (countActiveDrones(deps.db) >= droneCap) return false;
-  if (!await exclusiveGateAllows(deps, run)) return false;
+  if (!await projectQuotaGateAllows(deps, run)) return false;
   const stats = ciWakeStats(deps.db, run.id);
   if (stats.count >= CI_WAKE_LIMIT) {
     if (!stats.escalated) {
@@ -14242,7 +14370,7 @@ async function wakeAuthorOnChanges(deps, run, now, droneCap) {
   if (deps.db.activeReviewersFor(run.id).some((r) => r.status !== "stalled")) return false;
   if (deps.resourcesOk && !deps.resourcesOk()) return false;
   if (countActiveDrones(deps.db) >= droneCap) return false;
-  if (!await exclusiveGateAllows(deps, run)) return false;
+  if (!await projectQuotaGateAllows(deps, run)) return false;
   if (run.review_cycle >= REVIEW_CYCLE_LIMIT) return false;
   const wakes = deps.db.events(run.id).filter((e) => e.kind === "resumed" && (e.text ?? "").includes(CHANGES_WAKE_MARK));
   if (wakes.length >= CHANGES_WAKE_LIMIT) {
@@ -14336,37 +14464,55 @@ function activeDronesOnRepo(deps, repo, exceptRunId) {
     (r) => r.id !== exceptRunId && (r.kind ?? "drone") === "drone" && ACTIVE_DRONE_STATUSES.has(r.status) && effectiveRepo(deps, r) === repo
   );
 }
-async function exclusiveGateAllows(deps, run) {
-  if (!deps.exclusiveProject) return true;
+async function projectCapFor(deps, repo) {
+  let exclusive = false;
+  if (deps.exclusiveProject) {
+    try {
+      exclusive = await deps.exclusiveProject(repo);
+    } catch (e) {
+      console.error("[overmind] \u0447\u0442\u0435\u043D\u0438\u0435 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u043E\u0441\u0442\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0441\u043E\u0440\u0432\u0430\u043B\u043E\u0441\u044C \u2014 \u0441\u043F\u0430\u0432\u043D\u044E \u043A\u0430\u043A \u0440\u0430\u043D\u044C\u0448\u0435:", e);
+    }
+  }
+  if (exclusive) return { cap: 1, exclusive: true };
+  let quota = Number.POSITIVE_INFINITY;
+  if (deps.projectDroneCap) {
+    try {
+      const v = await deps.projectDroneCap(repo);
+      if (typeof v === "number" && v > 0) quota = v;
+    } catch (e) {
+      console.error("[overmind] \u0447\u0442\u0435\u043D\u0438\u0435 \u043A\u0432\u043E\u0442\u044B \xAB\u0434\u0440\u043E\u043D\u043E\u0432 \u043D\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\xBB \u0441\u043E\u0440\u0432\u0430\u043B\u043E\u0441\u044C \u2014 \u0441\u043F\u0430\u0432\u043D\u044E \u043A\u0430\u043A \u0440\u0430\u043D\u044C\u0448\u0435:", e);
+    }
+  }
+  return { cap: quota, exclusive: false };
+}
+async function projectQuotaGateAllows(deps, run) {
+  if (!deps.exclusiveProject && !deps.projectDroneCap) return true;
   const repo = effectiveRepo(deps, run);
   if (!repo) return true;
-  let exclusive;
-  try {
-    exclusive = await deps.exclusiveProject(repo);
-  } catch (e) {
-    console.error("[overmind] \u0447\u0442\u0435\u043D\u0438\u0435 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u043E\u0441\u0442\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0441\u043E\u0440\u0432\u0430\u043B\u043E\u0441\u044C \u2014 \u0441\u043F\u0430\u0432\u043D\u044E \u043A\u0430\u043A \u0440\u0430\u043D\u044C\u0448\u0435:", e);
-    return true;
-  }
+  const { cap, exclusive } = await projectCapFor(deps, repo);
   const logged = deps.exclusiveLogged ??= /* @__PURE__ */ new Map();
-  if (exclusive) {
+  if (Number.isFinite(cap)) {
     const busy = activeDronesOnRepo(deps, repo, run.id);
-    if (busy.length > 0) {
+    if (busy.length >= cap) {
       const who = busy.map((r) => `${droneLabel(r)} (${r.task_slug})`).join(", ");
-      const reason = `\u043F\u0440\u043E\u0435\u043A\u0442 \u0433\u043E\u043D\u044F\u0435\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443 (\u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u044B) \u0438 \u0441\u0435\u0439\u0447\u0430\u0441 \u0437\u0430\u043D\u044F\u0442: ${who}`;
+      const reason = exclusive ? `\u043F\u0440\u043E\u0435\u043A\u0442 \u0433\u043E\u043D\u044F\u0435\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443 (\u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u044B) \u0438 \u0441\u0435\u0439\u0447\u0430\u0441 \u0437\u0430\u043D\u044F\u0442: ${who}` : `\u043F\u0440\u043E\u0435\u043A\u0442\u0443 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u043E ${cap} \u0434\u0440\u043E\u043D(\u043E\u0432) \u043E\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E (\xAB\u0434\u0440\u043E\u043D\u043E\u0432 \u043D\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\xBB), \u0438 \u0432\u0441\u0435 \u0437\u0430\u043D\u044F\u0442\u044B: ${who}`;
       if (logged.get(run.id) !== reason) {
         logged.set(run.id, reason);
         deps.db.addEvent(
           run.id,
           "step",
-          `${reason} \u2014 \u0436\u0434\u0443 \u043D\u0435 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u0443\u044E \u043C\u0430\u0448\u0438\u043D\u0443, \u0430 \u043E\u0441\u0432\u043E\u0431\u043E\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0430; \u043F\u043E\u0434\u043D\u0438\u043C\u0443 \u0441\u0430\u043C, \u043A\u0430\u043A \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u043D \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u0442\u0441\u044F (TASWM-314)`
+          `${reason} \u2014 \u0436\u0434\u0443 \u043D\u0435 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u0443\u044E \u043C\u0430\u0448\u0438\u043D\u0443, \u0430 \u043E\u0441\u0432\u043E\u0431\u043E\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0430; \u043F\u043E\u0434\u043D\u0438\u043C\u0443 \u0441\u0430\u043C, \u043A\u0430\u043A \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u043D \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u0442\u0441\u044F (${exclusive ? "TASWM-314" : "TASWM-365"})`
+        );
+        narrate(
+          deps,
+          exclusive ? `${droneLabel(run)} \u2014 ${reason}. \u041D\u0435 \u0441\u043F\u0430\u0432\u043D\u044E: \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u043C\u0435\u0448\u0430\u044E\u0442 \u0434\u0440\u0443\u0433 \u0434\u0440\u0443\u0433\u0443.` : `${droneLabel(run)} \u2014 ${reason}. \u041D\u0435 \u0441\u043F\u0430\u0432\u043D\u044E: \u043F\u0440\u043E\u0435\u043A\u0442 \u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u0432\u043E\u044E \u043A\u0432\u043E\u0442\u0443 \u0434\u0440\u043E\u043D\u043E\u0432, \u043E\u0447\u0435\u0440\u0435\u0434\u044C \u043F\u043E\u0434\u043E\u0436\u0434\u0451\u0442.`
         );
-        narrate(deps, `${droneLabel(run)} \u2014 ${reason}. \u041D\u0435 \u0441\u043F\u0430\u0432\u043D\u044E: \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u043C\u0435\u0448\u0430\u044E\u0442 \u0434\u0440\u0443\u0433 \u0434\u0440\u0443\u0433\u0443.`);
       }
       return false;
     }
   }
   if (logged.delete(run.id)) {
-    deps.db.addEvent(run.id, "step", "\u043F\u0440\u043E\u0435\u043A\u0442 \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u043B\u0441\u044F \u2014 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0430 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u043E\u0441\u0442\u0438 \u0441\u043D\u044F\u0442\u0430 (TASWM-314)");
+    deps.db.addEvent(run.id, "step", "\u043F\u0440\u043E\u0435\u043A\u0442 \u043E\u0441\u0432\u043E\u0431\u043E\u0434\u0438\u043B\u0441\u044F \u2014 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u043E \u043A\u0432\u043E\u0442\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0441\u043D\u044F\u0442\u0430 (TASWM-314/TASWM-365)");
   }
   return true;
 }
@@ -14379,19 +14525,14 @@ function pruneGateLogs(deps) {
     for (const id of [...map.keys()]) if (!open.has(id)) map.delete(id);
   }
 }
-async function exclusivityBlockedRunIds(deps) {
+async function projectQuotaBlockedRunIds(deps) {
   const blocked = /* @__PURE__ */ new Set();
-  if (!deps.exclusiveProject) return blocked;
+  if (!deps.exclusiveProject && !deps.projectDroneCap) return blocked;
   for (const run of deps.db.listRuns("queued")) {
     const repo = effectiveRepo(deps, run);
     if (!repo) continue;
-    let exclusive;
-    try {
-      exclusive = await deps.exclusiveProject(repo);
-    } catch {
-      continue;
-    }
-    if (exclusive && activeDronesOnRepo(deps, repo, run.id).length > 0) blocked.add(run.id);
+    const { cap } = await projectCapFor(deps, repo);
+    if (Number.isFinite(cap) && activeDronesOnRepo(deps, repo, run.id).length >= cap) blocked.add(run.id);
   }
   return blocked;
 }
@@ -14419,7 +14560,7 @@ async function trySpawnQueuedRun(deps, run) {
   }
   if (deps.db.unmetDeps(run.depends_on).length > 0) return "skipped";
   if (!await envGateAllows(deps, run)) return "skipped";
-  if (!await exclusiveGateAllows(deps, run)) return "skipped";
+  if (!await projectQuotaGateAllows(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);
@@ -14456,7 +14597,7 @@ async function resumeWatchdogParked(deps, droneCap) {
   if (!parked.length) return;
   let candidate;
   for (const run of orderQueue(parked)) {
-    if (await exclusiveGateAllows(deps, run)) {
+    if (await projectQuotaGateAllows(deps, run)) {
       candidate = run;
       break;
     }
@@ -14990,7 +15131,7 @@ async function tickOnce(deps) {
       if (st.conflicting && deps.resolveConflict && !stormActive) {
         if (deps.resourcesOk && !deps.resourcesOk()) continue;
         if (countActiveDrones(deps.db) >= droneCap) continue;
-        if (!await exclusiveGateAllows(deps, run)) continue;
+        if (!await projectQuotaGateAllows(deps, run)) continue;
         if (deps.db.activeResolverFor(run.id)) continue;
         if (deps.db.resolverCountFor(run.id) >= RESOLVE_LIMIT) {
           if (!deps.db.events(run.id).some((e) => e.kind === "conflict" && (e.text ?? "").includes(RESOLVE_ESCALATION_MARK))) {
@@ -15312,7 +15453,7 @@ async function tickOnce(deps) {
       if (run.stop_reason === RELIEF_PAUSE_REASON) continue;
       if (run.stop_reason != null && run.stop_reason.startsWith(EXITED_NO_DONE_REASON)) continue;
       if (run.pid != null && deps.isAlive(run.pid)) continue;
-      if (!await exclusiveGateAllows(deps, run)) continue;
+      if (!await projectQuotaGateAllows(deps, run)) continue;
       const wt = run.worktree_path;
       const canContinue = !!wt && worktreeExists(wt) && hasTranscript(wt);
       const mode = canContinue ? "continue" : "fresh";
@@ -15392,7 +15533,7 @@ async function tickOnce(deps) {
   }
   if (deps.watchdog) {
     try {
-      const action = decideWatchdogAction(deps.db, now, deps.watchdog.state, deps.watchdog.thresholds, droneCap, { exists: worktreeExists, hasTranscript }, await exclusivityBlockedRunIds(deps));
+      const action = decideWatchdogAction(deps.db, now, deps.watchdog.state, deps.watchdog.thresholds, droneCap, { exists: worktreeExists, hasTranscript }, await projectQuotaBlockedRunIds(deps));
       if (action) await applyWatchdogAction(deps, action);
     } catch (e) {
       console.error("[overmind] \u0441\u0442\u043E\u0440\u043E\u0436 \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0430: \u0442\u0438\u043A \u0441\u043E\u0440\u0432\u0430\u043B\u0441\u044F:", e);
@@ -15957,6 +16098,7 @@ async function runDaemon(opts) {
   let baseBranchReader;
   let envGate;
   let exclusiveProject;
+  let projectDroneCap;
   if (SWARM_BACKEND === "client" && db instanceof SwarmClient) {
     const client = db;
     verifyModeReader = makeVerifyModeReader({
@@ -15996,6 +16138,13 @@ async function runDaemon(opts) {
       },
       ttlMs: 6e4
     });
+    projectDroneCap = makeDroneCapReader({
+      fetch: async (repo) => {
+        const repoFullName = await remoteRepoFullName(repo).catch(() => null);
+        return repoFullName ? client.repoDroneCap(repoFullName) : null;
+      },
+      ttlMs: 6e4
+    });
   }
   let spawnReviewerFn;
   let verdictCommentFn;
@@ -16216,6 +16365,9 @@ async function runDaemon(opts) {
     // client-режим (настройка живёт в проекте); repoFallback — чтобы прогон с пустым repo не
     // выглядел отдельным проектом. Дедуп событий — своя мапа на цикл демона, как у envGate.
     ...exclusiveProject ? { exclusiveProject } : {},
+    // TASWM-365: и квота «дронов на проект» рядом — один и тот же гейт очереди читает обе
+    // настройки и берёт из них минимум (см. projectCapFor).
+    ...projectDroneCap ? { projectDroneCap } : {},
     repoFallback: opts.repo,
     exclusiveLogged: /* @__PURE__ */ new Map(),
     // Зона задачи из истории репо (TASWM-348) — предлагаем сами, если постановщик

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "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": "e812f35a996b00111f3f535b6b0a45b379e7afb2",
+  "gitHead": "298573d4b361b8fc7ea4d6ea9d1e8784906bbd7e",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",