@taskless-app/swarm 0.6.50 → 0.6.52

package/dist/cli.js

@@ -164,6 +164,104 @@ var init_types = __esm({
   }
 });
 
+// ../swarm-core/src/verifyVerdict.ts
+function isVerifyVerdict(v) {
+  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
+}
+function toVerifyVerdict(v) {
+  return isVerifyVerdict(v) ? v : null;
+}
+function isNegativeVerifyVerdict(v) {
+  return v === "not_reproduced" || v === "found_issues";
+}
+function verifyVerdictLabel(v) {
+  switch (v) {
+    case "confirmed":
+      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
+    case "not_reproduced":
+      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
+    case "found_issues":
+      return "\u041D\u0410\u0428\u0401\u041B";
+  }
+}
+function verifyStats(runs) {
+  let confirmed = 0;
+  let notReproduced = 0;
+  let foundIssues = 0;
+  for (const r of runs) {
+    switch (toVerifyVerdict(r.verify_verdict)) {
+      case "confirmed":
+        confirmed++;
+        break;
+      case "not_reproduced":
+        notReproduced++;
+        break;
+      case "found_issues":
+        foundIssues++;
+        break;
+      default:
+        break;
+    }
+  }
+  const negative = notReproduced + foundIssues;
+  const total = confirmed + negative;
+  return { total, confirmed, notReproduced, foundIssues, negative, negativeShare: total ? negative / total : 0 };
+}
+function verifyStatsByDrone(runs) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const r of runs) {
+    if (!toVerifyVerdict(r.verify_verdict)) continue;
+    const name = (r.name ?? "").trim() || "(\u0438\u043C\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E)";
+    const bucket = byName.get(name);
+    if (bucket) bucket.push(r);
+    else byName.set(name, [r]);
+  }
+  return [...byName.entries()].map(([name, rs]) => ({ name, ...verifyStats(rs) })).sort((a, b) => b.negative - a.negative || b.total - a.total || a.name.localeCompare(b.name));
+}
+function verifyStatsLine(s) {
+  if (!s.total) return "\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442";
+  const pct = Math.round(s.negativeShare * 100);
+  return `\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 ${s.total} \xB7 \u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 ${s.negative} (${pct}%): \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u043B\u043E\u0441\u044C ${s.notReproduced}, \u043D\u0430\u0448\u043B\u0438 \u0434\u0435\u0444\u0435\u043A\u0442 ${s.foundIssues}`;
+}
+var VERIFY_VERDICTS, VERIFY_VERDICT_SET;
+var init_verifyVerdict = __esm({
+  "../swarm-core/src/verifyVerdict.ts"() {
+    "use strict";
+    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
+    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
+  }
+});
+
+// ../swarm-core/src/reviewPhase.ts
+function reviewPhaseKindOf(label2) {
+  if (!label2) return null;
+  return PHASE_BY_LENGTH.find((k) => label2.startsWith(REVIEW_PHASE_TEXT[k])) ?? null;
+}
+var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
+var init_reviewPhase = __esm({
+  "../swarm-core/src/reviewPhase.ts"() {
+    "use strict";
+    init_verifyVerdict();
+    REVIEW_PHASE_TEXT = {
+      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
+      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
+      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
+      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
+      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
+      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
+      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"
+    };
+    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
+      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
+    );
+  }
+});
+
 // ../swarm-core/src/timeline.ts
 function resolveDepRef(ref, lk) {
   const mapped = lk.slugByCuid.get(ref);
@@ -335,7 +433,8 @@ function computeCounters(lanes) {
       if (l.dependsOn.some((d) => !d.met)) c.waitingDep++;
       else c.waitingSlot++;
     } else if (l.status === "review") {
-      if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
+      if (reviewPhaseKindOf(l.reviewPhase) === "ready_awaiting_ci") c.waitingCI++;
+      else if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
       else c.waitingCI++;
     }
   }
@@ -345,103 +444,11 @@ var DEFAULT_RUN_MS;
 var init_timeline = __esm({
   "../swarm-core/src/timeline.ts"() {
     "use strict";
+    init_reviewPhase();
     DEFAULT_RUN_MS = 25 * 6e4;
   }
 });
 
-// ../swarm-core/src/verifyVerdict.ts
-function isVerifyVerdict(v) {
-  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
-}
-function toVerifyVerdict(v) {
-  return isVerifyVerdict(v) ? v : null;
-}
-function isNegativeVerifyVerdict(v) {
-  return v === "not_reproduced" || v === "found_issues";
-}
-function verifyVerdictLabel(v) {
-  switch (v) {
-    case "confirmed":
-      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
-    case "not_reproduced":
-      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
-    case "found_issues":
-      return "\u041D\u0410\u0428\u0401\u041B";
-  }
-}
-function verifyStats(runs) {
-  let confirmed = 0;
-  let notReproduced = 0;
-  let foundIssues = 0;
-  for (const r of runs) {
-    switch (toVerifyVerdict(r.verify_verdict)) {
-      case "confirmed":
-        confirmed++;
-        break;
-      case "not_reproduced":
-        notReproduced++;
-        break;
-      case "found_issues":
-        foundIssues++;
-        break;
-      default:
-        break;
-    }
-  }
-  const negative = notReproduced + foundIssues;
-  const total = confirmed + negative;
-  return { total, confirmed, notReproduced, foundIssues, negative, negativeShare: total ? negative / total : 0 };
-}
-function verifyStatsByDrone(runs) {
-  const byName = /* @__PURE__ */ new Map();
-  for (const r of runs) {
-    if (!toVerifyVerdict(r.verify_verdict)) continue;
-    const name = (r.name ?? "").trim() || "(\u0438\u043C\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E)";
-    const bucket = byName.get(name);
-    if (bucket) bucket.push(r);
-    else byName.set(name, [r]);
-  }
-  return [...byName.entries()].map(([name, rs]) => ({ name, ...verifyStats(rs) })).sort((a, b) => b.negative - a.negative || b.total - a.total || a.name.localeCompare(b.name));
-}
-function verifyStatsLine(s) {
-  if (!s.total) return "\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442";
-  const pct = Math.round(s.negativeShare * 100);
-  return `\u0432\u0435\u0440\u0434\u0438\u043A\u0442\u043E\u0432 ${s.total} \xB7 \u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 ${s.negative} (${pct}%): \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u043B\u043E\u0441\u044C ${s.notReproduced}, \u043D\u0430\u0448\u043B\u0438 \u0434\u0435\u0444\u0435\u043A\u0442 ${s.foundIssues}`;
-}
-var VERIFY_VERDICTS, VERIFY_VERDICT_SET;
-var init_verifyVerdict = __esm({
-  "../swarm-core/src/verifyVerdict.ts"() {
-    "use strict";
-    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
-    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
-  }
-});
-
-// ../swarm-core/src/reviewPhase.ts
-var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
-var init_reviewPhase = __esm({
-  "../swarm-core/src/reviewPhase.ts"() {
-    "use strict";
-    init_verifyVerdict();
-    REVIEW_PHASE_TEXT = {
-      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
-      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
-      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
-      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
-      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
-      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
-      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",
-      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"
-    };
-    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
-      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
-    );
-  }
-});
-
 // ../swarm-core/src/mergeGate.ts
 function computeMergeGate(input) {
   if (!input.hasRun) {
@@ -1716,7 +1723,7 @@ var init_effort = __esm({
 });
 
 // ../swarm-core/src/queuePlan.ts
-var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS, QUEUE_REVIEW_TAIL_MS;
+var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS;
 var init_queuePlan = __esm({
   "../swarm-core/src/queuePlan.ts"() {
     "use strict";
@@ -1727,7 +1734,6 @@ var init_queuePlan = __esm({
     MIN_MS = 6e4;
     QUEUE_NOMINAL_RUN_MS = 25 * MIN_MS;
     QUEUE_MIN_TAIL_MS = 3 * MIN_MS;
-    QUEUE_REVIEW_TAIL_MS = 10 * MIN_MS;
   }
 });
 
@@ -3486,7 +3492,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.50",
+      version: "0.6.52",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3537,7 +3543,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "859ffe2d91bf4c791af067147515b14a41b96739"
+      gitHead: "f77e0473fd2f80e4418ceadd1b29b9a70241fc04"
     };
   }
 });

package/dist/overmind.js

@@ -133,6 +133,123 @@ var init_types = __esm({
   }
 });
 
+// ../swarm-core/src/verifyVerdict.ts
+function isVerifyVerdict(v) {
+  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
+}
+function toVerifyVerdict(v) {
+  return isVerifyVerdict(v) ? v : null;
+}
+function isNegativeVerifyVerdict(v) {
+  return v === "not_reproduced" || v === "found_issues";
+}
+function verifyVerdictLabel(v) {
+  switch (v) {
+    case "confirmed":
+      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
+    case "not_reproduced":
+      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
+    case "found_issues":
+      return "\u041D\u0410\u0428\u0401\u041B";
+  }
+}
+function parseVerifyVerdictComment(text) {
+  const line = (text ?? "").split("\n").find((l) => l.trim().length > 0);
+  if (!line) return null;
+  let best = null;
+  for (const [verdict, marks] of VERDICT_MARKS) {
+    for (const mark of marks) {
+      const at = line.indexOf(mark);
+      if (at < 0) continue;
+      if (!best || at < best.at) best = { verdict, at };
+    }
+  }
+  return best?.verdict ?? null;
+}
+var VERIFY_VERDICTS, VERIFY_VERDICT_SET, VERDICT_MARKS;
+var init_verifyVerdict = __esm({
+  "../swarm-core/src/verifyVerdict.ts"() {
+    "use strict";
+    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
+    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
+    VERDICT_MARKS = [
+      ["not_reproduced", ["\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F", "NOT REPRODUCED", "\u041D\u0415 \u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E", "NOT CONFIRMED"]],
+      ["found_issues", ["\u041D\u0410\u0428\u0401\u041B", "\u041D\u0410\u0428\u0415\u041B", "FOUND"]],
+      ["confirmed", ["\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E", "CONFIRMED"]]
+    ];
+  }
+});
+
+// ../swarm-core/src/reviewPhase.ts
+function reviewPhaseKindOf(label2) {
+  if (!label2) return null;
+  return PHASE_BY_LENGTH.find((k) => label2.startsWith(REVIEW_PHASE_TEXT[k])) ?? null;
+}
+function computeReviewPhase(input) {
+  const { reviewVerdict, ciRed } = input;
+  const verifyVerdict = input.verifyVerdict ?? null;
+  if (!ciRed && isNegativeVerifyVerdict(verifyVerdict)) {
+    const kind = verifyVerdict === "found_issues" ? "verify_found" : "verify_not_reproduced";
+    return { kind, label: REVIEW_PHASE_TEXT[kind], ready: false };
+  }
+  if (reviewVerdict === "approve" && !ciRed) {
+    if (verifyVerdict === "confirmed" || input.verifyExpected === false) {
+      if (input.ciGreen !== true) {
+        return { kind: "ready_awaiting_ci", label: REVIEW_PHASE_TEXT.ready_awaiting_ci, ready: false };
+      }
+      return { kind: "ready", label: REVIEW_PHASE_TEXT.ready, ready: true };
+    }
+    if (input.verifierDead) {
+      return { kind: "verify_dead", label: REVIEW_PHASE_TEXT.verify_dead, ready: true };
+    }
+    return { kind: "awaiting_verify", label: REVIEW_PHASE_TEXT.awaiting_verify, ready: false };
+  }
+  if (ciRed) {
+    const jobs = (input.ciFailing ?? []).filter((j) => j && j !== "?");
+    const label3 = jobs.length ? `${REVIEW_PHASE_TEXT.ci_fixing}: ${jobs.join(", ")}` : REVIEW_PHASE_TEXT.ci_fixing;
+    return { kind: "ci_fixing", label: label3, ready: false };
+  }
+  if (reviewVerdict === "changes") {
+    return { kind: "changes", label: REVIEW_PHASE_TEXT.changes, ready: false };
+  }
+  if (input.reviewerName) {
+    return { kind: "in_review", label: `\u041D\u0430 \u0440\u0435\u0432\u044C\u044E \u0443 ${input.reviewerName}`, ready: false };
+  }
+  if (input.reviewerDead) {
+    return { kind: "reviewer_dead", label: REVIEW_PHASE_TEXT.reviewer_dead, ready: true };
+  }
+  const p = input.ciProgress;
+  if (p && p.total > 0 && p.pass >= p.total) {
+    return { kind: "awaiting_reviewer", label: REVIEW_PHASE_TEXT.awaiting_reviewer, ready: false };
+  }
+  const label2 = p && p.total > 0 ? `${REVIEW_PHASE_TEXT.checks} \u2014 CI ${p.pass}/${p.total}` : REVIEW_PHASE_TEXT.checks;
+  return { kind: "checks", label: label2, ready: false };
+}
+var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
+var init_reviewPhase = __esm({
+  "../swarm-core/src/reviewPhase.ts"() {
+    "use strict";
+    init_verifyVerdict();
+    REVIEW_PHASE_TEXT = {
+      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
+      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
+      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
+      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
+      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
+      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
+      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
+      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"
+    };
+    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
+      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
+    );
+  }
+});
+
 // ../swarm-core/src/timeline.ts
 function resolveDepRef(ref, lk) {
   const mapped = lk.slugByCuid.get(ref);
@@ -304,7 +421,8 @@ function computeCounters(lanes) {
       if (l.dependsOn.some((d) => !d.met)) c.waitingDep++;
       else c.waitingSlot++;
     } else if (l.status === "review") {
-      if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
+      if (reviewPhaseKindOf(l.reviewPhase) === "ready_awaiting_ci") c.waitingCI++;
+      else if (l.blocker.tone === "merge" || l.reviewVerdict === "approve") c.waitingMerge++;
       else c.waitingCI++;
     }
   }
@@ -314,119 +432,11 @@ var DEFAULT_RUN_MS;
 var init_timeline = __esm({
   "../swarm-core/src/timeline.ts"() {
     "use strict";
+    init_reviewPhase();
     DEFAULT_RUN_MS = 25 * 6e4;
   }
 });
 
-// ../swarm-core/src/verifyVerdict.ts
-function isVerifyVerdict(v) {
-  return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
-}
-function toVerifyVerdict(v) {
-  return isVerifyVerdict(v) ? v : null;
-}
-function isNegativeVerifyVerdict(v) {
-  return v === "not_reproduced" || v === "found_issues";
-}
-function verifyVerdictLabel(v) {
-  switch (v) {
-    case "confirmed":
-      return "\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E";
-    case "not_reproduced":
-      return "\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F";
-    case "found_issues":
-      return "\u041D\u0410\u0428\u0401\u041B";
-  }
-}
-function parseVerifyVerdictComment(text) {
-  const line = (text ?? "").split("\n").find((l) => l.trim().length > 0);
-  if (!line) return null;
-  let best = null;
-  for (const [verdict, marks] of VERDICT_MARKS) {
-    for (const mark of marks) {
-      const at = line.indexOf(mark);
-      if (at < 0) continue;
-      if (!best || at < best.at) best = { verdict, at };
-    }
-  }
-  return best?.verdict ?? null;
-}
-var VERIFY_VERDICTS, VERIFY_VERDICT_SET, VERDICT_MARKS;
-var init_verifyVerdict = __esm({
-  "../swarm-core/src/verifyVerdict.ts"() {
-    "use strict";
-    VERIFY_VERDICTS = ["confirmed", "not_reproduced", "found_issues"];
-    VERIFY_VERDICT_SET = new Set(VERIFY_VERDICTS);
-    VERDICT_MARKS = [
-      ["not_reproduced", ["\u041D\u0415 \u0412\u041E\u0421\u041F\u0420\u041E\u0418\u0417\u0412\u041E\u0414\u0418\u0422\u0421\u042F", "NOT REPRODUCED", "\u041D\u0415 \u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E", "NOT CONFIRMED"]],
-      ["found_issues", ["\u041D\u0410\u0428\u0401\u041B", "\u041D\u0410\u0428\u0415\u041B", "FOUND"]],
-      ["confirmed", ["\u041F\u041E\u0414\u0422\u0412\u0415\u0420\u0416\u0414\u0410\u042E", "CONFIRMED"]]
-    ];
-  }
-});
-
-// ../swarm-core/src/reviewPhase.ts
-function computeReviewPhase(input) {
-  const { reviewVerdict, ciRed } = input;
-  const verifyVerdict = input.verifyVerdict ?? null;
-  if (!ciRed && isNegativeVerifyVerdict(verifyVerdict)) {
-    const kind = verifyVerdict === "found_issues" ? "verify_found" : "verify_not_reproduced";
-    return { kind, label: REVIEW_PHASE_TEXT[kind], ready: false };
-  }
-  if (reviewVerdict === "approve" && !ciRed) {
-    if (verifyVerdict === "confirmed" || input.verifyExpected === false) {
-      return { kind: "ready", label: REVIEW_PHASE_TEXT.ready, ready: true };
-    }
-    if (input.verifierDead) {
-      return { kind: "verify_dead", label: REVIEW_PHASE_TEXT.verify_dead, ready: true };
-    }
-    return { kind: "awaiting_verify", label: REVIEW_PHASE_TEXT.awaiting_verify, ready: false };
-  }
-  if (ciRed) {
-    const jobs = (input.ciFailing ?? []).filter((j) => j && j !== "?");
-    const label3 = jobs.length ? `${REVIEW_PHASE_TEXT.ci_fixing}: ${jobs.join(", ")}` : REVIEW_PHASE_TEXT.ci_fixing;
-    return { kind: "ci_fixing", label: label3, ready: false };
-  }
-  if (reviewVerdict === "changes") {
-    return { kind: "changes", label: REVIEW_PHASE_TEXT.changes, ready: false };
-  }
-  if (input.reviewerName) {
-    return { kind: "in_review", label: `\u041D\u0430 \u0440\u0435\u0432\u044C\u044E \u0443 ${input.reviewerName}`, ready: false };
-  }
-  if (input.reviewerDead) {
-    return { kind: "reviewer_dead", label: REVIEW_PHASE_TEXT.reviewer_dead, ready: true };
-  }
-  const p = input.ciProgress;
-  if (p && p.total > 0 && p.pass >= p.total) {
-    return { kind: "awaiting_reviewer", label: REVIEW_PHASE_TEXT.awaiting_reviewer, ready: false };
-  }
-  const label2 = p && p.total > 0 ? `${REVIEW_PHASE_TEXT.checks} \u2014 CI ${p.pass}/${p.total}` : REVIEW_PHASE_TEXT.checks;
-  return { kind: "checks", label: label2, ready: false };
-}
-var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
-var init_reviewPhase = __esm({
-  "../swarm-core/src/reviewPhase.ts"() {
-    "use strict";
-    init_verifyVerdict();
-    REVIEW_PHASE_TEXT = {
-      checks: "\u0418\u0434\u0443\u0442 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438",
-      awaiting_reviewer: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u0442 \u0440\u0435\u0432\u044C\u044E\u0435\u0440\u0430",
-      ci_fixing: "CI \u043A\u0440\u0430\u0441\u043D\u044B\u0439 \u2014 \u0434\u0440\u043E\u043D \u0447\u0438\u043D\u0438\u0442",
-      in_review: "\u041D\u0430 \u0440\u0435\u0432\u044C\u044E",
-      changes: "\u041D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438 \u2014 \u0434\u0440\u043E\u043D \u043F\u0440\u0430\u0432\u0438\u0442",
-      verify_found: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0430\u0448\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      verify_not_reproduced: "\u0412\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043D\u0435 \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0451\u043B \u2014 \u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438",
-      awaiting_verify: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u2014 \u0436\u0434\u0451\u043C \u0432\u0435\u0440\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044E",
-      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",
-      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"
-    };
-    PHASE_BY_LENGTH = Object.keys(REVIEW_PHASE_TEXT).sort(
-      (a, b) => REVIEW_PHASE_TEXT[b].length - REVIEW_PHASE_TEXT[a].length
-    );
-  }
-});
-
 // ../swarm-core/src/mergeGate.ts
 function computeMergeGate(input) {
   if (!input.hasRun) {
@@ -1934,7 +1944,7 @@ var init_effort = __esm({
 });
 
 // ../swarm-core/src/queuePlan.ts
-var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS, QUEUE_REVIEW_TAIL_MS;
+var MIN_MS, QUEUE_NOMINAL_RUN_MS, QUEUE_MIN_TAIL_MS;
 var init_queuePlan = __esm({
   "../swarm-core/src/queuePlan.ts"() {
     "use strict";
@@ -1945,7 +1955,6 @@ var init_queuePlan = __esm({
     MIN_MS = 6e4;
     QUEUE_NOMINAL_RUN_MS = 25 * MIN_MS;
     QUEUE_MIN_TAIL_MS = 3 * MIN_MS;
-    QUEUE_REVIEW_TAIL_MS = 10 * MIN_MS;
   }
 });
 
@@ -12480,7 +12489,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.50",
+  version: "0.6.52",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12531,7 +12540,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "859ffe2d91bf4c791af067147515b14a41b96739"
+  gitHead: "f77e0473fd2f80e4418ceadd1b29b9a70241fc04"
 };
 
 // src/version.ts
@@ -14932,6 +14941,7 @@ function buildAnomalyCandidates(db, now, thresholds, opts) {
     if (run.resolves_run_id != null || run.reviews_run_id != null) continue;
     if (!run.pr_url) continue;
     if (run.review_verdict === "approve") {
+      if (reviewPhaseKindOf(run.review_phase) === "ready_awaiting_ci") continue;
       candidates.push({
         key: `pr_stuck_merge:${run.id}`,
         minDurationMs: thresholds.prStuckMergeMs,
@@ -18093,6 +18103,14 @@ function compareQueuePriority(a, b) {
 function orderQueue(runs) {
   return [...runs].sort(compareQueuePriority);
 }
+function placeReturners(returners, queued, unmet) {
+  const awaited = new Set(queued.flatMap(unmet));
+  const first = (r) => r.entry?.headPassed === true || awaited.has(r.run.task_slug);
+  return {
+    beforeHead: returners.filter(first),
+    afterHead: returners.filter((r) => !first(r))
+  };
+}
 
 // src/watchdog.ts
 init_src();
@@ -18476,6 +18494,7 @@ var CONFLICT_RESOLVE_COOLDOWN_MS = Number(process.env.SWARM_CONFLICT_COOLDOWN_MS
 var RESOLVE_LIMIT = Number(process.env.SWARM_RESOLVE_LIMIT) || 3;
 var BASE_MERGED_MARK = "\u0431\u0430\u0437\u0430 \u0432\u043B\u0438\u0442\u0430 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438";
 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;
 var CI_WAKE_LIMIT = Number(process.env.SWARM_CI_WAKE_LIMIT) || 3;
@@ -18602,6 +18621,26 @@ function lastCiCheckMs(db, runId) {
   if (!evs.length) return null;
   return Date.parse(evs[evs.length - 1].at.replace(" ", "T") + "Z");
 }
+function headMovedBy(e) {
+  if (e.kind !== "conflict") return false;
+  const text = e.text ?? "";
+  return text.startsWith(BASE_MERGED_MARK) || text.includes(RESOLVER_RESOLVED_MARK);
+}
+function ciGreenForHead(db, run, events) {
+  if (ciWatchCloseKind(db, run) != null) return true;
+  for (let i = events.length - 1; i >= 0; i -= 1) {
+    const e = events[i];
+    if (headMovedBy(e)) return false;
+    if (e.kind === "ci_wake") {
+      if ((e.text ?? "").startsWith("\u043F\u043E\u0431\u0443\u0434\u043A\u0430 \u0441\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C")) continue;
+      return false;
+    }
+    if (e.kind === "ci_checked") {
+      return /^CI (pass|зелёный) /.test(e.text ?? "");
+    }
+  }
+  return false;
+}
 function reviewPhaseInputFor(deps, run, projectWantsVerify = true) {
   const events = deps.db.events(run.id);
   let ciRed = false;
@@ -18632,6 +18671,7 @@ function reviewPhaseInputFor(deps, run, projectWantsVerify = true) {
   return {
     reviewVerdict: run.review_verdict,
     ciRed,
+    ciGreen: ciGreenForHead(deps.db, run, events),
     ciFailing,
     ciProgress,
     reviewerName: reviewer?.name ?? null,
@@ -19604,6 +19644,7 @@ async function handleCi(deps, run, now, worktreeExists, hasTranscript, droneCap)
     return;
   }
   const ci = await deps.ci.checks(run.pr_url).catch(() => null);
+  if (ci?.bucket !== "fail" && deps.returners?.get(run.id)?.kind === "ci") deps.returners.delete(run.id);
   if (ci?.bucket === "denied") {
     const seen = ciDeniedStreak(deps.db, run.id) + 1;
     if (seen < CI_DENIED_LIMIT) {
@@ -19637,7 +19678,11 @@ async function handleCi(deps, run, now, worktreeExists, hasTranscript, droneCap)
     return;
   }
   if (ci?.bucket === "fail") {
-    if (!await wakeAuthorOnRedCi(deps, run, now, ci, worktreeExists, hasTranscript, droneCap)) {
+    const capFull = countActiveDrones(deps.db) >= droneCap;
+    if (await wakeAuthorOnRedCi(deps, run, now, ci, worktreeExists, hasTranscript, droneCap)) {
+      deps.returners?.delete(run.id);
+    } else {
+      if (capFull || deps.returners?.get(run.id)?.kind === "ci") noteReturner(deps, run, now, { kind: "ci", ci, seenAt: now, since: now });
       deps.db.addEvent(run.id, "ci_checked", `CI fail (${ci.pass}/${ci.total}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u0430\u0432\u0442\u043E\u0440\u0430 \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0435\u0447\u0435\u043C/\u0440\u0430\u043D\u043E, \u0436\u0434\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0433\u043E \u043E\u043A\u043D\u0430`);
     }
     return;
@@ -20373,10 +20418,57 @@ async function failBeforeStart(deps, run, reason, opts = {}) {
   }
   return "failed";
 }
-async function batchSpawnQueue(deps, droneCap) {
-  for (const run of orderQueue(deps.db.listRuns("queued"))) {
+async function batchSpawnQueue(deps, droneCap, now) {
+  const queue = orderQueue(deps.db.listRuns("queued"));
+  const { beforeHead, afterHead } = placeReturners(pendingReturners(deps), queue, (q) => deps.db.unmetDeps(q.depends_on));
+  await liftReturners(deps, beforeHead, now, droneCap);
+  let afterHeadDue = afterHead.length > 0;
+  for (const run of queue) {
     if (countActiveDrones(deps.db) >= droneCap) break;
-    await trySpawnQueuedRun(deps, run);
+    if (await trySpawnQueuedRun(deps, run) === "spawned" && afterHeadDue) {
+      afterHeadDue = false;
+      for (const { entry } of afterHead) entry.headPassed = true;
+      await liftReturners(deps, afterHead, now, droneCap);
+    }
+  }
+  if (afterHeadDue) await liftReturners(deps, afterHead, now, droneCap);
+}
+var RETURNER_CI_TTL_MS = 3 * CI_CHECK_COOLDOWN_MS;
+function noteReturner(deps, run, now, entry) {
+  const pool = deps.returners ??= /* @__PURE__ */ new Map();
+  const prev = pool.get(run.id);
+  pool.set(run.id, { ...entry, since: prev?.since ?? entry.since, ...prev?.headPassed ? { headPassed: true } : {} });
+}
+function pendingReturners(deps) {
+  const pool = deps.returners;
+  if (!pool?.size) return [];
+  const out = [];
+  for (const [id, entry] of pool) {
+    const run = deps.db.getRun(id);
+    if (!run || run.status !== "review" || !run.pr_url) pool.delete(id);
+    else out.push({ run, entry });
+  }
+  return out.sort((a, b) => a.entry.since - b.entry.since || a.run.id - b.run.id);
+}
+async function liftReturners(deps, returners, now, droneCap) {
+  for (const { run, entry } of returners) {
+    if (countActiveDrones(deps.db) >= droneCap) return;
+    if (!deps.respawn || deps.db.activeResolverFor(run.id)) continue;
+    let lifted;
+    if (entry.kind === "changes") {
+      if (!needsFixIteration(run)) {
+        deps.returners?.delete(run.id);
+        continue;
+      }
+      lifted = await wakeAuthorOnChanges(deps, run, now, droneCap);
+    } else {
+      if (!deps.ci || now - entry.seenAt > RETURNER_CI_TTL_MS) {
+        deps.returners?.delete(run.id);
+        continue;
+      }
+      lifted = await wakeAuthorOnRedCi(deps, run, now, entry.ci, deps.worktreeExists ?? existsSync20, deps.hasTranscript ?? executorHasSession, droneCap);
+    }
+    if (lifted) deps.returners?.delete(run.id);
   }
 }
 async function resumeWatchdogParked(deps, droneCap) {
@@ -20668,7 +20760,7 @@ async function manageRelief(deps, now, droneCap, stormActive) {
   const pausedForRelief = deps.db.listRuns("paused").filter((r) => isReliefPause(r.stop_reason));
   const recovering = pausedForRelief.length > 0 || state.overloadedAt != null && now - state.overloadedAt < cfg.rampWindowMs;
   if (!recovering) {
-    await batchSpawnQueue(deps, droneCap);
+    await batchSpawnQueue(deps, droneCap, now);
     return;
   }
   if (!rampDue(state.lastRampAt ?? null, now, cfg)) return;
@@ -21158,7 +21250,7 @@ async function tickOnce(deps) {
   if (deps.resourcesOk) {
     await manageRelief(deps, now, droneCap, stormActive);
   } else if (!stormActive) {
-    await batchSpawnQueue(deps, droneCap);
+    await batchSpawnQueue(deps, droneCap, now);
   }
   if (!stormActive) {
     await resumeWatchdogParked(deps, droneCap);
@@ -21175,7 +21267,7 @@ async function tickOnce(deps) {
         });
         deps.db.updateRun(run.id, { status: "done" });
         deps.db.addEvent(run.id, "done", "\u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442 \u0440\u0430\u0437\u0440\u0435\u0448\u0451\u043D, main \u0432\u043B\u0438\u0442, PR \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D");
-        deps.db.addEvent(run.resolves_run_id, "conflict", `\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 ${run.name} \u2014 PR \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D`);
+        deps.db.addEvent(run.resolves_run_id, "conflict", `${RESOLVER_RESOLVED_MARK} ${run.name} \u2014 PR \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D`);
         continue;
       }
       if (run.reviews_run_id != null) {
@@ -21228,6 +21320,7 @@ async function tickOnce(deps) {
       const prUrl = run.pr_url;
       const st = await deps.prStatus(prUrl);
       run = syncBranchFromPr(deps.db, run, st.headBranch);
+      if (st.conflicting) deps.returners?.delete(run.id);
       if (st.merged) {
         if (await finalizeMergedReview(deps, run)) narrate(deps, `PR ${droneLabel(run)} \u0441\u043C\u0435\u0440\u0436\u0435\u043D \u2014 ${run.task_slug} \u0437\u0430\u043A\u0440\u044B\u0442\u0430, \u0441\u043B\u043E\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u0435\u043D.`);
         continue;
@@ -21334,8 +21427,13 @@ async function tickOnce(deps) {
       } else if (!st.conflicting && deps.ci && deps.respawn && !stormActive) {
         await handleCi(deps, run, now, worktreeExists, hasTranscript, droneCap);
       }
-      if (needsFixIteration(run) && !stormActive && !st.conflicting && !deps.db.activeResolverFor(run.id) && await wakeAuthorOnChanges(deps, run, now, droneCap)) {
-        continue;
+      if (needsFixIteration(run) && !stormActive && !st.conflicting && !deps.db.activeResolverFor(run.id)) {
+        const capFull = countActiveDrones(deps.db) >= droneCap;
+        if (await wakeAuthorOnChanges(deps, run, now, droneCap)) {
+          deps.returners?.delete(run.id);
+          continue;
+        }
+        if (capFull) noteReturner(deps, run, now, { kind: "changes", since: now });
       }
       const reviewerGatesOk = !st.conflicting && !st.isDraft && !!deps.spawnReviewer && !stormActive && (!deps.reviewCutoffAt || run.updated_at >= deps.reviewCutoffAt) && deps.db.reviewerCountFor(run.id) === 0 && // ГЕЙТ ПЕРВЫМ: живой/успешный ревьюер уже есть — ни капа, ни спавна не трогаем
       // …и НИ ОДНОГО живого/ждущего ревьюера ЛЮБОГО цикла (TASWM-299). reviewerCountFor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.50",
+  "version": "0.6.52",
   "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": "859ffe2d91bf4c791af067147515b14a41b96739",
+  "gitHead": "f77e0473fd2f80e4418ceadd1b29b9a70241fc04",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",