claudish 7.56.0 → 7.58.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.56.0";
+var VERSION = "7.58.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28077,6 +28077,7 @@ var init_provider_definitions = __esm(() => {
         { prefix: "dv/", stripPrefix: true },
         { prefix: "devin/", stripPrefix: true }
       ],
+      nativeModelPatterns: [{ pattern: /^swe-/i }],
       modelDiscovery: { path: "", format: "devin-connect" },
       isDirectApi: true,
       description: "Devin subscription (dv@, devin@)"
@@ -28214,6 +28215,7 @@ var init_provider_definitions = __esm(() => {
       baseUrl: "https://api.minimax.io",
       baseUrlEnvVars: ["MINIMAX_CODING_BASE_URL"],
       apiPath: "/anthropic/v1/messages",
+      modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "MINIMAX_CODING_API_KEY",
       apiKeyDescription: "MiniMax Coding Plan API Key",
       apiKeyUrl: "https://platform.minimax.io/user-center/basic-information/interface-key",
@@ -28250,6 +28252,7 @@ var init_provider_definitions = __esm(() => {
       baseUrl: "https://api.moonshot.ai",
       baseUrlEnvVars: ["MOONSHOT_BASE_URL", "KIMI_BASE_URL"],
       apiPath: "/anthropic/v1/messages",
+      modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "MOONSHOT_API_KEY",
       apiKeyAliases: ["KIMI_API_KEY"],
       apiKeyDescription: "Kimi/Moonshot API Key",
@@ -28301,6 +28304,7 @@ var init_provider_definitions = __esm(() => {
       tokenStrategy: "delta-aware",
       baseUrl: "https://api.z.ai",
       apiPath: "/api/coding/paas/v4/chat/completions",
+      modelDiscovery: { path: "/api/coding/paas/v4/models", format: "openai-models-list" },
       apiKeyEnvVar: "GLM_CODING_API_KEY",
       apiKeyAliases: ["ZAI_CODING_API_KEY"],
       apiKeyDescription: "GLM Coding Plan API Key",
@@ -28377,6 +28381,7 @@ var init_provider_definitions = __esm(() => {
       baseUrl: "https://opencode.ai/zen/go",
       baseUrlEnvVars: ["OPENCODE_GO_BASE_URL"],
       apiPath: "/v1/chat/completions",
+      modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "OPENCODE_GO_API_KEY",
       apiKeyAliases: ["OPENCODE_API_KEY"],
       apiKeyDescription: "OpenCode Zen Go (Lite Plan) API Key",
@@ -28594,6 +28599,7 @@ var init_provider_definitions = __esm(() => {
       baseUrl: "https://api.sakana.ai",
       baseUrlEnvVars: ["SAKANA_BASE_URL"],
       apiPath: "/v1/chat/completions",
+      modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "SAKANA_SUBSCRIPTION_API_KEY",
       apiKeyAliases: ["SAKANA_CODING_API_KEY"],
       apiKeyDescription: "Sakana Fugu Subscription API Key",
@@ -28741,6 +28747,8 @@ var init_all_models_cache = __esm(() => {
 
 // src/providers/catalog-client.ts
 function getCatalogEntries() {
+  if (_catalogEntriesForTest !== undefined)
+    return _catalogEntriesForTest;
   if (_memCache)
     return _memCache;
   const cache = readAllModelsCache();
@@ -28760,6 +28768,26 @@ function getCatalogEntries() {
   }
   return null;
 }
+function latestAnthropicTierModelId(tier) {
+  const entries = getCatalogEntries();
+  if (!entries)
+    return null;
+  const family = new RegExp(`^claude-${tier}-`, "i");
+  const opus = entries.filter((e) => family.test(e.modelId));
+  if (opus.length === 0)
+    return null;
+  opus.sort((a, b) => {
+    const byDate = (b.releaseDate ?? "").localeCompare(a.releaseDate ?? "");
+    if (byDate !== 0)
+      return byDate;
+    const aFast = /-fast$/i.test(a.modelId) ? 1 : 0;
+    const bFast = /-fast$/i.test(b.modelId) ? 1 : 0;
+    if (aFast !== bFast)
+      return aFast - bFast;
+    return b.modelId.localeCompare(a.modelId);
+  });
+  return opus[0].modelId;
+}
 function isCatalogWarm() {
   return _memCache !== null && _memCache.length > 0;
 }
@@ -28902,7 +28930,7 @@ async function ensureCatalogReady(timeoutMs = 5000) {
     new Promise((resolve) => setTimeout(resolve, timeoutMs))
   ]);
 }
-var FIREBASE_CATALOG_URL, _memCache = null, _warmPromise = null;
+var FIREBASE_CATALOG_URL, _memCache = null, _catalogEntriesForTest, _warmPromise = null;
 var init_catalog_client = __esm(() => {
   init_all_models_cache();
   FIREBASE_CATALOG_URL = process.env.CLAUDISH_CATALOG_URL ?? process.env.FIREBASE_CATALOG_URL ?? "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=active&catalog=slim&limit=1000";
@@ -39714,6 +39742,24 @@ var init_devin_stream_head_sniffer = __esm(() => {
   QUOTA_MESSAGE_RE = /quota|out of credits|credit balance|billing|plan limit|exceeded your/i;
 });
 
+// src/handlers/shared/model-unsupported.ts
+function hasModelUnsupportedWording(errorBody) {
+  const lower = (errorBody || "").toLowerCase();
+  return UNSUPPORTED_PHRASES.some((phrase) => lower.includes(phrase));
+}
+var UNSUPPORTED_PHRASES;
+var init_model_unsupported = __esm(() => {
+  UNSUPPORTED_PHRASES = [
+    "not supported",
+    "unsupported model",
+    "unsupported_model",
+    "model not found",
+    "model_not_found",
+    "unknown model",
+    "no such model"
+  ];
+});
+
 // src/handlers/shared/stream-head-sniffer.ts
 function isRetryableStreamError(code, type, message) {
   if (RETRYABLE_ERROR_CODES.has(code))
@@ -41668,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();
@@ -42067,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;
@@ -42515,7 +42594,7 @@ function getRecoveryHint(status, errorText, providerName, transportTerminal429)
     return "Rate limited. Wait, reduce concurrency, or check plan limits.";
   }
   if (status === 401 || status === 403) {
-    if (lower.includes("not supported") || lower.includes("unsupported model") || lower.includes("model not found")) {
+    if (hasModelUnsupportedWording(errorText)) {
       return "Model not supported by this provider. Verify model name.";
     }
     if (isQuotaExhaustionError(status, errorText)) {
@@ -42558,6 +42637,7 @@ var init_composed_handler = __esm(() => {
   init_collect_sse_message();
   init_connection_error();
   init_devin_stream_head_sniffer();
+  init_model_unsupported();
   init_openai_compat();
   init_quota_exhaustion();
   init_stream_head_sniffer();
@@ -42568,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];
 });
 
@@ -43277,6 +43358,11 @@ async function discoverProviderModels(providerName) {
       return recordFailure({ kind: "no-credentials", provider: providerName, endpoint });
     }
   }
+  headers = {
+    "User-Agent": `claudish/${VERSION}`,
+    ...def.headers ?? {},
+    ...headers
+  };
   let response;
   try {
     response = await fetch(endpoint, {
@@ -44954,6 +45040,7 @@ var init_default_routing_rules = __esm(() => {
     "ministral-*": ["mistralai", "openrouter"],
     "codestral-*": ["mistralai", "openrouter"],
     "labs-*": ["mistralai"],
+    "swe-*": ["devin"],
     fugu: ["sakana-subscription", "sakana"],
     "fugu-*": ["sakana-subscription", "sakana"],
     "*-zen": ["opencode-zen"],
@@ -45558,7 +45645,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";
 }
@@ -45569,7 +45656,7 @@ function emit(line) {
   const filePath = process.env[TRACE_FILE_ENV];
   if (filePath) {
     try {
-      appendFileSync4(filePath, formatted);
+      appendFileSync5(filePath, formatted);
     } catch {}
   }
 }
@@ -46369,6 +46456,15 @@ function normalizePricingDisplay(raw) {
     return "FREE";
   return pricing;
 }
+function formatListingPrice(entry, opts) {
+  const rate = normalizePricingDisplay(entry.pricing?.average);
+  if (rate !== "N/A")
+    return rate;
+  const plan = entry.subscription?.plan;
+  if (!plan)
+    return "N/A";
+  return opts?.compact ? "SUB" : `SUB (${plan})`;
+}
 function computeQuickPicks(primaries) {
   if (primaries.length === 0) {
     return {
@@ -46603,6 +46699,412 @@ async function isPortAvailable(port) {
 }
 var init_port_manager = () => {};
 
+// src/providers/probe-live.ts
+function effortForProvider(provider) {
+  return MINIMAL_EFFORT_UNSUPPORTED.has(provider) ? "low" : "minimal";
+}
+async function probeLink(proxyUrl, link, timeoutMs) {
+  const isOAuth = OAUTH_PROVIDERS2.has(link.provider);
+  if (!link.hasCredentials && !isOAuth) {
+    return {
+      state: "key-missing",
+      latencyMs: 0,
+      errorMessage: link.credentialHint
+    };
+  }
+  const startedAt = Date.now();
+  let response;
+  try {
+    response = await fetch(`${proxyUrl}/v1/messages`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        model: link.modelSpec,
+        system: "You are a helpful assistant.",
+        messages: [{ role: "user", content: PROBE_PROMPT }],
+        max_tokens: PROBE_MAX_TOKENS,
+        output_config: { effort: effortForProvider(link.provider) },
+        stream: true
+      }),
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+  } catch (e) {
+    const latencyMs = Date.now() - startedAt;
+    const name = e?.name || "";
+    const msg2 = String(e?.message || e);
+    if (name === "TimeoutError" || name === "AbortError" || /timeout/i.test(msg2)) {
+      return { state: "timeout", latencyMs, errorMessage: msg2 };
+    }
+    return { state: "network-error", latencyMs, errorMessage: msg2 };
+  }
+  const ttfbMs = Date.now() - startedAt;
+  if (!response.ok) {
+    const body = await safeReadBody(response);
+    return annotateOAuthHint(classifyHttpError(response.status, body, ttfbMs), link.provider, isOAuth);
+  }
+  const streamResult = await consumeProbeStream(response, timeoutMs, startedAt);
+  const totalMs = Date.now() - startedAt;
+  let timing2;
+  if (streamResult.state === "live" && streamResult.ttftMs !== undefined && !streamResult.truncated) {
+    const ttftMs = streamResult.ttftMs;
+    const tokens = streamResult.tokens ?? 0;
+    const streamMs = Math.max(STREAM_MS_FLOOR, totalMs - ttftMs);
+    const tokensPerSec = tokens > 0 ? tokens / streamMs * 1000 : 0;
+    timing2 = { ttfbMs, ttftMs, totalMs, tokens, tokensPerSec };
+  }
+  const { ttftMs: _ttft, tokens: _tok, truncated: _trunc, ...rest } = streamResult;
+  return annotateOAuthHint({
+    ...rest,
+    latencyMs: totalMs,
+    timing: timing2
+  }, link.provider, isOAuth);
+}
+function annotateOAuthHint(result, provider, isOAuth) {
+  if (!isOAuth)
+    return result;
+  if (result.state === "live")
+    return result;
+  const loginCommand = provider === "antigravity" ? "claudish login antigravity" : provider === "vertex" ? "gcloud auth application-default login" : provider === "devin" ? "devin login" : undefined;
+  if (!loginCommand)
+    return result;
+  if (result.httpStatus === 403)
+    return result;
+  const looksLikeAuthFailure = result.state === "auth-failed" || /auth|token|login|credential|unauthor/i.test(result.errorMessage || "");
+  if (!looksLikeAuthFailure)
+    return result;
+  return {
+    ...result,
+    state: "auth-failed",
+    actionHint: `run: ${loginCommand}`
+  };
+}
+async function safeReadBody(response) {
+  try {
+    const text = await response.text();
+    return text.slice(0, 500);
+  } catch {
+    return "";
+  }
+}
+function extractUpstreamStatus(body) {
+  if (!body)
+    return;
+  try {
+    const parsed = JSON.parse(body);
+    const status = parsed?.error?.upstream_status;
+    return typeof status === "number" ? status : undefined;
+  } catch {
+    return;
+  }
+}
+function extractErrorType(body) {
+  if (!body)
+    return;
+  try {
+    const parsed = JSON.parse(body);
+    const t = parsed?.error?.type;
+    return typeof t === "string" ? t : undefined;
+  } catch {
+    return;
+  }
+}
+function classifyHttpError(status, body, latencyMs) {
+  const lowered = body.toLowerCase();
+  if (extractErrorType(body) === "connection_error") {
+    return {
+      state: "network-error",
+      latencyMs,
+      httpStatus: status,
+      errorMessage: extractErrorMessage(body) || "Cannot reach provider"
+    };
+  }
+  const upstream = status === 400 ? extractUpstreamStatus(body) : undefined;
+  if (status === 401 || status === 403 || upstream === 401 || upstream === 403) {
+    const authStatus = upstream ?? status;
+    if (hasModelUnsupportedWording(body)) {
+      return {
+        state: "model-not-found",
+        latencyMs,
+        httpStatus: authStatus,
+        errorMessage: extractErrorMessage(body) || `HTTP ${authStatus}`
+      };
+    }
+    return {
+      state: "auth-failed",
+      latencyMs,
+      httpStatus: authStatus,
+      errorMessage: extractErrorMessage(body) || `HTTP ${authStatus}`
+    };
+  }
+  if (status === 404 || /model[_ ]not[_ ]found|no such model|unknown model/.test(lowered)) {
+    return {
+      state: "model-not-found",
+      latencyMs,
+      httpStatus: status,
+      errorMessage: extractErrorMessage(body) || `HTTP ${status}`
+    };
+  }
+  if (status === 429) {
+    return {
+      state: "rate-limited",
+      latencyMs,
+      httpStatus: status,
+      errorMessage: extractErrorMessage(body) || "Rate limited"
+    };
+  }
+  if (upstream === 429 || status === 402) {
+    return {
+      state: "out-of-credit",
+      latencyMs,
+      httpStatus: upstream ?? status,
+      errorMessage: extractErrorMessage(body) || "Out of credit \u2014 account balance or plan exhausted"
+    };
+  }
+  if (status >= 500) {
+    return {
+      state: "server-error",
+      latencyMs,
+      httpStatus: status,
+      errorMessage: extractErrorMessage(body) || `HTTP ${status}`
+    };
+  }
+  return {
+    state: "error",
+    latencyMs,
+    httpStatus: status,
+    errorMessage: extractErrorMessage(body) || `HTTP ${status}`
+  };
+}
+function extractErrorMessage(body) {
+  if (!body)
+    return;
+  try {
+    const parsed = JSON.parse(body);
+    const msg2 = parsed?.error?.message || parsed?.error?.error?.message || parsed?.message || parsed?.detail;
+    if (typeof msg2 === "string" && msg2.length > 0) {
+      return msg2.length > 160 ? `${msg2.slice(0, 157)}...` : msg2;
+    }
+  } catch {}
+  const trimmed2 = body.trim();
+  if (!trimmed2)
+    return;
+  return trimmed2.length > 160 ? `${trimmed2.slice(0, 157)}...` : trimmed2;
+}
+async function consumeProbeStream(response, timeoutMs, startedAt) {
+  const body = response.body;
+  if (!body) {
+    return { state: "error", errorMessage: "empty response body" };
+  }
+  const reader = body.getReader();
+  const decoder = new TextDecoder;
+  let buffered = "";
+  const deadline = Date.now() + timeoutMs;
+  let ttftMs;
+  let sawContent = false;
+  let textChars = 0;
+  let reportedTokens;
+  let stopReason;
+  let errorVerdict = null;
+  let completed = false;
+  try {
+    while (Date.now() < deadline) {
+      const { value, done } = await reader.read();
+      if (done) {
+        completed = true;
+        break;
+      }
+      buffered += decoder.decode(value, { stream: true });
+      const events = buffered.split(`
+
+`);
+      buffered = events.pop() ?? "";
+      for (const event of events) {
+        const verdict = interpretSseEvent(event);
+        if (verdict && typeof verdict === "object" && verdict.state !== "live") {
+          errorVerdict = verdict;
+          break;
+        }
+        const acct = accountStreamEvent(event);
+        if (acct.contentDelta) {
+          if (ttftMs === undefined)
+            ttftMs = Date.now() - startedAt;
+          sawContent = true;
+        }
+        if (acct.textChars)
+          textChars += acct.textChars;
+        if (acct.outputTokens !== undefined)
+          reportedTokens = acct.outputTokens;
+        if (acct.stopReason)
+          stopReason = acct.stopReason;
+      }
+      if (errorVerdict)
+        break;
+    }
+  } catch (e) {
+    if (!sawContent) {
+      return { state: "network-error", errorMessage: String(e?.message || e) };
+    }
+  } finally {
+    try {
+      await reader.cancel();
+    } catch {}
+  }
+  if (errorVerdict)
+    return errorVerdict;
+  if (sawContent) {
+    const tokens = reportedTokens ?? Math.max(1, Math.round(textChars / 4));
+    return { state: "live", ttftMs, tokens, truncated: !completed };
+  }
+  const truncationReason = stopReason === "max_tokens" || stopReason === "length" ? stopReason : undefined;
+  if (truncationReason || reportedTokens !== undefined && reportedTokens >= PROBE_MAX_TOKENS) {
+    const cause = truncationReason ? `finish: ${truncationReason}` : `${reportedTokens} tokens consumed, none visible`;
+    return {
+      state: "error",
+      errorMessage: `no visible output within probe budget (${cause})`
+    };
+  }
+  return { state: "error", errorMessage: "stream ended without content" };
+}
+function accountStreamEvent(rawEvent) {
+  let dataPayload = "";
+  for (const line of rawEvent.split(`
+`)) {
+    if (line.startsWith("data:"))
+      dataPayload += line.slice(5).trim();
+  }
+  if (!dataPayload || dataPayload === "[DONE]") {
+    return { contentDelta: false, textChars: 0 };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(dataPayload);
+  } catch {
+    return { contentDelta: false, textChars: 0 };
+  }
+  let textChars = 0;
+  let contentDelta = false;
+  const text = parsed?.delta?.text ?? (Array.isArray(parsed?.choices) ? parsed.choices[0]?.delta?.content : undefined);
+  if (typeof text === "string" && text.length > 0) {
+    contentDelta = true;
+    textChars = text.length;
+  } else if (parsed?.type === "content_block_delta" || parsed?.type === "content_block_start") {
+    contentDelta = true;
+  }
+  const outputTokens = parsed?.usage?.output_tokens ?? parsed?.message?.usage?.output_tokens ?? parsed?.usage?.completion_tokens;
+  const stopReason = parsed?.delta?.stop_reason ?? (Array.isArray(parsed?.choices) ? parsed.choices[0]?.finish_reason : undefined);
+  return {
+    contentDelta,
+    textChars,
+    outputTokens: typeof outputTokens === "number" ? outputTokens : undefined,
+    stopReason: typeof stopReason === "string" ? stopReason : undefined
+  };
+}
+function interpretSseEvent(rawEvent) {
+  const lines = rawEvent.split(`
+`);
+  let eventType = "";
+  let dataPayload = "";
+  for (const line of lines) {
+    if (line.startsWith("event:"))
+      eventType = line.slice(6).trim();
+    else if (line.startsWith("data:"))
+      dataPayload += line.slice(5).trim();
+  }
+  if (!dataPayload)
+    return null;
+  if (dataPayload === "[DONE]")
+    return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(dataPayload);
+  } catch {
+    return null;
+  }
+  if (parsed?.type === "error" || eventType === "error" || parsed?.error) {
+    const message = parsed?.error?.message || parsed?.error?.error?.message || parsed?.message || "provider returned error event";
+    const status = parsed?.error?.status || parsed?.status;
+    if (typeof status === "number") {
+      return {
+        state: status === 401 || status === 403 ? "auth-failed" : "error",
+        httpStatus: status,
+        errorMessage: message
+      };
+    }
+    return { state: "error", errorMessage: message };
+  }
+  if (isContentEvent(parsed, eventType)) {
+    return "live";
+  }
+  return null;
+}
+function isContentEvent(parsed, eventType) {
+  if (eventType === "content_block_start" || eventType === "content_block_delta")
+    return true;
+  if (eventType === "message_start")
+    return true;
+  if (parsed?.type === "content_block_start")
+    return true;
+  if (parsed?.type === "content_block_delta")
+    return true;
+  if (parsed?.type === "message_start")
+    return true;
+  if (parsed?.type === "message_delta")
+    return true;
+  if (Array.isArray(parsed?.choices) && parsed.choices.length > 0) {
+    const choice = parsed.choices[0];
+    if (choice?.delta || choice?.message || choice?.text || choice?.finish_reason)
+      return true;
+  }
+  if (parsed?.candidates)
+    return true;
+  return false;
+}
+function withDetail(base, message) {
+  return message ? `${base} \u2014 ${message}` : base;
+}
+function describeProbeState(result) {
+  const status = result.httpStatus ?? "";
+  const latency = result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : "";
+  switch (result.state) {
+    case "live":
+      return `live \xB7 ${result.latencyMs}ms`;
+    case "key-missing":
+      return result.errorMessage ? `missing (${result.errorMessage})` : "missing";
+    case "auth-failed":
+      return withDetail(`auth failed \xB7 ${status}${latency}`.trim(), result.errorMessage);
+    case "model-not-found":
+      return withDetail(`model not found \xB7 ${status}${latency}`.trim(), result.errorMessage);
+    case "rate-limited":
+      return withDetail(`rate limited \xB7 ${result.latencyMs}ms`, result.errorMessage);
+    case "out-of-credit":
+      return withDetail(`out of credit \xB7 ${status}${latency}`.trim(), result.errorMessage);
+    case "server-error":
+      return withDetail(`server error \xB7 ${status} \xB7 ${result.latencyMs}ms`, result.errorMessage);
+    case "timeout":
+      return withDetail(`timeout \xB7 ${result.latencyMs}ms`, result.errorMessage);
+    case "network-error":
+      return withDetail(`network error \xB7 ${result.latencyMs}ms`, result.errorMessage);
+    case "error": {
+      const base = `error${result.httpStatus ? ` \xB7 ${result.httpStatus}` : ""}${latency}`;
+      return withDetail(base, result.errorMessage);
+    }
+  }
+}
+function isReadyState(state) {
+  return state === "live";
+}
+function isFailureState(state) {
+  return state === "auth-failed" || state === "model-not-found" || state === "rate-limited" || state === "out-of-credit" || state === "server-error" || state === "timeout" || state === "network-error" || state === "error";
+}
+var STREAM_MS_FLOOR = 50, OAUTH_PROVIDERS2, PROBE_PROMPT = "Count from one to twenty in words, one per line.", PROBE_MAX_TOKENS = 512, MINIMAL_EFFORT_UNSUPPORTED;
+var init_probe_live = __esm(() => {
+  init_model_unsupported();
+  OAUTH_PROVIDERS2 = new Set(["vertex", "antigravity", "devin"]);
+  MINIMAL_EFFORT_UNSUPPORTED = new Set(["native-anthropic", "anthropic"]);
+});
+
 // ../../node_modules/.bun/hono@4.10.6/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
@@ -48707,7 +49209,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,
@@ -48762,7 +49264,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) {
@@ -51563,11 +52065,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",
@@ -53052,7 +53573,7 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
       };
       const renderGroup = (group) => {
         const m = group.primary;
-        const pricing = normalizePricingDisplay(m.pricing?.average);
+        const pricing = formatListingPrice(m);
         const ctx = m.context || "N/A";
         const caps = [];
         if (m.supportsTools)
@@ -53257,6 +53778,112 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
       return { content: [{ type: "text", text: output }] };
     }
   });
+  tools.push({
+    name: "preflight",
+    description: "Check a roster of models BEFORE spending a run on it. For each model: which provider " + "will actually serve it, whether that hop is covered by a SUBSCRIPTION or billed per " + "token, and whether it is reachable right now. Call this before `team` or a batch of " + "`create_session` calls \u2014 a dead or unexpectedly-metered model is then caught while " + "the roster can still be adjusted, instead of costing a slot minutes into the run.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        models: {
+          type: "array",
+          items: { type: "string" },
+          description: "Model ids to check \u2014 bare (`glm-5.2`) or explicit (`dv@swe-1.7`). Bare names go " + "through the SAME routing rules and credential filter a real run would use, so " + "the provider reported here is the provider that would serve it."
+        },
+        probe: {
+          type: "boolean",
+          description: "Send a real short request to each resolved route (default true). Set false for " + "a routing/billing answer only \u2014 far faster, but it cannot tell you the provider " + "is actually reachable, which is the failure this tool exists to catch."
+        },
+        timeout_ms: {
+          type: "number",
+          description: "Per-model probe timeout in ms (default 20000)."
+        }
+      },
+      required: ["models"]
+    },
+    group: "agentic",
+    heartbeat: true,
+    handler: async (args, ctx) => {
+      const models = Array.isArray(args.models) ? args.models : [];
+      if (models.length === 0) {
+        return {
+          content: [{ type: "text", text: "preflight: no models given." }],
+          isError: true
+        };
+      }
+      const doProbe = args.probe !== false;
+      const timeoutMs = typeof args.timeout_ms === "number" ? args.timeout_ms : 20000;
+      const proxy = doProbe ? await getProxy() : null;
+      const rows = [];
+      const readyModels = [];
+      const failedModels = [];
+      let subCount = 0;
+      let meteredCount = 0;
+      for (const model of models) {
+        ctx.reportProgress(`preflight: ${model}`);
+        let plan;
+        try {
+          plan = await route(model);
+        } catch (err) {
+          failedModels.push(model);
+          rows.push(`| \`${model}\` | \u2014 | \u2014 | \u274C route error | ${err instanceof Error ? err.message : String(err)} |`);
+          continue;
+        }
+        if (plan.kind === "no-route") {
+          failedModels.push(model);
+          rows.push(`| \`${model}\` | \u2014 | \u2014 | \u274C no route | ${plan.reason} |`);
+          continue;
+        }
+        const primary = plan.primary;
+        const billing = isLocalProviderName(primary.provider) ? "local" : isSubscriptionProvider(primary.provider) ? "SUB" : "metered";
+        if (billing === "SUB")
+          subCount++;
+        else if (billing === "metered")
+          meteredCount++;
+        let status = "not probed";
+        let ok = true;
+        if (proxy) {
+          try {
+            const result = await probeLink(proxy.url, {
+              provider: primary.provider,
+              modelSpec: primary.modelSpec,
+              hasCredentials: true
+            }, timeoutMs);
+            ok = isReadyState(result.state);
+            status = ok ? `\u2705 ${result.state}` : `\u274C ${result.state}${result.errorMessage ? ` \u2014 ${result.errorMessage}` : ""}`;
+          } catch (err) {
+            ok = false;
+            status = `\u274C probe error \u2014 ${err instanceof Error ? err.message : String(err)}`;
+          }
+        }
+        if (ok)
+          readyModels.push(model);
+        else
+          failedModels.push(model);
+        const fallbacks = plan.fallbacks.length > 0 ? ` (+${plan.fallbacks.length} fallback)` : "";
+        rows.push(`| \`${model}\` | ${primary.displayName}${fallbacks} | ${billing} | ${status} | \`${primary.modelSpec}\` |`);
+      }
+      const lines = [
+        `# Preflight \u2014 ${models.length} model${models.length === 1 ? "" : "s"}`,
+        "",
+        `**Ready: ${readyModels.length}** \xB7 **Failed: ${failedModels.length}** \xB7 ` + `subscription: ${subCount} \xB7 metered: ${meteredCount}`,
+        "",
+        "| Model | Provider | Billing | Status | Wire id |",
+        "|---|---|---|---|---|",
+        ...rows
+      ];
+      if (failedModels.length > 0) {
+        lines.push("", `\u26A0\uFE0F Drop or replace before running: ${failedModels.map((m) => `\`${m}\``).join(", ")}`);
+      }
+      if (meteredCount > 0) {
+        lines.push("", `\uD83D\uDCB8 ${meteredCount} model${meteredCount === 1 ? "" : "s"} will be billed PER TOKEN. ` + "A bare name can land on a metered provider when the subscription that covers it " + "has no credential configured \u2014 name the provider explicitly to pin it.");
+      }
+      if (!doProbe) {
+        lines.push("", "\u2139\uFE0F `probe: false` \u2014 routing and billing only. Reachability was NOT checked.");
+      }
+      return { content: [{ type: "text", text: lines.join(`
+`) }] };
+    }
+  });
   tools.push({
     name: "team",
     description: "Run AI models on a task with anonymized outputs and optional blind judging. Modes: 'run' (execute models), 'judge' (blind-vote on existing outputs), 'run-and-judge' (full pipeline), 'status' (check progress).",
@@ -53851,11 +54478,15 @@ var init_mcp_server = __esm(() => {
   init_prehydrate();
   init_diagnostics();
   init_channel();
+  init_remote_provider_types();
   init_progress_heartbeat();
   init_model_loader();
   init_port_manager();
+  init_model_parser();
   init_onepassword();
+  init_probe_live();
   init_provider_definitions();
+  init_routing_rules();
   init_proxy_server();
   init_redact();
   init_team_orchestrator();
@@ -68684,399 +69315,6 @@ var init_model_selector = __esm(() => {
   };
 });
 
-// src/providers/probe-live.ts
-async function probeLink(proxyUrl, link, timeoutMs) {
-  const isOAuth = OAUTH_PROVIDERS2.has(link.provider);
-  if (!link.hasCredentials && !isOAuth) {
-    return {
-      state: "key-missing",
-      latencyMs: 0,
-      errorMessage: link.credentialHint
-    };
-  }
-  const startedAt = Date.now();
-  let response;
-  try {
-    response = await fetch(`${proxyUrl}/v1/messages`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        model: link.modelSpec,
-        system: "You are a helpful assistant.",
-        messages: [{ role: "user", content: PROBE_PROMPT }],
-        max_tokens: PROBE_MAX_TOKENS,
-        output_config: { effort: "minimal" },
-        stream: true
-      }),
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-  } catch (e) {
-    const latencyMs = Date.now() - startedAt;
-    const name = e?.name || "";
-    const msg2 = String(e?.message || e);
-    if (name === "TimeoutError" || name === "AbortError" || /timeout/i.test(msg2)) {
-      return { state: "timeout", latencyMs, errorMessage: msg2 };
-    }
-    return { state: "network-error", latencyMs, errorMessage: msg2 };
-  }
-  const ttfbMs = Date.now() - startedAt;
-  if (!response.ok) {
-    const body = await safeReadBody(response);
-    return annotateOAuthHint(classifyHttpError(response.status, body, ttfbMs), link.provider, isOAuth);
-  }
-  const streamResult = await consumeProbeStream(response, timeoutMs, startedAt);
-  const totalMs = Date.now() - startedAt;
-  let timing2;
-  if (streamResult.state === "live" && streamResult.ttftMs !== undefined && !streamResult.truncated) {
-    const ttftMs = streamResult.ttftMs;
-    const tokens = streamResult.tokens ?? 0;
-    const streamMs = Math.max(STREAM_MS_FLOOR, totalMs - ttftMs);
-    const tokensPerSec = tokens > 0 ? tokens / streamMs * 1000 : 0;
-    timing2 = { ttfbMs, ttftMs, totalMs, tokens, tokensPerSec };
-  }
-  const { ttftMs: _ttft, tokens: _tok, truncated: _trunc, ...rest } = streamResult;
-  return annotateOAuthHint({
-    ...rest,
-    latencyMs: totalMs,
-    timing: timing2
-  }, link.provider, isOAuth);
-}
-function annotateOAuthHint(result, provider, isOAuth) {
-  if (!isOAuth)
-    return result;
-  if (result.state === "live")
-    return result;
-  const loginCommand2 = provider === "antigravity" ? "claudish login antigravity" : provider === "vertex" ? "gcloud auth application-default login" : provider === "devin" ? "devin login" : undefined;
-  if (!loginCommand2)
-    return result;
-  if (result.httpStatus === 403)
-    return result;
-  const looksLikeAuthFailure = result.state === "auth-failed" || /auth|token|login|credential|unauthor/i.test(result.errorMessage || "");
-  if (!looksLikeAuthFailure)
-    return result;
-  return {
-    ...result,
-    state: "auth-failed",
-    actionHint: `run: ${loginCommand2}`
-  };
-}
-async function safeReadBody(response) {
-  try {
-    const text = await response.text();
-    return text.slice(0, 500);
-  } catch {
-    return "";
-  }
-}
-function extractUpstreamStatus(body) {
-  if (!body)
-    return;
-  try {
-    const parsed = JSON.parse(body);
-    const status = parsed?.error?.upstream_status;
-    return typeof status === "number" ? status : undefined;
-  } catch {
-    return;
-  }
-}
-function extractErrorType(body) {
-  if (!body)
-    return;
-  try {
-    const parsed = JSON.parse(body);
-    const t = parsed?.error?.type;
-    return typeof t === "string" ? t : undefined;
-  } catch {
-    return;
-  }
-}
-function classifyHttpError(status, body, latencyMs) {
-  const lowered = body.toLowerCase();
-  if (extractErrorType(body) === "connection_error") {
-    return {
-      state: "network-error",
-      latencyMs,
-      httpStatus: status,
-      errorMessage: extractErrorMessage(body) || "Cannot reach provider"
-    };
-  }
-  const upstream = status === 400 ? extractUpstreamStatus(body) : undefined;
-  if (status === 401 || status === 403 || upstream === 401 || upstream === 403) {
-    const authStatus = upstream ?? status;
-    return {
-      state: "auth-failed",
-      latencyMs,
-      httpStatus: authStatus,
-      errorMessage: extractErrorMessage(body) || `HTTP ${authStatus}`
-    };
-  }
-  if (status === 404 || /model[_ ]not[_ ]found|no such model|unknown model/.test(lowered)) {
-    return {
-      state: "model-not-found",
-      latencyMs,
-      httpStatus: status,
-      errorMessage: extractErrorMessage(body) || `HTTP ${status}`
-    };
-  }
-  if (status === 429) {
-    return {
-      state: "rate-limited",
-      latencyMs,
-      httpStatus: status,
-      errorMessage: extractErrorMessage(body) || "Rate limited"
-    };
-  }
-  if (upstream === 429 || status === 402) {
-    return {
-      state: "out-of-credit",
-      latencyMs,
-      httpStatus: upstream ?? status,
-      errorMessage: extractErrorMessage(body) || "Out of credit \u2014 account balance or plan exhausted"
-    };
-  }
-  if (status >= 500) {
-    return {
-      state: "server-error",
-      latencyMs,
-      httpStatus: status,
-      errorMessage: extractErrorMessage(body) || `HTTP ${status}`
-    };
-  }
-  return {
-    state: "error",
-    latencyMs,
-    httpStatus: status,
-    errorMessage: extractErrorMessage(body) || `HTTP ${status}`
-  };
-}
-function extractErrorMessage(body) {
-  if (!body)
-    return;
-  try {
-    const parsed = JSON.parse(body);
-    const msg2 = parsed?.error?.message || parsed?.error?.error?.message || parsed?.message || parsed?.detail;
-    if (typeof msg2 === "string" && msg2.length > 0) {
-      return msg2.length > 160 ? `${msg2.slice(0, 157)}...` : msg2;
-    }
-  } catch {}
-  const trimmed2 = body.trim();
-  if (!trimmed2)
-    return;
-  return trimmed2.length > 160 ? `${trimmed2.slice(0, 157)}...` : trimmed2;
-}
-async function consumeProbeStream(response, timeoutMs, startedAt) {
-  const body = response.body;
-  if (!body) {
-    return { state: "error", errorMessage: "empty response body" };
-  }
-  const reader = body.getReader();
-  const decoder = new TextDecoder;
-  let buffered = "";
-  const deadline = Date.now() + timeoutMs;
-  let ttftMs;
-  let sawContent = false;
-  let textChars = 0;
-  let reportedTokens;
-  let stopReason;
-  let errorVerdict = null;
-  let completed = false;
-  try {
-    while (Date.now() < deadline) {
-      const { value, done } = await reader.read();
-      if (done) {
-        completed = true;
-        break;
-      }
-      buffered += decoder.decode(value, { stream: true });
-      const events = buffered.split(`
-
-`);
-      buffered = events.pop() ?? "";
-      for (const event of events) {
-        const verdict = interpretSseEvent(event);
-        if (verdict && typeof verdict === "object" && verdict.state !== "live") {
-          errorVerdict = verdict;
-          break;
-        }
-        const acct = accountStreamEvent(event);
-        if (acct.contentDelta) {
-          if (ttftMs === undefined)
-            ttftMs = Date.now() - startedAt;
-          sawContent = true;
-        }
-        if (acct.textChars)
-          textChars += acct.textChars;
-        if (acct.outputTokens !== undefined)
-          reportedTokens = acct.outputTokens;
-        if (acct.stopReason)
-          stopReason = acct.stopReason;
-      }
-      if (errorVerdict)
-        break;
-    }
-  } catch (e) {
-    if (!sawContent) {
-      return { state: "network-error", errorMessage: String(e?.message || e) };
-    }
-  } finally {
-    try {
-      await reader.cancel();
-    } catch {}
-  }
-  if (errorVerdict)
-    return errorVerdict;
-  if (sawContent) {
-    const tokens = reportedTokens ?? Math.max(1, Math.round(textChars / 4));
-    return { state: "live", ttftMs, tokens, truncated: !completed };
-  }
-  const truncationReason = stopReason === "max_tokens" || stopReason === "length" ? stopReason : undefined;
-  if (truncationReason || reportedTokens !== undefined && reportedTokens >= PROBE_MAX_TOKENS) {
-    const cause = truncationReason ? `finish: ${truncationReason}` : `${reportedTokens} tokens consumed, none visible`;
-    return {
-      state: "error",
-      errorMessage: `no visible output within probe budget (${cause})`
-    };
-  }
-  return { state: "error", errorMessage: "stream ended without content" };
-}
-function accountStreamEvent(rawEvent) {
-  let dataPayload = "";
-  for (const line of rawEvent.split(`
-`)) {
-    if (line.startsWith("data:"))
-      dataPayload += line.slice(5).trim();
-  }
-  if (!dataPayload || dataPayload === "[DONE]") {
-    return { contentDelta: false, textChars: 0 };
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(dataPayload);
-  } catch {
-    return { contentDelta: false, textChars: 0 };
-  }
-  let textChars = 0;
-  let contentDelta = false;
-  const text = parsed?.delta?.text ?? (Array.isArray(parsed?.choices) ? parsed.choices[0]?.delta?.content : undefined);
-  if (typeof text === "string" && text.length > 0) {
-    contentDelta = true;
-    textChars = text.length;
-  } else if (parsed?.type === "content_block_delta" || parsed?.type === "content_block_start") {
-    contentDelta = true;
-  }
-  const outputTokens = parsed?.usage?.output_tokens ?? parsed?.message?.usage?.output_tokens ?? parsed?.usage?.completion_tokens;
-  const stopReason = parsed?.delta?.stop_reason ?? (Array.isArray(parsed?.choices) ? parsed.choices[0]?.finish_reason : undefined);
-  return {
-    contentDelta,
-    textChars,
-    outputTokens: typeof outputTokens === "number" ? outputTokens : undefined,
-    stopReason: typeof stopReason === "string" ? stopReason : undefined
-  };
-}
-function interpretSseEvent(rawEvent) {
-  const lines = rawEvent.split(`
-`);
-  let eventType = "";
-  let dataPayload = "";
-  for (const line of lines) {
-    if (line.startsWith("event:"))
-      eventType = line.slice(6).trim();
-    else if (line.startsWith("data:"))
-      dataPayload += line.slice(5).trim();
-  }
-  if (!dataPayload)
-    return null;
-  if (dataPayload === "[DONE]")
-    return null;
-  let parsed;
-  try {
-    parsed = JSON.parse(dataPayload);
-  } catch {
-    return null;
-  }
-  if (parsed?.type === "error" || eventType === "error" || parsed?.error) {
-    const message = parsed?.error?.message || parsed?.error?.error?.message || parsed?.message || "provider returned error event";
-    const status = parsed?.error?.status || parsed?.status;
-    if (typeof status === "number") {
-      return {
-        state: status === 401 || status === 403 ? "auth-failed" : "error",
-        httpStatus: status,
-        errorMessage: message
-      };
-    }
-    return { state: "error", errorMessage: message };
-  }
-  if (isContentEvent(parsed, eventType)) {
-    return "live";
-  }
-  return null;
-}
-function isContentEvent(parsed, eventType) {
-  if (eventType === "content_block_start" || eventType === "content_block_delta")
-    return true;
-  if (eventType === "message_start")
-    return true;
-  if (parsed?.type === "content_block_start")
-    return true;
-  if (parsed?.type === "content_block_delta")
-    return true;
-  if (parsed?.type === "message_start")
-    return true;
-  if (parsed?.type === "message_delta")
-    return true;
-  if (Array.isArray(parsed?.choices) && parsed.choices.length > 0) {
-    const choice = parsed.choices[0];
-    if (choice?.delta || choice?.message || choice?.text || choice?.finish_reason)
-      return true;
-  }
-  if (parsed?.candidates)
-    return true;
-  return false;
-}
-function withDetail(base, message) {
-  return message ? `${base} \u2014 ${message}` : base;
-}
-function describeProbeState(result) {
-  const status = result.httpStatus ?? "";
-  const latency = result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : "";
-  switch (result.state) {
-    case "live":
-      return `live \xB7 ${result.latencyMs}ms`;
-    case "key-missing":
-      return result.errorMessage ? `missing (${result.errorMessage})` : "missing";
-    case "auth-failed":
-      return withDetail(`auth failed \xB7 ${status}${latency}`.trim(), result.errorMessage);
-    case "model-not-found":
-      return withDetail(`model not found \xB7 ${status}${latency}`.trim(), result.errorMessage);
-    case "rate-limited":
-      return withDetail(`rate limited \xB7 ${result.latencyMs}ms`, result.errorMessage);
-    case "out-of-credit":
-      return withDetail(`out of credit \xB7 ${status}${latency}`.trim(), result.errorMessage);
-    case "server-error":
-      return withDetail(`server error \xB7 ${status} \xB7 ${result.latencyMs}ms`, result.errorMessage);
-    case "timeout":
-      return withDetail(`timeout \xB7 ${result.latencyMs}ms`, result.errorMessage);
-    case "network-error":
-      return withDetail(`network error \xB7 ${result.latencyMs}ms`, result.errorMessage);
-    case "error": {
-      const base = `error${result.httpStatus ? ` \xB7 ${result.httpStatus}` : ""}${latency}`;
-      return withDetail(base, result.errorMessage);
-    }
-  }
-}
-function isReadyState(state) {
-  return state === "live";
-}
-function isFailureState(state) {
-  return state === "auth-failed" || state === "model-not-found" || state === "rate-limited" || state === "out-of-credit" || state === "server-error" || state === "timeout" || state === "network-error" || state === "error";
-}
-var STREAM_MS_FLOOR = 50, OAUTH_PROVIDERS2, PROBE_PROMPT = "Count from one to twenty in words, one per line.", PROBE_MAX_TOKENS = 512;
-var init_probe_live = __esm(() => {
-  OAUTH_PROVIDERS2 = new Set(["vertex", "antigravity", "devin"]);
-});
-
 // src/tui/theme.ts
 import { createTextAttributes } from "@opentui/core";
 function latencyBucket(ms) {
@@ -71350,6 +71588,21 @@ var init_api_key_map = __esm(() => {
   };
 });
 
+// src/providers/claude-code-aliases.ts
+function claudeCodeTierAlias(model) {
+  return TIER_ALIASES[model.trim().toLowerCase()] ?? null;
+}
+var TIER_ALIASES;
+var init_claude_code_aliases = __esm(() => {
+  TIER_ALIASES = {
+    opus: "opus",
+    sonnet: "sonnet",
+    haiku: "haiku",
+    internal: "opus",
+    default: "opus"
+  };
+});
+
 // src/providers/probe-runner.ts
 function pinProbeModelSpec(link) {
   if (link.provider === "native-anthropic")
@@ -72041,7 +72294,7 @@ async function printRecommendedModels(jsonOutput, forceUpdate) {
     const rawId = m.id;
     const modelId = rawId.length > 28 ? `${rawId.substring(0, 25)}...` : rawId;
     const modelIdPadded = modelId.padEnd(28);
-    const pricing = normalizePricingDisplay(m.pricing?.average);
+    const pricing = formatListingPrice(m, { compact: true });
     const pricingPadded = pricing.padEnd(10);
     const context = m.context || "N/A";
     const contextPadded = context.padEnd(6);
@@ -72133,13 +72386,19 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
         };
       }
       if (parsed.provider === "native-anthropic") {
-        const opusModel = process.env[ENV.CLAUDISH_MODEL_OPUS] || process.env[ENV.ANTHROPIC_DEFAULT_OPUS_MODEL] || "claude-opus-4-1";
+        const tier = claudeCodeTierAlias(parsed.model);
+        const tierEnv = {
+          opus: process.env[ENV.CLAUDISH_MODEL_OPUS] || process.env[ENV.ANTHROPIC_DEFAULT_OPUS_MODEL],
+          sonnet: process.env[ENV.CLAUDISH_MODEL_SONNET] || process.env[ENV.ANTHROPIC_DEFAULT_SONNET_MODEL],
+          haiku: process.env[ENV.CLAUDISH_MODEL_HAIKU] || process.env[ENV.ANTHROPIC_DEFAULT_HAIKU_MODEL]
+        };
+        const opusModel = tier ? tierEnv[tier] || latestAnthropicTierModelId(tier) || "claude-opus-5" : parsed.model;
         return {
           routes: [
             {
               provider: "native-anthropic",
               modelSpec: opusModel,
-              displayName: "Claude Code (Opus)"
+              displayName: tier ? `Claude Code (${tier})` : "Claude Code"
             }
           ],
           source: "auto-chain",
@@ -72233,6 +72492,33 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
     }
     return chain.source;
   }
+  function buildDirectChainEntry(parsed, directProbe) {
+    const providerDef = getProviderByName(parsed.provider);
+    const keyInfo = API_KEY_MAP[parsed.provider];
+    if (!providerDef && !keyInfo)
+      return [];
+    let hasCredentials;
+    let provenance;
+    if (providerDef?.isLocal) {
+      hasCredentials = isLocalProviderEnabled(parsed.provider);
+    } else if (!keyInfo?.envVar) {
+      hasCredentials = true;
+    } else {
+      provenance = resolveApiKeyProvenance(keyInfo.envVar, keyInfo.aliases);
+      hasCredentials = provenance.hasValue || (keyInfo.aliases?.some((a) => !!process.env[a]) ?? false);
+    }
+    return [
+      {
+        provider: parsed.provider,
+        displayName: providerDef?.displayName ?? parsed.provider,
+        modelSpec: parsed.model,
+        hasCredentials,
+        credentialHint: !hasCredentials ? providerDef?.isLocal ? "enable local provider in global config" : keyInfo?.envVar : undefined,
+        provenance,
+        probe: directProbe
+      }
+    ];
+  }
   function buildResultLinks(parsed, chainDetails, directProbe) {
     if (chainDetails.length === 0) {
       const directProviderDef = getProviderByName(parsed.provider);
@@ -72383,7 +72669,7 @@ async function probeModelRouting(models, jsonOutput, options = { live: true, tim
           isExplicit: parsed.isExplicitProvider,
           routingSource: chain.source,
           matchedPattern: chain.matchedPattern,
-          chain: chainDetails,
+          chain: chainDetails.length > 0 ? chainDetails : buildDirectChainEntry(parsed, directProbeResult),
           directProbe: directProbeResult,
           wiring
         });
@@ -73010,6 +73296,8 @@ var init_cli = __esm(() => {
   init_profile_config();
   init_api_key_map();
   init_api_key_provenance();
+  init_catalog_client();
+  init_claude_code_aliases();
   init_endpoint_registration();
   init_model_parser();
   init_probe_live();

package/package.json

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