claudish 7.62.0 → 7.63.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.62.0";
+var VERSION = "7.63.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -36505,6 +36505,17 @@ function wrapAnthropicError(status, message, errorType, upstreamStatus) {
     error46.upstream_status = upstreamStatus;
   return { type: "error", error: error46 };
 }
+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 extractProviderMessage(body) {
   if (body == null)
     return "";
@@ -45297,6 +45308,40 @@ var init_endpoint_diagnostics = __esm(() => {
   reasons = new Map;
 });
 
+// src/providers/picker-alias-extra.ts
+var PROVIDER_FILTER_ALIAS_EXTRA;
+var init_picker_alias_extra = __esm(() => {
+  PROVIDER_FILTER_ALIAS_EXTRA = {
+    gem: "google",
+    zen: "opencode-zen"
+  };
+});
+
+// src/providers/reserved-namespace.ts
+function reservedNamespace() {
+  const reserved = new Map;
+  for (const def of BUILTIN_PROVIDERS) {
+    reserved.set(def.name.toLowerCase(), def.name);
+    for (const shortcut of def.shortcuts) {
+      reserved.set(shortcut.toLowerCase(), def.name);
+    }
+    for (const legacy of def.legacyPrefixes) {
+      reserved.set(legacy.prefix.replace(/[/:]+$/, "").toLowerCase(), def.name);
+    }
+  }
+  for (const [alias, owner] of Object.entries(PROVIDER_FILTER_ALIAS_EXTRA)) {
+    reserved.set(alias.toLowerCase(), owner);
+  }
+  return reserved;
+}
+function reservedNamespaceOwner(name) {
+  return reservedNamespace().get(name.toLowerCase());
+}
+var init_reserved_namespace = __esm(() => {
+  init_picker_alias_extra();
+  init_provider_definitions();
+});
+
 // src/providers/custom-endpoints-loader.ts
 function registerEndpoint(name, entry, ovr) {
   const validated = CustomEndpointSchema.parse(entry);
@@ -45314,11 +45359,18 @@ function registerEndpoint(name, entry, ovr) {
   clearEndpointUnavailable(name);
 }
 function loadCustomEndpoints(config2) {
-  const result = { registered: 0, errors: [] };
+  const result = { registered: 0, errors: [], refused: [] };
   const raw = config2.customEndpoints;
   if (!raw || typeof raw !== "object")
     return result;
   for (const [name, entry] of Object.entries(raw)) {
+    const owner = reservedNamespaceOwner(name);
+    if (owner) {
+      const reason = `'${name}' is already claimed by builtin provider '${owner}' ` + "(as its name, a shortcut, or a legacy prefix)";
+      result.refused.push({ name, reason });
+      recordEndpointUnavailable(name, `custom endpoint was skipped because ${reason}`);
+      continue;
+    }
     try {
       registerEndpoint(name, entry);
       result.registered++;
@@ -45549,21 +45601,13 @@ var init_custom_endpoints_loader = __esm(() => {
   init_composed_handler();
   init_endpoint_diagnostics();
   init_provider_definitions();
+  init_reserved_namespace();
   init_runtime_providers();
   init_anthropic_compat();
   init_litellm();
   init_openai();
 });
 
-// src/providers/picker-alias-extra.ts
-var PROVIDER_FILTER_ALIAS_EXTRA;
-var init_picker_alias_extra = __esm(() => {
-  PROVIDER_FILTER_ALIAS_EXTRA = {
-    gem: "google",
-    zen: "opencode-zen"
-  };
-});
-
 // src/providers/predefined-catalog.ts
 var PREDEFINED_ENDPOINTS;
 var init_predefined_catalog = __esm(() => {
@@ -45872,22 +45916,6 @@ function warnOnce2(message) {
 function activeCatalog() {
   return catalogOverride ?? PREDEFINED_ENDPOINTS;
 }
-function reservedNamespace() {
-  const reserved = new Map;
-  for (const def of BUILTIN_PROVIDERS) {
-    reserved.set(def.name.toLowerCase(), def.name);
-    for (const shortcut of def.shortcuts) {
-      reserved.set(shortcut.toLowerCase(), def.name);
-    }
-    for (const legacy of def.legacyPrefixes) {
-      reserved.set(legacy.prefix.replace(/[/:]+$/, "").toLowerCase(), def.name);
-    }
-  }
-  for (const [alias, owner] of Object.entries(PROVIDER_FILTER_ALIAS_EXTRA)) {
-    reserved.set(alias.toLowerCase(), owner);
-  }
-  return reserved;
-}
 function readOptOut(config2) {
   const off = { disabled: true, disable: new Set, enable: new Set };
   if (process.env[KILL_SWITCH_ENV] === "1")
@@ -46026,9 +46054,8 @@ var init_predefined_endpoints = __esm(() => {
   init_config_schema();
   init_custom_endpoints_loader();
   init_endpoint_diagnostics();
-  init_picker_alias_extra();
   init_predefined_catalog();
-  init_provider_definitions();
+  init_reserved_namespace();
   init_runtime_providers();
   warnedMessages2 = new Set;
   ownRegistrations = new Set;
@@ -46038,23 +46065,67 @@ var init_predefined_endpoints = __esm(() => {
 var exports_endpoint_registration = {};
 __export(exports_endpoint_registration, {
   invalidateEndpointRegistration: () => invalidateEndpointRegistration,
+  getCustomEndpointResult: () => getCustomEndpointResult,
   ensureEndpointsRegistered: () => ensureEndpointsRegistered
 });
+function getCustomEndpointResult() {
+  return lastCustomResult;
+}
 function ensureEndpointsRegistered(opts = {}) {
   if (registered && !opts.force)
     return;
+  let config2;
+  try {
+    config2 = opts.config ?? loadConfig();
+  } catch {
+    return;
+  }
   registered = true;
   try {
-    loadPredefinedEndpoints(opts.config ?? loadConfig());
+    loadPredefinedEndpoints(config2);
+  } catch {}
+  try {
+    lastCustomResult = loadCustomEndpoints(config2);
+    reportCustomEndpoints(lastCustomResult);
+  } catch {}
+  try {
+    warnOnProjectScopedEndpoints();
   } catch {}
 }
+function reportCustomEndpoints(result) {
+  for (const { name, message } of result.errors) {
+    logStderr(`customEndpoints['${name}'] failed validation: ${message}`);
+  }
+  for (const { name, reason } of result.refused) {
+    warnOnce3(`customEndpoints['${name}'] skipped: ${reason}. The builtin wins. ` + `Rename your entry (e.g. '${name}-custom') to use it.`);
+  }
+}
+function warnOnProjectScopedEndpoints() {
+  try {
+    const local = loadLocalConfig();
+    const names = Object.keys(local?.customEndpoints ?? {});
+    if (names.length === 0)
+      return;
+    warnOnce3(`.claudish.json declares customEndpoints (${names.join(", ")}) but they are ` + "read from the GLOBAL config only, so they are being ignored. Move them to " + "~/.claudish/config.json.");
+  } catch {}
+}
+function warnOnce3(message) {
+  if (warnedMessages3.has(message))
+    return;
+  warnedMessages3.add(message);
+  logStderr(message);
+}
 function invalidateEndpointRegistration() {
   registered = false;
 }
-var registered = false;
+var registered = false, lastCustomResult, warnedMessages3;
 var init_endpoint_registration = __esm(() => {
+  init_logger();
   init_profile_config();
+  init_custom_endpoints_loader();
   init_predefined_endpoints();
+  lastCustomResult = { registered: 0, errors: [], refused: [] };
+  warnedMessages3 = new Set;
 });
 
 // src/providers/provider-registry.ts
@@ -46911,7 +46982,6 @@ async function prepareParentRoutingContext() {
     try {
       const config2 = loadConfig();
       ensureEndpointsRegistered({ config: config2 });
-      loadCustomEndpoints(config2);
     } catch {}
   }
   try {
@@ -46960,7 +47030,6 @@ var init_prehydrate = __esm(() => {
   init_profile_config();
   init_auto_route();
   init_catalog_client();
-  init_custom_endpoints_loader();
   init_endpoint_registration();
   init_model_parser();
   init_onepassword();
@@ -48113,17 +48182,6 @@ async function safeReadBody(response) {
     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;
@@ -48447,6 +48505,7 @@ function isFailureState(state) {
 }
 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_anthropic_error();
   init_model_unsupported();
   OAUTH_PROVIDERS2 = new Set(["vertex", "antigravity", "devin"]);
   MINIMAL_EFFORT_UNSUPPORTED = new Set(["native-anthropic", "anthropic"]);
@@ -50491,6 +50550,10 @@ ${summary}`);
 function isRetryableError(status, errorBody, provider) {
   if (hasQuotaExhaustionWording(errorBody))
     return true;
+  const upstream = status === 400 ? extractUpstreamStatus(errorBody) : undefined;
+  if (upstream === 401 || upstream === 403 || upstream === 402 || upstream === 429) {
+    return true;
+  }
   if (status === 401 || status === 403)
     return true;
   if (status === 402)
@@ -50526,8 +50589,15 @@ function isRetryableError(status, errorBody, provider) {
 function exhaustedChainStatus(errors3) {
   if (errors3.length === 0)
     return 400;
-  const allTransient = errors3.every((e) => e.status === 429 || e.status === 503 || hasQuotaExhaustionWording(e.message));
-  return allTransient ? 503 : 400;
+  const isTransient = (e) => {
+    if (e.status === 429 || e.status === 503)
+      return true;
+    if (hasQuotaExhaustionWording(e.message))
+      return true;
+    const upstream = e.status === 400 ? extractUpstreamStatus(e.message) : undefined;
+    return upstream === 429 || upstream === 503;
+  };
+  return errors3.every(isTransient) ? 503 : 400;
 }
 function isProvider(provider, needle) {
   if (!provider)
@@ -50552,6 +50622,7 @@ function truncate(s, max) {
 var init_fallback_handler = __esm(() => {
   init_logger();
   init_composed_handler();
+  init_anthropic_error();
   init_quota_exhaustion();
 });
 
@@ -52034,14 +52105,11 @@ function maybeCaptureClassifierRequest(c, body) {
 async function createProxyServer(port, _openrouterApiKey, model, monitorMode = false, anthropicApiKey, modelMap, options = {}) {
   try {
     const config2 = loadConfig();
-    ensureEndpointsRegistered({ config: config2 });
-    const customEpResult = loadCustomEndpoints(config2);
+    ensureEndpointsRegistered({ config: config2, force: true });
+    const customEpResult = getCustomEndpointResult();
     if (customEpResult.registered > 0) {
       log(`[Proxy] Registered ${customEpResult.registered} custom endpoint(s) from config`);
     }
-    for (const err of customEpResult.errors) {
-      logStderr(`customEndpoints['${err.name}'] failed validation: ${err.message}`);
-    }
   } catch (err) {
     log(`[Proxy] customEndpoints load skipped: ${err instanceof Error ? err.message : String(err)}`);
   }
@@ -52511,7 +52579,6 @@ var init_proxy_server = __esm(() => {
   init_profile_config();
   init_auto_route();
   init_catalog_client();
-  init_custom_endpoints_loader();
   init_endpoint_diagnostics();
   init_endpoint_registration();
   init_model_parser();
@@ -54106,6 +54173,7 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
       const doProbe = args.probe !== false;
       const timeoutMs = typeof args.timeout_ms === "number" ? args.timeout_ms : 20000;
       const proxy = doProbe ? await getProxy() : null;
+      ensureEndpointsRegistered();
       const rows = [];
       const readyModels = [];
       const failedModels = [];
@@ -54775,6 +54843,7 @@ var init_mcp_server = __esm(() => {
   init_progress_heartbeat();
   init_model_loader();
   init_port_manager();
+  init_endpoint_registration();
   init_model_parser();
   init_onepassword();
   init_probe_live();
@@ -55806,7 +55875,7 @@ __export(exports_providers, {
   providerAuthSource: () => providerAuthSource,
   providerAuthCapabilities: () => providerAuthCapabilities,
   maskKey: () => maskKey2,
-  PROVIDERS: () => PROVIDERS
+  getProviderDefs: () => getProviderDefs
 });
 function toProviderDef(def) {
   return {
@@ -55846,6 +55915,9 @@ function providerAuthCapabilities(p, config3) {
     oauth: { supported: oauthSupported, set: oauthSet }
   };
 }
+function getProviderDefs() {
+  return getAllProviders().filter((d) => !SKIP.has(d.name)).map(toProviderDef);
+}
 function maskKey2(key) {
   if (!key)
     return "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
@@ -55853,7 +55925,7 @@ function maskKey2(key) {
     return "****    ";
   return `${key.slice(0, 3)}\u2022\u2022${key.slice(-3)}`;
 }
-var SKIP, PROVIDERS;
+var SKIP;
 var init_providers = __esm(() => {
   init_antigravity_token();
   init_source();
@@ -55861,7 +55933,6 @@ var init_providers = __esm(() => {
   init_devin_credentials();
   init_provider_definitions();
   SKIP = new Set(["qwen", "native-anthropic"]);
-  PROVIDERS = getAllProviders().filter((d) => !SKIP.has(d.name)).map(toProviderDef);
 });
 
 // src/providers-command.ts
@@ -55871,7 +55942,8 @@ __export(exports_providers_command, {
   collectProviderStatuses: () => collectProviderStatuses
 });
 async function collectProviderStatuses(config3 = loadConfig()) {
-  return Promise.all(PROVIDERS.map(async (p) => {
+  ensureEndpointsRegistered();
+  return Promise.all(getProviderDefs().map(async (p) => {
     const authSource = await describeSource(p, config3);
     return {
       slug: p.catalogName,
@@ -55895,6 +55967,7 @@ async function providersCommand(opts) {
 var init_providers_command = __esm(() => {
   init_source();
   init_profile_config();
+  init_endpoint_registration();
   init_providers();
 });
 
@@ -75055,7 +75128,17 @@ var init_probe_catalog = __esm(() => {
 });
 
 // src/tui/constants.ts
-var COMMON_MODELS, PROVIDER_PREFIXES, CHAIN_PROVIDERS, HEADER_H = 2, TABS_H = 3, FOOTER_H = 1, DETAIL_H = 7;
+function getProviderPrefixes() {
+  return getProviderDefs().map((p) => ({
+    prefix: p.aliases?.[0] ? `${p.aliases[0]}@` : `${p.name}@`,
+    displayName: p.displayName,
+    name: p.name
+  }));
+}
+function getChainProviders() {
+  return getProviderDefs();
+}
+var COMMON_MODELS, HEADER_H = 2, TABS_H = 3, FOOTER_H = 1, DETAIL_H = 7;
 var init_constants3 = __esm(() => {
   init_providers();
   COMMON_MODELS = [
@@ -75077,12 +75160,6 @@ var init_constants3 = __esm(() => {
     "or@x-ai/grok-code-fast-1",
     "or@deepseek/deepseek-r1"
   ];
-  PROVIDER_PREFIXES = PROVIDERS.map((p) => ({
-    prefix: p.aliases?.[0] ? `${p.aliases[0]}@` : `${p.name}@`,
-    displayName: p.displayName,
-    name: p.name
-  }));
-  CHAIN_PROVIDERS = PROVIDERS;
 });
 
 // src/tui/components/Footer.tsx
@@ -76863,8 +76940,9 @@ function ProfilesContent({
     { name: "global    ~/.claudish/config.json", description: "", value: "global" },
     { name: "project   ./.claudish.json", description: "", value: "project" }
   ];
-  const prefixColW = PROVIDER_PREFIXES.reduce((max, p) => Math.max(max, p.prefix.length), 0) + 2;
-  const prefixOptions = PROVIDER_PREFIXES.map((p) => ({
+  const prefixes = getProviderPrefixes();
+  const prefixColW = prefixes.reduce((max, p) => Math.max(max, p.prefix.length), 0) + 2;
+  const prefixOptions = prefixes.map((p) => ({
     name: `${p.prefix.padEnd(prefixColW)}${p.displayName}`,
     description: "",
     value: p.prefix
@@ -78750,7 +78828,7 @@ function RoutingContent({
             scrollY: true,
             focused: false,
             style: { flexGrow: 1 },
-            children: CHAIN_PROVIDERS.map((prov, idx) => {
+            children: getChainProviders().map((prov, idx) => {
               const isCursor = idx === chainCursor;
               const isOn = chainSelected.has(prov.name);
               const pos = isOn ? chainOrder.indexOf(prov.name) + 1 : 0;
@@ -79192,10 +79270,10 @@ function useProfileWizard(args) {
     setProviderPickerIndex((i) => Math.max(0, i - 1));
   }, []);
   const prefixPickerDown = useCallback(() => {
-    setProviderPickerIndex((i) => Math.min(PROVIDER_PREFIXES.length - 1, i + 1));
+    setProviderPickerIndex((i) => Math.min(getProviderPrefixes().length - 1, i + 1));
   }, []);
   const prefixPickerSubmit = useCallback(() => {
-    const prefix = PROVIDER_PREFIXES[providerPickerIndex]?.prefix ?? "";
+    const prefix = getProviderPrefixes()[providerPickerIndex]?.prefix ?? "";
     setEditProfileValue(prefix);
     setSuggestions(computeSuggestions(prefix));
     setSuggestionIndex(-1);
@@ -79505,7 +79583,7 @@ function useRouteProbe(config3) {
         }
         for (let i = 0;i < chain.length; i++) {
           const link = chain[i];
-          const provDef = PROVIDERS.find((p) => p.catalogName === link.provider);
+          const provDef = getProviderDefs().find((p) => p.catalogName === link.provider);
           const ready = provDef ? providerIsReady(provDef, config3) : true;
           if (!ready) {
             setProbeResults((prev) => prev.map((e, idx) => idx === i ? { ...e, status: "no_key" } : e));
@@ -79609,7 +79687,7 @@ function App({ requestLogin } = {}) {
     if (activeTab !== "providers")
       return;
     let cancelled = false;
-    const localNames = PROVIDERS.filter((p) => p.isLocal).map((p) => p.catalogName);
+    const localNames = getProviderDefs().filter((p) => p.isLocal).map((p) => p.catalogName);
     if (localNames.length === 0)
       return;
     const sweep = async () => {
@@ -79653,11 +79731,12 @@ function App({ requestLogin } = {}) {
   const opPickerResolver = useRef4(null);
   const quit = useCallback3(() => renderer.destroy(), [renderer]);
   const displayProviders = useMemo2(() => {
-    return [...PROVIDERS].sort((a, b) => {
+    const roster = getProviderDefs();
+    return [...roster].sort((a, b) => {
       const aReady = providerIsReadyForDisplay(a, config3, localLiveness);
       const bReady = providerIsReadyForDisplay(b, config3, localLiveness);
       if (aReady === bReady)
-        return PROVIDERS.indexOf(a) - PROVIDERS.indexOf(b);
+        return roster.indexOf(a) - roster.indexOf(b);
       return aReady ? -1 : 1;
     });
   }, [config3, localLiveness]);
@@ -80269,9 +80348,9 @@ function App({ requestLogin } = {}) {
       if (key.name === "up" || key.name === "k") {
         setChainCursor((i) => Math.max(0, i - 1));
       } else if (key.name === "down" || key.name === "j") {
-        setChainCursor((i) => Math.min(CHAIN_PROVIDERS.length - 1, i + 1));
+        setChainCursor((i) => Math.min(getChainProviders().length - 1, i + 1));
       } else if (key.name === "space" || key.raw === " ") {
-        const prov = CHAIN_PROVIDERS[chainCursor];
+        const prov = getChainProviders()[chainCursor];
         if (prov.isLocal && !providerIsReady(prov, config3)) {
           setStatusMsg(`${prov.displayName} is disabled. Enable it in Providers first.`);
           return;
@@ -80289,7 +80368,7 @@ function App({ requestLogin } = {}) {
           return next;
         });
       } else if (key.raw && key.raw >= "1" && key.raw <= "9") {
-        const prov = CHAIN_PROVIDERS[chainCursor];
+        const prov = getChainProviders()[chainCursor];
         if (prov.isLocal && !providerIsReady(prov, config3)) {
           setStatusMsg(`${prov.displayName} is disabled. Enable it in Providers first.`);
           return;
@@ -80745,7 +80824,7 @@ function App({ requestLogin } = {}) {
         }
       } else if (key.raw === "T") {
         const fired = [];
-        for (const prov of PROVIDERS) {
+        for (const prov of getProviderDefs()) {
           const localRunning = prov.isLocal && localLiveness[prov.catalogName] === "running";
           if (!providerIsReady(prov, config3) && !localRunning)
             continue;
@@ -85530,8 +85609,11 @@ if (isMcpMode) {
 } else if (isConfigCommand) {
   traceSpan("startup:tui-import", () => Promise.resolve().then(() => (init_tui(), exports_tui))).then(async (m) => {
     const { credentials: credentials2 } = await Promise.resolve().then(() => (init_authority(), exports_authority));
-    const { PROVIDERS: PROVIDERS2 } = await Promise.resolve().then(() => (init_providers(), exports_providers));
-    await traceSpan("startup:credential-resolution", () => Promise.all(PROVIDERS2.map((p) => credentials2.isAvailable(p.catalogName, { allowOpPrompt: true }))), { providers: PROVIDERS2.length });
+    const { ensureEndpointsRegistered: ensureEndpointsRegistered2 } = await Promise.resolve().then(() => (init_endpoint_registration(), exports_endpoint_registration));
+    ensureEndpointsRegistered2();
+    const { getProviderDefs: getProviderDefs2 } = await Promise.resolve().then(() => (init_providers(), exports_providers));
+    const tuiProviders = getProviderDefs2();
+    await traceSpan("startup:credential-resolution", () => Promise.all(tuiProviders.map((p) => credentials2.isAvailable(p.catalogName, { allowOpPrompt: true }))), { providers: tuiProviders.length });
     finalizeStartupTrace("config");
     suppressStartupTraceTerminalOutput();
     return m.startConfigTui().catch(handlePromptExit);

package/package.json

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