claudish 14.18.0 → 14.18.1

package/dist/index.js

@@ -5494,7 +5494,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "14.18.0";
+var VERSION = "14.18.1";
 
 // src/redact.ts
 function isPlaceholder(value) {
@@ -5584,6 +5584,19 @@ function redactExactValues(text, values) {
   }
   return out;
 }
+function containsExactValue(text, values) {
+  if (!text)
+    return false;
+  for (const value of values) {
+    if (typeof value !== "string" || value.length < SIGNING_VALUE_MIN_LENGTH)
+      continue;
+    for (const form of signingValueForms(value)) {
+      if (text.includes(form))
+        return true;
+    }
+  }
+  return false;
+}
 function redactForClient(text) {
   return redactSigningValues(text);
 }
@@ -34251,6 +34264,236 @@ var init_harness = __esm(() => {
   SKILL_LINE = /^-\s+([a-z0-9][a-z0-9:_-]*):\s*(.+)$/i;
 });
 
+// src/handlers/shared/call-context.ts
+function createSigningSecrets() {
+  return { values: new Set, lease: acquireSigningLease() };
+}
+function signingSecretsOf(c) {
+  const installed = readCallVar(c, SIGNING_SECRETS_KEY);
+  if (installed)
+    return installed;
+  const lazy = createSigningSecrets();
+  writeCallVar(c, SIGNING_SECRETS_KEY, lazy);
+  return lazy;
+}
+function readCallVar(c, key) {
+  if (!c || typeof c !== "object")
+    return;
+  const store = c;
+  if (typeof store.get === "function")
+    return store.get(key);
+  return detachedCallVars.get(c)?.get(key);
+}
+function writeCallVar(c, key, value) {
+  if (!c || typeof c !== "object")
+    return;
+  const store = c;
+  if (typeof store.set === "function") {
+    store.set(key, value);
+    return;
+  }
+  let vars = detachedCallVars.get(c);
+  if (!vars) {
+    vars = new Map;
+    detachedCallVars.set(c, vars);
+  }
+  vars.set(key, value);
+}
+function addSigningSecrets(c, values) {
+  const secrets = signingSecretsOf(c);
+  const list = [...values].filter((v) => typeof v === "string" && v.length > 0);
+  for (const value of list)
+    secrets.values.add(value);
+  secrets.lease.add(list);
+}
+function isCredentialHeader(name) {
+  const lower = name.toLowerCase();
+  if (CREDENTIAL_HEADER_NAMES.has(lower))
+    return true;
+  return CREDENTIAL_HEADER_FRAGMENTS.some((fragment) => lower.includes(fragment));
+}
+function credentialPartsOf(name, value) {
+  const parts = [value];
+  const bare = value.replace(AUTH_SCHEME_PREFIX, "");
+  if (bare !== value)
+    parts.push(bare);
+  if (name.toLowerCase() === "cookie") {
+    for (const pair of value.split(";")) {
+      const eq = pair.indexOf("=");
+      if (eq > 0)
+        parts.push(pair.slice(eq + 1).trim());
+    }
+  }
+  return parts;
+}
+function credentialValuesFromRequest(headers, endpoint) {
+  const out = [];
+  for (const [name, value] of Object.entries(headers ?? {})) {
+    if (typeof value !== "string" || !value || !isCredentialHeader(name))
+      continue;
+    out.push(...credentialPartsOf(name, value));
+  }
+  if (endpoint) {
+    try {
+      for (const [name, value] of new URL(endpoint).searchParams) {
+        if (value && CREDENTIAL_QUERY_NAMES.has(name.toLowerCase()))
+          out.push(value);
+      }
+    } catch {}
+  }
+  return out;
+}
+function releaseWhenBodyEnds(response, release) {
+  const source = response.body;
+  if (!source) {
+    release();
+    return response;
+  }
+  const reader = source.getReader();
+  let cancelling = false;
+  const stream = new ReadableStream({
+    async pull(controller) {
+      let result;
+      try {
+        result = await reader.read();
+      } catch (err) {
+        if (cancelling)
+          return;
+        release();
+        controller.error(err);
+        return;
+      }
+      if (cancelling)
+        return;
+      if (result.done) {
+        release();
+        controller.close();
+        return;
+      }
+      controller.enqueue(result.value);
+    },
+    async cancel(reason) {
+      cancelling = true;
+      try {
+        await reader.cancel(reason);
+      } catch {} finally {
+        release();
+      }
+    }
+  }, { highWaterMark: 0 });
+  return new Response(stream, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers
+  });
+}
+function callAbortSignal(c) {
+  return readCallVar(c, CALL_ABORT_SIGNAL_KEY);
+}
+function callAborted(c) {
+  return callAbortSignal(c)?.aborted === true;
+}
+function callAbortError() {
+  return new DOMException("the call's deadline passed; claudish stopped its work", "AbortError");
+}
+function raceCallAbort(p, signal) {
+  if (!signal)
+    return p;
+  p.catch(() => {});
+  if (signal.aborted)
+    return Promise.reject(callAbortError());
+  return new Promise((resolve, reject) => {
+    const onAbort = () => reject(callAbortError());
+    signal.addEventListener("abort", onAbort, { once: true });
+    p.then((value) => {
+      signal.removeEventListener("abort", onAbort);
+      resolve(value);
+    }, (err) => {
+      signal.removeEventListener("abort", onAbort);
+      reject(err);
+    });
+  });
+}
+function sleepUnlessAborted(ms, signal) {
+  if (signal?.aborted)
+    return Promise.resolve(true);
+  return new Promise((resolve) => {
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve(true);
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve(false);
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+function withCallSignal(sig, callSignal) {
+  if (!callSignal)
+    return sig;
+  if (!sig)
+    return callSignal;
+  return AbortSignal.any([sig, callSignal]);
+}
+function abortedResponse() {
+  return new Response(JSON.stringify({
+    type: "error",
+    error: {
+      type: "timeout_error",
+      message: "claudish stopped this call: its deadline passed"
+    }
+  }), {
+    status: 408,
+    headers: { "content-type": "application/json", [CALL_ABORTED_HEADER]: "1" }
+  });
+}
+function hopLogOf(c) {
+  return readCallVar(c, HOP_LOG_KEY);
+}
+function recordHopEntry(c, provider, wireModel) {
+  const hops = hopLogOf(c);
+  if (!hops)
+    return;
+  const plannedUid = readCallVar(c, PLANNED_HOP_KEY);
+  const entry = {
+    provider,
+    wireModel,
+    arm: null,
+    billing: null,
+    ...plannedUid ? { plannedUid } : {}
+  };
+  hops.push(entry);
+  return entry;
+}
+async function withPlannedHop(c, plannedUid, work) {
+  if (!hopLogOf(c))
+    return work();
+  const previous = readCallVar(c, PLANNED_HOP_KEY);
+  writeCallVar(c, PLANNED_HOP_KEY, plannedUid);
+  try {
+    return await work();
+  } finally {
+    writeCallVar(c, PLANNED_HOP_KEY, previous);
+  }
+}
+var SIGNING_SECRETS_KEY = "claudishSigningSecrets", detachedCallVars, CREDENTIAL_HEADER_NAMES, CREDENTIAL_HEADER_FRAGMENTS, CREDENTIAL_QUERY_NAMES, AUTH_SCHEME_PREFIX, CALL_ABORT_SIGNAL_KEY = "claudishCallAbortSignal", CALL_ABORTED_HEADER = "x-claudish-call-aborted", HOP_LOG_KEY = "claudishHopLog", PLANNED_HOP_KEY = "claudishPlannedHop";
+var init_call_context = __esm(() => {
+  init_redact();
+  detachedCallVars = new WeakMap;
+  CREDENTIAL_HEADER_NAMES = new Set([
+    "authorization",
+    "proxy-authorization",
+    "x-api-key",
+    "api-key",
+    "x-goog-api-key",
+    "cookie"
+  ]);
+  CREDENTIAL_HEADER_FRAGMENTS = ["token", "secret", "key"];
+  CREDENTIAL_QUERY_NAMES = new Set(["key", "api_key", "token", "access_token"]);
+  AUTH_SCHEME_PREFIX = /^(?:Bearer|Basic|Token)\s+/i;
+});
+
 // src/providers/codex-models-discovery.ts
 import { existsSync as existsSync14, readFileSync as readFileSync18 } from "fs";
 import { homedir as homedir16 } from "os";
@@ -34322,6 +34565,21 @@ function toModelTable(body) {
   }
   return table;
 }
+function dropCredentialTiers(table, credentialValues) {
+  let dropped = 0;
+  for (const info of table.values()) {
+    if (info.serviceTiers) {
+      const kept = info.serviceTiers.filter((tier) => !containsExactValue(tier.id, credentialValues) && !containsExactValue(tier.name, credentialValues));
+      dropped += info.serviceTiers.length - kept.length;
+      info.serviceTiers = kept;
+    }
+    if (info.defaultServiceTier !== undefined && containsExactValue(info.defaultServiceTier, credentialValues)) {
+      delete info.defaultServiceTier;
+      dropped++;
+    }
+  }
+  return dropped;
+}
 function discoveryHeaders(binding) {
   const headers = {};
   for (const [name, value] of Object.entries(binding.auth?.headers ?? {})) {
@@ -34355,6 +34613,10 @@ async function fetchModelTable(binding, opts) {
       log("[CodexDiscovery] GET /models body has no models array");
       return;
     }
+    const dropped = dropCredentialTiers(table, credentialValuesFromRequest(binding.auth?.headers, binding.auth?.endpoint));
+    if (dropped > 0) {
+      log(`[CodexDiscovery] dropped ${dropped} service tier(s) that contain a credential value`);
+    }
     log(`[CodexDiscovery] GET /models: ${table.size} model(s)`);
     return table;
   } catch (err) {
@@ -34437,7 +34699,9 @@ async function getCodexModelInfo(slug, binding, accountKey, opts = {}) {
 }
 var CODEX_DISCOVERY_CLIENT_VERSION = "0.161.0", CODEX_DISCOVERY_TTL_MS, CODEX_DISCOVERY_FETCH_TIMEOUT_MS = 1e4, CODEX_DISCOVERY_DEFAULT_WAIT_MS = 2000, FAILURE_RETRY_AFTER_MS, memo;
 var init_codex_models_discovery = __esm(() => {
+  init_call_context();
   init_logger();
+  init_redact();
   CODEX_DISCOVERY_TTL_MS = 60 * 60 * 1000;
   FAILURE_RETRY_AFTER_MS = 60 * 1000;
   memo = new Map;
@@ -41218,236 +41482,6 @@ function decideCodexSpeed(speed, modelInfo) {
 }
 var CODEX_SERVICE_TIER_POINTER = "/service_tier";
 
-// src/handlers/shared/call-context.ts
-function createSigningSecrets() {
-  return { values: new Set, lease: acquireSigningLease() };
-}
-function signingSecretsOf(c) {
-  const installed = readCallVar(c, SIGNING_SECRETS_KEY);
-  if (installed)
-    return installed;
-  const lazy = createSigningSecrets();
-  writeCallVar(c, SIGNING_SECRETS_KEY, lazy);
-  return lazy;
-}
-function readCallVar(c, key) {
-  if (!c || typeof c !== "object")
-    return;
-  const store = c;
-  if (typeof store.get === "function")
-    return store.get(key);
-  return detachedCallVars.get(c)?.get(key);
-}
-function writeCallVar(c, key, value) {
-  if (!c || typeof c !== "object")
-    return;
-  const store = c;
-  if (typeof store.set === "function") {
-    store.set(key, value);
-    return;
-  }
-  let vars = detachedCallVars.get(c);
-  if (!vars) {
-    vars = new Map;
-    detachedCallVars.set(c, vars);
-  }
-  vars.set(key, value);
-}
-function addSigningSecrets(c, values) {
-  const secrets = signingSecretsOf(c);
-  const list = [...values].filter((v) => typeof v === "string" && v.length > 0);
-  for (const value of list)
-    secrets.values.add(value);
-  secrets.lease.add(list);
-}
-function isCredentialHeader(name) {
-  const lower = name.toLowerCase();
-  if (CREDENTIAL_HEADER_NAMES.has(lower))
-    return true;
-  return CREDENTIAL_HEADER_FRAGMENTS.some((fragment) => lower.includes(fragment));
-}
-function credentialPartsOf(name, value) {
-  const parts = [value];
-  const bare = value.replace(AUTH_SCHEME_PREFIX, "");
-  if (bare !== value)
-    parts.push(bare);
-  if (name.toLowerCase() === "cookie") {
-    for (const pair of value.split(";")) {
-      const eq = pair.indexOf("=");
-      if (eq > 0)
-        parts.push(pair.slice(eq + 1).trim());
-    }
-  }
-  return parts;
-}
-function credentialValuesFromRequest(headers, endpoint) {
-  const out = [];
-  for (const [name, value] of Object.entries(headers ?? {})) {
-    if (typeof value !== "string" || !value || !isCredentialHeader(name))
-      continue;
-    out.push(...credentialPartsOf(name, value));
-  }
-  if (endpoint) {
-    try {
-      for (const [name, value] of new URL(endpoint).searchParams) {
-        if (value && CREDENTIAL_QUERY_NAMES.has(name.toLowerCase()))
-          out.push(value);
-      }
-    } catch {}
-  }
-  return out;
-}
-function releaseWhenBodyEnds(response, release) {
-  const source = response.body;
-  if (!source) {
-    release();
-    return response;
-  }
-  const reader = source.getReader();
-  let cancelling = false;
-  const stream = new ReadableStream({
-    async pull(controller) {
-      let result;
-      try {
-        result = await reader.read();
-      } catch (err) {
-        if (cancelling)
-          return;
-        release();
-        controller.error(err);
-        return;
-      }
-      if (cancelling)
-        return;
-      if (result.done) {
-        release();
-        controller.close();
-        return;
-      }
-      controller.enqueue(result.value);
-    },
-    async cancel(reason) {
-      cancelling = true;
-      try {
-        await reader.cancel(reason);
-      } catch {} finally {
-        release();
-      }
-    }
-  }, { highWaterMark: 0 });
-  return new Response(stream, {
-    status: response.status,
-    statusText: response.statusText,
-    headers: response.headers
-  });
-}
-function callAbortSignal(c) {
-  return readCallVar(c, CALL_ABORT_SIGNAL_KEY);
-}
-function callAborted(c) {
-  return callAbortSignal(c)?.aborted === true;
-}
-function callAbortError() {
-  return new DOMException("the call's deadline passed; claudish stopped its work", "AbortError");
-}
-function raceCallAbort(p, signal) {
-  if (!signal)
-    return p;
-  p.catch(() => {});
-  if (signal.aborted)
-    return Promise.reject(callAbortError());
-  return new Promise((resolve, reject) => {
-    const onAbort = () => reject(callAbortError());
-    signal.addEventListener("abort", onAbort, { once: true });
-    p.then((value) => {
-      signal.removeEventListener("abort", onAbort);
-      resolve(value);
-    }, (err) => {
-      signal.removeEventListener("abort", onAbort);
-      reject(err);
-    });
-  });
-}
-function sleepUnlessAborted(ms, signal) {
-  if (signal?.aborted)
-    return Promise.resolve(true);
-  return new Promise((resolve) => {
-    const onAbort = () => {
-      clearTimeout(timer);
-      resolve(true);
-    };
-    const timer = setTimeout(() => {
-      signal?.removeEventListener("abort", onAbort);
-      resolve(false);
-    }, ms);
-    signal?.addEventListener("abort", onAbort, { once: true });
-  });
-}
-function withCallSignal(sig, callSignal) {
-  if (!callSignal)
-    return sig;
-  if (!sig)
-    return callSignal;
-  return AbortSignal.any([sig, callSignal]);
-}
-function abortedResponse() {
-  return new Response(JSON.stringify({
-    type: "error",
-    error: {
-      type: "timeout_error",
-      message: "claudish stopped this call: its deadline passed"
-    }
-  }), {
-    status: 408,
-    headers: { "content-type": "application/json", [CALL_ABORTED_HEADER]: "1" }
-  });
-}
-function hopLogOf(c) {
-  return readCallVar(c, HOP_LOG_KEY);
-}
-function recordHopEntry(c, provider, wireModel) {
-  const hops = hopLogOf(c);
-  if (!hops)
-    return;
-  const plannedUid = readCallVar(c, PLANNED_HOP_KEY);
-  const entry = {
-    provider,
-    wireModel,
-    arm: null,
-    billing: null,
-    ...plannedUid ? { plannedUid } : {}
-  };
-  hops.push(entry);
-  return entry;
-}
-async function withPlannedHop(c, plannedUid, work) {
-  if (!hopLogOf(c))
-    return work();
-  const previous = readCallVar(c, PLANNED_HOP_KEY);
-  writeCallVar(c, PLANNED_HOP_KEY, plannedUid);
-  try {
-    return await work();
-  } finally {
-    writeCallVar(c, PLANNED_HOP_KEY, previous);
-  }
-}
-var SIGNING_SECRETS_KEY = "claudishSigningSecrets", detachedCallVars, CREDENTIAL_HEADER_NAMES, CREDENTIAL_HEADER_FRAGMENTS, CREDENTIAL_QUERY_NAMES, AUTH_SCHEME_PREFIX, CALL_ABORT_SIGNAL_KEY = "claudishCallAbortSignal", CALL_ABORTED_HEADER = "x-claudish-call-aborted", HOP_LOG_KEY = "claudishHopLog", PLANNED_HOP_KEY = "claudishPlannedHop";
-var init_call_context = __esm(() => {
-  init_redact();
-  detachedCallVars = new WeakMap;
-  CREDENTIAL_HEADER_NAMES = new Set([
-    "authorization",
-    "proxy-authorization",
-    "x-api-key",
-    "api-key",
-    "x-goog-api-key",
-    "cookie"
-  ]);
-  CREDENTIAL_HEADER_FRAGMENTS = ["token", "secret", "key"];
-  CREDENTIAL_QUERY_NAMES = new Set(["key", "api_key", "token", "access_token"]);
-  AUTH_SCHEME_PREFIX = /^(?:Bearer|Basic|Token)\s+/i;
-});
-
 // src/handlers/shared/gemini-queue.ts
 function rejectIfAborted(request) {
   if (request.onAbort)
@@ -92866,6 +92900,111 @@ var init_handler_set = __esm(() => {
   init_composed_handler();
 });
 
+// src/handlers/shared/anthropic-forward.ts
+function inboundAuthHeaders(incoming) {
+  const out = {};
+  const authorization = incoming.get("authorization");
+  const apiKey = incoming.get("x-api-key");
+  if (authorization)
+    out.authorization = authorization;
+  if (apiKey)
+    out["x-api-key"] = apiKey;
+  return out;
+}
+function connectionNamed(headers) {
+  const named = new Set;
+  for (const token of (headers.get("connection") ?? "").split(",")) {
+    const name = token.trim().toLowerCase();
+    if (name)
+      named.add(name);
+  }
+  return named;
+}
+function requestHeadersToForward(incoming) {
+  const named = connectionNamed(incoming);
+  const out = {};
+  incoming.forEach((value, name) => {
+    const key = name.toLowerCase();
+    if (!ALLOWED_NAMES.has(key))
+      return;
+    if (HOP_BY_HOP.has(key) || named.has(key) || key.startsWith(INTERNAL_PREFIX))
+      return;
+    out[key] = value;
+  });
+  return out;
+}
+function querySegmentName(segment) {
+  const eq = segment.indexOf("=");
+  const rawName = eq < 0 ? segment : segment.slice(0, eq);
+  try {
+    return decodeURIComponent(rawName.replace(/\+/g, " "));
+  } catch {
+    return null;
+  }
+}
+function forwardedSearch(c) {
+  const url = c.req.url;
+  if (typeof url !== "string" || url.length === 0)
+    return "";
+  let search;
+  try {
+    search = new URL(url).search;
+  } catch {
+    return "";
+  }
+  const kept = search.slice(1).split("&").filter((segment) => {
+    const name = querySegmentName(segment);
+    return name !== null && ALLOWED_QUERY_NAMES.has(name);
+  });
+  return kept.length > 0 ? `?${kept.join("&")}` : "";
+}
+function recordInboundBody(c, raw, parsed) {
+  c.set(INBOUND_BODY_KEY, { raw, canonical: JSON.stringify(parsed) });
+}
+function bodyToForward(c, payload) {
+  const serialized = JSON.stringify(payload);
+  const inbound = c.get(INBOUND_BODY_KEY);
+  return inbound !== undefined && inbound.canonical === serialized ? inbound.raw : serialized;
+}
+var ALLOWED_NAMES, HOP_BY_HOP, INTERNAL_PREFIX = "x-claudish-", ALLOWED_QUERY_NAMES, INBOUND_BODY_KEY = "inboundBody";
+var init_anthropic_forward = __esm(() => {
+  ALLOWED_NAMES = new Set([
+    "authorization",
+    "x-api-key",
+    "content-type",
+    "accept",
+    "accept-encoding",
+    "user-agent",
+    "x-app",
+    "anthropic-beta",
+    "anthropic-version",
+    "anthropic-dangerous-direct-browser-access",
+    "x-claude-code-session-id",
+    "x-stainless-arch",
+    "x-stainless-lang",
+    "x-stainless-os",
+    "x-stainless-package-version",
+    "x-stainless-retry-count",
+    "x-stainless-runtime",
+    "x-stainless-runtime-version",
+    "x-stainless-timeout"
+  ]);
+  HOP_BY_HOP = new Set([
+    "connection",
+    "keep-alive",
+    "proxy-connection",
+    "proxy-authenticate",
+    "proxy-authorization",
+    "te",
+    "trailer",
+    "transfer-encoding",
+    "upgrade",
+    "host",
+    "content-length"
+  ]);
+  ALLOWED_QUERY_NAMES = new Set(["beta"]);
+});
+
 // src/handlers/shared/thinking-signature.ts
 function isUnsignedThinking(block) {
   if (!block || typeof block !== "object")
@@ -92956,7 +93095,10 @@ class NativeHandler {
   }
   async handle(c, incoming) {
     const payload = await this.applyRequestHooks(c, incoming);
-    const originalHeaders = c.req.header();
+    const headers = {
+      ...requestHeadersToForward(c.req.raw.headers),
+      ...inboundAuthHeaders(c.req.raw.headers)
+    };
     const target = payload.model;
     const strippedThinking = stripUnsignedThinkingBlocks(payload.messages);
     if (strippedThinking > 0) {
@@ -92965,22 +93107,15 @@ class NativeHandler {
     const advisorSwapped = c.get(ADVISOR_SWAPPED_CONTEXT_KEY) === true;
     log(`
 === [NATIVE] Claude Code \u2192 Anthropic API Request ===`);
-    log(`[Native] x-api-key: ${originalHeaders["x-api-key"] ? maskCredential(originalHeaders["x-api-key"]) : "(not set)"}`);
-    log(`[Native] authorization: ${originalHeaders.authorization ? maskCredential(originalHeaders.authorization) : "(not set)"}`);
+    log(`[Native] x-api-key: ${headers["x-api-key"] ? maskCredential(headers["x-api-key"]) : "(not set)"}`);
+    log(`[Native] authorization: ${headers.authorization ? maskCredential(headers.authorization) : "(not set)"}`);
     log(`Request body (Model: ${target}):`);
     log(`=== End Request ===
 `);
-    const headers = {
-      "Content-Type": "application/json",
-      "anthropic-version": originalHeaders["anthropic-version"] || "2023-06-01"
-    };
-    if (originalHeaders.authorization) {
-      headers.authorization = originalHeaders.authorization;
-    }
-    if (originalHeaders["x-api-key"]) {
-      headers["x-api-key"] = originalHeaders["x-api-key"];
-    }
-    if (!originalHeaders.authorization && !originalHeaders["x-api-key"]) {
+    headers["content-type"] = "application/json";
+    if (!headers["anthropic-version"])
+      headers["anthropic-version"] = "2023-06-01";
+    if (!headers.authorization && !headers["x-api-key"]) {
       let fallbackKey = this.apiKey;
       if (!fallbackKey) {
         const auth = await credentials.getRequestAuth("native-anthropic", { model: target });
@@ -92990,28 +93125,27 @@ class NativeHandler {
         headers["x-api-key"] = fallbackKey;
       }
     }
-    if (originalHeaders["anthropic-beta"]) {
-      const incomingBeta = originalHeaders["anthropic-beta"];
-      if (advisorSwapped) {
-        const { stripped, changed } = stripAdvisorBeta(incomingBeta);
-        if (changed) {
-          log(`[Native][advisor-swap] stripped advisor-tool beta; before=${incomingBeta} after=${stripped ?? "(empty)"}`);
-          logAdvisorEvent(loadAdvisorSwapConfig(this.advisorModels, this.advisorCollector), {
-            kind: "beta_stripped",
-            before: incomingBeta,
-            after: stripped ?? ""
-          });
-        }
-        if (stripped)
-          headers["anthropic-beta"] = stripped;
-      } else {
-        headers["anthropic-beta"] = incomingBeta;
+    const incomingBeta = headers["anthropic-beta"];
+    if (incomingBeta && advisorSwapped) {
+      const { stripped, changed } = stripAdvisorBeta(incomingBeta);
+      if (changed) {
+        log(`[Native][advisor-swap] stripped advisor-tool beta; before=${incomingBeta} after=${stripped ?? "(empty)"}`);
+        logAdvisorEvent(loadAdvisorSwapConfig(this.advisorModels, this.advisorCollector), {
+          kind: "beta_stripped",
+          before: incomingBeta,
+          after: stripped ?? ""
+        });
       }
+      if (stripped)
+        headers["anthropic-beta"] = stripped;
+      else
+        delete headers["anthropic-beta"];
     }
-    addSigningSecrets(c, credentialValuesFromRequest(headers));
-    const body = JSON.stringify(payload);
+    const url = `${this.baseUrl}/v1/messages${forwardedSearch(c)}`;
+    addSigningSecrets(c, credentialValuesFromRequest(headers, url));
+    const body = bodyToForward(c, payload);
     try {
-      const anthropicResponse = await fetch(`${this.baseUrl}/v1/messages`, {
+      const anthropicResponse = await fetch(url, {
         method: "POST",
         headers,
         body
@@ -93163,6 +93297,7 @@ var init_native_handler = __esm(() => {
   init_advisor_decorator();
   init_native_handler_advisor();
   init_anthropic_error();
+  init_anthropic_forward();
   init_call_context();
 });
 
@@ -94281,7 +94416,9 @@ ${plan.hint}` : `[Route] ${plan.reason}`;
   app.post("/v1/messages", async (c) => {
     let handlerThrew = false;
     try {
-      const body = await c.req.json();
+      const raw = await c.req.text();
+      const body = JSON.parse(raw);
+      recordInboundBody(c, raw, body);
       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)"}`);
       maybeCaptureClassifierRequest(c, body);
       if (!monitorMode && options.classifier?.enabled && isAutoModeClassifierRequest(body)) {
@@ -94359,6 +94496,7 @@ var init_proxy_server = __esm(() => {
   init_native_handler_advisor();
   init_native_handler();
   init_anthropic_error();
+  init_anthropic_forward();
   init_call_context();
   init_hop_decision();
   init_hooks();
@@ -97189,6 +97327,30 @@ var init_pane_launch = __esm(() => {
   FATAL_MAGMUX_STDERR = /ignoring --id|magmux: (?:--sock-dir|MAGMUX_SOCK_DIR) |magmux: socket/;
 });
 
+// src/process-tree.ts
+function waitForExit(proc, ms) {
+  if (proc.exitCode !== null || proc.signalCode !== null)
+    return Promise.resolve(true);
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (value) => {
+      if (settled)
+        return;
+      settled = true;
+      proc.off("exit", onExit);
+      resolve(value);
+    };
+    const onExit = () => done(true);
+    proc.once("exit", onExit);
+    const t = setTimeout(() => done(false), ms);
+    t.unref?.();
+  });
+}
+var KILL_PROCESS_GROUP;
+var init_process_tree = __esm(() => {
+  KILL_PROCESS_GROUP = process.platform !== "win32";
+});
+
 // src/recovery/types.ts
 var UI_LEASE_MS = 1e4, FRAME_TICK_MS = 1000;
 
@@ -98655,7 +98817,7 @@ Or set CLAUDE_PATH to your custom installation:`);
       } catch {}
     });
   }
-  setupSignalHandlers(proc, tempSettingsPath, config.quiet, onCleanup);
+  const signalShutdown = setupSignalHandlers(proc, tempSettingsPath, config.quiet, onCleanup);
   const { exitCode, exitSignal } = await new Promise((resolve) => {
     proc.on("exit", (code, signal) => {
       setClaudeCodeRunning(false);
@@ -98682,22 +98844,45 @@ Or set CLAUDE_PATH to your custom installation:`);
   try {
     unlinkSync11(tempSettingsPath);
   } catch {}
+  signalShutdown.launcherCleanupDone();
+  if (signalShutdown.started())
+    return new Promise(() => {});
   return exitCode;
 }
 function sessionOutcomeOf(exitCode) {
   return exitCode === 0 ? { state: "COMPLETED", reason: null, exitCode } : { state: "FAILED", reason: "child_exited", exitCode };
 }
+function delay(ms) {
+  return new Promise((resolve) => {
+    const t = setTimeout(resolve, Math.max(0, ms));
+    t.unref?.();
+  });
+}
 function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
   const signals = isWindows2() ? ["SIGINT", "SIGTERM"] : ["SIGINT", "SIGTERM", "SIGHUP"];
-  claimSignalExit();
-  for (const signal of signals) {
-    process.on(signal, () => {
-      releaseTerminalIsolation();
-      if (!quiet) {
-        console.error(`
-[claudish] Received ${signal}, shutting down...`);
+  let shuttingDown = null;
+  let markLauncherCleanupDone = () => {};
+  const launcherCleanup = new Promise((resolve) => {
+    markLauncherCleanupDone = resolve;
+  });
+  const shutdown = async (signal) => {
+    const startedAt = Date.now();
+    try {
+      proc.kill("SIGTERM");
+      if (!await waitForExit(proc, SIGNAL_CHILD_EXIT_GRACE_MS)) {
+        log(`[claudish] Claude Code did not exit within ${SIGNAL_CHILD_EXIT_GRACE_MS} ms of SIGTERM; sending SIGKILL`);
+        try {
+          proc.kill("SIGKILL");
+        } catch {}
+        await waitForExit(proc, SIGNAL_CHILD_KILL_WAIT_MS);
       }
-      proc.kill();
+      await Promise.race([
+        launcherCleanup,
+        delay(SIGNAL_SHUTDOWN_BUDGET_MS - (Date.now() - startedAt))
+      ]);
+    } catch (err) {
+      log(`[claudish] Signal shutdown error: ${err}`);
+    } finally {
       if (onCleanup) {
         try {
           onCleanup();
@@ -98707,8 +98892,28 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
         unlinkSync11(tempSettingsPath);
       } catch {}
       process.exit(signalExitCode(signal));
+    }
+  };
+  claimSignalExit();
+  for (const signal of signals) {
+    process.on(signal, () => {
+      if (shuttingDown) {
+        log(`[claudish] Received ${signal} while shutting down from ${shuttingDown}; ignored`);
+        return;
+      }
+      shuttingDown = signal;
+      releaseTerminalIsolation();
+      if (!quiet) {
+        console.error(`
+[claudish] Received ${signal}, shutting down...`);
+      }
+      shutdown(signal);
     });
   }
+  return {
+    started: () => shuttingDown !== null,
+    launcherCleanupDone: () => markLauncherCleanupDone()
+  };
 }
 async function findClaudeBinary(env = process.env) {
   const isWindows = process.platform === "win32";
@@ -98809,7 +99014,7 @@ var restoreTerminal = null, macosKeychainAnthropicMemo, defaultKeychainAnthropic
   }
   macosKeychainAnthropicMemo.set(memoKey, found);
   return found;
-}, CLAUDISH_PLACEHOLDER_API_KEY = "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx", CLAUDISH_PLACEHOLDER_AUTH_TOKEN = "placeholder-token-not-used-proxy-handles-auth", STALE_TOKEN_FILE_MS, MAX_TOKEN_FILES_SCANNED = 4000, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, USER_STATUS_LINE_TIMEOUT_SECONDS = 3, MIN_AUTO_COMPACT_WINDOW = 200000, MAX_AUTO_COMPACT_WINDOW = 1e6, ADVISOR_TOOL_ENV_VAR = "CLAUDE_CODE_ENABLE_EXPERIMENTAL_ADVISOR_TOOL", CLAUDISH_CHILD_ADVISOR_MODEL = "sonnet", CHILD_STDERR_NOISE;
+}, CLAUDISH_PLACEHOLDER_API_KEY = "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx", CLAUDISH_PLACEHOLDER_AUTH_TOKEN = "placeholder-token-not-used-proxy-handles-auth", STALE_TOKEN_FILE_MS, MAX_TOKEN_FILES_SCANNED = 4000, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, USER_STATUS_LINE_TIMEOUT_SECONDS = 3, MIN_AUTO_COMPACT_WINDOW = 200000, MAX_AUTO_COMPACT_WINDOW = 1e6, ADVISOR_TOOL_ENV_VAR = "CLAUDE_CODE_ENABLE_EXPERIMENTAL_ADVISOR_TOOL", CLAUDISH_CHILD_ADVISOR_MODEL = "sonnet", CHILD_STDERR_NOISE, SIGNAL_CHILD_EXIT_GRACE_MS = 3000, SIGNAL_CHILD_KILL_WAIT_MS = 500, SIGNAL_SHUTDOWN_BUDGET_MS = 4000;
 var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_claude_code_facts();
@@ -98825,6 +99030,7 @@ var init_claude_runner = __esm(() => {
   init_logger();
   init_child_env();
   init_pane_launch();
+  init_process_tree();
   init_profile_config();
   init_model_discovery();
   init_model_parser();
@@ -99858,30 +100064,6 @@ var init_gate_binding = __esm(() => {
   init_input_gate();
 });
 
-// src/process-tree.ts
-function waitForExit(proc, ms) {
-  if (proc.exitCode !== null || proc.signalCode !== null)
-    return Promise.resolve(true);
-  return new Promise((resolve) => {
-    let settled = false;
-    const done = (value) => {
-      if (settled)
-        return;
-      settled = true;
-      proc.off("exit", onExit);
-      resolve(value);
-    };
-    const onExit = () => done(true);
-    proc.once("exit", onExit);
-    const t = setTimeout(() => done(false), ms);
-    t.unref?.();
-  });
-}
-var KILL_PROCESS_GROUP;
-var init_process_tree = __esm(() => {
-  KILL_PROCESS_GROUP = process.platform !== "win32";
-});
-
 // src/pane/pane-reap.ts
 function alive(p) {
   return !!p && p.exitCode === null && p.signalCode === null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "14.18.0",
+  "version": "14.18.1",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -71,10 +71,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "14.18.0",
-    "@claudish/magmux-darwin-x64": "14.18.0",
-    "@claudish/magmux-linux-arm64": "14.18.0",
-    "@claudish/magmux-linux-x64": "14.18.0"
+    "@claudish/magmux-darwin-arm64": "14.18.1",
+    "@claudish/magmux-darwin-x64": "14.18.1",
+    "@claudish/magmux-linux-arm64": "14.18.1",
+    "@claudish/magmux-linux-x64": "14.18.1"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",