claudish 7.19.2 → 7.20.1

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.19.2";
+var VERSION = "7.20.1";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28326,8 +28326,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: ["kc"],
       shortestPrefix: "kc",
       legacyPrefixes: [{ prefix: "kc/", stripPrefix: true }],
-      nativeModelPatterns: [{ pattern: /^kimi-for-coding$/i }],
-      fixedModel: "kimi-for-coding",
+      nativeModelPatterns: [{ pattern: /^kimi-for-coding/i }, { pattern: /^k3(-|$)/i }],
+      modelDiscovery: { path: "/models", format: "openai-models-list" },
       isDirectApi: true,
       description: "Kimi Coding Plan (kc@)"
     },
@@ -30475,6 +30475,22 @@ function lookupModelForProvider(modelId, provider, cachePath) {
     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 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`);
@@ -42591,7 +42607,8 @@ var init_default_routing_rules = __esm(() => {
     "o3-*": ["openai-codex", "openai", "openrouter"],
     "gemini-*": ["gemini-codeassist", "google", "openrouter"],
     "grok-*": ["x-ai", "openrouter"],
-    "kimi-*": ["kimi-coding@kimi-for-coding", "kimi", "openrouter"],
+    "kimi-*": ["kimi-coding", "kimi", "openrouter"],
+    "k3*": ["kimi-coding", "kimi", "openrouter"],
     "minimax-*": ["minimax-coding", "minimax", "openrouter"],
     "glm-*": ["glm-coding", "glm", "openrouter"],
     "z-ai-*": ["z-ai", "openrouter"],
@@ -42645,7 +42662,7 @@ function matchRoutingRule(modelName, rules) {
     return rules["*"];
   return null;
 }
-function buildRoutingChain(entries, originalModelName) {
+function buildRoutingChain(entries, originalModelName, cachePath) {
   const routes = [];
   for (const entry of entries) {
     const atIdx = entry.indexOf("@");
@@ -42659,6 +42676,13 @@ function buildRoutingChain(entries, originalModelName) {
       modelName = originalModelName;
     }
     const provider = PROVIDER_SHORTCUTS[providerRaw.toLowerCase()] ?? providerRaw.toLowerCase();
+    if (atIdx === -1) {
+      const routing = resolveSubscriptionRouting(modelName, provider, cachePath);
+      if (routing.kind === "not-served")
+        continue;
+      if (routing.kind === "serves")
+        modelName = routing.externalId;
+    }
     let modelSpec;
     if (provider === "openrouter") {
       const resolution = resolveModelNameSync(modelName, "openrouter");
@@ -42685,7 +42709,7 @@ function globMatch(pattern, value) {
 async function hasCredentialsForProvider(provider) {
   return credentials.isAvailable(provider);
 }
-async function routeExplicit(modelSpec, model, provider) {
+async function routeExplicit(modelSpec, model, provider, cachePath) {
   if (!await hasCredentialsForProvider(provider)) {
     return {
       kind: "no-route",
@@ -42693,7 +42717,7 @@ async function routeExplicit(modelSpec, model, provider) {
       hint: buildCredentialHint(model, [provider]) ?? undefined
     };
   }
-  const built = buildRoutingChain([modelSpec], model)[0];
+  const built = buildRoutingChain([modelSpec], model, cachePath)[0];
   if (!built) {
     return {
       kind: "no-route",
@@ -42702,7 +42726,7 @@ async function routeExplicit(modelSpec, model, provider) {
   }
   return { kind: "ok", primary: built, fallbacks: [] };
 }
-async function routeBare(model, nativeProvider, rules, defaultProvider) {
+async function routeBare(model, nativeProvider, rules, defaultProvider, cachePath) {
   const matched = matchRoutingRule(model, rules) ?? [];
   const entries = [...matched];
   if (defaultProvider && defaultProvider.length > 0) {
@@ -42723,7 +42747,7 @@ async function routeBare(model, nativeProvider, rules, defaultProvider) {
       hint: buildCredentialHint(model, [nativeProvider]) ?? undefined
     };
   }
-  const candidates = buildRoutingChain(entries, model);
+  const candidates = buildRoutingChain(entries, model, cachePath);
   const credentialed = [];
   const skipped = [];
   const checks4 = await Promise.all(candidates.map((candidate) => hasCredentialsForProvider(candidate.provider)));
@@ -42744,16 +42768,17 @@ async function routeBare(model, nativeProvider, rules, defaultProvider) {
   const [primary, ...fallbacks] = credentialed;
   return { kind: "ok", primary, fallbacks };
 }
-async function route(modelSpec, rulesOverride, defaultProviderOverride) {
+async function route(modelSpec, rulesOverride, defaultProviderOverride, cachePath) {
   const parsed = parseModelSpec(modelSpec);
   if (parsed.isExplicitProvider) {
-    return routeExplicit(modelSpec, parsed.model, parsed.provider);
+    return routeExplicit(modelSpec, parsed.model, parsed.provider, cachePath);
   }
   const rules = rulesOverride ?? loadRoutingRules();
   const defaultProvider = defaultProviderOverride !== undefined ? defaultProviderOverride : rulesOverride !== undefined ? undefined : loadConfig().defaultProvider;
-  return routeBare(parsed.model, parsed.provider, rules, defaultProvider);
+  return routeBare(parsed.model, parsed.provider, rules, defaultProvider, cachePath);
 }
 var init_routing_rules = __esm(() => {
+  init_model_catalog();
   init_authority();
   init_profile_config();
   init_auto_route();
@@ -58584,6 +58609,114 @@ var init_model_catalog2 = __esm(() => {
   NO_CATALOG_VENDOR_SLUGS = new Set(["litellm", "ollama", "lmstudio", "lm-studio"]);
 });
 
+// src/providers/model-discovery.ts
+function resolveBaseUrl2(catalogName) {
+  const def = getProviderByName(catalogName);
+  if (!def)
+    return null;
+  for (const envVar of def.baseUrlEnvVars ?? []) {
+    const v = process.env[envVar];
+    if (v)
+      return v.replace(/\/+$/, "");
+  }
+  return (def.baseUrl || "").replace(/\/+$/, "") || null;
+}
+function readContextWindow(row) {
+  for (const field of ["context_length", "context_window", "max_context_length"]) {
+    const v = row[field];
+    if (typeof v === "number" && Number.isFinite(v) && v > 0)
+      return v;
+  }
+  return;
+}
+function parseOpenAIModelsList(body) {
+  const data = body?.data;
+  if (!Array.isArray(data))
+    return [];
+  const models = [];
+  for (const raw2 of data) {
+    if (!raw2 || typeof raw2 !== "object")
+      continue;
+    const row = raw2;
+    const id = row.id;
+    if (typeof id !== "string" || id.trim().length === 0)
+      continue;
+    const displayName = typeof row.display_name === "string" ? row.display_name : undefined;
+    models.push({ id, displayName, contextWindow: readContextWindow(row) });
+  }
+  return models;
+}
+async function discoverProviderModels(providerName) {
+  const cached2 = _cache2.get(providerName);
+  if (cached2 && cached2.expiresAt > Date.now())
+    return cached2.models;
+  const def = getProviderByName(providerName);
+  const descriptor = def?.modelDiscovery;
+  if (!def || !descriptor)
+    return [];
+  const baseUrl = resolveBaseUrl2(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 [];
+  }
+  let response;
+  try {
+    response = await fetch(endpoint, {
+      method: "GET",
+      headers,
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS2)
+    });
+  } catch (e) {
+    log(`[model-discovery:${providerName}] fetch failed: ${e?.message}`);
+    return [];
+  }
+  if (!response.ok) {
+    log(`[model-discovery:${providerName}] HTTP ${response.status} from ${endpoint}`);
+    return [];
+  }
+  let body;
+  try {
+    body = await response.json();
+  } catch {
+    log(`[model-discovery:${providerName}] response was not JSON`);
+    return [];
+  }
+  const models = parseOpenAIModelsList(body);
+  if (models.length === 0) {
+    log(`[model-discovery:${providerName}] endpoint reachable but listed no models`);
+    return [];
+  }
+  log(`[model-discovery:${providerName}] discovered ${models.length} models: ` + models.map((m) => `${m.id}(${m.contextWindow ?? "?"})`).join(", "));
+  _cache2.set(providerName, { models, expiresAt: Date.now() + CACHE_TTL_MS3 });
+  return models;
+}
+async function discoverContextWindow(providerName, modelId) {
+  const models = await discoverProviderModels(providerName);
+  const match2 = models.find((m) => m.id.toLowerCase() === modelId.toLowerCase());
+  return match2?.contextWindow;
+}
+function rankDiscoveredModels(models) {
+  return [...models].sort((a, b) => {
+    const diff = (b.contextWindow ?? 0) - (a.contextWindow ?? 0);
+    return diff !== 0 ? diff : a.id.localeCompare(b.id);
+  });
+}
+var CACHE_TTL_MS3, FETCH_TIMEOUT_MS2 = 5000, _cache2;
+var init_model_discovery = __esm(() => {
+  init_authority();
+  init_logger();
+  init_provider_definitions();
+  CACHE_TTL_MS3 = 5 * 60 * 1000;
+  _cache2 = new Map;
+});
+
 // src/providers/ollama-discovery.ts
 function ollamaBaseUrl() {
   return process.env.OLLAMA_HOST || process.env.OLLAMA_BASE_URL || "http://localhost:11434";
@@ -59153,8 +59286,22 @@ async function selectModelFromProvider(provider, tierName, recommendedModels, _f
   const prefix = PROVIDER_MODEL_PREFIX[provider] || `${provider}@`;
   const displayName = getPickerDisplayName(provider);
   const def = getProviderByName(provider);
-  if (def?.fixedModel) {
-    return buildExplicitModelSpec(provider, def.fixedModel);
+  if (def?.modelDiscovery) {
+    const discovered = rankDiscoveredModels(await discoverProviderModels(provider));
+    if (discovered.length > 0) {
+      const discoveredModels = discovered.map((m) => ({
+        id: m.id,
+        name: m.displayName || m.id,
+        description: m.contextWindow ? `${m.displayName ?? m.id} \xB7 ${Math.round(m.contextWindow / 1024)}K context` : m.displayName ?? m.id,
+        provider: displayName,
+        supportsTools: true,
+        isFree: true,
+        source: displayName
+      }));
+      const picked = await pickModelFromList(provider, displayName, tierName, discoveredModels);
+      if (picked)
+        return picked;
+    }
   }
   if (provider === "ollama") {
     const ollamaModels = await fetchOllamaModels2({ enrichCapabilities: false });
@@ -59333,6 +59480,7 @@ var init_model_selector = __esm(() => {
   init_authority();
   init_model_loader();
   init_model_catalog2();
+  init_model_discovery();
   init_provider_definitions();
   pickerProviderToFirebaseSlug = {
     openrouter: "openrouter",
@@ -64740,7 +64888,7 @@ function writeProbeModelsCache(data, path2 = PROBE_MODELS_CACHE_PATH) {
   mkdirSync14(dirname7(path2), { recursive: true });
   writeFileSync16(path2, JSON.stringify(data), "utf-8");
 }
-function isCacheFresh(data, ttlMs = CACHE_TTL_MS3) {
+function isCacheFresh(data, ttlMs = CACHE_TTL_MS4) {
   if (!data?.generatedAt)
     return false;
   const generatedMs = Date.parse(data.generatedAt);
@@ -64748,7 +64896,7 @@ function isCacheFresh(data, ttlMs = CACHE_TTL_MS3) {
     return false;
   return Date.now() - generatedMs < ttlMs;
 }
-async function fetchProbeModels(url2 = PROBE_MODELS_URL, timeoutMs = FETCH_TIMEOUT_MS2) {
+async function fetchProbeModels(url2 = PROBE_MODELS_URL, timeoutMs = FETCH_TIMEOUT_MS3) {
   let response;
   try {
     response = await fetch(url2, { signal: AbortSignal.timeout(timeoutMs) });
@@ -64854,9 +65002,9 @@ function isValidResponse(raw2) {
     return false;
   return true;
 }
-var PROBE_MODELS_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/probeModels", CACHE_TTL_MS3, FETCH_TIMEOUT_MS2 = 15000, PROBE_MODELS_CACHE_PATH, _inFlight = null;
+var PROBE_MODELS_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/probeModels", CACHE_TTL_MS4, FETCH_TIMEOUT_MS3 = 15000, PROBE_MODELS_CACHE_PATH, _inFlight = null;
 var init_probe_catalog = __esm(() => {
-  CACHE_TTL_MS3 = 60 * 60 * 1000;
+  CACHE_TTL_MS4 = 60 * 60 * 1000;
   PROBE_MODELS_CACHE_PATH = join24(homedir23(), ".claudish", "probe-models.json");
 });
 
@@ -71435,7 +71583,7 @@ async function computeMainThreadContextWindow(config3, cachePath) {
           continue;
         provider = plan.primary.provider;
       }
-      const win = lookupModelForProvider(parsed.model, provider, cachePath);
+      const win = await discoverContextWindow(provider, parsed.model) ?? lookupModelForProvider(parsed.model, provider, cachePath);
       if (typeof win === "number" && win > 0) {
         min = Math.min(min, win);
       }
@@ -71711,6 +71859,7 @@ var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_config();
   init_logger();
+  init_model_discovery();
   init_profile_config();
   init_model_parser();
   init_routing_rules();

package/package.json

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