@bman654/clodex 2.14.0 → 2.15.0

package/dist/cli.js

@@ -10,6 +10,7 @@ import {
   clearActiveOAuthAccount,
   collectPristineFacts,
   contentAddressedBackupPath,
+  customProviderId,
   emitParentNotice,
   ensureSecureAppHome,
   findClaudeBinary,
@@ -61,6 +62,7 @@ import {
   setServerListenMode,
   setServerMaskGatewayIds,
   sha256File,
+  slugifyProviderId,
   storeActiveOAuthAccount,
   tcpListenerUrlHost,
   tweakccMirrorBackupPath,
@@ -72,7 +74,7 @@ import {
   withRegistryWriteLockSync,
   writeParentNoticeLines,
   writeParentNoticeLinesSync
-} from "./chunk-3NCDMS7N.js";
+} from "./chunk-5TG736TX.js";
 
 // src/cli.ts
 import pc13 from "picocolors";
@@ -141,8 +143,8 @@ function fmtProvider(name) {
 }
 function fmtProviderBracket(providerId, providerName, isFree) {
   const color = providerTagColor(providerId);
-  const text5 = isFree ? `${providerName} \xB7 free` : providerName;
-  return color(pc.bold(`(${text5})`));
+  const text6 = isFree ? `${providerName} \xB7 free` : providerName;
+  return color(pc.bold(`(${text6})`));
 }
 function providerTagColor(providerId) {
   switch (providerId) {
@@ -246,7 +248,7 @@ function printFavoritesOnlyPanel() {
 }
 
 // src/cli.ts
-import * as p12 from "@clack/prompts";
+import * as p13 from "@clack/prompts";
 import { realpathSync as realpathSync3 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -344,7 +346,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.14.0",
+  version: "2.15.0",
   publishConfig: {
     access: "public"
   },
@@ -3432,7 +3434,7 @@ function savedStopsAfter(current, assignments) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 12;
+var PATCH_TRANSFORMS_VERSION = 13;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -3537,24 +3539,24 @@ function applyClodexPatches(source, config) {
   }
   const reEsc = (s) => s.replace(/[.*+?^$\{\}()|[\]\\]/g, "\\$&");
   const q = (s) => JSON.stringify(s);
-  function log12(status, name, extra) {
+  function log13(status, name, extra) {
     report.push(extra === void 0 ? { status, name } : { status, name, extra });
   }
   function applyOnce(name, regex, fn, { marker, required, noopIsSkip } = {}) {
     if (marker && js.includes(marker)) {
-      log12("SKIP", name, "already patched");
+      log13("SKIP", name, "already patched");
       return;
     }
     const g = new RegExp(regex.source, regex.flags.includes("g") ? regex.flags : regex.flags + "g");
     const matches = js.match(g);
     const count = matches ? matches.length : 0;
     if (count === 0) {
-      log12("FAIL", name, "anchor not found");
+      log13("FAIL", name, "anchor not found");
       if (required) fail("clodex patch: required patch failed: " + name);
       return;
     }
     if (count > 1) {
-      log12("FAIL", name, "anchor matched " + count + " times (expected 1)");
+      log13("FAIL", name, "anchor matched " + count + " times (expected 1)");
       if (required) fail("clodex patch: ambiguous anchor: " + name);
       return;
     }
@@ -3562,14 +3564,14 @@ function applyClodexPatches(source, config) {
     js = js.replace(regex, fn);
     if (js === before) {
       if (noopIsSkip) {
-        log12("SKIP", name, "already patched");
+        log13("SKIP", name, "already patched");
         return;
       }
-      log12("FAIL", name, "replacement made no change");
+      log13("FAIL", name, "replacement made no change");
       if (required) fail(name);
       return;
     }
-    log12("OK", name);
+    log13("OK", name);
   }
   function extendAliasArray(arrLiteral) {
     const toAdd = IDENTITIES.filter((a) => !new RegExp('"' + reEsc(a) + '"').test(arrLiteral));
@@ -3589,14 +3591,22 @@ function applyClodexPatches(source, config) {
     { required: true, noopIsSkip: true }
   );
   {
-    const missing = ALIASES.filter((a) => !new RegExp("case" + reEsc(q(a)) + ":return").test(js));
+    const RESOLVER_ANCHOR = /(case"best":\{[^{}]*\})/;
+    const RESOLVER_BUDGET = 2e3 + ALIASES.reduce((n, a) => n + 2 * a.length + 17, 0);
+    const RESOLVER_SWITCH = new RegExp(
+      'case"best":\\{[^{}]*\\}[\\s\\S]{0,' + RESOLVER_BUDGET + "}?default:return"
+    );
+    const resolver = js.match(RESOLVER_SWITCH)?.[0] ?? "";
+    const missing = ALIASES.filter(
+      (a) => !new RegExp("case" + reEsc(q(a)) + ":return").test(resolver)
+    );
     const cases = missing.map((a) => "case" + q(a) + ":return " + q(a) + ";").join("");
     if (ALIASES.length === 0) {
-      log12("SKIP", "PATCH 6: alias resolver switch", "no aliases configured");
+      log13("SKIP", "PATCH 6: alias resolver switch", "no aliases configured");
     } else {
       applyOnce(
         "PATCH 6: alias resolver switch",
-        /(case"best":\{[^{}]*\})/,
+        RESOLVER_ANCHOR,
         (m) => m + cases,
         { required: true, noopIsSkip: true }
       );
@@ -3615,9 +3625,9 @@ function applyClodexPatches(source, config) {
     const pickerSite = "PATCH 5: model picker options";
     const modelSelections = [...js.matchAll(/\(([\w$]+)==="opus"\|\|\1==="sonnet"\)/g)];
     if (ALIASES.length === 0) {
-      log12("SKIP", pickerSite, "no aliases configured");
+      log13("SKIP", pickerSite, "no aliases configured");
     } else if (modelSelections.length !== 1) {
-      log12("FAIL", pickerSite, "model selection appears " + modelSelections.length + " times (expected 1)");
+      log13("FAIL", pickerSite, "model selection appears " + modelSelections.length + " times (expected 1)");
     } else {
       applyOnce(
         pickerSite,
@@ -3745,11 +3755,11 @@ function applyClodexPatches(source, config) {
       "CLAUDE_CODE_OTEL_DIAG_STDERR"
     ];
     const MIN_SCRUBBED_ENV_NAMES = 1;
-    const blockEndIndex = (text5, open2) => {
+    const blockEndIndex = (text6, open2) => {
       const depths = [0];
       const templates = [false];
-      for (let i = open2; i < text5.length; i++) {
-        const ch = text5[i];
+      for (let i = open2; i < text6.length; i++) {
+        const ch = text6[i];
         const inTemplate = templates[templates.length - 1];
         if (inTemplate) {
           if (ch === "\\") {
@@ -3761,7 +3771,7 @@ function applyClodexPatches(source, config) {
             depths.pop();
             continue;
           }
-          if (ch === "$" && text5[i + 1] === "{") {
+          if (ch === "$" && text6[i + 1] === "{") {
             templates.push(false);
             depths.push(0);
             i++;
@@ -3774,12 +3784,12 @@ function applyClodexPatches(source, config) {
         }
         if (ch === '"' || ch === "'") {
           const quote = ch;
-          for (i++; i < text5.length; i++) {
-            if (text5[i] === "\\") {
+          for (i++; i < text6.length; i++) {
+            if (text6[i] === "\\") {
               i++;
               continue;
             }
-            if (text5[i] === quote) break;
+            if (text6[i] === quote) break;
           }
           continue;
         }
@@ -3788,12 +3798,12 @@ function applyClodexPatches(source, config) {
           depths.push(0);
           continue;
         }
-        if (ch === "/" && text5[i + 1] === "/") {
-          while (i < text5.length && text5[i] !== "\n") i++;
+        if (ch === "/" && text6[i + 1] === "/") {
+          while (i < text6.length && text6[i] !== "\n") i++;
           continue;
         }
-        if (ch === "/" && text5[i + 1] === "*") {
-          i = text5.indexOf("*/", i + 2);
+        if (ch === "/" && text6[i + 1] === "*") {
+          i = text6.indexOf("*/", i + 2);
           if (i < 0) return -1;
           i++;
           continue;
@@ -3816,7 +3826,7 @@ function applyClodexPatches(source, config) {
     };
     const passthroughSites = source.includes(marker) ? 1 : (source.match(/\)return process\.env;let [\w$]+=\{/g) ?? []).length;
     if (passthroughSites !== 1) {
-      log12("FAIL", patchName, "child env passthrough appears " + passthroughSites + " times (expected 1)");
+      log13("FAIL", patchName, "child env passthrough appears " + passthroughSites + " times (expected 1)");
       fail("clodex patch: required patch failed: " + patchName);
     }
     applyOnce(
@@ -3831,7 +3841,7 @@ function applyClodexPatches(source, config) {
         const scrubbedSeen = scrubbedEnvNames.filter((name) => body.includes(name));
         const why = missingLiteral !== void 0 ? "body does not contain " + missingLiteral : scrubbedSeen.length < MIN_SCRUBBED_ENV_NAMES ? "body spells only " + scrubbedSeen.length + " of the " + scrubbedEnvNames.length + " known child-env names (expected at least " + MIN_SCRUBBED_ENV_NAMES + ")" : /\bfunction\s*[\w$]*\(/.test(body) ? "body declares a nested function" : braceScanFailed ? "the brace walk never reached the function's closing brace" : bound !== 0 ? "match ends " + Math.abs(bound) + " characters " + (bound > 0 ? "before" : "after") + " the end of the function it started in" : void 0;
         if (why !== void 0) {
-          log12("FAIL", patchName, "target validation failed: " + why);
+          log13("FAIL", patchName, "target validation failed: " + why);
           fail("clodex patch: child network environment target validation failed: " + why);
         }
         const restoredBody = body.replace(/process\.env/g, "_clodexChildEnv");
@@ -6038,6 +6048,22 @@ function normalizeGoogleDisplayName(rawName, bareId) {
   return stripGoogleModelPrefix(trimmed);
 }
 
+// src/registry/server-text.ts
+function isControlCode(code) {
+  return code <= 31 || code >= 127 && code <= 159;
+}
+function hasControlChars(value) {
+  for (let i = 0; i < value.length; i++) {
+    if (isControlCode(value.charCodeAt(i))) return true;
+  }
+  return false;
+}
+function printableServerText(value) {
+  let out = "";
+  for (const ch of value) out += isControlCode(ch.charCodeAt(0)) ? " " : ch;
+  return out.trim();
+}
+
 // src/trace-log.ts
 import {
   chmodSync as chmodSync3,
@@ -6127,8 +6153,8 @@ function compactLogValueWithMarker(value, max) {
 function systemPreview(system) {
   if (typeof system === "string") return compactLogValue(system, REQUEST_PREVIEW_MAX) || void 0;
   if (!Array.isArray(system)) return void 0;
-  const text5 = system.map((block) => typeof block === "string" ? block : block && typeof block === "object" && typeof block.text === "string" ? block.text : "").filter(Boolean).join(" ");
-  return compactLogValue(text5, REQUEST_PREVIEW_MAX) || void 0;
+  const text6 = system.map((block) => typeof block === "string" ? block : block && typeof block === "object" && typeof block.text === "string" ? block.text : "").filter(Boolean).join(" ");
+  return compactLogValue(text6, REQUEST_PREVIEW_MAX) || void 0;
 }
 function inlineSystemPreview(messages) {
   if (!Array.isArray(messages)) return void 0;
@@ -6154,9 +6180,9 @@ function getLatestMessagePreview(messages, system) {
       if (typeof content === "string") {
         summary = content;
       } else if (Array.isArray(content)) {
-        const text5 = content.filter((block) => Boolean(block && typeof block === "object")).filter((block) => block.type === "text" && typeof block.text === "string").map((block) => block.text).join(" ");
-        if (text5.trim()) {
-          summary = text5;
+        const text6 = content.filter((block) => Boolean(block && typeof block === "object")).filter((block) => block.type === "text" && typeof block.text === "string").map((block) => block.text).join(" ");
+        if (text6.trim()) {
+          summary = text6;
         } else {
           const blockTypes = [...new Set(content.filter((block) => Boolean(block && typeof block === "object")).map((block) => typeof block.type === "string" ? block.type : "unknown"))];
           if (blockTypes.length > 0) blockSummary = `${role}: [${blockTypes.join(", ")}]`;
@@ -6428,8 +6454,8 @@ function writeSecureLogLine(path, line) {
 function printTraceLog(debugLogPath) {
   if (!existsSync3(debugLogPath)) return;
   const raw = readFileSync6(debugLogPath, "utf8");
-  const log12 = redactTraceLog(raw);
-  const errorLines = log12.split("\n").filter(
+  const log13 = redactTraceLog(raw);
+  const errorLines = log13.split("\n").filter(
     (l) => l.includes("error") || l.includes("Error") || l.includes('"type":"error"') || l.includes("status") || l.includes("resolveModel failed") || l.includes("resolveModel fallback")
   );
   console.log("\n" + pc2.bold(pc2.cyan("\u2500\u2500 Debug trace \u2500\u2500")));
@@ -6491,13 +6517,14 @@ function parseModelList(body, npm, allowBareArray) {
   for (const row of rows) {
     const rawId = row.id?.trim();
     if (!rawId) continue;
+    if (hasControlChars(rawId) || typeof row.name === "string" && hasControlChars(row.name.trim())) continue;
     const { id, upstreamModelId: upstreamModelId2 } = normalizeGoogleModelId(rawId, npm);
     const family = id.split(/[-/:]/)[0] ?? id;
     const cost = parseNativePricing(row.pricing);
     const freeStatus = classifyFreeStatus({
       model: { cost, isFree: row.isFree }
     });
-    const contextWindow = row.context_length ?? row.contextWindow ?? row.context_window ?? resolveContextWindow(id);
+    const contextWindow = row.context_length ?? row.contextWindow ?? row.context_window ?? row.max_model_len ?? resolveContextWindow(id);
     models.push({
       id,
       name: normalizeGoogleDisplayName(row.name, id),
@@ -6922,9 +6949,9 @@ function collectTargets(contents, kind) {
 function readNpmShim(shimPath) {
   const kind = launcherKind(shimPath);
   const unreadable = kind === "sh" ? { kind: "not-a-shim" } : { kind: "unreadable-launcher" };
-  const text5 = readLauncherText(shimPath);
-  if (text5 === null) return unreadable;
-  const rawTargets = collectTargets(text5, kind);
+  const text6 = readLauncherText(shimPath);
+  if (text6 === null) return unreadable;
+  const rawTargets = collectTargets(text6, kind);
   if (rawTargets.length === 0) return unreadable;
   if (!rawTargets.every(isLiteralPath)) return unreadable;
   const absolute = rawTargets.map((target) => resolve2(
@@ -7052,11 +7079,11 @@ function inspectClaudeNativeBinaryPlaceholder(path) {
       offset += bytesRead;
     }
     if (offset !== size) return null;
-    const text5 = bytes.toString("utf8");
+    const text6 = bytes.toString("utf8");
     const signals = [
-      text5.includes(MISSING_BINARY_MARKER),
-      text5.includes(INSTALL_SCRIPT_MARKER),
-      text5.includes(OMIT_OPTIONAL_MARKER) && text5.includes(IGNORE_SCRIPTS_MARKER)
+      text6.includes(MISSING_BINARY_MARKER),
+      text6.includes(INSTALL_SCRIPT_MARKER),
+      text6.includes(OMIT_OPTIONAL_MARKER) && text6.includes(IGNORE_SCRIPTS_MARKER)
     ];
     if (signals.filter(Boolean).length < 2) return null;
     return inspectNativePackage(path);
@@ -8885,11 +8912,11 @@ function reasoningGapShape(expected, actual, full, storedTail, index) {
 }
 var warnedReasoningGaps = /* @__PURE__ */ new Set();
 var MAX_REASONING_GAP_WARNINGS = 3;
-function warnReasoningNormalizationGap(fields, log12) {
+function warnReasoningNormalizationGap(fields, log13) {
   const signature = fields.join(",");
   const message = `clodex: warning: a reasoning item with identical encrypted_content failed the continuation match on field(s): ${signature}. Prompt caching is degraded for this turn \u2014 this is a clodex normalization gap, please report it at https://github.com/bman654/clodex/issues`;
   try {
-    log12?.(`reasoning normalization gap: ${signature}`);
+    log13?.(`reasoning normalization gap: ${signature}`);
   } catch {
   }
   if (warnedReasoningGaps.has(signature)) return;
@@ -8935,12 +8962,12 @@ function toolArgumentNormalizationGap(expected, actual, defaults, requiredProps)
 }
 var warnedToolArgumentGaps = /* @__PURE__ */ new Set();
 var MAX_TOOL_ARGUMENT_GAP_WARNINGS = 3;
-function warnToolArgumentNormalizationGap(gap, log12) {
+function warnToolArgumentNormalizationGap(gap, log13) {
   const tool3 = typeof gap.tool === "string" ? gap.tool : "unknown";
   const signature = `${tool3}:filler`;
   const message = `clodex: warning: tool call "${tool3}" failed the continuation match, but both sides are identical once clodex's filler-strip rule is applied, so the head should have matched. Prompt caching is degraded for this turn \u2014 please report it, with the adapter debug log from --trace if you can, at https://github.com/bman654/clodex/issues`;
   try {
-    log12?.(`tool argument normalization gap: ${signature}`);
+    log13?.(`tool argument normalization gap: ${signature}`);
   } catch {
   }
   if (warnedToolArgumentGaps.has(signature)) return;
@@ -8951,7 +8978,7 @@ function warnToolArgumentNormalizationGap(gap, log12) {
     emitParentNotice("clodex: warning: further tool-argument normalization warnings suppressed.");
   }
 }
-function continuationMismatchDetails(entry, payload, defaults, log12, warnOnGap = false, deferWarnings) {
+function continuationMismatchDetails(entry, payload, defaults, log13, warnOnGap = false, deferWarnings) {
   const raise = (warn) => {
     if (deferWarnings) deferWarnings.push(warn);
     else warn();
@@ -8969,7 +8996,7 @@ function continuationMismatchDetails(entry, payload, defaults, log12, warnOnGap
   const expected = mismatch < prefix.length ? prefix[mismatch] : void 0;
   const actual = mismatch < full.length ? full[mismatch] : void 0;
   const reasoningGap = reasoningNormalizationGap(expected, actual, defaults);
-  if (reasoningGap && warnOnGap) raise(() => warnReasoningNormalizationGap(reasoningGap, log12));
+  if (reasoningGap && warnOnGap) raise(() => warnReasoningNormalizationGap(reasoningGap, log13));
   let gapExpected = expected;
   if (conversationItemKind(expected) === "reasoning" && conversationItemKind(actual) === "function_call") {
     for (let index = mismatch; index < prefix.length; index += 1) {
@@ -8993,10 +9020,10 @@ function continuationMismatchDetails(entry, payload, defaults, log12, warnOnGap
   }
   if (toolArgumentGap?.equalAfterStrip === true) {
     const gap = toolArgumentGap;
-    if (warnOnGap) raise(() => warnToolArgumentNormalizationGap(gap, log12));
+    if (warnOnGap) raise(() => warnToolArgumentNormalizationGap(gap, log13));
   } else if (toolArgumentGap && warnOnGap) {
     try {
-      log12?.(`tool argument mismatch beyond the strip rule: ${String(toolArgumentGap.tool)}`);
+      log13?.(`tool argument mismatch beyond the strip rule: ${String(toolArgumentGap.tool)}`);
     } catch {
     }
   }
@@ -9021,17 +9048,17 @@ function continuationMismatchDetails(entry, payload, defaults, log12, warnOnGap
     ...toolArgumentGap ? { toolArgumentNormalizationGap: toolArgumentGap } : {}
   };
 }
-function continuationMismatchSummary(entry, payload, defaults, log12, mismatchDump = false, precomputedDetails) {
-  const details = precomputedDetails ?? continuationMismatchDetails(entry, payload, defaults, log12, true);
+function continuationMismatchSummary(entry, payload, defaults, log13, mismatchDump = false, precomputedDetails) {
+  const details = precomputedDetails ?? continuationMismatchDetails(entry, payload, defaults, log13, true);
   let summary = `full_items=${details.fullItems} expected_prefix_items=${details.expectedPrefixItems} first_mismatch=${details.firstMismatch} expected=${details.expectedKind} actual=${details.actualKind}`;
   if (details.expectedHash || details.actualHash) {
     summary += ` expected_hash=${details.expectedHash ?? "none"} actual_hash=${details.actualHash ?? "none"}`;
-    if (mismatchDump && log12) {
+    if (mismatchDump && log13) {
       const full = inputArray(payload);
       const prefix = [...entry.requestInput ?? [], ...entry.expectedAssistant ?? []];
       const index = details.firstMismatch;
-      log12(`mismatch dump expected[${index}]: ${mismatchDumpLine(prefix, index, defaults)}`);
-      log12(`mismatch dump actual[${index}]: ${mismatchDumpLine(full, index, defaults)}`);
+      log13(`mismatch dump expected[${index}]: ${mismatchDumpLine(prefix, index, defaults)}`);
+      log13(`mismatch dump actual[${index}]: ${mismatchDumpLine(full, index, defaults)}`);
     }
   }
   return summary;
@@ -9374,7 +9401,7 @@ function requiredToolProps(payload) {
     if (record.type !== "function" || typeof record.name !== "string") return;
     const parameters = record.parameters;
     const required = parameters && typeof parameters === "object" && Array.isArray(parameters.required) ? parameters.required : [];
-    map.set(record.name, new Set(required.filter((p13) => typeof p13 === "string")));
+    map.set(record.name, new Set(required.filter((p14) => typeof p14 === "string")));
   };
   if (Array.isArray(payload.tools)) for (const tool3 of payload.tools) add(tool3);
   return map;
@@ -9403,12 +9430,12 @@ function expectedAssistantItems(ctx) {
     const type = accumulator.type ?? (typeof done.type === "string" ? done.type : void 0);
     if (type === "message") {
       const doneContent = Array.isArray(done.content) ? done.content : void 0;
-      const text5 = accumulator.text || (doneContent ? doneContent.filter((part) => part && typeof part === "object" && part.type === "output_text").map((part) => String(part.text ?? "")).join("") : "");
-      output.push({ role: "assistant", content: [{ type: "output_text", text: text5 }] });
+      const text6 = accumulator.text || (doneContent ? doneContent.filter((part) => part && typeof part === "object" && part.type === "output_text").map((part) => String(part.text ?? "")).join("") : "");
+      output.push({ role: "assistant", content: [{ type: "output_text", text: text6 }] });
       continue;
     }
     if (type === "reasoning") {
-      const summary = accumulator.summaries.size ? [...accumulator.summaries.entries()].sort(([a], [b]) => a - b).map(([, text5]) => ({ type: "summary_text", text: text5 })) : Array.isArray(done.summary) ? done.summary : [];
+      const summary = accumulator.summaries.size ? [...accumulator.summaries.entries()].sort(([a], [b]) => a - b).map(([, text6]) => ({ type: "summary_text", text: text6 })) : Array.isArray(done.summary) ? done.summary : [];
       output.push({ ...withoutEphemeralFields(done), type: "reasoning", summary });
       continue;
     }
@@ -9698,7 +9725,7 @@ function handleSocketMessage(entry, data) {
     if (entry.connectionDiagnostic) observeIdleFrame(entry, data);
     return;
   }
-  const text5 = Array.isArray(data) ? Buffer.concat(data).toString("utf8") : data.toString("utf8");
+  const text6 = Array.isArray(data) ? Buffer.concat(data).toString("utf8") : data.toString("utf8");
   ctx.frameCount += 1;
   if (ctx.transportRetryPending) {
     ctx.transportRetryPending = false;
@@ -9710,9 +9737,9 @@ function handleSocketMessage(entry, data) {
   }
   let event;
   try {
-    event = JSON.parse(text5);
+    event = JSON.parse(text6);
   } catch {
-    ctx.pendingEvents.push(text5.replace(/\r?\n/g, " "));
+    ctx.pendingEvents.push(text6.replace(/\r?\n/g, " "));
     flushPending(ctx);
     return;
   }
@@ -10060,23 +10087,23 @@ function createConnection(WebSocket, wsUrl, headers, persistent, key, options, d
 function diagnosticCap(cap) {
   return Number.isFinite(cap) ? cap : null;
 }
-function envConnectionCap(name, log12) {
+function envConnectionCap(name, log13) {
   const raw = process.env[name];
   if (raw === void 0 || raw.trim() === "") return void 0;
   const value = Number(raw.trim());
   if (!Number.isInteger(value) || value < 1) {
     try {
-      log12?.(`ws: ignoring ${name}=${raw} (expected a positive integer)`);
+      log13?.(`ws: ignoring ${name}=${raw} (expected a positive integer)`);
     } catch {
     }
     return void 0;
   }
   return value;
 }
-function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
+function createResponsesWebSocketFetch(wsUrl, log13, options = {}) {
   const debug = (message) => {
     try {
-      log12?.(`ws: ${message}`);
+      log13?.(`ws: ${message}`);
     } catch {
     }
   };
@@ -10085,8 +10112,8 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
     hardTtlMs: options.hardTtlMs ?? RESPONSES_WS_HARD_TTL_MS,
     idleTtlMs: options.idleTtlMs ?? RESPONSES_WS_IDLE_TTL_MS,
     nurseryIdleTtlMs: options.nurseryIdleTtlMs ?? Math.min(RESPONSES_WS_NURSERY_IDLE_TTL_MS, options.idleTtlMs ?? RESPONSES_WS_IDLE_TTL_MS),
-    maxConnections: options.maxConnections ?? envConnectionCap("CLODEX_WS_MAX_CONNECTIONS", log12) ?? RESPONSES_WS_MAX_CONNECTIONS,
-    maxNurseryConnections: options.maxNurseryConnections ?? envConnectionCap("CLODEX_WS_MAX_NURSERY_CONNECTIONS", log12) ?? RESPONSES_WS_MAX_NURSERY_CONNECTIONS,
+    maxConnections: options.maxConnections ?? envConnectionCap("CLODEX_WS_MAX_CONNECTIONS", log13) ?? RESPONSES_WS_MAX_CONNECTIONS,
+    maxNurseryConnections: options.maxNurseryConnections ?? envConnectionCap("CLODEX_WS_MAX_NURSERY_CONNECTIONS", log13) ?? RESPONSES_WS_MAX_NURSERY_CONNECTIONS,
     now: options.now ?? Date.now
   };
   return async (_input, init) => {
@@ -10521,8 +10548,8 @@ function buildClaudeCodeBillingSystemLine() {
 function systemBlockText(block) {
   if (typeof block === "string") return block;
   if (block && typeof block === "object" && "text" in block) {
-    const text5 = block.text;
-    return typeof text5 === "string" ? text5 : void 0;
+    const text6 = block.text;
+    return typeof text6 === "string" ? text6 : void 0;
   }
   return void 0;
 }
@@ -10895,7 +10922,7 @@ function toCamelCase(str) {
   return str.replace(/[-_]([a-z])/g, (_, g) => g.toUpperCase());
 }
 function hasSupportedParameter(metadata, param) {
-  return (metadata?.supportedParameters ?? []).some((p13) => p13 === param);
+  return (metadata?.supportedParameters ?? []).some((p14) => p14 === param);
 }
 function isOpenRouterRoute(npm, metadata) {
   return npm === "@openrouter/ai-sdk-provider" || metadata?.providerId === "openrouter" || metadata?.apiBaseUrl?.includes("openrouter.ai") === true;
@@ -11641,6 +11668,7 @@ function routeUnavailableMessage(modelId, reason) {
 }
 
 // src/upstream-forward.ts
+import { randomUUID as randomUUID4 } from "crypto";
 import { Readable, Transform } from "stream";
 import { StringDecoder } from "string_decoder";
 
@@ -11729,18 +11757,50 @@ async function fetchWithOAuthRetry(apiKey, request3, refreshToken) {
   response = await request3(refreshed);
   return { response, apiKey: refreshed, refreshed: true };
 }
+function upstreamHoldsThreads(url) {
+  try {
+    return new URL(url).hostname.toLowerCase() === "api.anthropic.com";
+  } catch {
+    return false;
+  }
+}
+function anchorSafeMessageId(id) {
+  return typeof id === "string" && id.startsWith("msg_") ? "clodex_" + randomUUID4().replace(/-/g, "") : id;
+}
+function isThreadContinuation(body) {
+  const thread = body.thread;
+  return typeof thread === "object" && thread !== null && thread.type === "continue";
+}
+var THREAD_UNSUPPORTED_BODY = JSON.stringify({
+  type: "error",
+  error: {
+    type: "invalid_request_error",
+    message: "thread continuation is not supported on this route; resend the full conversation",
+    details: { error_code: "thread_unsupported_request" }
+  }
+});
 var SSE_LINE_SPLIT = /(\r\n|\r|\n)/;
-function anthropicSseModelRewrite(override) {
+function anthropicSseMessageStartRewrite(rewrite) {
   const decoder = new StringDecoder("utf8");
   let tail = "";
   const rewriteLine = (line) => {
     if (!line.startsWith("data:") || !line.includes('"message_start"')) return line;
     try {
       const parsed = JSON.parse(line.slice(5));
-      if (parsed.type === "message_start" && parsed.message && typeof parsed.message.model === "string") {
-        parsed.message.model = override;
-        return "data: " + JSON.stringify(parsed);
+      if (parsed.type !== "message_start" || !parsed.message) return line;
+      let changed = false;
+      if (rewrite.model !== void 0 && typeof parsed.message.model === "string") {
+        parsed.message.model = rewrite.model;
+        changed = true;
       }
+      if (rewrite.anchorSafeId) {
+        const id = anchorSafeMessageId(parsed.message.id);
+        if (id !== parsed.message.id) {
+          parsed.message.id = id;
+          changed = true;
+        }
+      }
+      if (changed) return "data: " + JSON.stringify(parsed);
     } catch {
     }
     return line;
@@ -11806,8 +11866,11 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
       "Connection": "keep-alive"
     });
     const upstream = Readable.fromWeb(upstreamRes.body).on("error", () => res.destroy());
-    if (options.responseModelOverride) {
-      upstream.pipe(anthropicSseModelRewrite(options.responseModelOverride)).on("error", () => res.destroy()).pipe(res);
+    if (options.responseModelOverride || options.anchorSafeMessageIds) {
+      upstream.pipe(anthropicSseMessageStartRewrite({
+        model: options.responseModelOverride,
+        anchorSafeId: options.anchorSafeMessageIds
+      })).on("error", () => res.destroy()).pipe(res);
     } else {
       upstream.pipe(res);
     }
@@ -11818,31 +11881,43 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
     res.end(JSON.stringify({ type: "error", error: { type: "api_error", message: "Upstream returned empty response body" } }));
     return;
   }
-  let text5 = await upstreamRes.text();
+  let text6 = await upstreamRes.text();
   let parsed;
   try {
-    parsed = JSON.parse(text5);
+    parsed = JSON.parse(text6);
   } catch {
     res.writeHead(502, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ type: "error", error: { type: "api_error", message: "Upstream response was not valid JSON" } }));
     return;
   }
-  if (options.responseModelOverride && parsed && typeof parsed === "object" && !Array.isArray(parsed) && parsed.type === "message" && typeof parsed.model === "string") {
-    parsed.model = options.responseModelOverride;
-    text5 = JSON.stringify(parsed);
+  if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && parsed.type === "message") {
+    const message = parsed;
+    let changed = false;
+    if (options.responseModelOverride && typeof message.model === "string") {
+      message.model = options.responseModelOverride;
+      changed = true;
+    }
+    if (options.anchorSafeMessageIds) {
+      const id = anchorSafeMessageId(message.id);
+      if (id !== message.id) {
+        message.id = id;
+        changed = true;
+      }
+    }
+    if (changed) text6 = JSON.stringify(message);
   }
   res.writeHead(200, {
     "Content-Type": "application/json",
-    "Content-Length": Buffer.byteLength(text5).toString()
+    "Content-Length": Buffer.byteLength(text6).toString()
   });
-  res.end(text5);
+  res.end(text6);
 }
 
 // src/proxy.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 
 // src/sdk-adapter.ts
-import { createHash as createHash7 } from "crypto";
+import { createHash as createHash7, randomUUID as randomUUID5 } from "crypto";
 import { streamText, generateText, tool, jsonSchema } from "ai";
 
 // src/proxy-shared.ts
@@ -12187,12 +12262,12 @@ var OpenAiThinkingBlock = class {
   append(part) {
     const entry = this.parts.get(part.id ?? "");
     if (!entry) throw new Error("OpenAI reasoning delta has no matching start");
-    const text5 = part.text ?? "";
-    if (!text5) return "";
+    const text6 = part.text ?? "";
+    if (!text6) return "";
     const separator = entry.text.length === 0 && this.hasText ? "\n\n" : "";
-    entry.text += text5;
+    entry.text += text6;
     this.hasText = true;
-    return separator + text5;
+    return separator + text6;
   }
   end(part) {
     const entry = this.parts.get(part.id ?? "");
@@ -12206,7 +12281,7 @@ var OpenAiThinkingBlock = class {
 function isRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-function restoreOpenAiThinking(text5, signature, npm) {
+function restoreOpenAiThinking(text6, signature, npm) {
   if (!signature?.startsWith(SIGNATURE_PREFIX)) return void 0;
   if (!signature.startsWith(SIGNATURE_V1)) return [];
   try {
@@ -12217,7 +12292,7 @@ function restoreOpenAiThinking(text5, signature, npm) {
       if (!isRecord(part) || typeof part.itemId !== "string" || !part.itemId || typeof part.text !== "string" || part.encryptedContent !== void 0 && typeof part.encryptedContent !== "string") return [];
       parts.push(part);
     }
-    if (npm !== "@ai-sdk/openai") return text5 ? [{ type: "reasoning", text: text5 }] : [];
+    if (npm !== "@ai-sdk/openai") return text6 ? [{ type: "reasoning", text: text6 }] : [];
     return parts.map((part) => ({
       type: "reasoning",
       text: part.text,
@@ -12291,10 +12366,10 @@ function supportsOpenAiPromptCacheBreakpoints(modelId) {
   const minor = Number(match[2] ?? 0);
   return major > 5 || major === 5 && minor >= 6;
 }
-function stripClaudeCodeBillingHeader(text5) {
-  if (!text5.startsWith(CLAUDE_CODE_BILLING_HEADER_PREFIX)) return text5;
-  const newline = text5.indexOf("\n");
-  return newline === -1 ? void 0 : text5.slice(newline + 1);
+function stripClaudeCodeBillingHeader(text6) {
+  if (!text6.startsWith(CLAUDE_CODE_BILLING_HEADER_PREFIX)) return text6;
+  const newline = text6.indexOf("\n");
+  return newline === -1 ? void 0 : text6.slice(newline + 1);
 }
 function systemToString(system, stripAnthropicBillingHeader = false) {
   if (!system) return void 0;
@@ -12303,8 +12378,8 @@ function systemToString(system, stripAnthropicBillingHeader = false) {
   }
   const blocks = system.map((b) => typeof b === "string" ? b : b.text ?? "");
   if (!stripAnthropicBillingHeader) return blocks.join("\n");
-  return blocks.flatMap((text5) => {
-    const stripped = stripClaudeCodeBillingHeader(text5);
+  return blocks.flatMap((text6) => {
+    const stripped = stripClaudeCodeBillingHeader(text6);
     return stripped === void 0 ? [] : [stripped];
   }).join("\n");
 }
@@ -12320,12 +12395,12 @@ function translateTopLevelSystemForOpenAi(system) {
   }
   return system.flatMap((block) => {
     const raw = typeof block === "string" ? block : block.text ?? "";
-    const text5 = stripClaudeCodeBillingHeader(raw) ?? "";
-    if (!text5.trim()) return [];
+    const text6 = stripClaudeCodeBillingHeader(raw) ?? "";
+    if (!text6.trim()) return [];
     const cacheControl = typeof block === "string" ? void 0 : block.cache_control;
     return [{
       role: "system",
-      content: text5,
+      content: text6,
       ...cacheControl ? { providerOptions: { openai: { promptCacheBreakpoint: { mode: "explicit" } } } } : {}
     }];
   });
@@ -12382,9 +12457,9 @@ function annotateToolNames(messages) {
   }
 }
 function thinkingToSdkPart(block, npm) {
-  const text5 = block.thinking ?? "";
-  if (npm === "@ai-sdk/openai" && !block.signature && !text5.trim()) return null;
-  const part = { type: "reasoning", text: text5 };
+  const text6 = block.thinking ?? "";
+  if (npm === "@ai-sdk/openai" && !block.signature && !text6.trim()) return null;
+  const part = { type: "reasoning", text: text6 };
   if (block.signature) {
     if (npm === "@ai-sdk/google") {
       part.providerOptions = { google: { thoughtSignature: block.signature } };
@@ -12419,10 +12494,10 @@ function translateMessages(messages, npm, openAiPromptCacheBreakpoints = false)
             ...openAiCacheBreakpoint(b, openAiPromptCacheBreakpoints) ? { providerOptions: openAiCacheBreakpoint(b, openAiPromptCacheBreakpoints) } : {}
           });
         } else if (b.type === "image") {
-          const p13 = imagePart(b);
-          if (p13) {
+          const p14 = imagePart(b);
+          if (p14) {
             parts.push({
-              ...p13,
+              ...p14,
               ...openAiCacheBreakpoint(b, openAiPromptCacheBreakpoints) ? { providerOptions: openAiCacheBreakpoint(b, openAiPromptCacheBreakpoints) } : {}
             });
           }
@@ -12475,10 +12550,10 @@ function translateMessages(messages, npm, openAiPromptCacheBreakpoints = false)
 function isPlainObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-function parsesAsJson(text5) {
-  if (text5.trim() === "") return true;
+function parsesAsJson(text6) {
+  if (text6.trim() === "") return true;
   try {
-    JSON.parse(text5);
+    JSON.parse(text6);
     return true;
   } catch {
     return false;
@@ -12527,7 +12602,7 @@ function isClaudeCodeCompactRequest(body) {
   const finalMessage = body.messages.at(-1);
   if (!finalMessage || finalMessage.role !== "user") return false;
   const texts = typeof finalMessage.content === "string" ? [finalMessage.content] : finalMessage.content.filter((block) => block.type === "text").map((block) => block.text ?? "");
-  return texts.some((text5) => text5.startsWith(COMPACT_TEXT_ONLY_START) && text5.includes(COMPACT_TEXT_ONLY_END));
+  return texts.some((text6) => text6.startsWith(COMPACT_TEXT_ONLY_START) && text6.includes(COMPACT_TEXT_ONLY_END));
 }
 var COMPACT_DRIFT_ANCHOR = "Tool calls will be REJECTED and will waste your only turn";
 var COMPACT_DRIFT_ANCHOR_LINE = new RegExp(
@@ -12539,25 +12614,25 @@ function looksLikeDriftedClaudeCodeCompactRequest(body) {
   const finalMessage = body.messages.at(-1);
   if (!finalMessage || finalMessage.role !== "user") return false;
   const texts = typeof finalMessage.content === "string" ? [finalMessage.content] : finalMessage.content.filter((block) => block.type === "text").map((block) => block.text ?? "");
-  return texts.some((text5) => !text5.startsWith(COMPACT_TEXT_ONLY_START) && COMPACT_DRIFT_OPENING.test(text5) && COMPACT_DRIFT_ANCHOR_LINE.test(text5));
+  return texts.some((text6) => !text6.startsWith(COMPACT_TEXT_ONLY_START) && COMPACT_DRIFT_OPENING.test(text6) && COMPACT_DRIFT_ANCHOR_LINE.test(text6));
 }
 function claudeCodeVersionFromRequest(body) {
   const texts = typeof body.system === "string" ? [body.system] : (body.system ?? []).map((block) => typeof block === "string" ? block : block.text ?? "");
-  for (const text5 of texts) {
-    if (!text5.startsWith(CLAUDE_CODE_BILLING_HEADER_PREFIX)) continue;
-    const match = text5.match(/\bcc_version=([0-9A-Za-z][0-9A-Za-z._+-]{0,63})(?:;|\s|$)/);
+  for (const text6 of texts) {
+    if (!text6.startsWith(CLAUDE_CODE_BILLING_HEADER_PREFIX)) continue;
+    const match = text6.match(/\bcc_version=([0-9A-Za-z][0-9A-Za-z._+-]{0,63})(?:;|\s|$)/);
     if (match) return match[1];
   }
   return void 0;
 }
 var warnedCompactPromptDrifts = /* @__PURE__ */ new Set();
 var MAX_COMPACT_PROMPT_DRIFT_WARNINGS = 3;
-function reportClaudeCodeCompactPromptDrift(body, log12) {
+function reportClaudeCodeCompactPromptDrift(body, log13) {
   if (!looksLikeDriftedClaudeCodeCompactRequest(body)) return;
   const version = claudeCodeVersionFromRequest(body);
   const signature = version ?? "unknown-version";
   try {
-    log12?.(`possible Claude Code compact prompt drift: ${signature}`);
+    log13?.(`possible Claude Code compact prompt drift: ${signature}`);
   } catch {
   }
   if (warnedCompactPromptDrifts.has(signature)) return;
@@ -12690,8 +12765,11 @@ function forwardAbortSignal(source, target) {
   source.addEventListener("abort", forward, { once: true });
   return () => source.removeEventListener("abort", forward);
 }
-async function writeAnthropicStream(stream, modelId, write, log12, observer, tools) {
-  const messageId = "msg_" + Date.now();
+function translatedMessageId() {
+  return "clodex_" + randomUUID5().replace(/-/g, "");
+}
+async function writeAnthropicStream(stream, modelId, write, log13, observer, tools) {
+  const messageId = translatedMessageId();
   const requiredProps = toolRequiredProps(tools);
   let blockIndex = -1;
   let started = false;
@@ -12887,7 +12965,7 @@ async function writeAnthropicStream(stream, modelId, write, log12, observer, too
         const errMsg = e?.message || (typeof part.error === "string" ? part.error : JSON.stringify(e?.data ?? part.error));
         const transportCode = sdkUpstreamErrorDetails(part.error)?.transportCode;
         const errorType = anthropicErrorType(upstreamHttpStatus(part.error, errMsg), transportCode);
-        log12?.(() => `sdk stream error (${errorType}): ${errMsg}`);
+        log13?.(() => `sdk stream error (${errorType}): ${errMsg}`);
         if (!(transportCode === "websocket_transport_error" && openType === "thinking")) closeOpen();
         throw part.error instanceof Error || part.error && typeof part.error === "object" ? part.error : new Error(errMsg);
       }
@@ -12901,7 +12979,7 @@ async function writeAnthropicStream(stream, modelId, write, log12, observer, too
   emit("message_delta", { type: "message_delta", delta: { stop_reason: finishReason, stop_sequence: null }, usage });
   emit("message_stop", { type: "message_stop" });
 }
-async function streamAnthropicResponse(model, params, modelId, write, log12, observer) {
+async function streamAnthropicResponse(model, params, modelId, write, log13, observer) {
   const { idleTimeoutMs, totalTimeoutMs, maxRetries } = upstreamRequestBudget({
     idleTimeoutMs: observer?.idleTimeoutMs
   });
@@ -12940,7 +13018,7 @@ async function streamAnthropicResponse(model, params, modelId, write, log12, obs
         clearTimeout(idleTimer);
       }
     })();
-    await writeAnthropicStream(watchedStream, modelId, write, log12, { ...observer, abortSignal }, params.tools);
+    await writeAnthropicStream(watchedStream, modelId, write, log13, { ...observer, abortSignal }, params.tools);
   } finally {
     stopForwardingAbort();
     clearTimeout(idleTimer);
@@ -12949,7 +13027,7 @@ async function streamAnthropicResponse(model, params, modelId, write, log12, obs
   }
 }
 async function generateAnthropicResponse(model, params, modelId, options) {
-  let text5;
+  let text6;
   let toolCalls;
   let finishReason;
   let usage;
@@ -13015,7 +13093,7 @@ async function generateAnthropicResponse(model, params, modelId, options) {
       clearTimeout(totalTimer);
       if (!forceAbort.signal.aborted) forceAbort.abort();
     }
-    text5 = streamedText.join("");
+    text6 = streamedText.join("");
     toolCalls = streamedToolCalls;
     finishReason = streamedFinishReason;
     usage = streamedUsage;
@@ -13035,7 +13113,7 @@ async function generateAnthropicResponse(model, params, modelId, options) {
         maxRetries,
         abortSignal: generateAbort.signal
       });
-      ({ text: text5, toolCalls, finishReason, usage, warnings } = r);
+      ({ text: text6, toolCalls, finishReason, usage, warnings } = r);
     } catch (error) {
       if (generateAbort.signal.aborted) throw streamAbortError(generateAbort.signal);
       throw error;
@@ -13049,12 +13127,12 @@ async function generateAnthropicResponse(model, params, modelId, options) {
   reportPromptTokens({ onPromptTokens: options?.onPromptTokens }, usage);
   const requiredProps = toolRequiredProps(params.tools);
   return {
-    id: "msg_" + Date.now(),
+    id: translatedMessageId(),
     type: "message",
     role: "assistant",
     model: modelId,
     content: [
-      ...text5 ? [{ type: "text", text: text5 }] : [],
+      ...text6 ? [{ type: "text", text: text6 }] : [],
       ...toolCalls.map((tc) => ({
         type: "tool_use",
         id: encodeToolUseId(tc.toolCallId, grabRoundTripSignature(tc)),
@@ -13265,7 +13343,7 @@ function configuredAliasLookupNames(alias) {
   }))].map(normalizeRouteLookupId);
 }
 async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenceLogPath, debugLogPath, webSocketDiagnosticsLogPath, modelAliases) {
-  const proxyToken = randomUUID4();
+  const proxyToken = randomUUID6();
   silenceSdkWarnings();
   if (routes.length === 0) {
     throw new Error("Proxy catalog requires at least one route");
@@ -13417,6 +13495,13 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
         }
         return;
       }
+      const holdsThreads = route.modelFormat === "anthropic" && upstreamHoldsThreads(upstreamUrl);
+      if (!holdsThreads && isThreadContinuation(anthropicBody)) {
+        plog(() => `thread continuation refused: route=${route.realModelId} upstream does not hold threads`);
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(THREAD_UNSUPPORTED_BODY);
+        return;
+      }
       if (!apiKey && routeAuthType !== "none" && !usesSdkAdapter) {
         anthropicError(res, 401, "Missing API key");
         return;
@@ -13470,6 +13555,9 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
             // the client would believe it reached a model it never reached, and
             // would key its context window off that phantom id.
             responseModelOverride: resolvedRoute && typeof originalModel === "string" && originalModel !== route.realModelId ? originalModel : void 0,
+            // An upstream that holds no threads must not hand Claude Code an id
+            // it would anchor the next request on.
+            anchorSafeMessageIds: !holdsThreads,
             onUpstreamError: inferenceLogPath ? (statusCode, errorContent) => writeInferenceResponseErrorLog(inferenceLogPath, {
               modelId: originalModel,
               provider: route.providerId ?? route.aliasId.split(":")[1] ?? "unknown",
@@ -13678,7 +13766,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
               res,
               upstreamStatus === 500 ? 502 : upstreamStatus,
               clientMessage,
-              contextLengthExceeded ? relayRequestId ?? randomUUID4() : void 0
+              contextLengthExceeded ? relayRequestId ?? randomUUID6() : void 0
             );
           } else {
             const errorType = anthropicErrorType(upstreamStatus, details?.transportCode);
@@ -13686,7 +13774,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
 data: ${JSON.stringify({
               type: "error",
               error: { type: errorType, message: clientMessage },
-              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID4() } : {}
+              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID6() } : {}
             })}
 
 `);
@@ -14743,11 +14831,11 @@ function formatModelMetadata(entries) {
 
 // src/first-run.ts
 import pc7 from "picocolors";
-import * as p6 from "@clack/prompts";
+import * as p7 from "@clack/prompts";
 
 // src/providers-command.ts
 import pc6 from "picocolors";
-import * as p5 from "@clack/prompts";
+import * as p6 from "@clack/prompts";
 
 // src/registry/import-build.ts
 function oauthAuthRef(providerId) {
@@ -14818,8 +14906,8 @@ async function fetchProviderCatalog(opts) {
   return loadRegistryProviders(warn, { ...opts, warn });
 }
 function providersForPicker(providers) {
-  for (const p13 of providers) {
-    p13.models.sort((a, b) => {
+  for (const p14 of providers) {
+    p14.models.sort((a, b) => {
       const nameA = a.name || a.id;
       const nameB = b.name || b.id;
       return nameA.localeCompare(nameB, void 0, { sensitivity: "base", numeric: true });
@@ -14835,7 +14923,7 @@ async function resolveLocalProviderApiKey(provider) {
   if (template?.apiKeyOptional || template?.anonymousFreeModels) {
     return "";
   }
-  const reg = loadRegistry().providers.find((p13) => p13.id === provider.id);
+  const reg = loadRegistry().providers.find((p14) => p14.id === provider.id);
   const authRef = provider.authRef ?? reg?.authRef ?? oauthAuthRef(provider.id);
   return resolveProviderCredential(provider.id, authRef);
 }
@@ -15009,7 +15097,7 @@ function localProvidersToServerModels(localProviders) {
 }
 
 // src/registry/credential-cleanup-journal.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 import {
   closeSync as closeSync9,
   existsSync as existsSync5,
@@ -15149,7 +15237,7 @@ function writeJournalUnlocked(journal, path) {
   assertRegistryWriteOwnership(path);
   ensureSecureAppHome();
   mkdirSync6(dirname6(path), { recursive: true, mode: DIR_MODE2 });
-  const tmp = `${path}.${process.pid}.${randomUUID5()}.tmp`;
+  const tmp = `${path}.${process.pid}.${randomUUID7()}.tmp`;
   let fd;
   try {
     fd = openSync9(tmp, "wx", FILE_MODE4);
@@ -15476,7 +15564,7 @@ async function addProviderFromTemplate(template, apiKey, opts) {
           }
         };
         if (existing) {
-          const idx = registry.providers.findIndex((p13) => p13.id === template.id);
+          const idx = registry.providers.findIndex((p14) => p14.id === template.id);
           registry.providers[idx] = entry;
         } else {
           registry.providers.push(entry);
@@ -15524,127 +15612,8 @@ async function addProviderFromTemplate(template, apiKey, opts) {
   return result;
 }
 
-// src/registry/crud.ts
-async function removeProviderWithinLifecycle(id, opts) {
-  const removal = await withRegistryWriteLock(async () => {
-    const registry = loadRegistryStrict();
-    const index = registry.providers.findIndex((p13) => p13.id === id);
-    if (index < 0) {
-      return {
-        result: {
-          removed: false,
-          id,
-          credentialDeleted: false,
-          error: `Provider not found: ${id}`
-        },
-        queuedRefs: []
-      };
-    }
-    const [removedProvider] = registry.providers.splice(index, 1);
-    const queuedRefs = [];
-    if (opts?.deleteCredential !== false) {
-      const credentialRefs = /* @__PURE__ */ new Set([
-        removedProvider.authRef,
-        ...removedProvider.defaultAuthRef ? [removedProvider.defaultAuthRef] : [],
-        ...Object.values(removedProvider.authAccounts ?? {}).map((slot) => slot.authRef)
-      ]);
-      for (const authRef of credentialRefs) {
-        if (await queueCredentialDelete(authRef)) queuedRefs.push(authRef);
-      }
-    }
-    saveRegistry(registry);
-    return {
-      result: {
-        removed: true,
-        id,
-        name: removedProvider.name,
-        credentialDeleted: false
-      },
-      queuedRefs
-    };
-  });
-  if (removal.queuedRefs.length > 0) {
-    try {
-      const cleanup = await reconcilePendingCredentialDeletes();
-      removal.result.credentialDeleted = removal.queuedRefs.every((ref) => cleanup.deleted.includes(ref));
-      removal.result.credentialCleanupPending = removal.queuedRefs.some((ref) => cleanup.pending.includes(ref)) || cleanup.persistenceError !== void 0;
-    } catch {
-      removal.result.credentialCleanupPending = true;
-    }
-    removal.result.credentialCleanupReconciled = true;
-  }
-  return removal.result;
-}
-async function removeProviderFromRegistry(id, opts) {
-  return withProviderMutationLock(id, () => removeProviderWithinLifecycle(id, opts));
-}
-async function setActiveOAuthAccount(id, account) {
-  return withProviderMutationLock(id, () => withRegistryWriteLock(() => {
-    const registry = loadRegistryStrict();
-    const provider = registry.providers.find((p13) => p13.id === id);
-    if (!provider) return { updated: false, error: `Provider not found: ${id}` };
-    const name = account?.trim().toLowerCase();
-    const previous = provider.activeAuthAccount?.trim() || void 0;
-    const selectedSlot = name ? getOAuthAccountSlot(provider, name) : void 0;
-    let selectionChanged = previous !== name;
-    let storageChanged = false;
-    if (name && !selectedSlot) {
-      const slots = provider.authAccounts ?? {};
-      const available = Object.keys(slots).sort().join(", ") || "none";
-      return {
-        updated: false,
-        error: `${provider.name} has no account named "${name}" (available: ${available}).`
-      };
-    }
-    if (name && provider.authType === "oauth") {
-      storageChanged = storeActiveOAuthAccount(provider, name, selectedSlot.authRef);
-    }
-    if (selectionChanged && provider.authType === "oauth") {
-      const previousSlot = previous ? getOAuthAccountSlot(provider, previous) : void 0;
-      if (previous && previousSlot && provider.modelsCache && provider.authAccounts) {
-        provider.authAccounts[previous] = {
-          ...previousSlot,
-          modelsCache: provider.modelsCache
-        };
-      }
-      const selectedCache = selectedSlot?.modelsCache;
-      if (selectedCache) {
-        provider.modelsCache = selectedCache;
-        provider.refreshedAt = selectedCache.fetchedAt;
-      } else {
-        delete provider.modelsCache;
-        delete provider.refreshedAt;
-      }
-    }
-    if (name && provider.authType !== "oauth") {
-      storageChanged = clearActiveOAuthAccount(provider) || storageChanged;
-      if (provider.activeAuthAccount !== name) {
-        provider.activeAuthAccount = name;
-        storageChanged = true;
-      }
-    } else if (!name && (previous !== void 0 || provider.defaultAuthRef !== void 0)) {
-      storageChanged = clearActiveOAuthAccount(provider);
-    } else if (!name) {
-      selectionChanged = false;
-    }
-    const migrationNeedsPersistence = registry.schemaVersion < REGISTRY_SCHEMA_VERSION_WITH_MATERIALIZED_ACTIVE_ACCOUNT && provider.defaultAuthRef !== void 0;
-    if (selectionChanged || storageChanged || migrationNeedsPersistence) saveRegistry(registry);
-    return { updated: true, changed: selectionChanged, ...name ? { account: name } : {}, provider };
-  }));
-}
-function toggleProviderEnabled(id) {
-  return withRegistryWriteLockSync(() => {
-    const registry = loadRegistryStrict();
-    const provider = registry.providers.find((p13) => p13.id === id);
-    if (!provider) return { toggled: false, error: `Provider not found: ${id}` };
-    provider.enabled = !provider.enabled;
-    saveRegistry(registry);
-    return { toggled: true, enabled: provider.enabled };
-  });
-}
-
-// src/registry/refresh-models.ts
-import { isDeepStrictEqual } from "util";
+// src/providers-custom-add.ts
+import * as p3 from "@clack/prompts";
 
 // src/registry/url-security.ts
 import { lookup } from "dns/promises";
@@ -15759,6 +15728,13 @@ async function validateCustomEndpointUrl(rawUrl, opts = {}) {
 }
 
 // src/registry/custom-endpoint.ts
+var CUSTOM_PROVIDER_ALLOCATION_SLOT = "custom-provider-allocation";
+function npmForKind(kind) {
+  return kind === "anthropic" ? "@ai-sdk/anthropic" : "@ai-sdk/openai-compatible";
+}
+function modelFormatForKind(kind) {
+  return kind === "anthropic" ? "anthropic" : "openai";
+}
 async function fetchAnthropicModels(baseUrl, apiKey, extraHeaders) {
   const root = baseUrl.replace(/\/v1\/?$/, "").replace(/\/$/, "");
   const modelsUrl2 = `${root}/v1/models`;
@@ -15798,6 +15774,7 @@ async function fetchAnthropicModels(baseUrl, apiKey, extraHeaders) {
       for (const row of json.data ?? []) {
         const id = row.id?.trim();
         if (!id) continue;
+        if (hasControlChars(id) || typeof row.name === "string" && hasControlChars(row.name.trim())) continue;
         models.push({
           id,
           name: row.name?.trim() || id,
@@ -15832,6 +15809,325 @@ async function fetchAnthropicModels(baseUrl, apiKey, extraHeaders) {
     clearTimeout(timer);
   }
 }
+function uniqueProviderId(displayName, registry) {
+  let base = customProviderId(displayName);
+  if (!base.startsWith("custom-")) base = `custom-${slugifyProviderId(displayName)}`;
+  if (!isValidProviderId(base)) base = "custom-provider";
+  if (!registry.providers.some((p14) => p14.id === base)) return base;
+  for (let i = 2; ; i++) {
+    const candidate = `${base}-${i}`;
+    if (isValidProviderId(candidate) && !registry.providers.some((p14) => p14.id === candidate)) {
+      return candidate;
+    }
+  }
+}
+async function addCustomEndpointProvider(input) {
+  const urlCheck = await validateCustomEndpointUrl(input.baseUrl, {
+    allowInsecureLocal: input.allowInsecureLocal
+  });
+  if (!urlCheck.ok || !urlCheck.normalizedUrl) {
+    return { added: false, error: urlCheck.error, hint: urlCheck.hint };
+  }
+  const normalizedUrl = urlCheck.normalizedUrl;
+  const displayName = input.displayName.trim();
+  const probeProviderId = uniqueProviderId(displayName, { providers: [] });
+  const npm = npmForKind(input.kind);
+  const apiKey = input.apiKey.trim();
+  const anonymous = apiKey.length === 0;
+  const headers = input.headers && Object.keys(input.headers).length > 0 ? input.headers : void 0;
+  let fetched;
+  if (input.kind === "anthropic") {
+    fetched = await fetchAnthropicModels(normalizedUrl, apiKey, headers);
+  } else {
+    fetched = await fetchTemplateModels(
+      {
+        id: probeProviderId,
+        name: displayName,
+        authType: anonymous ? "none" : "api",
+        npm,
+        defaultBaseUrl: normalizedUrl,
+        modelSource: "api-list",
+        supported: true
+      },
+      apiKey,
+      normalizedUrl,
+      headers
+    );
+  }
+  if (fetched.error || fetched.models.length === 0) {
+    return { added: false, error: fetched.error ?? "No models returned.", hint: fetched.hint };
+  }
+  const result = await withProviderMutationLock(CUSTOM_PROVIDER_ALLOCATION_SLOT, async () => {
+    const providerId = await withRegistryWriteLock(
+      () => uniqueProviderId(displayName, loadRegistryStrict())
+    );
+    const account = `provider:${providerId}`;
+    const authRef = anonymous ? "none:anonymous" : credentialInstanceAuthRef(account);
+    const persistAndCommit = async () => {
+      if (!anonymous) {
+        await journalCredentialWrite(authRef);
+        const saved = await provisionProviderCredential(authRef, apiKey);
+        if (!saved) {
+          return {
+            added: false,
+            error: "Could not save API key to the credential store.",
+            hint: "Check credential-store access and try again."
+          };
+        }
+      }
+      return withRegistryWriteLock(async () => {
+        const registry = loadRegistryStrict();
+        if (registry.providers.some((provider) => provider.id === providerId)) {
+          return {
+            added: false,
+            error: `Provider ID ${providerId} changed while its credential was being saved.`,
+            hint: "Retry adding the custom provider."
+          };
+        }
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const entry = {
+          id: providerId,
+          templateId: input.kind === "anthropic" ? "custom-anthropic" : "custom-openai",
+          name: displayName,
+          enabled: true,
+          authRef,
+          authType: anonymous ? "none" : "api",
+          api: { npm, url: fetched.baseUrl, ...headers ? { headers } : {} },
+          addedAt: now,
+          refreshedAt: now,
+          modelsCache: {
+            fetchedAt: now,
+            models: fetched.models.map((m) => ({
+              ...m,
+              modelFormat: modelFormatForKind(input.kind),
+              npm,
+              apiUrl: fetched.baseUrl
+            }))
+          }
+        };
+        registry.providers.push(entry);
+        saveRegistry(registry);
+        let credentialCleanupPending = false;
+        if (!anonymous) {
+          try {
+            await cancelCredentialDelete(authRef);
+          } catch {
+            credentialCleanupPending = true;
+          }
+        }
+        return {
+          added: true,
+          provider: entry,
+          modelCount: fetched.models.length,
+          ...credentialCleanupPending ? { credentialCleanupPending: true } : {}
+        };
+      });
+    };
+    if (anonymous) return persistAndCommit();
+    return withCredentialMutationLock(authRef, persistAndCommit);
+  });
+  if (result.added) {
+    try {
+      const cleanup = await reconcilePendingCredentialDeletes();
+      result.credentialCleanupPending = cleanup.pending.length > 0 || cleanup.persistenceError !== void 0;
+    } catch {
+      result.credentialCleanupPending = true;
+    }
+  } else {
+    try {
+      const cleanup = await reconcilePendingCredentialDeletes();
+      result.credentialCleanupPending = cleanup.pending.length > 0 || cleanup.persistenceError !== void 0;
+    } catch {
+      result.credentialCleanupPending = true;
+    }
+  }
+  result.credentialCleanupReconciled = true;
+  return result;
+}
+
+// src/providers-custom-add.ts
+async function runCustomEndpointAddFlow(onResult) {
+  const displayName = await p3.text({
+    message: "Name for this provider:",
+    placeholder: "OpenRouter",
+    validate: (value) => value.trim() ? void 0 : "Name is required"
+  });
+  if (p3.isCancel(displayName)) {
+    p3.cancel("Cancelled.");
+    return 0;
+  }
+  const baseUrl = await p3.text({
+    message: "Base URL of the OpenAI-compatible API (the part before /chat/completions):",
+    placeholder: "https://openrouter.ai/api/v1",
+    validate: (value) => value.trim() ? void 0 : "URL is required"
+  });
+  if (p3.isCancel(baseUrl)) {
+    p3.cancel("Cancelled.");
+    return 0;
+  }
+  let allowInsecureLocal = false;
+  if (/^http:\/\//i.test(String(baseUrl).trim())) {
+    p3.log.warn("HTTP is not encrypted. Only use it for a trusted local or LAN server.");
+    const allow = await p3.confirm({
+      message: "Allow insecure HTTP for this local/LAN server?",
+      initialValue: true
+    });
+    if (p3.isCancel(allow)) {
+      p3.cancel("Cancelled.");
+      return 0;
+    }
+    allowInsecureLocal = allow === true;
+  }
+  const apiKey = await p3.password({
+    message: "API key (leave empty for a local server without auth):"
+  });
+  if (p3.isCancel(apiKey)) {
+    p3.cancel("Cancelled.");
+    return 0;
+  }
+  const spinner6 = p3.spinner();
+  spinner6.start("Testing connection...");
+  const result = await addCustomEndpointProvider({
+    displayName: String(displayName).trim(),
+    baseUrl: String(baseUrl).trim(),
+    apiKey: String(apiKey ?? "").trim(),
+    kind: "openai",
+    allowInsecureLocal
+  });
+  spinner6.stop("");
+  onResult(result);
+  if (!result.added || !result.provider) {
+    p3.log.error(printableServerText(result.error ?? "Could not add the provider."));
+    const hint = printableServerText(result.hint ?? "");
+    if (hint) p3.log.info(hint);
+    return 1;
+  }
+  logConnected(result.provider.name, result.modelCount ?? 0);
+  p3.log.info(`Provider id: ${result.provider.id}. Its models are named clodex:${result.provider.id}:<model>.`);
+  return 0;
+}
+
+// src/registry/crud.ts
+async function removeProviderWithinLifecycle(id, opts) {
+  const removal = await withRegistryWriteLock(async () => {
+    const registry = loadRegistryStrict();
+    const index = registry.providers.findIndex((p14) => p14.id === id);
+    if (index < 0) {
+      return {
+        result: {
+          removed: false,
+          id,
+          credentialDeleted: false,
+          error: `Provider not found: ${id}`
+        },
+        queuedRefs: []
+      };
+    }
+    const [removedProvider] = registry.providers.splice(index, 1);
+    const queuedRefs = [];
+    if (opts?.deleteCredential !== false) {
+      const credentialRefs = /* @__PURE__ */ new Set([
+        removedProvider.authRef,
+        ...removedProvider.defaultAuthRef ? [removedProvider.defaultAuthRef] : [],
+        ...Object.values(removedProvider.authAccounts ?? {}).map((slot) => slot.authRef)
+      ]);
+      for (const authRef of credentialRefs) {
+        if (await queueCredentialDelete(authRef)) queuedRefs.push(authRef);
+      }
+    }
+    saveRegistry(registry);
+    return {
+      result: {
+        removed: true,
+        id,
+        name: removedProvider.name,
+        credentialDeleted: false
+      },
+      queuedRefs
+    };
+  });
+  if (removal.queuedRefs.length > 0) {
+    try {
+      const cleanup = await reconcilePendingCredentialDeletes();
+      removal.result.credentialDeleted = removal.queuedRefs.every((ref) => cleanup.deleted.includes(ref));
+      removal.result.credentialCleanupPending = removal.queuedRefs.some((ref) => cleanup.pending.includes(ref)) || cleanup.persistenceError !== void 0;
+    } catch {
+      removal.result.credentialCleanupPending = true;
+    }
+    removal.result.credentialCleanupReconciled = true;
+  }
+  return removal.result;
+}
+async function removeProviderFromRegistry(id, opts) {
+  return withProviderMutationLock(id, () => removeProviderWithinLifecycle(id, opts));
+}
+async function setActiveOAuthAccount(id, account) {
+  return withProviderMutationLock(id, () => withRegistryWriteLock(() => {
+    const registry = loadRegistryStrict();
+    const provider = registry.providers.find((p14) => p14.id === id);
+    if (!provider) return { updated: false, error: `Provider not found: ${id}` };
+    const name = account?.trim().toLowerCase();
+    const previous = provider.activeAuthAccount?.trim() || void 0;
+    const selectedSlot = name ? getOAuthAccountSlot(provider, name) : void 0;
+    let selectionChanged = previous !== name;
+    let storageChanged = false;
+    if (name && !selectedSlot) {
+      const slots = provider.authAccounts ?? {};
+      const available = Object.keys(slots).sort().join(", ") || "none";
+      return {
+        updated: false,
+        error: `${provider.name} has no account named "${name}" (available: ${available}).`
+      };
+    }
+    if (name && provider.authType === "oauth") {
+      storageChanged = storeActiveOAuthAccount(provider, name, selectedSlot.authRef);
+    }
+    if (selectionChanged && provider.authType === "oauth") {
+      const previousSlot = previous ? getOAuthAccountSlot(provider, previous) : void 0;
+      if (previous && previousSlot && provider.modelsCache && provider.authAccounts) {
+        provider.authAccounts[previous] = {
+          ...previousSlot,
+          modelsCache: provider.modelsCache
+        };
+      }
+      const selectedCache = selectedSlot?.modelsCache;
+      if (selectedCache) {
+        provider.modelsCache = selectedCache;
+        provider.refreshedAt = selectedCache.fetchedAt;
+      } else {
+        delete provider.modelsCache;
+        delete provider.refreshedAt;
+      }
+    }
+    if (name && provider.authType !== "oauth") {
+      storageChanged = clearActiveOAuthAccount(provider) || storageChanged;
+      if (provider.activeAuthAccount !== name) {
+        provider.activeAuthAccount = name;
+        storageChanged = true;
+      }
+    } else if (!name && (previous !== void 0 || provider.defaultAuthRef !== void 0)) {
+      storageChanged = clearActiveOAuthAccount(provider);
+    } else if (!name) {
+      selectionChanged = false;
+    }
+    const migrationNeedsPersistence = registry.schemaVersion < REGISTRY_SCHEMA_VERSION_WITH_MATERIALIZED_ACTIVE_ACCOUNT && provider.defaultAuthRef !== void 0;
+    if (selectionChanged || storageChanged || migrationNeedsPersistence) saveRegistry(registry);
+    return { updated: true, changed: selectionChanged, ...name ? { account: name } : {}, provider };
+  }));
+}
+function toggleProviderEnabled(id) {
+  return withRegistryWriteLockSync(() => {
+    const registry = loadRegistryStrict();
+    const provider = registry.providers.find((p14) => p14.id === id);
+    if (!provider) return { toggled: false, error: `Provider not found: ${id}` };
+    provider.enabled = !provider.enabled;
+    saveRegistry(registry);
+    return { toggled: true, enabled: provider.enabled };
+  });
+}
+
+// src/registry/refresh-models.ts
+import { isDeepStrictEqual } from "util";
 
 // src/registry/model-source.ts
 var MANUAL_ONLY_TEMPLATE_IDS = /* @__PURE__ */ new Set(["vertex", "bedrock", "azure"]);
@@ -16184,7 +16480,7 @@ async function refreshApiListProvider(provider, apiKey) {
   };
 }
 function updateProviderCache(registry, providerId, models, baseUrl, credentialSnapshot) {
-  const idx = registry.providers.findIndex((p13) => p13.id === providerId);
+  const idx = registry.providers.findIndex((p14) => p14.id === providerId);
   if (idx < 0) return;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const existing = registry.providers[idx];
@@ -16255,7 +16551,7 @@ function assertRefreshCredentialStillCurrent(current, snapshot) {
 }
 async function refreshProviderModels(providerId, apiKey, registry, credentialSnapshot) {
   const workingRegistry = registry ?? loadRegistryStrict();
-  const provider = workingRegistry.providers.find((p13) => p13.id === providerId);
+  const provider = workingRegistry.providers.find((p14) => p14.id === providerId);
   if (!provider) {
     return { id: providerId, name: providerId, ok: false, reason: "Provider not found." };
   }
@@ -16470,7 +16766,7 @@ async function refreshProviderModelsWithCredential(providerId, resolveKey, selec
 async function refreshAllProviderModels(resolveKey) {
   const refreshed = [];
   const registry = loadRegistryStrict();
-  const enabledProviders = registry.providers.filter((p13) => p13.enabled);
+  const enabledProviders = registry.providers.filter((p14) => p14.enabled);
   for (const provider of enabledProviders) {
     const accountOverride = process.env[OAUTH_ACCOUNT_ENV] ?? null;
     try {
@@ -16494,7 +16790,7 @@ async function refreshAllProviderModels(resolveKey) {
 
 // src/registry/provider-auth.ts
 import pc4 from "picocolors";
-import * as p3 from "@clack/prompts";
+import * as p4 from "@clack/prompts";
 import open from "open";
 function validateOAuthAccountName(name) {
   const trimmed = name.trim().toLowerCase();
@@ -16517,39 +16813,39 @@ function openBrowser(url) {
 async function runNativeDeviceCode(providerId) {
   const label = PROVIDER_DISPLAY[providerId];
   printOAuthStepsPanel(`${label} \u2014 Sign in`, label);
-  const spinner5 = p3.spinner();
-  spinner5.start("Waiting for authorization...");
+  const spinner6 = p4.spinner();
+  spinner6.start("Waiting for authorization...");
   try {
     const { tokens, accountId } = await runOpenAiDeviceCodeFlow(({ url, userCode }) => {
-      spinner5.stop("");
-      p3.log.info(`Visit: ${pc4.cyan(url)}`);
-      p3.log.info(`Enter code: ${pc4.bold(userCode)}`);
+      spinner6.stop("");
+      p4.log.info(`Visit: ${pc4.cyan(url)}`);
+      p4.log.info(`Enter code: ${pc4.bold(userCode)}`);
       openBrowser(url);
-      spinner5.start("Waiting for authorization...");
+      spinner6.start("Waiting for authorization...");
     });
-    spinner5.stop(pc4.green("Signed in to OpenAI ChatGPT"));
+    spinner6.stop(pc4.green("Signed in to OpenAI ChatGPT"));
     return tokensToStoredCredential(tokens, void 0, accountId);
   } catch (err) {
-    spinner5.stop("");
+    spinner6.stop("");
     throw err;
   }
 }
 async function runNativeBrowserSignIn(providerId) {
   const label = PROVIDER_DISPLAY[providerId];
   printOAuthBrowserPanel(`${label} \u2014 Sign in`, label);
-  const spinner5 = p3.spinner();
-  spinner5.start("Opening your browser...");
+  const spinner6 = p4.spinner();
+  spinner6.start("Opening your browser...");
   try {
     const { tokens, accountId } = await runOpenAiBrowserFlow(({ url }) => {
-      spinner5.stop("");
-      p3.log.info(`If the browser did not open, visit: ${pc4.cyan(url)}`);
+      spinner6.stop("");
+      p4.log.info(`If the browser did not open, visit: ${pc4.cyan(url)}`);
       openBrowser(url);
-      spinner5.start("Waiting for sign-in in your browser...");
+      spinner6.start("Waiting for sign-in in your browser...");
     });
-    spinner5.stop(pc4.green("Signed in to OpenAI ChatGPT"));
+    spinner6.stop(pc4.green("Signed in to OpenAI ChatGPT"));
     return tokensToStoredCredential(tokens, void 0, accountId);
   } catch (err) {
-    spinner5.stop("");
+    spinner6.stop("");
     throw err;
   }
 }
@@ -16758,7 +17054,7 @@ async function authenticateProvider(providerId, options = {}) {
   }
   const cred = options.method === "browser" ? await runNativeBrowserSignIn(providerId) : await runNativeDeviceCode(providerId);
   const persisted = await persistNativeOAuthCredential(providerId, cred, accountName);
-  const refreshSpinner = p3.spinner();
+  const refreshSpinner = p4.spinner();
   refreshSpinner.start("Refreshing model list...");
   try {
     const accountOverride = accountName ?? (persisted.registryProvider.activeAuthAccount === void 0 ? null : process.env[OAUTH_ACCOUNT_ENV] ?? null);
@@ -16813,7 +17109,7 @@ ${pc4.bold("Named accounts:")}
 }
 
 // src/prompts.ts
-import * as p4 from "@clack/prompts";
+import * as p5 from "@clack/prompts";
 import pc5 from "picocolors";
 
 // src/model-search.ts
@@ -16922,12 +17218,12 @@ async function pickModelFromPagedList(list, toOption, messagePrefix, initialMode
       options.push(navOption(SWITCH_SEARCH, "\u2190 New search", ""));
     }
     const initialValue = (initialModelId && pageItems.some((m) => m.id === initialModelId) ? initialModelId : pageItems[0]?.id) ?? options[0]?.value;
-    const picked = await p4.select({
+    const picked = await p5.select({
       message: `${messagePrefix} (page ${currentPage + 1} of ${totalPages})`,
       options,
       initialValue
     });
-    if (p4.isCancel(picked)) return "menu";
+    if (p5.isCancel(picked)) return "menu";
     const choice = String(picked);
     if (choice === PAGE_PREV) {
       page = currentPage - 1;
@@ -16948,7 +17244,7 @@ async function selectLargeCatalog(models, browseList, toOption, message, initial
   let mode = "choose";
   while (true) {
     if (mode === "choose") {
-      const method = await p4.select({
+      const method = await p5.select({
         message: `${message} (${models.length} available)`,
         options: [
           { value: MODE_SEARCH, label: pc5.cyan("Search models"), hint: "Filter by name, id, or brand" },
@@ -16960,7 +17256,7 @@ async function selectLargeCatalog(models, browseList, toOption, message, initial
           navOption("__back__", "\u2190 Go back", "Select a different provider")
         ]
       });
-      if (p4.isCancel(method) || String(method) === "__back__") {
+      if (p5.isCancel(method) || String(method) === "__back__") {
         return "back";
       }
       mode = method === MODE_BROWSE ? "browse" : "search";
@@ -16985,17 +17281,17 @@ async function selectLargeCatalog(models, browseList, toOption, message, initial
       if (isSelectedModel(picked)) return picked;
       continue;
     }
-    const searchInput = await p4.text({
+    const searchInput = await p5.text({
       message: `Search models (${models.length} available):`,
       placeholder: "e.g. claude, sonnet, llama"
     });
-    if (p4.isCancel(searchInput)) {
+    if (p5.isCancel(searchInput)) {
       mode = "choose";
       continue;
     }
     const matched = filterModelsBySearch(browseList, String(searchInput));
     if (matched.length === 0) {
-      p4.log.warn("No models match \u2014 try a different search");
+      p5.log.warn("No models match \u2014 try a different search");
       continue;
     }
     const result = await pickModelFromPagedList(
@@ -17026,12 +17322,12 @@ async function selectModelWithSearch(models, toOption, message, initialModelId,
       navOption("__back__", "\u2190 Go back", "")
     ];
     const initialValue = initialModelId && options.some((o) => o.value === initialModelId) ? initialModelId : options[0]?.value;
-    const picked = await p4.select({
+    const picked = await p5.select({
       message,
       options,
       initialValue
     });
-    if (p4.isCancel(picked) || String(picked) === "__back__") {
+    if (p5.isCancel(picked) || String(picked) === "__back__") {
       return "back";
     }
     const selected = models.find((m) => m.id === String(picked));
@@ -17065,12 +17361,12 @@ async function pickLocalModel(provider, conflicts, prefs) {
         navOption(BROWSE_ALL, "Browse all models \u2192", `${provider.models.length} available`),
         navOption("__back__", "\u2190 Go back", "Select a different provider")
       ];
-      const picked = await p4.select({
+      const picked = await p5.select({
         message: "Which model?",
         options,
         initialValue: recentModels[0].id
       });
-      if (p4.isCancel(picked) || String(picked) === "__back__") {
+      if (p5.isCancel(picked) || String(picked) === "__back__") {
         return "back";
       }
       if (String(picked) === BROWSE_ALL) {
@@ -17097,12 +17393,12 @@ async function pickLocalModel(provider, conflicts, prefs) {
   }
   noteEnvConflicts(conflicts);
   const modelLabel = formatModelLabel(selectedModel);
-  const confirmed = await p4.confirm({
+  const confirmed = await p5.confirm({
     message: confirmLaunchMessage("Claude Code", modelLabel, selectedModel.id, provider.name),
     initialValue: true
   });
-  if (p4.isCancel(confirmed) || !confirmed) {
-    p4.cancel("Cancelled.");
+  if (p5.isCancel(confirmed) || !confirmed) {
+    p5.cancel("Cancelled.");
     return null;
   }
   relayOutro("Launching", fmtModel(modelLabel, selectedModel.id));
@@ -17118,7 +17414,7 @@ function reportCredentialCleanup(pending, state, reconciled = false) {
     return;
   }
   if (pending) {
-    p5.log.warn(CREDENTIAL_CLEANUP_PENDING_MESSAGE);
+    p6.log.warn(CREDENTIAL_CLEANUP_PENDING_MESSAGE);
   }
 }
 async function reconcileCredentialCleanup() {
@@ -17208,7 +17504,7 @@ ${pc6.bold("Usage:")}
 
 ${pc6.bold("Subcommands:")}
   (none)      Provider hub wizard
-  add         Add a built-in provider or sign in with ChatGPT
+  add         Add a built-in provider, a custom OpenAI-compatible server, or sign in with ChatGPT
   auth        Sign in with ChatGPT/Codex-plan OAuth (device code, or --browser)
   list        Show configured providers
   remove      Remove a provider by id
@@ -17335,7 +17631,7 @@ function providerLabel(name, modelCount, enabled) {
   return `${fmtEnabledStar(enabled)} ${fmtProvider(name)} ${pc6.dim(`(${modelCount} model${modelCount === 1 ? "" : "s"})`)}`;
 }
 async function promptOAuthMethod() {
-  const choice = await p5.select({
+  const choice = await p6.select({
     message: "How do you want to sign in?",
     initialValue: "native",
     options: [
@@ -17343,8 +17639,8 @@ async function promptOAuthMethod() {
       { value: "browser", label: "Browser", hint: "for workspaces that disable device code authorization" }
     ]
   });
-  if (p5.isCancel(choice)) {
-    p5.cancel("Cancelled.");
+  if (p6.isCancel(choice)) {
+    p6.cancel("Cancelled.");
     return null;
   }
   return choice;
@@ -17353,17 +17649,17 @@ async function runProvidersAuthWithCleanupState(providerId, method, cleanupState
   try {
     const result = await authenticateProvider(providerId, { method, account });
     const slot = account === void 0 ? void 0 : validateOAuthAccountName(account);
-    p5.log.success(
+    p6.log.success(
       slot ? `Signed in to ${result.registryProvider.name} (account "${slot}") \u2014 make it the account every launch uses with: clodex providers` : `Signed in to ${result.registryProvider.name} \u2014 credential saved to the credential store.`
     );
     reportCredentialCleanup(result.credentialCleanupPending, cleanupState, true);
     return 0;
   } catch (err) {
     if (err instanceof Error && err.message === "Cancelled") {
-      p5.cancel("Cancelled.");
+      p6.cancel("Cancelled.");
       return 0;
     }
-    p5.log.error(err instanceof Error ? err.message : String(err));
+    p6.log.error(err instanceof Error ? err.message : String(err));
     return 1;
   }
 }
@@ -17374,13 +17670,13 @@ async function runProvidersRefreshModels(providerId, options = {}) {
   const resolveKey = async (provider) => resolveProviderCredentialWithSource(provider.id, provider.authRef);
   if (providerId) {
     const registry = loadRegistry();
-    const provider = registry.providers.find((p13) => p13.id === providerId);
+    const provider = registry.providers.find((p14) => p14.id === providerId);
     if (!provider) {
-      p5.log.error(`Provider not found: ${providerId}`);
+      p6.log.error(`Provider not found: ${providerId}`);
       return 1;
     }
-    const spinner6 = p5.spinner();
-    spinner6.start(`Refreshing ${provider.name}...`);
+    const spinner7 = p6.spinner();
+    spinner7.start(`Refreshing ${provider.name}...`);
     const accountOverride = options.accountOverride === void 0 ? process.env[OAUTH_ACCOUNT_ENV] ?? null : options.accountOverride;
     let result;
     try {
@@ -17396,59 +17692,59 @@ async function runProvidersRefreshModels(providerId, options = {}) {
         { ignoreProviderOverride: options.ignoreProviderCredentialOverride }
       );
     } catch (err) {
-      spinner6.stop("");
-      p5.log.error(err instanceof Error ? err.message : String(err));
+      spinner7.stop("");
+      p6.log.error(err instanceof Error ? err.message : String(err));
       return 1;
     }
-    spinner6.stop("");
+    spinner7.stop("");
     if (result.skipped) {
       const countNote = result.modelCount ? ` (${result.modelCount} cached models kept)` : "";
-      p5.log.warn(`${result.name}: ${result.reason}${countNote}`);
+      p6.log.warn(`${result.name}: ${result.reason}${countNote}`);
       return 0;
     }
     if (!result.ok) {
-      p5.log.error(`${result.name}: ${result.reason ?? "Refresh failed."}`);
+      p6.log.error(`${result.name}: ${result.reason ?? "Refresh failed."}`);
       return 1;
     }
     const diff = result.previousModelCount === void 0 ? 0 : (result.modelCount ?? 0) - result.previousModelCount;
     const diffStr = result.previousModelCount === void 0 ? "" : diff > 0 ? ` (+${diff})` : diff < 0 ? ` (${diff})` : "";
-    p5.log.success(`${result.name}: ${result.modelCount} model${result.modelCount === 1 ? "" : "s"} updated${diffStr}.`);
+    p6.log.success(`${result.name}: ${result.modelCount} model${result.modelCount === 1 ? "" : "s"} updated${diffStr}.`);
     if (result.reason) {
-      p5.log.warn(result.reason);
+      p6.log.warn(result.reason);
     }
     return 0;
   }
-  const spinner5 = p5.spinner();
-  spinner5.start("Refreshing model lists...");
+  const spinner6 = p6.spinner();
+  spinner6.start("Refreshing model lists...");
   const { refreshed } = await refreshAllProviderModels(resolveKey);
-  spinner5.stop("");
+  spinner6.stop("");
   const ok = refreshed.filter((r) => r.ok && !r.skipped);
   const skipped = refreshed.filter((r) => r.skipped);
   const failed = refreshed.filter((r) => !r.ok);
   if (ok.length > 0) {
-    p5.log.success(`Updated ${ok.length} provider${ok.length === 1 ? "" : "s"}.`);
+    p6.log.success(`Updated ${ok.length} provider${ok.length === 1 ? "" : "s"}.`);
     for (const r of ok) {
       const diff = r.previousModelCount === void 0 ? 0 : (r.modelCount ?? 0) - r.previousModelCount;
       const diffStr = r.previousModelCount === void 0 ? "" : diff > 0 ? ` (+${diff})` : diff < 0 ? ` (${diff})` : "";
-      p5.log.info(`  ${r.name}: ${r.modelCount} model${r.modelCount === 1 ? "" : "s"}${diffStr}`);
+      p6.log.info(`  ${r.name}: ${r.modelCount} model${r.modelCount === 1 ? "" : "s"}${diffStr}`);
       if (r.reason) {
-        p5.log.warn(`  ${r.reason}`);
+        p6.log.warn(`  ${r.reason}`);
       }
     }
   }
   for (const r of skipped) {
     const countNote = r.modelCount ? ` (${r.modelCount} cached models kept)` : "";
-    p5.log.warn(`Skipped ${r.name}: ${r.reason}${countNote}`);
+    p6.log.warn(`Skipped ${r.name}: ${r.reason}${countNote}`);
   }
   for (const r of failed) {
-    p5.log.error(`${r.name}: ${r.reason ?? "Refresh failed."}`);
+    p6.log.error(`${r.name}: ${r.reason ?? "Refresh failed."}`);
   }
   return failed.length > 0 ? 1 : 0;
 }
 async function runProvidersList() {
   const entries = await resolveProvidersForDisplay();
   if (entries.length === 0) {
-    p5.log.info("No providers configured. Run clodex providers add or clodex providers auth openai.");
+    p6.log.info("No providers configured. Run clodex providers add or clodex providers auth openai.");
     return 0;
   }
   console.log("");
@@ -17469,7 +17765,7 @@ async function runTemplateAddFlow(templateId, cleanupState) {
   const template = listRegistryAddableTemplates(registry.providers).find((candidate) => candidate.id === templateId);
   if (!template) {
     const known = getTemplateById(templateId);
-    p5.log.info(known ? `${known.name} is already configured.` : `Unknown provider template: ${templateId}`);
+    p6.log.info(known ? `${known.name} is already configured.` : `Unknown provider template: ${templateId}`);
     return known ? 0 : 1;
   }
   if (template.signupUrl) {
@@ -17477,27 +17773,27 @@ async function runTemplateAddFlow(templateId, cleanupState) {
       `${pc6.white("Get an API key at:")} ${fmtUrl(template.signupUrl)}`
     ]);
   }
-  const apiKeyInput = await p5.password({
+  const apiKeyInput = await p6.password({
     message: `Paste your ${template.name} API key:`,
     validate: (val) => val.trim() ? void 0 : "Key cannot be empty"
   });
-  if (p5.isCancel(apiKeyInput)) {
-    p5.cancel("Cancelled.");
+  if (p6.isCancel(apiKeyInput)) {
+    p6.cancel("Cancelled.");
     return 0;
   }
   const apiKey = String(apiKeyInput).trim();
-  const spinner5 = p5.spinner();
-  spinner5.start(`Testing connection to ${template.name}...`);
+  const spinner6 = p6.spinner();
+  spinner6.start(`Testing connection to ${template.name}...`);
   const result = await addProviderFromTemplate(template, apiKey);
-  spinner5.stop("");
+  spinner6.stop("");
   reportCredentialCleanup(
     result.credentialCleanupPending === true,
     cleanupState,
     result.credentialCleanupReconciled === true
   );
   if (!result.added) {
-    p5.log.error(result.error ?? "Could not add provider.");
-    if (result.hint) p5.log.info(result.hint);
+    p6.log.error(result.error ?? "Could not add provider.");
+    if (result.hint) p6.log.info(result.hint);
     return 1;
   }
   logConnected(template.name, result.modelCount ?? 0);
@@ -17521,16 +17817,17 @@ async function runProvidersAddWithCleanupState(cleanupState) {
       hint: template.id === "openai" ? "platform.openai.com key (usage-billed)" : "provider API key (usage-billed)"
     });
   }
-  if (options.length === 0) {
-    p5.log.info("All built-in providers are already configured.");
-    return 0;
-  }
-  const choice = await p5.select({
+  options.push({
+    value: "custom",
+    label: "Custom OpenAI-compatible server",
+    hint: "OpenRouter, Together, LM Studio, vLLM \u2014 any base URL"
+  });
+  const choice = await p6.select({
     message: "Add a provider",
     options
   });
-  if (p5.isCancel(choice)) {
-    p5.cancel("Cancelled.");
+  if (p6.isCancel(choice)) {
+    p6.cancel("Cancelled.");
     return 0;
   }
   if (choice === "oauth") {
@@ -17538,6 +17835,13 @@ async function runProvidersAddWithCleanupState(cleanupState) {
     if (method === null) return 0;
     return runProvidersAuthWithCleanupState("openai", method, cleanupState);
   }
+  if (choice === "custom") {
+    return runCustomEndpointAddFlow((result) => reportCredentialCleanup(
+      result.credentialCleanupPending === true,
+      cleanupState,
+      result.credentialCleanupReconciled === true
+    ));
+  }
   if (typeof choice === "string" && choice.startsWith("api:")) {
     return runTemplateAddFlow(choice.slice("api:".length), cleanupState);
   }
@@ -17550,16 +17854,16 @@ async function runProvidersRemoveWithCleanupState(id, interactive = false, clean
   const registry = loadRegistry();
   const provider = registry.providers.find((pr) => pr.id === id);
   if (!provider) {
-    p5.log.error(`Provider not found: ${id}`);
+    p6.log.error(`Provider not found: ${id}`);
     return 1;
   }
   if (interactive) {
-    const confirm6 = await p5.confirm({
+    const confirm7 = await p6.confirm({
       message: `Remove ${provider.name} (${id})?`,
       initialValue: false
     });
-    if (p5.isCancel(confirm6) || !confirm6) {
-      p5.cancel("Cancelled.");
+    if (p6.isCancel(confirm7) || !confirm7) {
+      p6.cancel("Cancelled.");
       return 0;
     }
   }
@@ -17570,16 +17874,16 @@ async function runProvidersRemoveWithCleanupState(id, interactive = false, clean
     result.credentialCleanupReconciled === true
   );
   if (!result.removed) {
-    p5.log.error(result.error ?? `Could not remove ${id}`);
+    p6.log.error(result.error ?? `Could not remove ${id}`);
     return 1;
   }
   if (result.error) {
-    p5.log.error(result.error);
+    p6.log.error(result.error);
     return 1;
   }
-  p5.log.success(`Removed ${result.name ?? id}.`);
+  p6.log.success(`Removed ${result.name ?? id}.`);
   if (result.credentialDeleted) {
-    p5.log.info("Provider API key removed from the credential store.");
+    p6.log.info("Provider API key removed from the credential store.");
   }
   return 0;
 }
@@ -17654,11 +17958,11 @@ async function runProviderDetail(id) {
     { value: "remove", label: "Remove provider", hint: "Delete from registry and credential store when safe" },
     { value: "back", label: "Back", hint: "" }
   );
-  const action = await p5.select({
+  const action = await p6.select({
     message: "What would you like to do?",
     options: detailOptions
   });
-  if (p5.isCancel(action) || action === "back") return "back";
+  if (p6.isCancel(action) || action === "back") return "back";
   if (action === "browse") {
     const cachedModels = projectProviderCachedModels(modelProvider);
     const localModels = cachedModels.map((m) => cachedModelToLocal(m, modelProvider)).filter((m) => m !== null);
@@ -17685,7 +17989,7 @@ async function runProviderDetail(id) {
     const providerDefault = "<default>";
     const stored = provider.activeAuthAccount;
     const current = stored !== void 0 && accountSlots.includes(stored) ? stored : providerDefault;
-    const chosen = await p5.select({
+    const chosen = await p6.select({
       message: "Which account should every launch use?",
       initialValue: current,
       options: [
@@ -17701,15 +18005,15 @@ async function runProviderDetail(id) {
         }))
       ]
     });
-    if (p5.isCancel(chosen)) return "back";
+    if (p6.isCancel(chosen)) return "back";
     return withProviderMutationLock(id, async () => {
       const result = await setActiveOAuthAccount(id, chosen === providerDefault ? void 0 : chosen);
       if (!result.updated) {
-        p5.log.error(result.error ?? "Could not switch account.");
+        p6.log.error(result.error ?? "Could not switch account.");
         return "back";
       }
       if (!result.provider) {
-        p5.log.error("Account selection was saved, but the resulting provider state could not be read.");
+        p6.log.error("Account selection was saved, but the resulting provider state could not be read.");
         return "back";
       }
       const refreshExitCode = await runProvidersRefreshModels(id, {
@@ -17718,7 +18022,7 @@ async function runProviderDetail(id) {
       });
       const currentProvider = loadRegistry().providers.find((candidate) => candidate.id === id);
       if (!currentProvider) {
-        p5.log.error("Account selection was saved, but the resulting provider state could not be read.");
+        p6.log.error("Account selection was saved, but the resulting provider state could not be read.");
         return "back";
       }
       const outcome = accountSwitchOutcome(
@@ -17730,26 +18034,26 @@ async function runProviderDetail(id) {
       if (outcome.ok && currentProvider.enabled && currentProvider.authType === "oauth" && (refreshExitCode !== 0 || !selectedCatalogReady)) {
         const savedLabel = result.account ?? PROVIDER_DEFAULT_ACCOUNT_LABEL;
         const savedContext = outcome.confirmsLaunch ? `Saved ${savedLabel} for ${currentProvider.name}.` : outcome.message;
-        p5.log.warn(
+        p6.log.warn(
           `${savedContext} Automatic model refresh for the saved selection did not produce a usable catalog; choose Switch account again to retry it before relying on that selection for launches.`
         );
       } else if (outcome.ok) {
-        p5.log.success(outcome.message);
+        p6.log.success(outcome.message);
       } else {
-        p5.log.warn(outcome.message);
+        p6.log.warn(outcome.message);
       }
       const restartWarning = accountSwitchServerRestartWarning(
         readLiveServerRuntimeStates().length,
         result.changed
       );
-      if (restartWarning) p5.log.warn(restartWarning);
+      if (restartWarning) p6.log.warn(restartWarning);
       return "back";
     });
   }
   if (action === "toggle") {
     const result = toggleProviderEnabled(id);
     if (result.toggled) {
-      p5.log.success(`${provider.name} ${result.enabled ? "enabled" : "disabled"}.`);
+      p6.log.success(`${provider.name} ${result.enabled ? "enabled" : "disabled"}.`);
     }
     return "back";
   }
@@ -17785,11 +18089,11 @@ async function runProvidersHub() {
       options.push({ value: "refresh-all", label: "\u21BA Refresh all models", hint: "Update model lists for all providers" });
     }
     options.push({ value: "done", label: "Done", hint: "" });
-    const choice = await p5.select({
+    const choice = await p6.select({
       message: entries.length > 0 ? "Your providers" : "Get started",
       options
     });
-    if (p5.isCancel(choice) || choice === "done") {
+    if (p6.isCancel(choice) || choice === "done") {
       return 0;
     }
     if (choice === "add") {
@@ -17807,7 +18111,7 @@ async function runProvidersHub() {
       continue;
     }
     if (choice === "auth-account") {
-      const name = await p5.text({
+      const name = await p6.text({
         message: "Name for this account (choose which one launches with: clodex providers)",
         placeholder: "work",
         validate: (value) => {
@@ -17819,7 +18123,7 @@ async function runProvidersHub() {
           }
         }
       });
-      if (p5.isCancel(name)) continue;
+      if (p6.isCancel(name)) continue;
       const accountMethod = await promptOAuthMethod();
       if (accountMethod === null) continue;
       await runWithCredentialCleanup((state) => runProvidersAuthWithCleanupState("openai", accountMethod, state, String(name)));
@@ -17835,7 +18139,7 @@ async function runProvidersHub() {
 async function runProvidersCommand(args) {
   const parsed = parseProvidersArgs(args);
   if (parsed.error) {
-    p5.log.error(parsed.error);
+    p6.log.error(parsed.error);
     return 1;
   }
   if (parsed.showHelp && parsed.subcommand !== "auth") {
@@ -17872,7 +18176,7 @@ async function needsFirstRunSetup() {
 }
 async function runFirstRunWizard(_trace = false) {
   printWelcomePanel();
-  const choice = await p6.select({
+  const choice = await p7.select({
     message: "How do you want to connect to OpenAI?",
     options: [
       {
@@ -17887,8 +18191,8 @@ async function runFirstRunWizard(_trace = false) {
       }
     ]
   });
-  if (p6.isCancel(choice)) {
-    p6.cancel("Cancelled.");
+  if (p7.isCancel(choice)) {
+    p7.cancel("Cancelled.");
     return "cancel";
   }
   let code;
@@ -17901,14 +18205,14 @@ async function runFirstRunWizard(_trace = false) {
   }
   if (code !== 0) return "cancel";
   if (await needsFirstRunSetup()) return "cancel";
-  p6.log.success("OpenAI provider ready \u2014 picking a model next.");
+  p7.log.success("OpenAI provider ready \u2014 picking a model next.");
   return "continue";
 }
 
 // src/server/index.ts
 import pc11 from "picocolors";
 import { networkInterfaces as networkInterfaces2 } from "os";
-import * as p10 from "@clack/prompts";
+import * as p11 from "@clack/prompts";
 
 // src/target-compatibility.ts
 function blacklistAgentForTarget(target) {
@@ -17946,10 +18250,10 @@ function providersForTarget(providers, target) {
 }
 
 // src/server/prompts.ts
-import * as p7 from "@clack/prompts";
+import * as p8 from "@clack/prompts";
 import pc8 from "picocolors";
 async function askServerStartMode() {
-  const mode = await p7.select({
+  const mode = await p8.select({
     message: "How do you want to start the server?",
     options: [
       { value: "configure", label: pc8.cyan("Configure & start"), hint: "Providers, discovery masking, listen mode" },
@@ -17957,37 +18261,37 @@ async function askServerStartMode() {
     ],
     initialValue: "configure"
   });
-  if (p7.isCancel(mode)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(mode)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return mode;
 }
 async function askMaskGatewayIds(initialValue) {
-  const mask = await p7.confirm({
+  const mask = await p8.confirm({
     message: "Mask gateway model ids for discovery? (Needed for Claude Desktop / Cowork)",
     initialValue
   });
-  if (p7.isCancel(mask)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(mask)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return Boolean(mask);
 }
 async function askFavoritesOnly(initialValue) {
   printFavoritesOnlyPanel();
-  const favoritesOnly = await p7.confirm({
+  const favoritesOnly = await p8.confirm({
     message: "Expose only favorite models?",
     initialValue
   });
-  if (p7.isCancel(favoritesOnly)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(favoritesOnly)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return Boolean(favoritesOnly);
 }
 async function askListenMode() {
-  const mode = await p7.select({
+  const mode = await p8.select({
     message: "Where should the server listen?",
     options: [
       { value: "local", label: pc8.cyan("Local only"), hint: "Only this computer can use it" },
@@ -17995,26 +18299,26 @@ async function askListenMode() {
     ],
     initialValue: "local"
   });
-  if (p7.isCancel(mode)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(mode)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return mode;
 }
 async function askServerPassword() {
   printNetworkWarningPanel();
-  const password2 = await p7.text({
+  const password3 = await p8.text({
     message: "Choose a server password for this run:",
     validate: (value) => value.trim() ? void 0 : "Password cannot be empty"
   });
-  if (p7.isCancel(password2)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(password3)) {
+    p8.cancel("Cancelled.");
     return null;
   }
-  return String(password2).trim();
+  return String(password3).trim();
 }
 async function askUseSavedServerPassword() {
-  const choice = await p7.select({
+  const choice = await p8.select({
     message: "Use saved server password?",
     options: [
       { value: "use-saved", label: pc8.cyan("Use saved password") },
@@ -18022,19 +18326,19 @@ async function askUseSavedServerPassword() {
     ],
     initialValue: "use-saved"
   });
-  if (p7.isCancel(choice)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(choice)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return choice;
 }
 async function askSaveServerPassword() {
-  const save = await p7.confirm({
+  const save = await p8.confirm({
     message: "Save this server password for future server runs?",
     initialValue: false
   });
-  if (p7.isCancel(save)) {
-    p7.cancel("Cancelled.");
+  if (p8.isCancel(save)) {
+    p8.cancel("Cancelled.");
     return null;
   }
   return Boolean(save);
@@ -18042,7 +18346,7 @@ async function askSaveServerPassword() {
 
 // src/server/router.ts
 import { createServer as createServer2 } from "http";
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 
 // src/openai-adapter.ts
 import { tool as tool2, jsonSchema as jsonSchema2, streamText as streamText2, generateText as generateText2 } from "ai";
@@ -18148,24 +18452,24 @@ function translateOpenAiRequest(body, options) {
 async function collectOpenAiStream(stream) {
   const collected = { text: "", toolCalls: [], finishReason: void 0, usage: void 0 };
   for await (const part of stream) {
-    const p13 = part;
-    switch (p13.type) {
+    const p14 = part;
+    switch (p14.type) {
       case "text-delta":
-        collected.text += p13.textDelta ?? p13.text ?? "";
+        collected.text += p14.textDelta ?? p14.text ?? "";
         break;
       case "tool-call":
         collected.toolCalls.push({
-          toolCallId: p13.toolCallId ?? "",
-          toolName: p13.toolName ?? "",
-          input: p13.input
+          toolCallId: p14.toolCallId ?? "",
+          toolName: p14.toolName ?? "",
+          input: p14.input
         });
         break;
       case "finish":
-        collected.finishReason = p13.finishReason ?? collected.finishReason;
-        collected.usage = p13.totalUsage ?? p13.usage ?? collected.usage;
+        collected.finishReason = p14.finishReason ?? collected.finishReason;
+        collected.usage = p14.totalUsage ?? p14.usage ?? collected.usage;
         break;
       case "error":
-        throw p13.error instanceof Error || p13.error && typeof p13.error === "object" ? p13.error : new Error(typeof p13.error === "string" ? p13.error : "Upstream stream failed");
+        throw p14.error instanceof Error || p14.error && typeof p14.error === "object" ? p14.error : new Error(typeof p14.error === "string" ? p14.error : "Upstream stream failed");
     }
   }
   return collected;
@@ -18290,22 +18594,22 @@ async function streamOpenAiResponse(model, params, responseModelId, onChunk, opt
 
 `);
     for await (const part of watchOpenAiStream(stream, budget)) {
-      const p13 = part;
-      switch (p13.type) {
+      const p14 = part;
+      switch (p14.type) {
         case "text-delta":
-          send({ role: "assistant", content: p13.textDelta ?? p13.text ?? "" });
+          send({ role: "assistant", content: p14.textDelta ?? p14.text ?? "" });
           break;
         case "tool-input-start":
-          send({ role: "assistant", tool_calls: [{ index: 0, id: p13.id ?? p13.toolCallId, type: "function", function: { name: p13.toolName, arguments: "" } }] });
+          send({ role: "assistant", tool_calls: [{ index: 0, id: p14.id ?? p14.toolCallId, type: "function", function: { name: p14.toolName, arguments: "" } }] });
           break;
         case "tool-input-delta":
-          send({ tool_calls: [{ index: 0, function: { arguments: p13.delta ?? p13.text ?? p13.argsTextDelta ?? "" } }] });
+          send({ tool_calls: [{ index: 0, function: { arguments: p14.delta ?? p14.text ?? p14.argsTextDelta ?? "" } }] });
           break;
         case "finish":
-          send({}, p13.finishReason || "stop");
+          send({}, p14.finishReason || "stop");
           break;
         case "error":
-          throw p13.error instanceof Error || p13.error && typeof p13.error === "object" ? p13.error : new Error(typeof p13.error === "string" ? p13.error : "Upstream stream failed");
+          throw p14.error instanceof Error || p14.error && typeof p14.error === "object" ? p14.error : new Error(typeof p14.error === "string" ? p14.error : "Upstream stream failed");
       }
     }
     onChunk("data: [DONE]\n\n");
@@ -18458,7 +18762,7 @@ async function handleAnthropicMessages(req, res, options, modelCache, plog) {
     plog(`model not found: ${body.model}`);
     return;
   }
-  const requestId = randomUUID6();
+  const requestId = randomUUID8();
   const claudeSessionIdHeader = Array.isArray(req.headers["x-claude-code-session-id"]) ? req.headers["x-claude-code-session-id"][0] : req.headers["x-claude-code-session-id"];
   const claudeSessionId = extractClaudeSessionId(body, claudeSessionIdHeader);
   const claudeAgentIds = extractClaudeAgentIds(req.headers);
@@ -19039,7 +19343,7 @@ function summarizeServerProviders(models) {
 
 // src/server/provider-select.ts
 import pc9 from "picocolors";
-import * as p8 from "@clack/prompts";
+import * as p9 from "@clack/prompts";
 function isSelected(list, id) {
   return list.includes(id);
 }
@@ -19049,7 +19353,7 @@ function resolveInitialServerProviders(initial, available) {
 }
 async function selectServerProviders(available, initial) {
   if (available.length === 0) {
-    p8.log.warn("No providers available to expose.");
+    p9.log.warn("No providers available to expose.");
     return null;
   }
   let selected = resolveInitialServerProviders(initial, available);
@@ -19075,31 +19379,31 @@ async function selectServerProviders(available, initial) {
     }
     options.push({ value: "__done__", label: "Done", hint: "" });
     const header = selected.length === 0 ? `Exposed providers (0/${available.length}) \u2014 add providers to expose` : `Exposed providers (${selected.length}/${available.length}) \u2014 select to stop exposing`;
-    const choice = await p8.select({
+    const choice = await p9.select({
       message: header,
       options,
       initialValue: "__done__"
     });
-    if (p8.isCancel(choice) || choice === "__done__") {
+    if (p9.isCancel(choice) || choice === "__done__") {
       if (selected.length === 0) {
-        p8.log.warn("Select at least one provider to expose.");
+        p9.log.warn("Select at least one provider to expose.");
         continue;
       }
       break;
     }
     if (choice === "__all__") {
       selected = available.map((provider) => provider.id);
-      p8.log.success(`Exposing all ${available.length} providers.`);
+      p9.log.success(`Exposing all ${available.length} providers.`);
       continue;
     }
     if (choice === "__clear__") {
       selected = [];
-      p8.log.success("Cleared provider list \u2014 add the ones you want to expose.");
+      p9.log.success("Cleared provider list \u2014 add the ones you want to expose.");
       continue;
     }
     if (choice === "__add__") {
       if (unselected.length === 0) continue;
-      const picked = await p8.select({
+      const picked = await p9.select({
         message: "Which provider?",
         options: unselected.map((provider) => ({
           value: provider.id,
@@ -19107,7 +19411,7 @@ async function selectServerProviders(available, initial) {
           hint: `${provider.modelCount} model${provider.modelCount !== 1 ? "s" : ""}`
         }))
       });
-      if (p8.isCancel(picked)) continue;
+      if (p9.isCancel(picked)) continue;
       selected = [...selected, picked];
       continue;
     }
@@ -19117,7 +19421,7 @@ async function selectServerProviders(available, initial) {
       if (!id) continue;
       const provider = lookup2.get(id);
       selected = selected.filter((_, i) => i !== idx);
-      p8.log.success(`Removed ${provider?.name ?? id}.`);
+      p9.log.success(`Removed ${provider?.name ?? id}.`);
     }
   }
   return selected;
@@ -19125,14 +19429,14 @@ async function selectServerProviders(available, initial) {
 
 // src/http-proxy/index.ts
 import pc10 from "picocolors";
-import * as p9 from "@clack/prompts";
+import * as p10 from "@clack/prompts";
 
 // src/http-proxy/server.ts
 import * as http2 from "http";
 import * as https from "https";
 import * as net from "net";
 import { PassThrough } from "stream";
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 import { URL as URL2 } from "url";
 import { createBrotliDecompress, createGunzip, createInflate } from "zlib";
 
@@ -19990,7 +20294,7 @@ async function startHttpProxy(options) {
     }
     const messagesEndpoint = anthropicMessagesEndpoint(req.url);
     if (req.method === "POST" && messagesEndpoint) {
-      const requestId = randomUUID7();
+      const requestId = randomUUID9();
       let parsed = null;
       let route;
       let adapterBody = rawBody;
@@ -20279,10 +20583,10 @@ function printHttpProxyModels(routes, aliases = []) {
 }
 function reportSkippedHttpProxyFavorites(loaded) {
   if (loaded.unavailable.length > 0) {
-    p9.log.warn(`${loaded.unavailable.length} favorite${loaded.unavailable.length === 1 ? "" : "s"} unavailable or missing credentials.`);
+    p10.log.warn(`${loaded.unavailable.length} favorite${loaded.unavailable.length === 1 ? "" : "s"} unavailable or missing credentials.`);
   }
   if (loaded.unsupported.length > 0) {
-    p9.log.warn(
+    p10.log.warn(
       `${loaded.unsupported.length} favorite${loaded.unsupported.length === 1 ? "" : "s"} skipped \u2014 HTTP proxy mode supports non-Anthropic AI SDK routes only.`
     );
   }
@@ -20294,7 +20598,7 @@ function reportSkippedHttpProxyFavorites(loaded) {
         describeModelAliasRejection(rejection.reason)
       ])
     );
-    p9.log.warn(
+    p10.log.warn(
       `${loaded.unavailableAliases.length} model alias${loaded.unavailableAliases.length === 1 ? "" : "es"} skipped. Saved entries were preserved.
 ` + loaded.unavailableAliases.map((alias) => `  ${JSON.stringify(alias.name)} \u2014 ${reasonByAlias.get(alias) ?? "target unavailable"}`).join("\n")
     );
@@ -20375,7 +20679,7 @@ async function runHttpProxyServerCommand(debug = false, webSocketDiagnostics = f
       webSocketDiagnosticsLogPath
     );
   } catch (err) {
-    p9.log.error(`Failed to start HTTP proxy: ${err instanceof Error ? err.message : String(err)}`);
+    p10.log.error(`Failed to start HTTP proxy: ${err instanceof Error ? err.message : String(err)}`);
     return 1;
   }
   const { handle, loaded, caWarning } = started;
@@ -20578,8 +20882,8 @@ async function getServerPasswordForQuickMode(mode, passwordOverride) {
   if (trimmedOverride) return { password: trimmedOverride, wasSaved: false };
   const savedPassword = await getSavedServerPassword();
   if (savedPassword) return { password: savedPassword, wasSaved: true };
-  p10.log.error("Network server quick-start needs a saved server password or `--password <value>`.");
-  p10.log.info("Run `clodex server` and choose Configure & start to save one, or pass a one-run password.");
+  p11.log.error("Network server quick-start needs a saved server password or `--password <value>`.");
+  p11.log.info("Run `clodex server` and choose Configure & start to save one, or pass a one-run password.");
   return void 0;
 }
 function savedServerRunConfig() {
@@ -20613,16 +20917,16 @@ function shouldUseQuickServerMode(options) {
   return Boolean(options.quick || hasServerRunOverrides(options) || !process.stdin.isTTY);
 }
 async function configureExposedProviders() {
-  p10.log.info("Add providers to expose. Listed providers are removed when selected \u2014 like favorites.");
-  const spinner5 = p10.spinner();
-  spinner5.start("Loading providers...");
+  p11.log.info("Add providers to expose. Listed providers are removed when selected \u2014 like favorites.");
+  const spinner6 = p11.spinner();
+  spinner6.start("Loading providers...");
   const catalog = await fetchProviderCatalog({ agent: "server" });
-  spinner5.stop("");
+  spinner6.stop("");
   const available = providerOptionsFromCatalog(catalog);
   const picked = await selectServerProviders(available, getServerExposedProviders() ?? void 0);
   if (!picked) return void 0;
   setServerExposedProviders(picked);
-  p10.log.success(`Saved ${picked.length} provider${picked.length !== 1 ? "s" : ""} for future server runs.`);
+  p11.log.success(`Saved ${picked.length} provider${picked.length !== 1 ? "s" : ""} for future server runs.`);
   return picked;
 }
 async function runServerWizard() {
@@ -20636,7 +20940,7 @@ async function runServerWizard() {
   if (favoritesOnly === null) return void 0;
   setServerFavoritesOnly(favoritesOnly);
   if (favoritesOnly) {
-    p10.log.info("Manage favorites with `clodex models`.");
+    p11.log.info("Manage favorites with `clodex models`.");
   }
   let exposedProviders = null;
   if (!favoritesOnly) {
@@ -20666,14 +20970,14 @@ async function runServerCommand(options = {}) {
   if (options.httpProxy) {
     const hasGatewayOptions = options.quick || options.listenMode !== void 0 || options.providersMode !== void 0 || options.maskGatewayIds !== void 0 || options.password !== void 0;
     if (hasGatewayOptions) {
-      p10.log.error("--proxy is a local-only server mode and cannot be combined with endpoint-mode server options.");
+      p11.log.error("--proxy is a local-only server mode and cannot be combined with endpoint-mode server options.");
       return 1;
     }
     return runHttpProxyServerCommand(false, options.wsDiagnostics, options.port, noDiscovery);
   }
   const apiKey = await resolveServerUpstreamApiKey();
   if (!apiKey) {
-    p10.log.error("No providers configured. Run `clodex providers` to add OpenAI.");
+    p11.log.error("No providers configured. Run `clodex providers` to add OpenAI.");
     return 1;
   }
   const quickMode = shouldUseQuickServerMode(options);
@@ -20688,8 +20992,8 @@ async function runServerCommand(options = {}) {
   const { password: serverPassword, wasSaved: passwordWasSaved } = pwResult;
   const mode = runConfig.listenMode;
   const host = mode === "network" ? "0.0.0.0" : "127.0.0.1";
-  const spinner5 = p10.spinner();
-  spinner5.start("Fetching available models...");
+  const spinner6 = p11.spinner();
+  spinner6.start("Fetching available models...");
   let models;
   try {
     models = await loadServerModels();
@@ -20699,26 +21003,26 @@ async function runServerCommand(options = {}) {
     if (runConfig.favoritesOnly) {
       const favorites = loadPreferences().favoriteModels ?? [];
       if (favorites.length === 0) {
-        spinner5.stop(pc11.red("No favorite models configured"));
-        p10.log.error("Run `clodex models` to add favorites, or turn off favorites-only in the server wizard.");
+        spinner6.stop(pc11.red("No favorite models configured"));
+        p11.log.error("Run `clodex models` to add favorites, or turn off favorites-only in the server wizard.");
         return 1;
       }
       models = filterServerModelsByFavorites(models, favorites).slice(0, MAX_MODEL_CATALOG);
       if (models.length === 0) {
-        spinner5.stop(pc11.red("No favorite models matched the current provider filter"));
-        p10.log.error("Adjust favorites with `clodex models` or change exposed providers in the server wizard.");
+        spinner6.stop(pc11.red("No favorite models matched the current provider filter"));
+        p11.log.error("Adjust favorites with `clodex models` or change exposed providers in the server wizard.");
         return 1;
       }
     }
     if (runConfig.favoritesOnly) {
-      p10.log.info(
+      p11.log.info(
         `Favorites-only mode active \u2014 GET /anthropic/v1/models returns ${models.length} favorites.`
       );
-      p10.log.info("Desktop/Cowork picker will only show these. Edit with `clodex models`.");
+      p11.log.info("Desktop/Cowork picker will only show these. Edit with `clodex models`.");
     }
     if (models.length === 0) {
-      spinner5.stop(pc11.red("No models to expose"));
-      p10.log.error("Add providers with `clodex providers add` or configure exposed providers in the server wizard.");
+      spinner6.stop(pc11.red("No models to expose"));
+      p11.log.error("Add providers with `clodex providers add` or configure exposed providers in the server wizard.");
       return 1;
     }
     const localCount = models.filter((m) => m.apiKey !== void 0).length;
@@ -20726,10 +21030,10 @@ async function runServerCommand(options = {}) {
     const filterNote = runConfig.exposedProviders ? ` \u2014 ${runConfig.exposedProviders.length} provider${runConfig.exposedProviders.length !== 1 ? "s" : ""}` : "";
     const favoritesNote = runConfig.favoritesOnly ? " \u2014 favorites only" : "";
     const maskNote = runConfig.maskGatewayIds ? " \u2014 discovery ids masked" : "";
-    spinner5.stop(`Loaded ${models.length} models (${localCount} from registry providers)${filterNote}${favoritesNote}${maskNote}`);
-    if (summary) p10.log.info(summary);
+    spinner6.stop(`Loaded ${models.length} models (${localCount} from registry providers)${filterNote}${favoritesNote}${maskNote}`);
+    if (summary) p11.log.info(summary);
   } catch (err) {
-    spinner5.stop(pc11.red("Failed to load models"));
+    spinner6.stop(pc11.red("Failed to load models"));
     console.error(pc11.red(String(err instanceof Error ? err.message : err)));
     return 1;
   }
@@ -20751,7 +21055,7 @@ async function runServerCommand(options = {}) {
     ...collidingAliases.flatMap(({ sources }) => sources.map((source) => `${JSON.stringify(source.name)} \u2014 conflicts with a catalog model id`))
   ];
   if (aliasWarnings.length > 0) {
-    p10.log.warn(
+    p11.log.warn(
       `${aliasWarnings.length} saved model alias${aliasWarnings.length === 1 ? "" : "es"} inactive. Saved entries were preserved.
   ${aliasWarnings.join("\n  ")}`
     );
@@ -20833,7 +21137,7 @@ function removeFavorite(list, fav) {
 }
 
 // src/favorites-picker.ts
-import * as p11 from "@clack/prompts";
+import * as p12 from "@clack/prompts";
 import pc12 from "picocolors";
 
 // src/favorite-provider-display.ts
@@ -20911,25 +21215,25 @@ async function pickGlobalFavoriteModel(providers, favorites, opts) {
   if (index.length === 0) return null;
   const freeOnly = opts?.freeOnly === true;
   while (true) {
-    const searchInput = await p11.text({
+    const searchInput = await p12.text({
       message: freeOnly ? `Search free models (${filterGlobalFavoriteIndex(index, "", { freeOnly: true }).length} models):` : `Search all providers (${index.length} models):`,
       placeholder: "e.g. deepseek, claude, sonnet"
     });
-    if (p11.isCancel(searchInput)) {
-      const fallback = await p11.select({
+    if (p12.isCancel(searchInput)) {
+      const fallback = await p12.select({
         message: "Add a favorite",
         options: [
           { value: "back", label: pc12.cyan("\u2190 Back to favorites"), hint: "" },
           { value: ADD_BY_PROVIDER, label: pc12.cyan("Browse by provider \u2192"), hint: "Pick one provider first" }
         ]
       });
-      if (p11.isCancel(fallback) || fallback === "back") return null;
+      if (p12.isCancel(fallback) || fallback === "back") return null;
       if (fallback === ADD_BY_PROVIDER) return ADD_BY_PROVIDER;
       continue;
     }
     const matched = filterGlobalFavoriteIndex(index, String(searchInput), { freeOnly });
     if (matched.length === 0) {
-      p11.log.warn("No models match \u2014 try a different search");
+      p12.log.warn("No models match \u2014 try a different search");
       continue;
     }
     const result = await pickModelFromPagedList(
@@ -20947,7 +21251,7 @@ async function pickGlobalFavoriteModel(providers, favorites, opts) {
     const picked = parseGlobalFavoritePickKey(result.id, matched);
     if (!picked) continue;
     if (isFavorite(favorites, { providerId: picked.providerId, modelId: picked.model.id })) {
-      p11.log.warn(`${picked.model.name || picked.model.id} (${picked.providerName}) is already in your favorites.`);
+      p12.log.warn(`${picked.model.name || picked.model.id} (${picked.providerName}) is already in your favorites.`);
       continue;
     }
     return picked;
@@ -21017,7 +21321,7 @@ function resolveLaunchTarget(explicit, prefs, _agent = "claude") {
 }
 function findProviderAndModel(providers, target) {
   if (!target.providerId || !target.modelId) return null;
-  const provider = providers.find((p13) => p13.id === target.providerId);
+  const provider = providers.find((p14) => p14.id === target.providerId);
   if (!provider) return null;
   const model = provider.models.find((m) => m.id === target.modelId);
   if (!model) return null;
@@ -21223,7 +21527,7 @@ function buildAndPublish(step) {
   const compiled = step.compile(cscPath, CSC_ARGS, scratch);
   const builtExe = join9(scratch, LAUNCHER_EXE_NAME);
   if (compiled.error || compiled.status !== 0 || !existsSync7(builtExe)) {
-    const output = [compiled.stdout, compiled.stderr].map((text5) => text5.trim()).filter(Boolean).join("\n");
+    const output = [compiled.stdout, compiled.stderr].map((text6) => text6.trim()).filter(Boolean).join("\n");
     return {
       ok: false,
       reason: "compile-failed",
@@ -21634,6 +21938,7 @@ ${pc13.bold("Providers:")}
   openai         OpenAI API key (platform.openai.com)
   openai-oauth   ChatGPT/Codex plan OAuth \u2014 sign in with clodex providers auth openai
   opencode-go    OpenCode Go API key \u2014 add with clodex providers add
+  custom-<name>  Any OpenAI-compatible server (OpenRouter, LM Studio, \u2026) \u2014 add with clodex providers add
 
 ${pc13.bold("Model switching:")}
   Run clodex models to save favorites (max ${MAX_MODEL_CATALOG}).
@@ -21858,9 +22163,9 @@ ${pc13.bold("Behavior:")}
 ${pc13.bold("Setup guide:")}
   docs/windows-setup.md in the clodex package (also on GitHub).`;
 }
-function printHelp(text5) {
+function printHelp(text6) {
   console.log(`
-${text5}
+${text6}
 `);
 }
 function reportInactiveCatalogAliases(modelAliases) {
@@ -21869,7 +22174,7 @@ function reportInactiveCatalogAliases(modelAliases) {
   const warningLines = unavailableAliases.flatMap((alias) => alias.sourceNames?.length ? alias.sourceNames.map((name) => `  ${JSON.stringify(name)} \u2014 ${alias.unavailableReason}`) : [
     `  ${JSON.stringify(alias.savedName ?? alias.name)} \u2014 ${alias.unavailableReason}`
   ]);
-  p12.log.warn(
+  p13.log.warn(
     `${warningLines.length} saved model alias${warningLines.length === 1 ? "" : "es"} inactive. Saved entries were preserved.
 ` + warningLines.join("\n")
   );
@@ -21887,11 +22192,11 @@ async function launchClaudeViaCatalog(catalogRoutes, startingRoute, modelAliases
       void 0,
       modelAliases
     );
-    p12.log.info(
+    p13.log.info(
       `Switch menu active \u2014 proxy on port ${proxyHandle.port} ` + pc13.dim(`(${catalogRoutes.length} model${catalogRoutes.length !== 1 ? "s" : ""} in /model)`)
     );
   } catch (err) {
-    p12.log.error(`Failed to start proxy: ${err instanceof Error ? err.message : String(err)}`);
+    p13.log.error(`Failed to start proxy: ${err instanceof Error ? err.message : String(err)}`);
     return 1;
   }
   const childEnv = buildChildEnv(
@@ -21904,7 +22209,7 @@ async function launchClaudeViaCatalog(catalogRoutes, startingRoute, modelAliases
   );
   const debugLogPath = prepareClaudeTraceLog();
   const traceArgs = trace ? ["--debug-file", debugLogPath] : [];
-  if (trace) p12.log.info(`Debug log: ${debugLogPath}`);
+  if (trace) p13.log.info(`Debug log: ${debugLogPath}`);
   const exitCode = await launchClaude(
     childEnv,
     claudeCodeClientModelId(startingRoute.aliasId, contextWindow),
@@ -21915,9 +22220,9 @@ async function launchClaudeViaCatalog(catalogRoutes, startingRoute, modelAliases
   return exitCode;
 }
 var CLACK_CONTEXT_REPORTER = {
-  info: (message) => p12.log.info(message),
-  warn: (message) => p12.log.warn(message),
-  success: (message) => p12.log.success(message)
+  info: (message) => p13.log.info(message),
+  warn: (message) => p13.log.warn(message),
+  success: (message) => p13.log.success(message)
 };
 var STDERR_CONTEXT_REPORTER = {
   info: (message) => console.error(message),
@@ -21932,7 +22237,7 @@ function applyContextStopAssignments(assignments, save, report, saveHint = "Add
   for (const assignment of assignments) {
     const cached = modelsByProvider.get(assignment.providerId)?.find((model) => model.id === assignment.modelId);
     if (!cached) {
-      p12.log.error(
+      p13.log.error(
         `${modelAliasTarget(assignment)} is not in the saved provider catalog. Add the provider and refresh its models first.`
       );
       return 1;
@@ -21966,12 +22271,12 @@ function applyContextStopAssignments(assignments, save, report, saveHint = "Add
 async function runModelsCommand(opts = {}) {
   const changesAlias = opts.alias !== void 0 || opts.unalias !== void 0;
   if (changesAlias && (opts.list || opts.alias !== void 0 && opts.unalias !== void 0)) {
-    p12.log.error("--alias/--unalias apply one at a time to proxy-mode favorites.");
+    p13.log.error("--alias/--unalias apply one at a time to proxy-mode favorites.");
     return 1;
   }
   const assignments = opts.contextAssignments ?? [];
   if (opts.saveContext && assignments.length === 0) {
-    p12.log.error("--save applies to --context assignments; none were given.");
+    p13.log.error("--save applies to --context assignments; none were given.");
     return 1;
   }
   if (assignments.length > 0) {
@@ -21990,7 +22295,7 @@ async function runModelsCommand(opts = {}) {
   if (opts.alias !== void 0) {
     const parsed = parseModelAliasAssignment(opts.alias);
     if ("error" in parsed) {
-      p12.log.error(parsed.error);
+      p13.log.error(parsed.error);
       return 1;
     }
     const prefs2 = loadPreferences();
@@ -21998,19 +22303,19 @@ async function runModelsCommand(opts = {}) {
       (favorite) => favorite.providerId === parsed.providerId && favorite.modelId === parsed.modelId
     );
     if (!isSavedFavorite) {
-      p12.log.error(`${modelAliasTarget(parsed)} is not a saved favorite.`);
-      p12.log.info("Add it with `clodex models`, then save the alias.");
+      p13.log.error(`${modelAliasTarget(parsed)} is not a saved favorite.`);
+      p13.log.info("Add it with `clodex models`, then save the alias.");
       return 1;
     }
     if (prefs2.modelAliases !== void 0 && !Array.isArray(prefs2.modelAliases)) {
-      p12.log.error('Saved model aliases are malformed: "modelAliases" must be an array.');
+      p13.log.error('Saved model aliases are malformed: "modelAliases" must be an array.');
       return 1;
     }
     const aliases = prefs2.modelAliases ?? [];
     const modelAliases = aliases.filter((alias) => !modelAliasMatchesName(alias, parsed.name));
     modelAliases.push(parsed);
     savePreferences({ modelAliases });
-    p12.log.success(`Saved model alias ${parsed.name} \u2192 ${modelAliasTarget(parsed)}.`);
+    p13.log.success(`Saved model alias ${parsed.name} \u2192 ${modelAliasTarget(parsed)}.`);
     return 0;
   }
   if (opts.unalias !== void 0) {
@@ -22018,18 +22323,18 @@ async function runModelsCommand(opts = {}) {
     const name = canonicalModelAliasName(requestedName);
     const prefs2 = loadPreferences();
     if (prefs2.modelAliases !== void 0 && !Array.isArray(prefs2.modelAliases)) {
-      p12.log.error('Saved model aliases are malformed: "modelAliases" must be an array.');
+      p13.log.error('Saved model aliases are malformed: "modelAliases" must be an array.');
       return 1;
     }
     const aliases = prefs2.modelAliases ?? [];
     const modelAliases = aliases.filter((alias) => !modelAliasMatchesStoredName(alias, requestedName));
     const removedCount = aliases.length - modelAliases.length;
     if (removedCount === 0) {
-      p12.log.error(`No model alias named ${JSON.stringify(requestedName)} is saved.`);
+      p13.log.error(`No model alias named ${JSON.stringify(requestedName)} is saved.`);
       return 1;
     }
     savePreferences({ modelAliases });
-    p12.log.success(
+    p13.log.success(
       removedCount === 1 ? `Removed model alias ${name || JSON.stringify(requestedName)}.` : `Removed ${removedCount} model aliases named ${name || JSON.stringify(requestedName)}.`
     );
     return 0;
@@ -22041,25 +22346,25 @@ async function runModelsCommand(opts = {}) {
       reportSkippedHttpProxyFavorites(loaded);
       return 0;
     } catch (err) {
-      p12.log.error(`Could not load proxy models: ${err instanceof Error ? err.message : String(err)}`);
+      p13.log.error(`Could not load proxy models: ${err instanceof Error ? err.message : String(err)}`);
       return 1;
     }
   }
   const maxFavorites = MAX_MODEL_CATALOG;
   const scopeName = "Favorite Models";
   relayIntro(scopeName);
-  const spinner5 = p12.spinner();
-  spinner5.start("Loading providers...");
+  const spinner6 = p13.spinner();
+  spinner6.start("Loading providers...");
   const catalog = await fetchProviderCatalog();
-  spinner5.stop("");
+  spinner6.stop("");
   const allProviders = providersForPicker(catalog);
   const favoriteProviders = allProviders.map((provider) => ({
     ...provider,
     name: favoriteProviderDisplayName(provider)
   }));
   if (favoriteProviders.length === 0) {
-    p12.log.warn("No providers found.");
-    p12.log.info(`${pc13.dim("Add a provider with ")}${pc13.cyan("clodex providers")}${pc13.dim(".")}`);
+    p13.log.warn("No providers found.");
+    p13.log.info(`${pc13.dim("Add a provider with ")}${pc13.cyan("clodex providers")}${pc13.dim(".")}`);
     relayOutro("Done");
     return 0;
   }
@@ -22088,19 +22393,19 @@ async function runModelsCommand(opts = {}) {
     });
     options.push({ value: "__done__", label: "Done", hint: "" });
     const header = favorites.length === 0 ? `${scopeName} (0/${maxFavorites})` : `${scopeName} (${favorites.length}/${maxFavorites}) \u2014 select to remove`;
-    const choice = await p12.select({
+    const choice = await p13.select({
       message: header,
       options,
       initialValue: "__done__"
     });
-    if (p12.isCancel(choice) || choice === "__done__") break;
+    if (p13.isCancel(choice) || choice === "__done__") break;
     if (choice === "__add__") {
       if (atCap) {
-        p12.log.warn(`Limit of ${maxFavorites} favorites reached \u2014 remove one first.`);
+        p13.log.warn(`Limit of ${maxFavorites} favorites reached \u2014 remove one first.`);
         continue;
       }
       const globalCount = buildGlobalFavoriteIndex(favoriteProviders).length;
-      const addPath = await p12.select({
+      const addPath = await p13.select({
         message: "Add a favorite",
         options: [
           {
@@ -22115,7 +22420,7 @@ async function runModelsCommand(opts = {}) {
           }
         ]
       });
-      if (p12.isCancel(addPath)) continue;
+      if (p13.isCancel(addPath)) continue;
       let provider;
       let browsedMultiple = [];
       if (addPath === "global") {
@@ -22130,12 +22435,12 @@ async function runModelsCommand(opts = {}) {
         let currentInitialProvider = void 0;
         while (true) {
           const providerOptions = favoriteProviders.map((ap) => providerSelectOption(ap));
-          const pickedProviderId = await p12.select({
+          const pickedProviderId = await p13.select({
             message: "Which provider?",
             options: providerOptions,
             initialValue: currentInitialProvider
           });
-          if (p12.isCancel(pickedProviderId)) break;
+          if (p13.isCancel(pickedProviderId)) break;
           provider = favoriteProviders.find((ap) => ap.id === pickedProviderId);
           const options2 = provider.models.map((m) => {
             const favorited = isFavorite(favorites, { providerId: provider.id, modelId: m.id });
@@ -22146,12 +22451,12 @@ async function runModelsCommand(opts = {}) {
               hint: favorited ? pc13.yellow("\u2605 already favorite") : ""
             };
           });
-          const pickedModelIds = await p12.multiselect({
+          const pickedModelIds = await p13.multiselect({
             message: `Select models to add from ${provider.name} ${pc13.dim("(Space to select, Enter to confirm)")}`,
             options: options2,
             required: false
           });
-          if (p12.isCancel(pickedModelIds)) {
+          if (p13.isCancel(pickedModelIds)) {
             currentInitialProvider = provider.id;
             continue;
           }
@@ -22186,27 +22491,27 @@ async function runModelsCommand(opts = {}) {
       if (addedModels.length > 0) {
         if (addedModels.length === 1) {
           const modelName = addedModels[0].name || addedModels[0].id;
-          p12.log.success(`Added ${modelName} (${provider.name}) to favorites.`);
+          p13.log.success(`Added ${modelName} (${provider.name}) to favorites.`);
         } else {
-          p12.log.success(`Added ${addedModels.length} models from ${provider.name} to favorites.`);
+          p13.log.success(`Added ${addedModels.length} models from ${provider.name} to favorites.`);
         }
       }
       if (duplicateCount > 0) {
-        p12.log.warn(`${duplicateCount} selected model(s) were already in your favorites.`);
+        p13.log.warn(`${duplicateCount} selected model(s) were already in your favorites.`);
       }
       if (limitReached) {
-        p12.log.warn(`Limit of ${maxFavorites} favorites reached \u2014 some selected models could not be added.`);
+        p13.log.warn(`Limit of ${maxFavorites} favorites reached \u2014 some selected models could not be added.`);
       }
     } else if (choice.startsWith("fav-")) {
       const idx = parseInt(choice.slice(4), 10);
       const fav = favorites[idx];
       const entry = modelLookup.get(`${fav.providerId}:${fav.modelId}`);
       const label = entry ? `${entry.modelName} (${entry.providerName})` : fav.modelId;
-      const confirmed = await p12.confirm({ message: `Remove ${label} from favorites?` });
-      if (p12.isCancel(confirmed) || !confirmed) continue;
+      const confirmed = await p13.confirm({ message: `Remove ${label} from favorites?` });
+      if (p13.isCancel(confirmed) || !confirmed) continue;
       favorites = removeFavorite(favorites, fav);
       favoritesDirty = true;
-      p12.log.success(`Removed ${label} from favorites.`);
+      p13.log.success(`Removed ${label} from favorites.`);
     }
   }
   if (favoritesDirty) {
@@ -22220,8 +22525,8 @@ async function runModelsCommand(opts = {}) {
 }
 async function runClaudeHttpProxyCommand(parsed, claudeArgs, agentStdout) {
   if (parsed.launchProvider || parsed.launchModel) {
-    p12.log.error("--provider/--model select endpoint-mode routes and cannot be combined with --proxy.");
-    p12.log.info("Use `-- --model clodex:<provider-id>:<model-id>` to start on a listed proxy-mode favorite.");
+    p13.log.error("--provider/--model select endpoint-mode routes and cannot be combined with --proxy.");
+    p13.log.info("Use `-- --model clodex:<provider-id>:<model-id>` to start on a listed proxy-mode favorite.");
     return 1;
   }
   if (!agentStdout) relayIntro("Claude Code \u2014 Proxy Mode");
@@ -22239,7 +22544,7 @@ async function runClaudeHttpProxyCommand(parsed, claudeArgs, agentStdout) {
       console.log("");
       return 0;
     } catch (err) {
-      p12.log.error(`Could not load proxy models: ${err instanceof Error ? err.message : String(err)}`);
+      p13.log.error(`Could not load proxy models: ${err instanceof Error ? err.message : String(err)}`);
       return 1;
     }
   }
@@ -22249,13 +22554,13 @@ async function runClaudeHttpProxyCommand(parsed, claudeArgs, agentStdout) {
   try {
     started = await startConfiguredHttpProxy(0, parsed.trace, inferenceLogPath, proxyDebugLogPath);
   } catch (err) {
-    p12.log.error(`Failed to start proxy: ${err instanceof Error ? err.message : String(err)}`);
+    p13.log.error(`Failed to start proxy: ${err instanceof Error ? err.message : String(err)}`);
     return 1;
   }
   const { handle, loaded, caWarning } = started;
   if (caWarning) {
     if (agentStdout) emitParentNotice(`clodex: ${caWarning}`);
-    else p12.log.warn(caWarning);
+    else p13.log.warn(caWarning);
   }
   const inheritedProxyPort = (() => {
     const value = process.env["HTTPS_PROXY"] ?? process.env["HTTP_PROXY"] ?? process.env["https_proxy"] ?? process.env["http_proxy"];
@@ -22289,20 +22594,20 @@ async function runClaudeHttpProxyCommand(parsed, claudeArgs, agentStdout) {
   };
   process.once("exit", onProcessExit);
   if (!agentStdout) {
-    p12.log.info(`Proxy started on port ${handle.port}; Claude Code's Anthropic auth remains active.`);
-    p12.log.info(`Inference request log: ${handle.inferenceLogPath}`);
+    p13.log.info(`Proxy started on port ${handle.port}; Claude Code's Anthropic auth remains active.`);
+    p13.log.info(`Inference request log: ${handle.inferenceLogPath}`);
     printHttpProxyModels(loaded.routes, loaded.aliases);
     reportSkippedHttpProxyFavorites(loaded);
     if (loaded.routes.length > 0) {
-      p12.log.info("Switch with `/model <listed-name>`.");
+      p13.log.info("Switch with `/model <listed-name>`.");
     }
   }
   const childEnv = buildHttpProxyChildEnv(handle.port, handle.caCertPath);
   const debugLogPath = parsed.trace ? prepareClaudeTraceLog(getSessionLogPath("claude-debug")) : void 0;
   const traceArgs = debugLogPath ? ["--debug-file", debugLogPath] : [];
   if (debugLogPath && !agentStdout) {
-    p12.log.info(`Claude debug log: ${debugLogPath}`);
-    if (proxyDebugLogPath) p12.log.info(`Adapter debug log: ${proxyDebugLogPath}`);
+    p13.log.info(`Claude debug log: ${debugLogPath}`);
+    if (proxyDebugLogPath) p13.log.info(`Adapter debug log: ${proxyDebugLogPath}`);
   }
   try {
     const exitCode = await launchClaude(childEnv, void 0, [...traceArgs, ...claudeArgs]);
@@ -22387,7 +22692,7 @@ Error: ${launchPlan.error}
       return 1;
     }
   } else {
-    const catalogSpinner = p12.spinner();
+    const catalogSpinner = p13.spinner();
     catalogSpinner.start("Loading your providers...");
     try {
       catalog = await fetchProviderCatalog();
@@ -22402,11 +22707,11 @@ Error: ${launchPlan.error}
   const blockedLaunchReason = launchPlan.skip && launchPlan.target?.providerId ? catalog.blockedProviders.get(launchPlan.target.providerId) : void 0;
   if (allProviders.length === 0) {
     if (blockedLaunchReason) {
-      p12.log.error(blockedLaunchReason);
+      p13.log.error(blockedLaunchReason);
       return 1;
     }
-    p12.log.warn("No providers available.");
-    p12.log.info(pc13.dim("Run clodex providers to get started."));
+    p13.log.warn("No providers available.");
+    p13.log.info(pc13.dim("Run clodex providers to get started."));
     return 0;
   }
   const providerOptions = allProviders.map((lp) => providerSelectOption(lp));
@@ -22423,7 +22728,7 @@ Error: ${launchPlan.error}
   if (launchPlan.skip && launchPlan.target) {
     const resolved = findProviderAndModel(allProviders, launchPlan.target);
     if (!resolved) {
-      p12.log.error(
+      p13.log.error(
         blockedLaunchReason ?? `Provider/model not found: ${launchPlan.target.providerId} / ${launchPlan.target.modelId}`
       );
       return 1;
@@ -22431,19 +22736,19 @@ Error: ${launchPlan.error}
     activeProvider = resolved.provider;
     selectedModel = resolved.model;
     if (!agentStdout) {
-      p12.log.step(`Using ${selectedModel.name || selectedModel.id} (${activeProvider.name})`);
+      p13.log.step(`Using ${selectedModel.name || selectedModel.id} (${activeProvider.name})`);
     }
     if (!dryRun) recordLaunchSelection("claude", activeProvider.id, selectedModel.id, prefs);
   } else {
     let currentInitialProvider = initialProvider;
     while (true) {
-      const chosen = await p12.select({
+      const chosen = await p13.select({
         message: "Which provider?",
         options: providerOptions,
         initialValue: currentInitialProvider
       });
-      if (p12.isCancel(chosen)) {
-        p12.cancel("Cancelled.");
+      if (p13.isCancel(chosen)) {
+        p13.cancel("Cancelled.");
         return 0;
       }
       const providerChoice = chosen;
@@ -22455,7 +22760,7 @@ Error: ${launchPlan.error}
           if (prov && mod) available.push({ provider: prov, model: mod });
         }
         if (available.length === 0) {
-          p12.log.warn("No saved favorites are currently available.");
+          p13.log.warn("No saved favorites are currently available.");
           return 0;
         }
         const favOptions = available.map((f, i) => ({
@@ -22463,13 +22768,13 @@ Error: ${launchPlan.error}
           label: `${f.model.name || f.model.id} \u2014 ${f.provider.name}`,
           hint: f.model.id
         }));
-        const pickedIdx = await p12.select({
+        const pickedIdx = await p13.select({
           message: "Starting model?",
           options: favOptions,
           initialValue: "0"
         });
-        if (p12.isCancel(pickedIdx)) {
-          p12.cancel("Cancelled.");
+        if (p13.isCancel(pickedIdx)) {
+          p13.cancel("Cancelled.");
           return 0;
         }
         const sel = available[Number(pickedIdx)];
@@ -22498,12 +22803,12 @@ Error: ${launchPlan.error}
     );
     const startingRoute = resolveRoute(activeProvider.id, selectedModel.id) ?? null;
     if (!startingRoute) {
-      p12.log.error("Could not resolve a proxy route for the selected model.");
+      p13.log.error("Could not resolve a proxy route for the selected model.");
       return 1;
     }
     const { routes: catalogRoutes, droppedFavorites } = buildCatalogRoutes(startingRoute, favorites, resolveRoute);
     if (droppedFavorites.length > 0) {
-      p12.log.warn(
+      p13.log.warn(
         `Skipping ${droppedFavorites.length} favorite${droppedFavorites.length === 1 ? "" : "s"} that are no longer available in /model`
       );
     }
@@ -22557,7 +22862,7 @@ Error: ${launchPlan.error}
   }
   const launchApiKey = await resolveLocalProviderApiKey(activeProvider);
   if (!anonymousProvider && !launchApiKey?.trim()) {
-    p12.log.error(
+    p13.log.error(
       `No credential found for ${activeProvider.name}. Add a key or sign in with clodex providers.`
     );
     return 1;
@@ -22583,9 +22888,9 @@ Error: ${launchPlan.error}
         },
         launchApiKey ?? ""
       );
-      if (!isAgentStdoutMode()) p12.log.info(`Anthropic proxy started on port ${proxyHandle.port}`);
+      if (!isAgentStdoutMode()) p13.log.info(`Anthropic proxy started on port ${proxyHandle.port}`);
     } catch (err) {
-      p12.log.error(`Failed to start Anthropic proxy: ${err instanceof Error ? err.message : String(err)}`);
+      p13.log.error(`Failed to start Anthropic proxy: ${err instanceof Error ? err.message : String(err)}`);
       return 1;
     }
     childEnv = buildChildEnv(
@@ -22629,12 +22934,12 @@ Error: ${launchPlan.error}
         launchApiKey ?? ""
       );
       if (!isAgentStdoutMode()) {
-        p12.log.info(
+        p13.log.info(
           `SDK adapter proxy started on port ${proxyHandle.port}` + (selectedModel.npm ? pc13.dim(` (${selectedModel.npm})`) : "")
         );
       }
     } catch (err) {
-      p12.log.error(`Failed to start SDK adapter proxy: ${err instanceof Error ? err.message : String(err)}`);
+      p13.log.error(`Failed to start SDK adapter proxy: ${err instanceof Error ? err.message : String(err)}`);
       return 1;
     }
     childEnv = buildChildEnv(
@@ -22650,7 +22955,7 @@ Error: ${launchPlan.error}
   }
   const debugLogPath = prepareClaudeTraceLog();
   const traceArgs = trace ? ["--debug-file", debugLogPath] : [];
-  if (trace) p12.log.info(`Debug log: ${debugLogPath}`);
+  if (trace) p13.log.info(`Debug log: ${debugLogPath}`);
   const exitCode = await launchClaude(
     childEnv,
     claudeCodeClientModelId(selectedModel.id, selectedModel.contextWindow),