claudish 7.43.0 → 7.44.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.43.0";
+var VERSION = "7.44.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28338,6 +28338,7 @@ var init_provider_definitions = __esm(() => {
         { prefix: "ollama:", stripPrefix: true }
       ],
       isLocal: true,
+      modelDiscovery: { path: "/api/tags", format: "ollama-tags" },
       description: "Local Ollama (ollama@)"
     },
     {
@@ -28359,6 +28360,7 @@ var init_provider_definitions = __esm(() => {
         { prefix: "mlstudio:", stripPrefix: true }
       ],
       isLocal: true,
+      modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       description: "Local LM Studio (lms@)"
     },
     {
@@ -28553,6 +28555,208 @@ var init_auto_route = __esm(() => {
   })();
 });
 
+// src/providers/all-models-cache.ts
+import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
+import { homedir as homedir8 } from "os";
+import { dirname as dirname5, join as join8 } from "path";
+function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
+  if (!existsSync6(path))
+    return null;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync6(path, "utf-8"));
+  } catch {
+    return null;
+  }
+  if (!raw || typeof raw !== "object")
+    return null;
+  const data = raw;
+  const lastUpdated = typeof data.lastUpdated === "string" ? data.lastUpdated : new Date(0).toISOString();
+  const models = Array.isArray(data.models) ? data.models : [];
+  const entries = Array.isArray(data.entries) ? data.entries : [];
+  return {
+    version: 2,
+    lastUpdated,
+    entries,
+    models
+  };
+}
+function writeAllModelsCache(data, path = ALL_MODELS_CACHE_PATH) {
+  const existing = readAllModelsCache(path);
+  const merged = {
+    version: 2,
+    lastUpdated: data.lastUpdated ?? new Date().toISOString(),
+    entries: data.entries ?? existing?.entries ?? [],
+    models: data.models ?? existing?.models ?? []
+  };
+  mkdirSync6(dirname5(path), { recursive: true });
+  writeFileSync6(path, JSON.stringify(merged), "utf-8");
+}
+var ALL_MODELS_CACHE_PATH;
+var init_all_models_cache = __esm(() => {
+  ALL_MODELS_CACHE_PATH = join8(homedir8(), ".claudish", "all-models.json");
+});
+
+// src/providers/catalog-client.ts
+function getCatalogEntries() {
+  if (_memCache)
+    return _memCache;
+  const cache = readAllModelsCache();
+  if (!cache)
+    return null;
+  if (cache.entries.length > 0) {
+    _memCache = cache.entries;
+    return _memCache;
+  }
+  if (cache.models.length > 0) {
+    _memCache = cache.models.map((m) => ({
+      modelId: m.id.includes("/") ? m.id.split("/").slice(1).join("/") : m.id,
+      aliases: [],
+      sources: { "openrouter-api": { externalId: m.id } }
+    }));
+    return _memCache;
+  }
+  return null;
+}
+function isCatalogWarm() {
+  return _memCache !== null && _memCache.length > 0;
+}
+function externalIdFor(entry, provider) {
+  const agg = entry.aggregators?.find((a) => a.provider === provider);
+  if (agg?.externalId)
+    return agg.externalId;
+  if (provider !== "openrouter")
+    return null;
+  const orSource = entry.sources["openrouter-api"];
+  if (orSource?.externalId)
+    return orSource.externalId;
+  for (const src of Object.values(entry.sources)) {
+    if (src.externalId.includes("/"))
+      return src.externalId;
+  }
+  return null;
+}
+function resolveExternalId(userInput, provider) {
+  const entries = getCatalogEntries();
+  if (userInput.includes("/")) {
+    if (entries) {
+      for (const entry of entries) {
+        for (const src of Object.values(entry.sources)) {
+          if (src.externalId === userInput)
+            return userInput;
+        }
+      }
+    }
+    return userInput;
+  }
+  if (!entries)
+    return null;
+  const byModelId = entries.find((e) => e.modelId === userInput);
+  if (byModelId)
+    return externalIdFor(byModelId, provider);
+  const byAlias = entries.find((e) => e.aliases.includes(userInput));
+  if (byAlias) {
+    const id = externalIdFor(byAlias, provider);
+    if (id)
+      return id;
+  }
+  for (const entry of entries) {
+    for (const src of Object.values(entry.sources)) {
+      if (src.externalId === userInput) {
+        const id = externalIdFor(entry, provider);
+        if (id)
+          return id;
+      }
+    }
+  }
+  const suffix = `/${userInput}`;
+  for (const entry of entries) {
+    const id = externalIdFor(entry, provider);
+    if (id?.endsWith(suffix))
+      return id;
+  }
+  const lowerSuffix = `/${userInput.toLowerCase()}`;
+  for (const entry of entries) {
+    const id = externalIdFor(entry, provider);
+    if (id?.toLowerCase().endsWith(lowerSuffix))
+      return id;
+  }
+  return null;
+}
+function resolveModelNameSync(userInput, targetProvider) {
+  if (targetProvider !== "openrouter" && userInput.includes("/")) {
+    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
+  }
+  const resolved = resolveExternalId(userInput, targetProvider);
+  if (!resolved || resolved === userInput) {
+    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
+  }
+  return { resolvedId: resolved, wasResolved: true, sourceLabel: `${targetProvider} catalog` };
+}
+function logResolution(userInput, result, quiet = false) {
+  if (result.wasResolved && !quiet) {
+    process.stderr.write(`[Model] Resolved "${userInput}" \u2192 "${result.resolvedId}" (${result.sourceLabel})
+`);
+  }
+}
+async function refreshCatalog(timeoutMs) {
+  let response;
+  try {
+    response = await fetch(FIREBASE_CATALOG_URL, { signal: AbortSignal.timeout(timeoutMs) });
+  } catch (err) {
+    const name = err?.name;
+    const reason = name === "TimeoutError" || name === "AbortError" ? "timeout" : "network";
+    return { kind: "fetch_failed", reason };
+  }
+  if (!response.ok)
+    return { kind: "fetch_failed", reason: "http_error" };
+  let data;
+  try {
+    data = await response.json();
+  } catch {
+    return { kind: "fetch_failed", reason: "network" };
+  }
+  if (!Array.isArray(data.models) || data.models.length === 0) {
+    return { kind: "fetch_failed", reason: "empty" };
+  }
+  const backwardCompatModels = [];
+  for (const entry of data.models) {
+    const id = externalIdFor(entry, "openrouter");
+    if (id)
+      backwardCompatModels.push({ id });
+  }
+  _memCache = data.models;
+  writeAllModelsCache({ entries: data.models, models: backwardCompatModels });
+  _warmPromise = Promise.resolve();
+  return { kind: "refreshed", modelCount: data.models.length };
+}
+async function warmCatalog() {
+  if (!_warmPromise) {
+    _warmPromise = refreshCatalog(8000).then(() => {
+      return;
+    });
+  }
+  await _warmPromise;
+}
+async function ensureCatalogReady(timeoutMs = 5000) {
+  if (isCatalogWarm())
+    return;
+  if (!_warmPromise) {
+    _warmPromise = refreshCatalog(8000).then(() => {
+      return;
+    });
+  }
+  await Promise.race([
+    _warmPromise,
+    new Promise((resolve) => setTimeout(resolve, timeoutMs))
+  ]);
+}
+var FIREBASE_CATALOG_URL, _memCache = null, _warmPromise = null;
+var init_catalog_client = __esm(() => {
+  init_all_models_cache();
+  FIREBASE_CATALOG_URL = process.env.CLAUDISH_CATALOG_URL ?? process.env.FIREBASE_CATALOG_URL ?? "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=active&catalog=slim&limit=1000";
+});
+
 // ../../node_modules/.bun/zod@4.1.13/node_modules/zod/index.js
 var init_zod = __esm(() => {
   init_external2();
@@ -28612,48 +28816,6 @@ var init_remote_provider_types = __esm(() => {
   };
 });
 
-// src/providers/all-models-cache.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
-import { homedir as homedir8 } from "os";
-import { dirname as dirname5, join as join8 } from "path";
-function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
-  if (!existsSync6(path))
-    return null;
-  let raw;
-  try {
-    raw = JSON.parse(readFileSync6(path, "utf-8"));
-  } catch {
-    return null;
-  }
-  if (!raw || typeof raw !== "object")
-    return null;
-  const data = raw;
-  const lastUpdated = typeof data.lastUpdated === "string" ? data.lastUpdated : new Date(0).toISOString();
-  const models = Array.isArray(data.models) ? data.models : [];
-  const entries = Array.isArray(data.entries) ? data.entries : [];
-  return {
-    version: 2,
-    lastUpdated,
-    entries,
-    models
-  };
-}
-function writeAllModelsCache(data, path = ALL_MODELS_CACHE_PATH) {
-  const existing = readAllModelsCache(path);
-  const merged = {
-    version: 2,
-    lastUpdated: data.lastUpdated ?? new Date().toISOString(),
-    entries: data.entries ?? existing?.entries ?? [],
-    models: data.models ?? existing?.models ?? []
-  };
-  mkdirSync6(dirname5(path), { recursive: true });
-  writeFileSync6(path, JSON.stringify(merged), "utf-8");
-}
-var ALL_MODELS_CACHE_PATH;
-var init_all_models_cache = __esm(() => {
-  ALL_MODELS_CACHE_PATH = join8(homedir8(), ".claudish", "all-models.json");
-});
-
 // src/adapters/model-catalog.ts
 function lookupModel(modelId, cachePath) {
   const entry = findCacheEntry(modelId, cachePath);
@@ -30447,10 +30609,10 @@ ${lines.join(`
 }
 var ANTIGRAVITY_BASE = "https://cloudcode-pa.googleapis.com", ANTIGRAVITY_ENDPOINT, MAX_RETRY_ATTEMPTS = 3, DEFAULT_RATE_LIMIT_DELAY_MS = 1e4, REASONING_TIER_RANK;
 var init_antigravity = __esm(() => {
+  init_model_catalog();
   init_antigravity_token();
-  init_authority();
   init_antigravity_user();
-  init_model_catalog();
+  init_authority();
   init_gemini_queue();
   init_logger();
   ANTIGRAVITY_ENDPOINT = `${ANTIGRAVITY_BASE}/v1internal:streamGenerateContent?alt=sse`;
@@ -34927,6 +35089,11 @@ var init_digest = __esm(() => {
 });
 
 // src/providers/ollama-discovery.ts
+var exports_ollama_discovery = {};
+__export(exports_ollama_discovery, {
+  ollamaBaseUrl: () => ollamaBaseUrl,
+  fetchOllamaModels: () => fetchOllamaModels
+});
 function ollamaBaseUrl() {
   return process.env.OLLAMA_HOST || process.env.OLLAMA_BASE_URL || "http://localhost:11434";
 }
@@ -40796,6 +40963,7 @@ __export(exports_devin_models, {
   getServedDevinModels: () => getServedDevinModels,
   fetchDevinModelConfigs: () => fetchDevinModelConfigs,
   fetchDevinAllowedUids: () => fetchDevinAllowedUids,
+  decodeModelConfigs: () => decodeModelConfigs,
   _resetDevinModelCache: () => _resetDevinModelCache
 });
 function unaryMetadata(apiKey) {
@@ -40835,11 +41003,59 @@ function decodeModelDetails(payload) {
   }
   return { maxOutput, family };
 }
+function decodeFamilyMetadata(payload) {
+  let groupLabel;
+  const axes = [];
+  for (const sub of parseTLV(payload)) {
+    if (sub.no === 1 && sub.wire === 2) {
+      groupLabel = readString(sub) || undefined;
+      continue;
+    }
+    if (sub.no !== 2 || sub.wire !== 2)
+      continue;
+    const axis = { key: "", enabled: false };
+    for (const entry of parseTLV(sub.payload)) {
+      if (entry.no === 1 && entry.wire === 2)
+        axis.key = readString(entry);
+      else if (entry.no === 2 && entry.wire === 2) {
+        for (const value of parseTLV(entry.payload)) {
+          if (value.no === 1 && value.wire === 0)
+            axis.enabled = readVarintValue(value) === 1;
+          else if (value.no === 2 && value.wire === 2)
+            axis.label = readString(value) || undefined;
+        }
+      }
+    }
+    if (axis.key)
+      axes.push(axis);
+  }
+  return { groupLabel, axes };
+}
+function decodePromo(payload) {
+  for (const sub of parseTLV(payload)) {
+    if (sub.wire !== 2)
+      continue;
+    for (const inner of parseTLV(sub.payload)) {
+      if (inner.no === 1 && inner.wire === 0) {
+        const expiresAt = readVarintValue(inner);
+        if (expiresAt > 0)
+          return { expiresAt };
+      }
+    }
+  }
+  return;
+}
 function decodeModelConfig(payload) {
   let uid = "";
   let displayName = "";
   let contextWindow = 0;
   let details = { maxOutput: 0, family: "" };
+  let family = { axes: [] };
+  let creditMultiplier;
+  let costTier;
+  let isFamilyDefault = false;
+  let isRecommended = false;
+  let promo;
   for (const field of parseTLV(payload)) {
     if (field.no === 22 && field.wire === 2)
       uid = readString(field);
@@ -40849,10 +41065,34 @@ function decodeModelConfig(payload) {
       contextWindow = readVarintValue(field);
     else if (field.no === 23 && field.wire === 2)
       details = decodeModelDetails(field.payload);
+    else if (field.no === 30 && field.wire === 2)
+      family = decodeFamilyMetadata(field.payload);
+    else if (field.no === 3 && field.wire === 5)
+      creditMultiplier = readFloat32LE(field);
+    else if (field.no === 24 && field.wire === 0)
+      costTier = readVarintValue(field);
+    else if (field.no === 31 && field.wire === 0)
+      isFamilyDefault = readVarintValue(field) === 1;
+    else if (field.no === 11 && field.wire === 0)
+      isRecommended = readVarintValue(field) === 1;
+    else if (field.no === 19 && field.wire === 2)
+      promo = decodePromo(field.payload);
   }
   if (!uid)
     return null;
-  return { uid, displayName: displayName || uid, contextWindow, ...details };
+  return {
+    uid,
+    displayName: displayName || uid,
+    contextWindow,
+    ...details,
+    groupLabel: family.groupLabel,
+    axes: family.axes,
+    creditMultiplier,
+    costTier,
+    isFamilyDefault,
+    isRecommended,
+    promo
+  };
 }
 function topLevelDelimited(body, fieldNumber) {
   return parseTLV(body).filter((field) => field.no === fieldNumber && field.wire === 2);
@@ -40861,13 +41101,17 @@ async function fetchDevinModelConfigs(apiKey) {
   const body = await postUnary(MODEL_CONFIGS_PATH, apiKey);
   if (!body)
     return [];
+  const configs = decodeModelConfigs(body);
+  log(`[Devin] GetCliModelConfigs: ${configs.length} configs`);
+  return configs;
+}
+function decodeModelConfigs(body) {
   const configs = [];
   for (const field of topLevelDelimited(body, 1)) {
     const config2 = decodeModelConfig(field.payload);
     if (config2)
       configs.push(config2);
   }
-  log(`[Devin] GetCliModelConfigs: ${configs.length} configs`);
   return configs;
 }
 async function fetchDevinAllowedUids(apiKey) {
@@ -40923,7 +41167,246 @@ var init_devin_models = __esm(() => {
   ROSTER_TTL_MS = 5 * 60 * 1000;
 });
 
+// src/providers/model-resolvers/types.ts
+function nonEmpty(value) {
+  const trimmed2 = value?.trim();
+  return trimmed2 ? trimmed2 : undefined;
+}
+function groupKeyOf(entry) {
+  return nonEmpty(entry.groupLabel) ?? nonEmpty(entry.family) ?? entry.wireId;
+}
+function offerIsLive(offer, now = Date.now()) {
+  if (!offer)
+    return false;
+  if (offer.expiresAt === undefined)
+    return true;
+  return offer.expiresAt * 1000 > now;
+}
+
+// src/providers/model-resolvers/devin.ts
+var exports_devin = {};
+__export(exports_devin, {
+  devinRosterEntry: () => devinRosterEntry,
+  devinHasSpeedPremium: () => devinHasSpeedPremium,
+  devinEffortOf: () => devinEffortOf,
+  DevinModelResolver: () => DevinModelResolver
+});
+function toEffortLevel(label) {
+  const normalised = label?.toLowerCase().replace(/[^a-z]/g, "");
+  if (!normalised)
+    return;
+  if (normalised === "nothinking")
+    return "none";
+  return isEffortLevel(normalised) ? normalised : undefined;
+}
+function effortFromUid(uid) {
+  for (const part of uid.toLowerCase().split("-").reverse()) {
+    if (isEffortLevel(part))
+      return part;
+    if (!SPEED_SUFFIXES.includes(part) && part !== "1m")
+      break;
+  }
+  return;
+}
+function devinEffortOf(config2) {
+  const axis = config2.axes.find((a) => EFFORT_AXIS_KEYS.includes(a.key.toLowerCase()));
+  return toEffortLevel(axis?.label) ?? effortFromUid(config2.uid);
+}
+function devinHasSpeedPremium(config2) {
+  const axis = config2.axes.find((a) => a.key.toLowerCase() === SPEED_AXIS_KEY);
+  if (axis)
+    return axis.enabled;
+  return SPEED_SUFFIXES.some((suffix) => config2.uid.toLowerCase().endsWith(`-${suffix}`));
+}
+function namesEffortTier(id) {
+  return id.toLowerCase().split("-").some((part) => isEffortLevel(part));
+}
+function modifiersOf(config2) {
+  const parts = config2.uid.toLowerCase().split("-");
+  const named = SPEED_SUFFIXES.filter((suffix) => parts.includes(suffix));
+  if (named.length > 0)
+    return named;
+  return devinHasSpeedPremium(config2) ? ["premium"] : [];
+}
+function devinRosterEntry(config2) {
+  return {
+    wireId: config2.uid,
+    displayName: config2.displayName,
+    contextWindow: config2.contextWindow,
+    groupLabel: config2.groupLabel,
+    family: config2.family,
+    costFactor: config2.creditMultiplier,
+    costTier: config2.costTier,
+    isFamilyDefault: config2.isFamilyDefault,
+    isRecommended: config2.isRecommended,
+    axes: config2.axes,
+    offer: config2.promo ? { kind: "promo", expiresAt: config2.promo.expiresAt } : undefined
+  };
+}
+function asConfig(entry) {
+  return {
+    uid: entry.wireId,
+    displayName: entry.displayName ?? entry.wireId,
+    contextWindow: entry.contextWindow ?? 0,
+    maxOutput: 0,
+    family: entry.family ?? "",
+    groupLabel: entry.groupLabel,
+    axes: entry.axes ?? [],
+    creditMultiplier: entry.costFactor,
+    costTier: entry.costTier,
+    isFamilyDefault: entry.isFamilyDefault ?? false,
+    isRecommended: entry.isRecommended ?? false
+  };
+}
+function byCost(a, b) {
+  const tier = (a.costTier ?? Number.MAX_SAFE_INTEGER) - (b.costTier ?? Number.MAX_SAFE_INTEGER);
+  if (tier !== 0)
+    return tier;
+  const cost = (a.costFactor ?? Number.MAX_SAFE_INTEGER) - (b.costFactor ?? Number.MAX_SAFE_INTEGER);
+  if (cost !== 0)
+    return cost;
+  const length = a.wireId.length - b.wireId.length;
+  return length !== 0 ? length : a.wireId.localeCompare(b.wireId);
+}
+function defaultOf(group) {
+  const declared = group.find((entry) => entry.isFamilyDefault);
+  if (declared)
+    return declared;
+  const plain = group.filter((entry) => !devinHasSpeedPremium(asConfig(entry)));
+  const pool = plain.length > 0 ? plain : group;
+  const tierless = pool.filter((entry) => !namesEffortTier(entry.wireId));
+  return [...tierless.length > 0 ? tierless : pool].sort(byCost)[0];
+}
+function keyOf(entry) {
+  return `${groupKeyOf(entry)}\x00${entry.contextWindow ?? 0}`;
+}
+function formatWindow(tokens) {
+  return tokens >= 1e6 ? `${Math.round(tokens / 1e5) / 10}M`.replace(".0M", "M") : `${Math.round(tokens / 1000)}K`;
+}
+
+class DevinModelResolver {
+  provider = "devin";
+  collapse(roster) {
+    const groups = new Map;
+    for (const entry of roster) {
+      const key = keyOf(entry);
+      const bucket = groups.get(key);
+      if (bucket)
+        bucket.push(entry);
+      else
+        groups.set(key, [entry]);
+    }
+    const windowsPerLabel = new Map;
+    for (const entry of roster) {
+      const label = groupKeyOf(entry);
+      const seen = windowsPerLabel.get(label) ?? new Set;
+      seen.add(entry.contextWindow ?? 0);
+      windowsPerLabel.set(label, seen);
+    }
+    const choices = [];
+    for (const group of groups.values()) {
+      const chosen = defaultOf(group);
+      const label = groupKeyOf(chosen);
+      const ambiguous = (windowsPerLabel.get(label)?.size ?? 1) > 1;
+      const window2 = chosen.contextWindow ?? 0;
+      const variants = group.map((entry) => {
+        const config2 = asConfig(entry);
+        return {
+          wireId: entry.wireId,
+          effort: devinEffortOf(config2),
+          modifiers: modifiersOf(config2),
+          costFactor: entry.costFactor
+        };
+      });
+      choices.push({
+        id: chosen.wireId,
+        displayName: ambiguous && window2 > 0 ? `${label} (${formatWindow(window2)})` : label,
+        contextWindow: chosen.contextWindow,
+        variants,
+        costFactor: chosen.costFactor,
+        offer: chosen.offer,
+        isRecommended: chosen.isRecommended
+      });
+    }
+    return choices;
+  }
+  expand(selection, roster, ctx) {
+    const requested = selection.trim();
+    if (!requested || roster.length === 0)
+      return requested || selection;
+    const groups = new Map;
+    for (const entry of roster) {
+      const key = keyOf(entry);
+      const bucket = groups.get(key);
+      if (bucket)
+        bucket.push(entry);
+      else
+        groups.set(key, [entry]);
+    }
+    const lower = requested.toLowerCase();
+    const exact = roster.find((entry) => entry.wireId.toLowerCase() === lower);
+    if (exact) {
+      if (!ctx.effort)
+        return exact.wireId;
+      const group = groups.get(keyOf(exact));
+      if (exact.wireId === defaultOf(group).wireId)
+        return pickForEffort(group, ctx.effort).wireId;
+      if (namesEffortTier(exact.wireId))
+        return exact.wireId;
+      return pickForEffort(group, ctx.effort).wireId;
+    }
+    const named = roster.filter((entry) => {
+      const label = nonEmpty(entry.groupLabel)?.toLowerCase();
+      const family = nonEmpty(entry.family)?.toLowerCase();
+      return label === lower || family === lower;
+    });
+    const pool = named.length > 0 ? named : roster.filter((entry) => entry.wireId.toLowerCase().startsWith(`${lower}-`));
+    if (pool.length === 0)
+      return requested;
+    if (named.length === 0 && new Set(pool.map(keyOf)).size > 1)
+      return requested;
+    const chosen = pool.filter((entry) => entry.isFamilyDefault).sort(byCost)[0] ?? pool.slice().sort(byCost)[0];
+    return pickForEffort(groups.get(keyOf(chosen)), ctx.effort).wireId;
+  }
+}
+function pickForEffort(group, effort) {
+  if (!effort)
+    return defaultOf(group);
+  const plain = group.filter((entry) => !devinHasSpeedPremium(asConfig(entry)));
+  const pool = plain.length > 0 ? plain : group;
+  const tiered = pool.map((entry) => ({ entry, effort: devinEffortOf(asConfig(entry)) })).filter((row) => row.effort !== undefined);
+  if (tiered.length === 0)
+    return defaultOf(group);
+  const target = EFFORT_LEVELS.indexOf(effort);
+  const ranked = tiered.slice().sort((a, b) => {
+    const distanceA = Math.abs(EFFORT_LEVELS.indexOf(a.effort) - target);
+    const distanceB = Math.abs(EFFORT_LEVELS.indexOf(b.effort) - target);
+    if (distanceA !== distanceB)
+      return distanceA - distanceB;
+    const levelA = EFFORT_LEVELS.indexOf(a.effort);
+    const levelB = EFFORT_LEVELS.indexOf(b.effort);
+    if (levelA !== levelB)
+      return levelB - levelA;
+    const defaultA = a.entry.isFamilyDefault ? 0 : 1;
+    const defaultB = b.entry.isFamilyDefault ? 0 : 1;
+    if (defaultA !== defaultB)
+      return defaultA - defaultB;
+    return byCost(a.entry, b.entry);
+  });
+  return ranked[0].entry;
+}
+var EFFORT_AXIS_KEYS, SPEED_AXIS_KEY = "fast mode", SPEED_SUFFIXES;
+var init_devin = __esm(() => {
+  init_base_api_format();
+  EFFORT_AXIS_KEYS = ["effort", "reasoning effort"];
+  SPEED_SUFFIXES = ["fast", "priority"];
+});
+
 // src/providers/model-discovery.ts
+function toRosterEntry(model) {
+  const { id, ...rest } = model;
+  return { wireId: id, ...rest };
+}
 function resolveBaseUrl(catalogName) {
   const def = getProviderByName(catalogName);
   if (!def)
@@ -40990,26 +41473,46 @@ async function discoverProviderModels(providerName) {
       log(`[model-discovery:${providerName}] no models for this subscription`);
       return [];
     }
-    const models2 = served.map((model) => ({
-      id: model.uid,
-      displayName: model.displayName,
-      contextWindow: model.contextWindow
-    }));
+    const { devinRosterEntry: devinRosterEntry2 } = await Promise.resolve().then(() => (init_devin(), exports_devin));
+    const models2 = served.map((model) => {
+      const { wireId, ...rest } = devinRosterEntry2(model);
+      return { id: wireId, ...rest };
+    });
     log(`[model-discovery:${providerName}] discovered ${models2.length} models`);
     _cache.set(providerName, { models: models2, expiresAt: Date.now() + CACHE_TTL_MS });
     return models2;
   }
+  if (descriptor.format === "ollama-tags") {
+    const { fetchOllamaModels: fetchOllamaModels2 } = await Promise.resolve().then(() => exports_ollama_discovery);
+    const installed = await fetchOllamaModels2({ enrichCapabilities: false });
+    if (installed.length === 0)
+      return [];
+    const models2 = installed.map((model) => ({
+      id: model.name,
+      displayName: model.name,
+      supportsTools: model.supportsTools
+    }));
+    log(`[model-discovery:${providerName}] discovered ${models2.length} local models`);
+    _cache.set(providerName, { models: models2, expiresAt: Date.now() + CACHE_TTL_MS });
+    return models2;
+  }
   const baseUrl = resolveBaseUrl(providerName);
   if (!baseUrl)
     return [];
   const endpoint = `${baseUrl}${descriptor.path}`;
   let headers = {};
-  try {
-    const auth = await credentials.getRequestAuth(providerName, { model: "" });
-    headers = { ...auth.headers };
-  } catch (e) {
-    log(`[model-discovery:${providerName}] no credentials, skipping: ${e?.message}`);
-    return [];
+  if (def.isLocal) {
+    const key = def.apiKeyEnvVar ? process.env[def.apiKeyEnvVar] : undefined;
+    if (key)
+      headers = { Authorization: `Bearer ${key}` };
+  } else {
+    try {
+      const auth = await credentials.getRequestAuth(providerName, { model: "" });
+      headers = { ...auth.headers };
+    } catch (e) {
+      log(`[model-discovery:${providerName}] no credentials, skipping: ${e?.message}`);
+      return [];
+    }
   }
   let response;
   try {
@@ -41789,166 +42292,6 @@ var init_custom_endpoints_loader = __esm(() => {
   init_openai();
 });
 
-// src/providers/catalog-client.ts
-function getCatalogEntries() {
-  if (_memCache)
-    return _memCache;
-  const cache2 = readAllModelsCache();
-  if (!cache2)
-    return null;
-  if (cache2.entries.length > 0) {
-    _memCache = cache2.entries;
-    return _memCache;
-  }
-  if (cache2.models.length > 0) {
-    _memCache = cache2.models.map((m) => ({
-      modelId: m.id.includes("/") ? m.id.split("/").slice(1).join("/") : m.id,
-      aliases: [],
-      sources: { "openrouter-api": { externalId: m.id } }
-    }));
-    return _memCache;
-  }
-  return null;
-}
-function isCatalogWarm() {
-  return _memCache !== null && _memCache.length > 0;
-}
-function externalIdFor(entry, provider) {
-  const agg = entry.aggregators?.find((a) => a.provider === provider);
-  if (agg?.externalId)
-    return agg.externalId;
-  if (provider !== "openrouter")
-    return null;
-  const orSource = entry.sources["openrouter-api"];
-  if (orSource?.externalId)
-    return orSource.externalId;
-  for (const src of Object.values(entry.sources)) {
-    if (src.externalId.includes("/"))
-      return src.externalId;
-  }
-  return null;
-}
-function resolveExternalId(userInput, provider) {
-  const entries = getCatalogEntries();
-  if (userInput.includes("/")) {
-    if (entries) {
-      for (const entry of entries) {
-        for (const src of Object.values(entry.sources)) {
-          if (src.externalId === userInput)
-            return userInput;
-        }
-      }
-    }
-    return userInput;
-  }
-  if (!entries)
-    return null;
-  const byModelId = entries.find((e) => e.modelId === userInput);
-  if (byModelId)
-    return externalIdFor(byModelId, provider);
-  const byAlias = entries.find((e) => e.aliases.includes(userInput));
-  if (byAlias) {
-    const id = externalIdFor(byAlias, provider);
-    if (id)
-      return id;
-  }
-  for (const entry of entries) {
-    for (const src of Object.values(entry.sources)) {
-      if (src.externalId === userInput) {
-        const id = externalIdFor(entry, provider);
-        if (id)
-          return id;
-      }
-    }
-  }
-  const suffix = `/${userInput}`;
-  for (const entry of entries) {
-    const id = externalIdFor(entry, provider);
-    if (id?.endsWith(suffix))
-      return id;
-  }
-  const lowerSuffix = `/${userInput.toLowerCase()}`;
-  for (const entry of entries) {
-    const id = externalIdFor(entry, provider);
-    if (id?.toLowerCase().endsWith(lowerSuffix))
-      return id;
-  }
-  return null;
-}
-function resolveModelNameSync(userInput, targetProvider) {
-  if (targetProvider !== "openrouter" && userInput.includes("/")) {
-    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
-  }
-  const resolved = resolveExternalId(userInput, targetProvider);
-  if (!resolved || resolved === userInput) {
-    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
-  }
-  return { resolvedId: resolved, wasResolved: true, sourceLabel: `${targetProvider} catalog` };
-}
-function logResolution(userInput, result, quiet = false) {
-  if (result.wasResolved && !quiet) {
-    process.stderr.write(`[Model] Resolved "${userInput}" \u2192 "${result.resolvedId}" (${result.sourceLabel})
-`);
-  }
-}
-async function refreshCatalog(timeoutMs) {
-  let response;
-  try {
-    response = await fetch(FIREBASE_CATALOG_URL, { signal: AbortSignal.timeout(timeoutMs) });
-  } catch (err) {
-    const name = err?.name;
-    const reason = name === "TimeoutError" || name === "AbortError" ? "timeout" : "network";
-    return { kind: "fetch_failed", reason };
-  }
-  if (!response.ok)
-    return { kind: "fetch_failed", reason: "http_error" };
-  let data;
-  try {
-    data = await response.json();
-  } catch {
-    return { kind: "fetch_failed", reason: "network" };
-  }
-  if (!Array.isArray(data.models) || data.models.length === 0) {
-    return { kind: "fetch_failed", reason: "empty" };
-  }
-  const backwardCompatModels = [];
-  for (const entry of data.models) {
-    const id = externalIdFor(entry, "openrouter");
-    if (id)
-      backwardCompatModels.push({ id });
-  }
-  _memCache = data.models;
-  writeAllModelsCache({ entries: data.models, models: backwardCompatModels });
-  _warmPromise = Promise.resolve();
-  return { kind: "refreshed", modelCount: data.models.length };
-}
-async function warmCatalog() {
-  if (!_warmPromise) {
-    _warmPromise = refreshCatalog(8000).then(() => {
-      return;
-    });
-  }
-  await _warmPromise;
-}
-async function ensureCatalogReady(timeoutMs = 5000) {
-  if (isCatalogWarm())
-    return;
-  if (!_warmPromise) {
-    _warmPromise = refreshCatalog(8000).then(() => {
-      return;
-    });
-  }
-  await Promise.race([
-    _warmPromise,
-    new Promise((resolve2) => setTimeout(resolve2, timeoutMs))
-  ]);
-}
-var FIREBASE_CATALOG_URL, _memCache = null, _warmPromise = null;
-var init_catalog_client = __esm(() => {
-  init_all_models_cache();
-  FIREBASE_CATALOG_URL = process.env.CLAUDISH_CATALOG_URL ?? process.env.FIREBASE_CATALOG_URL ?? "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=active&catalog=slim&limit=1000";
-});
-
 // src/providers/provider-registry.ts
 function resolveBaseUrl2(envVar, fallbackEnvVars, staticDefault) {
   for (const v of [envVar, ...fallbackEnvVars]) {
@@ -42447,8 +42790,8 @@ var init_routing_rules = __esm(() => {
   init_authority();
   init_profile_config();
   init_auto_route();
-  init_default_routing_rules();
   init_catalog_client();
+  init_default_routing_rules();
   init_model_parser();
   init_model_parser();
   init_routing_hints();
@@ -42857,8 +43200,8 @@ var CATALOG_WARM_TIMEOUT_MS = 5000, parentRoutingContextReady = false;
 var init_prehydrate = __esm(() => {
   init_profile_config();
   init_auto_route();
-  init_custom_endpoints_loader();
   init_catalog_client();
+  init_custom_endpoints_loader();
   init_model_parser();
   init_onepassword();
   init_provider_resolver();
@@ -46237,8 +46580,8 @@ Be direct. Limit your response to 300-500 words.`, COLLECTOR_SYSTEM_PROMPT = `Yo
 Be concise. Do not attribute advice to specific models.`;
 var init_native_handler_advisor = __esm(() => {
   init_logger();
-  init_catalog_query();
   init_catalog_client();
+  init_catalog_query();
   init_model_parser();
   advisorToolUseIds = new Set;
 });
@@ -46989,56 +47332,44 @@ var init_api_key_provenance = __esm(() => {
   import_dotenv = __toESM(require_main(), 1);
 });
 
-// src/providers/devin/model-id-resolver.ts
-function parseDevinUidTier(uid) {
-  let base = uid.trim();
-  let fast = false;
-  if (base.toLowerCase().endsWith(FAST_SUFFIX)) {
-    fast = true;
-    base = base.slice(0, -FAST_SUFFIX.length);
-  }
-  const match2 = base.match(TIER_SUFFIX_RE);
-  const candidate = match2?.[1]?.toLowerCase();
-  return { tier: isEffortLevel(candidate) ? candidate : null, fast };
+// src/providers/model-resolvers/registry.ts
+function getModelResolver(provider) {
+  return BY_PROVIDER.get(provider);
+}
+function collapseRoster(provider, roster) {
+  const resolver = getModelResolver(provider);
+  if (resolver)
+    return resolver.collapse(roster);
+  return roster.map((entry) => ({
+    id: entry.wireId,
+    displayName: entry.displayName ?? entry.wireId,
+    contextWindow: entry.contextWindow,
+    variants: [{ wireId: entry.wireId, modifiers: [] }],
+    costFactor: entry.costFactor,
+    offer: entry.offer,
+    isRecommended: entry.isRecommended
+  }));
 }
-function effortIndex(level) {
-  return EFFORT_LEVELS.indexOf(level);
+function expandSelection(provider, selection, roster, ctx = {}) {
+  return getModelResolver(provider)?.expand(selection, roster, ctx) ?? selection;
 }
+var RESOLVERS, BY_PROVIDER;
+var init_registry2 = __esm(() => {
+  init_devin();
+  RESOLVERS = [new DevinModelResolver];
+  BY_PROVIDER = new Map(RESOLVERS.map((resolver) => [resolver.provider, resolver]));
+});
+
+// src/providers/devin/model-id-resolver.ts
 function resolveDevinModelUid(requested, effort, served) {
-  const req = requested.trim();
-  if (!req || served.length === 0)
-    return req || requested;
-  const lower = req.toLowerCase();
-  const exact = served.find((model) => model.uid.toLowerCase() === lower);
-  if (exact)
-    return exact.uid;
-  const prefix = `${lower}-`;
-  const candidates = served.filter((model) => model.family.toLowerCase() === lower || model.uid.toLowerCase().startsWith(prefix));
-  if (candidates.length === 0)
-    return req;
-  const nonFast = candidates.filter((model) => !parseDevinUidTier(model.uid).fast);
-  const pool = nonFast.length > 0 ? nonFast : candidates;
-  if (pool.length === 1)
-    return pool[0].uid;
-  const tiered = pool.map((model) => ({ model, tier: parseDevinUidTier(model.uid).tier })).filter((entry) => entry.tier !== null);
-  if (tiered.length === 0)
-    return pool[0].uid;
-  const target = effort ? effortIndex(effort) : EFFORT_LEVELS.length - 1;
-  let best = tiered[0];
-  let bestDistance = Number.POSITIVE_INFINITY;
-  for (const entry of tiered) {
-    const distance = Math.abs(effortIndex(entry.tier) - target);
-    if (distance < bestDistance || distance === bestDistance && effortIndex(entry.tier) > effortIndex(best.tier)) {
-      best = entry;
-      bestDistance = distance;
-    }
-  }
-  return best.model.uid;
+  const trimmed2 = requested.trim();
+  if (!trimmed2 || served.length === 0)
+    return trimmed2 || requested;
+  return expandSelection("devin", trimmed2, served.map(devinRosterEntry), { effort });
 }
-var FAST_SUFFIX = "-fast", TIER_SUFFIX_RE;
 var init_model_id_resolver = __esm(() => {
-  init_base_api_format();
-  TIER_SUFFIX_RE = new RegExp(`-(${[...EFFORT_LEVELS].sort((a, b) => b.length - a.length).join("|")})$`, "i");
+  init_devin();
+  init_registry2();
 });
 
 // src/providers/transport/devin.ts
@@ -47134,7 +47465,7 @@ class DevinProviderTransport {
   }
 }
 var CHAT_PATH = "/exa.api_server_pb.ApiServerService/GetChatMessage", CHAT_CONTENT_TYPE = "application/connect+proto";
-var init_devin = __esm(() => {
+var init_devin2 = __esm(() => {
   init_authority();
   init_devin_credential();
   init_logger();
@@ -47352,7 +47683,7 @@ var init_provider_profiles = __esm(() => {
   init_runtime_providers();
   init_anthropic_compat();
   init_antigravity();
-  init_devin();
+  init_devin2();
   init_gemini_apikey();
   init_litellm();
   init_ollamacloud();
@@ -48812,8 +49143,8 @@ var init_proxy_server = __esm(() => {
   init_model_loader();
   init_profile_config();
   init_api_key_map();
-  init_custom_endpoints_loader();
   init_catalog_client();
+  init_custom_endpoints_loader();
   init_model_parser();
   init_provider_profiles();
   init_provider_registry();
@@ -64574,28 +64905,52 @@ async function pickModelFromList(provider, displayName, tierName, models) {
   });
   return selected === CUSTOM_VALUE ? null : selected;
 }
+function describeOffer(offer) {
+  if (!offerIsLive(offer) || offer?.kind !== "promo")
+    return;
+  if (offer.expiresAt === undefined)
+    return "FREE";
+  const until = new Date(offer.expiresAt * 1000).toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric"
+  });
+  return `FREE until ${until}`;
+}
 async function buildDiscoveredModelRows(provider, displayName, catalog) {
   const discovered = rankDiscoveredModels(await discoverProviderModels(provider)).filter((m) => isChatCapable(m.id));
   if (discovered.length === 0)
     return [];
   const subscription = isSubscriptionProvider(provider);
-  const pricingById = subscription ? new Map : new Map((await loadModelsForPickerProvider(provider, catalog)).map((m) => [
+  const local = getProviderByName(provider)?.isLocal === true;
+  const flatRate = subscription || local;
+  const pricingById = flatRate ? new Map : new Map((await loadModelsForPickerProvider(provider, catalog)).map((m) => [
     m.id.toLowerCase(),
     m.pricing
   ]));
-  const rows = discovered.map((m) => {
-    const contextLength = resolveDiscoveredContextLength(m);
+  const choices = collapseRoster(provider, discovered.map(toRosterEntry));
+  const discoveredById = new Map(discovered.map((m) => [m.id, m]));
+  const rows = choices.map((c) => {
+    const source = discoveredById.get(c.id);
+    const contextLength = source ? resolveDiscoveredContextLength(source) : c.contextWindow ?? 0;
+    const parts = [c.displayName];
+    if (contextLength)
+      parts.push(`${Math.round(contextLength / 1024)}K context`);
+    if (subscription && c.costFactor !== undefined)
+      parts.push(`\xD7${c.costFactor}`);
+    const promo = describeOffer(c.offer);
+    if (promo)
+      parts.push(promo);
     return {
-      id: m.id,
-      name: m.displayName || m.id,
-      description: contextLength ? `${m.displayName ?? m.id} \xB7 ${Math.round(contextLength / 1024)}K context` : m.displayName ?? m.id,
+      id: c.id,
+      name: c.displayName,
+      description: parts.join(" \xB7 "),
       provider: displayName,
-      releaseDate: resolveDiscoveredReleaseDate(m),
-      pricing: subscription ? SUBSCRIPTION_PRICING : pricingById.get(m.id.toLowerCase()),
+      releaseDate: source ? resolveDiscoveredReleaseDate(source) : undefined,
+      pricing: subscription ? SUBSCRIPTION_PRICING : pricingById.get(c.id.toLowerCase()),
       context: formatContextLength(contextLength),
       contextLength,
-      supportsTools: lookupModelCapabilities(m.id)?.supportsTools ?? true,
-      isFree: subscription,
+      supportsTools: lookupModelCapabilities(c.id)?.supportsTools ?? source?.supportsTools ?? true,
+      isFree: flatRate,
       source: displayName
     };
   });
@@ -64613,23 +64968,6 @@ async function selectModelFromProvider(provider, tierName, recommendedModels, _f
         return picked;
     }
   }
-  if (provider === "ollama") {
-    const ollamaModels = await fetchOllamaModels({ enrichCapabilities: false });
-    const chatModels = sortModelsNewestFirst(ollamaModels.map((m) => ({
-      id: m.name,
-      name: m.name,
-      description: m.description,
-      provider: displayName,
-      supportsTools: m.supportsTools,
-      isFree: true,
-      source: displayName
-    })));
-    if (chatModels.length > 0) {
-      const picked = await pickModelFromList(provider, displayName, tierName, chatModels);
-      if (picked)
-        return picked;
-    }
-  }
   if (isUserDeployedProvider(provider)) {
     const modelName = await dist_default5({
       message: tierName === "interactive session" ? `Enter ${displayName} model name:` : `Enter ${displayName} model name for ${tierName}:`,
@@ -64793,6 +65131,7 @@ var init_model_selector = __esm(() => {
   init_model_loader();
   init_model_catalog2();
   init_model_discovery();
+  init_registry2();
   init_provider_definitions();
   init_probe_discovery();
   pickerProviderToFirebaseSlug = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.43.0",
+  "version": "7.44.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.43.0",
-    "@claudish/magmux-darwin-x64": "7.43.0",
-    "@claudish/magmux-linux-arm64": "7.43.0",
-    "@claudish/magmux-linux-x64": "7.43.0"
+    "@claudish/magmux-darwin-arm64": "7.44.0",
+    "@claudish/magmux-darwin-x64": "7.44.0",
+    "@claudish/magmux-linux-arm64": "7.44.0",
+    "@claudish/magmux-linux-x64": "7.44.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",