@desplega.ai/agent-swarm 1.166.0 → 1.167.0

package/dist/cli-q1vnz8wv.js

@@ -0,0 +1,96 @@
+import {
+  retryProviderRequest
+} from "./cli-zy39d433.js";
+import {
+  headersToRecord,
+  providerHeadersToRecord
+} from "./cli-7kyk9jr3.js";
+import {
+  calculateCost
+} from "./cli-g7k7zbcz.js";
+
+// node_modules/@earendil-works/pi-ai/dist/api/classifier-shared.js
+function httpError(label, response, body) {
+  const error = new Error(`${label} returned ${response.status}`);
+  error.status = response.status;
+  error.headers = response.headers;
+  error.body = body;
+  return error;
+}
+function timeoutError(timeoutMs) {
+  const error = new Error(`Request timed out after ${timeoutMs}ms`);
+  error.name = "TimeoutError";
+  error.status = undefined;
+  error.headers = undefined;
+  error.body = "";
+  return error;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function requiredNumber(label, value, field) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    throw new Error(`${label} returned an invalid ${field}`);
+  }
+  return value;
+}
+function requestHeaders(model, apiKey, optionsHeaders) {
+  return providerHeadersToRecord({ authorization: `Bearer ${apiKey}`, "content-type": "application/json" }, model.headers, optionsHeaders) ?? {};
+}
+async function postClassifierRequest(label, url, model, body, options, noRetryStatuses) {
+  if (!options?.apiKey)
+    throw new Error(`No API key for provider: ${model.provider}`);
+  const apiKey = options.apiKey;
+  let payload = body;
+  const transformed = await options.onPayload?.(payload, model);
+  if (transformed !== undefined)
+    payload = transformed;
+  const requestFetch = options.fetch ?? globalThis.fetch;
+  const { response, json } = await retryProviderRequest(async () => {
+    const timeoutSignal = options.timeoutMs !== undefined ? AbortSignal.timeout(options.timeoutMs) : undefined;
+    const signal = options.signal && timeoutSignal ? AbortSignal.any([options.signal, timeoutSignal]) : options.signal ?? timeoutSignal;
+    try {
+      const next = await requestFetch(url, {
+        method: "POST",
+        headers: requestHeaders(model, apiKey, options.headers),
+        body: JSON.stringify(payload),
+        signal
+      });
+      if (!next.ok)
+        throw httpError(label, next, await next.text());
+      return { response: next, json: await next.json() };
+    } catch (error) {
+      if (timeoutSignal?.aborted && !options.signal?.aborted)
+        throw timeoutError(options.timeoutMs);
+      throw error;
+    }
+  }, {
+    maxRetries: options.maxRetries ?? 2,
+    maxRetryDelayMs: options.maxRetryDelayMs,
+    signal: options.signal,
+    noRetryStatuses
+  });
+  await options.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
+  return json;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
+function parseClassifierUsage(value, model) {
+  if (!isRecord(value) || value.input_tokens === undefined && value.output_tokens === undefined)
+    return;
+  const input = tokenCount(value.input_tokens);
+  const output = tokenCount(value.output_tokens);
+  const usage = {
+    input,
+    output,
+    cacheRead: 0,
+    cacheWrite: 0,
+    totalTokens: input + output,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+  };
+  calculateCost(model, usage);
+  return usage;
+}
+
+export { isRecord, requiredNumber, postClassifierRequest, parseClassifierUsage };

package/dist/{cli-fj86xr3c.js → cli-qd97v6z2.js}

@@ -8,7 +8,7 @@ import {
   resolveGrammarConstrainedSampling,
   resolveJsonSchemaStrictSampling,
   transformMessages
-} from "./cli-8kt0bmgx.js";
+} from "./cli-xf713zz0.js";
 import {
   sanitizeSurrogates
 } from "./cli-y2apkfe2.js";
@@ -18,7 +18,7 @@ import {
   renderSystemMessageUpdate,
   resolveTranscript,
   resolveTranscriptTools
-} from "./cli-nexwh8zg.js";
+} from "./cli-g7k7zbcz.js";
 import {
   parseStreamingJson
 } from "./cli-1m2e086m.js";

package/dist/{cli-66zh26sp.js → cli-qzmzwegq.js}

@@ -18,13 +18,13 @@ import {
   recoverIncompleteRuns,
   repointTrackerSyncBySwarmId,
   resolveLeadOnlyRecoveryAssignment
-} from "./cli-df56tqdw.js";
+} from "./cli-wydz3feg.js";
 import {
   isMultiRuntimeEnabled
 } from "./cli-re8z5p8p.js";
 import {
   createApprovalFollowUpTask
-} from "./cli-jvj6a0cv.js";
+} from "./cli-577bxkf6.js";
 import {
   MAX_EMPTY_POLLS,
   assignUnassignedTaskPending,
@@ -75,7 +75,7 @@ import {
   settleSupersededTaskDependents,
   supersedeTask,
   updateAgentStatus
-} from "./cli-yshaazs1.js";
+} from "./cli-mkdsy1nq.js";
 import {
   TERMINAL_TASK_STATUSES,
   init_types
@@ -90,11 +90,18 @@ import {
   init_env_flag,
   isEnvFlagEnabled
 } from "./cli-ej6gbxfb.js";
+import {
+  init_package,
+  package_default
+} from "./cli-ymmc1zxg.js";
 import {
   init_secret_scrubber,
   scrubSecrets
 } from "./cli-wt7ccy4r.js";
 
+// src/heartbeat/heartbeat.ts
+init_package();
+
 // src/be/approval-sweeps.ts
 init_db();
 var DEFAULT_APPROVAL_REQUEST_AUTO_CANCELLATION_DAYS = 7;
@@ -356,6 +363,9 @@ function heartbeatChecklistIntervalMs() {
 function isHeartbeatChecklistDisabled() {
   return isEnvFlagEnabled("HEARTBEAT_CHECKLIST_DISABLE", false);
 }
+function isBootTriageAlways() {
+  return isEnvFlagEnabled("HEARTBEAT_BOOT_TRIAGE_ALWAYS", false);
+}
 var heartbeatInterval = null;
 var checklistInterval = null;
 var bootTriageTimeout = null;
@@ -1130,19 +1140,7 @@ async function gatherSystemStatus(options) {
       sections.push("- If the retry failed or the work is no longer needed, cancel it");
       sections.push("- Do NOT mark this boot triage as complete until all items are triaged");
     }
-    const orphanedTasks = [];
-    for (const status of ["pending", "offered"]) {
-      const tasks = await getTasksByStatus(status);
-      for (const task of tasks) {
-        const holderId = status === "offered" ? task.offeredTo : task.agentId;
-        if (!holderId)
-          continue;
-        const agent = agents.find((a) => a.id === holderId);
-        if (!agent || agent.status === "offline") {
-          orphanedTasks.push(task);
-        }
-      }
-    }
+    const orphanedTasks = await getOrphanedPendingOrOfferedTasks(agents);
     if (orphanedTasks.length > 0) {
       sections.push("");
       sections.push("## Orphaned Tasks [auto-generated, NEEDS ATTENTION]");
@@ -1160,6 +1158,32 @@ async function gatherSystemStatus(options) {
   return sections.join(`
 `);
 }
+async function getOrphanedPendingOrOfferedTasks(agents) {
+  const orphanedTasks = [];
+  for (const status of ["pending", "offered"]) {
+    const tasks = await getTasksByStatus(status);
+    for (const task of tasks) {
+      const holderId = status === "offered" ? task.offeredTo : task.agentId;
+      if (!holderId)
+        continue;
+      const agent = agents.find((a) => a.id === holderId);
+      if (!agent || agent.status === "offline") {
+        orphanedTasks.push(task);
+      }
+    }
+  }
+  return orphanedTasks;
+}
+async function getBootTriageFindings() {
+  const now = Date.now();
+  const agents = await getAllAgents();
+  return {
+    rebootInterrupted: getRebootAffectedTasks().length,
+    stalled: (await getStalledInProgressTasks(stallThresholdMinutes())).length,
+    orphaned: (await getOrphanedPendingOrOfferedTasks(agents)).length,
+    supersededWithoutResume: (await getSupersededTasksWithoutResume(new Date(now - ORPHAN_SUPERSEDE_MIN_AGE_MS).toISOString(), new Date(now - ORPHAN_SUPERSEDE_MAX_AGE_MS).toISOString())).length
+  };
+}
 async function checkHeartbeatChecklist() {
   const lead = await getLeadAgent();
   if (!lead)
@@ -1323,7 +1347,23 @@ async function createBootTriageTask() {
        LIMIT 1`, [lead.id, ...TERMINAL_TASK_STATUSES]);
   if (existing)
     return;
-  const systemStatus = await gatherSystemStatus({ isBootTriage: true });
+  if (!isBootTriageAlways()) {
+    const findings = await getBootTriageFindings().catch((err) => {
+      console.error("[Heartbeat] Boot triage findings failed, creating Lead task:", scrubSecrets(err instanceof Error ? err.message : String(err)));
+      return null;
+    });
+    if (findings && Object.values(findings).every((count) => count === 0)) {
+      console.log(`[Heartbeat] Clean boot (v${package_default.version}): 0 interrupted, stalled, orphaned, or resume-less superseded tasks; no boot-triage task for lead ${lead.name}`);
+      return;
+    }
+  }
+  const systemStatus = await gatherSystemStatus({ isBootTriage: true }).catch((err) => {
+    const reason = scrubSecrets(err instanceof Error ? err.message : String(err));
+    console.error("[Heartbeat] Boot triage status gathering failed:", reason);
+    return `## System status unavailable
+
+Status gathering failed after this boot (${reason}). Investigate the task, agent, and DB state directly.`;
+  });
   const result = resolveTemplate("heartbeat.boot-triage", {
     system_status: systemStatus,
     heartbeat_content: isEffectivelyEmpty(heartbeatMd) ? "_No standing orders configured._" : heartbeatMd

package/dist/{cli-p4ztb80h.js → cli-r7eeddkq.js}

@@ -6,18 +6,20 @@ import {
 import {
   parseModelStr,
   resolveCredential
-} from "./cli-f2n17zhp.js";
-import {
-  DEFAULT_OPENROUTER_BASE_URL,
-  getOpenRouterBaseUrl
-} from "./cli-3dpj7atn.js";
+} from "./cli-7mhy3ths.js";
 import {
   complete,
   getBuiltinModel
-} from "./cli-pkke6geq.js";
+} from "./cli-km4x66j0.js";
 import {
   exports_typebox
 } from "./cli-rb9m6rpe.js";
+import {
+  DEFAULT_OPENROUTER_BASE_URL,
+  getOpenRouterAttributionHeaders,
+  getOpenRouterBaseUrl,
+  init_openrouter_base_url
+} from "./cli-a35hzdve.js";
 import {
   init_zod
 } from "./cli-sd0mxa3c.js";
@@ -31,6 +33,7 @@ import {
 
 // src/utils/internal-ai/complete-structured.ts
 init_zod();
+init_openrouter_base_url();
 init_secret_scrubber();
 var CLAUDE_CLI_TIMEOUT_MS = 30000;
 function stripJsonFences(raw) {
@@ -169,10 +172,12 @@ ${claudeUserPrompt}`, cred.modelDefault, opts.signal, jsonSchema);
     console.error(scrubSecrets(`internal-ai: unknown model ${provider}/${modelId} (callerTag=${callerTag})`));
     return null;
   }
-  const openRouterBaseUrl = getOpenRouterBaseUrl(opts.env ?? process.env);
+  const env = opts.env ?? process.env;
+  const openRouterBaseUrl = getOpenRouterBaseUrl(env);
   if (provider === "openrouter" && openRouterBaseUrl !== DEFAULT_OPENROUTER_BASE_URL) {
     model = { ...model, baseUrl: openRouterBaseUrl };
   }
+  const headers = provider === "openrouter" ? getOpenRouterAttributionHeaders(model.baseUrl, env) : {};
   const completeFn = opts._complete ?? complete;
   const toolChoice = model.api === "anthropic-messages" ? { type: "tool", name: opts.toolName } : "required";
   let userPrompt = opts.userPrompt;
@@ -189,7 +194,7 @@ ${claudeUserPrompt}`, cred.modelDefault, opts.signal, jsonSchema);
             parameters: opts.toolSchema
           }
         ]
-      }, { apiKey: cred.apiKey, signal: opts.signal, toolChoice });
+      }, { apiKey: cred.apiKey, signal: opts.signal, toolChoice, headers });
       const toolCall = msg.content.find((c) => c.type === "toolCall" && c.name === opts.toolName);
       if (!toolCall) {
         const assistantText = msg.content.filter((content) => content.type === "text").map((content) => content.text).join(`

package/dist/{cli-8ssjez7e.js → cli-rhy7z1rp.js}

@@ -7,7 +7,7 @@ import {
   imageFallback,
   resolvePath,
   truncateToWidth
-} from "./cli-cwxhbf43.js";
+} from "./cli-5t5my0h8.js";
 
 // node_modules/@earendil-works/pi-coding-agent/dist/utils/output-files.js
 import { randomBytes } from "node:crypto";
@@ -414,14 +414,25 @@ class VisualLinePreview {
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/utils/ansi.js
-function ansiRegex({ onlyFirst = false } = {}) {
-  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
-  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
-  const pattern = `${osc}|${csi}`;
-  return new RegExp(pattern, onlyFirst ? undefined : "g");
-}
-var regex = ansiRegex();
+var ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
+var OSC_START = "\\u001B\\]";
+var CSI_START = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?";
+var CSI_FINAL = "[\\dA-PR-TZcf-nq-uy=><~]";
+var ansiRegex = new RegExp(`(?:${OSC_START}[\\s\\S]*?${ST})|${CSI_START}${CSI_FINAL}`, "g");
+var unfinishedAnsiAtEndRegex = new RegExp(`(?:${OSC_START}(?:[^\\u0007\\u009C\\u001B]|\\u001B(?!\\\\))*|${CSI_START})$`);
+var MAX_PENDING_ANSI_LENGTH = 256;
+function splitIncompleteAnsiSuffix(value) {
+  if (!value.includes("\x1B") && !value.includes("›")) {
+    return { complete: value, pending: "" };
+  }
+  const windowStart = Math.max(0, value.length - MAX_PENDING_ANSI_LENGTH);
+  const match = unfinishedAnsiAtEndRegex.exec(value.slice(windowStart));
+  if (!match) {
+    return { complete: value, pending: "" };
+  }
+  const splitAt = windowStart + match.index;
+  return { complete: value.slice(0, splitAt), pending: value.slice(splitAt) };
+}
 function stripAnsi(value) {
   if (typeof value !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof value}\``);
@@ -429,7 +440,7 @@ function stripAnsi(value) {
   if (!value.includes("\x1B") && !value.includes("›")) {
     return value;
   }
-  return value.replace(regex, "");
+  return value.replace(ansiRegex, "");
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/core/tools/render-utils.js
@@ -518,4 +529,4 @@ function renderToolPath(rawPath, theme, cwd, options) {
   return linkPath(theme.fg("accent", shortenPath(value)), value, cwd);
 }
 
-export { stripAnsi, writeOutputFile, createOutputFileStream, getShellConfig, getPowerShellConfig, getShellEnv, sanitizeBinaryOutput, trackDetachedChildPid, untrackDetachedChildPid, killTrackedDetachedChildren, killProcessTree, DEFAULT_MAX_LINES, DEFAULT_MAX_BYTES, GREP_MAX_LINE_LENGTH, formatSize, truncateHead, truncateTail, truncateLine, truncateMiddle, truncateToVisualLines, VisualLinePreview, shortenPath, str, replaceTabs, normalizeDisplayText, getTextOutput, formatToolCallWithArgs, invalidArgText, renderToolPath };
+export { splitIncompleteAnsiSuffix, stripAnsi, writeOutputFile, createOutputFileStream, getShellConfig, getPowerShellConfig, getShellEnv, sanitizeBinaryOutput, trackDetachedChildPid, untrackDetachedChildPid, killTrackedDetachedChildren, killProcessTree, DEFAULT_MAX_LINES, DEFAULT_MAX_BYTES, GREP_MAX_LINE_LENGTH, formatSize, truncateHead, truncateTail, truncateLine, truncateMiddle, truncateToVisualLines, VisualLinePreview, shortenPath, str, replaceTabs, normalizeDisplayText, getTextOutput, formatToolCallWithArgs, invalidArgText, renderToolPath };

package/dist/{cli-4mevd1hf.js → cli-s9y81s7j.js}

@@ -3,7 +3,7 @@ import {
   getTextOutput,
   replaceTabs,
   str
-} from "./cli-8ssjez7e.js";
+} from "./cli-rhy7z1rp.js";
 import {
   Container,
   Spacer,
@@ -11,7 +11,7 @@ import {
   getDocsPath,
   highlightCode,
   keyHint
-} from "./cli-cwxhbf43.js";
+} from "./cli-5t5my0h8.js";
 import {
   exports_typebox
 } from "./cli-rb9m6rpe.js";
@@ -613,7 +613,7 @@ function createToolDefinitionFromAgentTool(tool) {
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/extensions/codemode/execute.lazy.js
-var loadCodemodeExecutor = () => import("./execute-s4ccjq3n.js");
+var loadCodemodeExecutor = () => import("./execute-h4jgevyw.js");
 
 // node_modules/@earendil-works/pi-coding-agent/dist/extensions/codemode/renderer.js
 var CODE_PREVIEW_LINES = 10;
@@ -755,9 +755,9 @@ var DESCRIPTION_INTRO = `Run JavaScript that calls other tools. The input is raw
 function describeGlobals(models) {
   const lines = [
     "Globals:",
-    "- `text(value)`, `image(dataUrlOrImageBlock)`, `console.log(...)`, and top-level `return` add output; `exit()` ends the script. `image()` also saves the image to a temp file and the result names its path.",
+    "- `text(value)`, `image(dataUrlOrImageBlock)`, `console.log(...)`, and top-level `return` add output; `exit()` ends the script. With several text items, each starts with a `==> text N/M <==` line, and `console` lines follow the other output in one `<console_output>` block. `image()` also saves the image to a temp file and the result names its path.",
     "- `store(key, value)` and `load(key)` keep JSON values across codemode calls.",
-    "- `ALL_TOOLS`, `searchTools(query, { limit?, namespace? })`, `describeTool(name)`, `describeNamespace(name)`: find unlisted tools, such as MCP tools."
+    "- `ALL_TOOLS`, `await searchTools(query, { limit?, namespace? })`, `await describeTool(name)`, `await describeNamespace(name)`: find unlisted tools, such as MCP tools."
   ];
   if (models) {
     lines.push(`- \`models\`: classifiers and image generation. Read ${CODEMODE_DOCS_PATH} first.`);

package/dist/{cli-h3x613ze.js → cli-tc5zec7v.js}

@@ -4,23 +4,23 @@ import {
 import {
   readPkgVersion
 } from "./cli-gt4hxb8p.js";
+import {
+  checkToolLoop
+} from "./cli-hp1n6zq3.js";
 import {
   CONTEXT_FORMULA,
   clampContextPercent,
   computeContextUsedUnified,
   getContextWindowSize
-} from "./cli-32bca7nr.js";
-import {
-  checkToolLoop
-} from "./cli-hp1n6zq3.js";
+} from "./cli-7avy4v8w.js";
 import {
   Anthropic
-} from "./cli-zy7vwsne.js";
+} from "./cli-5qkcdv8c.js";
 import {
   init_runtime_model_catalog,
   init_src,
   runtimeCatalogModel
-} from "./cli-zsh093hk.js";
+} from "./cli-014vns2y.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{cli-ttbsse3f.js → cli-tmhsxhb8.js}

@@ -8,7 +8,7 @@ import {
   reasoningLevelsFor,
   runtimeCatalogModel,
   runtimeCatalogSection
-} from "./cli-zsh093hk.js";
+} from "./cli-014vns2y.js";
 
 // src/providers/reasoning-effort.ts
 init_src();

package/dist/{cli-0nhdwxd5.js → cli-tx2zvn23.js}

@@ -1,14 +1,14 @@
 import {
   seedPricingFromModelsDev
-} from "./cli-ysnyhws9.js";
+} from "./cli-v1pwxreq.js";
 import {
   ensureRbacSeedsSynced,
   init_rbac_roles
-} from "./cli-8kgvmkak.js";
+} from "./cli-ypgba1a8.js";
 import {
   getDb,
   init_db1 as init_db
-} from "./cli-yshaazs1.js";
+} from "./cli-mkdsy1nq.js";
 
 // src/be/boot-seeds.ts
 init_db();

package/dist/{cli-mwegs4af.js → cli-ty4bzkqr.js}

@@ -5,10 +5,10 @@ import {
   CONTEXT_FORMULA,
   clampContextPercent,
   computeContextUsedUnified
-} from "./cli-32bca7nr.js";
+} from "./cli-7avy4v8w.js";
 import {
   applyReasoningEffort
-} from "./cli-ttbsse3f.js";
+} from "./cli-tmhsxhb8.js";
 import {
   ampBillsCacheWrites,
   resolveAmpModel
@@ -36,7 +36,7 @@ import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 init_secret_scrubber();
-var AMP_PACKAGE = "@ampcode/cli@0.0.1791403257-g05ffa9";
+var AMP_PACKAGE = "@ampcode/cli@0.0.1791460855-g1f688c";
 var AMP_MCP_SERVER_NAME = "agent-swarm";
 var AMP_PLUGIN_MODE_KEY = "agent-swarm";
 var AMP_LIVE_TEST_TIMEOUT_MS = 5000;

package/dist/{cli-ysnyhws9.js → cli-v1pwxreq.js}

@@ -1,7 +1,7 @@
 import {
   getDb,
   init_db1 as init_db
-} from "./cli-yshaazs1.js";
+} from "./cli-mkdsy1nq.js";
 
 // src/be/seed-pricing.ts
 init_db();
@@ -152,16 +152,47 @@ function projectCostBlock(provider, model, cost, opts = {}) {
   }
   return rows;
 }
-function buildModelsDevSeedRows(cache) {
+function outranksSource(candidate, current, key) {
+  const a = candidate.toLowerCase();
+  const b = current.toLowerCase();
+  if (a === key !== (b === key))
+    return a === key;
+  return a > b;
+}
+function collapseNormalizedIds(sourced) {
+  const modelKey = (row) => `${row.provider}\x00${row.model}`;
+  const winners = new Map;
+  for (const { sourceId, row } of sourced) {
+    const current = winners.get(modelKey(row));
+    if (current === undefined || outranksSource(sourceId, current, row.model)) {
+      winners.set(modelKey(row), sourceId);
+    }
+  }
+  const seen = new Set;
   const rows = [];
+  for (const { sourceId, row } of sourced) {
+    if (winners.get(modelKey(row)) !== sourceId)
+      continue;
+    const rowKey = `${modelKey(row)}\x00${row.tokenClass}`;
+    if (seen.has(rowKey))
+      continue;
+    seen.add(rowKey);
+    rows.push(row);
+  }
+  return rows;
+}
+function buildModelsDevSeedRows(cache) {
+  const sourced = [];
+  const add = (sourceId, projected) => {
+    for (const row of projected)
+      sourced.push({ sourceId, row });
+  };
   const anthropic = cache.anthropic?.models ?? {};
   for (const [id, model] of Object.entries(anthropic)) {
     if (!model?.cost)
       continue;
     for (const provider of ["claude", "claude-managed"]) {
-      for (const row of projectCostBlock(provider, id, model.cost)) {
-        rows.push(row);
-      }
+      add(id, projectCostBlock(provider, id, model.cost));
     }
   }
   for (const [shortname, fullId] of Object.entries(ANTHROPIC_SHORTNAME_TO_MODELSDEV)) {
@@ -169,96 +200,68 @@ function buildModelsDevSeedRows(cache) {
     if (!cost)
       continue;
     for (const provider of ["claude", "claude-managed"]) {
-      for (const row of projectCostBlock(provider, shortname, cost)) {
-        rows.push(row);
-      }
+      add(shortname, projectCostBlock(provider, shortname, cost));
     }
   }
   for (const [shortname, fullId] of Object.entries(ANTHROPIC_SHORTNAME_TO_MODELSDEV)) {
     const cost = anthropic[fullId]?.cost ?? (cache.anthropic ? ANTHROPIC_SHORTNAME_PRICING_FALLBACKS[fullId] : undefined);
     if (!cost)
       continue;
-    for (const row of projectCostBlock("pi", shortname, cost, { anthropicBilled: true })) {
-      rows.push(row);
-    }
+    add(shortname, projectCostBlock("pi", shortname, cost, { anthropicBilled: true }));
   }
   for (const section of ["anthropic", "openai", "google", "fireworks-ai"]) {
     for (const [id, model] of Object.entries(cache[section]?.models ?? {})) {
       if (!model?.cost)
         continue;
-      for (const row of projectCostBlock("amp", id, model.cost)) {
-        rows.push(row);
-      }
+      add(id, projectCostBlock("amp", id, model.cost));
     }
   }
   const openai = cache.openai?.models ?? {};
   for (const [id, model] of Object.entries(openai)) {
     if (!model?.cost)
       continue;
-    for (const row of projectCostBlock("codex", id, model.cost)) {
-      rows.push(row);
-    }
-    for (const row of projectCostBlock("pi", id, model.cost)) {
-      rows.push(row);
-    }
+    add(id, projectCostBlock("codex", id, model.cost));
+    add(id, projectCostBlock("pi", id, model.cost));
   }
   for (const vendor of ["openai", "anthropic", "google", "xai"]) {
     for (const [id, model] of Object.entries(cache[vendor]?.models ?? {})) {
       if (!model?.cost)
         continue;
-      for (const row of projectCostBlock("cursor", id, model.cost, { anthropicBilled: false })) {
-        rows.push(row);
-      }
+      add(id, projectCostBlock("cursor", id, model.cost, { anthropicBilled: false }));
     }
   }
   for (const [id, model] of Object.entries(cache.xai?.models ?? {})) {
     if (!model?.cost)
       continue;
-    for (const row of projectCostBlock("grok", id, model.cost, { anthropicBilled: false })) {
-      rows.push(row);
-    }
+    add(id, projectCostBlock("grok", id, model.cost, { anthropicBilled: false }));
   }
   const deepseek = cache.deepseek?.models ?? {};
   for (const [id, model] of Object.entries(deepseek)) {
     if (!model?.cost)
       continue;
-    for (const row of projectCostBlock("dsh", id, model.cost)) {
-      rows.push(row);
-    }
+    add(id, projectCostBlock("dsh", id, model.cost));
   }
   const openrouter = cache.openrouter?.models ?? {};
   for (const [id, model] of Object.entries(openrouter)) {
     if (!model?.cost)
       continue;
-    for (const row of projectCostBlock("opencode", id, model.cost)) {
-      rows.push(row);
-    }
-    for (const row of projectCostBlock("pi", id, model.cost, {
+    add(id, projectCostBlock("opencode", id, model.cost));
+    add(id, projectCostBlock("pi", id, model.cost, {
       anthropicBilled: id.startsWith("anthropic/")
-    })) {
-      rows.push(row);
-    }
-    for (const row of projectCostBlock("dsh", id, model.cost, {
+    }));
+    add(id, projectCostBlock("dsh", id, model.cost, {
       anthropicBilled: id.startsWith("anthropic/")
-    })) {
-      rows.push(row);
-    }
-    for (const row of projectCostBlock("grok", id, model.cost, {
+    }));
+    add(id, projectCostBlock("grok", id, model.cost, {
       anthropicBilled: id.startsWith("anthropic/")
-    })) {
-      rows.push(row);
-    }
+    }));
     if (id.startsWith("google/")) {
       const geminiKey = id.replace(/^google\//, "");
-      for (const row of projectCostBlock("gemini", geminiKey, model.cost)) {
-        rows.push(row);
-      }
-      for (const row of projectCostBlock("gemini", id, model.cost)) {
-        rows.push(row);
-      }
+      add(geminiKey, projectCostBlock("gemini", geminiKey, model.cost));
+      add(id, projectCostBlock("gemini", id, model.cost));
     }
   }
-  return rows;
+  return collapseNormalizedIds(sourced);
 }
 function buildPricingSeedRows(cache) {
   const modelsdevRows = cache ? buildModelsDevSeedRows(cache) : [];

package/dist/{cli-feh3dkah.js → cli-v1w7pbd8.js}

@@ -366,7 +366,8 @@ function credentialsToAuthJson(creds, opts = {}) {
       refresh_token: includeRefreshToken ? creds.refresh : "",
       account_id: creds.accountId
     },
-    last_refresh: new Date(creds.expires).toISOString()
+    last_refresh: new Date().toISOString(),
+    expires: creds.expires
   };
 }