claudish 7.39.0 → 7.40.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.39.0";
+var VERSION = "7.40.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -36683,6 +36683,33 @@ var init_middleware = __esm(() => {
   init_gemini_thought_signature();
 });
 
+// src/handlers/shared/quota-exhaustion.ts
+function hasQuotaExhaustionWording(errorBody) {
+  const lower = (errorBody || "").toLowerCase();
+  return EXHAUSTION_PHRASES.some((phrase) => lower.includes(phrase));
+}
+function isQuotaExhaustionError(status, errorBody) {
+  if (status !== 401 && status !== 403 && status !== 429)
+    return false;
+  return hasQuotaExhaustionWording(errorBody);
+}
+var EXHAUSTION_PHRASES;
+var init_quota_exhaustion = __esm(() => {
+  EXHAUSTION_PHRASES = [
+    "usage limit",
+    "billing cycle",
+    "quota",
+    "insufficient balance",
+    "insufficient_quota",
+    "upgrade your plan",
+    "exceeded your current",
+    "out of credits",
+    "credit balance",
+    "daily limit",
+    "plan limit"
+  ];
+});
+
 // src/providers/transport/openai.ts
 class OpenAIProviderTransport {
   name;
@@ -36768,11 +36795,14 @@ class OpenAIProviderTransport {
 function isTerminal429(body) {
   if (!body)
     return false;
+  if (isQuotaExhaustionError(429, body))
+    return true;
   const lower = body.toLowerCase();
   return lower.includes("insufficient balance") || lower.includes("insufficient_balance") || lower.includes("insufficient_quota") || lower.includes("insufficient quota") || lower.includes("billing_not_active") || lower.includes("billing not active") || lower.includes("quota_exceeded") || lower.includes("exceeded your current quota") || lower.includes("out of credits") || lower.includes('"code":"1113"') || lower.includes('"code":1113');
 }
 var OpenAITimeoutError, OpenAIConnectionError;
 var init_openai = __esm(() => {
+  init_quota_exhaustion();
   init_logger();
   OpenAITimeoutError = class OpenAITimeoutError extends Error {
     constructor(baseUrl) {
@@ -38664,28 +38694,6 @@ var init_context_window_fallback = __esm(() => {
   inFlight2 = new Map;
 });
 
-// src/handlers/shared/quota-exhaustion.ts
-function isQuotaExhaustionError(status, errorBody) {
-  if (status !== 401 && status !== 403 && status !== 429)
-    return false;
-  const lower = (errorBody || "").toLowerCase();
-  return EXHAUSTION_PHRASES.some((phrase) => lower.includes(phrase));
-}
-var EXHAUSTION_PHRASES;
-var init_quota_exhaustion = __esm(() => {
-  EXHAUSTION_PHRASES = [
-    "usage limit",
-    "billing cycle",
-    "quota",
-    "insufficient balance",
-    "insufficient_quota",
-    "upgrade your plan",
-    "exceeded your current",
-    "out of credits",
-    "credit balance"
-  ];
-});
-
 // src/handlers/shared/stream-head-sniffer.ts
 function isRetryableStreamError(code, type, message) {
   if (RETRYABLE_ERROR_CODES.has(code))
@@ -40837,6 +40845,9 @@ function getRecoveryHint(status, errorText, providerName) {
   if (status === 429 && isTerminal429(errorText)) {
     return "Out of quota \u2014 check your plan & billing details. This won't recover on retry.";
   }
+  if (isQuotaExhaustionError(status, errorText)) {
+    return "Subscription allowance spent \u2014 this refills on the provider's own schedule (see the message below). Reducing concurrency won't help; switch model/provider or wait.";
+  }
   if (status === 429 || lower.includes("rate limit")) {
     return "Rate limited. Wait, reduce concurrency, or check plan limits.";
   }
@@ -42249,13 +42260,15 @@ var init_default_routing_rules = __esm(() => {
     "o3-*": ["openai-codex", "openai", "openrouter"],
     "gemini-*": ["antigravity", "google", "openrouter"],
     "grok-*": ["x-ai", "openrouter"],
-    "kimi-*": ["kimi-coding", "kimi", "openrouter"],
-    "k3*": ["kimi-coding", "kimi", "openrouter"],
-    "minimax-*": ["minimax-coding", "minimax", "openrouter"],
-    "glm-*": ["glm-coding", "glm", "openrouter"],
-    "qwen3.*": ["qwen-cloud", "openrouter"],
+    "kimi-*": ["kimi-coding", "opencode-zen-go", "kimi", "openrouter"],
+    "k3*": ["kimi-coding", "opencode-zen-go", "kimi", "openrouter"],
+    "minimax-*": ["minimax-coding", "opencode-zen-go", "minimax", "openrouter"],
+    "glm-*": ["glm-coding", "opencode-zen-go", "glm", "openrouter"],
+    "qwen3.*": ["qwen-cloud", "opencode-zen-go", "openrouter"],
     "z-ai-*": ["z-ai", "openrouter"],
-    "deepseek-*": ["deepseek", "openrouter"],
+    "deepseek-*": ["opencode-zen-go", "deepseek", "openrouter"],
+    "mimo-*": ["opencode-zen-go", "openrouter"],
+    "hy3*": ["opencode-zen-go", "openrouter"],
     fugu: ["sakana-subscription", "sakana"],
     "fugu-*": ["sakana-subscription", "sakana"],
     "*-zen": ["opencode-zen"],
@@ -45404,7 +45417,11 @@ class FallbackHandler {
         }
         errors3.push({ provider: name, status: response.status, message: errorBody });
         if (!isLast) {
-          logStderr(`[Fallback] ${name} failed (HTTP ${response.status}), trying next provider...`);
+          if (hasQuotaExhaustionWording(errorBody)) {
+            logStderr(`[Fallback] ${name} subscription allowance is spent \u2014 falling through to the next provider, which is billed PER TOKEN. Use a provider prefix (e.g. \`zgo@model\`) to fail instead of switching.`);
+          } else {
+            logStderr(`[Fallback] ${name} failed (HTTP ${response.status}), trying next provider...`);
+          }
         }
       } catch (err) {
         errors3.push({ provider: name, status: 0, message: err.message });
@@ -45441,8 +45458,8 @@ ${summary}`);
   }
 }
 function isRetryableError(status, errorBody) {
-  if (isQuotaExhaustionError(status, errorBody))
-    return false;
+  if (hasQuotaExhaustionWording(errorBody))
+    return true;
   if (status === 401 || status === 403)
     return true;
   if (status === 402)
@@ -46137,7 +46154,7 @@ var init_api_key_map = __esm(() => {
     "qwen-cloud": { envVar: "QWEN_CLOUD_PLAN_API_KEY" },
     ollamacloud: { envVar: "OLLAMA_API_KEY" },
     "opencode-zen": { envVar: "OPENCODE_API_KEY" },
-    "opencode-zen-go": { envVar: "OPENCODE_API_KEY" },
+    "opencode-zen-go": { envVar: "OPENCODE_GO_API_KEY", aliases: ["OPENCODE_API_KEY"] },
     "gemini-codeassist": { envVar: "GEMINI_API_KEY" },
     vertex: { envVar: "VERTEX_API_KEY", aliases: ["VERTEX_PROJECT"] },
     poe: { envVar: "POE_API_KEY" }
@@ -46958,7 +46975,8 @@ var init_provider_profiles = __esm(() => {
       const zenApiKey = ctx.apiKey;
       const isGoProvider = ctx.provider.name === "opencode-zen-go";
       if (ctx.modelName.toLowerCase().includes("minimax")) {
-        const transport2 = new AnthropicProviderTransport(ctx.provider, zenApiKey);
+        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,
@@ -76541,13 +76559,15 @@ function createTempSettingsFile(_modelDisplay, port, proxyAuthMode, userStatusLi
     const DIM4 = "\\033[2m";
     const RESET4 = "\\033[0m";
     const BOLD4 = "\\033[1m";
+    const readPlanBash = `PLAN_PAIR=$(echo "$TOKENS" | grep -o '"id": *"[^"]*", *"used_pct": *[0-9]*' | sed 's/"id": *"\\([^"]*\\)", *"used_pct": *\\([0-9]*\\)/\\2 \\1/' | sort -rn | head -1); if [ -n "$PLAN_PAIR" ]; then PLAN_PCT="\${PLAN_PAIR%% *}"; PLAN_ID="\${PLAN_PAIR#* }"; case "$PLAN_PCT" in ''|*[!0-9]*) PLAN_PCT="" ;; esac; [ -n "$PLAN_PCT" ] && PLAN_DISPLAY="$PLAN_ID:$PLAN_PCT%"; fi;`;
     const formatTokensBash = `fmt_tok() { local n=\${1:-0}; if [ "$n" -ge 1000000 ]; then echo "$((n/1000000))M"; elif [ "$n" -ge 1000 ]; then echo "$((n/1000))k"; else echo "$n"; fi; }`;
     const effWinBash = `eff_win() { local w=\${1:-0}; local m=\${CLAUDE_CODE_MAX_CONTEXT_TOKENS:-}; local a=\${CLAUDE_CODE_AUTO_COMPACT_WINDOW:-}; case "$m" in ''|*[!0-9]*) m=${CLAUDE_CODE_DEFAULT_MAX_CONTEXT};; esac; case "$a" in ''|*[!0-9]*) a=0;; esac; case "$w" in ''|*[!0-9]*) w=0;; esac; if [ "$w" -gt 0 ]; then if [ "$m" -gt 0 ] && [ "$m" -lt "$w" ]; then w=$m; fi; if [ "$a" -gt 0 ] && [ "$a" -lt "$w" ]; then w=$a; fi; fi; echo "$w"; }`;
     const dirPrelude = `DIR=$(basename "$(pwd)"); [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true; `;
-    const readState = `CTX=-1; COST="0"; IS_FREE="false"; IS_EST="false"; PROVIDER=""; TOKEN_MODEL=""; IN_TOK=0; CTX_WIN=0; ${formatTokensBash}; ${effWinBash}; if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d '\\n\\r'); V=$(echo "$TOKENS" | grep -o '"context_left_percent": *-\\?[0-9]*' | grep -o '\\-\\?[0-9]*'); [ -n "$V" ] && CTX="$V"; V=$(echo "$TOKENS" | grep -o '"total_cost": *[0-9.]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && COST="$V"; V=$(echo "$TOKENS" | grep -o '"input_tokens": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && IN_TOK="$V"; V=$(echo "$TOKENS" | grep -o '"context_window": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && CTX_WIN="$V"; V=$(echo "$TOKENS" | grep -o '"is_free": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_FREE="$V"; V=$(echo "$TOKENS" | grep -o '"is_estimated": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_EST="$V"; V=$(echo "$TOKENS" | grep -o '"provider_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && PROVIDER="$V"; V=$(echo "$TOKENS" | grep -o '"model_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && TOKEN_MODEL="$V"; fi; if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi; MODEL_DISPLAY="\${TOKEN_MODEL:-$CLAUDISH_ACTIVE_MODEL_NAME}"; if [ -n "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi; EFF_WIN=$(eff_win $CTX_WIN); if [ "$EFF_WIN" -gt 0 ] 2>/dev/null && [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX=$(( ((EFF_WIN - IN_TOK) * 200 / EFF_WIN + 1) / 2 )); if [ "$CTX" -lt 0 ]; then CTX=0; fi; fi; if [ "$CTX" -lt 0 ] 2>/dev/null || [ "$EFF_WIN" -le 0 ] 2>/dev/null; then if [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX_DISPLAY="$(fmt_tok $IN_TOK) tokens"; else CTX_DISPLAY="N/A"; fi; elif [ "$IN_TOK" -gt 0 ] 2>/dev/null; then if [ "$EFF_WIN" -lt "$CTX_WIN" ] 2>/dev/null; then CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN) of $(fmt_tok $CTX_WIN))"; else CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN))"; fi; else CTX_DISPLAY="$CTX%"; fi`;
-    const segmentWithDir = `printf "${CYAN4}${BOLD4}%s${RESET4} ${DIM4}\u2022${RESET4} ${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX_DISPLAY"`;
-    const segmentNoDirWithProvider = `printf "${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$PROVIDER" "$COST_DISPLAY" "$CTX_DISPLAY"`;
-    const segmentNoDirNoProvider = `printf "${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}\\n" "$COST_DISPLAY" "$CTX_DISPLAY"`;
+    const readState = `CTX=-1; COST="0"; IS_FREE="false"; IS_EST="false"; PROVIDER=""; TOKEN_MODEL=""; IN_TOK=0; CTX_WIN=0; PLAN_DISPLAY=""; ${formatTokensBash}; ${effWinBash}; if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d '\\n\\r'); V=$(echo "$TOKENS" | grep -o '"context_left_percent": *-\\?[0-9]*' | grep -o '\\-\\?[0-9]*'); [ -n "$V" ] && CTX="$V"; V=$(echo "$TOKENS" | grep -o '"total_cost": *[0-9.]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && COST="$V"; V=$(echo "$TOKENS" | grep -o '"input_tokens": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && IN_TOK="$V"; V=$(echo "$TOKENS" | grep -o '"context_window": *[0-9]*' | grep -o '[0-9]*'); [ -n "$V" ] && CTX_WIN="$V"; V=$(echo "$TOKENS" | grep -o '"is_free": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_FREE="$V"; V=$(echo "$TOKENS" | grep -o '"is_estimated": *[a-z]*' | cut -d: -f2 | tr -d ' '); [ -n "$V" ] && IS_EST="$V"; V=$(echo "$TOKENS" | grep -o '"provider_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && PROVIDER="$V"; V=$(echo "$TOKENS" | grep -o '"model_name": *"[^"]*"' | cut -d'"' -f4); [ -n "$V" ] && TOKEN_MODEL="$V"; ${readPlanBash} fi; if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi; MODEL_DISPLAY="\${TOKEN_MODEL:-$CLAUDISH_ACTIVE_MODEL_NAME}"; if [ -n "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi; EFF_WIN=$(eff_win $CTX_WIN); if [ "$EFF_WIN" -gt 0 ] 2>/dev/null && [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX=$(( ((EFF_WIN - IN_TOK) * 200 / EFF_WIN + 1) / 2 )); if [ "$CTX" -lt 0 ]; then CTX=0; fi; fi; if [ "$CTX" -lt 0 ] 2>/dev/null || [ "$EFF_WIN" -le 0 ] 2>/dev/null; then if [ "$IN_TOK" -gt 0 ] 2>/dev/null; then CTX_DISPLAY="$(fmt_tok $IN_TOK) tokens"; else CTX_DISPLAY="N/A"; fi; elif [ "$IN_TOK" -gt 0 ] 2>/dev/null; then if [ "$EFF_WIN" -lt "$CTX_WIN" ] 2>/dev/null; then CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN) of $(fmt_tok $CTX_WIN))"; else CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $EFF_WIN))"; fi; else CTX_DISPLAY="$CTX%"; fi`;
+    const planSuffix = `if [ -n "$PLAN_DISPLAY" ]; then printf " ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4}" "$PLAN_DISPLAY"; fi`;
+    const segmentWithDir = `printf "${CYAN4}${BOLD4}%s${RESET4} ${DIM4}\u2022${RESET4} ${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX_DISPLAY"; ${planSuffix}; printf "\\n"`;
+    const segmentNoDirWithProvider = `printf "${YELLOW3}%s${RESET4} ${DIM4}\u2022${RESET4} ${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}" "$PROVIDER" "$COST_DISPLAY" "$CTX_DISPLAY"; ${planSuffix}; printf "\\n"`;
+    const segmentNoDirNoProvider = `printf "${GREEN4}%s${RESET4} ${DIM4}\u2022${RESET4} ${MAGENTA3}%s${RESET4}" "$COST_DISPLAY" "$CTX_DISPLAY"; ${planSuffix}; printf "\\n"`;
     const segmentNoDir = `if [ -n "$PROVIDER" ]; then ${segmentNoDirWithProvider}; else ${segmentNoDirNoProvider}; fi`;
     statusCommand = userStatusLineCommand ? buildChainedStatusCommand(userStatusLineCommand, readState, segmentNoDir) : `JSON=$(cat); ${dirPrelude}${readState}; ${segmentWithDir}`;
   }

package/package.json

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