@taskless-app/swarm 0.6.56 → 0.6.58

package/dist/cli.js

@@ -3520,7 +3520,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.56",
+      version: "0.6.58",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3571,7 +3571,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "1922a9b8079c0af2b2b8a9b5fc8756b0218f7446"
+      gitHead: "31bef5768382a2e72ea43807a0f1c61eb9f01071"
     };
   }
 });

package/dist/overmind.js

@@ -12593,7 +12593,7 @@ function parkReasonUnretriable(reason) {
 // package.json
 var package_default = {
   name: "@taskless-app/swarm",
-  version: "0.6.56",
+  version: "0.6.58",
   type: "module",
   description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
   keywords: [
@@ -12644,7 +12644,7 @@ var package_default = {
     execa: "^10.0.0",
     zod: "3.25.76"
   },
-  gitHead: "1922a9b8079c0af2b2b8a9b5fc8756b0218f7446"
+  gitHead: "31bef5768382a2e72ea43807a0f1c61eb9f01071"
 };
 
 // src/version.ts
@@ -19676,9 +19676,12 @@ async function resurrectStormDead(deps, worktreeExists, hasTranscript, opts) {
   }
   return resurrected;
 }
-async function wakeRun(deps, runId) {
+async function wakeRun(deps, runId, opts = {}) {
   const run = deps.db.getRun(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 (isAwaitingBudget(run.status, run.stop_reason) && !opts.budgetApproved) {
+    return { ok: false, why: `\u043F\u0440\u043E\u0433\u043E\u043D #${runId} \u0436\u0434\u0451\u0442 \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0430 \u0432\u043E\u043F\u0440\u043E\u0441 \u043E \u0431\u044E\u0434\u0436\u0435\u0442\u0435 \u2014 \u043E\u0442\u0432\u0435\u0442\u044C \u043D\u0430 \u043D\u0435\u0433\u043E \xAB\u0434\u0430\xBB \u0438\u043B\u0438 \xAB\u043D\u0435\u0442\xBB, \u043F\u043E\u0431\u0443\u0434\u043A\u0430 \u0431\u0435\u0437 \u043E\u0442\u0432\u0435\u0442\u0430 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0430 \u0431\u044B \u043E\u0433\u0440\u044B\u0437\u043E\u043A \u0431\u044E\u0434\u0436\u0435\u0442\u0430` };
+  }
   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 stoppedForHuman = deps.db.events(run.id).some((e) => isEscalationText(e.text ?? "", run, "author"));
@@ -20042,8 +20045,10 @@ async function spawnFreshReviewerAfterStall(deps, run, why) {
     deps.db.addEvent(run.id, "step", `\u0441\u0432\u0435\u0436\u0438\u0439 \u0440\u0435\u0432\u044C\u044E\u0435\u0440 \u043F\u043E\u0441\u043B\u0435 \u043F\u043E\u0442\u0435\u0440\u0438 \u0441\u0435\u0441\u0441\u0438\u0438 \u043D\u0435 \u043F\u043E\u0434\u043D\u044F\u043B\u0441\u044F: ${String(e)}`);
   }
 }
-async function wakeAuthorOnChanges(deps, run, now, droneCap) {
+async function wakeAuthorOnChanges(deps, snapshot, now, droneCap) {
   if (!deps.respawn) return false;
+  const run = deps.db.getRun(snapshot.id);
+  if (!run || isAwaitingBudget(run.status, run.stop_reason)) return false;
   if (run.pid != null && deps.isAlive(run.pid)) return false;
   if (deps.db.activeReviewersFor(run.id).some((r) => r.status !== "stalled" && !isAwaitingCi(r.status, r.stop_reason))) {
     return false;
@@ -20084,6 +20089,28 @@ async function wakeAuthorOnChanges(deps, run, now, droneCap) {
       );
     }
   }
+  const budgetBase = budgetBaseUsd(deps);
+  const budgetLeft = effectiveCostCeilingUsd(budgetBase, events) - run.cost_usd;
+  if (budgetBase > 0 && budgetLeft < budgetBase * FIX_BUDGET_MIN_SHARE) {
+    const next = nextApprovedCeilingUsd(budgetBase, events, run.cost_usd);
+    if (next == null || next - run.cost_usd < budgetBase * FIX_BUDGET_MIN_SHARE) {
+      return escalate(
+        "\u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u043D\u0435 \u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C \u0431\u044E\u0434\u0436\u0435\u0442\u0430, \u0430 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0443\u0436\u0435 \u043D\u0435\u043A\u0443\u0434\u0430 \u2014 \u043F\u0440\u0435\u0434\u0435\u043B \u0442\u0440\u0451\u0445 \u0431\u0430\u0437\u043E\u0432\u044B\u0445 \u043F\u043E\u0442\u043E\u043B\u043A\u043E\u0432",
+        `${droneLabel(run)} \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0432\u0437\u044F\u0442\u044C\u0441\u044F \u0437\u0430 \u043F\u0440\u0430\u0432\u043A\u0438: \u0431\u044E\u0434\u0436\u0435\u0442 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 \u0432\u044B\u0431\u0440\u0430\u043D \u0434\u043E \u043F\u0440\u0435\u0434\u0435\u043B\u0430. \u0414\u043E\u0434\u0435\u043B\u0430\u0439 \u0440\u0443\u043A\u0430\u043C\u0438.`
+      );
+    }
+    const ceiling = effectiveCostCeilingUsd(budgetBase, events);
+    const left = `$${Math.max(0, budgetLeft).toFixed(2)}`;
+    askBudget(
+      deps,
+      run,
+      `${AWAITING_BUDGET_REASON} \u2014 ${FIX_BUDGET_MARK} (\u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C ${left} \u043F\u0440\u0438 \u043F\u043E\u0442\u043E\u043B\u043A\u0435 $${ceiling.toFixed(2)})`,
+      fixBudgetQuestionText({ leftUsd: Math.max(0, budgetLeft), ceilingUsd: ceiling, nextUsd: next, prUrl })
+    );
+    deps.db.addEvent(run.id, "paused", `${AWAITING_BUDGET_REASON} \u2014 ${FIX_BUDGET_MARK}: \u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C ${left}, \u0441\u043F\u0440\u043E\u0441\u0438\u043B, \u0434\u0430\u0442\u044C \u043B\u0438 \u0431\u044E\u0434\u0436\u0435\u0442`);
+    narrate(deps, `${droneLabel(run)}: \u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u043F\u043E \u0440\u0435\u0432\u044C\u044E \u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C ${left} \u2014 \u0441\u043F\u0440\u043E\u0441\u0438\u043B, \u0434\u0430\u0442\u044C \u043B\u0438 \u0431\u044E\u0434\u0436\u0435\u0442, \u043F\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043C \u0431\u0440\u0430\u0442\u044C\u0441\u044F.`);
+    return false;
+  }
   const wt = run.worktree_path;
   const wtPath = wt || (deps.worktreesDir ? droneWorktreePath(deps.worktreesDir, normalizeRepo(run.repo || deps.repoFallback || ""), run.task_slug) : null);
   const worktreeReady = !!wtPath && (deps.worktreeExists ?? existsSync20)(wtPath);
@@ -21202,8 +21229,17 @@ async function handleBudgetExhausted(deps, run, ctx) {
   narrate(deps, `${droneLabel(run)} \u0443\u043F\u0451\u0440\u0441\u044F \u0432 \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0442\u0440\u0430\u0442 (${spent}) \u2014 \u0437\u0430\u043C\u0435\u0440, \u0440\u0430\u0431\u043E\u0442\u0430 \u0432 worktree \u0446\u0435\u043B\u0430, \u0434\u0430\u043B\u044C\u0448\u0435 \u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0437\u0430 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u043C.`);
 }
 var BUDGET_QUESTION_PREFIX = "\u0423\u043F\u0451\u0440\u0441\u044F \u0432 \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0442\u0440\u0430\u0442";
+var FIX_BUDGET_MIN_SHARE = 0.25;
+var FIX_BUDGET_MARK = "\u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u043F\u043E \u0440\u0435\u0432\u044C\u044E";
+var FIX_BUDGET_QUESTION_PREFIX = "\u0411\u044E\u0434\u0436\u0435\u0442 \u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438";
+function fixBudgetQuestionText(q, unclearAnswer) {
+  return [
+    unclearAnswer != null ? `${FIX_BUDGET_QUESTION_PREFIX}: \u043E\u0442\u0432\u0435\u0442 \xAB${unclearAnswer}\xBB \u043D\u0435 \u043F\u043E\u043D\u044F\u043B, \u043D\u0443\u0436\u0435\u043D \u044F\u0441\u043D\u044B\u0439 \xAB\u0434\u0430\xBB \u0438\u043B\u0438 \xAB\u043D\u0435\u0442\xBB.` : `${FIX_BUDGET_QUESTION_PREFIX}: \u0440\u0435\u0432\u044C\u044E \u043F\u0440\u043E\u0441\u0438\u0442 \u043F\u0440\u0430\u0432\u043A\u0438 (${q.prUrl}), \u0430 \u043D\u0430 \u043D\u0438\u0445 \u043E\u0441\u0442\u0430\u043B\u043E\u0441\u044C $${q.leftUsd.toFixed(2)} \u043F\u0440\u0438 \u043F\u043E\u0442\u043E\u043B\u043A\u0435 $${q.ceilingUsd.toFixed(2)} \u2014 \u043D\u0435 \u0445\u0432\u0430\u0442\u0438\u0442.`,
+    `\u0414\u0430\u0442\u044C \u0431\u044E\u0434\u0436\u0435\u0442? \u041E\u0442\u0432\u0435\u0442\u044C \xAB\u0434\u0430\xBB \u2014 \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0441\u0442\u0430\u043D\u0435\u0442 $${q.nextUsd.toFixed(2)}, \u0438 \u044F \u0432\u043E\u0437\u044C\u043C\u0443\u0441\u044C \u0437\u0430 \u043F\u0440\u0430\u0432\u043A\u0438. \xAB\u041D\u0435\u0442\xBB \u2014 \u043E\u0441\u0442\u0430\u0432\u043B\u044E PR \u043D\u0430 \u0440\u0435\u0432\u044C\u044E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443.`
+  ].join(" ");
+}
 function isBudgetQuestion(text) {
-  return text.startsWith(BUDGET_QUESTION_PREFIX);
+  return text.startsWith(BUDGET_QUESTION_PREFIX) || text.startsWith(FIX_BUDGET_QUESTION_PREFIX);
 }
 function budgetQuestionText(q, unclearAnswer) {
   return [
@@ -21247,6 +21283,10 @@ async function answerBudgetQuestions(deps, ctx) {
     const answer = q.answer.trim();
     const spent = `$${run.cost_usd.toFixed(2)}`;
     const verdict = budgetAnswer(answer);
+    if (run.stop_reason?.includes(FIX_BUDGET_MARK)) {
+      await answerFixBudget(deps, run, q, answer, verdict);
+      continue;
+    }
     if (verdict === "no") {
       const reason = `${BUDGET_STOP_REASON} (\u043F\u043E\u0442\u0440\u0430\u0447\u0435\u043D\u043E ${spent}) \u2014 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0442\u044C \u043D\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u043B\u0438`;
       if (run.worktree_path) await deps.removeWorktree(run.repo, run.worktree_path).catch(() => {
@@ -21291,7 +21331,8 @@ async function answerBudgetQuestions(deps, ctx) {
         ...deps.hasTranscript ? { hasTranscript: deps.hasTranscript } : {},
         narrate: (m) => narrate(deps, m)
       },
-      run.id
+      run.id,
+      { budgetApproved: true }
     );
     if (woken.ok) {
       budgetSyncAt.delete(run.id);
@@ -21301,6 +21342,37 @@ async function answerBudgetQuestions(deps, ctx) {
     if (deps.db.events(run.id).at(-1)?.text !== note) deps.db.addEvent(run.id, "step", note);
   }
 }
+async function answerFixBudget(deps, run, q, answer, verdict) {
+  const base3 = budgetBaseUsd(deps);
+  const events = deps.db.events(run.id);
+  const mark = `${CHANGES_WAKE_ESCALATION_MARK} (\u043A\u0440\u0443\u0433 ${run.review_cycle ?? 0})`;
+  const backToReview = (humanNote) => {
+    deps.db.updateRun(run.id, { status: "review", stop_reason: null });
+    if (humanNote) deps.db.addEvent(run.id, "step", `${mark}: ${humanNote} \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A`);
+    budgetSyncAt.delete(run.id);
+  };
+  if (!(base3 > 0)) return backToReview();
+  const next = nextApprovedCeilingUsd(base3, events, run.cost_usd);
+  if (verdict === "no") {
+    backToReview(`\u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u043D\u0435 \u0434\u0430\u043B\u0438 \u0431\u044E\u0434\u0436\u0435\u0442\u0430 (\xAB${answer}\xBB)`);
+    narrate(deps, `${droneLabel(run)}: \u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u0431\u044E\u0434\u0436\u0435\u0442\u0430 \u043D\u0435 \u0434\u0430\u043B\u0438 \u2014 PR \u043E\u0441\u0442\u0430\u0451\u0442\u0441\u044F \u043D\u0430 \u0440\u0435\u0432\u044C\u044E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443.`);
+    return;
+  }
+  if (verdict === "unclear") {
+    if (next == null) return backToReview("\u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0443\u0436\u0435 \u043D\u0435\u043A\u0443\u0434\u0430 \u2014 \u043F\u0440\u0435\u0434\u0435\u043B \u0442\u0440\u0451\u0445 \u0431\u0430\u0437\u043E\u0432\u044B\u0445 \u043F\u043E\u0442\u043E\u043B\u043A\u043E\u0432");
+    const ceiling = effectiveCostCeilingUsd(base3, events);
+    const left = Math.max(0, ceiling - run.cost_usd);
+    askBudget(deps, run, run.stop_reason, fixBudgetQuestionText({ leftUsd: left, ceilingUsd: ceiling, nextUsd: next, prUrl: run.pr_url ?? "" }, answer));
+    return;
+  }
+  const askedMs = stampMs(q.asked_at);
+  if (!events.some((e) => isBudgetApprovedEvent(e) && stampMs(e.at) >= askedMs)) {
+    if (next == null) return backToReview("\u043D\u0430 \xAB\u0434\u0430\xBB \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0443\u0436\u0435 \u043D\u0435\u043A\u0443\u0434\u0430 \u2014 \u043F\u0440\u0435\u0434\u0435\u043B \u0442\u0440\u0451\u0445 \u0431\u0430\u0437\u043E\u0432\u044B\u0445 \u043F\u043E\u0442\u043E\u043B\u043A\u043E\u0432");
+    deps.db.addEvent(run.id, "note", budgetApprovedText(next, answer));
+  }
+  backToReview();
+  narrate(deps, `${droneLabel(run)}: \u043D\u0430 \u043F\u0440\u0430\u0432\u043A\u0438 \u0434\u0430\u043B\u0438 \u0431\u044E\u0434\u0436\u0435\u0442 \u2014 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u044E \u043D\u0430 \u0440\u0435\u0432\u044C\u044E, \u043F\u0440\u0430\u0432\u043A\u0430 \u043F\u043E\u0434\u043D\u0438\u043C\u0435\u0442\u0441\u044F \u0441\u0432\u043E\u0438\u043C \u0445\u043E\u0434\u043E\u043C.`);
+}
 function buildEscalationCandidates(db) {
   const candidates = [];
   for (const run of db.listRuns("review")) {
@@ -21638,6 +21710,7 @@ async function tickOnce(deps) {
           deps.returners?.delete(run.id);
           continue;
         }
+        if (deps.db.getRun(run.id)?.status !== "review") 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 && // ГЕЙТ ПЕРВЫМ: живой/успешный ревьюер уже есть — ни капа, ни спавна не трогаем

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taskless-app/swarm",
-  "version": "0.6.56",
+  "version": "0.6.58",
   "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": "1922a9b8079c0af2b2b8a9b5fc8756b0218f7446",
+  "gitHead": "31bef5768382a2e72ea43807a0f1c61eb9f01071",
   "scripts": {
     "overmind": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/overmind.ts",
     "swarm": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=development\" tsx src/cli.ts",