claudish 5.5.2 → 5.6.0

package/dist/index.js

@@ -29650,18 +29650,228 @@ var init_oauth_registry = __esm(() => {
   };
 });
 
-// src/providers/auto-route.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "node:fs";
+// src/providers/catalog-resolvers/static-fallback.ts
+function staticOpenRouterFallback(userInput) {
+  if (userInput.includes("/"))
+    return userInput;
+  const lower = userInput.toLowerCase();
+  for (const [key, vendor] of Object.entries(OPENROUTER_VENDOR_MAP)) {
+    if (lower.startsWith(key)) {
+      return `${vendor}/${userInput}`;
+    }
+  }
+  return null;
+}
+var OPENROUTER_VENDOR_MAP;
+var init_static_fallback = __esm(() => {
+  OPENROUTER_VENDOR_MAP = {
+    google: "google",
+    openai: "openai",
+    kimi: "moonshotai",
+    "kimi-coding": "moonshotai",
+    glm: "z-ai",
+    "glm-coding": "z-ai",
+    zai: "z-ai",
+    minimax: "minimax",
+    ollamacloud: "meta-llama",
+    qwen: "qwen"
+  };
+});
+
+// src/providers/catalog-resolvers/openrouter.ts
+import { readFileSync as readFileSync7, existsSync as existsSync8 } from "node:fs";
 import { join as join8 } from "node:path";
 import { homedir as homedir7 } from "node:os";
+
+class OpenRouterCatalogResolver {
+  provider = "openrouter";
+  resolveSync(userInput) {
+    if (userInput.includes("/")) {
+      const models2 = this._getModels();
+      if (models2) {
+        const exactMatch = models2.find((m) => m.id === userInput);
+        return exactMatch ? exactMatch.id : userInput;
+      }
+      return userInput;
+    }
+    const models = this._getModels();
+    if (models) {
+      const suffix = `/${userInput}`;
+      const match = models.find((m) => m.id.endsWith(suffix));
+      if (match)
+        return match.id;
+      const lowerSuffix = `/${userInput.toLowerCase()}`;
+      const ciMatch = models.find((m) => m.id.toLowerCase().endsWith(lowerSuffix));
+      if (ciMatch)
+        return ciMatch.id;
+    }
+    return staticOpenRouterFallback(userInput);
+  }
+  async warmCache() {
+    try {
+      const existing = getCachedOpenRouterModels();
+      if (existing && existing.length > 0) {
+        _memCache = existing;
+        return;
+      }
+      const models = await ensureOpenRouterModelsLoaded();
+      if (models.length > 0) {
+        _memCache = models;
+      }
+    } catch {}
+  }
+  isCacheWarm() {
+    return _memCache !== null && _memCache.length > 0;
+  }
+  _getModels() {
+    if (_memCache)
+      return _memCache;
+    const diskPath = join8(homedir7(), ".claudish", "all-models.json");
+    if (existsSync8(diskPath)) {
+      try {
+        const data = JSON.parse(readFileSync7(diskPath, "utf-8"));
+        if (Array.isArray(data.models) && data.models.length > 0) {
+          _memCache = data.models;
+          return _memCache;
+        }
+      } catch {}
+    }
+    return null;
+  }
+}
+var _memCache = null;
+var init_openrouter = __esm(() => {
+  init_model_loader();
+  init_static_fallback();
+});
+
+// src/providers/catalog-resolvers/litellm.ts
+import { readFileSync as readFileSync8, existsSync as existsSync9 } from "node:fs";
+import { join as join9 } from "node:path";
+import { homedir as homedir8 } from "node:os";
 import { createHash as createHash3 } from "node:crypto";
-function readLiteLLMCacheSync(baseUrl) {
+function getCachePath() {
+  const baseUrl = process.env.LITELLM_BASE_URL;
+  if (!baseUrl)
+    return null;
   const hash2 = createHash3("sha256").update(baseUrl).digest("hex").substring(0, 16);
-  const cachePath = join8(homedir7(), ".claudish", `litellm-models-${hash2}.json`);
-  if (!existsSync8(cachePath))
+  return join9(homedir8(), ".claudish", `litellm-models-${hash2}.json`);
+}
+
+class LiteLLMCatalogResolver {
+  provider = "litellm";
+  resolveSync(userInput) {
+    const ids = this._getModelIds();
+    if (!ids || ids.length === 0)
+      return null;
+    if (ids.includes(userInput))
+      return userInput;
+    const prefixMatch = ids.find((id) => {
+      if (!id.includes("/"))
+        return false;
+      const afterSlash = id.split("/").pop();
+      return afterSlash === userInput;
+    });
+    if (prefixMatch)
+      return prefixMatch;
+    if (userInput.includes("/")) {
+      const bare = userInput.split("/").pop();
+      if (ids.includes(bare))
+        return bare;
+    }
+    return null;
+  }
+  async warmCache() {
+    const path = getCachePath();
+    if (!path || !existsSync9(path))
+      return;
+    try {
+      const data = JSON.parse(readFileSync8(path, "utf-8"));
+      if (Array.isArray(data.models)) {
+        _memCache2 = data.models.map((m) => m.name ?? m.id?.replace("litellm@", "") ?? "");
+      }
+    } catch {}
+  }
+  isCacheWarm() {
+    return _memCache2 !== null && _memCache2.length > 0;
+  }
+  _getModelIds() {
+    if (_memCache2)
+      return _memCache2;
+    const path = getCachePath();
+    if (!path || !existsSync9(path))
+      return null;
+    try {
+      const data = JSON.parse(readFileSync8(path, "utf-8"));
+      if (Array.isArray(data.models)) {
+        _memCache2 = data.models.map((m) => m.name ?? m.id?.replace("litellm@", "") ?? "");
+        return _memCache2;
+      }
+    } catch {}
+    return null;
+  }
+}
+var _memCache2 = null;
+var init_litellm = () => {};
+
+// src/providers/model-catalog-resolver.ts
+function registerResolver(resolver) {
+  RESOLVER_REGISTRY.set(resolver.provider, resolver);
+}
+function getResolver(provider) {
+  return RESOLVER_REGISTRY.get(provider) ?? null;
+}
+function resolveModelNameSync(userInput, targetProvider) {
+  if (targetProvider !== "openrouter" && userInput.includes("/")) {
+    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
+  }
+  const resolver = getResolver(targetProvider);
+  if (!resolver) {
+    return { resolvedId: userInput, wasResolved: false, sourceLabel: "passthrough" };
+  }
+  const resolved = resolver.resolveSync(userInput);
+  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}" → "${result.resolvedId}" (${result.sourceLabel})
+`);
+  }
+}
+async function warmAllCatalogs(providers) {
+  const targets = providers ? [...RESOLVER_REGISTRY.entries()].filter(([k]) => providers.includes(k)) : [...RESOLVER_REGISTRY.entries()];
+  await Promise.allSettled(targets.map(([, r]) => r.warmCache()));
+}
+var RESOLVER_REGISTRY;
+var init_model_catalog_resolver = __esm(() => {
+  init_openrouter();
+  init_litellm();
+  RESOLVER_REGISTRY = new Map;
+  [
+    new OpenRouterCatalogResolver,
+    new LiteLLMCatalogResolver
+  ].forEach(registerResolver);
+});
+
+// src/providers/auto-route.ts
+import { existsSync as existsSync10, readFileSync as readFileSync9 } from "node:fs";
+import { join as join10 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { createHash as createHash4 } from "node:crypto";
+function readLiteLLMCacheSync(baseUrl) {
+  const hash2 = createHash4("sha256").update(baseUrl).digest("hex").substring(0, 16);
+  const cachePath = join10(homedir9(), ".claudish", `litellm-models-${hash2}.json`);
+  if (!existsSync10(cachePath))
     return null;
   try {
-    const data = JSON.parse(readFileSync7(cachePath, "utf-8"));
+    const data = JSON.parse(readFileSync9(cachePath, "utf-8"));
     if (!Array.isArray(data.models))
       return null;
     return data.models;
@@ -29708,16 +29918,6 @@ function checkApiKeyForProvider(nativeProvider, modelName) {
   }
   return null;
 }
-function formatForOpenRouter(modelName, nativeProvider) {
-  if (modelName.includes("/")) {
-    return modelName;
-  }
-  const vendor = OPENROUTER_VENDOR_MAP[nativeProvider];
-  if (vendor) {
-    return `${vendor}/${modelName}`;
-  }
-  return modelName;
-}
 function getAutoRouteHint(modelName, nativeProvider) {
   const hint = PROVIDER_HINT_MAP[nativeProvider];
   const lines = [
@@ -29771,7 +29971,8 @@ function autoRoute(modelName, nativeProvider) {
       return apiKeyResult;
   }
   if (process.env.OPENROUTER_API_KEY) {
-    const orModelId = formatForOpenRouter(modelName, nativeProvider);
+    const resolution = resolveModelNameSync(modelName, "openrouter");
+    const orModelId = resolution.resolvedId;
     return {
       provider: "openrouter",
       resolvedModelId: orModelId,
@@ -29782,9 +29983,10 @@ function autoRoute(modelName, nativeProvider) {
   }
   return null;
 }
-var API_KEY_ENV_VARS, OPENROUTER_VENDOR_MAP, PROVIDER_HINT_MAP;
+var API_KEY_ENV_VARS, PROVIDER_HINT_MAP;
 var init_auto_route = __esm(() => {
   init_oauth_registry();
+  init_model_catalog_resolver();
   API_KEY_ENV_VARS = {
     google: { envVar: "GEMINI_API_KEY" },
     "gemini-codeassist": { envVar: "GEMINI_API_KEY" },
@@ -29802,18 +30004,6 @@ var init_auto_route = __esm(() => {
     vertex: { envVar: "VERTEX_API_KEY", aliases: ["VERTEX_PROJECT"] },
     poe: { envVar: "POE_API_KEY" }
   };
-  OPENROUTER_VENDOR_MAP = {
-    google: "google",
-    openai: "openai",
-    kimi: "moonshotai",
-    "kimi-coding": "moonshotai",
-    glm: "z-ai",
-    "glm-coding": "z-ai",
-    zai: "z-ai",
-    minimax: "minimax",
-    ollamacloud: "meta-llama",
-    qwen: "qwen"
-  };
   PROVIDER_HINT_MAP = {
     "kimi-coding": {
       loginFlag: "--kimi-login",
@@ -29870,9 +30060,9 @@ __export(exports_provider_resolver, {
   getMissingKeyResolutions: () => getMissingKeyResolutions,
   getMissingKeyError: () => getMissingKeyError
 });
-import { existsSync as existsSync9 } from "node:fs";
-import { join as join9 } from "node:path";
-import { homedir as homedir8 } from "node:os";
+import { existsSync as existsSync11 } from "node:fs";
+import { join as join11 } from "node:path";
+import { homedir as homedir10 } from "node:os";
 function isApiKeyAvailable(info) {
   if (!info.envVar) {
     return true;
@@ -29889,8 +30079,8 @@ function isApiKeyAvailable(info) {
   }
   if (info.oauthFallback) {
     try {
-      const credPath = join9(homedir8(), ".claudish", info.oauthFallback);
-      if (existsSync9(credPath)) {
+      const credPath = join11(homedir10(), ".claudish", info.oauthFallback);
+      if (existsSync11(credPath)) {
         return true;
       }
     } catch {}
@@ -30287,16 +30477,16 @@ __export(exports_cli, {
   getMissingKeyResolutions: () => getMissingKeyResolutions,
   getMissingKeyError: () => getMissingKeyError
 });
-import { readFileSync as readFileSync8, writeFileSync as writeFileSync5, existsSync as existsSync10, mkdirSync as mkdirSync5, copyFileSync, readdirSync, unlinkSync as unlinkSync3 } from "node:fs";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync5, existsSync as existsSync12, mkdirSync as mkdirSync5, copyFileSync, readdirSync, unlinkSync as unlinkSync3 } from "node:fs";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { dirname as dirname3, join as join10 } from "node:path";
-import { homedir as homedir9 } from "node:os";
+import { dirname as dirname3, join as join12 } from "node:path";
+import { homedir as homedir11 } from "node:os";
 function getVersion() {
   return VERSION;
 }
 function clearAllModelCaches() {
-  const cacheDir = join10(homedir9(), ".claudish");
-  if (!existsSync10(cacheDir))
+  const cacheDir = join12(homedir11(), ".claudish");
+  if (!existsSync12(cacheDir))
     return;
   const cachePatterns = ["all-models.json", "pricing-cache.json"];
   let cleared = 0;
@@ -30304,7 +30494,7 @@ function clearAllModelCaches() {
     const files = readdirSync(cacheDir);
     for (const file2 of files) {
       if (cachePatterns.includes(file2) || file2.startsWith("litellm-models-")) {
-        unlinkSync3(join10(cacheDir, file2));
+        unlinkSync3(join12(cacheDir, file2));
         cleared++;
       }
     }
@@ -30580,9 +30770,9 @@ async function fetchOllamaModels() {
 }
 async function searchAndPrintModels(query, forceUpdate) {
   let models = [];
-  if (!forceUpdate && existsSync10(ALL_MODELS_JSON_PATH)) {
+  if (!forceUpdate && existsSync12(ALL_MODELS_JSON_PATH)) {
     try {
-      const cacheData = JSON.parse(readFileSync8(ALL_MODELS_JSON_PATH, "utf-8"));
+      const cacheData = JSON.parse(readFileSync10(ALL_MODELS_JSON_PATH, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
       const now = new Date;
       const ageInDays = (now.getTime() - lastUpdated.getTime()) / (1000 * 60 * 60 * 24);
@@ -30750,9 +30940,9 @@ Found ${results.length} matching models:
 async function printAllModels(jsonOutput, forceUpdate) {
   let models = [];
   const [ollamaModels, zenModels] = await Promise.all([fetchOllamaModels(), fetchZenModels()]);
-  if (!forceUpdate && existsSync10(ALL_MODELS_JSON_PATH)) {
+  if (!forceUpdate && existsSync12(ALL_MODELS_JSON_PATH)) {
     try {
-      const cacheData = JSON.parse(readFileSync8(ALL_MODELS_JSON_PATH, "utf-8"));
+      const cacheData = JSON.parse(readFileSync10(ALL_MODELS_JSON_PATH, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
       const now = new Date;
       const ageInDays = (now.getTime() - lastUpdated.getTime()) / (1000 * 60 * 60 * 24);
@@ -30953,11 +31143,11 @@ async function printAllModels(jsonOutput, forceUpdate) {
   console.log("Top models:            claudish --top-models");
 }
 function isCacheStale() {
-  if (!existsSync10(MODELS_JSON_PATH)) {
+  if (!existsSync12(MODELS_JSON_PATH)) {
     return true;
   }
   try {
-    const jsonContent = readFileSync8(MODELS_JSON_PATH, "utf-8");
+    const jsonContent = readFileSync10(MODELS_JSON_PATH, "utf-8");
     const data = JSON.parse(jsonContent);
     if (!data.lastUpdated) {
       return true;
@@ -31052,9 +31242,9 @@ async function updateModelsFromOpenRouter() {
       providers.add(provider);
     }
     let version2 = "1.1.5";
-    if (existsSync10(MODELS_JSON_PATH)) {
+    if (existsSync12(MODELS_JSON_PATH)) {
       try {
-        const existing = JSON.parse(readFileSync8(MODELS_JSON_PATH, "utf-8"));
+        const existing = JSON.parse(readFileSync10(MODELS_JSON_PATH, "utf-8"));
         version2 = existing.version || version2;
       } catch {}
     }
@@ -31082,7 +31272,7 @@ async function checkAndUpdateModelsCache(forceUpdate = false) {
     await updateModelsFromOpenRouter();
   } else {
     try {
-      const data = JSON.parse(readFileSync8(MODELS_JSON_PATH, "utf-8"));
+      const data = JSON.parse(readFileSync10(MODELS_JSON_PATH, "utf-8"));
       console.error(`✓ Using cached models (last updated: ${data.lastUpdated})`);
     } catch {}
   }
@@ -31399,8 +31589,8 @@ MORE INFO:
 }
 function printAIAgentGuide() {
   try {
-    const guidePath = join10(__dirname4, "../AI_AGENT_GUIDE.md");
-    const guideContent = readFileSync8(guidePath, "utf-8");
+    const guidePath = join12(__dirname4, "../AI_AGENT_GUIDE.md");
+    const guideContent = readFileSync10(guidePath, "utf-8");
     console.log(guideContent);
   } catch (error46) {
     console.error("Error reading AI Agent Guide:");
@@ -31416,19 +31606,19 @@ async function initializeClaudishSkill() {
   console.log(`\uD83D\uDD27 Initializing Claudish skill in current project...
 `);
   const cwd = process.cwd();
-  const claudeDir = join10(cwd, ".claude");
-  const skillsDir = join10(claudeDir, "skills");
-  const claudishSkillDir = join10(skillsDir, "claudish-usage");
-  const skillFile = join10(claudishSkillDir, "SKILL.md");
-  if (existsSync10(skillFile)) {
+  const claudeDir = join12(cwd, ".claude");
+  const skillsDir = join12(claudeDir, "skills");
+  const claudishSkillDir = join12(skillsDir, "claudish-usage");
+  const skillFile = join12(claudishSkillDir, "SKILL.md");
+  if (existsSync12(skillFile)) {
     console.log("✅ Claudish skill already installed at:");
     console.log(`   ${skillFile}
 `);
     console.log("\uD83D\uDCA1 To reinstall, delete the file and run 'claudish --init' again.");
     return;
   }
-  const sourceSkillPath = join10(__dirname4, "../skills/claudish-usage/SKILL.md");
-  if (!existsSync10(sourceSkillPath)) {
+  const sourceSkillPath = join12(__dirname4, "../skills/claudish-usage/SKILL.md");
+  if (!existsSync12(sourceSkillPath)) {
     console.error("❌ Error: Claudish skill file not found in installation.");
     console.error(`   Expected at: ${sourceSkillPath}`);
     console.error(`
@@ -31437,15 +31627,15 @@ async function initializeClaudishSkill() {
     process.exit(1);
   }
   try {
-    if (!existsSync10(claudeDir)) {
+    if (!existsSync12(claudeDir)) {
       mkdirSync5(claudeDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/ directory");
     }
-    if (!existsSync10(skillsDir)) {
+    if (!existsSync12(skillsDir)) {
       mkdirSync5(skillsDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/ directory");
     }
-    if (!existsSync10(claudishSkillDir)) {
+    if (!existsSync12(claudishSkillDir)) {
       mkdirSync5(claudishSkillDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/claudish-usage/ directory");
     }
@@ -31488,8 +31678,8 @@ function printAvailableModels() {
   let lastUpdated = "unknown";
   let models = [];
   try {
-    if (existsSync10(MODELS_JSON_PATH)) {
-      const data = JSON.parse(readFileSync8(MODELS_JSON_PATH, "utf-8"));
+    if (existsSync12(MODELS_JSON_PATH)) {
+      const data = JSON.parse(readFileSync10(MODELS_JSON_PATH, "utf-8"));
       lastUpdated = data.lastUpdated || "unknown";
       models = data.models || [];
     }
@@ -31538,9 +31728,9 @@ Force update: claudish --list-models --force-update
 `);
 }
 function printAvailableModelsJSON() {
-  const jsonPath = join10(__dirname4, "../recommended-models.json");
+  const jsonPath = join12(__dirname4, "../recommended-models.json");
   try {
-    const jsonContent = readFileSync8(jsonPath, "utf-8");
+    const jsonContent = readFileSync10(jsonPath, "utf-8");
     const data = JSON.parse(jsonContent);
     console.log(JSON.stringify(data, null, 2));
   } catch (error46) {
@@ -31625,7 +31815,7 @@ async function fetchGLMCodingModels() {
     return [];
   }
 }
-var __filename4, __dirname4, VERSION = "5.5.2", CACHE_MAX_AGE_DAYS2 = 2, MODELS_JSON_PATH, CLAUDISH_CACHE_DIR2, ALL_MODELS_JSON_PATH;
+var __filename4, __dirname4, VERSION = "5.6.0", CACHE_MAX_AGE_DAYS2 = 2, MODELS_JSON_PATH, CLAUDISH_CACHE_DIR2, ALL_MODELS_JSON_PATH;
 var init_cli = __esm(() => {
   init_config();
   init_model_loader();
@@ -31634,12 +31824,12 @@ var init_cli = __esm(() => {
   __filename4 = fileURLToPath3(import.meta.url);
   __dirname4 = dirname3(__filename4);
   try {
-    const packageJson = JSON.parse(readFileSync8(join10(__dirname4, "../package.json"), "utf-8"));
+    const packageJson = JSON.parse(readFileSync10(join12(__dirname4, "../package.json"), "utf-8"));
     VERSION = packageJson.version;
   } catch {}
-  MODELS_JSON_PATH = join10(__dirname4, "../recommended-models.json");
-  CLAUDISH_CACHE_DIR2 = join10(homedir9(), ".claudish");
-  ALL_MODELS_JSON_PATH = join10(CLAUDISH_CACHE_DIR2, "all-models.json");
+  MODELS_JSON_PATH = join12(__dirname4, "../recommended-models.json");
+  CLAUDISH_CACHE_DIR2 = join12(homedir11(), ".claudish");
+  ALL_MODELS_JSON_PATH = join12(CLAUDISH_CACHE_DIR2, "all-models.json");
 });
 
 // src/update-checker.ts
@@ -31651,9 +31841,9 @@ __export(exports_update_checker, {
   checkForUpdates: () => checkForUpdates
 });
 import { execSync } from "node:child_process";
-import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync9, unlinkSync as unlinkSync4, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir10, platform as platform2, tmpdir } from "node:os";
-import { join as join11 } from "node:path";
+import { existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync11, unlinkSync as unlinkSync4, writeFileSync as writeFileSync6 } from "node:fs";
+import { homedir as homedir12, platform as platform2, tmpdir } from "node:os";
+import { join as join13 } from "node:path";
 import { createInterface } from "node:readline";
 function getUpdateCommand() {
   const scriptPath = process.argv[1] || "";
@@ -31665,27 +31855,27 @@ function getUpdateCommand() {
 function getCacheFilePath() {
   let cacheDir;
   if (isWindows) {
-    const localAppData = process.env.LOCALAPPDATA || join11(homedir10(), "AppData", "Local");
-    cacheDir = join11(localAppData, "claudish");
+    const localAppData = process.env.LOCALAPPDATA || join13(homedir12(), "AppData", "Local");
+    cacheDir = join13(localAppData, "claudish");
   } else {
-    cacheDir = join11(homedir10(), ".cache", "claudish");
+    cacheDir = join13(homedir12(), ".cache", "claudish");
   }
   try {
-    if (!existsSync11(cacheDir)) {
+    if (!existsSync13(cacheDir)) {
       mkdirSync6(cacheDir, { recursive: true });
     }
-    return join11(cacheDir, "update-check.json");
+    return join13(cacheDir, "update-check.json");
   } catch {
-    return join11(tmpdir(), "claudish-update-check.json");
+    return join13(tmpdir(), "claudish-update-check.json");
   }
 }
 function readCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (!existsSync11(cachePath)) {
+    if (!existsSync13(cachePath)) {
       return null;
     }
-    const data = JSON.parse(readFileSync9(cachePath, "utf-8"));
+    const data = JSON.parse(readFileSync11(cachePath, "utf-8"));
     return data;
   } catch {
     return null;
@@ -31708,7 +31898,7 @@ function isCacheValid(cache) {
 function clearCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (existsSync11(cachePath)) {
+    if (existsSync13(cachePath)) {
       unlinkSync4(cachePath);
     }
   } catch {}
@@ -34198,14 +34388,14 @@ __export(exports_model_selector, {
   promptForApiKey: () => promptForApiKey,
   confirmAction: () => confirmAction
 });
-import { readFileSync as readFileSync10, writeFileSync as writeFileSync7, existsSync as existsSync12, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join12, dirname as dirname4 } from "node:path";
-import { homedir as homedir11 } from "node:os";
+import { readFileSync as readFileSync12, writeFileSync as writeFileSync7, existsSync as existsSync14, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join14, dirname as dirname4 } from "node:path";
+import { homedir as homedir13 } from "node:os";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function loadRecommendedModels2() {
-  if (existsSync12(RECOMMENDED_MODELS_JSON_PATH)) {
+  if (existsSync14(RECOMMENDED_MODELS_JSON_PATH)) {
     try {
-      const content = readFileSync10(RECOMMENDED_MODELS_JSON_PATH, "utf-8");
+      const content = readFileSync12(RECOMMENDED_MODELS_JSON_PATH, "utf-8");
       const data = JSON.parse(content);
       return (data.models || []).map((model) => ({
         ...model,
@@ -34218,9 +34408,9 @@ function loadRecommendedModels2() {
   return [];
 }
 async function fetchAllModels(forceUpdate = false) {
-  if (!forceUpdate && existsSync12(ALL_MODELS_JSON_PATH2)) {
+  if (!forceUpdate && existsSync14(ALL_MODELS_JSON_PATH2)) {
     try {
-      const cacheData = JSON.parse(readFileSync10(ALL_MODELS_JSON_PATH2, "utf-8"));
+      const cacheData = JSON.parse(readFileSync12(ALL_MODELS_JSON_PATH2, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
       const now = new Date;
       const ageInDays = (now.getTime() - lastUpdated.getTime()) / (1000 * 60 * 60 * 24);
@@ -34649,11 +34839,11 @@ async function fetchOllamaCloudModels() {
   }
 }
 function shouldRefreshForFreeModels() {
-  if (!existsSync12(ALL_MODELS_JSON_PATH2)) {
+  if (!existsSync14(ALL_MODELS_JSON_PATH2)) {
     return true;
   }
   try {
-    const cacheData = JSON.parse(readFileSync10(ALL_MODELS_JSON_PATH2, "utf-8"));
+    const cacheData = JSON.parse(readFileSync12(ALL_MODELS_JSON_PATH2, "utf-8"));
     const lastUpdated = new Date(cacheData.lastUpdated);
     const now = new Date;
     const ageInHours = (now.getTime() - lastUpdated.getTime()) / (1000 * 60 * 60);
@@ -35169,9 +35359,9 @@ var init_model_selector = __esm(() => {
   init_model_loader();
   __filename5 = fileURLToPath4(import.meta.url);
   __dirname5 = dirname4(__filename5);
-  CLAUDISH_CACHE_DIR3 = join12(homedir11(), ".claudish");
-  ALL_MODELS_JSON_PATH2 = join12(CLAUDISH_CACHE_DIR3, "all-models.json");
-  RECOMMENDED_MODELS_JSON_PATH = join12(__dirname5, "../recommended-models.json");
+  CLAUDISH_CACHE_DIR3 = join14(homedir13(), ".claudish");
+  ALL_MODELS_JSON_PATH2 = join14(CLAUDISH_CACHE_DIR3, "all-models.json");
+  RECOMMENDED_MODELS_JSON_PATH = join14(__dirname5, "../recommended-models.json");
   PROVIDER_FILTER_ALIASES = {
     zen: "Zen",
     openrouter: "OpenRouter",
@@ -36168,17 +36358,17 @@ __export(exports_claude_runner, {
   checkClaudeInstalled: () => checkClaudeInstalled
 });
 import { spawn } from "node:child_process";
-import { writeFileSync as writeFileSync8, unlinkSync as unlinkSync5, mkdirSync as mkdirSync8, existsSync as existsSync13, readFileSync as readFileSync11 } from "node:fs";
-import { tmpdir as tmpdir2, homedir as homedir12 } from "node:os";
-import { join as join13 } from "node:path";
+import { writeFileSync as writeFileSync8, unlinkSync as unlinkSync5, mkdirSync as mkdirSync8, existsSync as existsSync15, readFileSync as readFileSync13 } from "node:fs";
+import { tmpdir as tmpdir2, homedir as homedir14 } from "node:os";
+import { join as join15 } from "node:path";
 function isWindows2() {
   return process.platform === "win32";
 }
 function createStatusLineScript(tokenFilePath) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join13(homeDir, ".claudish");
+  const claudishDir = join15(homeDir, ".claudish");
   const timestamp = Date.now();
-  const scriptPath = join13(claudishDir, `status-${timestamp}.js`);
+  const scriptPath = join15(claudishDir, `status-${timestamp}.js`);
   const escapedTokenPath = tokenFilePath.replace(/\\/g, "\\\\");
   const script = `
 const fs = require('fs');
@@ -36263,13 +36453,13 @@ process.stdin.on('end', () => {
 }
 function createTempSettingsFile(modelDisplay, port) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join13(homeDir, ".claudish");
+  const claudishDir = join15(homeDir, ".claudish");
   try {
     mkdirSync8(claudishDir, { recursive: true });
   } catch {}
   const timestamp = Date.now();
-  const tempPath = join13(claudishDir, `settings-${timestamp}.json`);
-  const tokenFilePath = join13(claudishDir, `tokens-${port}.json`);
+  const tempPath = join15(claudishDir, `settings-${timestamp}.json`);
+  const tokenFilePath = join15(claudishDir, `tokens-${port}.json`);
   let statusCommand;
   if (isWindows2()) {
     const scriptPath = createStatusLineScript(tokenFilePath);
@@ -36305,7 +36495,7 @@ function mergeUserSettingsIfPresent(config3, tempSettingsPath, statusLine) {
     if (userSettingsValue.trimStart().startsWith("{")) {
       userSettings = JSON.parse(userSettingsValue);
     } else {
-      const rawUserSettings = readFileSync11(userSettingsValue, "utf-8");
+      const rawUserSettings = readFileSync13(userSettingsValue, "utf-8");
       userSettings = JSON.parse(rawUserSettings);
     }
     userSettings.statusLine = statusLine;
@@ -36392,8 +36582,8 @@ async function runClaudeWithProxy(config3, proxyUrl) {
     console.error("Install it from: https://claude.com/claude-code");
     console.error(`
 Or set CLAUDE_PATH to your custom installation:`);
-    const home = homedir12();
-    const localPath = isWindows2() ? join13(home, ".claude", "local", "claude.exe") : join13(home, ".claude", "local", "claude");
+    const home = homedir14();
+    const localPath = isWindows2() ? join15(home, ".claude", "local", "claude.exe") : join15(home, ".claude", "local", "claude");
     console.error(`  export CLAUDE_PATH=${localPath}`);
     process.exit(1);
   }
@@ -36432,23 +36622,23 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet) {
 async function findClaudeBinary() {
   const isWindows3 = process.platform === "win32";
   if (process.env.CLAUDE_PATH) {
-    if (existsSync13(process.env.CLAUDE_PATH)) {
+    if (existsSync15(process.env.CLAUDE_PATH)) {
       return process.env.CLAUDE_PATH;
     }
   }
-  const home = homedir12();
-  const localPath = isWindows3 ? join13(home, ".claude", "local", "claude.exe") : join13(home, ".claude", "local", "claude");
-  if (existsSync13(localPath)) {
+  const home = homedir14();
+  const localPath = isWindows3 ? join15(home, ".claude", "local", "claude.exe") : join15(home, ".claude", "local", "claude");
+  if (existsSync15(localPath)) {
     return localPath;
   }
   if (isWindows3) {
     const windowsPaths = [
-      join13(home, "AppData", "Roaming", "npm", "claude.cmd"),
-      join13(home, ".npm-global", "claude.cmd"),
-      join13(home, "node_modules", ".bin", "claude.cmd")
+      join15(home, "AppData", "Roaming", "npm", "claude.cmd"),
+      join15(home, ".npm-global", "claude.cmd"),
+      join15(home, "node_modules", ".bin", "claude.cmd")
     ];
     for (const path of windowsPaths) {
-      if (existsSync13(path)) {
+      if (existsSync15(path)) {
         return path;
       }
     }
@@ -36456,14 +36646,14 @@ async function findClaudeBinary() {
     const commonPaths = [
       "/usr/local/bin/claude",
       "/opt/homebrew/bin/claude",
-      join13(home, ".npm-global/bin/claude"),
-      join13(home, ".local/bin/claude"),
-      join13(home, "node_modules/.bin/claude"),
+      join15(home, ".npm-global/bin/claude"),
+      join15(home, ".local/bin/claude"),
+      join15(home, "node_modules/.bin/claude"),
       "/data/data/com.termux/files/usr/bin/claude",
-      join13(home, "../usr/bin/claude")
+      join15(home, "../usr/bin/claude")
     ];
     for (const path of commonPaths) {
-      if (existsSync13(path)) {
+      if (existsSync15(path)) {
         return path;
       }
     }
@@ -39109,7 +39299,7 @@ class OpenRouterProvider {
   }
 }
 var OPENROUTER_API_URL2 = "https://openrouter.ai/api/v1/chat/completions";
-var init_openrouter = __esm(() => {
+var init_openrouter2 = __esm(() => {
   init_openrouter_queue();
 });
 
@@ -62406,9 +62596,9 @@ var init_gemini_codeassist = __esm(() => {
 // src/auth/vertex-auth.ts
 import { exec as exec4 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
-import { existsSync as existsSync14 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
-import { join as join14 } from "node:path";
+import { existsSync as existsSync16 } from "node:fs";
+import { homedir as homedir15 } from "node:os";
+import { join as join16 } from "node:path";
 
 class VertexAuthManager {
   cachedToken = null;
@@ -62462,8 +62652,8 @@ class VertexAuthManager {
   }
   async tryADC() {
     try {
-      const adcPath = join14(homedir13(), ".config/gcloud/application_default_credentials.json");
-      if (!existsSync14(adcPath)) {
+      const adcPath = join16(homedir15(), ".config/gcloud/application_default_credentials.json");
+      if (!existsSync16(adcPath)) {
         log("[VertexAuth] ADC credentials file not found");
         return null;
       }
@@ -62487,7 +62677,7 @@ class VertexAuthManager {
     if (!credPath) {
       return null;
     }
-    if (!existsSync14(credPath)) {
+    if (!existsSync16(credPath)) {
       throw new Error(`Service account file not found: ${credPath}
 
 Check GOOGLE_APPLICATION_CREDENTIALS path.`);
@@ -62526,8 +62716,8 @@ function validateVertexOAuthConfig() {
 ` + `  export VERTEX_PROJECT='your-gcp-project-id'
 ` + "  export VERTEX_LOCATION='us-central1'  # optional";
   }
-  const adcPath = join14(homedir13(), ".config/gcloud/application_default_credentials.json");
-  const hasADC = existsSync14(adcPath);
+  const adcPath = join16(homedir15(), ".config/gcloud/application_default_credentials.json");
+  const hasADC = existsSync16(adcPath);
   const hasServiceAccount = !!process.env.GOOGLE_APPLICATION_CREDENTIALS;
   if (!hasADC && !hasServiceAccount) {
     return `No Vertex AI credentials found.
@@ -62923,8 +63113,8 @@ var init_middleware = __esm(() => {
 
 // src/handlers/shared/token-tracker.ts
 import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
-import { join as join15 } from "node:path";
+import { homedir as homedir16 } from "node:os";
+import { join as join17 } from "node:path";
 
 class TokenTracker {
   port;
@@ -63038,9 +63228,9 @@ class TokenTracker {
         is_free: isFreeModel,
         is_estimated: isEstimate || false
       };
-      const claudishDir = join15(homedir14(), ".claudish");
+      const claudishDir = join17(homedir16(), ".claudish");
       mkdirSync9(claudishDir, { recursive: true });
-      writeFileSync9(join15(claudishDir, `tokens-${this.port}.json`), JSON.stringify(data), "utf-8");
+      writeFileSync9(join17(claudishDir, `tokens-${this.port}.json`), JSON.stringify(data), "utf-8");
     } catch (e) {
       log(`[TokenTracker] Error writing token file: ${e}`);
     }
@@ -64348,17 +64538,17 @@ class LiteLLMProvider {
   }
 }
 var MODEL_EXTRA_HEADERS;
-var init_litellm = __esm(() => {
+var init_litellm2 = __esm(() => {
   MODEL_EXTRA_HEADERS = [
     { pattern: "kimi", headers: { "User-Agent": "claude-code/1.0" } }
   ];
 });
 
 // src/adapters/litellm-adapter.ts
-import { existsSync as existsSync15, readFileSync as readFileSync13 } from "node:fs";
-import { createHash as createHash4 } from "node:crypto";
-import { homedir as homedir15 } from "node:os";
-import { join as join16 } from "node:path";
+import { existsSync as existsSync17, readFileSync as readFileSync15 } from "node:fs";
+import { createHash as createHash5 } from "node:crypto";
+import { homedir as homedir17 } from "node:os";
+import { join as join18 } from "node:path";
 var INLINE_IMAGE_MODEL_PATTERNS, LiteLLMAdapter;
 var init_litellm_adapter = __esm(() => {
   init_base_adapter();
@@ -64453,11 +64643,11 @@ var init_litellm_adapter = __esm(() => {
     }
     checkVisionSupport() {
       try {
-        const hash2 = createHash4("sha256").update(this.baseUrl).digest("hex").substring(0, 16);
-        const cachePath = join16(homedir15(), ".claudish", `litellm-models-${hash2}.json`);
-        if (!existsSync15(cachePath))
+        const hash2 = createHash5("sha256").update(this.baseUrl).digest("hex").substring(0, 16);
+        const cachePath = join18(homedir17(), ".claudish", `litellm-models-${hash2}.json`);
+        if (!existsSync17(cachePath))
           return true;
-        const cacheData = JSON.parse(readFileSync13(cachePath, "utf-8"));
+        const cacheData = JSON.parse(readFileSync15(cachePath, "utf-8"));
         const model = cacheData.models?.find((m) => m.name === this.modelId);
         if (model && model.supportsVision === false) {
           log(`[LiteLLMAdapter] Model ${this.modelId} does not support vision`);
@@ -64575,12 +64765,12 @@ class AnthropicCompatProvider {
     }
     if (this.provider.name === "kimi-coding" && !this.apiKey) {
       try {
-        const { existsSync: existsSync16, readFileSync: readFileSync14 } = await import("node:fs");
-        const { join: join17 } = await import("node:path");
-        const { homedir: homedir16 } = await import("node:os");
-        const credPath = join17(homedir16(), ".claudish", "kimi-oauth.json");
-        if (existsSync16(credPath)) {
-          const data = JSON.parse(readFileSync14(credPath, "utf-8"));
+        const { existsSync: existsSync18, readFileSync: readFileSync16 } = await import("node:fs");
+        const { join: join19 } = await import("node:path");
+        const { homedir: homedir18 } = await import("node:os");
+        const credPath = join19(homedir18(), ".claudish", "kimi-oauth.json");
+        if (existsSync18(credPath)) {
+          const data = JSON.parse(readFileSync16(credPath, "utf-8"));
           if (data.access_token && data.refresh_token) {
             const { KimiOAuth: KimiOAuth2 } = await Promise.resolve().then(() => (init_kimi_oauth(), exports_kimi_oauth));
             const oauth = KimiOAuth2.getInstance();
@@ -64802,9 +64992,9 @@ var init_ollamacloud_adapter = __esm(() => {
 });
 
 // src/services/pricing-cache.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync10, existsSync as existsSync16, mkdirSync as mkdirSync10, statSync } from "node:fs";
-import { homedir as homedir16 } from "node:os";
-import { join as join17 } from "node:path";
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync10, existsSync as existsSync18, mkdirSync as mkdirSync10, statSync } from "node:fs";
+import { homedir as homedir18 } from "node:os";
+import { join as join19 } from "node:path";
 function getDynamicPricingSync(provider, modelName) {
   if (provider === "openrouter") {
     const direct = pricingMap.get(modelName);
@@ -64869,12 +65059,12 @@ async function warmPricingCache() {
 }
 function loadDiskCache() {
   try {
-    if (!existsSync16(CACHE_FILE))
+    if (!existsSync18(CACHE_FILE))
       return false;
     const stat = statSync(CACHE_FILE);
     const age = Date.now() - stat.mtimeMs;
     const isFresh = age < CACHE_TTL_MS;
-    const raw2 = readFileSync14(CACHE_FILE, "utf-8");
+    const raw2 = readFileSync16(CACHE_FILE, "utf-8");
     const data = JSON.parse(raw2);
     for (const [key, pricing] of Object.entries(data)) {
       pricingMap.set(key, pricing);
@@ -64921,8 +65111,8 @@ var init_pricing_cache = __esm(() => {
   init_model_loader();
   init_remote_provider_types();
   pricingMap = new Map;
-  CACHE_DIR = join17(homedir16(), ".claudish");
-  CACHE_FILE = join17(CACHE_DIR, "pricing-cache.json");
+  CACHE_DIR = join19(homedir18(), ".claudish");
+  CACHE_FILE = join19(CACHE_DIR, "pricing-cache.json");
   CACHE_TTL_MS = 24 * 60 * 60 * 1000;
   PROVIDER_TO_OR_PREFIX = {
     openai: ["openai/"],
@@ -65200,6 +65390,16 @@ async function createProxyServer(port, openrouterApiKey, model, monitorMode = fa
     } else if (model) {
       target = model;
     }
+    {
+      const parsedTarget = parseModelSpec(target);
+      if (parsedTarget.provider === "openrouter" || parsedTarget.provider === "litellm") {
+        const resolution = resolveModelNameSync(parsedTarget.model, parsedTarget.provider);
+        logResolution(parsedTarget.model, resolution, options.quiet);
+        if (resolution.wasResolved) {
+          target = `${parsedTarget.provider}@${resolution.resolvedId}`;
+        }
+      }
+    }
     if (isPoeModel(target)) {
       const poeHandler = getPoeHandler(target);
       if (poeHandler) {
@@ -65268,6 +65468,10 @@ async function createProxyServer(port, openrouterApiKey, model, monitorMode = fa
     port = actualPort;
   log(`[Proxy] Server started on port ${port}`);
   warmPricingCache().catch(() => {});
+  const catalogProvidersToWarm = ["openrouter"];
+  if (process.env.LITELLM_BASE_URL)
+    catalogProvidersToWarm.push("litellm");
+  warmAllCatalogs(catalogProvidersToWarm).catch(() => {});
   return {
     port,
     url: `http://127.0.0.1:${port}`,
@@ -65282,7 +65486,7 @@ var init_proxy_server = __esm(() => {
   init_dist10();
   init_logger();
   init_native_handler();
-  init_openrouter();
+  init_openrouter2();
   init_openrouter_adapter();
   init_local();
   init_local_adapter();
@@ -65292,7 +65496,7 @@ var init_proxy_server = __esm(() => {
   init_vertex_oauth();
   init_base_adapter();
   init_composed_handler();
-  init_litellm();
+  init_litellm2();
   init_litellm_adapter();
   init_openai();
   init_openai_adapter();
@@ -65306,6 +65510,7 @@ var init_proxy_server = __esm(() => {
   init_provider_resolver();
   init_pricing_cache();
   init_model_loader();
+  init_model_catalog_resolver();
 });
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "5.5.2",
+  "version": "5.6.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",

package/recommended-models.json

@@ -1,6 +1,6 @@
 {
   "version": "1.2.0",
-  "lastUpdated": "2026-03-03",
+  "lastUpdated": "2026-03-05",
   "source": "https://openrouter.ai/models?categories=programming&fmt=cards&order=top-weekly",
   "models": [
     {
@@ -122,9 +122,9 @@
       "category": "vision",
       "priority": 6,
       "pricing": {
-        "input": "$0.40/1M",
-        "output": "$2.40/1M",
-        "average": "$1.40/1M"
+        "input": "$0.26/1M",
+        "output": "$1.56/1M",
+        "average": "$0.91/1M"
       },
       "context": "1000K",
       "maxOutputTokens": 65536,