claudish 7.57.0 → 7.59.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.57.0";
+var VERSION = "7.59.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -41714,6 +41714,33 @@ var init_token_tracker = __esm(() => {
   init_remote_provider_types();
 });
 
+// src/handlers/shared/upstream-error-capture.ts
+import { appendFileSync as appendFileSync4 } from "fs";
+function captureUpstreamError(record4) {
+  const path = process.env[UPSTREAM_ERROR_LOG_ENV];
+  if (!path)
+    return false;
+  try {
+    const raw = record4.body ?? "";
+    const truncated = raw.length > MAX_CAPTURED_BODY_BYTES;
+    const line = JSON.stringify({
+      at: record4.at ?? new Date().toISOString(),
+      provider: record4.provider,
+      model: record4.model,
+      status: record4.status,
+      body: truncated ? raw.slice(0, MAX_CAPTURED_BODY_BYTES) : raw,
+      ...truncated ? { truncated: true, original_bytes: raw.length } : {}
+    });
+    appendFileSync4(path, `${line}
+`);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var UPSTREAM_ERROR_LOG_ENV = "CLAUDISH_UPSTREAM_ERROR_LOG", MAX_CAPTURED_BODY_BYTES = 2048;
+var init_upstream_error_capture = () => {};
+
 // src/handlers/composed-handler.ts
 function extractAuthHeaders(c) {
   const headers = c.req.header();
@@ -42113,6 +42140,12 @@ class ComposedHandler {
       } else {
         const errorText = await response.text();
         log(`[${this.provider.displayName}] Error: ${errorText}`);
+        captureUpstreamError({
+          provider: this.provider.displayName,
+          model: this.bareModelName,
+          status: response.status,
+          body: errorText
+        });
         const transportTerminal = this.provider.classifyTerminalError?.(response.status, errorText);
         const hint = getRecoveryHint(response.status, errorText, this.provider.displayName, transportTerminal);
         let parsedErrorBody;
@@ -42615,6 +42648,7 @@ var init_composed_handler = __esm(() => {
   init_openai_responses_sse();
   init_openai_sse();
   init_token_tracker();
+  init_upstream_error_capture();
   STREAM_RETRY_DELAYS_MS = [3000, 15000, 30000];
 });
 
@@ -45015,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 };
@@ -45123,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) {
@@ -45164,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 ?? ""}`);
 }
@@ -45182,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();
@@ -45611,7 +45713,7 @@ var init_prehydrate = __esm(() => {
 });
 
 // src/channel/diagnostics.ts
-import { appendFileSync as appendFileSync4 } from "fs";
+import { appendFileSync as appendFileSync5 } from "fs";
 function traceEnabled() {
   return process.env[TRACE_ENV] === "1";
 }
@@ -45622,7 +45724,7 @@ function emit(line) {
   const filePath = process.env[TRACE_FILE_ENV];
   if (filePath) {
     try {
-      appendFileSync4(filePath, formatted);
+      appendFileSync5(filePath, formatted);
     } catch {}
   }
 }
@@ -49175,7 +49277,7 @@ var init_fallback_handler = __esm(() => {
 });
 
 // src/handlers/native-handler-advisor.ts
-import { appendFileSync as appendFileSync5 } from "fs";
+import { appendFileSync as appendFileSync6 } from "fs";
 function loadAdvisorSwapConfig(cliModels, cliCollector) {
   return {
     enabled: process.env.CLAUDISH_SWAP_ADVISOR === "1" || (cliModels?.length ?? 0) > 0,
@@ -49230,7 +49332,7 @@ function logAdvisorEvent(cfg, event) {
   const line = `${JSON.stringify({ ts: new Date().toISOString(), ...event })}
 `;
   try {
-    appendFileSync5(cfg.logPath, line);
+    appendFileSync6(cfg.logPath, line);
   } catch {}
 }
 function recordAdvisorEventsFromChunk(cfg, chunkText) {
@@ -52031,11 +52133,30 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
   }));
   app.get("/health", (c) => c.json({ status: "ok" }));
   const servedSlotIds = options.servedSlotIds ?? [];
+  const discoverableModelIds = (() => {
+    const seen = new Set;
+    try {
+      const cfg = loadConfig();
+      for (const name of Object.keys(cfg.routing ?? {})) {
+        if (name === "*")
+          continue;
+        seen.add(name);
+      }
+      for (const ep of Object.values(cfg.customEndpoints ?? {})) {
+        for (const m of ep.models ?? [])
+          seen.add(m);
+      }
+    } catch (err) {
+      log(`[Proxy] /v1/models discovery skipped: ${err instanceof Error ? err.message : err}`);
+    }
+    return [...seen];
+  })();
   app.get("/v1/models", (c) => {
+    const ids = servedSlotIds.length > 0 ? servedSlotIds : discoverableModelIds;
     return c.json({
       object: "list",
       has_more: false,
-      data: servedSlotIds.map((id) => ({
+      data: ids.map((id) => ({
         id,
         object: "model",
         type: "model",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.57.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.57.0",
-    "@claudish/magmux-darwin-x64": "7.57.0",
-    "@claudish/magmux-linux-arm64": "7.57.0",
-    "@claudish/magmux-linux-x64": "7.57.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",