claudish 6.2.0 → 6.2.1

package/dist/index.js

@@ -30721,6 +30721,9 @@ function loadConfig() {
     if (config3.endpoints !== undefined) {
       merged.endpoints = config3.endpoints;
     }
+    if (config3.autoApproveConfirmedAt !== undefined) {
+      merged.autoApproveConfirmedAt = config3.autoApproveConfirmedAt;
+    }
     return merged;
   } catch (error46) {
     console.error(`Warning: Failed to load config, using defaults: ${error46}`);
@@ -35530,6 +35533,12 @@ async function parseArgs(args) {
   if (envSummarizeTools === "true" || envSummarizeTools === "1") {
     config3.summarizeTools = true;
   }
+  try {
+    const fileConfig = loadConfig();
+    if (fileConfig.diagMode && ["auto", "pty", "tmux", "logfile", "off"].includes(fileConfig.diagMode)) {
+      config3.diagMode = fileConfig.diagMode;
+    }
+  } catch {}
   const envDiagMode = process.env[ENV.CLAUDISH_DIAG_MODE]?.toLowerCase();
   if (envDiagMode && ["auto", "pty", "tmux", "logfile", "off"].includes(envDiagMode)) {
     config3.diagMode = envDiagMode;
@@ -36615,6 +36624,7 @@ OPTIONS:
   -d, --debug              Enable debug logging to file (logs/claudish_*.log)
   --no-logs                Disable always-on structural logging (~/.claudish/logs/)
   --diag-mode <mode>       Diagnostic output: auto (default), pty, tmux, logfile, off
+                           Also: CLAUDISH_DIAG_MODE env var or "diagMode" in config.json
   --log-level <level>      Log verbosity: debug (full), info (truncated), minimal (labels only)
   -q, --quiet              Suppress [claudish] log messages (default in single-shot mode)
   -v, --verbose            Show [claudish] log messages (default in interactive mode)
@@ -37093,7 +37103,7 @@ async function fetchGLMCodingModels() {
     return [];
   }
 }
-var __filename4, __dirname4, VERSION = "6.2.0", CACHE_MAX_AGE_DAYS2 = 2, CLAUDISH_CACHE_DIR2, BUNDLED_MODELS_PATH, CACHED_MODELS_PATH, ALL_MODELS_JSON_PATH;
+var __filename4, __dirname4, VERSION = "6.2.1", CACHE_MAX_AGE_DAYS2 = 2, CLAUDISH_CACHE_DIR2, BUNDLED_MODELS_PATH, CACHED_MODELS_PATH, ALL_MODELS_JSON_PATH;
 var init_cli = __esm(() => {
   init_config();
   init_model_loader();
@@ -100552,12 +100562,33 @@ class MtmDiagRunner {
       if (parsed.provider)
         this.provider = parsed.provider;
     }
+    if (msg.includes("HANDLER STARTED") || msg.includes("=== Request")) {
+      this.requestCount++;
+    }
+    const rtMatch = msg.match(/(\d+)ms\b/);
+    if (rtMatch && msg.includes("Response")) {
+      const ms = parseInt(rtMatch[1], 10);
+      this.roundtripSamples.push(ms);
+      if (this.roundtripSamples.length > 20)
+        this.roundtripSamples.shift();
+      this.avgRoundtripMs = Math.round(this.roundtripSamples.reduce((a, b2) => a + b2, 0) / this.roundtripSamples.length);
+    }
+    if (msg.includes("Format:") || msg.includes("Transport:") || msg.includes("Translator:")) {
+      const parts = msg.split(":").slice(1).join(":").trim();
+      if (parts)
+        this.adapters = parts;
+    }
     this.refreshStatusBar();
   }
   modelName = "";
   provider = "";
   lastError = "";
   errorCount = 0;
+  requestCount = 0;
+  totalCost = 0;
+  avgRoundtripMs = 0;
+  roundtripSamples = [];
+  adapters = "";
   setModel(name) {
     this.modelName = name.includes("/") ? name.split("/").pop() : name;
     if (name.includes("@")) {
@@ -100572,7 +100603,9 @@ class MtmDiagRunner {
       model: this.modelName,
       provider: this.provider,
       errorCount: this.errorCount,
-      lastError: this.lastError
+      lastError: this.lastError,
+      requestCount: this.requestCount,
+      avgRoundtripMs: this.avgRoundtripMs
     });
     try {
       appendFileSync(this.statusPath, bar + `
@@ -100607,31 +100640,47 @@ class MtmDiagRunner {
     const thisDir = dirname6(thisFile);
     const platform3 = process.platform;
     const arch = process.arch;
-    const bundledPlatform = join23(thisDir, "..", "..", "native", "mtm", `mtm-${platform3}-${arch}`);
+    const pkgRoot = join23(thisDir, "..");
+    const bundledPlatform = join23(pkgRoot, "native", "mtm", `mtm-${platform3}-${arch}`);
     if (existsSync21(bundledPlatform))
       return bundledPlatform;
-    const builtDev = join23(thisDir, "..", "native", "mtm", "mtm");
+    const builtDev = join23(pkgRoot, "native", "mtm", "mtm");
     if (existsSync21(builtDev))
       return builtDev;
     try {
       const result = execSync3("which mtm", { encoding: "utf-8" }).trim();
-      if (result)
+      if (result && this.isMtmFork(result))
         return result;
     } catch {}
     throw new Error("mtm binary not found. Build it with: cd packages/cli/native/mtm && make");
   }
+  isMtmFork(binPath) {
+    try {
+      const output = execSync3(`"${binPath}" --help 2>&1 || true`, {
+        encoding: "utf-8",
+        timeout: 2000
+      });
+      return output.includes("-e ");
+    } catch {
+      return false;
+    }
+  }
 }
 function shellQuote(s) {
   return "'" + s.replace(/'/g, "'\\''") + "'";
 }
 function renderStatusBar(state) {
-  const { model, provider, errorCount, lastError } = state;
+  const { model, provider, errorCount, lastError, requestCount, avgRoundtripMs } = state;
   const parts = [];
   parts.push("M: claudish ");
   if (model)
     parts.push(`C: ${model} `);
   if (provider)
     parts.push(`D: ${provider} `);
+  if (requestCount > 0) {
+    const rt = avgRoundtripMs > 0 ? ` ~${avgRoundtripMs}ms` : "";
+    parts.push(`D: ${requestCount} req${rt} `);
+  }
   if (errorCount > 0) {
     const errLabel = errorCount === 1 ? " \u26A0 1 error " : ` \u26A0 ${errorCount} errors `;
     parts.push(`R:${errLabel}`);
@@ -106318,24 +106367,38 @@ class OpenAIProviderTransport {
     return headers;
   }
   async enqueueRequest(fetchFn) {
-    const controller = new AbortController;
-    const timeoutId = setTimeout(() => controller.abort(), 30000);
-    try {
-      const response = await fetchFn();
-      return response;
-    } catch (fetchError) {
-      if (fetchError.name === "AbortError") {
-        log(`[${this.displayName}] Request timed out after 30s`);
-        throw new OpenAITimeoutError(this.provider.baseUrl);
-      }
-      if (fetchError.cause?.code === "UND_ERR_CONNECT_TIMEOUT") {
-        log(`[${this.displayName}] Connection timeout: ${fetchError.message}`);
-        throw new OpenAIConnectionError(this.provider.baseUrl, fetchError.cause?.code);
-      }
-      throw fetchError;
-    } finally {
-      clearTimeout(timeoutId);
+    const maxRetries = 5;
+    let lastResponse = null;
+    for (let attempt = 0;attempt <= maxRetries; attempt++) {
+      try {
+        const response = await fetchFn();
+        if (response.status === 429 && attempt < maxRetries) {
+          lastResponse = response;
+          const retryAfter = response.headers.get("Retry-After");
+          let delayMs;
+          if (retryAfter && !Number.isNaN(Number(retryAfter))) {
+            delayMs = Math.min(Number(retryAfter) * 1000, 30000);
+          } else {
+            delayMs = Math.min(2000 * Math.pow(2, attempt), 30000);
+          }
+          log(`[${this.displayName}] 429 rate limited, retry ${attempt + 1}/${maxRetries} in ${(delayMs / 1000).toFixed(1)}s`);
+          await new Promise((resolve4) => setTimeout(resolve4, delayMs));
+          continue;
+        }
+        return response;
+      } catch (fetchError) {
+        if (fetchError.name === "AbortError") {
+          log(`[${this.displayName}] Request timed out after 30s`);
+          throw new OpenAITimeoutError(this.provider.baseUrl);
+        }
+        if (fetchError.cause?.code === "UND_ERR_CONNECT_TIMEOUT") {
+          log(`[${this.displayName}] Connection timeout: ${fetchError.message}`);
+          throw new OpenAIConnectionError(this.provider.baseUrl, fetchError.cause?.code);
+        }
+        throw fetchError;
+      }
     }
+    return lastResponse;
   }
   static formatDisplayName(name) {
     if (name === "opencode-zen")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",