@taskless-app/swarm 0.6.63 → 0.6.64

package/dist/cli.js

@@ -388,8 +388,8 @@ function computeBlocker(status, stopReason, lastStep, pr, ci, deps, openQ) {
   }
 }
 function pickHeadline(lanes) {
-  const live = lanes.filter((l2) => l2.live && !l2.obsolete);
-  const by = (pred) => live.find(pred);
+  const live2 = lanes.filter((l2) => l2.live && !l2.obsolete);
+  const by = (pred) => live2.find(pred);
   const fmt = (l2, extra) => `${l2.name} \xB7 ${l2.slug} \u2014 ${extra}`;
   let l = by((x) => x.status === "review" && x.ci?.tone === "fail");
   if (l) return { icon: "\u274C", text: fmt(l, "CI \u0443\u043F\u0430\u043B \u2014 \u0447\u0438\u043D\u0438\u0442\u044C"), tone: "fail" };
@@ -407,7 +407,7 @@ function pickHeadline(lanes) {
   l = by((x) => x.status === "review");
   if (l) return { icon: "\u23F3", text: fmt(l, "review \u2014 CI \u0438\u0434\u0451\u0442"), tone: "review" };
   l = by((x) => x.status === "running");
-  if (l) return { icon: "\u25B6", text: `${live.filter((x) => x.status === "running").length} \u0434\u0440\u043E\u043D\u0430 \u0432 \u0440\u0430\u0431\u043E\u0442\u0435 \u2014 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043E\u043A \u043D\u0435\u0442`, tone: "run" };
+  if (l) return { icon: "\u25B6", text: `${live2.filter((x) => x.status === "running").length} \u0434\u0440\u043E\u043D\u0430 \u0432 \u0440\u0430\u0431\u043E\u0442\u0435 \u2014 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043E\u043A \u043D\u0435\u0442`, tone: "run" };
   return null;
 }
 function computeCounters(lanes) {
@@ -706,13 +706,15 @@ var init_modelPolicy = __esm({
       },
       // Grok CLI. Каталог — живой `grok models` (16.10.2026), целиком и без выдуманных
       // имён: grok-4.7 (дефолт CLI и исполнителя), grok-4.7-build-fast, grok-4.6, grok-4.5
-      // (проверка — младшая, та же идея, что sonnet против opus). Тарифа нет: цену пишет CLI.
+      // TASWM-605: обе роли — на свежей модели (решение владельца: рой работает на свежих
+      // моделях). Это только фолбэк: демон берёт дефолт живого `grok models` (liveModels.ts).
+      // Тарифа нет: цену пишет CLI.
       {
         id: "xai",
         label: "xAI (Grok)",
         executorId: "grok",
         selectable: true,
-        roles: { executor: "grok-4.7", review: "grok-4.5" },
+        roles: { executor: "grok-4.7", review: "grok-4.7" },
         models: ["grok-4.7", "grok-4.7-build-fast", "grok-4.6", "grok-4.5"]
       },
       // TASWM-565 · шаг 1 из четырёх: провайдер в реестре ЕСТЬ, выбрать его ещё нельзя.
@@ -2834,7 +2836,24 @@ ${notice}` : spec.prompt;
   }
 });
 
+// src/liveModels.ts
+import { execFile } from "child_process";
+function liveDefaultModel(providerId) {
+  return live.get(providerId) ?? null;
+}
+var live;
+var init_liveModels = __esm({
+  "src/liveModels.ts"() {
+    "use strict";
+    init_grok();
+    live = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/swarmModels.ts
+function roleDefault(role, providerId) {
+  return liveDefaultModel(providerId) ?? defaultModelFor(role, providerId);
+}
 function pick2(v) {
   const s = typeof v === "string" ? v.trim() : "";
   return s.length > 0 ? s : null;
@@ -2863,11 +2882,11 @@ function resolveRunModelRef(run, swarm, env = process.env) {
   const own = providersFromEnv(env);
   if (own) {
     if (configured && own.includes(configured.providerId)) return configured;
-    return { providerId: own[0], model: defaultModelFor(modelRoleOf(run.kind), own[0]) };
+    return { providerId: own[0], model: roleDefault(modelRoleOf(run.kind), own[0]) };
   }
   if (configured) return configured;
   const providerId = pick2(env.SWARM_MODEL_PROVIDER) ?? DEFAULT_PROVIDER_ID;
-  return { providerId, model: defaultModelFor(modelRoleOf(run.kind), providerId) };
+  return { providerId, model: roleDefault(modelRoleOf(run.kind), providerId) };
 }
 function resolveRunEffort(run, swarm, env = process.env) {
   return toEffortLevel(run.effort) ?? forKind(run.kind, swarm, toEffortLevel) ?? toEffortLevel(env.SWARM_DRONE_EFFORT) ?? null;
@@ -2876,6 +2895,7 @@ var init_swarmModels = __esm({
   "src/swarmModels.ts"() {
     "use strict";
     init_src();
+    init_liveModels();
   }
 });
 
@@ -3288,11 +3308,11 @@ var init_resources = __esm({
 
 // src/names.ts
 function pickName(rows) {
-  const live = /* @__PURE__ */ new Set();
+  const live2 = /* @__PURE__ */ new Set();
   const lastUse = /* @__PURE__ */ new Map();
   for (const r of rows) {
     if (!r.name) continue;
-    if (NAME_LIVE.has(r.status)) live.add(r.name);
+    if (NAME_LIVE.has(r.status)) live2.add(r.name);
     const b = baseName(r.name);
     lastUse.set(b, Math.max(lastUse.get(b) ?? 0, r.id));
   }
@@ -3302,7 +3322,7 @@ function pickName(rows) {
   for (let g = 1; ; g++) {
     for (const base3 of ordered) {
       const cand = genName(base3, g);
-      if (!live.has(cand)) return cand;
+      if (!live2.has(cand)) return cand;
     }
   }
 }
@@ -3852,7 +3872,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@taskless-app/swarm",
-      version: "0.6.63",
+      version: "0.6.64",
       type: "module",
       description: "Local control plane for a fleet of AI coding agents (drones), coordinating through Taskless. The overmind runs the swarm.",
       keywords: [
@@ -3903,7 +3923,7 @@ var init_package = __esm({
         execa: "^10.0.0",
         zod: "3.25.76"
       },
-      gitHead: "8d438b6288da036308528cff1160a157b4b64abd"
+      gitHead: "7f27042a00bf1554798cce7b8a233ee6c5686a50"
     };
   }
 });
@@ -4460,8 +4480,8 @@ async function checkoutWorktree(repo, path, branch, opts) {
   const busyAt = await worktreeForBranch(repo, branch);
   if (busyAt) {
     const exists = existsSync11(busyAt);
-    const live = exists && (opts.isWorktreeHeldLive ? await opts.isWorktreeHeldLive(busyAt) : true);
-    if (live) throw new WorktreeBusyError(branch, busyAt);
+    const live2 = exists && (opts.isWorktreeHeldLive ? await opts.isWorktreeHeldLive(busyAt) : true);
+    if (live2) throw new WorktreeBusyError(branch, busyAt);
     if (exists && await worktreeDirty(busyAt)) throw new WorktreeBusyError(branch, busyAt);
     await reclaimStaleWorktree(repo, busyAt);
     opts.onStaleReclaim?.(busyAt);
@@ -11038,19 +11058,19 @@ function makeMergeIntentResolver(deps) {
     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) {
+    const live2 = deps.baseSync ? await deps.baseSync(prUrl).catch(() => null) : null;
+    if (!live2 || !live2.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) {
+    if (verdict.action === "merge" && live2.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`
+        reason: `\u0431\u0430\u0437\u0430 \u0443\u0448\u043B\u0430 \u0432\u043F\u0435\u0440\u0451\u0434 \u043D\u0430 ${live2.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` };
+    if (live2.headSha !== sha) {
+      return { action: "wait", code: "checks_pending", reason: `\u043D\u0430 PR \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 ${shortSha(live2.headSha)} \u2014 \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E \u0437\u0430\u043D\u043E\u0432\u043E` };
     }
     return verdict;
   };
@@ -11330,13 +11350,13 @@ function timelineState(db2, now = Date.now(), overmindLog = []) {
   const lanes = [];
   const reviewPRs = [];
   for (const r of runs) {
-    const live = !isTerminalStatus(r.status);
-    const recencyGated = !live || r.status === "stalled";
+    const live2 = !isTerminalStatus(r.status);
+    const recencyGated = !live2 || r.status === "stalled";
     if (recencyGated && sqliteMs(r.updated_at) < cutoff) continue;
     const events = db2.events(r.id).map((e) => ({ kind: e.kind, text: e.text ?? null, at: sqliteIso(e.at) }));
     const steps = events.filter((e) => e.kind === "step" && e.text).map((e) => ({ at: e.at, text: e.text }));
     const lastStep = steps.length ? steps[steps.length - 1].text : null;
-    const laneEnd = live ? nowIso : sqliteIso(r.updated_at);
+    const laneEnd = live2 ? nowIso : sqliteIso(r.updated_at);
     const segments = buildSegments(sqliteIso(r.created_at), events, laneEnd);
     const deps = (r.depends_on ?? []).map((ref) => {
       const { slug, unresolved } = resolveDepRef(ref, { slugByCuid: EMPTY_CUID_MAP, knownSlugs });
@@ -11358,7 +11378,7 @@ function timelineState(db2, now = Date.now(), overmindLog = []) {
         ci = ciCache.get(r.pr_url)?.ci ?? null;
       }
     }
-    const obsoleteBy = live && doneNameBySlug.has(r.task_slug) ? doneNameBySlug.get(r.task_slug) : null;
+    const obsoleteBy = live2 && doneNameBySlug.has(r.task_slug) ? doneNameBySlug.get(r.task_slug) : null;
     const obsolete = obsoleteBy != null;
     const blocker = obsolete ? { icon: "\u{1F9DF}", text: `\u0443\u0441\u0442\u0430\u0440\u0435\u043B \u2014 \u0437\u0430\u0434\u0430\u0447\u0443 \u0437\u0430\u043A\u0440\u044B\u043B ${obsoleteBy}`, tone: "queued" } : computeBlocker(r.status, r.stop_reason, lastStep, r.pr_url, ci, deps, openQ.get(r.id) ?? null);
     lanes.push({
@@ -11370,7 +11390,7 @@ function timelineState(db2, now = Date.now(), overmindLog = []) {
       area: r.area,
       start: sqliteIso(r.created_at),
       end: laneEnd,
-      live,
+      live: live2,
       obsolete,
       obsoleteBy,
       segments,
@@ -12487,7 +12507,7 @@ function setPausedVia(deps, paused, source, reason) {
 function daemonStatus(deps) {
   const counts = {};
   for (const r of deps.db.listRuns()) counts[r.status] = (counts[r.status] ?? 0) + 1;
-  const live = deps.liveSessionIds?.() ?? [];
+  const live2 = deps.liveSessionIds?.() ?? [];
   const ver = deps.daemonVersion?.() ?? null;
   const queuedReady = deps.db.listRuns("queued").filter((r) => deps.db.unmetDeps(r.depends_on).length === 0).length;
   return {
@@ -12504,9 +12524,9 @@ function daemonStatus(deps) {
     backend: SWARM_BACKEND,
     paused: deps.control?.paused ?? false,
     pause: deps.control?.state ?? null,
-    restart: deps.restart ? { phase: deps.restart.phase, intent: deps.restart.intent, sessions: live } : null,
+    restart: deps.restart ? { phase: deps.restart.phase, intent: deps.restart.intent, sessions: live2 } : null,
     counts,
-    live,
+    live: live2,
     version: PACKAGE_VERSION,
     repos: deps.repoMap?.() ?? [],
     // TASWM-324: «нас не пускают» — то же состояние процесса, что кричит рамкой в лог.
@@ -13064,7 +13084,7 @@ function makeLauncher(cfg) {
       console.error(`[launcher] \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u0443\u0441\u0438\u043B\u0438\u0435 \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id}: ${String(e)}`);
     }
     try {
-      cfg.recordModelRef?.(run.id, modelRef);
+      cfg.recordModelRef?.(run.id, modelRef, run);
     } catch (e) {
       console.error(`[launcher] \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u043C\u043E\u0434\u0435\u043B\u044C \u043F\u0440\u043E\u0433\u043E\u043D\u0430 #${run.id}: ${String(e)}`);
     }