claudish 7.18.0 → 7.19.0

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.18.0";
+var VERSION = "7.19.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -755,7 +755,7 @@ function redactDeep(val, key) {
   return val;
 }
 function isStructuralLogWorthy(msg) {
-  return msg.startsWith("[SSE:") || msg.startsWith("[Proxy]") || msg.startsWith("[Fallback]") || msg.startsWith("[Streaming] ===") || msg.startsWith("[Streaming] Chunk:") || msg.startsWith("[Streaming] Received") || msg.startsWith("[Streaming] Text-based tool calls") || msg.startsWith("[Streaming] Final usage") || msg.startsWith("[Streaming] Sending") || msg.startsWith("[AnthropicSSE] Stream complete") || msg.startsWith("[AnthropicSSE] Tool use:") || msg.includes("Response status:") || msg.includes("Error") || msg.includes("error") || msg.includes("[Auto-route]");
+  return msg.startsWith("[SSE:") || msg.startsWith("[Suppressed]") || msg.startsWith("[Proxy]") || msg.startsWith("[Fallback]") || msg.startsWith("[Streaming] ===") || msg.startsWith("[Streaming] Chunk:") || msg.startsWith("[Streaming] Received") || msg.startsWith("[Streaming] Text-based tool calls") || msg.startsWith("[Streaming] Final usage") || msg.startsWith("[Streaming] Sending") || msg.startsWith("[AnthropicSSE] Stream complete") || msg.startsWith("[AnthropicSSE] Tool use:") || msg.includes("Response status:") || msg.includes("Error") || msg.includes("error") || msg.includes("[Auto-route]");
 }
 function redactLogLine(message, timestamp) {
   if (message.startsWith("[SSE:")) {
@@ -27650,6 +27650,9 @@ function loadConfig() {
     if (config2.onepasswordEnvironments !== undefined) {
       merged.onepasswordEnvironments = config2.onepasswordEnvironments;
     }
+    if (config2.anthropicApiBilling !== undefined) {
+      merged.anthropicApiBilling = config2.anthropicApiBilling;
+    }
     if (config2.localProviders !== undefined) {
       merged.localProviders = Array.from(new Set(config2.localProviders)).sort();
     }
@@ -37112,9 +37115,15 @@ function statusToErrorType(status) {
       return "api_error";
   }
 }
+function sanitizeErrorMessage(message, maxLength = MAX_ERROR_MESSAGE_LENGTH) {
+  const flattened = String(message ?? "").replace(ANSI_ESCAPE, "").replace(CONTROL_CHARS, " ").replace(/\s+/g, " ").trim();
+  if (flattened.length <= maxLength)
+    return flattened;
+  return `${flattened.slice(0, maxLength - 1).trimEnd()}\u2026`;
+}
 function wrapAnthropicError(status, message, errorType, upstreamStatus) {
   const type = errorType || statusToErrorType(status);
-  const error46 = { type, message };
+  const error46 = { type, message: sanitizeErrorMessage(message) };
   if (upstreamStatus !== undefined)
     error46.upstream_status = upstreamStatus;
   return { type: "error", error: error46 };
@@ -37178,15 +37187,23 @@ function buildSurfacedErrorMessage(opts) {
 }
 function ensureAnthropicErrorFormat(status, body) {
   if (body?.type === "error" && typeof body?.error?.type === "string" && typeof body?.error?.message === "string") {
-    return body;
+    return { ...body, error: { ...body.error, message: sanitizeErrorMessage(body.error.message) } };
   }
   if (typeof body?.error?.type === "string" && typeof body?.error?.message === "string") {
-    return { type: "error", error: body.error };
+    return {
+      type: "error",
+      error: { ...body.error, message: sanitizeErrorMessage(body.error.message) }
+    };
   }
   const message = body?.error?.message || body?.message || body?.error || (typeof body === "string" ? body : JSON.stringify(body));
   const errorType = body?.error?.type || body?.type || body?.code;
   return wrapAnthropicError(status, String(message), errorType);
 }
+var MAX_ERROR_MESSAGE_LENGTH = 600, ANSI_ESCAPE, CONTROL_CHARS;
+var init_anthropic_error = __esm(() => {
+  ANSI_ESCAPE = /\x1B\[[0-?]*[ -/]*[@-~]|\x1B[@-Z\\-_]/g;
+  CONTROL_CHARS = /[\x00-\x1F\x7F]/g;
+});
 
 // src/handlers/shared/connection-error.ts
 function findConnectionCode(error46) {
@@ -37201,8 +37218,18 @@ function findConnectionCode(error46) {
   const msg = String(error46?.message ?? error46 ?? "");
   if (/getaddrinfo|ENOTFOUND|EAI_AGAIN|nodename nor servname/i.test(msg))
     return "ENOTFOUND";
+  if (BUN_CONNECT_MESSAGE.test(msg))
+    return "ConnectionRefused";
   return null;
 }
+function isLoopback(endpoint) {
+  try {
+    const { hostname: hostname4 } = new URL(endpoint);
+    return /^(localhost|127\.\d+\.\d+\.\d+|0\.0\.0\.0|\[?::1\]?)$/i.test(hostname4);
+  } catch {
+    return false;
+  }
+}
 function classifyConnectionError(error46) {
   const code = findConnectionCode(error46);
   if (!code)
@@ -37222,12 +37249,15 @@ function buildConnectionErrorMessage(kind, displayName, endpoint) {
     case "dns":
       return `Cannot resolve ${host} for ${displayName}. This is a DNS/network problem on your machine \u2014 check your internet connection, VPN, or DNS resolver (e.g. Tailscale MagicDNS) \u2014 not ${displayName}.`;
     case "refused":
-      return `Cannot connect to ${displayName} at ${endpoint}. Make sure the server is running.`;
+      if (isLoopback(endpoint)) {
+        return `Cannot connect to ${displayName} at ${endpoint}. Make sure the server is running.`;
+      }
+      return `Cannot reach ${host} for ${displayName}. This is a network problem on your machine \u2014 check your internet connection, VPN, or DNS resolver (e.g. Tailscale MagicDNS) \u2014 not ${displayName}.`;
     case "unreachable":
       return `Cannot reach ${displayName} at ${endpoint}. Check your network connection.`;
   }
 }
-var CODE_KIND;
+var CODE_KIND, BUN_CONNECT_MESSAGE;
 var init_connection_error = __esm(() => {
   CODE_KIND = {
     ENOTFOUND: "dns",
@@ -37239,8 +37269,13 @@ var init_connection_error = __esm(() => {
     EHOSTUNREACH: "unreachable",
     EPIPE: "unreachable",
     UND_ERR_CONNECT_TIMEOUT: "unreachable",
-    UND_ERR_SOCKET: "unreachable"
+    UND_ERR_SOCKET: "unreachable",
+    ConnectionRefused: "refused",
+    ConnectionClosed: "unreachable",
+    FailedToOpenSocket: "unreachable",
+    ERR_SOCKET_CLOSED: "unreachable"
   };
+  BUN_CONNECT_MESSAGE = /unable to connect\. is the computer able to access the url\?/i;
 });
 
 // src/handlers/shared/stream-parsers/anthropic-sse.ts
@@ -38206,6 +38241,7 @@ data: ${JSON.stringify(data)}
 var init_openai_responses_sse = __esm(() => {
   init_reasoning_cache();
   init_logger();
+  init_anthropic_error();
 });
 
 // src/handlers/shared/token-tracker.ts
@@ -38548,7 +38584,7 @@ class ComposedHandler {
           isInteractive: this.isInteractive,
           authType: "oauth"
         });
-        return c.json({ error: { type: "authentication_error", message: err.message } }, 401);
+        return c.json(wrapAnthropicError(401, err.message, "authentication_error"), 401);
       }
     }
     if (this.provider.getContextWindow) {
@@ -38614,7 +38650,7 @@ class ComposedHandler {
             invocation_mode: this.options.invocationMode ?? "auto-route"
           });
         } catch {}
-        return c.json(wrapAnthropicError(503, msg, "connection_error"), 503);
+        return c.json(wrapAnthropicError(400, msg, "connection_error"), 400);
       }
       throw error46;
     }
@@ -38951,6 +38987,7 @@ var init_composed_handler = __esm(() => {
   init_stats();
   init_telemetry();
   init_transform();
+  init_anthropic_error();
   init_connection_error();
   init_openai_compat();
   init_anthropic_sse();
@@ -39907,6 +39944,7 @@ var init_native_handler = __esm(() => {
   init_logger();
   init_profile_config();
   init_native_handler_advisor();
+  init_anthropic_error();
 });
 
 // src/providers/api-key-map.ts
@@ -43482,7 +43520,7 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
       log(`[Proxy] Registered ${customEpResult.registered} custom endpoint(s) from config`);
     }
     for (const err of customEpResult.errors) {
-      console.error(`[claudish] customEndpoints['${err.name}'] failed validation: ${err.message}`);
+      logStderr(`customEndpoints['${err.name}'] failed validation: ${err.message}`);
     }
   } catch (err) {
     log(`[Proxy] customEndpoints load skipped: ${err instanceof Error ? err.message : String(err)}`);
@@ -43570,9 +43608,10 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
     const resolution = resolveModelProvider(targetModel);
     if (resolution.wasAutoRouted && resolution.autoRouteMessage) {
       if (!options.quiet) {
-        console.error(`[Auto-route] ${resolution.autoRouteMessage}`);
+        logStderr(`[Auto-route] ${resolution.autoRouteMessage}`);
+      } else {
+        log(`[Auto-route] ${resolution.autoRouteMessage}`);
       }
-      log(`[Auto-route] ${resolution.autoRouteMessage}`);
     }
     if (resolution.category === "openrouter") {
       if (resolution.wasAutoRouted && resolution.fullModelId) {
@@ -43591,7 +43630,7 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
       let apiKey = "";
       if (resolved.provider.apiKeyEnvVar) {
         if (!credentials.get(resolved.provider.name)) {
-          console.error(`[Proxy] No credential provider registered for "${resolved.provider.name}" \u2014 treating as missing credential (authority registration gap)`);
+          logStderr(`[Proxy] No credential provider registered for "${resolved.provider.name}" \u2014 treating as missing credential (authority registration gap)`);
           log(`[Proxy] Credential authority has no provider registered under "${resolved.provider.name}"`);
           return null;
         }
@@ -43749,6 +43788,11 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
   };
   const app = new Hono2;
   app.use("*", cors());
+  app.onError((err, c) => {
+    logStderr(`[Proxy] Unhandled error on ${c.req.method} ${c.req.path}: ${err?.message ?? err}`);
+    log(`[Proxy] Unhandled error stack: ${err?.stack ?? "(no stack)"}`);
+    return c.json(wrapAnthropicError(500, `Proxy error: ${err?.message ?? String(err)}`), 500);
+  });
   app.get("/", (c) => c.json({
     status: "ok",
     message: "Claudish Proxy",
@@ -43828,7 +43872,7 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
       const body = await c.req.json();
       log(`[RequestMeta] model=${body.model} output_config=${JSON.stringify(body.output_config) ?? "(none)"} metadata=${JSON.stringify(body.metadata) ?? "(none)"} anthropic-beta=${c.req.header("anthropic-beta") ?? "(none)"}`);
       const handler = await getHandlerForRequest(body.model);
-      return handler.handle(c, body);
+      return await handler.handle(c, body);
     } catch (e) {
       log(`[Proxy] Error: ${e}`);
       if (e instanceof RoutingError) {
@@ -43882,6 +43926,7 @@ var init_proxy_server = __esm(() => {
   init_composed_handler();
   init_fallback_handler();
   init_native_handler();
+  init_anthropic_error();
   init_logger();
   init_model_loader();
   init_profile_config();
@@ -58344,7 +58389,8 @@ var init_config = __esm(() => {
     OPENAI_BASE_URL: "OPENAI_BASE_URL",
     CLAUDISH_SUMMARIZE_TOOLS: "CLAUDISH_SUMMARIZE_TOOLS",
     CLAUDISH_DIAG_MODE: "CLAUDISH_DIAG_MODE",
-    CLAUDISH_DEBUG: "CLAUDISH_DEBUG"
+    CLAUDISH_DEBUG: "CLAUDISH_DEBUG",
+    CLAUDISH_ANTHROPIC_API_BILLING: "CLAUDISH_ANTHROPIC_API_BILLING"
   };
   OPENROUTER_HEADERS = {
     "HTTP-Referer": "https://claudish.com",
@@ -62301,6 +62347,8 @@ async function parseArgs(args) {
         process.exit(1);
       }
       config3.defaultProvider = dpArg;
+    } else if (arg === "--anthropic-api-billing") {
+      config3.anthropicApiBilling = true;
     } else if (arg === "--op-env" || arg.startsWith("--op-env=")) {
       const v = arg.startsWith("--op-env=") ? arg.slice("--op-env=".length) : args[++i];
       if (!v) {
@@ -63350,6 +63398,10 @@ ${h("OPTIONS")}
   ${green("--profile")} ${yellow("<name>")}         Use named profile for model mapping (default profile if omitted)
   ${green("--default-provider")} ${yellow("<name>")} Fallback provider for bare model names (builtin or customEndpoints key)
                            ${dim("Precedence: this flag > CLAUDISH_DEFAULT_PROVIDER env > config.json")}
+  ${green("--anthropic-api-billing")}  Use your real ANTHROPIC_API_KEY for native Claude models
+                           ${dim("(metered API billing). Default: the key is hidden so Claude Code")}
+                           ${dim("uses your claude.ai subscription. Env: CLAUDISH_ANTHROPIC_API_BILLING")}
+                           ${dim("Config: anthropicApiBilling: true")}
   ${green("--config")} ${yellow("<file>")}          Use THIS config file for the run, fully replacing the machine
                            ${dim("global (~/.claudish/config.json) AND project (.claudish.json).")}
                            ${dim("A file naming no op:// source never touches 1Password (no prompt).")}
@@ -63525,6 +63577,7 @@ ${h("ENVIRONMENT VARIABLES")}
   ${blue("CLAUDISH_CONTEXT_WINDOW")}         Override context window size
   ${blue("CLAUDISH_DIAG_MODE")}              Diagnostic output: auto / logfile / off
   ${blue("CLAUDISH_DEBUG")}                  Always enable debug logging: 1 / true ${dim("(same as -d)")}
+  ${blue("CLAUDISH_ANTHROPIC_API_BILLING")}  Bill native Claude to your API key ${dim("(see --anthropic-api-billing)")}
   ${blue("CLAUDISH_MCP_TOOLS")}              MCP tool gating: all / low-level / agentic / channel
   ${blue("CLAUDISH_MODEL_OPUS")}             Override model for Opus role
   ${blue("CLAUDISH_MODEL_SONNET")}           Override model for Sonnet role
@@ -71036,6 +71089,56 @@ var init_tui = __esm(() => {
   }
 });
 
+// src/terminal-isolation.ts
+import { format } from "util";
+function beginTerminalIsolation(onSuppressed) {
+  if (active)
+    return () => {};
+  active = true;
+  const emit2 = (source, text) => {
+    if (routing)
+      return;
+    routing = true;
+    try {
+      onSuppressed({ source, text });
+    } catch {} finally {
+      routing = false;
+    }
+  };
+  const originalConsole = {};
+  for (const method of CONSOLE_METHODS) {
+    originalConsole[method] = console[method];
+    console[method] = (...args) => {
+      emit2(`console.${method}`, format(...args));
+    };
+  }
+  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+  const originalStderrWrite = process.stderr.write.bind(process.stderr);
+  const makeWrite = (source) => (chunk, encoding, callback) => {
+    const done = typeof encoding === "function" ? encoding : callback;
+    emit2(source, typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8"));
+    if (typeof done === "function")
+      done(null);
+    return true;
+  };
+  process.stdout.write = makeWrite("stdout");
+  process.stderr.write = makeWrite("stderr");
+  return function restore() {
+    if (!active)
+      return;
+    for (const method of CONSOLE_METHODS) {
+      console[method] = originalConsole[method];
+    }
+    process.stdout.write = originalStdoutWrite;
+    process.stderr.write = originalStderrWrite;
+    active = false;
+  };
+}
+var CONSOLE_METHODS, active = false, routing = false;
+var init_terminal_isolation = __esm(() => {
+  CONSOLE_METHODS = ["log", "error", "warn", "info", "debug", "trace", "dir"];
+});
+
 // src/claude-runner.ts
 var exports_claude_runner = {};
 __export(exports_claude_runner, {
@@ -71059,6 +71162,12 @@ import {
 import { homedir as homedir24, tmpdir as tmpdir2 } from "os";
 import { join as join25 } from "path";
 import { isatty } from "tty";
+function releaseTerminalIsolation() {
+  if (!restoreTerminal)
+    return;
+  restoreTerminal();
+  restoreTerminal = null;
+}
 function hasNativeAnthropicMapping(config3) {
   const models = [
     config3.model,
@@ -71069,6 +71178,18 @@ function hasNativeAnthropicMapping(config3) {
   ];
   return models.some((m) => m && parseModelSpec(m).provider === "native-anthropic");
 }
+function wantsAnthropicApiBilling(config3) {
+  if (config3.anthropicApiBilling)
+    return true;
+  const raw2 = process.env[ENV.CLAUDISH_ANTHROPIC_API_BILLING];
+  if (raw2 !== undefined && raw2 !== "" && raw2 !== "0" && raw2.toLowerCase() !== "false")
+    return true;
+  try {
+    return loadConfig().anthropicApiBilling === true;
+  } catch {
+    return false;
+  }
+}
 function isProxyAuthMode(config3) {
   return !config3.monitor && !hasNativeAnthropicMapping(config3);
 }
@@ -71332,6 +71453,7 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
     [ENV.CLAUDISH_ACTIVE_MODEL_NAME]: modelDisplayName,
     CLAUDISH_IS_LOCAL: isLocalModel2 ? "true" : "false"
   };
+  let hidAnthropicApiKey = false;
   delete env.CLAUDECODE;
   if (config3.monitor) {
     delete env.ANTHROPIC_API_KEY;
@@ -71345,9 +71467,14 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
       env[ENV.ANTHROPIC_MODEL] = modelId;
       env[ENV.ANTHROPIC_SMALL_FAST_MODEL] = modelId;
     }
-    if (hasNativeAnthropicMapping(config3)) {} else {
-      env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY || "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx";
-      env.ANTHROPIC_AUTH_TOKEN = process.env.ANTHROPIC_AUTH_TOKEN || "placeholder-token-not-used-proxy-handles-auth";
+    if (hasNativeAnthropicMapping(config3)) {
+      if (process.env.ANTHROPIC_API_KEY && !wantsAnthropicApiBilling(config3)) {
+        delete env.ANTHROPIC_API_KEY;
+        hidAnthropicApiKey = true;
+      }
+    } else {
+      env.ANTHROPIC_API_KEY = "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx";
+      env.ANTHROPIC_AUTH_TOKEN = "placeholder-token-not-used-proxy-handles-auth";
       if (!process.env[ENV.CLAUDE_CODE_AUTO_COMPACT_WINDOW]) {
         const autoCompactWindow = await computeMainThreadContextWindow(config3);
         if (autoCompactWindow > 0) {
@@ -71370,6 +71497,9 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
   };
   if (!config3.monitor && hasNativeAnthropicMapping(config3)) {
     log2("[claudish] Native Claude model detected \u2014 using Claude Code subscription credentials");
+    if (hidAnthropicApiKey) {
+      log2("[claudish]   ANTHROPIC_API_KEY found but hidden so it can't override that subscription \xB7 " + "use --anthropic-api-billing (or anthropicApiBilling: true) to bill the API instead");
+    }
   }
   if (config3.interactive) {
     log2(`
@@ -71417,6 +71547,11 @@ Or set CLAUDE_PATH to your custom installation:`);
     stdio,
     shell: needsShell
   });
+  if (config3.interactive) {
+    restoreTerminal = beginTerminalIsolation((entry) => {
+      logStderr(`[Suppressed] ${entry.source}: ${entry.text.trimEnd()}`);
+    });
+  }
   if (ttyFd !== undefined) {
     const fdToClose = ttyFd;
     proc.on("spawn", () => {
@@ -71432,6 +71567,7 @@ Or set CLAUDE_PATH to your custom installation:`);
       resolve3(code ?? 1);
     });
   });
+  releaseTerminalIsolation();
   try {
     unlinkSync9(tempSettingsPath);
   } catch {}
@@ -71441,6 +71577,7 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
   const signals2 = isWindows2() ? ["SIGINT", "SIGTERM"] : ["SIGINT", "SIGTERM", "SIGHUP"];
   for (const signal of signals2) {
     process.on(signal, () => {
+      releaseTerminalIsolation();
       if (!quiet) {
         console.error(`
 [claudish] Received ${signal}, shutting down...`);
@@ -71529,12 +71666,16 @@ async function checkClaudeInstalled() {
   const binary = await findClaudeBinary();
   return binary !== null;
 }
+var restoreTerminal = null;
 var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_config();
+  init_logger();
+  init_profile_config();
   init_model_parser();
   init_routing_rules();
   init_telemetry();
+  init_terminal_isolation();
 });
 
 // src/diag-output.ts

package/package.json

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