claudish 7.58.0 → 7.59.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.58.0";
+var VERSION = "7.59.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -45049,6 +45049,36 @@ var init_default_routing_rules = __esm(() => {
   validateDefaultRoutingRules();
 });
 
+// src/providers/model-availability.ts
+function rosterHas(ids, wireId) {
+  const needle = wireId.trim().toLowerCase();
+  return ids.some((id) => id.trim().toLowerCase() === needle);
+}
+async function providerServesModel(provider, wireId) {
+  const def = getProviderByName(provider);
+  if (def?.modelDiscovery) {
+    const models = await discoverProviderModels(provider);
+    if (models.length > 0) {
+      return rosterHas(models.map((m) => m.id), wireId) ? "serves" : "not-served";
+    }
+    getDiscoveryFailure(provider);
+    return "unknown";
+  }
+  const entries = getCatalogEntries();
+  if (!entries)
+    return "unknown";
+  const needle = wireId.trim().toLowerCase();
+  const row = entries.find((e) => e.modelId.toLowerCase() === needle || e.aliases.some((a) => a.toLowerCase() === needle) || (e.aggregators ?? []).some((a) => a.externalId?.toLowerCase() === needle));
+  if (!row)
+    return "unknown";
+  return (row.aggregators ?? []).some((a) => a.provider === provider) ? "serves" : "unknown";
+}
+var init_model_availability = __esm(() => {
+  init_catalog_client();
+  init_model_discovery();
+  init_provider_definitions();
+});
+
 // src/providers/routing-rules.ts
 function mergeRoutingRules(defaults, global_, local) {
   return { ...defaults, ...global_, ...local };
@@ -45157,6 +45187,13 @@ async function routeExplicit(modelSpec, model, provider, cachePath) {
       reason: `Could not build a route for "${modelSpec}".`
     };
   }
+  if (await providerServesModel(built.provider, wireIdOf(built)) === "not-served") {
+    return {
+      kind: "no-route",
+      reason: `${built.displayName} does not serve "${model}".`,
+      hint: `Check the model id, or use a bare \`${model}\` to let claudish pick a provider ` + "that carries it."
+    };
+  }
   return { kind: "ok", primary: built, fallbacks: [] };
 }
 async function routeBare(model, nativeProvider, rules, defaultProvider, cachePath) {
@@ -45198,9 +45235,37 @@ async function routeBare(model, nativeProvider, rules, defaultProvider, cachePat
       hint: buildCredentialHint(model, skipped) ?? undefined
     };
   }
-  const [primary, ...fallbacks] = credentialed;
+  const availability = await Promise.all(credentialed.map((candidate) => providerServesModel(candidate.provider, wireIdOf(candidate))));
+  const serving = [];
+  const notServing = [];
+  credentialed.forEach((candidate, i) => {
+    if (availability[i] === "not-served") {
+      notServing.push(candidate.provider);
+    } else {
+      serving.push(candidate);
+    }
+  });
+  if (serving.length === 0) {
+    return {
+      kind: "no-route",
+      reason: `No provider serves "${model}" (checked: ${notServing.join(", ")}).`,
+      hint: buildCredentialHint(model, notServing) ?? undefined
+    };
+  }
+  if (notServing.length > 0) {
+    log(`[routing] ${model}: skipped ${notServing.join(", ")} \u2014 does not serve this model`);
+    const droppedSubscription = notServing.filter((p) => isSubscriptionProvider(p));
+    if (droppedSubscription.length > 0 && !isSubscriptionProvider(serving[0].provider)) {
+      logStderr(`[claudish] ${droppedSubscription.join(", ")} does not serve ${model} \u2014 ` + `using ${serving[0].displayName}, which bills per token.`);
+    }
+  }
+  const [primary, ...fallbacks] = serving;
   return { kind: "ok", primary, fallbacks };
 }
+function wireIdOf(route) {
+  const at = route.modelSpec.indexOf("@");
+  return at === -1 ? route.modelSpec : route.modelSpec.slice(at + 1);
+}
 function normalizeGlmSlug(model) {
   return model.replace(/^glm-(\d+)-(\d+)(-.*)?$/i, (_m, major, minor, suffix) => `glm-${major}.${minor}${suffix ?? ""}`);
 }
@@ -45216,10 +45281,13 @@ async function route(modelSpec, rulesOverride, defaultProviderOverride, cachePat
 var init_routing_rules = __esm(() => {
   init_model_catalog();
   init_authority();
+  init_remote_provider_types();
+  init_logger();
   init_profile_config();
   init_auto_route();
   init_catalog_client();
   init_default_routing_rules();
+  init_model_availability();
   init_model_parser();
   init_model_parser();
   init_routing_hints();

package/package.json

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