@taskless-app/swarm 0.6.49 → 0.6.51

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) {
@@ -1723,13 +1733,61 @@ function similarTasks(model, text, limit = 5) {
   }
   return scored.sort((a, b) => b.score - a.score).slice(0, limit);
 }
+function historyFiles(model) {
+  let idx = historyIndex.get(model);
+  if (!idx) {
+    const files = new Set(model.entries.flatMap((e) => e.files));
+    const byBase = /* @__PURE__ */ new Map();
+    for (const f of files) {
+      const base3 = f.slice(f.lastIndexOf("/") + 1);
+      byBase.set(base3, [...byBase.get(base3) ?? [], f]);
+    }
+    idx = { files, byBase };
+    historyIndex.set(model, idx);
+  }
+  return idx;
+}
+function namedPaths(model, text, fileExists) {
+  const { files, byBase } = historyFiles(model);
+  const known = (p) => files.has(p) || (fileExists?.(p) ?? false);
+  const raw = [...new Set((text.match(PATH_CANDIDATE) ?? []).map((c) => c.replace(/^\.?\/+/, "").replace(/\.+$/, "")))].filter((c) => c && !c.split("/").includes(".."));
+  raw.sort((a, b) => b.split("/").length - a.split("/").length);
+  const out = [];
+  const dirs = /* @__PURE__ */ new Set();
+  const take = (p) => {
+    if (out.includes(p)) return;
+    out.push(p);
+    dirs.add(dirOf(p));
+  };
+  for (const c of raw) {
+    if (known(c)) {
+      take(c);
+      continue;
+    }
+    const base3 = c.slice(c.lastIndexOf("/") + 1);
+    let matches = (byBase.get(base3) ?? []).filter((f) => f === c || f.endsWith(`/${c}`));
+    if (matches.length > 1) matches = matches.filter((f) => dirs.has(dirOf(f)));
+    if (matches.length === 1) {
+      take(matches[0]);
+      continue;
+    }
+    if (!c.includes("/") && fileExists) {
+      const sibling = [...dirs].map((d) => d ? `${d}/${c}` : c).filter(fileExists);
+      if (sibling.length === 1) take(sibling[0]);
+    }
+  }
+  return out;
+}
 function predictFiles(model, opts) {
   if (!hasZoneModel(model)) return [];
   const limit = opts.limit ?? 40;
   const best = /* @__PURE__ */ new Map();
+  const named = opts.text ? namedPaths(model, opts.text, opts.fileExists) : [];
+  for (const path of named) best.set(path, { path, weight: 1, why: "\u043D\u0430\u0437\u0432\u0430\u043D \u0432 \u0437\u0430\u0434\u0430\u0447\u0435", named: true });
+  const factor = named.length ? NAMED_BACKGROUND_FACTOR : 1;
   const put = (path, weight, why) => {
     const cur = best.get(path);
-    if (!cur || cur.weight < weight) best.set(path, { path, weight, why });
+    if (!cur || cur.weight < weight * factor) best.set(path, { path, weight: weight * factor, why });
   };
   if (opts.text) {
     const sim = similarTasks(model, opts.text, opts.similar ?? 5);
@@ -1746,12 +1804,18 @@ function predictFiles(model, opts) {
   }
   return [...best.values()].sort((a, b) => b.weight - a.weight || a.path.localeCompare(b.path)).slice(0, limit);
 }
+function heldByPrediction(predicted) {
+  const named = predicted.filter((p) => p.named);
+  return (named.length ? named : predicted).map((p) => p.path);
+}
 function overlapRisk(predicted, actual, opts = {}) {
   const o = { ...OVERLAP_DEFAULTS, ...opts };
   const actualSet = new Set(actual);
   const actualDirs = new Set([...actualSet].map(dirOf).filter(Boolean));
   const totalWeight = predicted.reduce((a, p) => a + p.weight, 0);
   if (!totalWeight) return { overlap: false, score: 0, sharedFiles: [], sharedDirs: [] };
+  const hasNamed = predicted.some((p) => p.named);
+  let namedHit = false;
   let hit = 0;
   let strong = false;
   const sharedFiles = [];
@@ -1760,24 +1824,26 @@ function overlapRisk(predicted, actual, opts = {}) {
     if (actualSet.has(p.path)) {
       hit += p.weight;
       sharedFiles.push(p.path);
-      if (p.weight >= o.strongFile) strong = true;
+      if (p.named) namedHit = true;
+      if (p.weight >= o.strongFile && (p.named || !hasNamed)) strong = true;
       continue;
     }
     const d = dirOf(p.path);
     if (d && actualDirs.has(d)) {
       hit += p.weight * 0.25;
       sharedDirs.add(d);
+      if (p.named) namedHit = true;
     }
   }
   const score = Math.min(1, hit / totalWeight);
   return {
-    overlap: strong || score >= o.threshold,
+    overlap: strong || score >= o.threshold && (!hasNamed || namedHit),
     score,
     sharedFiles: sharedFiles.slice(0, 10),
     sharedDirs: [...sharedDirs].slice(0, 5)
   };
 }
-var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS, OVERLAP_DEFAULTS;
+var SPINE_ZONE, DEFAULTS, EMPTY_ZONE_MODEL, GENERIC_DIRS, WORKSPACE_DIRS, GENERIC_TEST_DIRS, STOP_TERMS, PATH_CANDIDATE, historyIndex, NAMED_BACKGROUND_FACTOR, OVERLAP_DEFAULTS;
 var init_codeZones = __esm({
   "../swarm-core/src/codeZones.ts"() {
     "use strict";
@@ -1856,6 +1922,9 @@ var init_codeZones = __esm({
       "\u043F\u0435\u0440\u0444",
       "wip"
     ]);
+    PATH_CANDIDATE = /[\w@.\-/]+\.[A-Za-z][A-Za-z0-9]{0,5}/g;
+    historyIndex = /* @__PURE__ */ new WeakMap();
+    NAMED_BACKGROUND_FACTOR = 0.1;
     OVERLAP_DEFAULTS = { threshold: 0.2, strongFile: 0.35 };
   }
 });
@@ -1875,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";
@@ -1886,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;
   }
 });
 
@@ -6253,6 +6321,10 @@ function rowToRun(row) {
     // вычисляемая фаза ревью (TASWM-230)
     review_cycle: row.review_cycle ?? 0,
     // старые прогоны без колонки → 0
+    // TASWM-577: намерение смержить (человек отметил «пора влить»). В sqlite-бэкенде оно
+    // живёт только здесь — ставить его некому, кроме самого демона, зато читает его
+    // реконсайл, и колонка нужна, чтобы отметка пережила рестарт.
+    merge_requested_at: row.merge_requested_at ?? null,
     task_title: row.task_title ?? null,
     task_desc: row.task_desc ?? null,
     // TASWM-556: когда заведена сама задача — по ней проверка дубля отличает свой
@@ -6328,6 +6400,7 @@ CREATE TABLE IF NOT EXISTS runs (
   verifies_run_id INTEGER,
   verify_verdict TEXT,
   review_cycle INTEGER NOT NULL DEFAULT 0,
+  merge_requested_at TEXT,
   task_title TEXT,
   task_desc TEXT,
   task_created_at TEXT,
@@ -6422,6 +6495,8 @@ CREATE TABLE IF NOT EXISTS imports (
           "ALTER TABLE runs ADD COLUMN verify_verdict TEXT",
           // Авто-ревью v2 (TASWM-162): номер цикла ревью — пере-ревью после фикс-итерации.
           "ALTER TABLE runs ADD COLUMN review_cycle INTEGER NOT NULL DEFAULT 0",
+          // TASWM-577: намерение смержить — по нему рой вливает PR сам, по очереди мержа.
+          "ALTER TABLE runs ADD COLUMN merge_requested_at TEXT",
           // Вычисляемая фаза ревью (TASWM-230): человеко-фраза «чего ждёт PR», её считает демон.
           "ALTER TABLE runs ADD COLUMN review_phase TEXT",
           // Приоритетная очередь (TASWM-269): явный приоритет прогона, выше — раньше из queued.
@@ -7207,7 +7282,7 @@ var init_droneStore = __esm({
 
 // src/overmind.ts
 import { homedir as homedir7 } from "os";
-import { existsSync as existsSync20, readFileSync as readFileSync25, readdirSync as readdirSync14, renameSync as renameSync12 } from "fs";
+import { existsSync as existsSync20, readFileSync as readFileSync25, readdirSync as readdirSync14, renameSync as renameSync12, statSync as statSync13 } from "fs";
 import { basename as basename6, dirname as dirname5, join as join34 } from "path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "url";
 import { spawn as spawn4 } from "child_process";
@@ -7555,6 +7630,12 @@ function depsFailureRetriable(code) {
 function runRef(runKey) {
   return { __runRef: runKey };
 }
+function isoOrNull(v) {
+  if (v == null) return null;
+  const raw = v instanceof Date ? v.toISOString() : typeof v === "string" ? v : "";
+  const at = Date.parse(raw);
+  return Number.isNaN(at) ? null : new Date(at).toISOString();
+}
 function isRunRef(v) {
   return typeof v === "object" && v !== null && "__runRef" in v;
 }
@@ -8022,6 +8103,17 @@ var SwarmClient = class _SwarmClient {
   runKeyOf(id) {
     return this.runs.get(id)?.runKey ?? null;
   }
+  /**
+   * Cuid прогона В ПРОДЕ — им адресуются прод-РУЧКИ, а не MCP-тулы (TASWM-577: демон
+   * вливает PR тем же `POST /swarm/merge`, что и кнопка, и снимает намерение тем же
+   * `DELETE /swarm/merge-request/:runId`). null — прогон до прода ещё не долетел
+   * (создан этим демоном, флаш не прошёл): адресовать его там нечем, и вызывающий
+   * обязан прочитать это как «сейчас нельзя», а не как ошибку.
+   */
+  prodRunId(id) {
+    const key = this.runs.get(id)?.runKey;
+    return key ? this.prodIdFor(key) ?? null : null;
+  }
   runByKey(key) {
     const direct = [...this.runs.values()].find((r) => r.runKey === key);
     if (direct) return this.mat(direct);
@@ -9568,6 +9660,9 @@ var SwarmClient = class _SwarmClient {
         verify_verdict: null,
         review_phase: null,
         // вычисляемая фаза ревью (TASWM-230) — прод хранит и раздаёт
+        // TASWM-577: намерение смержить — прод-поле (его ставит человек ручкой
+        // /swarm/merge-request), заполняется ниже из ответа.
+        merge_requested_at: null,
         // Локальная бухгалтерия (в прод-схему не уходит) — на гидрации из прода дефолт 0;
         // существующая локальная запись НЕ перетирается (поле не в field-copy ниже),
         // в отличие от respawns, — авто-ревью v2, TASWM-162.
@@ -9603,6 +9698,7 @@ var SwarmClient = class _SwarmClient {
     local.task_title = pr.taskTitle ?? local.task_title;
     local.task_desc = pr.taskDesc ?? local.task_desc;
     local.task_created_at = pr.taskCreatedAt ?? local.task_created_at;
+    if ("mergeRequestedAt" in pr) local.merge_requested_at = isoOrNull(pr.mergeRequestedAt);
     local.name = pr.droneName ?? local.name;
     local.kind = pr.role ?? local.kind;
     const heroProd = pr.heroId ?? null;
@@ -12393,7 +12489,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.49",
+  version: "0.6.51",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12444,7 +12540,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "27600667531d4f65761c74793e8c4ee4859dc8ae"
+  gitHead: "24aad254ba4f3f71904310b73435e647a08f22f5"
 };
 
 // src/version.ts
@@ -12762,18 +12858,48 @@ async function prHeadBranch(prUrl, run = realRunner) {
     return null;
   }
 }
-async function prBaseSync(prUrl, run = realRunner) {
+function prRepoPath(prUrl) {
   const m = prUrl.trim().match(/github\.com\/([^/\s]+)\/([^/\s]+)\/pull\/\d+/i);
-  if (!isGithubPrUrl(prUrl) || !m) return null;
-  const [, owner, repo] = m;
+  return isGithubPrUrl(prUrl) && m ? `${m[1]}/${m[2]}` : null;
+}
+async function prBaseSync(prUrl, run = realRunner) {
+  const repoPath = prRepoPath(prUrl);
+  if (!repoPath) return null;
   try {
     const j = JSON.parse(await run(["pr", "view", prUrl, "--json", "baseRefName,headRefOid"]));
     const base3 = j.baseRefName;
     const head = j.headRefOid;
     if (!base3 || !head) return null;
-    const out = await run(["api", `repos/${owner}/${repo}/compare/${base3}...${head}?per_page=1`, "--jq", ".behind_by"]);
+    const out = await run(["api", `repos/${repoPath}/compare/${base3}...${head}?per_page=1`, "--jq", ".behind_by"]);
     const behindBy = Number(out.trim());
-    return Number.isFinite(behindBy) && behindBy >= 0 ? { behindBy, base: base3 } : null;
+    return Number.isFinite(behindBy) && behindBy >= 0 ? { behindBy, base: base3, headSha: head } : null;
+  } catch {
+    return null;
+  }
+}
+var ACTIONS_RUN_OK = /* @__PURE__ */ new Set(["success", "skipped", "neutral"]);
+async function prActionsRuns(prUrl, headSha2, run = realRunner) {
+  const repoPath = prRepoPath(prUrl);
+  if (!repoPath || !/^[0-9a-f]{7,40}$/i.test(headSha2)) return null;
+  try {
+    const j = JSON.parse(
+      await run(["api", `repos/${repoPath}/actions/runs?head_sha=${headSha2}&per_page=100&exclude_pull_requests=true`])
+    );
+    const runs = j.workflow_runs;
+    if (!Array.isArray(runs)) return null;
+    if (typeof j.total_count === "number" && j.total_count > runs.length) return null;
+    const latest = /* @__PURE__ */ new Map();
+    for (const r of runs) {
+      const key = `${r.workflow_id ?? r.name ?? "?"}:${r.event ?? "?"}`;
+      const seen = latest.get(key);
+      if (!seen || (r.id ?? 0) > (seen.id ?? 0)) latest.set(key, r);
+    }
+    const label2 = (r, what) => `${r.name || "workflow"} (${what || "?"})`;
+    return {
+      total: runs.length,
+      active: runs.filter((r) => r.status !== "completed").map((r) => label2(r, r.status)),
+      failed: [...latest.values()].filter((r) => r.status === "completed" && !ACTIONS_RUN_OK.has(r.conclusion ?? "")).map((r) => label2(r, r.conclusion))
+    };
   } catch {
     return null;
   }
@@ -14815,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,
@@ -15337,22 +15464,10 @@ function mergeQueueCandidates(runs, repo, repoFallback) {
 }
 var BASE_TTL_MS = 2e4;
 function makeMergeQueueResolver(deps) {
-  const memo = /* @__PURE__ */ new Map();
+  const read = deps.headState ?? makeHeadStateReader(deps);
   const evaluate = async (e, prUrl, ready) => {
-    const now = Date.now();
-    let cached = memo.get(prUrl);
-    const ttl = deps.ttlMs ?? BASE_TTL_MS;
-    if (!cached || now - cached.at >= ttl) {
-      const base3 = await deps.baseSync(prUrl).catch(() => null);
-      let checks = "none";
-      if (base3?.behindBy === 0 && deps.checks) {
-        const ci = await deps.checks(prUrl).catch(() => null);
-        checks = ci ? ci.bucket : null;
-      }
-      cached = { at: now, base: base3, checks };
-      memo.set(prUrl, cached);
-    }
-    return computeMergeQueue({ entry: e, ready, behindBy: cached.base ? cached.base.behindBy : null, checks: cached.checks });
+    const st = await read(prUrl);
+    return computeMergeQueue({ entry: e, ready, behindBy: st.behindBy, checks: st.checks });
   };
   return async (run) => {
     if (!deps.baseSync || !run.pr_url) return null;
@@ -15387,6 +15502,124 @@ function makeMergeQueueResolver(deps) {
 function entryOf(r) {
   return { runId: r.id, prNumber: prNumberOf(r.pr_url), slug: r.task_slug };
 }
+function makeHeadStateReader(deps) {
+  const memo = /* @__PURE__ */ new Map();
+  return async (prUrl) => {
+    const now = Date.now();
+    const ttl = deps.ttlMs ?? BASE_TTL_MS;
+    const cached = memo.get(prUrl);
+    if (cached && now - cached.at < ttl) return { behindBy: cached.behindBy, checks: cached.checks, headSha: cached.headSha };
+    const base3 = deps.baseSync ? await deps.baseSync(prUrl).catch(() => null) : null;
+    let checks = "none";
+    if (base3?.behindBy === 0 && deps.checks) {
+      const ci = await deps.checks(prUrl).catch(() => null);
+      checks = ci ? ci.bucket : null;
+    }
+    const fresh = { behindBy: base3 ? base3.behindBy : null, checks, headSha: base3?.headSha ?? null };
+    memo.set(prUrl, { at: now, ...fresh });
+    return fresh;
+  };
+}
+function hasMergeIntent(r) {
+  return !!(r.merge_requested_at ?? "").trim();
+}
+var NO_CI_GRACE_MS = 10 * 6e4;
+var shortSha = (sha) => sha.slice(0, 7);
+function makeMergeIntentResolver(deps) {
+  const read = deps.headState ?? makeHeadStateReader(deps);
+  const firstSeen = /* @__PURE__ */ new Map();
+  const ciSettled = async (prUrl, st, now) => {
+    const sha = st.headSha;
+    if (!sha) {
+      return { action: "wait", code: "checks_unknown", reason: "gh \u043D\u0435 \u0441\u043A\u0430\u0437\u0430\u043B HEAD PR \u2014 \u0431\u0435\u0437 \u043D\u0435\u0433\u043E \u043D\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C, \u0434\u043E\u0431\u0435\u0436\u0430\u043B \u043B\u0438 \u043D\u0430 \u043D\u0451\u043C CI. \u0421\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    if (!deps.actionsRuns) {
+      return { action: "wait", code: "checks_unknown", reason: "\u0440\u043E\u044E \u043D\u0435\u0447\u0435\u043C \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 HEAD PR \u2014 \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443 \u0430\u0433\u0440\u0435\u0433\u0430\u0442\u0443 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u0432\u0441\u043B\u0435\u043F\u0443\u044E \u043D\u0435 \u0432\u043B\u0438\u0432\u0430\u044E" };
+    }
+    const runs = await deps.actionsRuns(prUrl, sha).catch(() => null);
+    if (!runs) {
+      return { action: "wait", code: "checks_unknown", reason: `\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 ${shortSha(sha)} \u2014 \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C` };
+    }
+    if (runs.failed.length > 0) {
+      return { action: "clear", code: "checks_red", reason: `\u043D\u0430 ${shortSha(sha)} \u0443\u043F\u0430\u043B \u043F\u0440\u043E\u0433\u043E\u043D GitHub Actions: ${runs.failed.join(", ")} \u2014 \u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E, \u043D\u0443\u0436\u043D\u0430 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0430` };
+    }
+    if (runs.active.length > 0) {
+      return {
+        action: "wait",
+        code: "checks_pending",
+        reason: `\u043D\u0430 ${shortSha(sha)} \u0435\u0449\u0451 \u0438\u0434\u0443\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions: ${runs.active.join(", ")} \u2014 \u0432\u0438\u0434\u0438\u043C\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0437\u0435\u043B\u0451\u043D\u044B\u043C\u0438, \u043F\u043E\u043A\u0430 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F \u0432\u043E\u043B\u043D\u0430 \u0434\u0436\u043E\u0431 \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u043D\u0430`
+      };
+    }
+    if (st.checks === "none") {
+      if (runs.total > 0) {
+        return { action: "wait", code: "checks_pending", reason: `\u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 ${shortSha(sha)} \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0438\u0441\u044C, \u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043E\u043A \u0443 PR \u0435\u0449\u0451 \u043D\u0435 \u0432\u0438\u0434\u043D\u043E \u2014 \u0436\u0434\u0443, \u043F\u043E\u043A\u0430 GitHub \u0438\u0445 \u043F\u043E\u043A\u0430\u0436\u0435\u0442` };
+      }
+      const seen = firstSeen.get(prUrl);
+      const waited = seen && seen.sha === sha ? now - seen.at : 0;
+      const graceMin = NO_CI_GRACE_MS / 6e4;
+      if (waited < NO_CI_GRACE_MS) {
+        return {
+          action: "wait",
+          code: "checks_pending",
+          reason: `\u043D\u0430 ${shortSha(sha)} \u043F\u043E\u043A\u0430 \u043D\u0438 \u043E\u0434\u043D\u043E\u0439 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0438 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u043E\u043D\u0430 GitHub Actions \u2014 CI \u043C\u043E\u0433 \u0435\u0449\u0451 \u043D\u0435 \u0437\u0430\u0432\u0435\u0441\u0442\u0438 \u0434\u0436\u043E\u0431\u044B \u043F\u043E\u0441\u043B\u0435 \u043F\u0443\u0448\u0430. \u0416\u0434\u0443 \u0434\u043E ${graceMin} \u043C\u0438\u043D (\u043F\u0440\u043E\u0448\u043B\u043E ${Math.floor(waited / 6e4)})`
+        };
+      }
+      return { action: "merge", code: "queue_head", reason: `\u0435\u0433\u043E \u0447\u0435\u0440\u0451\u0434 \u0438 \u0431\u0430\u0437\u0430 \u0441\u0432\u0435\u0436\u0430\u044F, \u0430 ${shortSha(sha)} ${graceMin} \u043C\u0438\u043D \u043F\u0440\u043E\u0441\u0442\u043E\u044F\u043B \u0431\u0435\u0437 \u0435\u0434\u0438\u043D\u043E\u0439 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0438 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 GitHub Actions \u2014 CI \u0443 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F \u043D\u0435\u0442` };
+    }
+    return { action: "merge", code: "queue_head", reason: `\u0435\u0433\u043E \u0447\u0435\u0440\u0451\u0434, \u0431\u0430\u0437\u0430 \u0441\u0432\u0435\u0436\u0430\u044F, \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043D\u0430 ${shortSha(sha)} \u0437\u0435\u043B\u0451\u043D\u044B\u0435 \u0438 \u0432\u0441\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u044B GitHub Actions \u043D\u0430 \u043D\u0451\u043C \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u044B` };
+  };
+  const confirmLive = async (prUrl, sha, verdict) => {
+    if (!sha) {
+      return { action: "wait", code: "checks_unknown", reason: "gh \u043D\u0435 \u0441\u043A\u0430\u0437\u0430\u043B HEAD PR \u2014 \u043D\u0435 \u043F\u043E\u043D\u044F\u0442\u044C, \u043F\u0440\u043E \u043A\u0430\u043A\u043E\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u044D\u0442\u043E\u0442 \u0432\u0435\u0440\u0434\u0438\u043A\u0442; \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    const live = deps.baseSync ? await deps.baseSync(prUrl).catch(() => null) : null;
+    if (!live || !live.headSha) {
+      return { action: "wait", code: "base_unknown", reason: "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0435\u0440\u0435\u0441\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u0436\u0438\u0432\u043E\u0439 HEAD PR \u2014 \u0441\u043F\u0440\u043E\u0448\u0443 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C" };
+    }
+    if (verdict.action === "merge" && live.behindBy > 0) {
+      return {
+        action: "refresh_base",
+        code: "base_stale",
+        reason: `\u0431\u0430\u0437\u0430 \u0443\u0448\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434 \u043D\u0430 ${live.behindBy} \u043A\u043E\u043C\u043C\u0438\u0442(\u043E\u0432) \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0433\u043E \u043C\u0435\u0440\u0436\u0430 \u2014 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0432\u043B\u0438\u0442\u044C main \u0438 \u0434\u043E\u0436\u0434\u0430\u0442\u044C\u0441\u044F CI \u043D\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435`
+      };
+    }
+    if (live.headSha !== sha) {
+      return { action: "wait", code: "checks_pending", reason: `\u043D\u0430 PR \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 ${shortSha(live.headSha)} \u2014 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E \u0437\u0430\u043D\u043E\u0432\u043E` };
+    }
+    return verdict;
+  };
+  return async (run) => {
+    if (!deps.baseSync || !run.pr_url || !hasMergeIntent(run)) return null;
+    const num = prNumberOf(run.pr_url);
+    if (num == null) return null;
+    const marked = mergeQueueCandidates(deps.listRuns(), effectiveRepoOf(run.repo, deps.repoFallback), deps.repoFallback).filter(hasMergeIntent);
+    const mine = marked.find((c) => prNumberOf(c.pr_url) === num);
+    if (!mine) return null;
+    const queue = orderMergeQueue(marked.map(entryOf));
+    const entry = entryOf(mine);
+    const position = queue.findIndex((e) => e.runId === entry.runId) + 1;
+    const head = queue[0];
+    if (head.runId !== entry.runId) {
+      return {
+        action: "wait",
+        code: "queue_wait",
+        reason: `\u0440\u043E\u0439 \u0432\u043B\u0438\u0432\u0430\u0435\u0442 \u043F\u043E \u043E\u0434\u043D\u043E\u043C\u0443: \u0441\u0435\u0439\u0447\u0430\u0441 \u043E\u0447\u0435\u0440\u0435\u0434\u044C PR #${head.prNumber}${head.slug ? ` (${head.slug})` : ""}, \u044D\u0442\u043E\u0442 \u2014 ${position}-\u0439 \u0438\u0437 ${queue.length}`,
+        position,
+        size: queue.length
+      };
+    }
+    const st = await read(mine.pr_url);
+    const now = deps.now ? deps.now() : Date.now();
+    if (st.headSha) {
+      const seen = firstSeen.get(mine.pr_url);
+      if (!seen || seen.sha !== st.headSha) firstSeen.set(mine.pr_url, { sha: st.headSha, at: now });
+    }
+    const d = computeMergeQueue({ entry, ready: queue, behindBy: st.behindBy, checks: st.checks });
+    const verdict = d.code === "queue_head" ? await ciSettled(mine.pr_url, st, now) : { action: d.code === "base_stale" ? "refresh_base" : d.code === "checks_red" ? "clear" : "wait", code: d.code, reason: d.reason };
+    const final = verdict.action === "merge" || verdict.action === "clear" ? await confirmLive(mine.pr_url, st.headSha, verdict) : verdict;
+    return { ...final, position, size: queue.length, ...st.headSha ? { headSha: st.headSha } : {} };
+  };
+}
 function needsBaseRefresh(d) {
   return d?.code === "base_stale";
 }
@@ -15418,9 +15651,15 @@ function makeMergeGateParts(deps) {
     });
   };
   const repoOfRun = deps.repoFullNameOf ? (r) => deps.repoFullNameOf(effectiveRepoOf(r.repo, deps.repoFallback)) : void 0;
+  const headState = makeHeadStateReader({
+    ...deps.baseSync ? { baseSync: deps.baseSync } : {},
+    ...deps.checks ? { checks: deps.checks } : {},
+    ...deps.ttlMs != null ? { ttlMs: deps.ttlMs } : {}
+  });
   const queueFor = makeMergeQueueResolver({
     listRuns: deps.listRuns,
     gateAllows: async (r) => (await gateFor(r)).allowed,
+    headState,
     ...deps.repoFallback ? { repoFallback: deps.repoFallback } : {},
     ...deps.baseSync ? { baseSync: deps.baseSync } : {},
     ...deps.checks ? { checks: deps.checks } : {},
@@ -15446,7 +15685,68 @@ function makeMergeGateParts(deps) {
       }
     };
   };
-  return { gate, queue: queueFor };
+  const intentFor = makeMergeIntentResolver({
+    listRuns: deps.listRuns,
+    headState,
+    ...deps.repoFallback ? { repoFallback: deps.repoFallback } : {},
+    ...deps.baseSync ? { baseSync: deps.baseSync } : {},
+    ...deps.checks ? { checks: deps.checks } : {},
+    ...deps.actionsRuns ? { actionsRuns: deps.actionsRuns } : {},
+    ...deps.ttlMs != null ? { ttlMs: deps.ttlMs } : {}
+  });
+  return { gate, queue: queueFor, intent: intentFor };
+}
+
+// src/prodMerge.ts
+init_config();
+init_taskless();
+var TIMEOUT_MS = 3e4;
+async function tokenFor(api, deps) {
+  return deps.token ? deps.token() : resolveApiToken(api);
+}
+async function prodMergePr(runId, sha, deps = {}) {
+  const api = deps.api ?? TASKLESS_API;
+  const doFetch = deps.fetchFn ?? fetch;
+  try {
+    const token = await tokenFor(api, deps);
+    if (!token) return { ok: false, error: "\u043D\u0435\u0447\u0435\u043C \u0445\u043E\u0434\u0438\u0442\u044C \u0432 \u043F\u0440\u043E\u0434 (\u043D\u0435\u0442 \u0442\u043E\u043A\u0435\u043D\u0430)" };
+    const res = await doFetch(restEndpoint(api, "/swarm/merge"), {
+      method: "POST",
+      headers: { Authorization: `Bearer ${token}`, "content-type": "application/json" },
+      body: JSON.stringify(sha ? { runId, sha } : { runId }),
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      let code;
+      try {
+        code = JSON.parse(text).error;
+      } catch {
+        code = void 0;
+      }
+      if (code === "head_moved") return { ok: false, error: "HEAD PR \u0441\u043C\u0435\u043D\u0438\u043B\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438", headMoved: true };
+      return { ok: false, error: `\u043F\u0440\u043E\u0434 \u043E\u0442\u043A\u0430\u0437\u0430\u043B (${res.status}): ${text.slice(0, 300)}` };
+    }
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
+async function prodClearMergeIntent(runId, deps = {}) {
+  const api = deps.api ?? TASKLESS_API;
+  const doFetch = deps.fetchFn ?? fetch;
+  try {
+    const token = await tokenFor(api, deps);
+    if (!token) return false;
+    const res = await doFetch(restEndpoint(api, `/swarm/merge-request/${encodeURIComponent(runId)}`), {
+      method: "DELETE",
+      headers: { Authorization: `Bearer ${token}` },
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    return res.ok;
+  } catch {
+    return false;
+  }
 }
 
 // src/envGate.ts
@@ -17803,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();
@@ -18034,8 +18342,8 @@ async function headSha(repo) {
 function runText(run) {
   return [run.task_title ?? "", run.task_desc ?? ""].join(" ").trim();
 }
-function predictForRun(model, run) {
-  return predictFiles(model, { zone: run.area, text: runText(run) });
+function predictForRun(model, run, fileExists) {
+  return predictFiles(model, { zone: run.area, text: runText(run), ...fileExists ? { fileExists } : {} });
 }
 function short(files, n = 3) {
   return files.slice(0, n).join(", ") + (files.length > n ? ` \u0438 \u0435\u0449\u0451 ${files.length - n}` : "");
@@ -18050,17 +18358,17 @@ var SPINE_PREDICTION_WEIGHT = 0.7;
 function spineOfPrediction(spine, predicted) {
   return predicted.filter((p) => spine.has(p.path) && p.weight >= SPINE_PREDICTION_WEIGHT).map((p) => p.path);
 }
-function decideConflict({ model, candidate, active }) {
+function decideConflict({ model, candidate, active, fileExists }) {
   if ((candidate.kind ?? "drone") !== "drone") return { kind: "clear" };
   if (!hasZoneModel(model)) return { kind: "unknown" };
-  const predicted = predictForRun(model, candidate);
+  const predicted = predictForRun(model, candidate, fileExists);
   if (!predicted.length) return { kind: "unknown" };
   if (!active.length) return { kind: "clear" };
   const spine = new Set(model.spine);
   const candidateSpine = new Set(spineOfPrediction(spine, predicted));
   if (candidateSpine.size) {
     for (const w of active) {
-      const theirSpine = w.actual ? w.files.filter((f) => spine.has(f)) : spineOfPrediction(spine, predictForRun(model, w.run));
+      const theirSpine = w.actual ? w.files.filter((f) => spine.has(f)) : spineOfPrediction(spine, predictForRun(model, w.run, fileExists));
       const shared = theirSpine.filter((f) => candidateSpine.has(f));
       if (!shared.length) continue;
       return {
@@ -18186,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;
@@ -18282,11 +18591,56 @@ async function needsBaseRefreshNow(deps, run, stormActive, now) {
   if (last != null && now - last < CONFLICT_RESOLVE_COOLDOWN_MS) return false;
   return needsBaseRefresh(await deps.mergeQueue(run).catch(() => null));
 }
+async function dropMergeIntent(deps, run, reason) {
+  if (!deps.clearMergeIntent) return false;
+  if (!await deps.clearMergeIntent(run).catch(() => false)) return false;
+  deps.db.updateRun(run.id, { merge_requested_at: null });
+  deps.db.addEvent(run.id, "step", `\u043C\u0435\u0440\u0436 \u0441\u043D\u044F\u0442: ${reason}`);
+  narrate(deps, `\u0421\u043D\u044F\u043B \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u0435 \u0441\u043C\u0435\u0440\u0436\u0438\u0442\u044C PR ${droneLabel(run)} \u2014 ${reason}.`);
+  return true;
+}
+function mergeIntentDropReason(deps, run, conflicting) {
+  if (needsFixIteration(run)) return "\u043F\u043E PR \u043F\u0440\u0438\u0448\u0451\u043B \u0432\u0435\u0440\u0434\u0438\u043A\u0442 \xAB\u043D\u0443\u0436\u043D\u044B \u043F\u0440\u0430\u0432\u043A\u0438\xBB \u2014 \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u0434\u043E\u0440\u0430\u0431\u043E\u0442\u043A\u0430";
+  if (conflicting && resolveEscalated(deps.db, run.id)) return "\u0440\u043E\u0439 \u043D\u0435 \u0441\u043C\u043E\u0433 \u0441\u0432\u0435\u0441\u0442\u0438 \u0432\u0435\u0442\u043A\u0443 \u0441 \u0431\u0430\u0437\u043E\u0439 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A";
+  return null;
+}
+var MERGE_INTENT_FAIL_MARK = "\u043C\u0435\u0440\u0436 \u043F\u043E \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u044E \u043D\u0435 \u043F\u0440\u043E\u0448\u0451\u043B";
+var MERGE_INTENT_FAIL_NOTE_MS = 60 * 6e4;
+function noteMergeIntentFailure(deps, run, error, now) {
+  const text = `${MERGE_INTENT_FAIL_MARK}: ${error} \u2014 \u043F\u043E\u0432\u0442\u043E\u0440\u044E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C`;
+  const prev = deps.db.events(run.id).filter((e) => (e.text ?? "").startsWith(MERGE_INTENT_FAIL_MARK));
+  const last = prev[prev.length - 1];
+  if (last && last.text === text) {
+    const at = Date.parse(last.at.replace(" ", "T") + "Z");
+    if (!Number.isNaN(at) && now - at < MERGE_INTENT_FAIL_NOTE_MS) return;
+  }
+  deps.db.addEvent(run.id, "step", text);
+}
 function lastCiCheckMs(db, runId) {
   const evs = db.events(runId).filter((e) => e.kind === "ci_wake" || e.kind === "ci_checked");
   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;
@@ -18317,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,
@@ -19289,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) {
@@ -19322,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;
@@ -19712,6 +20072,13 @@ async function zoneConflictFor(db, models, activeFiles, run, repo, repoFallback)
   if (!hasZoneModel(model)) return { kind: "unknown" };
   const holders = db.listRuns().filter((r) => holdsFiles(r));
   activeFiles.prune(holders.map((r) => r.id));
+  const fileExists = (p) => {
+    try {
+      return statSync13(join34(repo, p), { throwIfNoEntry: false })?.isFile() ?? false;
+    } catch {
+      return false;
+    }
+  };
   const active = [];
   for (const r of holders) {
     if (r.id === run.id) continue;
@@ -19720,10 +20087,10 @@ async function zoneConflictFor(db, models, activeFiles, run, repo, repoFallback)
     const files = snapshot.length ? snapshot : await activeFiles.filesOf(r);
     const prUrl = r.status === "review" ? r.pr_url : null;
     active.push(
-      files.length ? { run: r, files, actual: true, prUrl } : { run: r, files: predictForRun(model, r).map((p) => p.path), actual: false, prUrl }
+      files.length ? { run: r, files, actual: true, prUrl } : { run: r, files: heldByPrediction(predictForRun(model, r, fileExists)), actual: false, prUrl }
     );
   }
-  return decideConflict({ model, candidate: run, active });
+  return decideConflict({ model, candidate: run, active, fileExists });
 }
 function activeDronesOnRepo(deps, repo, exceptRunId) {
   return deps.db.listRuns().filter(
@@ -20051,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) {
@@ -20346,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;
@@ -20836,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);
@@ -20853,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) {
@@ -20906,11 +21320,13 @@ 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;
       }
       if (prLiveness(st) === "closed") {
+        if (hasMergeIntent(run)) await dropMergeIntent(deps, run, "PR \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430");
         await finalizeClosedPrReview(deps, run, "PR \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430 \u2014 \u0440\u0435\u0432\u044C\u044E \u043E\u0442\u043C\u0435\u043D\u0435\u043D\u043E, \u043F\u0440\u043E\u0433\u043E\u043D \u0437\u0430\u043A\u0440\u044B\u0442");
         narrate(deps, `PR ${droneLabel(run)} \u0437\u0430\u043A\u0440\u044B\u0442 \u0431\u0435\u0437 \u043C\u0435\u0440\u0436\u0430 \u2014 ${run.task_slug} \u0441\u043D\u0438\u043C\u0430\u0435\u0442\u0441\u044F \u0441 \u0440\u0435\u0432\u044C\u044E, \u0441\u043B\u043E\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u0435\u043D.`);
         continue;
@@ -20940,7 +21356,37 @@ async function tickOnce(deps) {
         continue;
       }
       await retireOutdatedReviewers(deps, run);
-      const baseStale = !st.conflicting && await needsBaseRefreshNow(deps, run, stormActive, now);
+      let intentBaseStale = false;
+      if (hasMergeIntent(run)) {
+        const drop = mergeIntentDropReason(deps, run, st.conflicting === true);
+        if (drop) {
+          if (await dropMergeIntent(deps, run, drop)) run = deps.db.getRun(run.id) ?? run;
+        } else if (deps.mergeIntent && !stormActive) {
+          const decision = await deps.mergeIntent(run).catch(() => null);
+          if (decision?.action === "clear") {
+            if (await dropMergeIntent(deps, run, decision.reason)) run = deps.db.getRun(run.id) ?? run;
+          } else if (decision?.action === "refresh_base") {
+            if (resolveEscalated(deps.db, run.id)) {
+              if (await dropMergeIntent(deps, run, "\u0440\u043E\u0439 \u043D\u0435 \u0441\u043C\u043E\u0433 \u043F\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u0432\u0435\u0442\u043A\u0443 \u043A \u0441\u0432\u0435\u0436\u0435\u0439 \u0431\u0430\u0437\u0435 \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A")) run = deps.db.getRun(run.id) ?? run;
+            } else {
+              intentBaseStale = true;
+            }
+          } else if (decision?.action === "merge" && deps.mergePr && !st.conflicting) {
+            const res = await deps.mergePr(run, decision.headSha).catch((e) => ({ ok: false, error: describeError(e) }));
+            if (res.ok) {
+              deps.db.addEvent(run.id, "step", `\u0440\u043E\u0439 \u0432\u043B\u0438\u043B PR \u043F\u043E \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u043C\u0435\u0440\u0436\u0430: ${decision.reason} (TASWM-577)`);
+              narrate(deps, `\u0412\u043B\u0438\u043B PR ${droneLabel(run)} \u043F\u043E \u043E\u0447\u0435\u0440\u0435\u0434\u0438 \u043C\u0435\u0440\u0436\u0430: ${decision.reason}.`);
+              continue;
+            }
+            if ("headMoved" in res && res.headMoved) {
+              deps.db.addEvent(run.id, "step", `\u043C\u0435\u0440\u0436 \u043F\u043E \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0438\u044E \u043E\u0442\u043B\u043E\u0436\u0435\u043D: HEAD PR \u0441\u043C\u0435\u043D\u0438\u043B\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 ${(decision.headSha ?? "").slice(0, 7)} \u2014 \u043F\u0440\u043E\u0432\u0435\u0440\u044E \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0442\u0438\u043A\u043E\u043C (TASWM-580)`);
+            } else {
+              noteMergeIntentFailure(deps, run, res.error, now);
+            }
+          }
+        }
+      }
+      const baseStale = !st.conflicting && (intentBaseStale || await needsBaseRefreshNow(deps, run, stormActive, now));
       if ((st.conflicting || baseStale) && deps.resolveConflict && !stormActive) {
         if (deps.db.activeResolverFor(run.id)) continue;
         if (deps.db.resolverCountFor(run.id) >= RESOLVE_LIMIT) {
@@ -20981,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
@@ -22458,7 +22909,10 @@ async function runDaemon(opts) {
         const ci = await prCiStatus(url);
         if (ci.bucket === "denied" || ci.bucket === "unavailable") return null;
         return { bucket: ci.bucket };
-      }
+      },
+      // TASWM-577: прогоны GitHub Actions на HEAD — только вливанию по намерению: рой
+      // вливает сам и обязан дождаться, пока CI на этом коммите добежит целиком.
+      actionsRuns: (url, sha) => prActionsRuns(url, sha)
     } : {}
   });
   const deps = {
@@ -22468,6 +22922,24 @@ async function runDaemon(opts) {
     worktreesDir,
     // TASWM-472: реконсайлу от очереди нужен ровно исход `base_stale` (см. needsBaseRefreshNow).
     ...SWARM_MERGE_QUEUE ? { mergeQueue: mergeParts.queue } : {},
+    // TASWM-577: вливание ПО НАМЕРЕНИЮ — та же ось, тот же вход (mergeParts), но очередь из
+    // одних отмеченных PR. Выключается тем же ключом, что и очередь: SWARM_MERGE_QUEUE=0 —
+    // рой не вливает ничего, мержит человек кнопкой, как до этой задачи.
+    ...SWARM_MERGE_QUEUE ? { mergeIntent: mergeParts.intent } : {},
+    // Сам мерж и снятие намерения идут в ПРОД-ручки (`POST /swarm/merge` — GitHub App
+    // воркспейса, squash; `DELETE /swarm/merge-request/:runId`), а адресуются они cuid'ом
+    // прогона в проде. Он есть только у клиентского бэкенда: в sqlite-режиме прогонов в
+    // проде нет вовсе, и рой там по-прежнему не мержит — мержит человек.
+    ...db instanceof SwarmClient ? {
+      mergePr: async (run, sha) => {
+        const prodId = db.prodRunId(run.id);
+        return prodId ? prodMergePr(prodId, sha) : { ok: false, error: "\u043F\u0440\u043E\u0433\u043E\u043D \u0435\u0449\u0451 \u043D\u0435 \u0434\u043E\u043B\u0435\u0442\u0435\u043B \u0434\u043E \u043F\u0440\u043E\u0434\u0430 \u2014 \u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u043C" };
+      },
+      clearMergeIntent: async (run) => {
+        const prodId = db.prodRunId(run.id);
+        return prodId ? prodClearMergeIntent(prodId) : false;
+      }
+    } : {},
     narrate: narrator.narrate,
     control,
     spawn: async (run) => {