@desplega.ai/agent-swarm 1.165.0 → 1.167.0

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

@@ -5,14 +5,14 @@ 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
-} from "./cli-420bdgw0.js";
+} from "./cli-mv2520nm.js";
 import {
   swarmRuntimeInstanceId
 } from "./cli-re8z5p8p.js";
@@ -28,7 +28,7 @@ import {
   init_secret_scrubber,
   registerVolatileSecret,
   scrubSecrets
-} from "./cli-h1spv8v4.js";
+} from "./cli-wt7ccy4r.js";
 
 // src/providers/amp-adapter.ts
 import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
@@ -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.1791360091-gfb32ce";
+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-nfygw434.js → cli-v1pwxreq.js}

@@ -1,7 +1,7 @@
 import {
   getDb,
-  init_db
-} from "./cli-qdv8kgz7.js";
+  init_db1 as init_db
+} 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-ftry7975.js → cli-v1w7pbd8.js}

@@ -5,7 +5,7 @@ import {
 import {
   init_secret_scrubber,
   scrubSecrets
-} from "./cli-h1spv8v4.js";
+} from "./cli-wt7ccy4r.js";
 
 // src/providers/codex-oauth/flow.ts
 init_secret_scrubber();
@@ -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
   };
 }
 

package/dist/{cli-10zmp1p7.js → cli-vr5avem2.js}

@@ -1,3 +1,10 @@
+import {
+  ProjectTrustStore,
+  addMcpServerConfig,
+  loadMcpConfig,
+  openBrowser,
+  removeMcpServerConfig
+} from "./cli-13xwcqvj.js";
 import {
   McpOAuthCredentialStore,
   McpServerConnection,
@@ -5,24 +12,17 @@ import {
   McpSignInCancelledError,
   createDefaultTransport,
   signInMcpServer
-} from "./cli-x3x0qwky.js";
-import {
-  ProjectTrustStore,
-  addMcpServerConfig,
-  loadMcpConfig,
-  openBrowser,
-  removeMcpServerConfig
-} from "./cli-qvfk83fy.js";
+} from "./cli-bxqez1p0.js";
 import {
   getMcpToolExposure,
   validateMcpServerConfig
-} from "./cli-krqm5f11.js";
-import"./cli-8ssjez7e.js";
+} from "./cli-xezn9nkh.js";
+import"./cli-rhy7z1rp.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
   source_default
-} from "./cli-cwxhbf43.js";
+} from "./cli-5t5my0h8.js";
 import"./cli-5bfdm1ah.js";
 import"./cli-0m7wct0d.js";
 import"./cli-2x0e561b.js";
@@ -451,8 +451,9 @@ async function login(entry, connection, url, timeoutMs, options, credentials, lo
 ${authorizationUrl.href}`);
           openUrl(authorizationUrl.href);
         },
-        promptForRedirectUrl: (signal) => waitForRedirectUrl(signal, timeoutMs, interactive)
-      }
+        promptForRedirectUrl: (signal) => waitForRedirectUrl(signal, interactive)
+      },
+      signal: AbortSignal.timeout(timeoutMs)
     });
   } catch (signInError) {
     error(signInError instanceof McpSignInCancelledError ? `Sign-in to MCP server "${name}" was cancelled or not completed within ${Math.round(timeoutMs / 1000)} seconds.` : `Sign-in to MCP server "${name}" failed: ${errorMessage(signInError)}`);
@@ -468,27 +469,21 @@ ${authorizationUrl.href}`);
   log(`Signed in to MCP server "${name}" (${connection.tools.length} tools).`);
   return 0;
 }
-async function waitForRedirectUrl(signal, timeoutMs, interactive) {
-  const controller = new AbortController;
-  const abort = () => controller.abort();
-  signal.addEventListener("abort", abort, { once: true });
-  const timer = setTimeout(abort, timeoutMs);
+async function waitForRedirectUrl(signal, interactive) {
+  if (!interactive) {
+    if (!signal.aborted)
+      await new Promise((resolve) => signal.addEventListener("abort", resolve, { once: true }));
+    return;
+  }
+  const readline = createInterface({ input: process.stdin, output: process.stderr });
   try {
-    if (!interactive) {
-      await new Promise((resolve) => controller.signal.addEventListener("abort", () => resolve(), { once: true }));
-      return;
-    }
-    const readline = createInterface({ input: process.stdin, output: process.stderr });
-    try {
-      return await readline.question("If the browser cannot reach this machine, paste the URL it was redirected to: ", { signal: controller.signal });
-    } catch {
-      return;
-    } finally {
-      readline.close();
-    }
+    return await readline.question("If the browser cannot reach this machine, paste the URL it was redirected to: ", {
+      signal
+    });
+  } catch {
+    return;
   } finally {
-    clearTimeout(timer);
-    signal.removeEventListener("abort", abort);
+    readline.close();
   }
 }
 export {

package/dist/{cli-bzr0ftht.js → cli-wnb9b2g3.js}

@@ -77,6 +77,8 @@ class EventStream {
 }
 
 class AssistantMessageEventStream extends EventStream {
+  #startedAt = Date.now();
+  #startedAtMonotonic = performance.now();
   constructor() {
     super((event) => event.type === "done" || event.type === "error", (event) => {
       if (event.type === "done") {
@@ -87,6 +89,23 @@ class AssistantMessageEventStream extends EventStream {
       throw new Error("Unexpected event type for final result");
     });
   }
+  push(event) {
+    if (event.type === "done")
+      this.#time(event.message);
+    else if (event.type === "error")
+      this.#time(event.error);
+    super.push(event);
+  }
+  end(result) {
+    if (result !== undefined)
+      this.#time(result);
+    super.end(result);
+  }
+  #time(message) {
+    if (this.done || message.durationMs !== undefined || message.timestamp < this.#startedAt)
+      return;
+    message.durationMs = Math.max(0, Math.round(performance.now() - this.#startedAtMonotonic));
+  }
 }
 function createAssistantMessageEventStream() {
   return new AssistantMessageEventStream;