archymedes-cli 3.1.0 → 3.2.0

package/dist/archymedes-main.mjs

@@ -15970,56 +15970,6 @@ async function saveSetup(params, deps) {
   return { ok: true, file, ...note ? { note } : {} };
 }
 
-// packages/archymedes-cli/src/session/models.ts
-function modelsForProvider(provider, asOf) {
-  const seen = new Set;
-  for (const record2 of PRICE_CATALOG) {
-    if (record2.provider !== provider || record2.modality !== "text" || record2.billingUnit !== "tokens")
-      continue;
-    seen.add(record2.model);
-  }
-  const fallback = PROVIDERS[provider].defaultModel;
-  seen.add(fallback);
-  const models = [...seen].filter((model) => model !== fallback).sort();
-  return [fallback, ...models];
-}
-function buildModelCatalog(environment, asOf, live) {
-  const choices = [];
-  const unconfigured = [];
-  for (const provider of PROVIDER_IDS) {
-    const spec = PROVIDERS[provider];
-    const missing = missingRequirements(provider, environment);
-    if (missing.length > 0) {
-      unconfigured.push({ provider, label: spec.label, missing });
-      continue;
-    }
-    const known = modelsForProvider(provider, asOf);
-    const knownSet = new Set(known);
-    const extra = (live?.[provider] ?? []).filter((model) => !knownSet.has(model) && (provider !== "free" || isFreeModelId(model))).slice().sort();
-    for (const model of [...known, ...extra]) {
-      choices.push({
-        provider,
-        providerLabel: spec.label,
-        model,
-        isProviderDefault: model === (environment[`${providerEnvPrefix(provider)}_MODEL`]?.trim() || spec.defaultModel),
-        prices: catalogPrices(provider, model, asOf),
-        ...knownSet.has(model) ? {} : { live: true }
-      });
-    }
-  }
-  return { choices, unconfigured };
-}
-function describePrice(prices, display, convert2) {
-  if (!prices)
-    return "unpriced";
-  const input = convert2({ currency: prices.currency, micros: prices.inputPerMillion });
-  const output = convert2({ currency: prices.currency, micros: prices.outputPerMillion });
-  if (!input || !output) {
-    return `${formatMoney(money(prices.inputPerMillion, prices.currency))}/${formatMoney(money(prices.outputPerMillion, prices.currency))} per Mtok`;
-  }
-  return `${formatMoney(input)}/${formatMoney(output)} per Mtok`;
-}
-
 // packages/core/src/providers/model-fetch.ts
 import { promises as fs16 } from "node:fs";
 import path21 from "node:path";
@@ -16036,10 +15986,8 @@ function modelsEndpoint(provider, environment) {
       return { url: `${FREE_BASE_URL}/models`, headers: {} };
     case "openrouter": {
       const key = trimmed(environment.OPENROUTER_API_KEY);
-      if (!key)
-        return;
       const base = trimmed(environment.OPENROUTER_BASE_URL) ?? "https://openrouter.ai/api/v1";
-      return { url: modelsUrl(base), headers: { authorization: `Bearer ${key}` } };
+      return { url: modelsUrl(base), headers: key ? { authorization: `Bearer ${key}` } : {} };
     }
     case "archymedes-cloud":
       return;
@@ -16224,48 +16172,79 @@ function fetchableProviders(environment, providers) {
   return providers.filter((provider) => provider !== "archymedes-cloud" && missingRequirements(provider, environment).length === 0);
 }
 
-// packages/archymedes-cli/src/app/live-models.ts
-function createLiveModelRefresh(environment, state) {
-  return async (options = {}) => {
-    const providers = fetchableProviders(environment, PROVIDER_IDS);
-    if (providers.length === 0)
-      return { errors: [] };
-    const loaded = await loadLiveModels(providers, environment, options);
-    if (Object.keys(loaded.models).length > 0)
-      state.liveModels = loaded.models;
-    return {
-      errors: loaded.errors.filter((error) => error.provider !== "ollama" || Boolean(environment.OLLAMA_BASE_URL?.trim())).map((error) => `${error.provider}: ${error.error}`)
-    };
-  };
+// packages/archymedes-cli/src/session/models.ts
+function modelsForProvider(provider, asOf) {
+  const seen = new Set;
+  for (const record2 of PRICE_CATALOG) {
+    if (record2.provider !== provider || record2.modality !== "text" || record2.billingUnit !== "tokens")
+      continue;
+    seen.add(record2.model);
+  }
+  const fallback = PROVIDERS[provider].defaultModel;
+  seen.add(fallback);
+  const models = [...seen].filter((model) => model !== fallback).sort();
+  return [fallback, ...models];
 }
-async function readCachedLiveModels(environment, state) {
-  const cached = await readModelCache(environment);
-  if (isCacheFresh(cached))
-    state.liveModels = cached.models;
+function describePrice(prices, display, convert2) {
+  if (!prices)
+    return "unpriced";
+  const input = convert2({ currency: prices.currency, micros: prices.inputPerMillion });
+  const output = convert2({ currency: prices.currency, micros: prices.outputPerMillion });
+  if (!input || !output) {
+    return `${formatMoney(money(prices.inputPerMillion, prices.currency))}/${formatMoney(money(prices.outputPerMillion, prices.currency))} per Mtok`;
+  }
+  return `${formatMoney(input)}/${formatMoney(output)} per Mtok`;
 }
 
 // packages/archymedes-cli/src/app/acp-models.ts
-async function modelList(environment, params) {
-  const state = {};
+var PUBLIC_LISTINGS = ["free", "openrouter"];
+async function modelList(environment, params, options = {}) {
+  const offline = /^(1|true|on|yes)$/i.test(environment.ARCHYMEDES_MODELS_OFFLINE?.trim() ?? "");
+  const cached = await readModelCache(environment);
+  let live = isCacheFresh(cached, options.now) ? cached.models : undefined;
   let errors = [];
-  if (params.refresh === true)
-    errors = (await createLiveModelRefresh(environment, state)({ refresh: true })).errors;
-  else
-    await readCachedLiveModels(environment, state);
-  const catalog = buildModelCatalog(environment, undefined, state.liveModels);
-  return {
-    choices: catalog.choices.map((choice) => ({
-      provider: choice.provider,
-      providerLabel: choice.providerLabel,
-      model: choice.model,
-      isDefault: choice.isProviderDefault,
-      live: Boolean(choice.live),
-      price: choice.prices ? describePrice(choice.prices, choice.prices.currency, (value) => value) : "unpriced"
-    })),
-    unconfigured: catalog.unconfigured.map(({ provider, label: label3, missing }) => ({ provider, label: label3, missing })),
-    errors,
-    providers: PROVIDER_IDS.length
-  };
+  if (params.refresh === true || !live && !offline) {
+    const asked = new Set(fetchableProviders(environment, PROVIDER_IDS));
+    if (!offline)
+      for (const provider of PUBLIC_LISTINGS)
+        asked.add(provider);
+    const loaded = await loadLiveModels([...asked], environment, { refresh: true, ...options });
+    if (Object.keys(loaded.models).length > 0)
+      live = { ...live ?? cached?.models ?? {}, ...loaded.models };
+    errors = loaded.errors.filter((error) => error.provider !== "ollama" || Boolean(environment.OLLAMA_BASE_URL?.trim())).map((error) => `${error.provider}: ${error.error}`);
+  }
+  live ??= cached?.models;
+  const ready = [];
+  const locked = [];
+  const unconfigured = [];
+  const freeIds = new Set(live?.free ?? []);
+  for (const provider of PROVIDER_IDS) {
+    const spec = PROVIDERS[provider];
+    const missing = missingRequirements(provider, environment);
+    if (missing.length > 0)
+      unconfigured.push({ provider, label: spec.label, missing });
+    const known = modelsForProvider(provider);
+    const knownSet = new Set(known);
+    const extra = (live?.[provider] ?? []).filter((model) => !knownSet.has(model) && (provider !== "free" || isFreeModelId(model)) && !(provider === "openrouter" && freeIds.has(model))).sort();
+    const preferred = environment[`${providerEnvPrefix(provider)}_MODEL`]?.trim() || spec.defaultModel;
+    for (const model of [...known, ...extra]) {
+      const prices = catalogPrices(provider, model);
+      const free = provider === "free" || model.endsWith(":free") || Boolean(prices && prices.inputPerMillion === 0 && prices.outputPerMillion === 0);
+      const choice = {
+        provider,
+        providerLabel: spec.label,
+        model,
+        isDefault: model === preferred,
+        live: !knownSet.has(model),
+        price: free ? "free" : prices ? describePrice(prices, prices.currency, (value) => value) : "unpriced",
+        free,
+        locked: missing.length > 0,
+        missing
+      };
+      (choice.locked ? locked : ready).push(choice);
+    }
+  }
+  return { choices: [...ready, ...locked], unconfigured, errors, providers: PROVIDER_IDS.length };
 }
 
 // packages/archymedes-cli/src/app/acp-commands.ts
@@ -16773,7 +16752,7 @@ function escapeCodeTimeoutMs(environment = process.env) {
 // packages/archymedes-cli/package.json
 var package_default = {
   name: "archymedes-cli",
-  version: "3.1.0",
+  version: "3.2.0",
   description: "Archymedes CLI — a coding agent that shows its work. Runs against your working tree or an isolated remote sandbox, with guarded approvals, git checkpoints, and exact, measured cost accounting.",
   keywords: [
     "cli",
@@ -16819,12 +16798,12 @@ var package_default = {
     prepublishOnly: "bun run ../../tooling/build/build-packages.ts"
   },
   optionalDependencies: {
-    "@archymedes/cli-darwin-arm64": "3.1.0",
-    "@archymedes/cli-darwin-x64": "3.1.0",
-    "@archymedes/cli-linux-arm64": "3.1.0",
-    "@archymedes/cli-linux-x64": "3.1.0",
-    "@archymedes/cli-win32-arm64": "3.1.0",
-    "@archymedes/cli-win32-x64": "3.1.0",
+    "@archymedes/cli-darwin-arm64": "3.2.0",
+    "@archymedes/cli-darwin-x64": "3.2.0",
+    "@archymedes/cli-linux-arm64": "3.2.0",
+    "@archymedes/cli-linux-x64": "3.2.0",
+    "@archymedes/cli-win32-arm64": "3.2.0",
+    "@archymedes/cli-win32-x64": "3.2.0",
     "@archymedes/state-darwin-arm64": "0.4.0",
     "@archymedes/state-darwin-x64": "0.4.0",
     "@archymedes/state-linux-arm64-gnu": "0.4.0",
@@ -26040,7 +26019,7 @@ function closeWithClient(client, hook) {
 }
 
 // packages/archymedes-cli/src/app/live-models.ts
-async function readCachedLiveModels2(environment, state) {
+async function readCachedLiveModels(environment, state) {
   const cached = await readModelCache(environment);
   if (isCacheFresh(cached))
     state.liveModels = cached.models;
@@ -27113,7 +27092,7 @@ async function main() {
   out2.route(firstSink);
   let explainedTabs = false;
   let liveModels = {};
-  await readCachedLiveModels2(environment, state);
+  await readCachedLiveModels(environment, state);
   if (args.estimateOnly) {
     out2.write(`${ledger.formatPrediction(await agent.estimate(args.prompt))}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archymedes-cli",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Archymedes CLI — a coding agent that shows its work. Runs against your working tree or an isolated remote sandbox, with guarded approvals, git checkpoints, and exact, measured cost accounting.",
   "keywords": [
     "cli",
@@ -46,12 +46,12 @@
     "prepublishOnly": "bun run ../../tooling/build/build-packages.ts"
   },
   "optionalDependencies": {
-    "@archymedes/cli-darwin-arm64": "3.1.0",
-    "@archymedes/cli-darwin-x64": "3.1.0",
-    "@archymedes/cli-linux-arm64": "3.1.0",
-    "@archymedes/cli-linux-x64": "3.1.0",
-    "@archymedes/cli-win32-arm64": "3.1.0",
-    "@archymedes/cli-win32-x64": "3.1.0",
+    "@archymedes/cli-darwin-arm64": "3.2.0",
+    "@archymedes/cli-darwin-x64": "3.2.0",
+    "@archymedes/cli-linux-arm64": "3.2.0",
+    "@archymedes/cli-linux-x64": "3.2.0",
+    "@archymedes/cli-win32-arm64": "3.2.0",
+    "@archymedes/cli-win32-x64": "3.2.0",
     "@archymedes/state-darwin-arm64": "0.4.0",
     "@archymedes/state-darwin-x64": "0.4.0",
     "@archymedes/state-linux-arm64-gnu": "0.4.0",