@taskless-app/swarm 0.6.65 → 0.6.67

package/dist/cli.js

@@ -254,7 +254,8 @@ var init_reviewPhase = __esm({
       verify_dead: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0434\u0430\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
       ready: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0433\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443",
       ready_awaiting_ci: "\u0413\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443 \u2014 \u0436\u0434\u0451\u0442 CI",
-      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
+      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
+      cycles_exhausted: "\u041B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
     };
     PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
       (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
@@ -705,16 +706,17 @@ var init_modelPolicy = __esm({
         roles: { executor: "glm-5.3", review: "glm-5.3" }
       },
       // Grok CLI. Каталог — живой `grok models` (16.10.2026), целиком и без выдуманных
-      // имён: grok-4.7 (дефолт CLI и исполнителя), grok-4.7-build-fast, grok-4.6, grok-4.5
-      // TASWM-605: обе роли — на свежей модели (решение владельца: рой работает на свежих
-      // моделях). Это только фолбэк: демон берёт дефолт живого `grok models` (liveModels.ts).
+      // имён: grok-4.7 (дефолт CLI и исполнителя), grok-4.7-build-fast, grok-4.6, grok-4.5.
+      // TASWM-607: исполнитель остаётся на свежей модели. Живой дефолт CLI демон применяет
+      // только к роли executor (liveModels.ts). Ревьюер и проверяющий — на облегчённой
+      // grok-4.7-build-fast, пока человек не задал свою модель ревьюеров.
       // Тарифа нет: цену пишет CLI.
       {
         id: "xai",
         label: "xAI (Grok)",
         executorId: "grok",
         selectable: true,
-        roles: { executor: "grok-4.7", review: "grok-4.7" },
+        roles: { executor: "grok-4.7", review: "grok-4.7-build-fast" },
         models: ["grok-4.7", "grok-4.7-build-fast", "grok-4.6", "grok-4.5"]
       },
       // TASWM-565 · шаг 1 из четырёх: провайдер в реестре ЕСТЬ, выбрать его ещё нельзя.
@@ -1788,17 +1790,22 @@ var init_effort = __esm({
 });
 
 // ../swarm-core/src/queuePlan.ts
-var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS;
+var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS, SERVICE_DONE_KEEP_MS, PR_HEAD_LAG_MS, SERVICE_DONE_MARKER_MS;
 var init_queuePlan = __esm({
   "../swarm-core/src/queuePlan.ts"() {
     "use strict";
     init_status();
     init_hostPool();
     init_hosts();
+    init_modelPolicy();
     init_time();
+    init_verifyVerdict();
     MIN_MS = 6e4;
     QUEUE_NOMINAL_RUN_MS = 25 * MIN_MS;
     QUEUE_MIN_TAIL_MS = 3 * MIN_MS;
+    SERVICE_DONE_KEEP_MS = 2 * 60 * MIN_MS;
+    PR_HEAD_LAG_MS = 5 * MIN_MS;
+    SERVICE_DONE_MARKER_MS = 8 * MIN_MS;
   }
 });
 
@@ -2852,7 +2859,8 @@ var init_liveModels = __esm({
 
 // src/swarmModels.ts
 function roleDefault(role, providerId) {
-  return liveDefaultModel(providerId) ?? defaultModelFor(role, providerId);
+  if (role === "executor") return liveDefaultModel(providerId) ?? defaultModelFor(role, providerId);
+  return defaultModelFor(role, providerId);
 }
 function pick2(v) {
   const s = typeof v === "string" ? v.trim() : "";
@@ -3872,7 +3880,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.65",
+      version: "0.6.67",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3923,7 +3931,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "254a8954d2f53f168b6cebc23b2daa0bc1562426"
+      gitHead: "92a3176867bc1668677a4b6a25e02e0cb6661ce0"
     };
   }
 });
@@ -9253,6 +9261,8 @@ var SwarmClient = class _SwarmClient {
     if (!(typeof n === "number" && Number.isFinite(n) && n > 0)) return null;
     const str = (v) => typeof v === "string" && v.trim() ? v.trim() : null;
     const cost = obj?.swarmSettings?.maxCostUsd;
+    const rawLimit = obj?.swarmSettings?.reviewCycleLimit;
+    const reviewCycleLimit = typeof rawLimit === "number" && Number.isInteger(rawLimit) && rawLimit >= 1 && rawLimit <= 20 ? rawLimit : null;
     return {
       maxDrones: Math.trunc(n),
       // Старый прод (до TASWM-364) поля swarmSettings не отдаёт вовсе — обе модели null,
@@ -9269,7 +9279,8 @@ var SwarmClient = class _SwarmClient {
       // значим («гарантия выключена осознанно»), поэтому пропускаем и его, а не только
       // положительные: null остаётся ровно за «ручка не задана / старый прод», и только
       // он уводит спавн на env-фолбэк и дефолт ядра.
-      maxCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? cost : null
+      maxCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? cost : null,
+      reviewCycleLimit
     };
   }
   /**
@@ -14847,10 +14858,11 @@ switch (cmd) {
         // TASWM-592 (ревью): сессию ищет харнесс ПРОГОНА, а не глобальный исполнитель —
         // иначе побудка codex-прогона при мёртвом демоне теряла продолжаемую сессию.
         hasTranscript: (run2) => !!run2.worktree_path && executorForRun(run2, null).session.exists(run2.worktree_path),
-        respawn: (r, mode) => respawnRun(
+        respawn: (r, mode, nudge) => respawnRun(
           { db, launch, repoFallback: SWARM_REPO, worktreesDir: effectiveWorktreesDir(), getTask: () => Promise.resolve(null) },
           r,
-          mode
+          mode,
+          nudge
         )
       },
       runId

package/dist/overmind.js

@@ -188,6 +188,9 @@ function reviewPhaseKindOf(label2) {
 function computeReviewPhase(input) {
   const { reviewVerdict, ciRed } = input;
   const verifyVerdict = input.verifyVerdict ?? null;
+  if (input.cyclesExhausted) {
+    return { kind: "cycles_exhausted", label: REVIEW_PHASE_TEXT.cycles_exhausted, ready: true };
+  }
   if (!ciRed && isNegativeVerifyVerdict(verifyVerdict)) {
     const kind = verifyVerdict === "found_issues" ? "verify_found" : "verify_not_reproduced";
     return { kind, label: REVIEW_PHASE_TEXT[kind], ready: false };
@@ -242,7 +245,8 @@ var init_reviewPhase = __esm({
       verify_dead: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0434\u0430\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
       ready: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0433\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443",
       ready_awaiting_ci: "\u0413\u043E\u0442\u043E\u0432 \u043A \u043C\u0435\u0440\u0436\u0443 \u2014 \u0436\u0434\u0451\u0442 CI",
-      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
+      reviewer_dead: "\u0420\u0435\u0432\u044C\u044E\u0435\u0440 \u0443\u043C\u0435\u0440 \u2014 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u043D\u0435\u0442, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A",
+      cycles_exhausted: "\u041B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A"
     };
     PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
       (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
@@ -702,16 +706,17 @@ var init_modelPolicy = __esm({
         roles: { executor: "glm-5.3", review: "glm-5.3" }
       },
       // Grok CLI. Каталог — живой `grok models` (16.10.2026), целиком и без выдуманных
-      // имён: grok-4.7 (дефолт CLI и исполнителя), grok-4.7-build-fast, grok-4.6, grok-4.5
-      // TASWM-605: обе роли — на свежей модели (решение владельца: рой работает на свежих
-      // моделях). Это только фолбэк: демон берёт дефолт живого `grok models` (liveModels.ts).
+      // имён: grok-4.7 (дефолт CLI и исполнителя), grok-4.7-build-fast, grok-4.6, grok-4.5.
+      // TASWM-607: исполнитель остаётся на свежей модели. Живой дефолт CLI демон применяет
+      // только к роли executor (liveModels.ts). Ревьюер и проверяющий — на облегчённой
+      // grok-4.7-build-fast, пока человек не задал свою модель ревьюеров.
       // Тарифа нет: цену пишет CLI.
       {
         id: "xai",
         label: "xAI (Grok)",
         executorId: "grok",
         selectable: true,
-        roles: { executor: "grok-4.7", review: "grok-4.7" },
+        roles: { executor: "grok-4.7", review: "grok-4.7-build-fast" },
         models: ["grok-4.7", "grok-4.7-build-fast", "grok-4.6", "grok-4.5"]
       },
       // TASWM-565 · шаг 1 из четырёх: провайдер в реестре ЕСТЬ, выбрать его ещё нельзя.
@@ -2019,17 +2024,22 @@ var init_effort = __esm({
 });
 
 // ../swarm-core/src/queuePlan.ts
-var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS;
+var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS, SERVICE_DONE_KEEP_MS, PR_HEAD_LAG_MS, SERVICE_DONE_MARKER_MS;
 var init_queuePlan = __esm({
   "../swarm-core/src/queuePlan.ts"() {
     "use strict";
     init_status();
     init_hostPool();
     init_hosts();
+    init_modelPolicy();
     init_time();
+    init_verifyVerdict();
     MIN_MS = 6e4;
     QUEUE_NOMINAL_RUN_MS = 25 * MIN_MS;
     QUEUE_MIN_TAIL_MS = 3 * MIN_MS;
+    SERVICE_DONE_KEEP_MS = 2 * 60 * MIN_MS;
+    PR_HEAD_LAG_MS = 5 * MIN_MS;
+    SERVICE_DONE_MARKER_MS = 8 * MIN_MS;
   }
 });
 
@@ -3099,7 +3109,8 @@ var init_liveModels = __esm({
 
 // src/swarmModels.ts
 function roleDefault(role, providerId) {
-  return liveDefaultModel(providerId) ?? defaultModelFor(role, providerId);
+  if (role === "executor") return liveDefaultModel(providerId) ?? defaultModelFor(role, providerId);
+  return defaultModelFor(role, providerId);
 }
 function pick2(v) {
   const s = typeof v === "string" ? v.trim() : "";
@@ -3135,6 +3146,10 @@ function resolveRunModelRef(run2, swarm, env = process.env) {
   const providerId = pick2(env.SWARM_MODEL_PROVIDER) ?? DEFAULT_PROVIDER_ID;
   return { providerId, model: roleDefault(modelRoleOf(run2.kind), providerId) };
 }
+function modelRefToRecord(run2, ref) {
+  if (!run2 || pick2(run2.model)) return null;
+  return `${ref.providerId}/${ref.model}`;
+}
 function resolveRunEffort(run2, swarm, env = process.env) {
   return toEffortLevel(run2.effort) ?? forKind(run2.kind, swarm, toEffortLevel) ?? toEffortLevel(env.SWARM_DRONE_EFFORT) ?? null;
 }
@@ -9525,6 +9540,8 @@ var SwarmClient = class _SwarmClient {
     if (!(typeof n === "number" && Number.isFinite(n) && n > 0)) return null;
     const str2 = (v) => typeof v === "string" && v.trim() ? v.trim() : null;
     const cost = obj?.swarmSettings?.maxCostUsd;
+    const rawLimit = obj?.swarmSettings?.reviewCycleLimit;
+    const reviewCycleLimit = typeof rawLimit === "number" && Number.isInteger(rawLimit) && rawLimit >= 1 && rawLimit <= 20 ? rawLimit : null;
     return {
       maxDrones: Math.trunc(n),
       // Старый прод (до TASWM-364) поля swarmSettings не отдаёт вовсе — обе модели null,
@@ -9541,7 +9558,8 @@ var SwarmClient = class _SwarmClient {
       // значим («гарантия выключена осознанно»), поэтому пропускаем и его, а не только
       // положительные: null остаётся ровно за «ручка не задана / старый прод», и только
       // он уводит спавн на env-фолбэк и дефолт ядра.
-      maxCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? cost : null
+      maxCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? cost : null,
+      reviewCycleLimit
     };
   }
   /**
@@ -13056,7 +13074,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.65",
+  version: "0.6.67",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -13107,7 +13125,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "254a8954d2f53f168b6cebc23b2daa0bc1562426"
+  gitHead: "92a3176867bc1668677a4b6a25e02e0cb6661ce0"
 };
 
 // src/version.ts
@@ -14116,12 +14134,36 @@ init_src();
 
 // src/reviewCycle.ts
 init_src();
+var REVIEW_CYCLE_LIMIT_DEFAULT = 3;
+var REVIEW_CYCLE_LIMIT_CAP = 20;
+function validReviewCycleLimit(n) {
+  return n != null && Number.isInteger(n) && n >= 1 && n <= REVIEW_CYCLE_LIMIT_CAP;
+}
+function parseReviewCycleLimitEnv(raw) {
+  if (raw == null || raw.trim() === "") return REVIEW_CYCLE_LIMIT_DEFAULT;
+  const n = Number(raw);
+  return validReviewCycleLimit(n) ? n : REVIEW_CYCLE_LIMIT_DEFAULT;
+}
+var REVIEW_CYCLE_LIMIT = parseReviewCycleLimitEnv(process.env.SWARM_REVIEW_CYCLE_LIMIT);
+var configuredReviewCycleLimit = null;
+function configureReviewCycleLimit(n) {
+  configuredReviewCycleLimit = validReviewCycleLimit(n) ? n : null;
+}
+function effectiveReviewCycleLimit() {
+  return configuredReviewCycleLimit ?? REVIEW_CYCLE_LIMIT;
+}
+function reviewCyclesExhausted(run2) {
+  return (run2.review_cycle ?? 0) >= effectiveReviewCycleLimit();
+}
 function needsFixIteration(run2) {
   return run2.review_verdict === "changes" || isNegativeVerifyVerdict(toVerifyVerdict(run2.verify_verdict));
 }
 function reviewTransitionPatch(run2, prUrl) {
   const isFixIteration = needsFixIteration(run2);
   if (isFixIteration) {
+    if (reviewCyclesExhausted(run2)) {
+      return { isFixIteration: false, cycle: null, patch: { status: "review", pr_url: prUrl } };
+    }
     const cycle = (run2.review_cycle ?? 0) + 1;
     return {
       isFixIteration: true,
@@ -19122,7 +19164,87 @@ var BASE_MERGED_MARK = "\u0431\u0430\u0437\u0430 \u0432\u043B\u0438\u0442\u0430
 var BASE_NOOP_MARK = "\u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E";
 var RESOLVER_RESOLVED_MARK = "\u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442 \u0441 main \u0440\u0430\u0437\u0440\u0435\u0448\u0451\u043D \u0440\u0435\u0437\u043E\u043B\u0432\u0435\u0440\u043E\u043C";
 var REVIEW_SPAWN_LIMIT = Number(process.env.SWARM_REVIEW_SPAWN_LIMIT) || 3;
-var REVIEW_CYCLE_LIMIT = Number(process.env.SWARM_REVIEW_CYCLE_LIMIT) || 3;
+function reviewCycleHumanBody(cycle, limit) {
+  return `\u041B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u043F\u0440\u0430\u0432\u043E\u043A \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D (${cycle} \u0438\u0437 ${limit}) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A. \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0440\u0435\u0432\u044C\u044E, \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0438 \u043F\u043E\u0431\u0443\u0434\u043A\u0438 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u044B \u2014 PR \u043E\u0441\u0442\u0430\u0451\u0442\u0441\u044F \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443.`;
+}
+var CYCLE_TASK_COMMENT_SENT = "\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 \u043B\u0438\u043C\u0438\u0442\u0430 \u043A\u0440\u0443\u0433\u043E\u0432 \u0432 \u0437\u0430\u0434\u0430\u0447\u0443 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D";
+var CYCLE_PR_COMMENT_SENT = "\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 \u043B\u0438\u043C\u0438\u0442\u0430 \u043A\u0440\u0443\u0433\u043E\u0432 \u0432 PR \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D";
+var cycleCommentInflight = /* @__PURE__ */ new Map();
+function takeCycleCommentSlot(runId, side) {
+  let slot = cycleCommentInflight.get(runId);
+  if (!slot) {
+    slot = { task: false, pr: false };
+    cycleCommentInflight.set(runId, slot);
+  }
+  if (slot[side]) return false;
+  slot[side] = true;
+  return true;
+}
+function freeCycleCommentSlot(runId, side) {
+  const slot = cycleCommentInflight.get(runId);
+  if (slot) slot[side] = false;
+}
+async function noteReviewCyclesExhausted(deps, run2) {
+  const texts = deps.db.events(run2.id).map((e) => e.text ?? "");
+  const marked = texts.some((t) => t.includes(REVIEW_CYCLE_ESCALATION_MARK));
+  const taskSent = texts.some((t) => t.includes(CYCLE_TASK_COMMENT_SENT));
+  const prSent = texts.some((t) => t.includes(CYCLE_PR_COMMENT_SENT));
+  const cycle = run2.review_cycle ?? 0;
+  const body = reviewCycleHumanBody(cycle, effectiveReviewCycleLimit());
+  if (!marked) {
+    deps.db.addEvent(run2.id, "step", `${REVIEW_CYCLE_ESCALATION_MARK}: ${body}`);
+    try {
+      deps.narrate?.(body);
+    } catch {
+    }
+  }
+  if (deps.reportComment && !taskSent && takeCycleCommentSlot(run2.id, "task")) {
+    const ok = await deps.reportComment(
+      run2.task_slug,
+      body,
+      { swarmKind: "report", swarmDroneName: run2.name || "(\u0438\u043C\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E)", swarmReviewCycle: cycle },
+      run2.workspace_id
+    ).then(() => true).catch((e) => {
+      deps.db.addEvent(run2.id, "step", `\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 \xAB\u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A\xBB \u0432 \u0437\u0430\u0434\u0430\u0447\u0443 \u043D\u0435 \u0443\u0448\u0451\u043B: ${e instanceof Error ? e.message : String(e)}`);
+      return false;
+    });
+    if (ok) deps.db.addEvent(run2.id, "step", CYCLE_TASK_COMMENT_SENT);
+    freeCycleCommentSlot(run2.id, "task");
+  }
+  if (run2.pr_url && deps.prComment && !prSent && takeCycleCommentSlot(run2.id, "pr")) {
+    const ok = await deps.prComment(run2.pr_url, body).then(() => true).catch((e) => {
+      deps.db.addEvent(run2.id, "step", `\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 \xAB\u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A\xBB \u0432 PR \u043D\u0435 \u0443\u0448\u0451\u043B: ${e instanceof Error ? e.message : String(e)}`);
+      return false;
+    });
+    if (ok) deps.db.addEvent(run2.id, "step", CYCLE_PR_COMMENT_SENT);
+    freeCycleCommentSlot(run2.id, "pr");
+  }
+}
+function cycleHolder(db, run2) {
+  if (run2.kind === "hero" || run2.resolves_run_id != null) return null;
+  const parentId = run2.reviews_run_id ?? run2.verifies_run_id;
+  if (parentId != null) return db.getRun(parentId) ?? null;
+  return run2;
+}
+function cycleCapHolder(db, run2) {
+  const holder = cycleHolder(db, run2);
+  return holder && reviewCyclesExhausted(holder) ? holder : null;
+}
+var CYCLE_CAP_STOP_REASON = "\u043B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u043F\u0440\u0430\u0432\u043E\u043A \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A";
+async function handOffAtCycleCap(deps, run2, holder, where) {
+  await noteReviewCyclesExhausted(deps, holder);
+  const text = `${CYCLE_CAP_STOP_REASON} (${holder.review_cycle ?? 0} \u0438\u0437 ${effectiveReviewCycleLimit()}): ${where} \u2014 \u0441\u0435\u0441\u0441\u0438\u044E \u043D\u0435 \u043F\u043E\u0434\u043D\u0438\u043C\u0430\u044E`;
+  if (holder.id !== run2.id) {
+    if (run2.worktree_path) await deps.removeWorktree(run2.repo, run2.worktree_path).catch(() => {
+    });
+    deps.db.updateRun(run2.id, { status: "stopped", stop_reason: CYCLE_CAP_STOP_REASON });
+    deps.db.addEvent(run2.id, "stopped", text);
+    return;
+  }
+  if (run2.pr_url) deps.db.updateRun(run2.id, { status: "review", stop_reason: null });
+  else deps.db.updateRun(run2.id, { status: "paused", stop_reason: CYCLE_CAP_STOP_REASON });
+  deps.db.addEvent(run2.id, "step", text);
+}
 var CI_WAKE_LIMIT = Number(process.env.SWARM_CI_WAKE_LIMIT) || 3;
 var CI_WAKE_COOLDOWN_MS = Number(process.env.SWARM_CI_WAKE_COOLDOWN_MS) || 3 * 60 * 1e3;
 var CI_CHECK_COOLDOWN_MS = Number(process.env.SWARM_CI_CHECK_COOLDOWN_MS) || 60 * 1e3;
@@ -19149,7 +19271,7 @@ var CHANGES_WAKE_MARK = "\u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430
 var CHANGES_FIX_COST_MARK = "\u0442\u0440\u0430\u0442\u044B \u0434\u043E \u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438";
 var CHANGES_WAKE_FAILED_MARK = "\u043F\u043E\u0431\u0443\u0434\u043A\u0430 \u0441\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C";
 var BUDGET_STOP_REASON = "\u043D\u0435 \u0443\u043B\u043E\u0436\u0438\u043B\u0441\u044F \u0432 \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0442\u0440\u0430\u0442: \u0441\u0435\u0441\u0441\u0438\u044E \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u043B \u0431\u044E\u0434\u0436\u0435\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u0430";
-var NO_AUTO_WAKE_REASONS = [EXITED_NO_DONE_REASON, BUDGET_STOP_REASON, ABORTED_STOP_REASON, AWAITING_BUDGET_REASON];
+var NO_AUTO_WAKE_REASONS = [EXITED_NO_DONE_REASON, BUDGET_STOP_REASON, ABORTED_STOP_REASON, AWAITING_BUDGET_REASON, CYCLE_CAP_STOP_REASON];
 var REVIEW_NO_VERDICT_REASON = "\u0440\u0435\u0432\u044C\u044E \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u043E\u0441\u044C \u0431\u0435\u0437 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430: \u043D\u0438 approve, \u043D\u0438 changes \u2014 \u0437\u0430\u0441\u0447\u0438\u0442\u044B\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E, \u043D\u0443\u0436\u0435\u043D \u043D\u043E\u0432\u044B\u0439 \u0437\u0430\u0445\u043E\u0434 (TASWM-375)";
 function verdictCommentMark(createdAt) {
   return `\u043A\u043E\u043C\u043C\u0435\u043D\u0442-\u0432\u0435\u0440\u0434\u0438\u043A\u0442@${createdAt}`;
@@ -19312,7 +19434,9 @@ function reviewPhaseInputFor(deps, run2, projectWantsVerify = true) {
     reviewerDead,
     verifyVerdict: run2.verify_verdict,
     verifyExpected,
-    verifierDead
+    verifierDead,
+    // TASWM-606: потолок кругов важнее «чинит CI» и «ждёт ревьюера» — человека уже позвали.
+    cyclesExhausted: reviewCyclesExhausted(run2)
   };
 }
 async function refreshReviewPhases(deps) {
@@ -19605,11 +19729,13 @@ function relinkUnboundReviewers(deps) {
     narrate(deps, `${droneLabel(rv)} \u0440\u0430\u0431\u043E\u0442\u0430\u043B \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438 \u043A \u043F\u0440\u043E\u0433\u043E\u043D\u0443 \u2014 \u0441\u0432\u044F\u0437\u0430\u043B \u043F\u043E PR-\u0441\u0441\u044B\u043B\u043A\u0435, \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0442\u0435\u043F\u0435\u0440\u044C \u043B\u044F\u0436\u0435\u0442 \u0432 ${parent.task_slug}, \u0430 \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u043A\u043E\u043C\u043C\u0435\u043D\u0442 GitHub.`);
   }
 }
-var ESCALATION_LIMITS = { reviewSpawn: REVIEW_SPAWN_LIMIT, reviewCycle: REVIEW_CYCLE_LIMIT };
+function escalationLimits() {
+  return { reviewSpawn: REVIEW_SPAWN_LIMIT, reviewCycle: effectiveReviewCycleLimit() };
+}
 function deliberateReviewStop(db, run2) {
   const texts = db.events(run2.id).map((e) => e.text ?? "");
   const hit = findEscalation(texts, run2, "reviewer");
-  return hit?.stopReason?.(run2, ESCALATION_LIMITS) ?? null;
+  return hit?.stopReason?.(run2, escalationLimits()) ?? null;
 }
 function noteReviewBlocked(deps, run2, reason) {
   if (!shouldNoteReason(deps.db, run2.id, reason)) return;
@@ -19694,6 +19820,10 @@ async function spawnVerifiersForOpenPrs(deps, stormActive) {
       if (run2.kind !== "drone") continue;
       if (run2.reviews_run_id != null || run2.resolves_run_id != null || run2.verifies_run_id != null) continue;
       if (!run2.pr_url || !isGithubPrUrl(run2.pr_url)) continue;
+      if (reviewCyclesExhausted(run2)) {
+        await noteReviewCyclesExhausted(deps, run2);
+        continue;
+      }
       if (run2.verify_verdict != null) continue;
       if (deps.db.verifierCountFor(run2.id) > 0) continue;
       const attempts = deps.db.verifierAttemptCountFor(run2.id);
@@ -19719,6 +19849,18 @@ async function spawnVerifiersForOpenPrs(deps, stormActive) {
   }
 }
 var CONTINUE_NUDGE = "\u0422\u0432\u043E\u044F \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0430\u044F \u0441\u0435\u0441\u0441\u0438\u044F \u043E\u0431\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C (\u0441\u0435\u0442\u044C/\u043F\u0440\u043E\u0446\u0435\u0441\u0441) \u2014 \u0442\u044B headless-\u0434\u0440\u043E\u043D, \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0448\u044C \u0422\u0423 \u0416\u0415 \u0437\u0430\u0434\u0430\u0447\u0443. \u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0438 `git status`/`git log` \u0438 \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u0432\u043E\u0438\u0445 \u0448\u0430\u0433\u043E\u0432: \u0447\u0442\u043E \u0443\u0436\u0435 \u0441\u0434\u0435\u043B\u0430\u043D\u043E \u2014 \u041D\u0415 \u043F\u0435\u0440\u0435\u0434\u0435\u043B\u044B\u0432\u0430\u0439, \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438 \u0441 \u043C\u0435\u0441\u0442\u0430 \u043E\u0431\u0440\u044B\u0432\u0430. \u0414\u043E\u0432\u0435\u0434\u0438 \u0437\u0430\u0434\u0430\u0447\u0443 \u0434\u043E \u043A\u043E\u043D\u0446\u0430, \u041A\u041E\u041C\u041C\u0418\u0422\u042C \u0418 \u041F\u0423\u0428\u042C \u043F\u043E\u0441\u043B\u0435 \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0448\u0430\u0433\u0430, \u043E\u0442\u043A\u0440\u043E\u0439 PR \u0438 \u0432\u044B\u0437\u043E\u0432\u0438 done(pr_url). \u0412\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0432 stdout \u043D\u0435 \u0437\u0430\u0434\u0430\u0432\u0430\u0439 \u2014 \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0435\u0440\u0435\u0437 MCP-\u0442\u0443\u043B ask.";
+function buildSubmittedContinueNudge(opts) {
+  const verify = opts.verifySummary ? `\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E\u0449\u0435\u0433\u043E:
+${opts.verifySummary}` : "\u0412\u0435\u0440\u0434\u0438\u043A\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E\u0449\u0435\u0433\u043E \u0432 \u043B\u0435\u043D\u0442\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u2014 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0439 \u0435\u0433\u043E \u0441\u0430\u043C: `gh pr view --comments`.";
+  const review = opts.reviewSummary ? `\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430:
+${opts.reviewSummary}` : "";
+  return [
+    `\u0422\u044B \u0443\u0436\u0435 \u0441\u0434\u0430\u043B \u0440\u0430\u0431\u043E\u0442\u0443: PR ${opts.prUrl} \u043E\u0442\u043A\u0440\u044B\u0442. \u041D\u0415 \u0432\u044B\u0437\u044B\u0432\u0430\u0439 done() \u043D\u0430 \u0442\u043E\u043C \u0436\u0435 \u043A\u043E\u043C\u043C\u0438\u0442\u0435 \u2014 \u044D\u0442\u043E \u0441\u043E\u0436\u0436\u0451\u0442 \u0435\u0449\u0451 \u043E\u0434\u0438\u043D \u043A\u0440\u0443\u0433 \u043F\u0440\u0430\u0432\u043E\u043A \u0432\u043F\u0443\u0441\u0442\u0443\u044E.`,
+    verify,
+    review,
+    "\u041F\u0440\u043E\u0447\u0438\u0442\u0430\u0439 \u0432\u0435\u0440\u0434\u0438\u043A\u0442, \u043F\u043E\u0447\u0438\u043D\u0438 \u043F\u0440\u0438\u0447\u0438\u043D\u0443, \u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0442\u044C \u041D\u041E\u0412\u0423\u042E \u0440\u0430\u0431\u043E\u0442\u0443 \u0438 \u0437\u0430\u043F\u0443\u0448\u044C \u0432 \u0442\u0443 \u0436\u0435 \u0432\u0435\u0442\u043A\u0443. \u0422\u043E\u043B\u044C\u043A\u043E \u043F\u043E\u0441\u043B\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u043A\u043E\u043C\u043C\u0438\u0442\u0430 \u0432\u044B\u0437\u043E\u0432\u0438 done(pr_url) \u0441 \u0442\u043E\u0439 \u0436\u0435 \u0441\u0441\u044B\u043B\u043A\u043E\u0439. \u0412\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0432 stdout \u043D\u0435 \u0437\u0430\u0434\u0430\u0432\u0430\u0439 \u2014 \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0435\u0440\u0435\u0437 MCP-\u0442\u0443\u043B ask."
+  ].filter((part) => part.length > 0).join("\n\n");
+}
 function buildCiWakeNudge(summary) {
   return [
     "\u{1F534} CI \u0443\u043F\u0430\u043B \u043D\u0430 \u0442\u0432\u043E\u0451\u043C PR \u2014 \u0440\u043E\u0439 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043B `gh pr checks` \u0438 \u043F\u0440\u0438\u0441\u043B\u0430\u043B \u0442\u0435\u0431\u0435 \u0441\u0436\u0430\u0442\u044B\u0439 \u0440\u0430\u0437\u0431\u043E\u0440 \u0444\u0435\u0439\u043B\u0430 (\u043D\u0435 \u0432\u0435\u0441\u044C \u043B\u043E\u0433, \u0442\u043E\u043A\u0435\u043D-\u0434\u0438\u0441\u0446\u0438\u043F\u043B\u0438\u043D\u0430):",
@@ -20040,6 +20182,15 @@ function lastVerdictEvent(db, reviewRunId) {
 function lastChangesSummary(db, reviewRunId) {
   return lastVerdictEvent(db, reviewRunId)?.text ?? null;
 }
+var VERIFY_EVENT_PREFIXES = ["\u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u043E\u0442", "\u0432\u0435\u0440\u0434\u0438\u043A\u0442 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u043F\u043E\u0434\u0445\u0432\u0430\u0447\u0435\u043D \u0438\u0437 PR-\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430"];
+function lastVerifySummary(db, runId) {
+  const events = db.events(runId);
+  for (let i = events.length - 1; i >= 0; i--) {
+    const text = events[i].text ?? "";
+    if (VERIFY_EVENT_PREFIXES.some((p) => text.startsWith(p))) return text;
+  }
+  return null;
+}
 function changesVerdictAt(db, reviewRunId) {
   return lastVerdictEvent(db, reviewRunId)?.at ?? null;
 }
@@ -20219,6 +20370,11 @@ async function resurrectStormDead(deps, worktreeExists, hasTranscript, opts) {
   let resurrected = 0;
   for (const run2 of deps.db.listRuns("storm_dead")) {
     if (countActiveDrones(deps.db) >= cap) break;
+    const capHolder = cycleCapHolder(deps.db, run2);
+    if (capHolder) {
+      await handOffAtCycleCap(deps, run2, capHolder, "\u043E\u0436\u0438\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u043E\u0441\u043B\u0435 \u0448\u0442\u043E\u0440\u043C\u0430");
+      continue;
+    }
     if (!await projectQuotaGateAllows(deps, run2)) continue;
     const wt = run2.worktree_path;
     const mode = !!wt && worktreeExists(wt) && hasTranscript(run2) ? "continue" : "fresh";
@@ -20242,6 +20398,16 @@ async function wakeRun(deps, runId, opts = {}) {
   }
   if (run2.pid != null && deps.isAlive(run2.pid)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0443\u0436\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 (pid ${run2.pid}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
   if (isTerminalStatus(run2.status)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B\u0435\u043D (${run2.status}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
+  const capHolder = cycleCapHolder(deps.db, run2);
+  if (capHolder) {
+    await noteReviewCyclesExhausted(deps, capHolder);
+    const limit = effectiveReviewCycleLimit();
+    const whose = capHolder.id === run2.id ? `\u043F\u0440\u043E\u0433\u043E\u043D #${runId}` : `\u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u044B\u0439 \u043F\u0440\u043E\u0433\u043E\u043D #${capHolder.id} (\u0434\u043B\u044F #${runId})`;
+    return {
+      ok: false,
+      why: `${whose} \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043B \u043B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u043F\u0440\u0430\u0432\u043E\u043A (${capHolder.review_cycle ?? 0} \u0438\u0437 ${limit}) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A, \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u043F\u043E\u0431\u0443\u0434\u043A\u0438 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u044B`
+    };
+  }
   const stoppedForHuman = deps.db.events(run2.id).some((e) => isEscalationText(e.text ?? "", run2, "author"));
   if (run2.status === "review" && run2.pr_url && !needsFixIteration(run2) && !stoppedForHuman) {
     return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0443\u0436\u0435 \u0441\u0434\u0430\u043D \u043D\u0430 \u0440\u0435\u0432\u044C\u044E (${run2.pr_url}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E; \u043F\u0440\u0430\u0432\u043A\u0438 \u043F\u043E\u0434\u043D\u0438\u043C\u0435\u0442 \u0440\u043E\u0439 \u043F\u043E \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0443` };
@@ -20255,8 +20421,11 @@ async function wakeRun(deps, runId, opts = {}) {
     return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u2014 \u0441\u043B\u0443\u0436\u0435\u0431\u043D\u044B\u0439 (\u0440\u0435\u0432\u044C\u044E\u0435\u0440/\u0440\u0435\u0437\u043E\u043B\u0432\u0435\u0440), \u0430 \u0441\u0435\u0441\u0441\u0438\u044E \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u043C: fresh \u043F\u043E\u0442\u0435\u0440\u044F\u043B \u0431\u044B \u0435\u0433\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442` };
   }
   const mode = canContinue ? "continue" : "fresh";
+  const verifySummary = lastVerifySummary(deps.db, run2.id);
+  const reviewSummary = lastChangesSummary(deps.db, run2.id);
+  const nudge = mode === "continue" && !isSubrun(run2) && run2.kind !== "hero" && run2.pr_url && (needsFixIteration(run2) || verifySummary || reviewSummary) ? buildSubmittedContinueNudge({ prUrl: run2.pr_url, verifySummary, reviewSummary }) : void 0;
   try {
-    await deps.respawn(run2, mode);
+    await deps.respawn(run2, mode, nudge);
   } catch (e) {
     return { ok: false, why: `\u043F\u043E\u0431\u0443\u0434\u043A\u0430 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${runId} \u0441\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C: ${String(e)}` };
   }
@@ -20448,6 +20617,10 @@ function closeCiWatch(deps, run2, mark, why, narration) {
 }
 async function wakeAuthorOnRedCi(deps, run2, now, ci, worktreeExists, hasTranscript, droneCap) {
   if (run2.pid != null && deps.isAlive(run2.pid)) return false;
+  if (reviewCyclesExhausted(run2)) {
+    await noteReviewCyclesExhausted(deps, run2);
+    return false;
+  }
   if (deps.resourcesOk && !deps.resourcesOk()) return false;
   if (countActiveDrones(deps.db) >= droneCap) return false;
   if (!await projectQuotaGateAllows(deps, run2)) return false;
@@ -20517,6 +20690,15 @@ async function wakeReviewerOnCiReady(deps, run2, over) {
   const reviewer = awaitingCiReviewer(deps.db, run2);
   if (!reviewer) return false;
   if (reviewer.pid != null && deps.isAlive(reviewer.pid)) return false;
+  if (reviewCyclesExhausted(run2)) {
+    await noteReviewCyclesExhausted(deps, run2);
+    deps.db.addEvent(
+      run2.id,
+      "ci_checked",
+      `${ciReadyLabel(over)} \u2014 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430 \u043D\u0435 \u0431\u0443\u0436\u0443: \u043B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u043F\u0440\u0430\u0432\u043E\u043A \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D, \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`
+    );
+    return true;
+  }
   if (deps.resourcesOk && !deps.resourcesOk()) {
     deps.db.addEvent(run2.id, "ci_checked", `${ciReadyLabel(over)} \u2014 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u0436\u0434\u0451\u0442, \u043C\u0430\u0448\u0438\u043D\u0430 \u043F\u0435\u0440\u0435\u0433\u0440\u0443\u0436\u0435\u043D\u0430`);
     return true;
@@ -20591,7 +20773,8 @@ async function spawnFreshReviewerAfterStall(deps, run2, why) {
     deps.db.addEvent(run2.id, "step", `\u0441\u0432\u0435\u0436\u0438\u0439 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D: ${live2[0].name} \u0435\u0449\u0451 \u0436\u0438\u0432 (${live2[0].stop_reason ?? live2[0].status})`);
     return;
   }
-  if (run2.review_cycle >= REVIEW_CYCLE_LIMIT || deps.db.reviewerAttemptCountFor(run2.id) >= REVIEW_SPAWN_LIMIT) {
+  if (reviewCyclesExhausted(run2) || deps.db.reviewerAttemptCountFor(run2.id) >= REVIEW_SPAWN_LIMIT) {
+    if (reviewCyclesExhausted(run2)) await noteReviewCyclesExhausted(deps, run2);
     return;
   }
   const gate = await prGateForReviewer(deps, run2, run2.pr_url, "\u043F\u043E\u043A\u0430 \u0436\u0434\u0430\u043B CI");
@@ -20615,7 +20798,10 @@ async function wakeAuthorOnChanges(deps, snapshot, now, droneCap) {
   if (deps.resourcesOk && !deps.resourcesOk()) return false;
   if (countActiveDrones(deps.db) >= droneCap) return false;
   if (!await projectQuotaGateAllows(deps, run2)) return false;
-  if (run2.review_cycle >= REVIEW_CYCLE_LIMIT) return false;
+  if (reviewCyclesExhausted(run2)) {
+    await noteReviewCyclesExhausted(deps, run2);
+    return false;
+  }
   const prUrl = run2.pr_url;
   const events = deps.db.events(run2.id);
   const mark = `${CHANGES_WAKE_ESCALATION_MARK} (\u043A\u0440\u0443\u0433 ${run2.review_cycle ?? 0})`;
@@ -21168,6 +21354,11 @@ async function resumeWatchdogParked(deps, droneCap) {
   }
   if (!candidate) return;
   if (candidate.pid != null && deps.isAlive(candidate.pid)) return;
+  const capHolder = cycleCapHolder(deps.db, candidate);
+  if (capHolder) {
+    await handOffAtCycleCap(deps, candidate, capHolder, "\u0432\u043E\u0437\u0432\u0440\u0430\u0442 \u0438\u0437 \u043F\u0430\u0440\u043A\u043E\u0432\u043A\u0438 \u0441\u0442\u043E\u0440\u043E\u0436\u0430");
+    return;
+  }
   const worktreeExists = deps.worktreeExists ?? existsSync22;
   const hasTranscript = deps.hasTranscript ?? executorHasSession;
   const wt = candidate.worktree_path;
@@ -21227,6 +21418,11 @@ async function applyWatchdogAction(deps, action) {
     }
     case "fresh": {
       if (!deps.respawn) return;
+      const capHolder = cycleCapHolder(deps.db, action.run);
+      if (capHolder) {
+        await handOffAtCycleCap(deps, action.run, capHolder, "\u0441\u0432\u0435\u0436\u0438\u0439 \u043F\u043E\u0434\u044A\u0451\u043C \u0441\u0442\u043E\u0440\u043E\u0436\u0435\u043C \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0430");
+        return;
+      }
       try {
         await deps.respawn(action.run, "fresh", buildFreshRestartNudge(action.run));
         deps.db.addEvent(action.run.id, "resumed", `\u0441\u0442\u043E\u0440\u043E\u0436 \u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0430: ${action.reason}`);
@@ -21470,6 +21666,11 @@ async function manageRelief(deps, now, droneCap, stormActive) {
       }
       if (now - loopEntry.lastPauseAt < reliefBackoffMs(loopEntry.pauses, cfg.rampWindowMs, loopCfg)) return;
     }
+    const capHolder = cycleCapHolder(deps.db, resumeCandidate);
+    if (capHolder) {
+      await handOffAtCycleCap(deps, resumeCandidate, capHolder, "\u0432\u043E\u0437\u0432\u0440\u0430\u0442 \u0438\u0437 \u0440\u0430\u0437\u0433\u0440\u0443\u0437\u043A\u0438");
+      return;
+    }
     const wt = resumeCandidate.worktree_path;
     const canContinue = !!wt && worktreeAndTranscriptAlive(deps, resumeCandidate);
     const mode = canContinue ? "continue" : "fresh";
@@ -21890,6 +22091,8 @@ async function answerBudgetQuestions(deps, ctx) {
         respawn: deps.respawn,
         ...deps.worktreeExists ? { worktreeExists: deps.worktreeExists } : {},
         ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {},
+        ...deps.prComment ? { prComment: deps.prComment } : {},
+        ...deps.reportComment ? { reportComment: deps.reportComment } : {},
         narrate: (m) => narrate(deps, m)
       },
       run2.id,
@@ -21899,6 +22102,11 @@ async function answerBudgetQuestions(deps, ctx) {
       budgetSyncAt.delete(run2.id);
       continue;
     }
+    if (reviewCyclesExhausted(run2) && run2.pr_url) {
+      deps.db.updateRun(run2.id, { status: "review", stop_reason: null });
+      budgetSyncAt.delete(run2.id);
+      continue;
+    }
     const note = `\u043F\u043E\u0431\u0443\u0434\u043A\u0430 \u043F\u043E \u043E\u0442\u0432\u0435\u0442\u0443 \xAB\u0434\u0430\xBB \u043D\u0435 \u0432\u044B\u0448\u043B\u0430: ${woken.why} \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u044E`;
     if (deps.db.events(run2.id).at(-1)?.text !== note) deps.db.addEvent(run2.id, "step", note);
   }
@@ -22284,11 +22492,8 @@ async function tickOnce(deps) {
       // рано, спавнить второго нельзя.
       liveOrWaitingReviewers(deps.db, run2.id).length === 0;
       if (reviewerGatesOk && deps.spawnReviewer && await projectWantsChecks(deps, run2)) {
-        if (run2.review_cycle >= REVIEW_CYCLE_LIMIT) {
-          if (!deps.db.events(run2.id).some((e) => e.kind === "step" && (e.text ?? "").includes(REVIEW_CYCLE_ESCALATION_MARK))) {
-            deps.db.addEvent(run2.id, "step", `${REVIEW_CYCLE_ESCALATION_MARK}: ${run2.review_cycle} \u0446\u0438\u043A\u043B(\u043E\u0432) \u0440\u0435\u0432\u044C\u044E-\u0444\u0438\u043A\u0441\u043E\u0432 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`);
-            narrate(deps, `\u0420\u0435-\u0440\u0435\u0432\u044C\u044E ${droneLabel(run2)} \u0437\u0430\u0446\u0438\u043A\u043B\u0438\u043B\u043E\u0441\u044C (${run2.review_cycle} \u0444\u0438\u043A\u0441-\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0439) \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A.`);
-          }
+        if (reviewCyclesExhausted(run2)) {
+          await noteReviewCyclesExhausted(deps, run2);
           continue;
         }
         const attempts = deps.db.reviewerAttemptCountFor(run2.id);
@@ -22444,6 +22649,14 @@ async function tickOnce(deps) {
         continue;
       }
     }
+    if (!alive && run2.status === "running" && !isSubrun(run2) && run2.kind !== "hero") {
+      const capHolder = cycleCapHolder(deps.db, run2);
+      if (capHolder) {
+        await handOffAtCycleCap(deps, run2, capHolder, `\u0441\u0435\u0441\u0441\u0438\u044F \u0430\u0432\u0442\u043E\u0440\u0430 \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u0430\u0441\u044C (${outcome})`);
+        narrate(deps, `${droneLabel(run2)} \u0443\u043F\u0451\u0440\u0441\u044F \u0432 \u043B\u0438\u043C\u0438\u0442 \u043A\u0440\u0443\u0433\u043E\u0432 \u043F\u0440\u0430\u0432\u043E\u043A \u2014 \u043D\u0435 \u043F\u043E\u0434\u043D\u0438\u043C\u0430\u044E, PR \u043E\u0441\u0442\u0430\u0451\u0442\u0441\u044F \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443.`);
+        continue;
+      }
+    }
     if (!alive && (outcome === "graceful" || outcome === "aborted") && run2.status === "running" && !isSubrun(run2) && // суб-дроны (резолвер/ревьюер/верификатор) — своими ветками ниже, TASWM-528
     run2.kind !== "hero") {
       if (!wasAborted(outcome) && run2.pr_url) {
@@ -22549,6 +22762,11 @@ async function tickOnce(deps) {
       }
     }
     if (!alive && outcome === "graceful" && run2.status === "running" && isSubrun(run2)) {
+      const capHolder = cycleCapHolder(deps.db, run2);
+      if (capHolder) {
+        await handOffAtCycleCap(deps, run2, capHolder, "\u0441\u0443\u0431-\u0434\u0440\u043E\u043D \u0432\u044B\u0448\u0435\u043B \u0441\u0430\u043C, \u043D\u0435 \u0432\u044B\u043D\u0435\u0441\u044F \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430");
+        continue;
+      }
       const wt = run2.worktree_path;
       const canContinue = !!wt && worktreeExists(wt) && hasTranscript(run2);
       if (deps.respawn && canContinue && run2.respawns < RESPAWN_LIMIT) {
@@ -22624,6 +22842,11 @@ async function tickOnce(deps) {
       if (isReliefPause(run2.stop_reason)) continue;
       if (NO_AUTO_WAKE_REASONS.some((r) => run2.stop_reason?.startsWith(r))) continue;
       if (run2.pid != null && deps.isAlive(run2.pid)) continue;
+      const capHolder = cycleCapHolder(deps.db, run2);
+      if (capHolder) {
+        await handOffAtCycleCap(deps, run2, capHolder, "\u043F\u0440\u043E\u0431\u0443\u0436\u0434\u0435\u043D\u0438\u0435 \u0437\u0430\u043C\u0435\u0440\u0448\u0435\u0433\u043E");
+        continue;
+      }
       if (!await projectQuotaGateAllows(deps, run2)) continue;
       const wt = run2.worktree_path;
       const canContinue = !!wt && worktreeExists(wt) && hasTranscript(run2);
@@ -23386,9 +23609,8 @@ async function runDaemon(opts) {
     recordModelRef: (runId, ref, run2) => {
       if (runModelRefPin.size > 4096) runModelRefPin.clear();
       runModelRefPin.set(runId, ref);
-      if (run2 && !run2.model && !isReviewKind(run2.kind)) {
-        db.updateRun(runId, { model: `${ref.providerId}/${ref.model}` });
-      }
+      const model = modelRefToRecord(run2, ref);
+      if (model) db.updateRun(runId, { model });
     },
     maxCostUsd: () => lastMaxCostUsd,
     // TASWM-535: поднятый потолок тяжёлого прогона живёт в его ленте — спавн читает её
@@ -23574,6 +23796,7 @@ async function runDaemon(opts) {
           lastSwarmModels = settings.models;
           lastSwarmEfforts = settings.efforts;
           lastMaxCostUsd = settings.maxCostUsd;
+          configureReviewCycleLimit(settings.reviewCycleLimit);
         }
         return settings?.maxDrones ?? null;
       },
@@ -24307,7 +24530,18 @@ async function runDaemon(opts) {
       wakeRun: async (slug) => {
         const run2 = db.activeRunForSlug(slug);
         if (!run2) return null;
-        return wakeRun({ db, isAlive: pidAlive, respawn: deps.respawn, narrate: narrator.narrate, ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {} }, run2.id);
+        return wakeRun(
+          {
+            db,
+            isAlive: pidAlive,
+            respawn: deps.respawn,
+            narrate: narrator.narrate,
+            ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {},
+            ...deps.prComment ? { prComment: deps.prComment } : {},
+            ...deps.reportComment ? { reportComment: deps.reportComment } : {}
+          },
+          run2.id
+        );
       },
       update: async (onStep) => {
         const pm = detectGlobalPm(process.argv[1]);
@@ -24457,7 +24691,18 @@ async function runDaemon(opts) {
     // Побудка прогона по id (TASWM-240): вход для `swarm wake <id>` — тот же respawn с
     // полными deps демона (getTask/verifyMode/реестр репо), что и авто-оживление, и по
     // зеркалу демона, а не по короткоживущему стору CLI.
-    wake: (runId) => wakeRun({ db, isAlive: pidAlive, respawn: deps.respawn, narrate: narrator.narrate, ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {} }, runId),
+    wake: (runId) => wakeRun(
+      {
+        db,
+        isAlive: pidAlive,
+        respawn: deps.respawn,
+        narrate: narrator.narrate,
+        ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {},
+        ...deps.prComment ? { prComment: deps.prComment } : {},
+        ...deps.reportComment ? { reportComment: deps.reportComment } : {}
+      },
+      runId
+    ),
     replay: (qid, chosen) => replayDecision(
       {
         db,
@@ -24592,6 +24837,7 @@ export {
   CI_WAKE_LIMIT,
   CONFLICT_RESOLVE_COOLDOWN_MS,
   CONTINUE_NUDGE,
+  CYCLE_CAP_STOP_REASON,
   DEAD_HOLDER_SILENCE_MS,
   EXITED_CONTINUE_NUDGE,
   EXITED_NO_DONE_REASON,
@@ -24637,12 +24883,17 @@ export {
   buildResolverPrompt,
   buildReviewChecklist,
   buildReviewerPrompt,
+  buildSubmittedContinueNudge,
   buildVerifierPrompt,
   cancelRun,
   capacityProvenance,
+  configureReviewCycleLimit,
+  cycleCapHolder,
+  effectiveReviewCycleLimit,
   hasLiveDescendant,
   isSubrun,
   lastChangesSummary,
+  lastVerifySummary,
   listDroneProcesses,
   livePpids,
   makeCheckerAttachmentsReader,
@@ -24651,6 +24902,8 @@ export {
   resolveConflict,
   respawnRun,
   reviewBudgetMark,
+  reviewCycleHumanBody,
+  reviewCyclesExhausted,
   reviewDefectClasses,
   reviewUnrecoverableMark,
   reviveStuck,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.65",
+  "version": "0.6.67",
   "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": "254a8954d2f53f168b6cebc23b2daa0bc1562426",
+  "gitHead": "92a3176867bc1668677a4b6a25e02e0cb6661ce0",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",