claudish 14.16.1 → 14.17.0

package/dist/index.js

@@ -133,6 +133,9 @@ var init_config = __esm(() => {
     CLAUDISH_PROVIDER_NAME: "CLAUDISH_PROVIDER_NAME",
     ANTHROPIC_MODEL: "ANTHROPIC_MODEL",
     ANTHROPIC_SMALL_FAST_MODEL: "ANTHROPIC_SMALL_FAST_MODEL",
+    CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST: "CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST",
+    CLAUDE_CODE_ASSUME_FIRST_PARTY_BASE_URL: "_CLAUDE_CODE_ASSUME_FIRST_PARTY_BASE_URL",
+    CLAUDISH_SET_HOST_ROUTING_VARS: "CLAUDISH_SET_HOST_ROUTING_VARS",
     CLAUDISH_MODEL_OPUS: "CLAUDISH_MODEL_OPUS",
     CLAUDISH_MODEL_SONNET: "CLAUDISH_MODEL_SONNET",
     CLAUDISH_MODEL_HAIKU: "CLAUDISH_MODEL_HAIKU",
@@ -5491,7 +5494,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "14.16.1";
+var VERSION = "14.17.0";
 
 // src/redact.ts
 function isPlaceholder(value) {
@@ -12187,6 +12190,8 @@ function stripVendorPrefix(lowerId) {
   return lowerId.includes("/") ? lowerId.substring(lowerId.lastIndexOf("/") + 1) : lowerId;
 }
 function findCacheEntry(modelId, cachePath) {
+  if (modelId.startsWith("@"))
+    return;
   if (modelId.includes("@")) {
     throw new Error(`model-catalog lookup received provider-routed ID "${modelId}" \u2014 callers must strip the "@" prefix before calling`);
   }
@@ -34200,6 +34205,14 @@ function toModelInfo(raw) {
   if (tp && typeof tp.mode === "string" && typeof tp.limit === "number") {
     info.truncationPolicy = { mode: tp.mode, limit: tp.limit };
   }
+  if (Array.isArray(m.service_tiers)) {
+    info.serviceTiers = m.service_tiers.flatMap((tier) => {
+      const t = tier;
+      return t && typeof t.id === "string" && typeof t.name === "string" ? [{ id: t.id, name: t.name }] : [];
+    });
+  }
+  if (typeof m.default_service_tier === "string")
+    info.defaultServiceTier = m.default_service_tier;
   return info;
 }
 function toModelTable(body) {
@@ -34296,7 +34309,7 @@ async function firstAnswer(entry, slug, binding, opts, now) {
       log(`[CodexDiscovery] ${slug}: /models not answered within ${waitMs} ms`);
     }
   }
-  return slug ? fromModelsCache(slug, opts.codexHome) : undefined;
+  return slug && !opts.accountOnly ? fromModelsCache(slug, opts.codexHome) : undefined;
 }
 function fromModelsCache(slug, codexHome) {
   const info = toModelTable(readModelsCache(codexHome))?.get(slug.toLowerCase());
@@ -41082,6 +41095,34 @@ function parseModelParams(spec, into = {}) {
   return into;
 }
 
+// src/providers/codex-service-tier.ts
+function findCodexServiceTier(speed, tiers) {
+  if (!tiers)
+    return;
+  const matches = (tier) => tier.id === speed || tier.name.toLowerCase() === speed;
+  return tiers.find(matches);
+}
+function decideCodexSpeed(speed, modelInfo) {
+  if (speed.value === "standard") {
+    return { note: "speed standard: field omitted (connection default)" };
+  }
+  if (modelInfo === "unsigned") {
+    const message = `speed "${speed.value}" is not available on this connection (no subscription account signed the request)`;
+    return speed.explicit ? { note: message, refusal: message } : { note: message };
+  }
+  const tier = findCodexServiceTier(speed.value, modelInfo?.serviceTiers);
+  if (tier) {
+    return {
+      tier: tier.id,
+      note: `speed ${speed.value}: ${CODEX_SERVICE_TIER_POINTER} set to the account's ${speed.value} tier (from the account's dynamic models catalog)`
+    };
+  }
+  const listed = modelInfo?.serviceTiers?.length ?? 0;
+  const message = modelInfo ? `speed "${speed.value}" is not offered on this connection (the account lists ${listed} service tier${listed === 1 ? "" : "s"})` : `speed "${speed.value}" is not available on this connection (the account's dynamic models catalog did not answer; retry)`;
+  return speed.explicit ? { note: message, refusal: message } : { note: message };
+}
+var CODEX_SERVICE_TIER_POINTER = "/service_tier";
+
 // src/handlers/shared/call-context.ts
 function createSigningSecrets() {
   return { values: new Set, lease: acquireSigningLease() };
@@ -48149,6 +48190,34 @@ var init_authority = __esm(() => {
   installBillingProbes();
 });
 
+// src/providers/catalog-endpoints.ts
+function catalogUrl() {
+  return process.env.CLAUDISH_CATALOG_URL ?? DEFAULT_CATALOG_URL;
+}
+function siblingEndpoint(pathname, fallback) {
+  try {
+    const url = new URL(catalogUrl());
+    url.pathname = url.pathname.replace(/\/queryModels$/, pathname);
+    url.search = "";
+    return url.toString();
+  } catch {
+    return fallback;
+  }
+}
+function plansUrl() {
+  return process.env.CLAUDISH_PLANS_URL ?? siblingEndpoint("/queryPlans", `${DEFAULT_HOST}/queryPlans`);
+}
+function probeModelsUrl() {
+  return process.env.CLAUDISH_PROBE_MODELS_URL ?? siblingEndpoint("/probeModels", `${DEFAULT_HOST}/probeModels`);
+}
+function modelsBaseUrl() {
+  return siblingEndpoint("/queryModels", `${DEFAULT_HOST}/queryModels`);
+}
+var DEFAULT_HOST = "https://us-central1-claudish-6da10.cloudfunctions.net", DEFAULT_CATALOG_URL;
+var init_catalog_endpoints = __esm(() => {
+  DEFAULT_CATALOG_URL = `${DEFAULT_HOST}/queryModels?status=all&catalog=slim&includeRouteVariants=true&limit=1000`;
+});
+
 // src/providers/catalog-v3.ts
 function parseCatalogV3Envelope(value) {
   if (!value || typeof value !== "object")
@@ -48617,22 +48686,6 @@ var init_probe_discovery = __esm(() => {
 });
 
 // src/providers/catalog-client.ts
-function catalogUrl() {
-  return process.env.CLAUDISH_CATALOG_URL ?? DEFAULT_CATALOG_URL;
-}
-function derivePlansUrl(modelsUrl) {
-  try {
-    const url = new URL(modelsUrl);
-    url.pathname = url.pathname.replace(/\/queryModels$/, "/queryPlans");
-    url.search = "";
-    return url.toString();
-  } catch {
-    return "https://us-central1-claudish-6da10.cloudfunctions.net/queryPlans";
-  }
-}
-function plansUrl() {
-  return process.env.CLAUDISH_PLANS_URL ?? derivePlansUrl(catalogUrl());
-}
 function buildRoutesUrl(modelsUrl, generationId) {
   const url = new URL(modelsUrl);
   url.search = "";
@@ -48832,8 +48885,9 @@ async function refreshCatalogOnce(timeoutMs, options) {
   let pages = 0;
   const seenCursors = new Set;
   let expectedTotal;
+  const base = catalogUrl();
   for (;; ) {
-    const result = await fetchEnvelope(buildCatalogPageUrl(catalogUrl(), cursor, CATALOG_PAGE_LIMIT, generationId), timeoutMs);
+    const result = await fetchEnvelope(buildCatalogPageUrl(base, cursor, CATALOG_PAGE_LIMIT, generationId), timeoutMs);
     if (!result.ok) {
       if (result.reason === "incompatible") {
         return { kind: "incompatible", serverContractVersion: result.serverContractVersion };
@@ -48882,7 +48936,7 @@ async function refreshCatalogOnce(timeoutMs, options) {
     }
     return { kind: "fetch_failed", reason: planResult.reason };
   }
-  const registryResult = await fetchRouteRegistry(timeoutMs, generationId);
+  const registryResult = await fetchRouteRegistry(timeoutMs, generationId, base);
   if (!registryResult.ok) {
     if (registryResult.reason === "incompatible") {
       return { kind: "incompatible", serverContractVersion: registryResult.serverContractVersion };
@@ -48960,8 +49014,8 @@ async function fetchSubscriptionPlans(timeoutMs, generationId) {
   }
   return { ok: true, plans };
 }
-async function fetchRouteRegistry(timeoutMs, generationId) {
-  const result = await fetchEnvelope(buildRoutesUrl(catalogUrl(), generationId), timeoutMs);
+async function fetchRouteRegistry(timeoutMs, generationId, modelsUrl) {
+  const result = await fetchEnvelope(buildRoutesUrl(modelsUrl, generationId), timeoutMs);
   if (!result.ok)
     return result;
   if (result.envelope.generationId !== generationId) {
@@ -49003,7 +49057,7 @@ async function ensureRouteRegistryReady(timeoutMs = 5000) {
   if (cache?.routeRegistry)
     return;
   if (cache && !catalogWarmDisabled()) {
-    const result = await fetchRouteRegistry(timeoutMs, cache.catalogGenerationId);
+    const result = await fetchRouteRegistry(timeoutMs, cache.catalogGenerationId, catalogUrl());
     if (result.ok) {
       const routeRegistry = { generationId: cache.catalogGenerationId, registry: result.registry };
       if (wiresMatchRegistry(cache.entries, routeRegistry, cache.catalogGenerationId)) {
@@ -49026,10 +49080,11 @@ async function waitForCatalogWarm(timeoutMs) {
   if (timedOut)
     log(`[catalog] still refreshing after ${timeoutMs} ms; the caller goes on without it`);
 }
-var DEFAULT_CATALOG_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels?status=all&catalog=slim&includeRouteVariants=true&limit=1000", MAX_CATALOG_PAGES = 40, CATALOG_PAGE_LIMIT = 1000, _memCache = null, _catalogEntriesForTest, _warmPromise = null;
+var MAX_CATALOG_PAGES = 40, CATALOG_PAGE_LIMIT = 1000, _memCache = null, _catalogEntriesForTest, _warmPromise = null;
 var init_catalog_client = __esm(() => {
   init_logger();
   init_all_models_cache();
+  init_catalog_endpoints();
   init_catalog_route_bindings();
   init_connection_wire();
   init_probe_discovery();
@@ -50252,7 +50307,7 @@ async function discoverEveryServedModel(providerName) {
         detail: oneLine3(e?.message ?? "")
       });
     }
-    if (!hasAuthHeader(headers)) {
+    if (!hasAuthHeader(headers) && def.authScheme !== "none") {
       return recordFailure({ kind: "no-credentials", provider: providerName, endpoint });
     }
   }
@@ -50532,6 +50587,15 @@ function setPointer(body, path, value) {
   }
   node[tokens[tokens.length - 1]] = value;
 }
+function readPointer(body, path) {
+  let node = body;
+  for (const token of pointerTokens(path)) {
+    if (node === null || typeof node !== "object" || Array.isArray(node))
+      return;
+    node = node[token];
+  }
+  return node;
+}
 function deletePointer(body, path) {
   const tokens = pointerTokens(path);
   const trail = [body];
@@ -50608,6 +50672,18 @@ function applyControl(body, control, requested, label, explicit, result) {
   result.headers.push(...control.headers);
   result.notes.push(`${label} ${requested}: ${control.path} = ${JSON.stringify(native)}${control.access !== "open" ? ` (access: ${control.access})` : ""}`);
 }
+function wireSpeedOffered(control, speed) {
+  return control.status === "supported" && control.values[speed] !== undefined;
+}
+function applyWireSpeed(body, wire, speed) {
+  const result = { headers: [], notes: [], borrowed: [] };
+  if (wire.speed.status === "supported" && readPointer(body, wire.speed.path) !== undefined) {
+    result.notes.push(`speed ${speed.value}: ${wire.speed.path} already set by --model-params`);
+    return result;
+  }
+  applyControl(body, wire.speed, speed.value, "speed", speed.explicit, result);
+  return result;
+}
 function writeAssignments(put, assignments) {
   for (const assignment of assignments)
     put(assignment.path, assignment.value);
@@ -50693,7 +50769,8 @@ function wireChoicesFromClaudeRequest(claudeRequest, pinnedEffort) {
     effort: effort === "none" ? undefined : effort,
     reasoningOff,
     hasTools: Array.isArray(claudeRequest?.tools) && claudeRequest.tools.length > 0,
-    maxTokens: typeof claudeRequest?.max_tokens === "number" ? claudeRequest.max_tokens : undefined
+    maxTokens: typeof claudeRequest?.max_tokens === "number" ? claudeRequest.max_tokens : undefined,
+    ...claudeRequest?.speed === "fast" && { speed: { value: "fast", explicit: false } }
   };
 }
 function outputLimitToSend(wire, choices, result) {
@@ -50760,7 +50837,7 @@ function recoverBorrowedWireFields(payload, borrowed, errorText) {
     deletePointer(next, path);
   return {
     payload: next,
-    note: `dropped ${drop.join(", ")} (borrowed from the owner's connection; this connection's value is unknown)`
+    note: `dropped ${drop.join(", ")} (not published by this connection's catalog wire)`
   };
 }
 function mergeWireHeaders(headers, extra) {
@@ -53111,10 +53188,18 @@ function createAnthropicPassthroughStream(c, response, opts) {
   let pendingEventLine = null;
   let inputTokens = 0;
   let outputTokens = 0;
+  let cacheReadTokens = 0;
+  let cacheCreationTokens = 0;
   let stopReason = null;
   let sawMessageStart = false;
   let sawMessageStop = false;
   let openBlockIndex = null;
+  const reportUsage = () => {
+    opts.onTokenUpdate?.(inputTokens + cacheReadTokens + cacheCreationTokens, outputTokens, {
+      cacheReadTokens,
+      cacheCreationTokens
+    });
+  };
   const noteLifecycle = (data, emittedIndex) => {
     switch (data?.type) {
       case "message_start":
@@ -53191,10 +53276,10 @@ data: ${JSON.stringify(data)}
     } catch {}
   };
   const endCancelled = () => {
-    const sawUsage = inputTokens > 0 || outputTokens > 0;
+    const sawUsage = inputTokens > 0 || outputTokens > 0 || cacheReadTokens > 0 || cacheCreationTokens > 0;
     log(`[AnthropicSSE] Client cancelled the stream for ${opts.modelName}; usage ${sawUsage ? "reported" : "not received, not recorded"}`);
     if (sawUsage)
-      opts.onTokenUpdate?.(inputTokens, outputTokens);
+      reportUsage();
     if (pingInterval) {
       clearInterval(pingInterval);
       pingInterval = null;
@@ -53356,10 +53441,14 @@ data: ${JSON.stringify({
                     if (data.message?.usage) {
                       inputTokens = data.message.usage.input_tokens || inputTokens;
                       outputTokens = data.message.usage.output_tokens || outputTokens;
+                      cacheReadTokens = data.message.usage.cache_read_input_tokens || cacheReadTokens;
+                      cacheCreationTokens = data.message.usage.cache_creation_input_tokens || cacheCreationTokens;
                     }
                     if (data.usage) {
                       inputTokens = data.usage.input_tokens || inputTokens;
                       outputTokens = data.usage.output_tokens || outputTokens;
+                      cacheReadTokens = data.usage.cache_read_input_tokens || cacheReadTokens;
+                      cacheCreationTokens = data.usage.cache_creation_input_tokens || cacheCreationTokens;
                     }
                     if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
                       const txt = data.delta.text || "";
@@ -53398,10 +53487,14 @@ data: ${JSON.stringify({
                 if (data.message?.usage) {
                   inputTokens = data.message.usage.input_tokens || inputTokens;
                   outputTokens = data.message.usage.output_tokens || outputTokens;
+                  cacheReadTokens = data.message.usage.cache_read_input_tokens || cacheReadTokens;
+                  cacheCreationTokens = data.message.usage.cache_creation_input_tokens || cacheCreationTokens;
                 }
                 if (data.usage) {
                   inputTokens = data.usage.input_tokens || inputTokens;
                   outputTokens = data.usage.output_tokens || outputTokens;
+                  cacheReadTokens = data.usage.cache_read_input_tokens || cacheReadTokens;
+                  cacheCreationTokens = data.usage.cache_creation_input_tokens || cacheCreationTokens;
                 }
                 if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
                   textChunks++;
@@ -53423,9 +53516,7 @@ data: ${JSON.stringify({
           return;
         }
         log(`[AnthropicSSE] Stream complete for ${opts.modelName}: ${totalLines} lines, ${textChunks} text chunks, ${toolUseBlocks} tool_use blocks, stop_reason=${stopReason}${filterThinking ? `, filtered ${thinkingBlocksSuppressed} thinking blocks` : ""}`);
-        if (opts.onTokenUpdate) {
-          opts.onTokenUpdate(inputTokens, outputTokens);
-        }
+        reportUsage();
         if (!isClosed) {
           isClosed = true;
           if (pingInterval) {
@@ -53442,7 +53533,7 @@ data: ${JSON.stringify({
         log(`[AnthropicSSE] Stream error: ${e}`);
         finalizeAbandonedStream(controller);
         try {
-          opts.onTokenUpdate?.(inputTokens, outputTokens);
+          reportUsage();
         } catch {}
         if (!isClosed) {
           isClosed = true;
@@ -54617,6 +54708,13 @@ var init_stall_guard = __esm(() => {
 });
 
 // src/handlers/shared/stream-parsers/responses/responses-leg.ts
+function hasReplayableReasoning(item) {
+  if (item?.type !== "reasoning")
+    return false;
+  if (item.encrypted_content)
+    return true;
+  return Array.isArray(item.content) && item.content.length > 0;
+}
 function readUsage(raw, prior, keepPrior = false) {
   if (!raw || typeof raw !== "object")
     return;
@@ -54945,7 +55043,7 @@ class ResponsesLeg {
       if (typeof item.phase === "string")
         message.phase = item.phase;
       this.items.push(message);
-    } else if (item?.type === "reasoning" && item.encrypted_content) {
+    } else if (hasReplayableReasoning(item)) {
       this.items.push({
         type: "reasoning",
         content: item.content ?? [],
@@ -55040,7 +55138,7 @@ class ResponsesLeg {
   }
   onItemDone(event) {
     const item = event.item;
-    if (item?.type === "reasoning" && item.encrypted_content) {
+    if (hasReplayableReasoning(item)) {
       this.pendingReasoning.push({
         type: "reasoning",
         content: item.content ?? [],
@@ -55655,8 +55753,9 @@ var init_token_file = __esm(() => {
 import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync12 } from "fs";
 import { dirname as dirname13 } from "path";
 function stripProviderPrefix(name) {
-  const at = name.indexOf("@");
-  return at === -1 ? name : name.slice(at + 1);
+  if (!hasProviderPrefix(name))
+    return name;
+  return name.slice(name.indexOf("@") + 1);
 }
 function computeCacheReadDiscount(pricing, billedInputTokens, detail) {
   const cacheReadTokens = detail?.cacheReadTokens ?? 0;
@@ -55905,6 +56004,7 @@ var init_token_tracker = __esm(() => {
   init_tool_name_utils();
   init_types2();
   init_logger();
+  init_model_parser();
   init_token_file();
   init_remote_provider_types();
   ALLOWANCE_LABEL_STALE_MS = 10 * 60 * 1000;
@@ -55990,8 +56090,8 @@ class ComposedHandler {
   pendingFallbackMeta;
   lastPlanPollAt = 0;
   constructor(provider, targetModel, modelName, port, options = {}) {
-    if (modelName.includes("@")) {
-      throw new Error(`ComposedHandler: modelName must not contain '@' (got "${modelName}"). Strip the provider routing prefix before passing modelName. If you need the full routed form, pass it as targetModel.`);
+    if (hasProviderPrefix(modelName)) {
+      throw new Error(`ComposedHandler: modelName must not contain a provider prefix (got "${modelName}"). Strip the provider routing prefix before passing modelName. If you need the full routed form, pass it as targetModel.`);
     }
     this.provider = provider;
     this.targetModel = targetModel;
@@ -56115,6 +56215,17 @@ class ComposedHandler {
       subscription: CREDENTIAL_DECIDED_PROVIDERS.has(name) ? binding?.auth?.arm === "oauth" : isSubscriptionProvider(name)
     };
   }
+  wireWhere() {
+    const connection = this.options.connection;
+    return `${connection?.route.routeId}/${connection?.route.routeProfileId} \xB7 ${connection?.externalModelId}`;
+  }
+  noticeFastIgnored(source) {
+    if (fastIgnoredNoticed.has(this.targetModel))
+      return;
+    fastIgnoredNoticed.add(this.targetModel);
+    const advice = source === "catalog" ? "the fast tier is billed at a higher per-token price. Add #fast to the model spec to send it anyway." : "the Codex fast tier is sent only on a request signed by a Codex subscription account.";
+    logStderr(`${this.targetModel}: Claude Code /fast ignored, the request is metered and ${advice}`);
+  }
   respondCallAborted(startTime, fallbackMeta) {
     log(`[${this.provider.displayName}] call stopped: its deadline passed`);
     try {
@@ -56547,7 +56658,7 @@ class ComposedHandler {
       }));
     }
     let requestPayload = adapter.buildPayload(claudeRequest, messages, tools);
-    const extraFields = this.provider.getExtraPayloadFields?.();
+    const extraFields = await this.provider.getExtraPayloadFields?.();
     if (extraFields) {
       Object.assign(requestPayload, extraFields);
     }
@@ -56558,6 +56669,8 @@ class ComposedHandler {
     const toolNameMap = adapter.getToolNameMap();
     let wireHeaders = [];
     let wireBorrowed = [];
+    let codexSpeed;
+    let fastSpeed;
     const wire = this.options.connection?.wire;
     if (wire?.status === "known") {
       const choices = {
@@ -56580,6 +56693,13 @@ class ComposedHandler {
       }
       if (wireSpeed)
         choices.speed = { value: wireSpeed, explicit: true };
+      if (choices.speed && this.provider.name === "openai-codex" && wire.speed.status === "unknown") {
+        codexSpeed = choices.speed;
+        choices.speed = undefined;
+      } else if (choices.speed && !choices.speed.explicit) {
+        fastSpeed = choices.speed;
+        choices.speed = undefined;
+      }
       const shaped = shapeRequestFromWire(requestPayload, wire, choices, this.options.connection?.ownerWire);
       wireBorrowed = shaped.borrowed;
       const where = `${this.options.connection?.route.routeId}/${this.options.connection?.route.routeProfileId} \xB7 ${this.options.connection?.externalModelId}`;
@@ -56680,6 +56800,18 @@ class ComposedHandler {
         this.tokenTracker.setContextWindow(providerWindow);
       }
     }
+    if (fastSpeed && wire?.status === "known") {
+      if (!this.signedBilling(binding).subscription) {
+        log(`[Wire] ${this.wireWhere()}: speed ${fastSpeed.value} (Claude Code /fast) not sent: the request is metered`);
+        if (wireSpeedOffered(wire.speed, fastSpeed.value))
+          this.noticeFastIgnored("catalog");
+      } else {
+        const applied = applyWireSpeed(requestPayload, wire, fastSpeed);
+        for (const note of applied.notes)
+          log(`[Wire] ${this.wireWhere()}: ${note}`);
+        wireHeaders = [...wireHeaders, ...applied.headers];
+      }
+    }
     if (this.provider.name === "openai-codex") {
       const resume = (mayRequestModule) => resumeFromToolResults(claudeRequest, binding, peekCodeModeStores(), claudeRequest?.tool_choice, {
         setting: this.options.codeMode ?? DEFAULT_CODE_MODE_SETTING,
@@ -56704,6 +56836,30 @@ class ComposedHandler {
     if (this.provider.transformPayload) {
       requestPayload = this.provider.transformPayload(requestPayload, claudeRequest, binding);
     }
+    if (codexSpeed) {
+      addSigningSecrets(c, credentialValuesFromRequest(binding?.auth?.headers, this.signedEndpoint(binding)));
+      const accountKey = accountKeyFromBinding(binding);
+      const subscription = this.signedBilling(binding).subscription;
+      const modelInfo = !subscription ? "unsigned" : binding && accountKey ? await getCodexModelInfo(String(requestPayload?.model ?? ""), binding, accountKey, {
+        accountOnly: true
+      }) : undefined;
+      const outcome = decideCodexSpeed(codexSpeed, modelInfo);
+      const where = this.wireWhere();
+      log(`[Wire] ${where}: ${outcome.note}`);
+      if (!subscription && !codexSpeed.explicit && codexSpeed.value !== "standard") {
+        this.noticeFastIgnored("codex");
+      }
+      if (outcome.refusal) {
+        return c.json(wrapAnthropicError(400, redactForClient(`claudish: ${outcome.refusal} (${where})`), "invalid_request_error"), 400);
+      }
+      if (outcome.tier && requestPayload.service_tier !== undefined) {
+        log(`[Wire] ${where}: service_tier already set by --model-params; speed tier not written`);
+      } else if (outcome.tier) {
+        requestPayload.service_tier = outcome.tier;
+        if (!codexSpeed.explicit)
+          wireBorrowed = [...wireBorrowed, CODEX_SERVICE_TIER_POINTER];
+      }
+    }
     let codeModeShape;
     let codeModePrePayload;
     let codeModeContext;
@@ -58024,7 +58180,7 @@ function getRecoveryHint(status, errorText, providerName, transportTerminal429,
   }
   return `Unexpected HTTP ${status} from ${providerName}.`;
 }
-var STREAM_RETRY_DELAYS_MS;
+var STREAM_RETRY_DELAYS_MS, fastIgnoredNoticed;
 var init_composed_handler = __esm(() => {
   init_base_api_format();
   init_minimax_model_dialect();
@@ -58051,6 +58207,8 @@ var init_composed_handler = __esm(() => {
   init_raw();
   init_request_stage();
   init_logger();
+  init_codex_models_discovery();
+  init_model_parser();
   init_provider_definitions();
   init_openai();
   init_wire_markers();
@@ -58088,6 +58246,7 @@ var init_composed_handler = __esm(() => {
   init_transient_retry();
   init_upstream_error_capture();
   STREAM_RETRY_DELAYS_MS = [3000, 15000, 30000];
+  fastIgnoredNoticed = new Set;
 });
 
 // src/providers/api-key-provenance.ts
@@ -58638,7 +58797,7 @@ class LiteLLMProviderTransport {
       exclude
     });
   }
-  getExtraPayloadFields() {
+  async getExtraPayloadFields() {
     const fields = {};
     const extraHeaders = this.getExtraHeaders();
     if (extraHeaders) {
@@ -61230,6 +61389,9 @@ var init_provider_definitions = __esm(() => {
 });
 
 // src/providers/model-parser.ts
+function hasProviderPrefix(spec) {
+  return PROVIDER_PREFIX.test(spec);
+}
 function parseModelChain(modelSpec) {
   const parts = modelSpec.split(MODEL_CHAIN_SEPARATOR).map((s) => s.trim()).filter(Boolean);
   const merged = [];
@@ -61363,12 +61525,13 @@ function getLegacySyntaxWarning(parsed) {
   return `Deprecation warning: "${parsed.original}" uses legacy prefix syntax.
 ` + `  Consider using: ${newSyntax}`;
 }
-var AUTO_ROUTE_PROVIDER = "auto-route", PROVIDER_SHORTCUTS, LOCAL_PROVIDERS, NATIVE_MODEL_PATTERNS, LEGACY_PREFIX_PATTERNS, MODEL_CHAIN_SEPARATOR = "+", MODE_MARKER_SEGMENT;
+var AUTO_ROUTE_PROVIDER = "auto-route", PROVIDER_SHORTCUTS, PROVIDER_PREFIX, LOCAL_PROVIDERS, NATIVE_MODEL_PATTERNS, LEGACY_PREFIX_PATTERNS, MODEL_CHAIN_SEPARATOR = "+", MODE_MARKER_SEGMENT;
 var init_model_parser = __esm(() => {
   init_claude_code_aliases();
   init_provider_definitions();
   init_wire_markers();
   PROVIDER_SHORTCUTS = getShortcuts();
+  PROVIDER_PREFIX = /^[^@]+@/;
   LOCAL_PROVIDERS = {
     has(name) {
       return isLocalTransport(name);
@@ -71066,6 +71229,14 @@ function loadCustomEndpoints(config) {
   }
   return result;
 }
+function openaiModelsDiscovery(wireFormat, apiPath, modelPrefix) {
+  if (modelPrefix)
+    return;
+  const api = ["/chat/completions", "/responses"].find((suffix) => apiPath.endsWith(suffix));
+  if (wireFormat !== "openai" || !api)
+    return;
+  return { path: `${apiPath.slice(0, -api.length)}/models`, format: "openai-models-list" };
+}
 function buildProviderDefinition(name, ep, ovr) {
   const apiKeyEnvVar = ovr?.apiKeyEnvVar ?? customEndpointKeyEnvVar(name);
   const apiKeyAliases = ovr?.apiKeyAliases;
@@ -71090,9 +71261,11 @@ function buildProviderDefinition(name, ep, ovr) {
       isDirectApi: true,
       shortestPrefix: name,
       description: ovr?.description ?? `Custom endpoint: ${name}`,
-      authScheme: ep.authScheme ?? "bearer"
+      authScheme: ep.authScheme ?? "bearer",
+      modelDiscovery: openaiModelsDiscovery(ep.format, "/chat/completions", ep.modelPrefix)
     };
   }
+  const apiPath = ep.apiPath ?? "/v1/chat/completions";
   return {
     createHandler: runtimeHandler(name),
     tier: CUSTOM_ENDPOINT_TIER,
@@ -71101,7 +71274,7 @@ function buildProviderDefinition(name, ep, ovr) {
     transport: ep.transport,
     baseUrl: stripTrailingSlash(ep.baseUrl),
     baseUrlEnvVars,
-    apiPath: ep.apiPath ?? "/v1/chat/completions",
+    apiPath,
     apiKeyEnvVar,
     apiKeyAliases,
     apiKeyDescription: ovr?.apiKeyDescription ?? `${ep.displayName} (custom endpoint)`,
@@ -71112,7 +71285,8 @@ function buildProviderDefinition(name, ep, ovr) {
     shortestPrefix: name,
     description: ovr?.description ?? `Custom endpoint: ${ep.displayName}`,
     headers: ep.headers,
-    authScheme: ep.authScheme ?? "bearer"
+    authScheme: ep.authScheme ?? "bearer",
+    modelDiscovery: openaiModelsDiscovery(ep.transport, apiPath, ep.modelPrefix)
   };
 }
 function buildProviderProfile(ep, ovr) {
@@ -71970,7 +72144,7 @@ function isCacheFresh(data, ttlMs = CACHE_TTL_MS4) {
   const generatedMs = Date.parse(data.generatedAt);
   return !Number.isNaN(generatedMs) && Date.now() - generatedMs < ttlMs;
 }
-async function fetchProbeModels(url = PROBE_MODELS_URL, timeoutMs = FETCH_TIMEOUT_MS5) {
+async function fetchProbeModels(url = probeModelsUrl(), timeoutMs = FETCH_TIMEOUT_MS5) {
   let response;
   try {
     response = await fetch(url, {
@@ -72101,8 +72275,9 @@ function isValidResponse(raw) {
   const data = raw;
   return data.version === 3 && typeof data.generationId === "string" && data.generationId.length > 0 && typeof data.generatedAt === "string" && !!data.providers && typeof data.providers === "object" && !!data.unavailable && typeof data.unavailable === "object";
 }
-var PROBE_MODELS_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/probeModels", CACHE_TTL_MS4, FETCH_TIMEOUT_MS5 = 15000, PROBE_MODELS_CACHE_PATH, _inFlight = null, DISCOVERY_ATTEMPTS = 3, DISCOVERY_TIMEOUT_MS = 8000;
+var CACHE_TTL_MS4, FETCH_TIMEOUT_MS5 = 15000, PROBE_MODELS_CACHE_PATH, _inFlight = null, DISCOVERY_ATTEMPTS = 3, DISCOVERY_TIMEOUT_MS = 8000;
 var init_probe_catalog = __esm(() => {
+  init_catalog_endpoints();
   init_catalog_route_bindings();
   CACHE_TTL_MS4 = 60 * 60 * 1000;
   PROBE_MODELS_CACHE_PATH = join33(homedir31(), ".claudish", "probe-models.json");
@@ -72834,6 +73009,8 @@ async function applyCandidateFilters(explanation, candidates) {
   }
 }
 function wireIdOf(route) {
+  if (route.provider === "openrouter")
+    return route.modelSpec;
   const at = route.modelSpec.indexOf("@");
   return at === -1 ? route.modelSpec : route.modelSpec.slice(at + 1);
 }
@@ -73420,7 +73597,7 @@ function normalizePinnedSpec(r) {
   const spec = r.modelSpec?.trim();
   if (!spec)
     return null;
-  if (spec.includes("@"))
+  if (hasProviderPrefix(spec))
     return spec;
   if (spec.startsWith("http://") || spec.startsWith("https://"))
     return spec;
@@ -73485,6 +73662,46 @@ function claudeCodeKeychainServiceCandidates(env = process.env) {
 var BASE_KEYCHAIN_SERVICE = "Claude Code", KEYCHAIN_SERVICE_SUFFIX = "-credentials";
 var init_claude_code_facts = () => {};
 
+// src/fast-mode-gates.ts
+function applyProxyFastModeGates(env) {
+  scrubInheritedFastModeGates(env);
+  if (env.CLAUDE_CODE_DISABLE_FAST_MODE)
+    return;
+  const opened = [];
+  if (env.CLAUDE_CODE_SKIP_FAST_MODE_ORG_CHECK === undefined) {
+    env.CLAUDE_CODE_SKIP_FAST_MODE_ORG_CHECK = "1";
+    opened.push("skip");
+  }
+  const caps = env.CLAUDE_CODE_MODEL_CAPABILITIES;
+  env.CLAUDE_CODE_MODEL_CAPABILITIES = caps ? `${FAST_MODE_CAPABILITY};${caps}` : FAST_MODE_CAPABILITY;
+  opened.push("caps");
+  env[CLAUDISH_FAST_MODE_GATES_VAR] = opened.join(",");
+}
+function scrubInheritedFastModeGates(env) {
+  const marker = env[CLAUDISH_FAST_MODE_GATES_VAR];
+  if (marker === undefined)
+    return { removed: [] };
+  const opened = marker.split(",");
+  const removed = [];
+  if (opened.includes("skip") && env.CLAUDE_CODE_SKIP_FAST_MODE_ORG_CHECK === "1") {
+    delete env.CLAUDE_CODE_SKIP_FAST_MODE_ORG_CHECK;
+    removed.push("CLAUDE_CODE_SKIP_FAST_MODE_ORG_CHECK");
+  }
+  const caps = env.CLAUDE_CODE_MODEL_CAPABILITIES;
+  if (opened.includes("caps") && caps !== undefined) {
+    if (caps === FAST_MODE_CAPABILITY) {
+      delete env.CLAUDE_CODE_MODEL_CAPABILITIES;
+      removed.push("CLAUDE_CODE_MODEL_CAPABILITIES");
+    } else if (caps.startsWith(`${FAST_MODE_CAPABILITY};`)) {
+      env.CLAUDE_CODE_MODEL_CAPABILITIES = caps.slice(FAST_MODE_CAPABILITY.length + 1);
+      removed.push("CLAUDE_CODE_MODEL_CAPABILITIES");
+    }
+  }
+  delete env[CLAUDISH_FAST_MODE_GATES_VAR];
+  return { removed };
+}
+var CLAUDISH_FAST_MODE_GATES_VAR = "CLAUDISH_FAST_MODE_GATES", FAST_MODE_CAPABILITY = "fast_mode";
+
 // src/hooks/session/binding.ts
 function sessionHooksNeedBinding(engine) {
   return BINDING_EVENTS.some((e) => engine.select(e).length > 0);
@@ -77277,6 +77494,34 @@ var init_no_surface = __esm(() => {
   init_binding();
 });
 
+// src/host-routing-env.ts
+function applyHostRouting(env) {
+  env[ENV.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST] = "1";
+  env[ENV.CLAUDE_CODE_ASSUME_FIRST_PARTY_BASE_URL] = "";
+  env[ENV.CLAUDISH_SET_HOST_ROUTING_VARS] = "1";
+}
+function scrubInheritedHostRouting(env) {
+  if (env[ENV.CLAUDISH_SET_HOST_ROUTING_VARS] !== "1")
+    return { removed: [] };
+  const removed = [];
+  for (const name of HOST_ROUTING_VARS) {
+    if (name in env) {
+      delete env[name];
+      removed.push(name);
+    }
+  }
+  return { removed };
+}
+var HOST_ROUTING_VARS;
+var init_host_routing_env = __esm(() => {
+  init_config();
+  HOST_ROUTING_VARS = [
+    ENV.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST,
+    ENV.CLAUDE_CODE_ASSUME_FIRST_PARTY_BASE_URL,
+    ENV.CLAUDISH_SET_HOST_ROUTING_VARS
+  ];
+});
+
 // src/launcher/magmux-binary.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync28 } from "fs";
@@ -78080,7 +78325,8 @@ async function getRecommendedModels(opts = {}) {
     const generationId = readAllModelsCache()?.catalogGenerationId;
     if (!generationId)
       throw new Error("No complete v3 model and plan snapshot");
-    const response = await fetchCatalogData(FIREBASE_RECOMMENDED_URL, RECOMMENDED_FETCH_TIMEOUT_MS, generationId);
+    const base = modelsBaseUrl();
+    const response = await fetchCatalogData(`${base}${RECOMMENDED_VIEW}`, RECOMMENDED_FETCH_TIMEOUT_MS, generationId);
     if (response.mode !== "recommended")
       throw new Error("Unexpected recommendation mode");
     if (response.recommendations.generationId !== generationId) {
@@ -78091,7 +78337,7 @@ async function getRecommendedModels(opts = {}) {
     } catch (err) {
       log(`[effort] sidecar write failed for generation ${generationId}: ${err instanceof Error ? err.message : String(err)}`);
     }
-    const top100 = await fetchCatalogData(`${FIREBASE_BASE_URL}?catalog=top100`, RECOMMENDED_FETCH_TIMEOUT_MS, generationId);
+    const top100 = await fetchCatalogData(`${base}?catalog=top100`, RECOMMENDED_FETCH_TIMEOUT_MS, generationId);
     const data = recommendationProjection(response.recommendations, top100.models);
     if (data.models.length > 0) {
       _cachedRecommendedModels = data;
@@ -78135,27 +78381,27 @@ function isFreshEnough(doc) {
   return ageHours <= FIREBASE_CACHE_TTL_HOURS;
 }
 async function searchModels(query, limit = 50) {
-  const url = `${FIREBASE_BASE_URL}?search=${encodeURIComponent(query)}&limit=${limit}&status=active`;
+  const url = `${modelsBaseUrl()}?search=${encodeURIComponent(query)}&limit=${limit}&status=active`;
   const data = await fetchCatalogData(url, SEARCH_FETCH_TIMEOUT_MS);
   return data.models ?? [];
 }
 async function getModelByIdFromFirebase(modelId) {
-  const url = `${FIREBASE_BASE_URL}?modelId=${encodeURIComponent(modelId)}`;
+  const url = `${modelsBaseUrl()}?modelId=${encodeURIComponent(modelId)}`;
   const data = await fetchCatalogData(url, SEARCH_FETCH_TIMEOUT_MS);
   return data.mode === "exact" ? data.model : null;
 }
 async function getTop100Models() {
-  const url = `${FIREBASE_BASE_URL}?catalog=top100`;
+  const url = `${modelsBaseUrl()}?catalog=top100`;
   const data = await fetchCatalogData(url, SEARCH_FETCH_TIMEOUT_MS);
   return data;
 }
 async function getProviderList() {
-  const url = `${FIREBASE_BASE_URL}?catalog=providers`;
+  const url = `${modelsBaseUrl()}?catalog=providers`;
   const data = await fetchCatalogData(url, SEARCH_FETCH_TIMEOUT_MS);
   return data.providers ?? [];
 }
 async function getModelsByProvider(provider, pageSize = 200) {
-  const base = `${FIREBASE_BASE_URL}?provider=${encodeURIComponent(provider)}&status=active&limit=${pageSize}`;
+  const base = `${modelsBaseUrl()}?provider=${encodeURIComponent(provider)}&status=active&limit=${pageSize}`;
   return fetchPinnedModelDocs(base, "provider catalog");
 }
 async function fetchPinnedModelDocs(base, label) {
@@ -78193,7 +78439,7 @@ async function fetchPinnedModelDocs(base, label) {
   throw new Error(`${Label} exceeded the pagination limit`);
 }
 async function getAllModelDocs(pageSize = 200) {
-  const base = `${FIREBASE_BASE_URL}?status=active&limit=${pageSize}`;
+  const base = `${modelsBaseUrl()}?status=active&limit=${pageSize}`;
   return fetchPinnedModelDocs(base, "model catalog");
 }
 function loadModelInfo() {
@@ -78229,7 +78475,7 @@ function getAvailableModels() {
   _cachedModelIds = result;
   return result;
 }
-var RECOMMENDATION_SECTIONS, RECOMMENDATION_TIER_INDEX, _cachedModelInfo = null, _cachedModelIds = null, _cachedRecommendedModels = null, FIREBASE_BASE_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels", FIREBASE_RECOMMENDED_URL, RECOMMENDED_PROJECTION_VERSION = 2, RECOMMENDED_MODELS_CACHE_PATH, RECOMMENDED_FETCH_TIMEOUT_MS = 5000, SEARCH_FETCH_TIMEOUT_MS = 1e4, RECOMMENDED_ROUTE_TIER_ORDER;
+var RECOMMENDATION_SECTIONS, RECOMMENDATION_TIER_INDEX, _cachedModelInfo = null, _cachedModelIds = null, _cachedRecommendedModels = null, RECOMMENDED_VIEW = "?catalog=recommended", RECOMMENDED_PROJECTION_VERSION = 2, RECOMMENDED_MODELS_CACHE_PATH, RECOMMENDED_FETCH_TIMEOUT_MS = 5000, SEARCH_FETCH_TIMEOUT_MS = 1e4, RECOMMENDED_ROUTE_TIER_ORDER;
 var init_model_loader = __esm(() => {
   init_fs_atomic();
   init_logger();
@@ -78237,6 +78483,7 @@ var init_model_loader = __esm(() => {
   init_auto_route();
   init_cache_ttl();
   init_catalog_client();
+  init_catalog_endpoints();
   init_catalog_route_bindings();
   init_effort_recommendations();
   init_route_candidates();
@@ -78258,7 +78505,6 @@ var init_model_loader = __esm(() => {
     { recommendationTier: "subscription", title: "Subscription", quickPickEligible: true }
   ];
   RECOMMENDATION_TIER_INDEX = new Map(RECOMMENDATION_SECTIONS.map((section, index) => [section.recommendationTier, index]));
-  FIREBASE_RECOMMENDED_URL = `${FIREBASE_BASE_URL}?catalog=recommended`;
   RECOMMENDED_MODELS_CACHE_PATH = join41(homedir33(), ".claudish", "recommended-models-cache-v2.json");
   RECOMMENDED_ROUTE_TIER_ORDER = {
     native: 0,
@@ -83299,7 +83545,7 @@ var init_probe_live = __esm(() => {
 function pinProbeModelSpec(link) {
   if (link.provider === "native-anthropic")
     return link.modelSpec;
-  return link.modelSpec.includes("@") ? link.modelSpec : `${link.provider}@${link.modelSpec}`;
+  return hasProviderPrefix(link.modelSpec) ? link.modelSpec : `${link.provider}@${link.modelSpec}`;
 }
 function droppedRemedy(credentialHint) {
   if (!credentialHint)
@@ -83324,6 +83570,7 @@ function probeProviderRoute(proxyUrl, link, timeoutMs) {
 }
 var INTERACTIVE_PROBE_TIMEOUT_MS = 60000, DROPPED_LABEL;
 var init_probe_runner = __esm(() => {
+  init_model_parser();
   init_probe_live();
   DROPPED_LABEL = {
     "no-credential": "no credential",
@@ -90951,6 +91198,16 @@ var init_local_queue = __esm(() => {
 
 // src/providers/transport/local.ts
 import { Agent } from "undici";
+async function hasOllamaTagsShape(response) {
+  if (!response.ok)
+    return false;
+  try {
+    const data = await response.json();
+    return Array.isArray(data?.models);
+  } catch {
+    return false;
+  }
+}
 
 class LocalTransport {
   name;
@@ -90964,6 +91221,7 @@ class LocalTransport {
   lastProbeError;
   lastProbeUrl;
   _contextWindow = 32768;
+  _isOllamaBackend;
   constructor(config, modelName, options) {
     this.config = config;
     this.modelName = modelName;
@@ -91005,7 +91263,7 @@ class LocalTransport {
       exclude,
       hasApiKey: Boolean(this.config.apiKey)
     };
-    if (this.config.name === "ollama") {
+    if (await this.isOllamaBackend()) {
       return discoverViaOllama(this.config.baseUrl, {
         ...cacheKey,
         key: `ollama:${this.config.baseUrl}`
@@ -91022,8 +91280,8 @@ class LocalTransport {
       signal: AbortSignal.timeout(600000)
     };
   }
-  getExtraPayloadFields() {
-    if (this.config.name === "ollama") {
+  async getExtraPayloadFields() {
+    if (await this.isOllamaBackend()) {
       const numCtx = Math.max(this._contextWindow, 32768);
       log(`[${this.displayName}] Setting num_ctx: ${numCtx} (detected: ${this._contextWindow})`);
       return { options: { num_ctx: numCtx } };
@@ -91052,6 +91310,25 @@ class LocalTransport {
   getConfig() {
     return this.config;
   }
+  async isOllamaBackend() {
+    if (this.config.name === "ollama")
+      return true;
+    if (this.config.name !== "custom" && this.config.name in DISPLAY_NAMES2)
+      return false;
+    if (this._isOllamaBackend !== undefined)
+      return this._isOllamaBackend;
+    try {
+      const response = await fetch(`${this.config.baseUrl}/api/tags`, {
+        method: "GET",
+        signal: AbortSignal.timeout(5000)
+      });
+      this._isOllamaBackend = await hasOllamaTagsShape(response);
+    } catch {
+      this._isOllamaBackend = false;
+    }
+    log(`[${this.displayName}] Ollama backend probe (${this.config.baseUrl}): ${this._isOllamaBackend}`);
+    return this._isOllamaBackend;
+  }
   async checkHealth() {
     if (this.healthChecked)
       return this.isHealthy;
@@ -91064,6 +91341,7 @@ class LocalTransport {
         method: "GET",
         signal: AbortSignal.timeout(5000)
       });
+      this._isOllamaBackend ??= await hasOllamaTagsShape(response);
       if (response.ok) {
         this.isHealthy = true;
         this.healthChecked = true;
@@ -91103,7 +91381,7 @@ class LocalTransport {
     if (process.env.CLAUDISH_CONTEXT_WINDOW)
       return;
     log(`[${this.displayName}] Fetching context window...`);
-    if (this.config.name === "ollama") {
+    if (await this.isOllamaBackend()) {
       await this.fetchOllamaContextWindow();
     } else if (this.config.name === "lmstudio") {
       await this.fetchLMStudioContextWindow();
@@ -96110,6 +96388,14 @@ var init_magmux_ui = __esm(() => {
   };
 });
 
+// src/signal-exit-code.ts
+import { constants as constants3 } from "os";
+function signalExitCode(signal) {
+  const signum = constants3.signals[signal];
+  return typeof signum === "number" ? 128 + signum : 128;
+}
+var init_signal_exit_code = () => {};
+
 // src/terminal-isolation.ts
 import { format as format2 } from "util";
 function beginTerminalIsolation(onSuppressed) {
@@ -96232,6 +96518,12 @@ function scrubInheritedClaudishPlaceholders(env) {
   }
   return { removed };
 }
+function removeInheritedHostRouting(env) {
+  const { removed } = scrubInheritedHostRouting(env);
+  if (removed.length > 0) {
+    log(`[claude-runner] Removed inherited host-routing variables: ${removed.join(", ")}`);
+  }
+}
 function isClaudishPlaceholderCredential(name, value) {
   if (name === "ANTHROPIC_API_KEY")
     return value === CLAUDISH_PLACEHOLDER_API_KEY;
@@ -97000,6 +97292,8 @@ async function runClaudeWithProxy(config, proxyUrl, onCleanup) {
   if (config.monitor || advisorNativeSession) {
     delete env.ANTHROPIC_API_KEY;
     delete env.ANTHROPIC_AUTH_TOKEN;
+    scrubInheritedFastModeGates(env);
+    removeInheritedHostRouting(env);
     if (modelId) {
       env[ENV.ANTHROPIC_MODEL] = modelId;
       env[ENV.ANTHROPIC_SMALL_FAST_MODEL] = modelId;
@@ -97014,15 +97308,22 @@ async function runClaudeWithProxy(config, proxyUrl, onCleanup) {
       if (scrubbed.removed.length > 0) {
         log(`[claude-runner] Removed inherited claudish placeholder credentials: ${scrubbed.removed.join(", ")}`);
       }
+      removeInheritedHostRouting(env);
       if (shouldHideIncidentalAnthropicKey(config, env)) {
         delete env.ANTHROPIC_API_KEY;
         hidAnthropicApiKey = true;
       }
+      const closedGates = scrubInheritedFastModeGates(env);
+      if (closedGates.removed.length > 0) {
+        log(`[claude-runner] Removed inherited claudish fast-mode gates: ${closedGates.removed.join(", ")}`);
+      }
     } else {
       if (classifierPassthroughEnabled(config)) {
         console.error("[claudish] classifier passthrough enabled but no Anthropic credentials detected \u2014 " + "classifier requests will fail to authenticate against api.anthropic.com. " + "Map a role to a native Claude model (e.g. --model-sonnet claude-sonnet-5) or set ANTHROPIC_API_KEY.");
       }
       applyProxyPlaceholderAuth(env);
+      applyProxyFastModeGates(env);
+      applyHostRouting(env);
       const realWindow = await computeMainThreadContextWindow(config);
       const contextEnv = resolveContextWindowEnv(realWindow, process.env);
       Object.assign(env, contextEnv.vars);
@@ -97198,7 +97499,7 @@ Or set CLAUDE_PATH to your custom installation:`);
       setClaudeCodeRunning(false);
       const paneExit = wrap?.paneExitCode() ?? null;
       resolve({
-        exitCode: paneExit !== null ? paneExit : signal ? 128 + (SIGNAL_EXIT_NUMBERS[signal] ?? 0) : code ?? 1,
+        exitCode: paneExit !== null ? paneExit : signal ? signalExitCode(signal) : code ?? 1,
         exitSignal: signal
       });
     });
@@ -97226,6 +97527,7 @@ function sessionOutcomeOf(exitCode) {
 }
 function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
   const signals = isWindows2() ? ["SIGINT", "SIGTERM"] : ["SIGINT", "SIGTERM", "SIGHUP"];
+  claimSignalExit();
   for (const signal of signals) {
     process.on(signal, () => {
       releaseTerminalIsolation();
@@ -97242,7 +97544,7 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
       try {
         unlinkSync11(tempSettingsPath);
       } catch {}
-      process.exit(128 + (SIGNAL_EXIT_NUMBERS[signal] ?? 0));
+      process.exit(signalExitCode(signal));
     });
   }
 }
@@ -97345,7 +97647,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, SIGNAL_EXIT_NUMBERS;
+}, 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;
 var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_claude_code_facts();
@@ -97356,6 +97658,7 @@ var init_claude_runner = __esm(() => {
   init_interactive_driver();
   init_interactive_launch();
   init_no_surface();
+  init_host_routing_env();
   init_magmux_wrapper();
   init_logger();
   init_child_env();
@@ -97369,18 +97672,13 @@ var init_claude_runner = __esm(() => {
   init_settings();
   init_session_discovery();
   init_token_file();
+  init_signal_exit_code();
   init_telemetry();
   init_terminal_isolation();
   init_theme_mode();
   macosKeychainAnthropicMemo = new Map;
   STALE_TOKEN_FILE_MS = 7 * 24 * 60 * 60 * 1000;
   CHILD_STDERR_NOISE = [/^\[claude-code:unrecognized_model\]/];
-  SIGNAL_EXIT_NUMBERS = {
-    SIGHUP: 1,
-    SIGINT: 2,
-    SIGQUIT: 3,
-    SIGTERM: 15
-  };
 });
 
 // src/pane/contract.ts
@@ -97860,7 +98158,7 @@ var init_accounting = __esm(() => {
 
 // src/pane/pane-registry.ts
 import {
-  constants as constants3,
+  constants as constants4,
   accessSync as accessSync2,
   existsSync as existsSync38,
   lstatSync as lstatSync7,
@@ -98233,7 +98531,7 @@ function dialErrno(reported, sockPath) {
   if (!isSocket)
     return "ENOTSOCK";
   try {
-    accessSync2(sockPath, constants3.W_OK);
+    accessSync2(sockPath, constants4.W_OK);
   } catch {
     return "EACCES";
   }
@@ -102490,7 +102788,7 @@ var init_transcript_redaction = __esm(() => {
 
 // src/pane/transcript-page.ts
 import {
-  constants as constants4,
+  constants as constants5,
   closeSync as closeSync14,
   fstatSync as fstatSync5,
   lstatSync as lstatSync8,
@@ -102856,7 +103154,7 @@ var init_transcript_page = __esm(() => {
     maxEntryBytes: 32 * 1024 * 1024
   };
   READ_CHUNK = 1024 * 1024;
-  OPEN_FLAGS = constants4.O_RDONLY | (constants4.O_NOFOLLOW ?? 0) | (constants4.O_NONBLOCK ?? 0);
+  OPEN_FLAGS = constants5.O_RDONLY | (constants5.O_NOFOLLOW ?? 0) | (constants5.O_NONBLOCK ?? 0);
   loggedRejections = new Set;
   HEAD_CWD_MAX_BYTES = 256 * 1024;
 });
@@ -102887,7 +103185,7 @@ var init_pane = __esm(() => {
 
 // src/mcp-session/replay-manager.ts
 import { randomBytes as randomBytes13, randomUUID as randomUUID9 } from "crypto";
-import { constants as constants5, accessSync as accessSync3, closeSync as closeSync15, existsSync as existsSync39, realpathSync as realpathSync9, statSync as statSync21 } from "fs";
+import { constants as constants6, accessSync as accessSync3, closeSync as closeSync15, existsSync as existsSync39, realpathSync as realpathSync9, statSync as statSync21 } from "fs";
 import { dirname as dirname23, resolve as resolve7 } from "path";
 function unavailable2(reason, message) {
   return new ContractErrorException("replay_unavailable", message, reason);
@@ -102910,7 +103208,7 @@ async function replayClaudeBinary(env) {
     try {
       if (!statSync21(named).isFile())
         throw new Error("not a file");
-      accessSync3(named, constants5.X_OK);
+      accessSync3(named, constants6.X_OK);
     } catch {
       throw new Error(`CLAUDE_PATH ${named} is not an executable file`);
     }
@@ -106167,6 +106465,8 @@ function claudeCodePrintEnv(parent) {
   delete env.ANTHROPIC_API_KEY;
   delete env.ANTHROPIC_AUTH_TOKEN;
   delete env.ANTHROPIC_BASE_URL;
+  scrubInheritedFastModeGates(env);
+  scrubInheritedHostRouting(env);
   return env;
 }
 function isFrame(v) {
@@ -106357,6 +106657,7 @@ function startError(command, e) {
 var PRINT_FLAGS, PRINT_CHILD_DROPPED_MARKERS, inFlight4, KILL_GRACE_MS = 5000, STDERR_TAIL_CHARS = 2000;
 var init_run_prompt_claude_code = __esm(() => {
   init_config();
+  init_host_routing_env();
   init_child_env();
   init_pane_launch();
   init_redact();
@@ -120341,6 +120642,9 @@ function shouldWarmCatalog(args) {
     if (m.startsWith(prefix))
       return false;
   }
+  const routesOnlyNative = !args.forceUpdate && !args.advisor && !args.modelChain?.length && !args.modelOpus && !args.modelSonnet && !args.modelHaiku && !args.modelSubagent;
+  if (args.model && routesOnlyNative && nativeRouteFor(args.model))
+    return false;
   return true;
 }
 function classifyCatalogState(cache, ttlHours, now) {
@@ -120396,10 +120700,7 @@ function startSpinner(label, quiet = false) {
   };
 }
 async function warmCatalogIfNeeded(config, opts) {
-  if (!shouldWarmCatalog({
-    model: config.model,
-    skipModelsUpdate: config.skipModelsUpdate
-  })) {
+  if (!shouldWarmCatalog(config)) {
     return "skipped";
   }
   if (!config.quiet) {
@@ -120467,6 +120768,7 @@ var HARD_FAIL_MESSAGE, LOCAL_MODEL_PREFIXES;
 var init_catalog_warm = __esm(() => {
   init_all_models_cache();
   init_catalog_client();
+  init_native_route();
   HARD_FAIL_MESSAGE = `Error: cannot reach model catalog and no cached copy found.
 ` + `
 ` + `To proceed:

package/package.json

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