claudish 8.0.0 → 8.1.0

package/dist/index.js

@@ -731,7 +731,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "8.0.0";
+var VERSION = "8.1.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -27458,6 +27458,271 @@ var init_stdio2 = __esm(() => {
   init_stdio();
 });
 
+// src/providers/all-models-cache.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname4, join as join7 } from "path";
+function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
+  if (!existsSync5(path))
+    return null;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync5(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 ?? []
+  };
+  mkdirSync5(dirname4(path), { recursive: true });
+  writeFileSync5(path, JSON.stringify(merged), "utf-8");
+}
+var ALL_MODELS_CACHE_PATH;
+var init_all_models_cache = __esm(() => {
+  ALL_MODELS_CACHE_PATH = join7(homedir7(), ".claudish", "all-models.json");
+});
+
+// src/providers/model-ordering.ts
+function extractVersionParts(modelId) {
+  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
+  let started = false;
+  const parts = [];
+  for (const token of tokens) {
+    const match = token.match(/\d+(?:\.\d+)*/);
+    if (!match) {
+      if (started)
+        break;
+      continue;
+    }
+    if (!started && /^\d+b$/.test(token) && Number.parseInt(match[0], 10) > 10) {
+      continue;
+    }
+    if (!started) {
+      started = true;
+      for (const part of match[0].split(".")) {
+        parts.push(Number.parseInt(part, 10));
+      }
+      if (!/^\d+(?:\.\d+)*$/.test(token)) {
+        break;
+      }
+      continue;
+    }
+    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
+      break;
+    }
+    for (const part of token.split(".")) {
+      parts.push(Number.parseInt(part, 10));
+    }
+  }
+  return parts;
+}
+function compareVersionPartsDesc(a, b) {
+  const maxLength = Math.max(a.length, b.length);
+  for (let i = 0;i < maxLength; i++) {
+    const aPart = a[i] ?? -1;
+    const bPart = b[i] ?? -1;
+    if (aPart !== bPart) {
+      return bPart - aPart;
+    }
+  }
+  return 0;
+}
+function compareByReleaseDateDesc(a, b) {
+  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
+  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
+  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
+  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
+  if (aRelease !== bRelease) {
+    return bRelease - aRelease;
+  }
+  const aId = a.id ?? a.modelId ?? "";
+  const bId = b.id ?? b.modelId ?? "";
+  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
+  if (versionCompare !== 0) {
+    return versionCompare;
+  }
+  return aId.localeCompare(bId);
+}
+
+// src/adapters/model-catalog.ts
+function lookupModel(modelId, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry || entry.contextWindow === undefined)
+    return;
+  return {
+    modelId: entry.modelId,
+    contextWindow: entry.contextWindow,
+    supportsVision: entry.supportsVision,
+    releaseDate: entry.releaseDate
+  };
+}
+function lookupModelReasoning(modelId, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.reasoning;
+}
+function lookupModelTokenParam(modelId, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.tokenParam;
+}
+function lookupRouteReasoningMode(modelId, provider, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.aggregators?.find((aggregator) => aggregator.provider === provider)?.reasoning?.mode;
+}
+function lookupFamilyDefaultVariant(familyId, provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return;
+  for (const entry of cache.entries) {
+    const rv = entry.routeVariant;
+    if (!rv?.isDefault)
+      continue;
+    if (rv.provider !== provider)
+      continue;
+    if (rv.familyId === familyId || rv.baseModelId === familyId)
+      return entry.modelId;
+  }
+  return;
+}
+function lookupVariantPresets(baseModelId, provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return [];
+  const wanted = stripVendorPrefix(baseModelId.toLowerCase());
+  const found = [];
+  for (const entry of cache.entries) {
+    const rv = entry.routeVariant;
+    if (!rv?.preset || !rv.baseModelId)
+      continue;
+    if (stripVendorPrefix(rv.baseModelId.toLowerCase()) !== wanted)
+      continue;
+    if (provider !== undefined && rv.provider !== provider)
+      continue;
+    found.push({ modelId: entry.modelId, preset: rv.preset, provider: rv.provider });
+  }
+  return found;
+}
+function lookupModelCapabilities(modelId, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return;
+  return { supportsTools: entry.supportsTools, supportsThinking: entry.supportsThinking };
+}
+function lookupModelForProvider(modelId, provider, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return;
+  return entry.aggregators?.find((a) => a.provider === provider)?.contextWindow ?? entry.contextWindow;
+}
+function resolveSubscriptionRouting(modelId, provider, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return { kind: "unknown" };
+  if (entry.subscriptionPlans?.includes(provider)) {
+    const agg = entry.aggregators?.find((a) => a.provider === provider);
+    return agg?.externalId ? { kind: "serves", externalId: agg.externalId } : { kind: "unknown" };
+  }
+  return isSubscriptionPlan(provider, cachePath) ? { kind: "not-served" } : { kind: "unknown" };
+}
+function isSubscriptionPlan(provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return false;
+  return cache.entries.some((e) => e.subscriptionPlans?.includes(provider));
+}
+function stripVendorPrefix(lowerId) {
+  return lowerId.includes("/") ? lowerId.substring(lowerId.lastIndexOf("/") + 1) : lowerId;
+}
+function findCacheEntry(modelId, cachePath) {
+  if (modelId.includes("@")) {
+    throw new Error(`model-catalog lookup received provider-routed ID "${modelId}" \u2014 callers must strip the "@" prefix before calling`);
+  }
+  const cache = readAllModelsCache(cachePath);
+  if (!cache || cache.entries.length === 0)
+    return;
+  const lower = modelId.toLowerCase();
+  const unprefixed = stripVendorPrefix(lower);
+  for (const entry of cache.entries) {
+    const entryId = entry.modelId.toLowerCase();
+    const exactMatch = entryId === unprefixed || entryId === lower;
+    const aliasMatch = entry.aliases?.some((a) => a.toLowerCase() === unprefixed || a.toLowerCase() === lower);
+    if (exactMatch || aliasMatch) {
+      return entry;
+    }
+  }
+  return;
+}
+function classifyCatalogHit(entry, q) {
+  const id = entry.modelId.toLowerCase();
+  if (id === q || stripVendorPrefix(id) === q)
+    return { bucket: "exact" };
+  const aliases = entry.aliases ?? [];
+  const exactAlias = aliases.find((a) => a.toLowerCase() === q || stripVendorPrefix(a.toLowerCase()) === q);
+  if (exactAlias)
+    return { bucket: "exact", matchedAlias: exactAlias };
+  if (id.includes(q))
+    return { bucket: "id" };
+  const partialAlias = aliases.find((a) => a.toLowerCase().includes(q));
+  return partialAlias ? { bucket: "alias", matchedAlias: partialAlias } : undefined;
+}
+function searchCatalogModels(query, limit = 10, cachePath) {
+  const q = query.trim().toLowerCase();
+  if (!q)
+    return [];
+  const cache = readAllModelsCache(cachePath);
+  if (!cache || cache.entries.length === 0)
+    return [];
+  const exact = [];
+  const idPartial = [];
+  const aliasPartial = [];
+  for (const entry of cache.entries) {
+    const hit = classifyCatalogHit(entry, q);
+    if (!hit)
+      continue;
+    const ranked = {
+      entry,
+      match: {
+        modelId: entry.modelId,
+        aliases: entry.aliases ?? [],
+        subscriptionPlans: entry.subscriptionPlans ?? [],
+        ...hit.matchedAlias ? { matchedAlias: hit.matchedAlias } : {}
+      }
+    };
+    if (hit.bucket === "exact")
+      exact.push(ranked);
+    else if (hit.bucket === "id")
+      idPartial.push(ranked);
+    else
+      aliasPartial.push(ranked);
+  }
+  const byRelevance = (a, b) => {
+    const lengthDelta = a.entry.modelId.length - b.entry.modelId.length;
+    if (lengthDelta !== 0)
+      return lengthDelta;
+    return compareByReleaseDateDesc(a.entry, b.entry);
+  };
+  idPartial.sort(byRelevance);
+  aliasPartial.sort(byRelevance);
+  return [...exact, ...idPartial, ...aliasPartial].slice(0, limit).map((r) => r.match);
+}
+var init_model_catalog = __esm(() => {
+  init_all_models_cache();
+});
+
 // src/agent-availability.ts
 import { spawn } from "child_process";
 function parseAvailableAgents(output) {
@@ -27574,26 +27839,26 @@ __export(exports_profile_config, {
   setKeychainEnabled: () => setKeychainEnabled,
   setProfile: () => setProfile
 });
-import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir7 } from "os";
-import { dirname as dirname4, join as join7, parse as parse6 } from "path";
+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, parse as parse6 } from "path";
 function activeConfigFile() {
   return activeGlobalConfigFile(CONFIG_FILE);
 }
 function ensureConfigDir() {
-  if (!existsSync5(CONFIG_DIR)) {
-    mkdirSync5(CONFIG_DIR, { recursive: true });
+  if (!existsSync6(CONFIG_DIR)) {
+    mkdirSync6(CONFIG_DIR, { recursive: true });
   }
 }
 function loadConfig() {
   const activeFile = activeConfigFile();
   if (!getConfigFileOverride())
     ensureConfigDir();
-  if (!existsSync5(activeFile)) {
+  if (!existsSync6(activeFile)) {
     return { ...DEFAULT_CONFIG };
   }
   try {
-    const content = readFileSync5(activeFile, "utf-8");
+    const content = readFileSync6(activeFile, "utf-8");
     const config2 = JSON.parse(content);
     const merged = {
       version: config2.version || DEFAULT_CONFIG.version,
@@ -27663,39 +27928,39 @@ function loadConfig() {
 function saveConfig(config2) {
   if (!getConfigFileOverride())
     ensureConfigDir();
-  writeFileSync5(activeConfigFile(), JSON.stringify(config2, null, 2), "utf-8");
+  writeFileSync6(activeConfigFile(), JSON.stringify(config2, null, 2), "utf-8");
 }
 function configExists() {
-  return existsSync5(CONFIG_FILE);
+  return existsSync6(CONFIG_FILE);
 }
 function getConfigPath() {
   return CONFIG_FILE;
 }
 function getLocalConfigPath() {
-  const home = homedir7();
+  const home = homedir8();
   let dir = process.cwd();
   const root = parse6(dir).root;
   while (dir !== root && dir !== home) {
-    const candidate = join7(dir, LOCAL_CONFIG_FILENAME);
-    if (existsSync5(candidate))
+    const candidate = join8(dir, LOCAL_CONFIG_FILENAME);
+    if (existsSync6(candidate))
       return candidate;
-    if (existsSync5(join7(dir, ".git"))) {
+    if (existsSync6(join8(dir, ".git"))) {
       return candidate;
     }
-    dir = dirname4(dir);
+    dir = dirname5(dir);
   }
-  return join7(process.cwd(), LOCAL_CONFIG_FILENAME);
+  return join8(process.cwd(), LOCAL_CONFIG_FILENAME);
 }
 function localConfigExists() {
-  return existsSync5(getLocalConfigPath());
+  return existsSync6(getLocalConfigPath());
 }
 function readProOnUltracode(paths = defaultScopedConfigPaths) {
   for (const pathFn of [paths.project, paths.global]) {
     try {
       const path = pathFn();
-      if (!existsSync5(path))
+      if (!existsSync6(path))
         continue;
-      const parsed = JSON.parse(readFileSync5(path, "utf-8"));
+      const parsed = JSON.parse(readFileSync6(path, "utf-8"));
       if (typeof parsed?.proOnUltracode === "boolean")
         return parsed.proOnUltracode;
     } catch {}
@@ -27704,17 +27969,17 @@ function readProOnUltracode(paths = defaultScopedConfigPaths) {
 }
 function isProjectDirectory() {
   const cwd = process.cwd();
-  return [".git", "package.json", "Cargo.toml", "go.mod", "pyproject.toml", ".claudish.json"].some((f) => existsSync5(join7(cwd, f)));
+  return [".git", "package.json", "Cargo.toml", "go.mod", "pyproject.toml", ".claudish.json"].some((f) => existsSync6(join8(cwd, f)));
 }
 function loadLocalConfig() {
   if (getConfigFileOverride())
     return null;
   const localPath = getLocalConfigPath();
-  if (!existsSync5(localPath)) {
+  if (!existsSync6(localPath)) {
     return null;
   }
   try {
-    const content = readFileSync5(localPath, "utf-8");
+    const content = readFileSync6(localPath, "utf-8");
     const config2 = JSON.parse(content);
     return {
       ...config2,
@@ -27732,7 +27997,7 @@ function saveLocalConfig(config2) {
   if (toWrite.routing !== undefined && Object.keys(toWrite.routing).length === 0) {
     delete toWrite.routing;
   }
-  writeFileSync5(getLocalConfigPath(), JSON.stringify(toWrite, null, 2), "utf-8");
+  writeFileSync6(getLocalConfigPath(), JSON.stringify(toWrite, null, 2), "utf-8");
 }
 function loadConfigForScope(scope) {
   if (scope === "local") {
@@ -27987,8 +28252,8 @@ function disableLocalProvider(providerName) {
 }
 var CONFIG_DIR, CONFIG_FILE, LOCAL_CONFIG_FILENAME = ".claudish.json", DEFAULT_CONFIG, defaultScopedConfigPaths;
 var init_profile_config = __esm(() => {
-  CONFIG_DIR = join7(homedir7(), ".claudish");
-  CONFIG_FILE = join7(CONFIG_DIR, "config.json");
+  CONFIG_DIR = join8(homedir8(), ".claudish");
+  CONFIG_FILE = join8(CONFIG_DIR, "config.json");
   DEFAULT_CONFIG = {
     version: "1.0.0",
     defaultProfile: "default",
@@ -28095,153 +28360,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);
-  if (!entry || entry.contextWindow === undefined)
-    return;
-  return {
-    modelId: entry.modelId,
-    contextWindow: entry.contextWindow,
-    supportsVision: entry.supportsVision,
-    releaseDate: entry.releaseDate
-  };
-}
-function lookupModelReasoning(modelId, cachePath) {
-  return findCacheEntry(modelId, cachePath)?.reasoning;
-}
-function lookupModelTokenParam(modelId, cachePath) {
-  return findCacheEntry(modelId, cachePath)?.tokenParam;
-}
-function lookupFamilyDefaultVariant(familyId, provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return;
-  for (const entry of cache2.entries) {
-    const rv = entry.routeVariant;
-    if (!rv?.isDefault)
-      continue;
-    if (rv.provider !== provider)
-      continue;
-    if (rv.familyId === familyId || rv.baseModelId === familyId)
-      return entry.modelId;
-  }
-  return;
-}
-function lookupVariantPresets(baseModelId, provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return [];
-  const wanted = stripVendorPrefix(baseModelId.toLowerCase());
-  const found = [];
-  for (const entry of cache2.entries) {
-    const rv = entry.routeVariant;
-    if (!rv?.preset || !rv.baseModelId)
-      continue;
-    if (stripVendorPrefix(rv.baseModelId.toLowerCase()) !== wanted)
-      continue;
-    if (provider !== undefined && rv.provider !== provider)
-      continue;
-    found.push({ modelId: entry.modelId, preset: rv.preset, provider: rv.provider });
-  }
-  return found;
-}
-function lookupModelCapabilities(modelId, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return;
-  return { supportsTools: entry.supportsTools, supportsThinking: entry.supportsThinking };
-}
-function lookupModelForProvider(modelId, provider, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return;
-  return entry.aggregators?.find((a) => a.provider === provider)?.contextWindow ?? entry.contextWindow;
-}
-function resolveSubscriptionRouting(modelId, provider, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return { kind: "unknown" };
-  if (entry.subscriptionPlans?.includes(provider)) {
-    const agg = entry.aggregators?.find((a) => a.provider === provider);
-    return agg?.externalId ? { kind: "serves", externalId: agg.externalId } : { kind: "unknown" };
-  }
-  return isSubscriptionPlan(provider, cachePath) ? { kind: "not-served" } : { kind: "unknown" };
-}
-function isSubscriptionPlan(provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return false;
-  return cache2.entries.some((e) => e.subscriptionPlans?.includes(provider));
-}
-function stripVendorPrefix(lowerId) {
-  return lowerId.includes("/") ? lowerId.substring(lowerId.lastIndexOf("/") + 1) : lowerId;
-}
-function findCacheEntry(modelId, cachePath) {
-  if (modelId.includes("@")) {
-    throw new Error(`model-catalog lookup received provider-routed ID "${modelId}" \u2014 callers must strip the "@" prefix before calling`);
-  }
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2 || cache2.entries.length === 0)
-    return;
-  const lower = modelId.toLowerCase();
-  const unprefixed = stripVendorPrefix(lower);
-  for (const entry of cache2.entries) {
-    const entryId = entry.modelId.toLowerCase();
-    const exactMatch = entryId === unprefixed || entryId === lower;
-    const aliasMatch = entry.aliases?.some((a) => a.toLowerCase() === unprefixed || a.toLowerCase() === lower);
-    if (exactMatch || aliasMatch) {
-      return entry;
-    }
-  }
-  return;
-}
-var init_model_catalog = __esm(() => {
-  init_all_models_cache();
-});
-
 // src/adapters/tool-name-utils.ts
 function hashToolName(name) {
   let h1 = 3735928559;
@@ -39642,6 +39760,18 @@ var init_session_events = __esm(() => {
 
 // src/session-events/pro-injection.ts
 function resolveVariantPreset(bareModelName, provider, cachePath) {
+  const routeMode = lookupRouteReasoningMode(bareModelName, provider, cachePath);
+  if (routeMode) {
+    if (routeMode.status !== "supported" || !routeMode.values.includes("pro")) {
+      return;
+    }
+    return {
+      params: { reasoning: { mode: "pro" } },
+      provider,
+      preset: "reasoning.mode=pro",
+      sourceLabel: `route capability @ ${provider}`
+    };
+  }
   for (const variant of lookupVariantPresets(bareModelName, provider, cachePath)) {
     try {
       const params = parseModelParams(variant.preset);
@@ -39649,9 +39779,9 @@ function resolveVariantPreset(bareModelName, provider, cachePath) {
         continue;
       return {
         params,
-        variantModelId: variant.modelId,
         provider: variant.provider,
-        preset: variant.preset
+        preset: variant.preset,
+        sourceLabel: `variant ${variant.modelId} @ ${variant.provider}`
       };
     } catch {}
   }
@@ -39675,7 +39805,7 @@ function applyProInjection(requestPayload, opts) {
     if (!resolved)
       return false;
     deepMergeParams(requestPayload, resolved.params);
-    log(`[SessionEvents] ultracode active \u2192 preset ${resolved.preset} for ${opts.targetModel} ` + `(catalog variant ${resolved.variantModelId} @ ${resolved.provider}, session ${opts.sessionId})`);
+    log(`[SessionEvents] ultracode active \u2192 preset ${resolved.preset} for ${opts.targetModel} ` + `(catalog ${resolved.sourceLabel}, session ${opts.sessionId})`);
     return true;
   } catch {
     return false;
@@ -51266,68 +51396,6 @@ var init_cache_ttl = __esm(() => {
   FIREBASE_CACHE_TTL_MS = FIREBASE_CACHE_TTL_HOURS * 60 * 60 * 1000;
 });
 
-// src/providers/model-ordering.ts
-function extractVersionParts(modelId) {
-  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
-  let started = false;
-  const parts = [];
-  for (const token of tokens) {
-    const match = token.match(/\d+(?:\.\d+)*/);
-    if (!match) {
-      if (started)
-        break;
-      continue;
-    }
-    if (!started && /^\d+b$/.test(token) && Number.parseInt(match[0], 10) > 10) {
-      continue;
-    }
-    if (!started) {
-      started = true;
-      for (const part of match[0].split(".")) {
-        parts.push(Number.parseInt(part, 10));
-      }
-      if (!/^\d+(?:\.\d+)*$/.test(token)) {
-        break;
-      }
-      continue;
-    }
-    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
-      break;
-    }
-    for (const part of token.split(".")) {
-      parts.push(Number.parseInt(part, 10));
-    }
-  }
-  return parts;
-}
-function compareVersionPartsDesc(a, b) {
-  const maxLength = Math.max(a.length, b.length);
-  for (let i = 0;i < maxLength; i++) {
-    const aPart = a[i] ?? -1;
-    const bPart = b[i] ?? -1;
-    if (aPart !== bPart) {
-      return bPart - aPart;
-    }
-  }
-  return 0;
-}
-function compareByReleaseDateDesc(a, b) {
-  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
-  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
-  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
-  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
-  if (aRelease !== bRelease) {
-    return bRelease - aRelease;
-  }
-  const aId = a.id ?? a.modelId ?? "";
-  const bId = b.id ?? b.modelId ?? "";
-  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
-  if (versionCompare !== 0) {
-    return versionCompare;
-  }
-  return aId.localeCompare(bId);
-}
-
 // src/model-loader.ts
 import { existsSync as existsSync21, mkdirSync as mkdirSync13, readFileSync as readFileSync21, writeFileSync as writeFileSync13 } from "fs";
 import { homedir as homedir29 } from "os";
@@ -56488,7 +56556,7 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
   });
   tools.push({
     name: "search_models",
-    description: "Search all OpenRouter models by name, provider, or capability",
+    description: "Search OpenRouter's listing by name, provider, or capability, and cross-reference " + "claudish's own catalog. SCOPE: the listing covers OpenRouter only, so a name's " + "absence from it is NOT evidence the name is unroutable \u2014 subscription wire ids " + "(`k3`) and catalog aliases live outside that namespace and are reported separately " + "here. This tool cannot tell you which provider will serve a model or whether the " + "hop is subscription or metered; call `preflight` for that.",
     inputSchema: {
       type: "object",
       properties: {
@@ -56523,13 +56591,40 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           return b.score - a.score;
         return compareByReleaseDateDesc(orderingKey(a.model), orderingKey(b.model));
       }).slice(0, maxResults);
+      const catalogMatches = searchCatalogModels(query, Math.max(maxResults, 5));
+      const renderCatalogSection = () => {
+        if (catalogMatches.length === 0)
+          return "";
+        let s = `
+## Catalog names (what claudish routes)
+
+`;
+        s += `| Bare name | Matched alias | Subscription plan |
+`;
+        s += `|-----------|---------------|-------------------|
+`;
+        for (const m of catalogMatches) {
+          const plans = m.subscriptionPlans.length > 0 ? m.subscriptionPlans.join(", ") : "-";
+          s += `| ${m.modelId} | ${m.matchedAlias ?? "-"} | ${plans} |
+`;
+        }
+        s += `
+Pass the **bare name**. Routing puts a subscription ahead of the metered API and ` + "rewrites the model to that plan's wire id for you. An aggregator-qualified id " + "(`moonshotai/...`, `accounts/fireworks/...`) pins that aggregator and bills per token.\n";
+        return s;
+      };
       if (results.length === 0) {
-        return {
-          content: [{ type: "text", text: `No models found matching "${query}"` }]
-        };
+        const catalog = renderCatalogSection();
+        const text = catalog ? `No OpenRouter listing matches "${query}", but claudish's catalog knows these:
+${catalog}` : `No models found matching "${query}".
+
+` + "This searched OpenRouter's listing only. Subscription wire ids and catalog " + "aliases are not in it, so this is not proof the name is unroutable. Call " + "`list_models` for the recommended set, or `preflight` to test a specific name " + "against real routing.";
+        return { content: [{ type: "text", text }] };
       }
       let output = `# Search Results for "${query}"
 
+`;
+      output += `## OpenRouter listing
+
 `;
       output += `| Model | Provider | Pricing | Context |
 `;
@@ -56545,8 +56640,13 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
         output += `| ${model.id} | ${provider} | ${pricing} | ${context} |
 `;
       }
+      output += renderCatalogSection();
+      const suggested = catalogMatches[0]?.modelId ?? results[0].model.id;
       output += `
-Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
+Use with: run_prompt(model="${suggested}", prompt="your prompt")`;
+      output += `
+
+To learn which provider would actually serve \`${suggested}\`, and whether that ` + "hop is covered by a subscription or billed per token, call " + `\`preflight({models: ["${suggested}"]})\`. This listing cannot answer that.`;
       return { content: [{ type: "text", text: output }] };
     }
   });
@@ -57450,6 +57550,7 @@ var init_mcp_server = __esm(() => {
   init_server2();
   init_stdio2();
   init_types();
+  init_model_catalog();
   init_agent_availability();
   init_prehydrate();
   init_diagnostics();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "8.0.0",
+  "version": "8.1.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": "8.0.0",
-    "@claudish/magmux-darwin-x64": "8.0.0",
-    "@claudish/magmux-linux-arm64": "8.0.0",
-    "@claudish/magmux-linux-x64": "8.0.0"
+    "@claudish/magmux-darwin-arm64": "8.1.0",
+    "@claudish/magmux-darwin-x64": "8.1.0",
+    "@claudish/magmux-linux-arm64": "8.1.0",
+    "@claudish/magmux-linux-x64": "8.1.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",