claudish 7.44.0 → 7.45.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.44.0";
+var VERSION = "7.45.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28693,6 +28693,15 @@ function resolveModelNameSync(userInput, targetProvider) {
   }
   return { resolvedId: resolved, wasResolved: true, sourceLabel: `${targetProvider} catalog` };
 }
+function resolveTargetForCatalog(target, isExplicitProvider, model, provider, resolve = resolveModelNameSync) {
+  if (!isExplicitProvider)
+    return { target, resolution: null };
+  const resolution = resolve(model, provider);
+  return {
+    target: resolution.wasResolved ? `${provider}@${resolution.resolvedId}` : target,
+    resolution
+  };
+}
 function logResolution(userInput, result, quiet = false) {
   if (result.wasResolved && !quiet) {
     process.stderr.write(`[Model] Resolved "${userInput}" \u2192 "${result.resolvedId}" (${result.sourceLabel})
@@ -36662,6 +36671,10 @@ function warnGoAliasDeprecatedOnce() {
   process.stderr.write(`[claudish] go@ is deprecated \u2014 use ag@<model> (Antigravity). Routing there.
 `);
 }
+function parseModelChain(modelSpec) {
+  const parts = modelSpec.split(MODEL_CHAIN_SEPARATOR).map((s) => s.trim()).filter(Boolean);
+  return parts.length > 0 ? parts : [modelSpec];
+}
 function parseModelSpec(modelSpec) {
   const original = modelSpec;
   if (modelSpec.startsWith("http://") || modelSpec.startsWith("https://")) {
@@ -36761,7 +36774,7 @@ function getLegacySyntaxWarning(parsed) {
   return `Deprecation warning: "${parsed.original}" uses legacy prefix syntax.
 ` + `  Consider using: ${newSyntax}`;
 }
-var PROVIDER_SHORTCUTS, _goDeprecationWarned = false, LOCAL_PROVIDERS, NATIVE_MODEL_PATTERNS, LEGACY_PREFIX_PATTERNS;
+var PROVIDER_SHORTCUTS, _goDeprecationWarned = false, LOCAL_PROVIDERS, NATIVE_MODEL_PATTERNS, LEGACY_PREFIX_PATTERNS, MODEL_CHAIN_SEPARATOR = "+";
 var init_model_parser = __esm(() => {
   init_provider_definitions();
   PROVIDER_SHORTCUTS = getShortcuts();
@@ -40668,6 +40681,13 @@ class ComposedHandler {
       response = next;
     }
   }
+  describeComposition() {
+    return {
+      transport: this.provider.name,
+      streamFormat: this.resolveStreamFormat(),
+      endpoint: this.provider.getEndpoint(this.bareModelName)
+    };
+  }
   resolveStreamFormat() {
     return this.provider.overrideStreamFormat?.() ?? this.explicitAdapter?.getStreamFormat() ?? this.modelAdapter?.getStreamFormat() ?? this.getAdapter().getStreamFormat();
   }
@@ -43170,11 +43190,15 @@ async function pinSpecFor(model, router = route) {
     const plan = await router(model);
     if (plan.kind !== "ok")
       return null;
-    return normalizePinnedSpec(plan.primary);
+    return joinPinnedChain([plan.primary, ...plan.fallbacks]);
   } catch {
     return null;
   }
 }
+function joinPinnedChain(routes) {
+  const specs = routes.map(normalizePinnedSpec).filter((s) => !!s);
+  return specs.length > 0 ? specs.join(MODEL_CHAIN_SEPARATOR) : null;
+}
 function normalizePinnedSpec(r) {
   const spec = r.modelSpec?.trim();
   if (!spec)
@@ -43458,6 +43482,18 @@ var init_signal_watcher = __esm(() => {
   QUESTION_PATTERNS = [/\?\s*$/m, /\bchoose\b.*:/im, /\bselect\b.*:/im, /\benter\b.*:/im];
 });
 
+// src/spawn-claudish.ts
+function resolveClaudishSpawn(env = process.env) {
+  const bin = env[CLAUDISH_BIN_ENV]?.trim();
+  if (!bin)
+    return { command: "claudish", prefixArgs: [] };
+  if (/\.(ts|tsx|js|mjs|cjs)$/.test(bin)) {
+    return { command: process.execPath, prefixArgs: ["run", bin] };
+  }
+  return { command: bin, prefixArgs: [] };
+}
+var CLAUDISH_BIN_ENV = "CLAUDISH_BIN";
+
 // src/channel/session-manager.ts
 import { spawn } from "child_process";
 import { randomUUID as randomUUID4 } from "crypto";
@@ -43498,7 +43534,8 @@ class SessionManager {
       "--quiet",
       ...opts.claudishFlags ?? []
     ];
-    const proc = spawn("claudish", args, {
+    const spawnTarget = resolveClaudishSpawn();
+    const proc = spawn(spawnTarget.command, [...spawnTarget.prefixArgs, ...args], {
       cwd: opts.cwd ?? process.cwd(),
       stdio: ["pipe", "pipe", "pipe"],
       shell: false
@@ -46149,7 +46186,7 @@ ${summary}`);
           error: truncate(parseErrorMessage(e.message), 200)
         }))
       }
-    }, 502);
+    }, exhaustedChainStatus(errors3));
   }
   async shutdown() {
     for (const { handler } of this.candidates) {
@@ -46183,6 +46220,9 @@ function isRetryableError(status, errorBody, provider) {
     if (provider?.toLowerCase().includes("antigravity") && lower.includes("invalid argument")) {
       return true;
     }
+    if (isProvider(provider, "opencodezen") && (lower.includes("upstream request failed") || lower.includes("error from provider ("))) {
+      return true;
+    }
   }
   if (status === 500) {
     if (lower.includes("insufficient balance") || lower.includes("insufficient credit") || lower.includes("quota exceeded") || lower.includes("billing")) {
@@ -46191,6 +46231,17 @@ function isRetryableError(status, errorBody, provider) {
   }
   return false;
 }
+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;
+}
+function isProvider(provider, needle) {
+  if (!provider)
+    return false;
+  return provider.toLowerCase().replace(/[^a-z0-9]/g, "").includes(needle);
+}
 function parseErrorMessage(body) {
   try {
     const parsed = JSON.parse(body);
@@ -47795,17 +47846,6 @@ var init_provider_profiles = __esm(() => {
     createHandler(ctx) {
       const zenApiKey = ctx.apiKey;
       const isGoProvider = ctx.provider.name === "opencode-zen-go";
-      if (ctx.modelName.toLowerCase().includes("minimax")) {
-        const bearerProvider = { ...ctx.provider, authScheme: "bearer" };
-        const transport2 = new AnthropicProviderTransport(bearerProvider, zenApiKey);
-        const adapter2 = new AnthropicAPIFormat(ctx.modelName, ctx.provider.name);
-        const handler2 = new ComposedHandler(transport2, ctx.targetModel, ctx.modelName, ctx.port, {
-          adapter: adapter2,
-          ...ctx.sharedOpts
-        });
-        log(`[Proxy] Created OpenCode Zen${isGoProvider ? " Go" : ""} (Anthropic composed): ${ctx.modelName}`);
-        return handler2;
-      }
       if (ctx.modelName.toLowerCase().startsWith("gpt-")) {
         const responsesProvider = { ...ctx.provider, apiPath: "/v1/responses" };
         const transport2 = new OpenAIProviderTransport(responsesProvider, ctx.modelName, zenApiKey);
@@ -48920,13 +48960,38 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
       target = model;
     }
     const invocationMode = detectInvocationMode(target, wasFromModelMap);
+    if (options.modelChain && options.modelChain.length > 1 && target === options.modelChain[0]) {
+      const cacheKey = `chain:${options.modelChain.join("+")}`;
+      const cached2 = fallbackHandlerCache.get(cacheKey);
+      if (cached2)
+        return cached2;
+      await ensureCatalogReady(5000);
+      const candidates = [];
+      for (const spec of options.modelChain) {
+        const parsed = parseModelSpec(spec);
+        const resolvedSpec = resolveTargetForCatalog(spec, parsed.isExplicitProvider, parsed.model, parsed.provider).target;
+        const handler = parsed.provider === "openrouter" ? getOpenRouterHandler(resolvedSpec, invocationMode) : await getRemoteProviderHandler(resolvedSpec, invocationMode) ?? getLocalProviderHandler(resolvedSpec, invocationMode);
+        if (handler) {
+          candidates.push({ name: DISPLAY_NAMES[parsed.provider] ?? parsed.provider, handler });
+        }
+      }
+      if (candidates.length > 0) {
+        const resultHandler = candidates.length > 1 ? new FallbackHandler(candidates) : candidates[0].handler;
+        fallbackHandlerCache.set(cacheKey, resultHandler);
+        if (!options.quiet && candidates.length > 1) {
+          logStderr(`[Route] ${candidates.length} pinned providers for ${target}: ${candidates.map((c) => c.name).join(" \u2192 ")}`);
+        }
+        return resultHandler;
+      }
+    }
     {
       const parsedTarget = parseModelSpec(target);
-      await ensureCatalogReady(5000);
-      const resolution = resolveModelNameSync(parsedTarget.model, parsedTarget.provider);
-      logResolution(parsedTarget.model, resolution, options.quiet);
-      if (resolution.wasResolved) {
-        target = `${parsedTarget.provider}@${resolution.resolvedId}`;
+      if (parsedTarget.isExplicitProvider) {
+        await ensureCatalogReady(5000);
+        const outcome = resolveTargetForCatalog(target, parsedTarget.isExplicitProvider, parsedTarget.model, parsedTarget.provider);
+        if (outcome.resolution)
+          logResolution(parsedTarget.model, outcome.resolution, options.quiet);
+        target = outcome.target;
       }
     }
     {
@@ -49143,6 +49208,7 @@ var init_proxy_server = __esm(() => {
   init_model_loader();
   init_profile_config();
   init_api_key_map();
+  init_auto_route();
   init_catalog_client();
   init_custom_endpoints_loader();
   init_model_parser();
@@ -49537,7 +49603,8 @@ async function runModels(sessionPath, opts = {}) {
       state: "RUNNING",
       startedAt: new Date().toISOString()
     });
-    const proc = spawn2("claudish", args, {
+    const teamSpawnTarget = resolveClaudishSpawn();
+    const proc = spawn2(teamSpawnTarget.command, [...teamSpawnTarget.prefixArgs, ...args], {
       stdio: ["pipe", "pipe", "pipe"],
       shell: false,
       env: {
@@ -68112,7 +68179,10 @@ async function parseArgs(args) {
         printAvailableModels();
         process.exit(1);
       }
-      config3.model = modelArg;
+      const chain = parseModelChain(modelArg);
+      config3.model = chain[0];
+      if (chain.length > 1)
+        config3.modelChain = chain;
     } else if (arg === "--model-opus") {
       const val = args[++i];
       if (val)
@@ -78701,7 +78771,8 @@ Team Status`);
       quiet: cliConfig.quiet,
       isInteractive: cliConfig.interactive,
       advisorModels: cliConfig.advisorModels,
-      advisorCollector: cliConfig.advisorCollector
+      advisorCollector: cliConfig.advisorCollector,
+      modelChain: cliConfig.monitor ? undefined : cliConfig.modelChain
     }));
     const diag = createDiagOutput2({
       interactive: cliConfig.interactive,

package/package.json

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