claudish 7.17.1 → 7.18.1

package/dist/index.js

@@ -460,6 +460,69 @@ var require_main = __commonJS((exports, module) => {
   module.exports = DotenvModule;
 });
 
+// src/config-override.ts
+var exports_config_override = {};
+__export(exports_config_override, {
+  setConfigFileOverride: () => setConfigFileOverride,
+  planConfigOverride: () => planConfigOverride,
+  getConfigFileOverride: () => getConfigFileOverride,
+  activeOpConfigPaths: () => activeOpConfigPaths,
+  activeGlobalConfigFile: () => activeGlobalConfigFile
+});
+function setConfigFileOverride(path) {
+  overridePath = path;
+}
+function getConfigFileOverride() {
+  return overridePath;
+}
+function activeGlobalConfigFile(realGlobal) {
+  return overridePath ?? realGlobal;
+}
+function activeOpConfigPaths(defaults) {
+  if (overridePath === null)
+    return defaults;
+  const file = overridePath;
+  return {
+    global: () => file,
+    project: () => SUPPRESSED_PROJECT_CONFIG
+  };
+}
+function planConfigOverride(argv, env, deps) {
+  const flag = scanConfigFlag(argv);
+  let path;
+  if (flag) {
+    if (!flag.value || flag.value.startsWith("-")) {
+      return { kind: "error", message: "[claudish] --config requires a file path" };
+    }
+    path = flag.value;
+  } else {
+    path = env.CLAUDISH_CONFIG || undefined;
+  }
+  if (!path)
+    return { kind: "none" };
+  const resolved = deps.resolve(path);
+  if (!deps.exists(resolved)) {
+    return { kind: "error", message: `[claudish] --config file not found: ${resolved}` };
+  }
+  const rest = argv.slice();
+  if (flag)
+    rest.splice(flag.dropAt, flag.dropCount);
+  return { kind: "apply", path: resolved, argv: rest, fromFlag: flag !== null };
+}
+function scanConfigFlag(argv) {
+  for (let i = 0;i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--config") {
+      return { value: argv[i + 1], dropAt: i, dropCount: argv[i + 1] === undefined ? 1 : 2 };
+    }
+    if (a.startsWith("--config=")) {
+      return { value: a.slice("--config=".length), dropAt: i, dropCount: 1 };
+    }
+  }
+  return null;
+}
+var SUPPRESSED_PROJECT_CONFIG = "", overridePath = null;
+
 // src/providers/onepassword-config.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
@@ -482,6 +545,9 @@ function readRawConfig(path) {
 }
 function mutateConfig(scope, paths, mutate) {
   const path = pathFor(scope, paths);
+  if (path === "") {
+    throw new Error("Cannot save to project scope while --config/CLAUDISH_CONFIG is active \u2014 " + "the override file is the only config for this run. Save to global scope " + "(which writes to the override file), or re-run without --config.");
+  }
   const cfg = readRawConfig(path);
   mutate(cfg);
   writeFileSync(path, `${JSON.stringify(cfg, null, 2)}
@@ -572,16 +638,20 @@ function addOnepasswordEnvironment(id, scope, paths = defaultOpConfigPaths) {
 function removeOnepasswordEnvironment(id, scope, paths = defaultOpConfigPaths) {
   removeFromStringList(scope, "onepasswordEnvironments", id, paths);
 }
-var defaultOpConfigPaths;
+var realOpConfigPaths, defaultOpConfigPaths;
 var init_onepassword_config = __esm(() => {
-  defaultOpConfigPaths = {
+  realOpConfigPaths = {
     global: () => join(homedir(), ".claudish", "config.json"),
     project: () => join(process.cwd(), ".claudish.json")
   };
+  defaultOpConfigPaths = {
+    global: () => activeOpConfigPaths(realOpConfigPaths).global(),
+    project: () => activeOpConfigPaths(realOpConfigPaths).project()
+  };
 });
 
 // src/version.ts
-var VERSION = "7.17.1";
+var VERSION = "7.18.1";
 
 // src/logger.ts
 var exports_logger = {};
@@ -685,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:")) {
@@ -3942,6 +4012,8 @@ function resetSdkClientCache() {
 }
 function isTransientSdkError(err) {
   const msg = (err instanceof Error ? err.message : String(err)).toLowerCase();
+  if (msg.includes("denied authorization"))
+    return false;
   return msg.includes("ipc operation failed") || msg.includes("ipc operation") || msg.includes("-4") || msg.includes("denied") || msg.includes("broken pipe") || msg.includes("connection") || msg.includes("invalid client id") || msg.includes("invalid client") || msg.includes("invalid session") || msg.includes("session expired") || msg.includes("session not found") || msg.includes("unauthorized") || msg.includes("token expired") || msg.includes("not authenticated");
 }
 function runSdkExclusive(op, label = "op:sdk-op", meta) {
@@ -4285,7 +4357,7 @@ function readConfigRaw() {
   if (testSeams?.config)
     return testSeams.config;
   try {
-    const configPath = join5(homedir5(), ".claudish", "config.json");
+    const configPath = activeGlobalConfigFile(join5(homedir5(), ".claudish", "config.json"));
     if (!existsSync4(configPath))
       return {};
     return JSON.parse(readFileSync3(configPath, "utf-8"));
@@ -27498,6 +27570,7 @@ __export(exports_profile_config, {
   setProfile: () => setProfile,
   setEndpoint: () => setEndpoint,
   setDefaultProfile: () => setDefaultProfile,
+  setConfigFileOverride: () => setConfigFileOverride,
   setApiKey: () => setApiKey,
   saveLocalConfig: () => saveLocalConfig,
   saveConfig: () => saveConfig,
@@ -27524,23 +27597,29 @@ __export(exports_profile_config, {
   deleteProfile: () => deleteProfile,
   createProfile: () => createProfile,
   configExistsForScope: () => configExistsForScope,
-  configExists: () => configExists
+  configExists: () => configExists,
+  activeConfigFile: () => activeConfigFile
 });
 import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir8 } from "os";
 import { dirname as dirname3, join as join8, parse as parse6 } from "path";
+function activeConfigFile() {
+  return activeGlobalConfigFile(CONFIG_FILE);
+}
 function ensureConfigDir() {
   if (!existsSync6(CONFIG_DIR)) {
     mkdirSync6(CONFIG_DIR, { recursive: true });
   }
 }
 function loadConfig() {
-  ensureConfigDir();
-  if (!existsSync6(CONFIG_FILE)) {
+  const activeFile = activeConfigFile();
+  if (!getConfigFileOverride())
+    ensureConfigDir();
+  if (!existsSync6(activeFile)) {
     return { ...DEFAULT_CONFIG };
   }
   try {
-    const content = readFileSync5(CONFIG_FILE, "utf-8");
+    const content = readFileSync5(activeFile, "utf-8");
     const config2 = JSON.parse(content);
     const merged = {
       version: config2.version || DEFAULT_CONFIG.version,
@@ -27593,8 +27672,9 @@ function loadConfig() {
   }
 }
 function saveConfig(config2) {
-  ensureConfigDir();
-  writeFileSync7(CONFIG_FILE, JSON.stringify(config2, null, 2), "utf-8");
+  if (!getConfigFileOverride())
+    ensureConfigDir();
+  writeFileSync7(activeConfigFile(), JSON.stringify(config2, null, 2), "utf-8");
 }
 function configExists() {
   return existsSync6(CONFIG_FILE);
@@ -27625,6 +27705,8 @@ function isProjectDirectory() {
   return [".git", "package.json", "Cargo.toml", "go.mod", "pyproject.toml", ".claudish.json"].some((f) => existsSync6(join8(cwd, f)));
 }
 function loadLocalConfig() {
+  if (getConfigFileOverride())
+    return null;
   const localPath = getLocalConfigPath();
   if (!existsSync6(localPath)) {
     return null;
@@ -28615,535 +28697,6 @@ var init_provider_definitions = __esm(() => {
   ];
 });
 
-// ../../node_modules/.bun/@hono+node-server@1.19.6+86bafc9754e56507/node_modules/@hono/node-server/dist/index.mjs
-import { createServer as createServerHTTP } from "http";
-import { Http2ServerRequest as Http2ServerRequest2 } from "http2";
-import { Http2ServerRequest } from "http2";
-import { Readable } from "stream";
-import crypto from "crypto";
-async function readWithoutBlocking(readPromise) {
-  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(undefined))]);
-}
-function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const cancel = (error46) => {
-    reader.cancel(error46).catch(() => {});
-  };
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
-  return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
-  });
-  function handleStreamError(error46) {
-    if (error46) {
-      writable.destroy(error46);
-    }
-  }
-  function onDrain() {
-    reader.read().then(flow, handleStreamError);
-  }
-  function flow({ done, value }) {
-    try {
-      if (done) {
-        writable.end();
-      } else if (!writable.write(value)) {
-        writable.once("drain", onDrain);
-      } else {
-        return reader.read().then(flow, handleStreamError);
-      }
-    } catch (e) {
-      handleStreamError(e);
-    }
-  }
-}
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
-}
-var RequestError, toRequestError = (e) => {
-  if (e instanceof RequestError) {
-    return e;
-  }
-  return new RequestError(e.message, { cause: e });
-}, GlobalRequest, Request2, newHeadersFromIncoming = (incoming) => {
-  const headerRecord = [];
-  const rawHeaders = incoming.rawHeaders;
-  for (let i = 0;i < rawHeaders.length; i += 2) {
-    const { [i]: key, [i + 1]: value } = rawHeaders;
-    if (key.charCodeAt(0) !== 58) {
-      headerRecord.push([key, value]);
-    }
-  }
-  return new Headers(headerRecord);
-}, wrapBodyStream, newRequestFromIncoming = (method, url2, headers, incoming, abortController) => {
-  const init = {
-    method,
-    headers,
-    signal: abortController.signal
-  };
-  if (method === "TRACE") {
-    init.method = "GET";
-    const req = new Request2(url2, init);
-    Object.defineProperty(req, "method", {
-      get() {
-        return "TRACE";
-      }
-    });
-    return req;
-  }
-  if (!(method === "GET" || method === "HEAD")) {
-    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
-      init.body = new ReadableStream({
-        start(controller) {
-          controller.enqueue(incoming.rawBody);
-          controller.close();
-        }
-      });
-    } else if (incoming[wrapBodyStream]) {
-      let reader;
-      init.body = new ReadableStream({
-        async pull(controller) {
-          try {
-            reader ||= Readable.toWeb(incoming).getReader();
-            const { done, value } = await reader.read();
-            if (done) {
-              controller.close();
-            } else {
-              controller.enqueue(value);
-            }
-          } catch (error46) {
-            controller.error(error46);
-          }
-        }
-      });
-    } else {
-      init.body = Readable.toWeb(incoming);
-    }
-  }
-  return new Request2(url2, init);
-}, getRequestCache, requestCache, incomingKey, urlKey, headersKey, abortControllerKey, getAbortController, requestPrototype, newRequest = (incoming, defaultHostname) => {
-  const req = Object.create(requestPrototype);
-  req[incomingKey] = incoming;
-  const incomingUrl = incoming.url || "";
-  if (incomingUrl[0] !== "/" && (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
-    if (incoming instanceof Http2ServerRequest) {
-      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
-    }
-    try {
-      const url22 = new URL(incomingUrl);
-      req[urlKey] = url22.href;
-    } catch (e) {
-      throw new RequestError("Invalid absolute URL", { cause: e });
-    }
-    return req;
-  }
-  const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
-  if (!host) {
-    throw new RequestError("Missing host header");
-  }
-  let scheme;
-  if (incoming instanceof Http2ServerRequest) {
-    scheme = incoming.scheme;
-    if (!(scheme === "http" || scheme === "https")) {
-      throw new RequestError("Unsupported scheme");
-    }
-  } else {
-    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
-  }
-  const url2 = new URL(`${scheme}://${host}${incomingUrl}`);
-  if (url2.hostname.length !== host.length && url2.hostname !== host.replace(/:\d+$/, "")) {
-    throw new RequestError("Invalid host header");
-  }
-  req[urlKey] = url2.href;
-  return req;
-}, responseCache, getResponseCache, cacheKey, GlobalResponse, Response2, buildOutgoingHttpHeaders = (headers) => {
-  const res = {};
-  if (!(headers instanceof Headers)) {
-    headers = new Headers(headers ?? undefined);
-  }
-  const cookies = [];
-  for (const [k, v] of headers) {
-    if (k === "set-cookie") {
-      cookies.push(v);
-    } else {
-      res[k] = v;
-    }
-  }
-  if (cookies.length > 0) {
-    res["set-cookie"] = cookies;
-  }
-  res["content-type"] ??= "text/plain; charset=UTF-8";
-  return res;
-}, X_ALREADY_SENT = "x-hono-already-sent", webFetch, outgoingEnded, handleRequestError = () => new Response(null, {
-  status: 400
-}), handleFetchError = (e) => new Response(null, {
-  status: e instanceof Error && (e.name === "TimeoutError" || e.constructor.name === "TimeoutError") ? 504 : 500
-}), handleResponseError = (e, outgoing) => {
-  const err = e instanceof Error ? e : new Error("unknown error", { cause: e });
-  if (err.code === "ERR_STREAM_PREMATURE_CLOSE") {
-    console.info("The user aborted a request.");
-  } else {
-    console.error(e);
-    if (!outgoing.headersSent) {
-      outgoing.writeHead(500, { "Content-Type": "text/plain" });
-    }
-    outgoing.end(`Error: ${err.message}`);
-    outgoing.destroy(err);
-  }
-}, flushHeaders = (outgoing) => {
-  if ("flushHeaders" in outgoing && outgoing.writable) {
-    outgoing.flushHeaders();
-  }
-}, responseViaCache = async (res, outgoing) => {
-  let [status, body, header] = res[cacheKey];
-  if (header instanceof Headers) {
-    header = buildOutgoingHttpHeaders(header);
-  }
-  if (typeof body === "string") {
-    header["Content-Length"] = Buffer.byteLength(body);
-  } else if (body instanceof Uint8Array) {
-    header["Content-Length"] = body.byteLength;
-  } else if (body instanceof Blob) {
-    header["Content-Length"] = body.size;
-  }
-  outgoing.writeHead(status, header);
-  if (typeof body === "string" || body instanceof Uint8Array) {
-    outgoing.end(body);
-  } else if (body instanceof Blob) {
-    outgoing.end(new Uint8Array(await body.arrayBuffer()));
-  } else {
-    flushHeaders(outgoing);
-    await writeFromReadableStream(body, outgoing)?.catch((e) => handleResponseError(e, outgoing));
-  }
-  outgoing[outgoingEnded]?.();
-}, isPromise = (res) => typeof res.then === "function", responseViaResponseObject = async (res, outgoing, options = {}) => {
-  if (isPromise(res)) {
-    if (options.errorHandler) {
-      try {
-        res = await res;
-      } catch (err) {
-        const errRes = await options.errorHandler(err);
-        if (!errRes) {
-          return;
-        }
-        res = errRes;
-      }
-    } else {
-      res = await res.catch(handleFetchError);
-    }
-  }
-  if (cacheKey in res) {
-    return responseViaCache(res, outgoing);
-  }
-  const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
-  if (res.body) {
-    const reader = res.body.getReader();
-    const values = [];
-    let done = false;
-    let currentReadPromise = undefined;
-    if (resHeaderRecord["transfer-encoding"] !== "chunked") {
-      let maxReadCount = 2;
-      for (let i = 0;i < maxReadCount; i++) {
-        currentReadPromise ||= reader.read();
-        const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
-          console.error(e);
-          done = true;
-        });
-        if (!chunk) {
-          if (i === 1) {
-            await new Promise((resolve) => setTimeout(resolve));
-            maxReadCount = 3;
-            continue;
-          }
-          break;
-        }
-        currentReadPromise = undefined;
-        if (chunk.value) {
-          values.push(chunk.value);
-        }
-        if (chunk.done) {
-          done = true;
-          break;
-        }
-      }
-      if (done && !("content-length" in resHeaderRecord)) {
-        resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
-      }
-    }
-    outgoing.writeHead(res.status, resHeaderRecord);
-    values.forEach((value) => {
-      outgoing.write(value);
-    });
-    if (done) {
-      outgoing.end();
-    } else {
-      if (values.length === 0) {
-        flushHeaders(outgoing);
-      }
-      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
-    }
-  } else if (resHeaderRecord[X_ALREADY_SENT]) {} else {
-    outgoing.writeHead(res.status, resHeaderRecord);
-    outgoing.end();
-  }
-  outgoing[outgoingEnded]?.();
-}, getRequestListener = (fetchCallback, options = {}) => {
-  const autoCleanupIncoming = options.autoCleanupIncoming ?? true;
-  if (options.overrideGlobalObjects !== false && global.Request !== Request2) {
-    Object.defineProperty(global, "Request", {
-      value: Request2
-    });
-    Object.defineProperty(global, "Response", {
-      value: Response2
-    });
-  }
-  return async (incoming, outgoing) => {
-    let res, req;
-    try {
-      req = newRequest(incoming, options.hostname);
-      let incomingEnded = !autoCleanupIncoming || incoming.method === "GET" || incoming.method === "HEAD";
-      if (!incomingEnded) {
-        incoming[wrapBodyStream] = true;
-        incoming.on("end", () => {
-          incomingEnded = true;
-        });
-        if (incoming instanceof Http2ServerRequest2) {
-          outgoing[outgoingEnded] = () => {
-            if (!incomingEnded) {
-              setTimeout(() => {
-                if (!incomingEnded) {
-                  setTimeout(() => {
-                    incoming.destroy();
-                    outgoing.destroy();
-                  });
-                }
-              });
-            }
-          };
-        }
-      }
-      outgoing.on("close", () => {
-        const abortController = req[abortControllerKey];
-        if (abortController) {
-          if (incoming.errored) {
-            req[abortControllerKey].abort(incoming.errored.toString());
-          } else if (!outgoing.writableFinished) {
-            req[abortControllerKey].abort("Client connection prematurely closed.");
-          }
-        }
-        if (!incomingEnded) {
-          setTimeout(() => {
-            if (!incomingEnded) {
-              setTimeout(() => {
-                incoming.destroy();
-              });
-            }
-          });
-        }
-      });
-      res = fetchCallback(req, { incoming, outgoing });
-      if (cacheKey in res) {
-        return responseViaCache(res, outgoing);
-      }
-    } catch (e) {
-      if (!res) {
-        if (options.errorHandler) {
-          res = await options.errorHandler(req ? e : toRequestError(e));
-          if (!res) {
-            return;
-          }
-        } else if (!req) {
-          res = handleRequestError();
-        } else {
-          res = handleFetchError(e);
-        }
-      } else {
-        return handleResponseError(e, outgoing);
-      }
-    }
-    try {
-      return await responseViaResponseObject(res, outgoing, options);
-    } catch (e) {
-      return handleResponseError(e, outgoing);
-    }
-  };
-}, createAdaptorServer = (options) => {
-  const fetchCallback = options.fetch;
-  const requestListener = getRequestListener(fetchCallback, {
-    hostname: options.hostname,
-    overrideGlobalObjects: options.overrideGlobalObjects,
-    autoCleanupIncoming: options.autoCleanupIncoming
-  });
-  const createServer2 = options.createServer || createServerHTTP;
-  const server = createServer2(options.serverOptions || {}, requestListener);
-  return server;
-}, serve = (options, listeningListener) => {
-  const server = createAdaptorServer(options);
-  server.listen(options?.port ?? 3000, options.hostname, () => {
-    const serverInfo = server.address();
-    listeningListener && listeningListener(serverInfo);
-  });
-  return server;
-};
-var init_dist = __esm(() => {
-  RequestError = class extends Error {
-    constructor(message, options) {
-      super(message, options);
-      this.name = "RequestError";
-    }
-  };
-  GlobalRequest = global.Request;
-  Request2 = class extends GlobalRequest {
-    constructor(input, options) {
-      if (typeof input === "object" && getRequestCache in input) {
-        input = input[getRequestCache]();
-      }
-      if (typeof options?.body?.getReader !== "undefined") {
-        options.duplex ??= "half";
-      }
-      super(input, options);
-    }
-  };
-  wrapBodyStream = Symbol("wrapBodyStream");
-  getRequestCache = Symbol("getRequestCache");
-  requestCache = Symbol("requestCache");
-  incomingKey = Symbol("incomingKey");
-  urlKey = Symbol("urlKey");
-  headersKey = Symbol("headersKey");
-  abortControllerKey = Symbol("abortControllerKey");
-  getAbortController = Symbol("getAbortController");
-  requestPrototype = {
-    get method() {
-      return this[incomingKey].method || "GET";
-    },
-    get url() {
-      return this[urlKey];
-    },
-    get headers() {
-      return this[headersKey] ||= newHeadersFromIncoming(this[incomingKey]);
-    },
-    [getAbortController]() {
-      this[getRequestCache]();
-      return this[abortControllerKey];
-    },
-    [getRequestCache]() {
-      this[abortControllerKey] ||= new AbortController;
-      return this[requestCache] ||= newRequestFromIncoming(this.method, this[urlKey], this.headers, this[incomingKey], this[abortControllerKey]);
-    }
-  };
-  [
-    "body",
-    "bodyUsed",
-    "cache",
-    "credentials",
-    "destination",
-    "integrity",
-    "mode",
-    "redirect",
-    "referrer",
-    "referrerPolicy",
-    "signal",
-    "keepalive"
-  ].forEach((k) => {
-    Object.defineProperty(requestPrototype, k, {
-      get() {
-        return this[getRequestCache]()[k];
-      }
-    });
-  });
-  ["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-    Object.defineProperty(requestPrototype, k, {
-      value: function() {
-        return this[getRequestCache]()[k]();
-      }
-    });
-  });
-  Object.setPrototypeOf(requestPrototype, Request2.prototype);
-  responseCache = Symbol("responseCache");
-  getResponseCache = Symbol("getResponseCache");
-  cacheKey = Symbol("cache");
-  GlobalResponse = global.Response;
-  Response2 = class _Response {
-    #body;
-    #init;
-    [getResponseCache]() {
-      delete this[cacheKey];
-      return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
-    }
-    constructor(body, init) {
-      let headers;
-      this.#body = body;
-      if (init instanceof _Response) {
-        const cachedGlobalResponse = init[responseCache];
-        if (cachedGlobalResponse) {
-          this.#init = cachedGlobalResponse;
-          this[getResponseCache]();
-          return;
-        } else {
-          this.#init = init.#init;
-          headers = new Headers(init.#init.headers);
-        }
-      } else {
-        this.#init = init;
-      }
-      if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
-        headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-        this[cacheKey] = [init?.status || 200, body, headers];
-      }
-    }
-    get headers() {
-      const cache = this[cacheKey];
-      if (cache) {
-        if (!(cache[2] instanceof Headers)) {
-          cache[2] = new Headers(cache[2]);
-        }
-        return cache[2];
-      }
-      return this[getResponseCache]().headers;
-    }
-    get status() {
-      return this[cacheKey]?.[0] ?? this[getResponseCache]().status;
-    }
-    get ok() {
-      const status = this.status;
-      return status >= 200 && status < 300;
-    }
-  };
-  ["body", "bodyUsed", "redirected", "statusText", "trailers", "type", "url"].forEach((k) => {
-    Object.defineProperty(Response2.prototype, k, {
-      get() {
-        return this[getResponseCache]()[k];
-      }
-    });
-  });
-  ["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-    Object.defineProperty(Response2.prototype, k, {
-      value: function() {
-        return this[getResponseCache]()[k]();
-      }
-    });
-  });
-  Object.setPrototypeOf(Response2, GlobalResponse);
-  Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
-  webFetch = global.fetch;
-  if (typeof global.crypto === "undefined") {
-    global.crypto = crypto;
-  }
-  global.fetch = (info, init) => {
-    init = {
-      compress: false,
-      ...init
-    };
-    return webFetch(info, init);
-  };
-  outgoingEnded = Symbol("outgoingEnded");
-});
-
 // ../../node_modules/.bun/hono@4.10.6/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
@@ -29303,15 +28856,15 @@ var splitPath = (path) => {
   }
   const match = label.match(/^\:([^\{\}]+)(?:\{(.+)\})?$/);
   if (match) {
-    const cacheKey2 = `${label}#${next}`;
-    if (!patternCache[cacheKey2]) {
+    const cacheKey = `${label}#${next}`;
+    if (!patternCache[cacheKey]) {
       if (match[2]) {
-        patternCache[cacheKey2] = next && next[0] !== ":" && next[0] !== "*" ? [cacheKey2, match[1], new RegExp(`^${match[2]}(?=/${next})`)] : [label, match[1], new RegExp(`^${match[2]}$`)];
+        patternCache[cacheKey] = next && next[0] !== ":" && next[0] !== "*" ? [cacheKey, match[1], new RegExp(`^${match[2]}(?=/${next})`)] : [label, match[1], new RegExp(`^${match[2]}$`)];
       } else {
-        patternCache[cacheKey2] = [label, match[1], true];
+        patternCache[cacheKey] = [label, match[1], true];
       }
     }
-    return patternCache[cacheKey2];
+    return patternCache[cacheKey];
   }
   return null;
 }, tryDecode = (str, decoder) => {
@@ -30726,7 +30279,7 @@ var init_hono = __esm(() => {
 });
 
 // ../../node_modules/.bun/hono@4.10.6/node_modules/hono/dist/index.js
-var init_dist2 = __esm(() => {
+var init_dist = __esm(() => {
   init_hono();
 });
 
@@ -33899,6 +33452,7 @@ class ApiKeyCredentialProvider {
   staticHeaders;
   publicKeyFallback;
   oauthFallback;
+  declaredKey;
   cachedKey;
   resolving;
   constructor(descriptor) {
@@ -33909,9 +33463,17 @@ class ApiKeyCredentialProvider {
     this.staticHeaders = descriptor.staticHeaders ?? {};
     this.publicKeyFallback = descriptor.publicKeyFallback;
     this.oauthFallback = descriptor.oauthFallback;
+    this.declaredKey = descriptor.declaredKey;
   }
   resolveFromEnvConfig() {
-    return process.env[this.envVar] || this.aliases.map((a) => process.env[a]).find((v) => !!v) || getApiKey(this.envVar);
+    return process.env[this.envVar] || this.aliases.map((a) => process.env[a]).find((v) => !!v) || getApiKey(this.envVar) || this.resolveDeclared();
+  }
+  resolveDeclared() {
+    try {
+      return this.declaredKey?.() || undefined;
+    } catch {
+      return;
+    }
   }
   hasOauthFallbackFile() {
     if (!this.oauthFallback)
@@ -35780,7 +35342,8 @@ class CredentialAuthority {
       catalogName: descriptor.name,
       envVar: descriptor.envVar,
       aliases: descriptor.aliases,
-      authScheme: descriptor.authScheme === "x-api-key" ? "x-api-key" : "bearer"
+      authScheme: descriptor.authScheme === "x-api-key" ? "x-api-key" : "bearer",
+      declaredKey: descriptor.declaredKey
     }), [descriptor.name]);
   }
   async isAvailable(name, opts) {
@@ -37549,9 +37112,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 };
@@ -37615,15 +37184,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) {
@@ -37638,8 +37215,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)
@@ -37659,12 +37246,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",
@@ -37676,8 +37266,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
@@ -38643,6 +38238,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
@@ -38985,7 +38581,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) {
@@ -39051,7 +38647,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;
     }
@@ -39388,6 +38984,7 @@ var init_composed_handler = __esm(() => {
   init_stats();
   init_telemetry();
   init_transform();
+  init_anthropic_error();
   init_connection_error();
   init_openai_compat();
   init_anthropic_sse();
@@ -40344,6 +39941,7 @@ var init_native_handler = __esm(() => {
   init_logger();
   init_profile_config();
   init_native_handler_advisor();
+  init_anthropic_error();
 });
 
 // src/providers/api-key-map.ts
@@ -40737,8 +40335,8 @@ function cacheSetFailure(key, reason) {
 function cacheSetRanked(key, ranked) {
   _cache.set(key, { ranked, expiresAt: Date.now() + CACHE_TTL_MS });
 }
-async function discoverViaOpenAIModels(endpoint, headers, cacheKey2) {
-  const cached2 = cacheGet(cacheKey2.key, cacheKey2.exclude);
+async function discoverViaOpenAIModels(endpoint, headers, cacheKey) {
+  const cached2 = cacheGet(cacheKey.key, cacheKey.exclude);
   if (cached2 !== undefined)
     return cached2;
   let response;
@@ -40750,14 +40348,14 @@ async function discoverViaOpenAIModels(endpoint, headers, cacheKey2) {
     });
   } catch (e) {
     const reason = classifyFetchError(e, endpoint);
-    log(`[probe-discovery${cacheKey2.displayName ? `:${cacheKey2.displayName}` : ""}] fetch failed: ${reason}`);
-    cacheSetFailure(cacheKey2.key, reason);
+    log(`[probe-discovery${cacheKey.displayName ? `:${cacheKey.displayName}` : ""}] fetch failed: ${reason}`);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   if (!response.ok) {
     const reason = `HTTP ${response.status} from ${endpoint}`;
-    log(`[probe-discovery${cacheKey2.displayName ? `:${cacheKey2.displayName}` : ""}] ${reason}`);
-    cacheSetFailure(cacheKey2.key, reason);
+    log(`[probe-discovery${cacheKey.displayName ? `:${cacheKey.displayName}` : ""}] ${reason}`);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   let body;
@@ -40765,7 +40363,7 @@ async function discoverViaOpenAIModels(endpoint, headers, cacheKey2) {
     body = await response.json();
   } catch {
     const reason = "invalid /v1/models response (not JSON)";
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   const ids = extractModelIds(body);
@@ -40773,17 +40371,17 @@ async function discoverViaOpenAIModels(endpoint, headers, cacheKey2) {
     const url2 = tryParseUrl(endpoint);
     const host = url2?.host ?? endpoint;
     const reason = `${host} reachable but no models loaded \u2014 load a model in the server UI`;
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   const ranked = rankProbeCandidates(ids);
   if (ranked.length === 0) {
     const reason = `no chat-capable model among ${ids.length} listed`;
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
-  cacheSetRanked(cacheKey2.key, ranked);
-  const pick2 = ranked.find((m) => !cacheKey2.exclude?.has(m));
+  cacheSetRanked(cacheKey.key, ranked);
+  const pick2 = ranked.find((m) => !cacheKey.exclude?.has(m));
   if (!pick2) {
     return {
       model: null,
@@ -40833,8 +40431,8 @@ function extractModelIds(body) {
   }
   return [];
 }
-async function discoverViaOllama(baseUrl, cacheKey2) {
-  const cached2 = cacheGet(cacheKey2.key, cacheKey2.exclude);
+async function discoverViaOllama(baseUrl, cacheKey) {
+  const cached2 = cacheGet(cacheKey.key, cacheKey.exclude);
   if (cached2 !== undefined)
     return cached2;
   let connectionError;
@@ -40855,7 +40453,7 @@ async function discoverViaOllama(baseUrl, cacheKey2) {
   const candidates = allRaw.filter((m) => isChatCapable(m.name));
   if (candidates.length === 0) {
     const reason = connectionError ?? (allRaw.length === 0 ? `no models on ${baseUrl} (pull one: ollama pull llama3.2)` : `only embedding/non-chat models on ${baseUrl}`);
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   const sized = candidates.filter((m) => typeof m.size === "number");
@@ -40867,11 +40465,11 @@ async function discoverViaOllama(baseUrl, cacheKey2) {
   }
   if (ranked.length === 0) {
     const reason = "no chat-capable model on Ollama endpoint";
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
-  cacheSetRanked(cacheKey2.key, ranked);
-  const pick2 = ranked.find((m) => !cacheKey2.exclude?.has(m));
+  cacheSetRanked(cacheKey.key, ranked);
+  const pick2 = ranked.find((m) => !cacheKey.exclude?.has(m));
   if (!pick2) {
     return {
       model: null,
@@ -40880,8 +40478,8 @@ async function discoverViaOllama(baseUrl, cacheKey2) {
   }
   return { model: pick2 };
 }
-async function discoverViaLMStudio(baseUrl, headers, cacheKey2) {
-  const cached2 = cacheGet(cacheKey2.key, cacheKey2.exclude);
+async function discoverViaLMStudio(baseUrl, headers, cacheKey) {
+  const cached2 = cacheGet(cacheKey.key, cacheKey.exclude);
   if (cached2 !== undefined)
     return cached2;
   let response;
@@ -40892,17 +40490,17 @@ async function discoverViaLMStudio(baseUrl, headers, cacheKey2) {
       signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
     });
   } catch (e) {
-    return discoverViaOpenAIModels(`${baseUrl}/v1/models`, headers, cacheKey2);
+    return discoverViaOpenAIModels(`${baseUrl}/v1/models`, headers, cacheKey);
   }
   if (!response.ok) {
-    return discoverViaOpenAIModels(`${baseUrl}/v1/models`, headers, cacheKey2);
+    return discoverViaOpenAIModels(`${baseUrl}/v1/models`, headers, cacheKey);
   }
   let body;
   try {
     body = await response.json();
   } catch {
     const reason = "invalid /api/v0/models response (not JSON)";
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   const models = extractLMStudioModels(body);
@@ -40910,7 +40508,7 @@ async function discoverViaLMStudio(baseUrl, headers, cacheKey2) {
     const url2 = tryParseUrl(baseUrl);
     const host = url2?.host ?? baseUrl;
     const reason = `${host} reachable but no models present \u2014 download one in the LM Studio UI`;
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
   const chatModels = models.filter((m) => isChatCapable(m.id) && m.type !== "embeddings" && m.type !== "embedding");
@@ -40924,11 +40522,11 @@ async function discoverViaLMStudio(baseUrl, headers, cacheKey2) {
     const url2 = tryParseUrl(baseUrl);
     const host = url2?.host ?? baseUrl;
     const reason = `${host} has ${models.length} model(s) but none are chat-capable`;
-    cacheSetFailure(cacheKey2.key, reason);
+    cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
-  cacheSetRanked(cacheKey2.key, ranked);
-  const pick2 = ranked.find((m) => !cacheKey2.exclude?.has(m));
+  cacheSetRanked(cacheKey.key, ranked);
+  const pick2 = ranked.find((m) => !cacheKey.exclude?.has(m));
   if (!pick2) {
     return {
       model: null,
@@ -41109,7 +40707,8 @@ function loadCustomEndpoints(config2) {
       credentials.registerApiKeyProvider({
         name: def.name,
         envVar: def.apiKeyEnvVar,
-        authScheme: def.authScheme === "x-api-key" ? "x-api-key" : "bearer"
+        authScheme: def.authScheme === "x-api-key" ? "x-api-key" : "bearer",
+        declaredKey: () => resolveDeclaredEndpointKey(validated)
       });
       result.registered++;
     } catch (err) {
@@ -41267,6 +40866,14 @@ function resolveCustomEndpointApiKey(ep) {
   }
   return literal3;
 }
+function resolveDeclaredEndpointKey(ep) {
+  const declared = ep.apiKey?.trim();
+  if (!declared)
+    return;
+  if (declared.startsWith("op://"))
+    return;
+  return resolveCustomEndpointApiKey(ep) || undefined;
+}
 function stripTrailingSlash(url2) {
   return url2.replace(/\/+$/, "");
 }
@@ -41382,6 +40989,12 @@ var init_ollama_api_format = __esm(() => {
 import { existsSync as existsSync15, readFileSync as readFileSync12 } from "fs";
 import { homedir as homedir18 } from "os";
 import { join as join18, resolve } from "path";
+function activeConfigPath() {
+  return activeGlobalConfigFile(join18(homedir18(), ".claudish", "config.json"));
+}
+function configLayerLabel() {
+  return getConfigFileOverride() ? activeConfigPath() : "~/.claudish/config.json";
+}
 function maskKey(key) {
   if (!key)
     return null;
@@ -41401,7 +41014,7 @@ function resolveApiKeyProvenance(envVar, aliases) {
   });
   const configValue = readConfigKey(envVar);
   layers.push({
-    source: "~/.claudish/config.json",
+    source: configLayerLabel(),
     maskedValue: maskKey(configValue),
     isActive: false
   });
@@ -41427,7 +41040,7 @@ function resolveApiKeyProvenance(envVar, aliases) {
       layers[0].isActive = true;
       layers[2].isActive = false;
     } else if (configValue && configValue === runtimeValue) {
-      effectiveSource = "~/.claudish/config.json";
+      effectiveSource = configLayerLabel();
       layers[1].isActive = true;
       layers[2].isActive = false;
     } else if (isOpHydratedVar(runtimeVar)) {
@@ -41468,7 +41081,7 @@ function readDotenvKey(envVars) {
 }
 function readConfigKey(envVar) {
   try {
-    const configPath = join18(homedir18(), ".claudish", "config.json");
+    const configPath = activeConfigPath();
     if (!existsSync15(configPath))
       return null;
     const cfg = JSON.parse(readFileSync12(configPath, "utf-8"));
@@ -43327,21 +42940,21 @@ class LocalTransport {
     return headers;
   }
   async discoverProbeModel(exclude) {
-    const cacheKey2 = {
+    const cacheKey = {
       key: `${this.config.name}:${this.config.baseUrl}`,
       displayName: this.displayName,
       exclude
     };
     if (this.config.name === "ollama") {
       return discoverViaOllama(this.config.baseUrl, {
-        ...cacheKey2,
+        ...cacheKey,
         key: `ollama:${this.config.baseUrl}`
       });
     }
     if (this.config.name === "lmstudio") {
-      return discoverViaLMStudio(this.config.baseUrl, await this.getHeaders(), cacheKey2);
+      return discoverViaLMStudio(this.config.baseUrl, await this.getHeaders(), cacheKey);
     }
-    return discoverViaOpenAIModels(`${this.config.baseUrl}/v1/models`, await this.getHeaders(), cacheKey2);
+    return discoverViaOpenAIModels(`${this.config.baseUrl}/v1/models`, await this.getHeaders(), cacheKey);
   }
   getRequestInit() {
     return {
@@ -43904,7 +43517,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)}`);
@@ -43992,9 +43605,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) {
@@ -44013,7 +43627,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;
         }
@@ -44105,9 +43719,9 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
     {
       const parsedForFallback = parseModelSpec(target);
       if (!parsedForFallback.isExplicitProvider && parsedForFallback.provider !== "native-anthropic" && !isPoeModel(target)) {
-        const cacheKey2 = `fallback:${target}`;
-        if (fallbackHandlerCache.has(cacheKey2)) {
-          return fallbackHandlerCache.get(cacheKey2);
+        const cacheKey = `fallback:${target}`;
+        if (fallbackHandlerCache.has(cacheKey)) {
+          return fallbackHandlerCache.get(cacheKey);
         }
         await ensureCatalogReady("openrouter", 5000);
         const plan = await route(parsedForFallback.model, effectiveRoutingRules);
@@ -44127,7 +43741,7 @@ async function createProxyServer(port, _openrouterApiKey, model, monitorMode = f
           }
           if (candidates.length > 0) {
             const resultHandler = candidates.length > 1 ? new FallbackHandler(candidates) : candidates[0].handler;
-            fallbackHandlerCache.set(cacheKey2, resultHandler);
+            fallbackHandlerCache.set(cacheKey, resultHandler);
             if (!options.quiet && candidates.length > 1) {
               logStderr(`[Route] ${candidates.length} providers for ${parsedForFallback.model}: ${candidates.map((c) => c.name).join(" \u2192 ")}`);
             }
@@ -44171,6 +43785,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",
@@ -44250,7 +43869,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) {
@@ -44259,9 +43878,13 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
       return c.json(wrapAnthropicError(500, String(e)), 500);
     }
   });
-  const server = serve({ fetch: app.fetch, port, hostname: "127.0.0.1" });
-  const addr = server.address();
-  const resolvedPort = typeof addr === "object" && addr?.port ? addr.port : port;
+  const server = Bun.serve({
+    fetch: app.fetch,
+    port,
+    hostname: "127.0.0.1",
+    idleTimeout: 255
+  });
+  const resolvedPort = server.port ?? port;
   log(`[Proxy] Server started on port ${resolvedPort}`);
   warmPricingCache().catch(() => {});
   warmRecommendedModels().catch(() => {});
@@ -44270,7 +43893,7 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
     port: resolvedPort,
     url: `http://127.0.0.1:${resolvedPort}`,
     shutdown: async () => {
-      return new Promise((resolve2) => server.close(() => resolve2()));
+      await server.stop(true);
     },
     invalidateHandlerCache: (providerSlug) => {
       if (!providerSlug) {
@@ -44293,7 +43916,6 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
 var RoutingError;
 var init_proxy_server = __esm(() => {
   init_dist();
-  init_dist2();
   init_cors();
   init_local_adapter();
   init_openrouter_api_format();
@@ -44301,6 +43923,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();
@@ -45730,7 +45353,7 @@ var init_mcp_server = __esm(() => {
   init_proxy_server();
   init_team_orchestrator();
   import_dotenv2 = __toESM(require_main(), 1);
-  import_dotenv2.config();
+  import_dotenv2.config({ quiet: true });
   __filename2 = fileURLToPath(import.meta.url);
   __dirname2 = dirname5(__filename2);
   CLAUDISH_CACHE_DIR = join21(homedir20(), ".claudish");
@@ -46142,7 +45765,7 @@ function isUnicodeSupported() {
   return Boolean(process3.env["WT_SESSION"]) || Boolean(process3.env["TERMINUS_SUBLIME"]) || process3.env["ConEmuTask"] === "{cmd::Cmder}" || process3.env["TERM_PROGRAM"] === "Terminus-Sublime" || process3.env["TERM_PROGRAM"] === "vscode" || process3.env["TERM"] === "xterm-256color" || process3.env["TERM"] === "alacritty" || process3.env["TERMINAL_EMULATOR"] === "JetBrains-JediTerm";
 }
 var common, specialMainSymbols, specialFallbackSymbols, mainSymbols, fallbackSymbols, shouldUseMain, figures, dist_default, replacements;
-var init_dist3 = __esm(() => {
+var init_dist2 = __esm(() => {
   common = {
     circleQuestionMark: "(?)",
     questionMarkPrefix: "(?)",
@@ -46429,7 +46052,7 @@ var init_dist3 = __esm(() => {
 import { styleText } from "util";
 var defaultTheme;
 var init_theme = __esm(() => {
-  init_dist3();
+  init_dist2();
   defaultTheme = {
     prefix: {
       idle: styleText("blue", "?"),
@@ -47472,7 +47095,7 @@ var ESC = "\x1B[", cursorLeft, cursorHide, cursorShow, cursorUp = (rows = 1) =>
   }
   return `${ESC}${x + 1}G`;
 }, eraseLine, eraseLines = (lines) => lines > 0 ? (eraseLine + cursorUp(1)).repeat(lines - 1) + eraseLine + cursorLeft : "";
-var init_dist4 = __esm(() => {
+var init_dist3 = __esm(() => {
   cursorLeft = ESC + "G";
   cursorHide = ESC + "?25l";
   cursorShow = ESC + "?25h";
@@ -47545,7 +47168,7 @@ var height = (content) => content.split(`
 `).pop() ?? "";
 var init_screen_manager = __esm(() => {
   init_utils();
-  init_dist4();
+  init_dist3();
 });
 
 // ../../node_modules/.bun/@inquirer+core@11.0.1+04f2146be16c61ef/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
@@ -47678,11 +47301,11 @@ class Separator {
   }
 }
 var init_Separator = __esm(() => {
-  init_dist3();
+  init_dist2();
 });
 
 // ../../node_modules/.bun/@inquirer+core@11.0.1+04f2146be16c61ef/node_modules/@inquirer/core/dist/index.js
-var init_dist5 = __esm(() => {
+var init_dist4 = __esm(() => {
   init_use_prefix();
   init_use_state();
   init_use_effect();
@@ -47742,11 +47365,11 @@ function normalizeChoices(choices) {
   });
 }
 var checkboxTheme, dist_default2;
-var init_dist6 = __esm(() => {
-  init_dist5();
+var init_dist5 = __esm(() => {
   init_dist4();
   init_dist3();
-  init_dist5();
+  init_dist2();
+  init_dist4();
   checkboxTheme = {
     icon: {
       checked: styleText3("green", dist_default.circleFilled),
@@ -57387,7 +57010,7 @@ class ExternalEditor {
   }
 }
 var import_chardet, import_iconv_lite;
-var init_dist7 = __esm(() => {
+var init_dist6 = __esm(() => {
   init_CreateFileError();
   init_LaunchEditorError();
   init_ReadFileError();
@@ -57398,9 +57021,9 @@ var init_dist7 = __esm(() => {
 
 // ../../node_modules/.bun/@inquirer+editor@5.0.1+04f2146be16c61ef/node_modules/@inquirer/editor/dist/index.js
 var editorTheme, dist_default3;
-var init_dist8 = __esm(() => {
-  init_dist7();
-  init_dist5();
+var init_dist7 = __esm(() => {
+  init_dist6();
+  init_dist4();
   editorTheme = {
     validationFailureMode: "keep"
   };
@@ -57483,8 +57106,8 @@ function boolToString(value) {
   return value ? "Yes" : "No";
 }
 var dist_default4;
-var init_dist9 = __esm(() => {
-  init_dist5();
+var init_dist8 = __esm(() => {
+  init_dist4();
   dist_default4 = createPrompt((config3, done) => {
     const { transformer = boolToString } = config3;
     const [status, setStatus] = useState("idle");
@@ -57522,8 +57145,8 @@ var init_dist9 = __esm(() => {
 
 // ../../node_modules/.bun/@inquirer+input@5.0.1+04f2146be16c61ef/node_modules/@inquirer/input/dist/index.js
 var inputTheme, dist_default5;
-var init_dist10 = __esm(() => {
-  init_dist5();
+var init_dist9 = __esm(() => {
+  init_dist4();
   inputTheme = {
     validationFailureMode: "keep"
   };
@@ -57627,8 +57250,8 @@ function validateNumber(value, { min, max, step }) {
   return true;
 }
 var dist_default6;
-var init_dist11 = __esm(() => {
-  init_dist5();
+var init_dist10 = __esm(() => {
+  init_dist4();
   dist_default6 = createPrompt((config3, done) => {
     const { validate: validate2 = () => true, min = -Infinity, max = Infinity, step = 1, required: required2 = false } = config3;
     const theme = makeTheme(config3.theme);
@@ -57711,8 +57334,8 @@ function normalizeChoices2(choices) {
   });
 }
 var helpChoice, dist_default7;
-var init_dist12 = __esm(() => {
-  init_dist5();
+var init_dist11 = __esm(() => {
+  init_dist4();
   helpChoice = {
     key: "h",
     name: "Help, list all options",
@@ -57835,8 +57458,8 @@ function getSelectedChoice(input, choices) {
   return selectedChoice ? [selectedChoice, choices.indexOf(selectedChoice)] : [undefined, undefined];
 }
 var numberRegex, dist_default8;
-var init_dist13 = __esm(() => {
-  init_dist5();
+var init_dist12 = __esm(() => {
+  init_dist4();
   numberRegex = /\d+/;
   dist_default8 = createPrompt((config3, done) => {
     const { loop = true } = config3;
@@ -57914,9 +57537,9 @@ var init_dist13 = __esm(() => {
 
 // ../../node_modules/.bun/@inquirer+password@5.0.1+04f2146be16c61ef/node_modules/@inquirer/password/dist/index.js
 var dist_default9;
-var init_dist14 = __esm(() => {
-  init_dist5();
+var init_dist13 = __esm(() => {
   init_dist4();
+  init_dist3();
   dist_default9 = createPrompt((config3, done) => {
     const { validate: validate2 = () => true } = config3;
     const theme = makeTheme(config3.theme);
@@ -57997,9 +57620,9 @@ function normalizeChoices4(choices) {
   });
 }
 var searchTheme, dist_default10;
-var init_dist15 = __esm(() => {
-  init_dist5();
-  init_dist3();
+var init_dist14 = __esm(() => {
+  init_dist4();
+  init_dist2();
   searchTheme = {
     icon: { cursor: dist_default.pointer },
     style: {
@@ -58165,10 +57788,10 @@ function normalizeChoices5(choices) {
   });
 }
 var selectTheme, dist_default11;
-var init_dist16 = __esm(() => {
-  init_dist5();
+var init_dist15 = __esm(() => {
   init_dist4();
   init_dist3();
+  init_dist2();
   selectTheme = {
     icon: { cursor: dist_default.pointer },
     style: {
@@ -58311,8 +57934,9 @@ __export(exports_dist, {
   checkbox: () => dist_default2,
   Separator: () => Separator
 });
-var init_dist17 = __esm(() => {
-  init_dist6();
+var init_dist16 = __esm(() => {
+  init_dist5();
+  init_dist7();
   init_dist8();
   init_dist9();
   init_dist10();
@@ -58321,7 +57945,6 @@ var init_dist17 = __esm(() => {
   init_dist13();
   init_dist14();
   init_dist15();
-  init_dist16();
 });
 
 // src/auth/auth-commands.ts
@@ -58387,7 +58010,7 @@ async function logoutCommand(providerArg) {
 }
 var AUTH_PROVIDERS;
 var init_auth_commands = __esm(() => {
-  init_dist17();
+  init_dist16();
   init_codex_oauth();
   init_gemini_oauth();
   init_kimi_oauth();
@@ -58424,7 +58047,7 @@ __export(exports_quota_command, {
 });
 async function quotaCommand(provider) {
   if (!provider) {
-    const { select } = await Promise.resolve().then(() => (init_dist17(), exports_dist));
+    const { select } = await Promise.resolve().then(() => (init_dist16(), exports_dist));
     const choices = QUOTA_ADAPTERS.map((a) => ({
       name: `${a.name} \u2014 ${a.isAvailable() ? "logged in" : "not logged in"}`,
       value: a
@@ -59312,8 +58935,8 @@ async function selectModel(options = {}) {
     pickerProviders = toPickerProviders(await getInteractiveProviderChoices());
   }
   const loadRemoteModels = async (providerSlug, searchTerm) => {
-    const cacheKey2 = `${providerSlug || "__all__"}::${searchTerm}`;
-    const cached2 = remoteQueryCache.get(cacheKey2);
+    const cacheKey = `${providerSlug || "__all__"}::${searchTerm}`;
+    const cached2 = remoteQueryCache.get(cacheKey);
     if (cached2) {
       return cached2;
     }
@@ -59326,7 +58949,7 @@ async function selectModel(options = {}) {
         return [];
       }
     })();
-    remoteQueryCache.set(cacheKey2, request);
+    remoteQueryCache.set(cacheKey, request);
     return request;
   };
   const ac = new AbortController;
@@ -59665,7 +59288,7 @@ async function confirmAction(message) {
 }
 var pickerProviderToFirebaseSlug, LOCAL_OR_USER_DEPLOYED, PROVIDER_FILTER_ALIASES, ALL_PROVIDER_CHOICES, PROVIDER_MODEL_PREFIX;
 var init_model_selector = __esm(() => {
-  init_dist17();
+  init_dist16();
   init_authority();
   init_model_loader();
   init_model_catalog2();
@@ -63769,6 +63392,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("--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).")}
+                           ${dim("Env vars still resolve first. Env: CLAUDISH_CONFIG")}
   ${green("--op")} ${yellow("<op://glob>")}         Load API keys from a 1Password item glob (SDK-based, no op CLI)
   ${green("--op")} ${yellow("<glob>")} ${green("--list")}      Preview which fields the glob would import (names only, no values)
   ${green("--op-env")} ${yellow("<id>")}            Load env vars from a 1Password Environment (highest priority)
@@ -64997,7 +64624,7 @@ ${BOLD3}Examples:${RESET3}
 }
 var RESET3 = "\x1B[0m", BOLD3 = "\x1B[1m", DIM3 = "\x1B[2m", GREEN3 = "\x1B[32m", YELLOW2 = "\x1B[33m", CYAN3 = "\x1B[36m", MAGENTA2 = "\x1B[35m";
 var init_profile_commands = __esm(() => {
-  init_dist17();
+  init_dist16();
   init_model_selector();
   init_profile_config();
 });
@@ -70121,8 +69748,8 @@ function App({ requestLogin } = {}) {
     setOpFieldCursor(0);
     setOpFilter("");
     setMode("pick_op_field");
-    const cacheKey2 = `${vaultId}:${itemId}`;
-    const cached2 = opFieldsCache.current.get(cacheKey2);
+    const cacheKey = `${vaultId}:${itemId}`;
+    const cached2 = opFieldsCache.current.get(cacheKey);
     if (cached2) {
       setOpFields(cached2);
       setStatusMsg(`1Password: ${cached2.length} field${cached2.length === 1 ? "" : "s"} (cached).`);
@@ -70134,7 +69761,7 @@ function App({ requestLogin } = {}) {
     try {
       const auth = await acquireOpAuth();
       const fields = await withSdkRetry(() => discoverItemFieldsById(vaultId, itemId, vaultTitle, itemTitle, { auth }), "tui:load-fields");
-      opFieldsCache.current.set(cacheKey2, fields);
+      opFieldsCache.current.set(cacheKey, fields);
       setOpFields(fields);
       setStatusMsg(`1Password: ${fields.length} field${fields.length === 1 ? "" : "s"}.`);
     } catch (err) {
@@ -71451,6 +71078,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, {
@@ -71474,6 +71151,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,
@@ -71832,6 +71515,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", () => {
@@ -71847,6 +71535,7 @@ Or set CLAUDE_PATH to your custom installation:`);
       resolve3(code ?? 1);
     });
   });
+  releaseTerminalIsolation();
   try {
     unlinkSync9(tempSettingsPath);
   } catch {}
@@ -71856,6 +71545,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...`);
@@ -71944,12 +71634,15 @@ 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_model_parser();
   init_routing_rules();
   init_telemetry();
+  init_terminal_isolation();
 });
 
 // src/diag-output.ts
@@ -72451,8 +72144,8 @@ var init_team_grid = __esm(() => {
 init_op_source();
 init_startup_trace();
 var import_dotenv3 = __toESM(require_main(), 1);
-import { readFileSync as readFileSync23 } from "fs";
-import { join as join28 } from "path";
+import { existsSync as existsSync25, readFileSync as readFileSync23 } from "fs";
+import { join as join28, resolve as resolve3 } from "path";
 import_dotenv3.config({ quiet: true });
 function classifyStartupKind() {
   const argv = process.argv.slice(2);
@@ -72547,6 +72240,24 @@ async function applyOpImport() {
   }
   process.argv = [...head, ...rebuilt];
 }
+async function applyConfigOverride() {
+  const { planConfigOverride: planConfigOverride2, setConfigFileOverride: setConfigFileOverride2 } = await Promise.resolve().then(() => exports_config_override);
+  const plan = planConfigOverride2(process.argv.slice(2), process.env, {
+    resolve: resolve3,
+    exists: existsSync25
+  });
+  if (plan.kind === "none")
+    return;
+  if (plan.kind === "error") {
+    console.error(plan.message);
+    process.exit(1);
+  }
+  if (plan.fromFlag)
+    process.argv = [...process.argv.slice(0, 2), ...plan.argv];
+  setConfigFileOverride2(plan.path);
+  process.env.CLAUDISH_CONFIG = plan.path;
+}
+await traceSpan("startup:config-override", () => applyConfigOverride());
 await traceSpan("startup:op-env-flags", () => applyOpEnvironment());
 await traceSpan("startup:op-import-flag", () => applyOpImport());
 var isMcpMode = process.argv.includes("--mcp");
@@ -72734,11 +72445,11 @@ Team Status`);
   You can disable it anytime with: --no-auto-approve
 
 `);
-          const answer = await new Promise((resolve3) => {
+          const answer = await new Promise((resolve4) => {
             const rl = createInterface2({ input: process.stdin, output: process.stderr });
             rl.question("Enable auto-approve? [Y/n] ", (ans) => {
               rl.close();
-              resolve3(ans.trim().toLowerCase());
+              resolve4(ans.trim().toLowerCase());
             });
           });
           const declined = answer === "n" || answer === "no";