claudish 12.1.2 → 12.2.0

package/dist/index.js

@@ -901,7 +901,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "12.1.2";
+var VERSION = "12.2.0";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -60382,10 +60382,13 @@ class FallbackHandler {
   async handle(c, payload) {
     const errors = [];
     const startIndex = this.lastSuccessIndex;
+    let credentialStop;
     for (let attempt = 0;attempt < this.candidates.length; attempt++) {
       const idx = (startIndex + attempt) % this.candidates.length;
       const { name, handler, provider } = this.candidates[idx];
       const isLast = attempt === this.candidates.length - 1;
+      if (credentialStop && !(provider && isSubscriptionProvider(provider)))
+        continue;
       try {
         if (errors.length > 0 && handler instanceof ComposedHandler) {
           try {
@@ -60408,13 +60411,27 @@ class FallbackHandler {
           return response;
         }
         const verdict = authVerdict(response.headers);
-        if (verdict) {
+        const subscriptionRejected = verdict === "terminal" && !!provider && isSubscriptionProvider(provider);
+        if (verdict && !subscriptionRejected) {
           if (errors.length > 0) {
             logStderr(`[Fallback] ${name}: credential ${verdict === "terminal" ? "rejected" : "temporarily unavailable"} \u2014 stopping the chain here.`);
           }
           return response;
         }
         const errorBody = await response.clone().text();
+        if (subscriptionRejected || isSubscriptionCredentialRejection(response.status, errorBody, provider)) {
+          errors.push({ provider: name, status: response.status, message: errorBody });
+          if (!credentialStop) {
+            credentialStop = response;
+            logStderr(`[Fallback] ${name}: subscription login rejected \u2014 trying the chain's other subscription providers only; metered providers are skipped.`);
+          }
+          continue;
+        }
+        if (credentialStop) {
+          errors.push({ provider: name, status: response.status, message: errorBody });
+          logStderr(`[Fallback] ${name} failed (HTTP ${response.status}), trying the next subscription provider...`);
+          continue;
+        }
         if (!isRetryableError(response.status, errorBody, name, response.headers, provider)) {
           if (errors.length > 0) {
             errors.push({ provider: name, status: response.status, message: errorBody });
@@ -60437,6 +60454,10 @@ class FallbackHandler {
         }
       }
     }
+    if (credentialStop) {
+      logStderr(`[Fallback] No subscription provider could serve ${payload.model || "the model"}; metered providers were skipped.`);
+      return credentialStop;
+    }
     return this.formatCombinedError(c, errors, payload.model);
   }
   formatCombinedError(c, errors, modelName) {
@@ -60464,6 +60485,15 @@ ${summary}`);
     }
   }
 }
+function isSubscriptionCredentialRejection(status, errorBody, providerId) {
+  if (!providerId || !isSubscriptionProvider(providerId))
+    return false;
+  const recovered = status === 400 ? extractUpstreamStatus(errorBody) : undefined;
+  if ((status === 401 || recovered === 401) && isCredentialRejection(401, errorBody)) {
+    return true;
+  }
+  return status === 403 && isCredentialRejection(403, errorBody);
+}
 function isRetryableError(status, errorBody, provider, headers, providerId) {
   if (isClaudishConnectionVerdict(headers))
     return false;
@@ -60471,15 +60501,8 @@ function isRetryableError(status, errorBody, provider, headers, providerId) {
     return false;
   if (hasQuotaExhaustionWording(errorBody))
     return true;
-  if (providerId && isSubscriptionProvider(providerId)) {
-    const recovered = status === 400 ? extractUpstreamStatus(errorBody) : undefined;
-    if ((status === 401 || recovered === 401) && isCredentialRejection(401, errorBody)) {
-      return false;
-    }
-    if (status === 403 && isCredentialRejection(403, errorBody)) {
-      return false;
-    }
-  }
+  if (isSubscriptionCredentialRejection(status, errorBody, providerId))
+    return false;
   const upstream = status === 400 ? extractUpstreamStatus(errorBody) : undefined;
   if (upstream === 401 || upstream === 403 || upstream === 402 || upstream === 429) {
     return true;

package/package.json

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