claudish 12.1.2 → 12.2.1

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.1";
 
 // 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;
@@ -63927,7 +63950,11 @@ function readProcessTable() {
 }
 function readProcessTableAsync() {
   return new Promise((resolve) => {
-    execFile("ps", PS_ARGS, { env: PS_ENV, encoding: "utf8", maxBuffer: 64 * 1024 * 1024 }, (err, stdout) => resolve(err ? [] : parsePsTable(String(stdout))));
+    try {
+      execFile("ps", PS_ARGS, { env: PS_ENV, encoding: "utf8", maxBuffer: 64 * 1024 * 1024 }, (err, stdout) => resolve(err ? [] : parsePsTable(String(stdout))));
+    } catch {
+      resolve([]);
+    }
   });
 }
 function magmuxNeedle(paneId) {
@@ -69618,8 +69645,17 @@ var init_session_discovery = __esm(() => {
 
 // src/team-orchestrator.ts
 import { randomBytes as randomBytes8, randomUUID as randomUUID5 } from "crypto";
-import { existsSync as existsSync31, mkdirSync as mkdirSync21, readFileSync as readFileSync31, readdirSync as readdirSync9, statSync as statSync12, writeFileSync as writeFileSync22 } from "fs";
-import { basename as basename4, join as join50, resolve as resolve5 } from "path";
+import {
+  existsSync as existsSync31,
+  lstatSync as lstatSync3,
+  mkdirSync as mkdirSync21,
+  readFileSync as readFileSync31,
+  readdirSync as readdirSync9,
+  realpathSync as realpathSync6,
+  statSync as statSync12,
+  writeFileSync as writeFileSync22
+} from "fs";
+import { basename as basename4, dirname as dirname15, join as join50, resolve as resolve5, sep } from "path";
 function slotTerminal(e) {
   if (!e.session)
     return true;
@@ -70005,9 +70041,30 @@ function persistErrorLog(errorLogPath, header, sections) {
 }
 function validateSessionPath(sessionPath) {
   const resolved = resolve5(sessionPath);
-  const cwd = process.cwd();
-  if (!resolved.startsWith(`${cwd}/`) && resolved !== cwd) {
-    throw new Error(`Session path must be within current directory: ${sessionPath}`);
+  const outside = () => new Error(`Session path must be within current directory: ${sessionPath}`);
+  let existing = resolved;
+  const tail = [];
+  for (;; ) {
+    try {
+      lstatSync3(existing);
+      break;
+    } catch {
+      const parent = dirname15(existing);
+      if (parent === existing)
+        break;
+      tail.unshift(basename4(existing));
+      existing = parent;
+    }
+  }
+  let real;
+  try {
+    real = join50(realpathSync6(existing), ...tail);
+  } catch {
+    throw outside();
+  }
+  const cwd = realpathSync6(process.cwd());
+  if (real !== cwd && !real.startsWith(cwd + sep)) {
+    throw outside();
   }
   return resolved;
 }
@@ -70749,7 +70806,7 @@ import {
   statSync as statSync13,
   writeFileSync as writeFileSync23
 } from "fs";
-import { join as join51, resolve as resolve6, sep } from "path";
+import { join as join51, resolve as resolve6, sep as sep2 } from "path";
 function normaliseTimeoutSeconds(raw) {
   const n = typeof raw === "string" && raw.trim() !== "" ? Number(raw) : raw;
   if (typeof n !== "number" || !Number.isFinite(n))
@@ -71592,7 +71649,7 @@ class SessionManager {
     const dir = resolve6(root, sessionId);
     if (dir !== join51(root, sessionId))
       return null;
-    if (!dir.startsWith(root + sep))
+    if (!dir.startsWith(root + sep2))
       return null;
     return dir;
   }
@@ -72278,7 +72335,7 @@ var init_run_prompt_claude_code = __esm(() => {
 // src/mcp-server.ts
 import { existsSync as existsSync33, mkdirSync as mkdirSync24, readFileSync as readFileSync33, readdirSync as readdirSync10, writeFileSync as writeFileSync25 } from "fs";
 import { homedir as homedir35 } from "os";
-import { dirname as dirname15, join as join53, resolve as resolve7 } from "path";
+import { dirname as dirname16, join as join53, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 async function loadAllModels(forceRefresh = false) {
   if (!forceRefresh && existsSync33(OPENROUTER_MODELS_CACHE_PATH)) {
@@ -73828,7 +73885,7 @@ var init_mcp_server = __esm(() => {
   import_dotenv2 = __toESM(require_main(), 1);
   import_dotenv2.config({ quiet: true });
   __filename3 = fileURLToPath3(import.meta.url);
-  __dirname3 = dirname15(__filename3);
+  __dirname3 = dirname16(__filename3);
   CLAUDISH_CACHE_DIR = join53(homedir35(), ".claudish");
   OPENROUTER_MODELS_CACHE_PATH = join53(CLAUDISH_CACHE_DIR, "openrouter-models.json");
   NEXT_STEP = {
@@ -83719,7 +83776,7 @@ import {
   writeFileSync as writeFileSync28
 } from "fs";
 import { homedir as homedir37, tmpdir as tmpdir3 } from "os";
-import { dirname as dirname16, join as join57 } from "path";
+import { dirname as dirname17, join as join57 } from "path";
 import { isatty } from "tty";
 function releaseTerminalIsolation() {
   if (!restoreTerminal)
@@ -83960,7 +84017,7 @@ process.stdin.on('end', () => {
 }
 function initializeTokenFile(tokenFilePath) {
   try {
-    mkdirSync25(dirname16(tokenFilePath), { recursive: true });
+    mkdirSync25(dirname17(tokenFilePath), { recursive: true });
     writeFileSync28(tokenFilePath, JSON.stringify({
       input_tokens: 0,
       output_tokens: 0,

package/package.json

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