@taskless-app/swarm 0.6.26 → 0.6.27

package/dist/cli.js

@@ -340,26 +340,6 @@ var init_timeline = __esm({
   }
 });
 
-// ../swarm-core/src/reviewPhase.ts
-var REVIEW_PHASE_TEXT, PHASE_BY_LENGTH;
-var init_reviewPhase = __esm({
-  "../swarm-core/src/reviewPhase.ts"() {
-    "use strict";
-    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",
-      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/verifyVerdict.ts
 function isVerifyVerdict(v) {
   return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
@@ -428,6 +408,31 @@ var init_verifyVerdict = __esm({
   }
 });
 
+// ../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) {
@@ -1619,6 +1624,13 @@ var init_zoneMemory = __esm({
   }
 });
 
+// ../swarm-core/src/taskPrs.ts
+var init_taskPrs = __esm({
+  "../swarm-core/src/taskPrs.ts"() {
+    "use strict";
+  }
+});
+
 // ../swarm-core/src/index.ts
 var init_src = __esm({
   "../swarm-core/src/index.ts"() {
@@ -1653,6 +1665,7 @@ var init_src = __esm({
     init_effort();
     init_queuePlan();
     init_zoneMemory();
+    init_taskPrs();
   }
 });
 
@@ -3040,7 +3053,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.26",
+      version: "0.6.27",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3091,7 +3104,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "52416995d46b0a843374d14bfb00dd310f71c4bf"
+      gitHead: "2e1ed83014422ae577be60271adc79e291b9e2ab"
     };
   }
 });

package/dist/overmind.js

@@ -309,52 +309,6 @@ var init_timeline = __esm({
   }
 });
 
-// ../swarm-core/src/reviewPhase.ts
-function computeReviewPhase(input) {
-  const { reviewVerdict, ciRed } = input;
-  if (reviewVerdict === "approve" && !ciRed) {
-    return { kind: "ready", label: REVIEW_PHASE_TEXT.ready, ready: true };
-  }
-  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";
-    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",
-      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/verifyVerdict.ts
 function isVerifyVerdict(v) {
   return typeof v === "string" && VERIFY_VERDICT_SET.has(v);
@@ -402,6 +356,68 @@ var init_verifyVerdict = __esm({
   }
 });
 
+// ../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) {
@@ -1709,6 +1725,57 @@ var init_zoneMemory = __esm({
   }
 });
 
+// ../swarm-core/src/taskPrs.ts
+function normalizePrUrl(raw) {
+  const s = (raw ?? "").trim();
+  if (!s) return null;
+  const m = s.match(/^(?:https?:\/\/)?(?:www\.)?github\.com\/([^/\s]+)\/([^/\s]+)\/pull\/(\d+)/i);
+  if (!m) return s.replace(/\/+$/, "").toLowerCase();
+  return `github.com/${m[1]}/${m[2]}/pull/${m[3]}`.toLowerCase();
+}
+function samePr(a, b) {
+  const x = normalizePrUrl(a);
+  const y = normalizePrUrl(b);
+  return x != null && y != null && x === y;
+}
+function prBelongsToTask(slug, pr) {
+  const s = (slug ?? "").trim().toLowerCase();
+  if (!s) return false;
+  const branch = (pr.headRefName ?? "").trim().toLowerCase();
+  if (branch === s || branch.startsWith(s) && /^[-/_.]/.test(branch.slice(s.length))) return true;
+  const title = (pr.title ?? "").toLowerCase();
+  if (!title.includes(s)) return false;
+  const at = title.indexOf(s);
+  const before = at > 0 ? title[at - 1] : "";
+  const after = title[at + s.length] ?? "";
+  return !/[a-z0-9]/.test(before) && !/[a-z0-9-]/.test(after);
+}
+function decideTaskWork(facts) {
+  const candidate = (facts.mergedCandidate ?? "").trim() || null;
+  const open = [];
+  for (const raw of facts.openPrs ?? []) {
+    const url = (raw ?? "").trim();
+    if (!url) continue;
+    if (!open.some((u) => samePr(u, url))) open.push(url);
+  }
+  if (open.length > 0) return { kind: "open", prs: open, candidate: candidate && !open.some((u) => samePr(u, candidate)) ? candidate : null };
+  if (!candidate) return { kind: "unmerged" };
+  return { kind: "merged", pr: candidate };
+}
+function formatMergedDuplicateReason(pr) {
+  return `PR \u0437\u0430\u0434\u0430\u0447\u0438 \u0443\u0436\u0435 \u0441\u043C\u0435\u0440\u0436\u0435\u043D (${pr}) \u2014 \u043F\u0440\u043E\u0433\u043E\u043D-\u0434\u0443\u0431\u043B\u044C \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u0441\u043F\u0430\u0432\u043D\u0430/\u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0438 (TASWM-206)`;
+}
+function formatOpenPrHold(v) {
+  const list = v.prs.join(", ");
+  const tail2 = v.candidate ? ` (\u0441\u043C\u0435\u0440\u0436\u0435\u043D ${v.candidate}, \u043D\u043E \u044D\u0442\u043E \u043D\u0435 \u0432\u0441\u044F \u0440\u0430\u0431\u043E\u0442\u0430)` : "";
+  return `\u0443 \u0437\u0430\u0434\u0430\u0447\u0438 \u043E\u0441\u0442\u0430\u043B\u0438\u0441\u044C \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 PR: ${list}${tail2} \u2014 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0435 \u0432\u043B\u0438\u0442\u0430 \u0446\u0435\u043B\u0438\u043A\u043E\u043C, \u0437\u0430\u0434\u0430\u0447\u0443 \u043D\u0435 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0435\u043C \u0438 \u043F\u0440\u043E\u0433\u043E\u043D \u0434\u0443\u0431\u043B\u0435\u043C \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u043C (TASWM-515)`;
+}
+var init_taskPrs = __esm({
+  "../swarm-core/src/taskPrs.ts"() {
+    "use strict";
+  }
+});
+
 // ../swarm-core/src/index.ts
 var init_src = __esm({
   "../swarm-core/src/index.ts"() {
@@ -1743,6 +1810,7 @@ var init_src = __esm({
     init_effort();
     init_queuePlan();
     init_zoneMemory();
+    init_taskPrs();
   }
 });
 
@@ -11124,25 +11192,76 @@ var UNRETRIABLE_PARK_MARK = "\u043F\u043E\u0432\u0442\u043E\u0440 \u043D\u0435 \
 function isUnretriableParked(run) {
   return isPreStartFailure(run) && (run.stop_reason ?? "").includes(UNRETRIABLE_PARK_MARK);
 }
+var PARK_APPLIED_MARK = "\u0437\u0430\u0434\u0430\u0447\u0430 \u0441\u043D\u044F\u0442\u0430 \u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u0440\u043E\u044F";
+var PARK_APPLIED_RE = new RegExp(`${PARK_APPLIED_MARK} \\(([^,)]+)(?:, \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043F\u043E #(\\d+))?\\)`);
+function withParkApplied(reason, at, upToRunId) {
+  if (PARK_APPLIED_RE.test(reason)) return reason;
+  const upTo = upToRunId != null ? `, \u043F\u0440\u043E\u0433\u043E\u043D\u044B \u043F\u043E #${upToRunId}` : "";
+  return `${reason} \u2014 ${PARK_APPLIED_MARK} (${at}${upTo})`;
+}
+function parkApplied(run) {
+  if (!run || !isParkApplied(run)) return null;
+  const m = PARK_APPLIED_RE.exec(run.stop_reason ?? "");
+  if (!m) return null;
+  const ms = m[1] ? stampMs(m[1]) : Number.NaN;
+  return {
+    at: Number.isFinite(ms) ? ms : null,
+    upToRunId: m[2] ? Number(m[2]) : null
+  };
+}
+function lastRunIdFor(runs, taskSlug) {
+  return ownRuns(runs, taskSlug).reduce((max, r) => Math.max(max, r.id), 0);
+}
+function isParkApplied(run) {
+  return isPreStartFailure(run) && (run.stop_reason ?? "").includes(PARK_APPLIED_MARK);
+}
+var PARK_CAUSE_PREFIX = "\u0427\u0435\u0433\u043E \u043D\u0435 \u0445\u0432\u0430\u0442\u0438\u043B\u043E: ";
+function parkedCause(run) {
+  const at = (run?.stop_reason ?? "").indexOf(PARK_CAUSE_PREFIX);
+  if (at < 0) return null;
+  const cause = run.stop_reason.slice(at + PARK_CAUSE_PREFIX.length).replace(new RegExp(`\\s*\u2014\\s*${PARK_APPLIED_MARK} \\([^)]*\\)\\s*$`), "").trim();
+  return cause || null;
+}
 var SPAWN_ATTEMPT_WINDOW_MS = 60 * 6e4;
+function ownRuns(runs, taskSlug) {
+  return runs.filter(
+    (r) => r.task_slug === taskSlug && r.reviews_run_id == null && r.resolves_run_id == null && r.verifies_run_id == null
+  );
+}
+function newestFirst(a, b) {
+  const at = a.created_at ? stampMs(a.created_at) : Number.NaN;
+  const bt = b.created_at ? stampMs(b.created_at) : Number.NaN;
+  if (Number.isFinite(at) && Number.isFinite(bt) && at !== bt) return bt - at;
+  return b.id - a.id;
+}
 function preStartAttempts(runs, taskSlug, opts = {}) {
   const windowMs = opts.windowMs ?? SPAWN_ATTEMPT_WINDOW_MS;
   const now = opts.now ?? Date.now();
-  const own = runs.filter((r) => r.task_slug === taskSlug && r.reviews_run_id == null && r.resolves_run_id == null && r.verifies_run_id == null).sort((a, b) => b.id - a.id);
+  const own = ownRuns(runs, taskSlug).sort(newestFirst);
   let n = 0;
+  let newestCreatedAt = Number.NEGATIVE_INFINITY;
+  let newestSeenId = Number.NEGATIVE_INFINITY;
   for (const run of own) {
+    const applied = parkApplied(run);
+    if (applied) {
+      const returned = applied.upToRunId != null ? newestSeenId > applied.upToRunId : applied.at != null && newestCreatedAt > applied.at;
+      if (returned) break;
+    }
+    newestSeenId = Math.max(newestSeenId, run.id);
+    const startedAt = run.created_at ? stampMs(run.created_at) : Number.NaN;
+    if (Number.isFinite(startedAt)) newestCreatedAt = Math.max(newestCreatedAt, startedAt);
     if (run.status === "queued" || run.status === "running") continue;
     if (isSpawnParked(run) && run.status !== "failed") continue;
     if (!isPreStartFailure(run)) break;
-    const at = run.created_at ? stampMs(run.created_at) : Number.NaN;
-    if (Number.isFinite(at) && now - at >= windowMs) break;
+    if (Number.isFinite(startedAt) && now - startedAt >= windowMs) break;
+    if (opts.since != null && Number.isFinite(startedAt) && startedAt < opts.since) break;
     n += 1;
     if (isUnretriableParked(run)) return Math.max(n, PRE_START_ATTEMPT_LIMIT);
   }
   return n;
 }
 function lastPreStartAttempt(runs, taskSlug) {
-  return runs.filter((r) => r.task_slug === taskSlug && isPreStartFailure(r)).sort((a, b) => b.id - a.id)[0] ?? null;
+  return runs.filter((r) => r.task_slug === taskSlug && isPreStartFailure(r)).sort(newestFirst)[0] ?? null;
 }
 function unresolvedRepoReason(repo, served) {
   const raw = repo.trim();
@@ -11325,6 +11444,17 @@ async function mergedPrForBranch(branch, repoDir, run = realRepoRunner) {
     return null;
   }
 }
+async function openPrsForTask(slug, repoDir, run = realRepoRunner) {
+  if (!slug || !repoDir) return null;
+  try {
+    const out = await run(["pr", "list", "--state", "open", "--json", "url,headRefName,title", "--limit", "50"], repoDir);
+    const arr = JSON.parse(out);
+    if (!Array.isArray(arr)) return null;
+    return arr.filter((p) => typeof p.url === "string" && prBelongsToTask(slug, { headRefName: p.headRefName, title: p.title })).map((p) => p.url);
+  } catch {
+    return null;
+  }
+}
 async function closePR(prUrl, run = realRunner) {
   await run(["pr", "close", prUrl, "--comment", "\u043F\u0435\u0440\u0435\u0438\u0433\u0440\u0430\u043D \u043D\u0430 \u0434\u0440\u0443\u0433\u043E\u0439 \u0432\u0430\u0440\u0438\u0430\u043D\u0442 (swarm)"]);
 }
@@ -14074,7 +14204,7 @@ import { serve as serve2 } from "@hono/node-server";
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.26",
+  version: "0.6.27",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -14125,7 +14255,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "52416995d46b0a843374d14bfb00dd310f71c4bf"
+  gitHead: "2e1ed83014422ae577be60271adc79e291b9e2ab"
 };
 
 // src/version.ts
@@ -16625,6 +16755,7 @@ var RESPAWN_LIMIT = Number(process.env.SWARM_RESPAWN_LIMIT) || 2;
 var RESPAWN_YOUNG_MS = Number(process.env.SWARM_RESPAWN_YOUNG_MS) || 60 * 1e3;
 var EXITED_NO_DONE_REASON = "\u0441\u0435\u0441\u0441\u0438\u044F \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0430\u0441\u044C \u0441\u0430\u043C\u0430, done() \u043D\u0435 \u0432\u044B\u0437\u0432\u0430\u043D";
 var ABORTED_STOP_REASON = "\u0441\u0435\u0441\u0441\u0438\u044F \u043E\u0431\u043E\u0440\u0432\u0430\u043B\u0430\u0441\u044C, done() \u043D\u0435 \u0432\u044B\u0437\u0432\u0430\u043D";
+var SUBMITTED_EXIT_TEXT = "\u0441\u0435\u0441\u0441\u0438\u044F \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0430\u0441\u044C, \u043D\u043E \u0440\u0430\u0431\u043E\u0442\u0430 \u0443\u0436\u0435 \u0441\u0434\u0430\u043D\u0430 (PR \u043E\u0442\u043A\u0440\u044B\u0442, done() \u043F\u0440\u0438\u043D\u044F\u0442) \u2014 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u044E \u0432 \u0440\u0435\u0432\u044C\u044E, \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D";
 var EXIT_WORK_PUSHED = "\u0432\u0435\u0442\u043A\u0430 \u0435\u0441\u0442\u044C \u043D\u0430 origin \u2014 \u0435\u0441\u0442\u044C \u0447\u0442\u043E \u0441\u043F\u0430\u0441\u0430\u0442\u044C, PR \u043D\u0435 \u043E\u0442\u043A\u0440\u044B\u0442";
 var EXIT_WORK_LOST = "\u0432\u0435\u0442\u043A\u0438 \u043D\u0430 origin \u043D\u0435\u0442 \u2014 \u043D\u0435\u0437\u0430\u043F\u0443\u0448\u0435\u043D\u043D\u043E\u0435 \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u043E";
 var EXIT_WORK_UNKNOWN = "\u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C origin \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u2014 \u0446\u0435\u043B\u0430 \u043B\u0438 \u0440\u0430\u0431\u043E\u0442\u0430, \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E";
@@ -16757,7 +16888,7 @@ function lastCiCheckMs(db, runId) {
   if (!evs.length) return null;
   return Date.parse(evs[evs.length - 1].at.replace(" ", "T") + "Z");
 }
-function reviewPhaseInputFor(deps, run) {
+function reviewPhaseInputFor(deps, run, projectWantsVerify = true) {
   const events = deps.db.events(run.id);
   let ciRed = false;
   let ciFailing = [];
@@ -16782,20 +16913,35 @@ function reviewPhaseInputFor(deps, run) {
   const attempts = deps.db.reviewerAttemptCountFor(run.id);
   const lastAttempt = deps.db.lastReviewerAttemptFor(run.id);
   const reviewerDead = !reviewer && run.review_verdict == null && attempts >= REVIEW_SPAWN_LIMIT && (lastAttempt?.status === "failed" || lastAttempt?.status === "stalled" || lastAttempt?.status === "stopped");
+  const verifyExpected = deps.spawnVerifier != null && projectWantsVerify;
+  const verifierDead = verifyExpected && run.verify_verdict == null && deps.db.verifierCountFor(run.id) === 0 && deps.db.verifierAttemptCountFor(run.id) >= VERIFY_SPAWN_LIMIT;
   return {
     reviewVerdict: run.review_verdict,
     ciRed,
     ciFailing,
     ciProgress,
     reviewerName: reviewer?.name ?? null,
-    reviewerDead
+    reviewerDead,
+    verifyVerdict: run.verify_verdict,
+    verifyExpected,
+    verifierDead
   };
 }
-function refreshReviewPhases(deps) {
-  for (const run of deps.db.listRuns("review")) {
-    if (run.reviews_run_id != null || run.resolves_run_id != null) continue;
-    if (!run.pr_url) continue;
-    const phase = computeReviewPhase(reviewPhaseInputFor(deps, run));
+async function refreshReviewPhases(deps) {
+  const runs = deps.db.listRuns("review").filter((r) => r.reviews_run_id == null && r.resolves_run_id == null && !!r.pr_url);
+  const wantsChecks = /* @__PURE__ */ new Map();
+  const needsAnswer = (r) => deps.spawnVerifier != null && r.review_verdict === "approve" && r.verify_verdict == null;
+  for (const run of runs) {
+    if (!needsAnswer(run) || wantsChecks.has(run.repo)) continue;
+    try {
+      wantsChecks.set(run.repo, await projectWantsChecks(deps, run));
+    } catch (e) {
+      console.warn(`[overmind] autoReview \u043F\u0440\u043E\u0435\u043A\u0442\u0430 (${run.repo}) \u043D\u0435 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D \u2014 \u0444\u0430\u0437\u0430 \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0441\u044F \u043A\u0430\u043A \u0440\u0430\u043D\u044C\u0448\u0435:`, e);
+      wantsChecks.set(run.repo, true);
+    }
+  }
+  for (const run of runs) {
+    const phase = computeReviewPhase(reviewPhaseInputFor(deps, run, wantsChecks.get(run.repo) ?? true));
     if (run.review_phase !== phase.label) deps.db.updateRun(run.id, { review_phase: phase.label });
   }
 }
@@ -16897,7 +17043,14 @@ async function retireOutdatedReviewers(deps, run) {
     narrate(deps, `${droneLabel(run)}: \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043F\u0440\u043E\u0448\u043B\u043E\u0433\u043E \u043A\u0440\u0443\u0433\u0430 \u0435\u0449\u0451 \u0436\u0438\u0432 \u2014 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u044E \u0435\u0433\u043E, \u0432\u0442\u043E\u0440\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0440\u0445 \u043D\u0435 \u0434\u0435\u0440\u0436\u0443.`);
   }
 }
-async function finalizeMergedReview(deps, run) {
+async function finalizeMergedReview(deps, run, opts) {
+  if (!opts?.workChecked) {
+    const work = await taskWorkState(deps, run.task_slug, run.repo || "", run.pr_url ?? null);
+    if (work.kind === "open") {
+      noteOpenPrHold(deps, run, work);
+      return false;
+    }
+  }
   await deps.finishTask(run.task_slug, run.workspace_id);
   if (run.worktree_path) await deps.removeWorktree(run.repo, run.worktree_path).catch(() => {
   });
@@ -16905,6 +17058,7 @@ async function finalizeMergedReview(deps, run) {
   deps.db.updateRun(run.id, { status: "done" });
   deps.db.addEvent(run.id, "done");
   await closeReviewersOnDeadPr(deps, run.id, "PR \u0441\u043C\u0435\u0440\u0436\u0435\u043D \u0440\u0430\u043D\u044C\u0448\u0435 \u0432\u0435\u0440\u0434\u0438\u043A\u0442\u0430 \u0440\u0435\u0432\u044C\u044E \u2014 \u0440\u0435\u0432\u044C\u044E \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E");
+  return true;
 }
 async function finalizeClosedPrReview(deps, run, reason) {
   await closeReviewersOnDeadPr(deps, run.id, "PR \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430 \u2014 \u0440\u0435\u0432\u044C\u044E\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E");
@@ -16918,7 +17072,7 @@ async function prGateForReviewer(deps, run, prUrl, when) {
   const st = await deps.prStatus(prUrl).catch(() => null);
   switch (prLiveness(st)) {
     case "merged":
-      await finalizeMergedReview(deps, run);
+      if (!await finalizeMergedReview(deps, run)) return { kind: "wait" };
       narrate(deps, `PR ${droneLabel(run)} \u0441\u043C\u0435\u0440\u0436\u0435\u043D, ${when} \u2014 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u044E \u043F\u0440\u043E\u0433\u043E\u043D, \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D.`);
       return { kind: "finalized" };
     case "closed":
@@ -16949,6 +17103,16 @@ function doneMergedPrForSlug(db, slug) {
   );
   return done?.pr_url ?? null;
 }
+var OPEN_PR_HOLD_MARK = "\u0443 \u0437\u0430\u0434\u0430\u0447\u0438 \u043E\u0441\u0442\u0430\u043B\u0438\u0441\u044C \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 PR";
+async function taskWorkState(deps, slug, repoDir, candidate) {
+  const openPrs = deps.openPrsForTask ? await deps.openPrsForTask(slug, repoDir).catch(() => null) : null;
+  return decideTaskWork({ mergedCandidate: candidate, openPrs });
+}
+function noteOpenPrHold(deps, run, v) {
+  if (deps.db.events(run.id).some((e) => (e.text ?? "").includes(OPEN_PR_HOLD_MARK))) return;
+  deps.db.addEvent(run.id, "step", formatOpenPrHold(v));
+  narrate(deps, `${droneLabel(run)} \u2014 \u0443 ${run.task_slug} \u0435\u0449\u0451 \u043E\u0442\u043A\u0440\u044B\u0442 PR \u0441 \u043D\u0435\u0432\u043B\u0438\u0442\u043E\u0439 \u0440\u0430\u0431\u043E\u0442\u043E\u0439 (${v.prs.join(", ")}), \u0437\u0430\u0434\u0430\u0447\u0443 \u043D\u0435 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u044E.`);
+}
 async function closeDuplicateTaskRun(deps, run, mergedUrl) {
   if (run.pid != null && deps.kill && deps.isAlive(run.pid)) {
     try {
@@ -16958,7 +17122,7 @@ async function closeDuplicateTaskRun(deps, run, mergedUrl) {
   }
   if (run.worktree_path) await deps.removeWorktree(run.repo, run.worktree_path).catch(() => {
   });
-  const reason = `PR \u0437\u0430\u0434\u0430\u0447\u0438 \u0443\u0436\u0435 \u0441\u043C\u0435\u0440\u0436\u0435\u043D (${mergedUrl}) \u2014 \u043F\u0440\u043E\u0433\u043E\u043D-\u0434\u0443\u0431\u043B\u044C \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u0441\u043F\u0430\u0432\u043D\u0430/\u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0438 (TASWM-206)`;
+  const reason = formatMergedDuplicateReason(mergedUrl);
   deps.db.updateRun(run.id, { status: "superseded", stop_reason: reason });
   deps.db.addEvent(run.id, "superseded", reason);
 }
@@ -16990,10 +17154,16 @@ async function closeMergedTaskRuns(deps) {
         mergedUrl = await deps.mergedPrForBranch(slug, group[0].repo || "").catch(() => null);
       }
       if (!mergedUrl) continue;
+      const work = await taskWorkState(deps, slug, group[0].repo || "", mergedUrl);
+      if (work.kind === "open") {
+        for (const run of nonTerminal) noteOpenPrHold(deps, run, work);
+        continue;
+      }
+      if (work.kind === "merged") mergedUrl = work.pr;
       const canonical = withPr && withPr.pr_url === mergedUrl && !isTerminalStatus(withPr.status) ? withPr : null;
       for (const run of nonTerminal) {
         if (canonical && run.id === canonical.id) {
-          await finalizeMergedReview(deps, run);
+          await finalizeMergedReview(deps, run, { workChecked: true });
           narrate(deps, `PR ${droneLabel(run)} \u0441\u043C\u0435\u0440\u0436\u0435\u043D \u2014 ${slug} \u0437\u0430\u043A\u0440\u044B\u0442\u0430 (\u0434\u0443\u0431\u043B\u044C-\u0440\u0430\u043D\u044B \u0440\u043E\u044F, TASWM-206).`);
         } else {
           await closeDuplicateTaskRun(deps, run, mergedUrl);
@@ -17592,6 +17762,16 @@ async function wakeRun(deps, runId) {
   if (!run) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0432 \u0437\u0435\u0440\u043A\u0430\u043B\u0435 \u0440\u043E\u044F` };
   if (run.pid != null && deps.isAlive(run.pid)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0443\u0436\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 (pid ${run.pid}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
   if (isTerminalStatus(run.status)) return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B\u0435\u043D (${run.status}) \u2014 \u0431\u0443\u0434\u0438\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E` };
+  const authorSideStopped = deps.db.events(run.id).some(
+    (e) => [RESOLVE_ESCALATION_MARK, CI_WAKE_ESCALATION_MARK, VERIFY_ESCALATION_MARK].some(
+      (m) => (e.text ?? "").includes(m)
+    )
+  );
+  const changesEscalated = deps.db.events(run.id).some((e) => (e.text ?? "").includes(`${CHANGES_WAKE_ESCALATION_MARK} (\u043A\u0440\u0443\u0433 ${run.review_cycle ?? 0})`));
+  const stoppedForHuman = deliberateReviewStop(deps.db, run) != null || changesEscalated || authorSideStopped;
+  if (run.status === "review" && run.pr_url && !needsFixIteration(run) && !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 (${run.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` };
+  }
   const worktreeExists = deps.worktreeExists ?? existsSync18;
   const hasTranscript = deps.hasTranscript ?? executorHasSession;
   const wt = run.worktree_path;
@@ -18194,17 +18374,31 @@ async function trySpawnQueuedRun(deps, run) {
       // причина одна на машину — в лог уходит одной строкой, а не по строке на прогон
     });
   }
-  const spentAttempts = preStartAttempts(deps.db.listRuns(), run.task_slug);
+  const spentAttempts = attemptsFor(deps, run.task_slug);
   if (spentAttempts >= PRE_START_ATTEMPT_LIMIT) {
     const last = lastPreStartAttempt(deps.db.listRuns(), run.task_slug);
-    const why = last && isUnretriableParked(last) ? `${SPAWN_PARK_MARK}: \u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u043E\u0442\u043A\u0430\u0437\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u043C \u043D\u0435 \u043B\u0435\u0447\u0438\u0442\u0441\u044F, \u043D\u043E\u0432\u043E\u0433\u043E \u0437\u0430\u0445\u043E\u0434\u0430 \u043D\u0435 \u0434\u0435\u043B\u0430\u044E (TASWM-485). \u0427\u0435\u043C \u043A\u043E\u043D\u0447\u0438\u043B\u043E\u0441\u044C \u2014 \u0432 \u043F\u0440\u043E\u0433\u043E\u043D\u0435 #${last.id}` : `${PRE_START_MARK} ${spentAttempts} \u0440\u0430\u0437\u0430 \u043F\u043E\u0434\u0440\u044F\u0434 \u2014 ${SPAWN_PARK_MARK}, \u0447\u0435\u0442\u0432\u0451\u0440\u0442\u043E\u0433\u043E \u0437\u0430\u0445\u043E\u0434\u0430 \u043D\u0435 \u0434\u0435\u043B\u0430\u044E (TASWM-422)`;
+    const cause = parkedCause(last);
+    const tail2 = cause ? ` \u0427\u0435\u0433\u043E \u043D\u0435 \u0445\u0432\u0430\u0442\u0438\u043B\u043E: ${cause}` : "";
+    const why = (last && isUnretriableParked(last) ? `${SPAWN_PARK_MARK}: \u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u043E\u0442\u043A\u0430\u0437\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u043C \u043D\u0435 \u043B\u0435\u0447\u0438\u0442\u0441\u044F, \u043D\u043E\u0432\u043E\u0433\u043E \u0437\u0430\u0445\u043E\u0434\u0430 \u043D\u0435 \u0434\u0435\u043B\u0430\u044E (TASWM-485). \u0427\u0435\u043C \u043A\u043E\u043D\u0447\u0438\u043B\u043E\u0441\u044C \u2014 \u0432 \u043F\u0440\u043E\u0433\u043E\u043D\u0435 #${last.id}` : `${PRE_START_MARK} ${spentAttempts} \u0440\u0430\u0437\u0430 \u043F\u043E\u0434\u0440\u044F\u0434 \u2014 ${SPAWN_PARK_MARK}, \u0447\u0435\u0442\u0432\u0451\u0440\u0442\u043E\u0433\u043E \u0437\u0430\u0445\u043E\u0434\u0430 \u043D\u0435 \u0434\u0435\u043B\u0430\u044E (TASWM-422)`) + tail2;
     deps.db.updateRun(run.id, { status: "stopped", stop_reason: why });
     deps.db.addEvent(run.id, "step", why);
+    if (deps.parkTask && last && !isParkApplied(last)) {
+      const ok = await deps.parkTask(run, last.stop_reason ?? why, { comment: false }).catch(() => false);
+      if (ok)
+        deps.db.updateRun(last.id, {
+          // Водораздел включает и ЭТОТ, только что закрытый гейтом прогон: он появился до
+          // подтверждения, и принимать его за ручной возврат нельзя (code-review PR #984).
+          stop_reason: withParkApplied(last.stop_reason ?? why, stamp(), lastRunIdFor(deps.db.listRuns(), run.task_slug))
+        });
+    }
     const d = noteDefer(deps.spawnDefer ??= /* @__PURE__ */ new Map(), `pre-start-exhausted:${run.task_slug}`, why, GATE_LOG_HEARTBEAT_TICKS);
     if (d.log) console.error(`[overmind] ${run.task_slug}: ${why}${d.changed ? "" : ` \u2014 \u0435\u0449\u0451 \u0432\u0438\u0441\u0438\u0442, \u0442\u0438\u043A ${d.ticks}`}`);
     return "closed";
   }
-  const mergedUrl = doneMergedPrForSlug(deps.db, run.task_slug) ?? (deps.mergedPrForBranch ? await deps.mergedPrForBranch(run.task_slug, run.repo || "").catch(() => null) : null);
+  const mergedCandidate = doneMergedPrForSlug(deps.db, run.task_slug) ?? (deps.mergedPrForBranch ? await deps.mergedPrForBranch(run.task_slug, run.repo || "").catch(() => null) : null);
+  const work = mergedCandidate ? await taskWorkState(deps, run.task_slug, run.repo || "", mergedCandidate) : null;
+  if (work?.kind === "open") noteOpenPrHold(deps, run, work);
+  const mergedUrl = work?.kind === "merged" ? work.pr : null;
   if (mergedUrl) {
     await closeDuplicateTaskRun(deps, run, mergedUrl);
     await deps.finishTask(run.task_slug, run.workspace_id).catch(() => {
@@ -18299,10 +18493,13 @@ function spawnRetryOpts(e) {
   if (!(e instanceof TaskBodyUnavailableError)) return {};
   return { retriable: TOOL_FAILURE_RETRIABLE[e.code] };
 }
+function attemptsFor(deps, taskSlug) {
+  return preStartAttempts(deps.db.listRuns(), taskSlug, deps.startedAt != null ? { since: deps.startedAt } : {});
+}
 async function failBeforeStart(deps, run, reason, opts = {}) {
   deps.db.updateRun(run.id, { status: "failed", stop_reason: `${PRE_START_MARK}: ${reason}` });
   deps.db.addEvent(run.id, "failed", `${PRE_START_MARK} \u2014 ${reason}`);
-  const attempts = preStartAttempts(deps.db.listRuns(), run.task_slug);
+  const attempts = attemptsFor(deps, run.task_slug);
   if (opts.retriable !== false && attempts < PRE_START_ATTEMPT_LIMIT) {
     narrate(deps, `${droneLabel(run)} \u2014 ${PRE_START_MARK} (\u043F\u043E\u043F\u044B\u0442\u043A\u0430 ${attempts} \u0438\u0437 ${PRE_START_ATTEMPT_LIMIT}): ${reason}`);
     return "failed";
@@ -18313,7 +18510,13 @@ async function failBeforeStart(deps, run, reason, opts = {}) {
   narrate(deps, `${run.task_slug}: ${parked}`);
   if (deps.parkTask) {
     const ok = await deps.parkTask(run, parked).catch(() => false);
-    if (!ok) {
+    if (ok)
+      deps.db.updateRun(run.id, {
+        // Водораздел (code-review PR #984) — самый большой id прогона задачи ПРЯМО СЕЙЧАС:
+        // всё, что появится после него, заведено уже по возвращённой в очередь задаче.
+        stop_reason: withParkApplied(parked, stamp(), lastRunIdFor(deps.db.listRuns(), run.task_slug))
+      });
+    else {
       deps.db.addEvent(
         run.id,
         "step",
@@ -18983,8 +19186,7 @@ async function tickOnce(deps) {
       const st = await deps.prStatus(prUrl);
       run = syncBranchFromPr(deps.db, run, st.headBranch);
       if (st.merged) {
-        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.`);
+        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;
       }
       if (prLiveness(st) === "closed") {
@@ -19128,7 +19330,7 @@ async function tickOnce(deps) {
   relinkUnboundReviewers(deps);
   await closeOrphanedReviewers(deps);
   await spawnVerifiersForOpenPrs(deps, stormActive);
-  refreshReviewPhases(deps);
+  await refreshReviewPhases(deps);
   let liveChildPpids;
   try {
     liveChildPpids = deps.livePpids?.() ?? null;
@@ -19218,6 +19420,12 @@ async function tickOnce(deps) {
       }
     }
     if (!alive && (outcome === "graceful" || outcome === "aborted") && run.status === "running" && run.resolves_run_id == null && run.reviews_run_id == null && run.verifies_run_id == null && run.kind !== "hero") {
+      if (!wasAborted(outcome) && run.pr_url) {
+        deps.db.updateRun(run.id, { status: "review", stop_reason: null });
+        deps.db.addEvent(run.id, "step", `${SUBMITTED_EXIT_TEXT}: ${run.pr_url}`);
+        narrate(deps, `${droneLabel(run)} \u0432\u044B\u0448\u0435\u043B, \u043D\u043E \u0440\u0430\u0431\u043E\u0442\u0430 \u0443\u0436\u0435 \u0441\u0434\u0430\u043D\u0430 (${run.pr_url}) \u2014 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u044E \u0432 \u0440\u0435\u0432\u044C\u044E, \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u043D\u0435 \u043D\u0443\u0436\u0435\u043D.`);
+        continue;
+      }
       const aborted = wasAborted(outcome);
       const abort = aborted ? deps.exitAbort?.(run) ?? null : null;
       const what = aborted ? abortReason(abort) : EXITED_NO_DONE_REASON;
@@ -20484,6 +20692,9 @@ async function runDaemon(opts) {
     // Смерженный PR ветки-слага (TASWM-206) — тот же фолбэк на дефолт-репо роя, что и
     // openPrsForBranch выше; реальный gh, логика закрытия дублей — в tickOnce (тестируется).
     mergedPrForBranch: (branch, repoDir) => mergedPrForBranch(branch, repoDir || opts.repo),
+    // ВСЕ открытые PR задачи (TASWM-515) — тот же фолбэк на дефолт-репо роя. Реальный gh;
+    // и отбор «этот PR — задачи», и решение «закончена ли работа» чистые (swarm-core).
+    openPrsForTask: (slug, repoDir) => openPrsForTask(slug, repoDir || opts.repo),
     // Закрыта ли задача в Taskless (TASWM-137 п.г): death-detect гасит зомби-прогон, чья
     // задача уже completed/cancelled/archived, вместо респавна. null — Taskless недоступен
     // (не гасим). Без tl (нет токена) ключ не задаём — шаг инертен, старое поведение.
@@ -20499,17 +20710,22 @@ async function runDaemon(opts) {
     // задачу), а не кодом возврата: клиент глушит отказ сервера внутрь (safeCall), и по
     // возврату «отложил» было бы неотличимо от «сказал, но не доехало» — то самое молчание,
     // из-за которого 17.08 круг и крутился.
-    parkTask: async (run, reason) => {
+    parkTask: async (run, reason, opts2) => {
       const client = tlFor(run.workspace_id);
       if (!client) return false;
-      await client.addComment(
-        run.task_slug,
-        `${reason}
+      if (opts2?.comment !== false)
+        await client.addComment(
+          run.task_slug,
+          // TASWM-514: советуем ИМЕННО возврат в очередь — теперь этот рычаг работает
+          // (возврат в «не начато» обнуляет счётчик попыток). И причина стоит в первой
+          // строке (её несёт `reason`, см. parkReason): человек, читающий пометку через
+          // час, должен из неё понять, ЧТО чинить, а не раскапывать записи прогонов.
+          `${reason}
 
-\u0417\u0430\u0434\u0430\u0447\u0430 \u0441\u043D\u044F\u0442\u0430 \u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u0440\u043E\u044F \u2014 \u043F\u043E\u043A\u0430 \u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u043D\u0435 \u0443\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0430, \u0431\u0440\u0430\u0442\u044C \u0435\u0451 \u0441\u043D\u043E\u0432\u0430 \u0441\u043C\u044B\u0441\u043B\u0430 \u043D\u0435\u0442. \u0420\u0430\u0437\u0431\u0435\u0440\u0438\u0441\u044C \u0438 \u0432\u0435\u0440\u043D\u0438 \u0432 \u0431\u044D\u043A\u043B\u043E\u0433.`,
-        { swarmKind: "report", swarmDroneName: run.name }
-      ).catch(() => {
-      });
+\u0417\u0430\u0434\u0430\u0447\u0430 \u0441\u043D\u044F\u0442\u0430 \u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u0440\u043E\u044F \u2014 \u043F\u043E\u043A\u0430 \u043F\u0440\u0438\u0447\u0438\u043D\u0430 \u043D\u0435 \u0443\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0430, \u0431\u0440\u0430\u0442\u044C \u0435\u0451 \u0441\u043D\u043E\u0432\u0430 \u0441\u043C\u044B\u0441\u043B\u0430 \u043D\u0435\u0442. \u0423\u0441\u0442\u0440\u0430\u043D\u0438 \u043F\u0440\u0438\u0447\u0438\u043D\u0443 \u0438 \u0432\u0435\u0440\u043D\u0438 \u0437\u0430\u0434\u0430\u0447\u0443 \u0432 \xAB\u043D\u0435 \u043D\u0430\u0447\u0430\u0442\u043E\xBB \u2014 \u0440\u043E\u0439 \u043F\u043E\u0434\u0445\u0432\u0430\u0442\u0438\u0442 \u0435\u0451 \u0441\u043D\u043E\u0432\u0430.`,
+          { swarmKind: "report", swarmDroneName: run.name }
+        ).catch(() => {
+        });
       await client.startTask(run.task_slug).catch(() => {
       });
       const after = await client.getTask(run.task_slug).catch(() => null);
@@ -20723,6 +20939,9 @@ async function runDaemon(opts) {
       nudge
     ),
     worktreeExists: (p) => existsSync18(p),
+    // TASWM-514: с этого момента считаем попытки спавна — счётчик живёт ровно одну жизнь
+    // процесса демона и рестарт не переживает (см. preStartAttempts).
+    startedAt: Date.now(),
     hasTranscript: executorHasSession,
     // CI-осведомлённость review-PR (TASWM-102): реальный `gh pr checks`/`gh run view --log-failed`
     // (gh.ts) — решение (будить ли дрона) и гейты живут в tickOnce/handleCiRed. failureSummary
@@ -21184,6 +21403,7 @@ export {
   GATE_LOG_HEARTBEAT_TICKS,
   HEADLESS_BLOCK,
   HERO_CONTINUE_NUDGE,
+  OPEN_PR_HOLD_MARK,
   OVERMIND_ENTRY,
   RESOLVE_ESCALATION_MARK,
   RESOLVE_LIMIT,
@@ -21201,6 +21421,8 @@ export {
   STALL_FLOOR_MS,
   STALL_MS,
   STORM_DEAD_LIMIT,
+  SUBMITTED_EXIT_TEXT,
+  VERIFY_ESCALATION_MARK,
   VERIFY_SPAWN_LIMIT,
   WATCHDOG_PARK_REASON,
   abortReason,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.26",
+  "version": "0.6.27",
   "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": "52416995d46b0a843374d14bfb00dd310f71c4bf",
+  "gitHead": "2e1ed83014422ae577be60271adc79e291b9e2ab",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",