@bman654/clodex 2.18.0 → 2.18.2

package/dist/cli.js

@@ -346,7 +346,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.18.0",
+  version: "2.18.2",
   publishConfig: {
     access: "public"
   },
@@ -401,10 +401,9 @@ var package_default = {
     "https-proxy-agent": "9.1.0",
     "ipaddr.js": "2.4.0",
     "node-forge": "1.4.0",
-    "node-gyp-build": "4.8.4",
     open: "11.0.0",
     picocolors: "1.1.1",
-    tweakcc: "4.3.0",
+    tweakcc: "4.3.3",
     undici: "7.29.0",
     ws: "8.21.0"
   },
@@ -3439,7 +3438,7 @@ function savedStopsAfter(current, assignments) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 13;
+var PATCH_TRANSFORMS_VERSION = 14;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -3617,15 +3616,10 @@ function applyClodexPatches(source, config) {
       );
     }
   }
+  const pickerRow = (a) => "{value:" + q(a) + ",label:" + q(a.charAt(0).toUpperCase() + a.slice(1)) + ",description:" + q(displayFor(a, ALIAS_TO_ID[a])) + "}";
   {
     const missing = ALIASES.filter((a) => !new RegExp("value:" + reEsc(q(a))).test(js));
-    const entries = missing.map(
-      // value = the alias (the name the user types and the binary sends);
-      // description = the real model label, e.g. "GPT-5.6 Sol (OpenAI (ChatGPT))".
-      // (tweakcc's writeContent round-trips utf8 faithfully — verified — so the
-      // old adhoc-patch ASCII-only constraint no longer applies.)
-      (a) => "{value:" + q(a) + ",label:" + q(a.charAt(0).toUpperCase() + a.slice(1)) + ",description:" + q(displayFor(a, ALIAS_TO_ID[a])) + "}"
-    ).join(",");
+    const entries = missing.map(pickerRow).join(",");
     const injectInto = (options) => missing.length ? "[" + entries + "].forEach(function(_o){if(!" + options + ".some(function(_i){return _i.value===_o.value}))" + options + ".push(_o)});" : "";
     const pickerSite = "PATCH 5: model picker options";
     const modelSelections = [...js.matchAll(/\(([\w$]+)==="opus"\|\|\1==="sonnet"\)/g)];
@@ -3642,6 +3636,25 @@ function applyClodexPatches(source, config) {
       );
     }
   }
+  {
+    const catalogSite = "PATCH 11: catalog picker options";
+    const catalogMarker = "/*ccpatch:picker*/";
+    const catalogAnchor = /function [\w$]+\(([\w$]+),([\w$]+)\)\{let ([\w$]+)=[\w$]+\(\1,\2\),([\w$]+)=\3\?\?[\w$]+\(\1\)(?=[,;])(?=[\s\S]{0,400}ANTHROPIC_CUSTOM_MODEL_OPTION)/;
+    const entryPoints = source.match(new RegExp(catalogAnchor.source, "g"))?.length ?? 0;
+    const rows = ALIASES.map(pickerRow).join(",");
+    if (ALIASES.length === 0) {
+      log13("SKIP", catalogSite, "no aliases configured");
+    } else if (entryPoints !== 1 && !js.includes(catalogMarker)) {
+      log13("FAIL", catalogSite, entryPoints === 0 ? "anchor not found" : "anchor matched " + entryPoints + " times (expected 1)");
+    } else {
+      applyOnce(
+        catalogSite,
+        catalogAnchor,
+        (m, _first, _second, _catalog, options) => m + ",_ccpick=" + catalogMarker + "[" + rows + "].forEach(function(_o){if(!" + options + ".some(function(_i){return _i.value===_o.value}))" + options + ".push(_o)})",
+        { marker: catalogMarker, required: false }
+      );
+    }
+  }
   {
     const safe = (s) => String(s).replace(/`/g, "'").replace(/\$\{/g, "(");
     const listing = IDENTITIES.map(function(i) {
@@ -3873,8 +3886,8 @@ import {
   statSync as statSync7,
   unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync5,
-  openSync as openSync8,
-  closeSync as closeSync8,
+  openSync as openSync9,
+  closeSync as closeSync9,
   realpathSync as realpathSync3
 } from "fs";
 import { homedir as homedir3 } from "os";
@@ -4148,14 +4161,14 @@ function uniqueMatch(source, name, pattern) {
   }
   return match[0];
 }
-function captureNeedle(source, name, needle) {
-  if (countExactOccurrences(source, needle) !== 1) {
+function captureNeedle(source, name, needle, expected = 1) {
+  if (countExactOccurrences(source, needle) !== expected) {
     throw new Error(`clodex patch: could not capture built-in postcondition: ${name}`);
   }
   return {
     name,
     protectedText: needle,
-    occurrences: 1
+    occurrences: expected
   };
 }
 function capturePattern(source, name, pattern) {
@@ -4215,16 +4228,25 @@ function captureBuiltInPatchProofs(source, config, results) {
       ));
     }
   }
-  if (protectsResult(results, "PATCH 5: model picker options")) {
+  const pickerSites = [
+    "PATCH 5: model picker options",
+    "PATCH 11: catalog picker options"
+  ].filter((name) => protectsResult(results, name));
+  if (pickerSites.length > 0) {
     for (const { alias, id, display } of aliases) {
       const entry = "{value:" + JSON.stringify(alias) + ",label:" + JSON.stringify(alias.charAt(0).toUpperCase() + alias.slice(1)) + ",description:" + JSON.stringify(display ?? `Custom model (${id})`) + "}";
       proofs.push(captureNeedle(
         source,
-        `PATCH 5: model picker options (${alias})`,
-        entry
+        `model picker options (${alias})`,
+        entry,
+        pickerSites.length
       ));
     }
   }
+  addPattern(
+    "PATCH 11: catalog picker options",
+    /,_ccpick=\/\*ccpatch:picker\*\/\[[\s\S]*?\]\.forEach\(function\(_o\)\{if\(![\w$]+\.some\(function\(_i\)\{return _i\.value===_o\.value\}\)\)[\w$]+\.push\(_o\)\}\)/
+  );
   addPattern(
     "PATCH 7: per-model context window",
     /\/\*ccpatch:ctx\*\/var _ccw=\(\{[^{}]*\}\)\[[^\]]*\];if\(_ccw!==void 0\)return _ccw;/
@@ -6064,11 +6086,11 @@ var OPENAI_OAUTH_MODEL_SEEDS = [
   // program, so most installs will never see this id in their catalog.
   { id: "gpt-daybreak-blue-latest", name: "GPT Daybreak Blue", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: true, preferWebSockets: true, minimalClientVersion: "0.144.0" },
   // GPT-5.6 family (Sol / Terra / Luna)
-  { id: "gpt-5.6-sol", name: "GPT-5.6 Sol", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, minimalClientVersion: "0.144.0" },
-  { id: "gpt-5.6-terra", name: "GPT-5.6 Terra", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, minimalClientVersion: "0.144.0" },
+  { id: "gpt-5.6-sol", name: "GPT-5.6 Sol", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: true, preferWebSockets: true, minimalClientVersion: "0.144.0" },
+  { id: "gpt-5.6-terra", name: "GPT-5.6 Terra", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: true, preferWebSockets: true, minimalClientVersion: "0.144.0" },
   { id: "gpt-5.6-luna", name: "GPT-5.6 Luna", contextWindow: 272e3, maxContextWindow: 872e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: true, preferWebSockets: true, minimalClientVersion: "0.144.0" },
   // GPT-5.5 family (Pro)
-  { id: "gpt-5.5", name: "GPT-5.5", contextWindow: 272e3, maxOutputTokens: 128e3, reasoning: true },
+  { id: "gpt-5.5", name: "GPT-5.5", contextWindow: 272e3, maxContextWindow: 272e3, maxOutputTokens: 128e3, reasoning: true, useResponsesLite: false, preferWebSockets: true, minimalClientVersion: "0.124.0" },
   // GPT-5.4 family
   { id: "gpt-5.4", name: "GPT-5.4", contextWindow: 272e3, maxContextWindow: 1e6 },
   { id: "gpt-5.4-mini", name: "GPT-5.4 Mini", contextWindow: 272e3 },
@@ -7380,270 +7402,44 @@ function inspectClaudeNativeBinaryPlaceholder(path) {
   }
 }
 
-// src/bun-entry-module.ts
-import { closeSync as closeSync3, openSync as openSync3, readSync as readSync2, statSync as statSync6, writeSync } from "fs";
+// src/patch-signature.ts
 import { execFileSync as execFileSync2 } from "child_process";
-var BUN_TRAILER = Buffer.from("\n---- Bun! ----\n");
-var BUN_OFFSETS_BYTES = 32;
-var TAIL_SCAN_BYTES = 16 * 1024 * 1024;
-var MODULE_STRUCT_BYTES_CURRENT = 52;
-var MODULE_STRUCT_BYTES_LEGACY = 36;
-var CONTENTS_FIELD_AT = 8;
-var SOURCEMAP_FIELD_AT = 16;
-var BYTECODE_FIELD_AT = 24;
-var MODULE_INFO_FIELD_AT = 32;
-var BYTECODE_ORIGIN_PATH_FIELD_AT = 40;
-var BUN_BLOB_FLAGS = {
-  /** Every module's source text lies in one run no other region falls inside. */
-  SOURCE_TEXT_CONTIGUOUS: 1 << 4,
-  /** A `[u32; modules]` of each module's source hash follows the module table. */
-  HAS_SOURCE_HASHES: 1 << 5,
-  /** After the source hashes: `u32 count`, then `count` x `{ u32 id, offset, length }`. */
-  HAS_BUILTIN_BYTECODE: 1 << 6,
-  /** After the builtin-bytecode table: one `{ offset, length }` for the shared string table. */
-  HAS_BYTECODE_STRING_TABLE: 1 << 7
-};
-var LOADER_FROM_END = 3;
-var BUN_JAVASCRIPT_LOADER = 1;
-var MAX_MODULE_NAME_BYTES = 4096;
-var MIN_SHIMMABLE_NAME_BYTES = 7;
-function tweakccRecognizesModuleName(name) {
-  return name.endsWith("/claude") || name === "claude" || name.endsWith("/claude.exe") || name === "claude.exe" || name.endsWith("/src/entrypoints/cli.js") || name === "src/entrypoints/cli.js";
-}
-function entryModuleShimName(byteLength) {
-  if (byteLength < MIN_SHIMMABLE_NAME_BYTES) return null;
-  const padding = byteLength - MIN_SHIMMABLE_NAME_BYTES;
-  return "/clodex".padEnd(padding, "-").slice(0, padding) + "/claude";
-}
-function readAt(fd, length, position) {
-  if (length <= 0 || position < 0) return null;
-  const buffer = Buffer.alloc(length);
-  const read = readSync2(fd, buffer, 0, length, position);
-  return read === length ? buffer : null;
-}
-function readBunModuleNames(fd, fileSize) {
-  const tailLength = Math.min(fileSize, TAIL_SCAN_BYTES);
-  const tail = readAt(fd, tailLength, fileSize - tailLength);
-  if (!tail) return null;
-  const tailAt = fileSize - tailLength;
-  for (let searchFrom = tail.length - 1; searchFrom >= 0; ) {
-    const trailerInTail = tail.lastIndexOf(BUN_TRAILER, searchFrom);
-    if (trailerInTail < 0) return null;
-    const parsed = parseBunModuleNamesAt(fd, tailAt + trailerInTail - BUN_OFFSETS_BYTES);
-    if (parsed) return parsed;
-    searchFrom = trailerInTail - 1;
-  }
-  return null;
-}
-function parseBunModuleNamesAt(fd, offsetsAt) {
-  try {
-    return parseBunModuleNamesAtUnchecked(fd, offsetsAt);
-  } catch {
-    return null;
-  }
-}
-function parseBunModuleNamesAtUnchecked(fd, offsetsAt) {
-  const offsets = readAt(fd, BUN_OFFSETS_BYTES, offsetsAt);
-  if (!offsets) return null;
-  const byteCount = offsets.readBigUInt64LE(0);
-  const modulesOffset = offsets.readUInt32LE(8);
-  const modulesLength = offsets.readUInt32LE(12);
-  const entryPointId = offsets.readUInt32LE(16);
-  const compileExecArgvOffset = offsets.readUInt32LE(20);
-  const compileExecArgvLength = offsets.readUInt32LE(24);
-  const flags = offsets.readUInt32LE(28);
-  if (byteCount <= 0n || byteCount > BigInt(offsetsAt)) return null;
-  const blobAt = offsetsAt - Number(byteCount);
-  if (modulesLength <= 0 || BigInt(modulesOffset) + BigInt(modulesLength) > byteCount) return null;
-  const structBytes = modulesLength % MODULE_STRUCT_BYTES_LEGACY === 0 && modulesLength % MODULE_STRUCT_BYTES_CURRENT !== 0 ? MODULE_STRUCT_BYTES_LEGACY : MODULE_STRUCT_BYTES_CURRENT;
-  const moduleCount = Math.floor(modulesLength / structBytes);
-  if (moduleCount <= 0 || entryPointId >= moduleCount) return null;
-  const modules = readAt(fd, moduleCount * structBytes, blobAt + modulesOffset);
-  if (!modules) return null;
-  const names = [];
-  const nameOffsets = [];
-  const contents = [];
-  const sourcemap = [];
-  const bytecode = [];
-  const moduleInfo = [];
-  const bytecodeOriginPath = [];
-  const loaders = [];
-  for (let index = 0; index < moduleCount; index++) {
-    const nameOffset = modules.readUInt32LE(index * structBytes);
-    const nameLength = modules.readUInt32LE(index * structBytes + 4);
-    if (nameLength <= 0 || nameLength > MAX_MODULE_NAME_BYTES) return null;
-    if (BigInt(nameOffset) + BigInt(nameLength) > byteCount) return null;
-    const bytes = readAt(fd, nameLength + 1, blobAt + nameOffset);
-    if (!bytes || bytes[nameLength] !== 0) return null;
-    const name = bytes.subarray(0, nameLength).toString("utf8");
-    if (!/^[\x20-\x7e]+$/.test(name)) return null;
-    names.push(name);
-    nameOffsets.push(blobAt + nameOffset);
-    const pairAt = (field) => ({
-      offset: modules.readUInt32LE(index * structBytes + field),
-      length: modules.readUInt32LE(index * structBytes + field + 4)
-    });
-    contents.push(pairAt(CONTENTS_FIELD_AT));
-    sourcemap.push(pairAt(SOURCEMAP_FIELD_AT));
-    bytecode.push(pairAt(BYTECODE_FIELD_AT));
-    const current = structBytes === MODULE_STRUCT_BYTES_CURRENT;
-    moduleInfo.push(current ? pairAt(MODULE_INFO_FIELD_AT) : { offset: 0, length: 0 });
-    bytecodeOriginPath.push(
-      current ? pairAt(BYTECODE_ORIGIN_PATH_FIELD_AT) : { offset: 0, length: 0 }
-    );
-    loaders.push(modules.readUInt8(index * structBytes + structBytes - LOADER_FROM_END));
-  }
-  return {
-    names,
-    entryPointId,
-    offsets: nameOffsets,
-    contents,
-    sourcemap,
-    bytecode,
-    moduleInfo,
-    bytecodeOriginPath,
-    loaders,
-    blobAt,
-    modulesAt: blobAt + modulesOffset,
-    modulesOffset,
-    modulesLength,
-    structBytes,
-    byteCount: Number(byteCount),
-    compileExecArgv: { offset: compileExecArgvOffset, length: compileExecArgvLength },
-    flags
-  };
-}
-function findStandIn(fd, fileSize, marker) {
-  const needle = Buffer.from(marker);
-  const chunkBytes = 8 * 1024 * 1024;
-  const offsets = [];
-  let carry = Buffer.alloc(0);
-  for (let position = 0; position < fileSize; ) {
-    const length = Math.min(chunkBytes, fileSize - position);
-    const chunk = readAt(fd, length, position);
-    if (!chunk) throw new Error("could not re-read the candidate to verify the entry-module name");
-    const window = carry.length > 0 ? Buffer.concat([carry, chunk]) : chunk;
-    const windowAt = position - carry.length;
-    for (let at = window.indexOf(needle); at >= 0; at = window.indexOf(needle, at + 1)) {
-      offsets.push(windowAt + at);
-    }
-    carry = Buffer.from(window.subarray(Math.max(0, window.length - (needle.length - 1))));
-    position += length;
-  }
-  return offsets;
-}
-function restoreEveryStandIn(fd, fileSize, shim) {
-  const moduleNameCopies = () => findStandIn(fd, fileSize, shim.marker).filter((offset) => isModuleNameAt(fd, offset, shim.marker));
-  const found = moduleNameCopies();
-  for (const offset of found) writeNameBytes(fd, shim.original, offset);
-  if (found.length > 0 && moduleNameCopies().length > 0) {
-    throw new Error(`the entry-module stand-in ${shim.marker} survived restoration`);
-  }
-}
-function isModuleNameAt(fd, offset, marker) {
-  const after = readAt(fd, 1, offset + Buffer.byteLength(marker));
-  return after !== null && after[0] === 0;
-}
-function writeNameBytes(fd, name, offset) {
-  const bytes = Buffer.from(name);
-  const written = writeSync(fd, bytes, 0, bytes.length, offset);
-  if (written !== bytes.length) {
-    throw new Error(`wrote ${written} of ${bytes.length} entry-module name bytes at ${offset}`);
-  }
-}
-function isMachO(fd) {
-  const magic = readAt(fd, 4, 0);
-  if (!magic) return false;
-  const value = magic.readUInt32BE(0);
-  return value === 4277009102 || value === 4277009103 || value === 3472551422 || value === 3489328638 || value === 3405691582 || value === 3405691583;
-}
-function readBunModuleTable(path) {
+import { closeSync as closeSync3, openSync as openSync3, readSync as readSync2 } from "fs";
+function signAndVerifyMachOCandidate(path, installPath = path) {
+  if (process.platform !== "darwin") return;
   const fd = openSync3(path, "r");
+  let machO = false;
   try {
-    return readBunModuleNames(fd, statSync6(path).size);
-  } finally {
-    closeSync3(fd);
-  }
-}
-function readBunJavaScriptModules(path) {
-  const fd = openSync3(path, "r");
-  try {
-    const parsed = readBunModuleNames(fd, statSync6(path).size);
-    if (!parsed) return null;
-    const modules = [];
-    for (let index = 0; index < parsed.names.length; index++) {
-      if (parsed.loaders[index] !== BUN_JAVASCRIPT_LOADER) continue;
-      const range = parsed.contents[index];
-      if (range.offset < 0 || range.length < 0 || range.offset + range.length > parsed.byteCount) {
-        return null;
-      }
-      const bytes = range.length === 0 ? Buffer.alloc(0) : readAt(fd, range.length, parsed.blobAt + range.offset);
-      if (!bytes) return null;
-      modules.push({
-        index,
-        name: parsed.names[index],
-        source: bytes.toString("utf8"),
-        byteLength: bytes.length
-      });
-    }
-    return modules;
-  } finally {
-    closeSync3(fd);
-  }
-}
-function shimEntryModuleName(path) {
-  const fd = openSync3(path, "r+");
-  try {
-    const parsed = readBunModuleNames(fd, statSync6(path).size);
-    if (!parsed) return null;
-    if (parsed.names.some(tweakccRecognizesModuleName)) return null;
-    const original = parsed.names[parsed.entryPointId];
-    const offset = parsed.offsets[parsed.entryPointId];
-    const marker = entryModuleShimName(Buffer.byteLength(original));
-    if (marker === null) return null;
-    if (findStandIn(fd, statSync6(path).size, marker).some((offset2) => isModuleNameAt(fd, offset2, marker))) {
-      return null;
+    const magic = Buffer.alloc(4);
+    if (readSync2(fd, magic, 0, 4, 0) === 4) {
+      machO = [
+        4277009102,
+        4277009103,
+        3472551422,
+        3489328638,
+        3405691582,
+        3405691583,
+        3199925962
+      ].includes(magic.readUInt32BE(0));
     }
-    writeNameBytes(fd, marker, offset);
-    return { offset, original, marker };
   } finally {
     closeSync3(fd);
   }
-}
-function restoreEntryModuleName(path, shim, { resign }) {
-  const fd = openSync3(path, "r+");
-  let machO;
+  if (!machO) return;
   try {
-    const parsed = readBunModuleNames(fd, statSync6(path).size);
-    const offset = parsed?.offsets[parsed.entryPointId];
-    if (!parsed || offset === void 0 || parsed.names[parsed.entryPointId] !== shim.marker) {
-      throw new Error(
-        `expected the entry module of ${path} to be named ${shim.marker}, found ${parsed ? JSON.stringify(parsed.names[parsed.entryPointId]) : "no readable Bun module list"}`
-      );
-    }
-    writeNameBytes(fd, shim.original, offset);
-    restoreEveryStandIn(fd, statSync6(path).size, shim);
-    machO = resign;
-  } finally {
-    closeSync3(fd);
-  }
-  if (machO) resignMachOBinary(path);
-}
-function resignMachOBinary(path) {
-  const fd = openSync3(path, "r");
-  let machO;
-  try {
-    machO = isMachO(fd);
-  } finally {
-    closeSync3(fd);
-  }
-  if (machO && process.platform === "darwin") {
-    execFileSync2("codesign", ["-s", "-", "-f", path], { stdio: "ignore" });
+    execFileSync2("codesign", ["-s", "-", "-f", path], { stdio: "pipe" });
+    execFileSync2("codesign", ["--verify", "--strict", path], { stdio: "pipe" });
+  } catch (error) {
+    const stderr = error?.stderr;
+    const detail = String(stderr ?? "").trim().split(`${path}: `).join("").split(/\r?\n/).filter((line) => line !== "replacing existing signature").join("\n").trim() || (error instanceof Error ? error.message.trimEnd() : String(error).trimEnd());
+    throw new Error(
+      `Mach-O signing or verification failed for ${installPath}: ${detail}. Claude Code was left unchanged.`
+    );
   }
 }
 
 // src/bun-compiled-pointer.ts
-import { closeSync as closeSync4, fstatSync as fstatSync2, openSync as openSync4, readSync as readSync3, writeSync as writeSync2 } from "fs";
+import { closeSync as closeSync4, fstatSync as fstatSync2, openSync as openSync4, readSync as readSync3, writeSync } from "fs";
 var TWEAKCC_SCAN_STRIDE = 16384n;
 var SCAN_CHUNK = 1 << 20;
 var ELF_MAGIC = 1179403647;
@@ -7651,7 +7447,7 @@ var ELFCLASS64 = 2;
 var ELFDATA2LSB = 1;
 var PT_LOAD = 1;
 var PF_W = 2;
-function readAt2(fd, length, position) {
+function readAt(fd, length, position) {
   const buf = Buffer.alloc(length);
   let read = 0;
   while (read < length) {
@@ -7662,7 +7458,7 @@ function readAt2(fd, length, position) {
   return read === length ? buf : buf.subarray(0, read);
 }
 function readElfLayout(fd) {
-  const ident = readAt2(fd, 64, 0);
+  const ident = readAt(fd, 64, 0);
   if (ident.length < 64) return null;
   if (ident.readUInt32LE(0) !== ELF_MAGIC) return null;
   if (ident[4] !== ELFCLASS64 || ident[5] !== ELFDATA2LSB) return null;
@@ -7678,7 +7474,7 @@ function readElfLayout(fd) {
   const fileSize = fstatSync2(fd).size;
   const fits = (offset, length) => Number.isSafeInteger(offset) && offset >= 0 && length >= 0 && offset + length <= fileSize;
   if (!fits(Number(shoff), shnum * shentsize)) return null;
-  const shTable = readAt2(fd, shnum * shentsize, Number(shoff));
+  const shTable = readAt(fd, shnum * shentsize, Number(shoff));
   if (shTable.length !== shnum * shentsize) return null;
   const raw = [];
   for (let i = 0; i < shnum; i++) {
@@ -7692,7 +7488,7 @@ function readElfLayout(fd) {
   }
   const strtab = raw[shstrndx];
   if (!fits(Number(strtab.offset), Number(strtab.size))) return null;
-  const names = readAt2(fd, Number(strtab.size), Number(strtab.offset));
+  const names = readAt(fd, Number(strtab.size), Number(strtab.offset));
   const sections = raw.map((section) => {
     const start = section.nameOffset;
     let end = start;
@@ -7705,7 +7501,7 @@ function readElfLayout(fd) {
     };
   });
   if (!fits(Number(phoff), phnum * phentsize)) return null;
-  const phTable = readAt2(fd, phnum * phentsize, Number(phoff));
+  const phTable = readAt(fd, phnum * phentsize, Number(phoff));
   if (phTable.length !== phnum * phentsize) return null;
   const segments = [];
   for (let i = 0; i < phnum; i++) {
@@ -7742,7 +7538,7 @@ function tweakccWouldFind(fd, segment, needle) {
   const last = segment.vaddr + segment.filesz - 8n;
   for (let vaddr = first; vaddr <= last; vaddr += TWEAKCC_SCAN_STRIDE) {
     const at = Number(segment.offset + (vaddr - segment.vaddr));
-    if (readAt2(fd, 8, at).equals(needle)) return vaddr;
+    if (readAt(fd, 8, at).equals(needle)) return vaddr;
   }
   return null;
 }
@@ -7751,7 +7547,7 @@ function scanForNeedle(fd, from, to, needle, skipFrom, skipTo) {
   for (let start = from; start < to; start += SCAN_CHUNK - 7) {
     const length = Math.min(SCAN_CHUNK, to - start);
     if (length < 8) break;
-    const chunk = readAt2(fd, length, start);
+    const chunk = readAt(fd, length, start);
     let at = 0;
     for (; ; ) {
       const found = chunk.indexOf(needle, at);
@@ -7809,9 +7605,9 @@ function shimBunCompiledPointer(path) {
       throw new Error("no address tweakcc's ELF repack scans is usable for Bun's blob pointer");
     }
     const standInOffset = Number(segment.offset + (standInVaddr - segment.vaddr));
-    const displaced = readAt2(fd, 8, standInOffset);
+    const displaced = readAt(fd, 8, standInOffset);
     if (displaced.length !== 8) throw new Error("could not read the bytes Bun's blob pointer displaces");
-    writeSync2(fd, needle, 0, 8, standInOffset);
+    writeSync(fd, needle, 0, 8, standInOffset);
     return { pointerVaddr, standInVaddr, displaced, bunVaddr: bun.addr };
   } finally {
     closeSync4(fd);
@@ -7831,7 +7627,7 @@ function restoreBunCompiledPointer(path, shim) {
         "the repack left Bun's blob pointer outside the loaded image, or in more than one segment of it"
       );
     }
-    const standIn = readAt2(fd, 8, standInOffset);
+    const standIn = readAt(fd, 8, standInOffset);
     if (standIn.length !== 8) {
       throw new Error("the repacked binary ends before the stand-in for Bun's blob pointer");
     }
@@ -7846,12 +7642,12 @@ function restoreBunCompiledPointer(path, shim) {
     }
     const value = Buffer.alloc(8);
     value.writeBigUInt64LE(written);
-    writeSync2(fd, value, 0, 8, pointerOffset);
-    writeSync2(fd, shim.displaced, 0, 8, standInOffset);
-    if (!readAt2(fd, 8, pointerOffset).equals(value)) {
+    writeSync(fd, value, 0, 8, pointerOffset);
+    writeSync(fd, shim.displaced, 0, 8, standInOffset);
+    if (!readAt(fd, 8, pointerOffset).equals(value)) {
       throw new Error("Bun's blob pointer did not take the repacked address");
     }
-    if (!readAt2(fd, 8, standInOffset).equals(shim.displaced)) {
+    if (!readAt(fd, 8, standInOffset).equals(shim.displaced)) {
       throw new Error("the bytes the stand-in displaced were not restored");
     }
   } finally {
@@ -7860,13 +7656,185 @@ function restoreBunCompiledPointer(path, shim) {
 }
 
 // src/bun-bundle.ts
-import { closeSync as closeSync5, openSync as openSync5, readSync as readSync4, writeSync as writeSync3 } from "fs";
+import { closeSync as closeSync6, openSync as openSync6, readSync as readSync5, writeSync as writeSync2 } from "fs";
+
+// src/bun-module-table.ts
+import { closeSync as closeSync5, openSync as openSync5, readSync as readSync4, statSync as statSync6 } from "fs";
+var BUN_TRAILER = Buffer.from("\n---- Bun! ----\n");
+var BUN_OFFSETS_BYTES = 32;
+var TAIL_SCAN_BYTES = 16 * 1024 * 1024;
+var MODULE_STRUCT_BYTES_CURRENT = 52;
+var MODULE_STRUCT_BYTES_LEGACY = 36;
+var CONTENTS_FIELD_AT = 8;
+var SOURCEMAP_FIELD_AT = 16;
+var BYTECODE_FIELD_AT = 24;
+var MODULE_INFO_FIELD_AT = 32;
+var BYTECODE_ORIGIN_PATH_FIELD_AT = 40;
+var BUN_BLOB_FLAGS = {
+  /** Every module's source text lies in one run no other region falls inside. */
+  SOURCE_TEXT_CONTIGUOUS: 1 << 4,
+  /** A `[u32; modules]` of each module's source hash follows the module table. */
+  HAS_SOURCE_HASHES: 1 << 5,
+  /** After the source hashes: `u32 count`, then `count` x `{ u32 id, offset, length }`. */
+  HAS_BUILTIN_BYTECODE: 1 << 6,
+  /** After the builtin-bytecode table: one `{ offset, length }` for the shared string table. */
+  HAS_BYTECODE_STRING_TABLE: 1 << 7
+};
+var LOADER_FROM_END = 3;
+var BUN_JAVASCRIPT_LOADER = 1;
+var MAX_MODULE_NAME_BYTES = 4096;
+function tweakccRecognizesModuleName(name) {
+  return name.endsWith("/claude") || name === "claude" || name.endsWith("/claude.exe") || name === "claude.exe" || name.endsWith("/src/entrypoints/cli.js") || name === "src/entrypoints/cli.js" || name.endsWith("/cli") || name === "cli";
+}
+function readAt2(fd, length, position) {
+  if (length <= 0 || position < 0) return null;
+  const buffer = Buffer.alloc(length);
+  const read = readSync4(fd, buffer, 0, length, position);
+  return read === length ? buffer : null;
+}
+function readBunModuleNames(fd, fileSize) {
+  const tailLength = Math.min(fileSize, TAIL_SCAN_BYTES);
+  const tail = readAt2(fd, tailLength, fileSize - tailLength);
+  if (!tail) return null;
+  const tailAt = fileSize - tailLength;
+  for (let searchFrom = tail.length - 1; searchFrom >= 0; ) {
+    const trailerInTail = tail.lastIndexOf(BUN_TRAILER, searchFrom);
+    if (trailerInTail < 0) return null;
+    const parsed = parseBunModuleNamesAt(fd, tailAt + trailerInTail - BUN_OFFSETS_BYTES);
+    if (parsed) return parsed;
+    searchFrom = trailerInTail - 1;
+  }
+  return null;
+}
+function parseBunModuleNamesAt(fd, offsetsAt) {
+  try {
+    return parseBunModuleNamesAtUnchecked(fd, offsetsAt);
+  } catch {
+    return null;
+  }
+}
+function parseBunModuleNamesAtUnchecked(fd, offsetsAt) {
+  const offsets = readAt2(fd, BUN_OFFSETS_BYTES, offsetsAt);
+  if (!offsets) return null;
+  const byteCount = offsets.readBigUInt64LE(0);
+  const modulesOffset = offsets.readUInt32LE(8);
+  const modulesLength = offsets.readUInt32LE(12);
+  const entryPointId = offsets.readUInt32LE(16);
+  const compileExecArgvOffset = offsets.readUInt32LE(20);
+  const compileExecArgvLength = offsets.readUInt32LE(24);
+  const flags = offsets.readUInt32LE(28);
+  if (byteCount <= 0n || byteCount > BigInt(offsetsAt)) return null;
+  const blobAt = offsetsAt - Number(byteCount);
+  if (modulesLength <= 0 || BigInt(modulesOffset) + BigInt(modulesLength) > byteCount) return null;
+  const structBytes = modulesLength % MODULE_STRUCT_BYTES_LEGACY === 0 && modulesLength % MODULE_STRUCT_BYTES_CURRENT !== 0 ? MODULE_STRUCT_BYTES_LEGACY : MODULE_STRUCT_BYTES_CURRENT;
+  const moduleCount = Math.floor(modulesLength / structBytes);
+  if (moduleCount <= 0 || entryPointId >= moduleCount) return null;
+  const modules = readAt2(fd, moduleCount * structBytes, blobAt + modulesOffset);
+  if (!modules) return null;
+  const names = [];
+  const nameOffsets = [];
+  const contents = [];
+  const sourcemap = [];
+  const bytecode = [];
+  const moduleInfo = [];
+  const bytecodeOriginPath = [];
+  const loaders = [];
+  for (let index = 0; index < moduleCount; index++) {
+    const nameOffset = modules.readUInt32LE(index * structBytes);
+    const nameLength = modules.readUInt32LE(index * structBytes + 4);
+    if (nameLength <= 0 || nameLength > MAX_MODULE_NAME_BYTES) return null;
+    if (BigInt(nameOffset) + BigInt(nameLength) > byteCount) return null;
+    const bytes = readAt2(fd, nameLength + 1, blobAt + nameOffset);
+    if (!bytes || bytes[nameLength] !== 0) return null;
+    const name = bytes.subarray(0, nameLength).toString("utf8");
+    if (!/^[\x20-\x7e]+$/.test(name)) return null;
+    names.push(name);
+    nameOffsets.push(blobAt + nameOffset);
+    const pairAt = (field) => ({
+      offset: modules.readUInt32LE(index * structBytes + field),
+      length: modules.readUInt32LE(index * structBytes + field + 4)
+    });
+    contents.push(pairAt(CONTENTS_FIELD_AT));
+    sourcemap.push(pairAt(SOURCEMAP_FIELD_AT));
+    bytecode.push(pairAt(BYTECODE_FIELD_AT));
+    const current = structBytes === MODULE_STRUCT_BYTES_CURRENT;
+    moduleInfo.push(current ? pairAt(MODULE_INFO_FIELD_AT) : { offset: 0, length: 0 });
+    bytecodeOriginPath.push(
+      current ? pairAt(BYTECODE_ORIGIN_PATH_FIELD_AT) : { offset: 0, length: 0 }
+    );
+    loaders.push(modules.readUInt8(index * structBytes + structBytes - LOADER_FROM_END));
+  }
+  return {
+    names,
+    entryPointId,
+    offsets: nameOffsets,
+    contents,
+    sourcemap,
+    bytecode,
+    moduleInfo,
+    bytecodeOriginPath,
+    loaders,
+    blobAt,
+    modulesAt: blobAt + modulesOffset,
+    modulesOffset,
+    modulesLength,
+    structBytes,
+    byteCount: Number(byteCount),
+    compileExecArgv: { offset: compileExecArgvOffset, length: compileExecArgvLength },
+    flags
+  };
+}
+function readBunModuleTable(path) {
+  const fd = openSync5(path, "r");
+  try {
+    return readBunModuleNames(fd, statSync6(path).size);
+  } finally {
+    closeSync5(fd);
+  }
+}
+function readBunJavaScriptModules(path) {
+  const fd = openSync5(path, "r");
+  try {
+    const parsed = readBunModuleNames(fd, statSync6(path).size);
+    if (!parsed) return null;
+    const modules = [];
+    for (let index = 0; index < parsed.names.length; index++) {
+      if (parsed.loaders[index] !== BUN_JAVASCRIPT_LOADER) continue;
+      const range = parsed.contents[index];
+      if (range.offset < 0 || range.length < 0 || range.offset + range.length > parsed.byteCount) {
+        return null;
+      }
+      const bytes = range.length === 0 ? Buffer.alloc(0) : readAt2(fd, range.length, parsed.blobAt + range.offset);
+      if (!bytes) return null;
+      modules.push({
+        index,
+        name: parsed.names[index],
+        source: bytes.toString("utf8"),
+        byteLength: bytes.length
+      });
+    }
+    return modules;
+  } finally {
+    closeSync5(fd);
+  }
+}
+
+// src/bun-bundle.ts
 function writableModuleIndex(path) {
   const table = readBunModuleTable(path);
   if (!table) return null;
   const index = table.names.findIndex(tweakccRecognizesModuleName);
   return index < 0 ? null : index;
 }
+function assertRecognizedEntryModule(path) {
+  const table = readBunModuleTable(path);
+  if (table && !table.names.some(tweakccRecognizesModuleName)) {
+    const entry = table.names[table.entryPointId];
+    throw new Error(
+      `Claude Code entry module ${JSON.stringify(entry)} is not recognized by tweakcc. Update clodex and try again. Claude Code was left unchanged.`
+    );
+  }
+}
 var BUNDLE_MODULE_SEPARATOR = '\n/*clodex:module-boundary`;{}"]*/\n';
 function readClaudeBundle(path) {
   const modules = readBunJavaScriptModules(path);
@@ -7976,18 +7944,18 @@ function placeholderOf(byteLength) {
   return PLACEHOLDER_TEXT.repeat(Math.ceil(byteLength / PLACEHOLDER_TEXT.length)).slice(0, byteLength);
 }
 function readBlobData(path, table, into) {
-  const fd = openSync5(path, "r");
+  const fd = openSync6(path, "r");
   try {
     let read = 0;
     while (read < table.byteCount) {
-      const got = readSync4(fd, into, read, table.byteCount - read, table.blobAt + read);
+      const got = readSync5(fd, into, read, table.byteCount - read, table.blobAt + read);
       if (got <= 0) {
         throw new Error(`read ${read} of the ${table.byteCount} blob bytes of ${path}`);
       }
       read += got;
     }
   } finally {
-    closeSync5(fd);
+    closeSync6(fd);
   }
 }
 function repointModule(data, table, append) {
@@ -8039,7 +8007,7 @@ function applyBundleWritePlan(path, plan) {
   }
   const offsets = Buffer.from(plan.offsets);
   offsets.writeBigUInt64LE(BigInt(byteCount), 0);
-  const fd = openSync5(path, "r+");
+  const fd = openSync6(path, "r+");
   try {
     writeAll(fd, plan.data, repacked.blobAt, path);
     const padding = byteCount - plan.data.length;
@@ -8047,7 +8015,7 @@ function applyBundleWritePlan(path, plan) {
     writeAll(fd, offsets, repacked.blobAt + byteCount, path);
     writeAll(fd, BUN_TRAILER2, repacked.blobAt + byteCount + BUN_OFFSETS_BYTES2, path);
   } finally {
-    closeSync5(fd);
+    closeSync6(fd);
   }
   const published = readBunModuleTable(path);
   if (!published) throw new Error(`cannot re-read the Bun module table of ${path} after publishing its blob`);
@@ -8075,7 +8043,7 @@ function applyBundleWritePlan(path, plan) {
 function writeAll(fd, bytes, position, path) {
   let written = 0;
   while (written < bytes.length) {
-    const wrote = writeSync3(fd, bytes, written, bytes.length - written, position + written);
+    const wrote = writeSync2(fd, bytes, written, bytes.length - written, position + written);
     if (wrote <= 0) throw new Error(`wrote ${written} of ${bytes.length} blob bytes to ${path}`);
     written += wrote;
   }
@@ -8086,13 +8054,20 @@ import { wrapLanguageModel, extractReasoningMiddleware } from "ai";
 
 // src/oauth/responses-websocket.ts
 import { createHash as createHash5 } from "crypto";
-import { closeSync as closeSync6, openSync as openSync6 } from "fs";
+import { closeSync as closeSync7, openSync as openSync7 } from "fs";
 import { devNull } from "os";
 import { AsyncLocalStorage } from "async_hooks";
 
 // src/outbound-proxy.ts
+import { randomUUID as randomUUID3 } from "crypto";
 import { networkInterfaces } from "os";
 import { HttpsProxyAgent } from "https-proxy-agent";
+var OUTBOUND_PROXY_HOP_HEADER = "x-clodex-proxy-hop";
+var outboundProxyHopNonce = randomUUID3();
+function isOwnOutboundProxyHop(value) {
+  return (Array.isArray(value) ? value : [value]).some((entry) => entry?.split(",").some((part) => part.trim() === outboundProxyHopNonce));
+}
+var proxyHopHeaders = { [OUTBOUND_PROXY_HOP_HEADER]: outboundProxyHopNonce };
 function hasOutboundProxyEnv(env = process.env) {
   return Boolean(
     env["HTTPS_PROXY"]?.trim() || env["https_proxy"]?.trim() || env["HTTP_PROXY"]?.trim() || env["http_proxy"]?.trim()
@@ -8139,7 +8114,16 @@ function proxyUrlTargetsListener(proxyUrl, listenerHost, listenerPort, localAddr
   }
   const proxyPort = parsed.port ? Number(parsed.port) : parsed.protocol === "https:" ? 443 : parsed.protocol === "http:" ? 80 : void 0;
   if (proxyPort !== listenerPort) return false;
-  const normalizeHost = (host) => host.toLowerCase().replace(/^\[|\]$/g, "");
+  const normalizeHost = (host) => {
+    const plain = host.toLowerCase().replace(/^\[|\]$/g, "");
+    const mapped = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(plain);
+    if (mapped) {
+      const high = parseInt(mapped[1], 16);
+      const low = parseInt(mapped[2], 16);
+      return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+    }
+    return plain.replace(/^::ffff:(?=\d+\.)/, "").replace(/^localhost\.$/, "localhost");
+  };
   const proxyHost = normalizeHost(parsed.hostname);
   const boundHost = normalizeHost(listenerHost);
   if (proxyHost === boundHost) return true;
@@ -8172,7 +8156,7 @@ function outboundHttpProxyAgent(targetUrl, env = process.env) {
     if (!parsedProxy.hostname || !["http:", "https:"].includes(parsedProxy.protocol)) {
       throw new TypeError("Invalid proxy URL");
     }
-    return new HttpsProxyAgent(parsedProxy, { keepAlive: true });
+    return new HttpsProxyAgent(parsedProxy, { keepAlive: true, headers: { ...proxyHopHeaders } });
   } catch (err) {
     emitParentNotice(
       `clodex: HTTP(S)_PROXY cannot be used for a CONNECT tunnel; using a direct connection (${err instanceof Error ? err.message : String(err)})`
@@ -9888,7 +9872,7 @@ function descriptorExhaustionCode(error) {
   const code = error.code;
   if (isDescriptorExhaustion(code)) return code;
   try {
-    closeSync6(openSync6(devNull, "r"));
+    closeSync7(openSync7(devNull, "r"));
     return void 0;
   } catch (probe) {
     const probeCode = probe.code;
@@ -10784,7 +10768,7 @@ function createResponsesWebSocketFetch(wsUrl, log13, options = {}) {
 }
 
 // src/oauth/claude-identity.ts
-import { createHash as createHash6, randomUUID as randomUUID3 } from "crypto";
+import { createHash as createHash6, randomUUID as randomUUID4 } from "crypto";
 var CLAUDE_CODE_CLI_VERSION = "2.1.195";
 var CLAUDE_CODE_USER_AGENT = `claude-cli/${CLAUDE_CODE_CLI_VERSION} (external, cli)`;
 var CLAUDE_CODE_ENTRYPOINT = process.env.CLAUDE_CODE_ENTRYPOINT ?? "cli";
@@ -10793,7 +10777,7 @@ var sessionCache = /* @__PURE__ */ new Map();
 function getOrCreateSessionId(seed) {
   let id = sessionCache.get(seed);
   if (!id) {
-    id = randomUUID3();
+    id = randomUUID4();
     sessionCache.set(seed, id);
   }
   return id;
@@ -11717,7 +11701,7 @@ function thinkingProviderOptions(npm) {
 
 // src/proxy.ts
 import { createServer } from "http";
-import { appendFileSync as appendFileSync2, openSync as openSync7, writeSync as writeSync4, closeSync as closeSync7 } from "fs";
+import { appendFileSync as appendFileSync2, openSync as openSync8, writeSync as writeSync3, closeSync as closeSync8 } from "fs";
 
 // src/http-utils.ts
 import * as zlib from "zlib";
@@ -11949,7 +11933,7 @@ function routeUnavailableMessage(modelId, reason) {
 }
 
 // src/upstream-forward.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 import { Readable, Transform } from "stream";
 import { StringDecoder } from "string_decoder";
 
@@ -12046,7 +12030,7 @@ function upstreamHoldsThreads(url) {
   }
 }
 function anchorSafeMessageId(id) {
-  return typeof id === "string" && id.startsWith("msg_") ? "clodex_" + randomUUID4().replace(/-/g, "") : id;
+  return typeof id === "string" && id.startsWith("msg_") ? "clodex_" + randomUUID5().replace(/-/g, "") : id;
 }
 function isThreadContinuation(body) {
   const thread = body.thread;
@@ -12195,10 +12179,10 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
 }
 
 // src/proxy.ts
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 
 // src/sdk-adapter.ts
-import { createHash as createHash7, randomUUID as randomUUID5 } from "crypto";
+import { createHash as createHash7, randomUUID as randomUUID6 } from "crypto";
 import { streamText, generateText, tool, jsonSchema } from "ai";
 
 // src/proxy-shared.ts
@@ -13042,7 +13026,7 @@ function forwardAbortSignal(source, target) {
   return () => source.removeEventListener("abort", forward);
 }
 function translatedMessageId() {
-  return "clodex_" + randomUUID5().replace(/-/g, "");
+  return "clodex_" + randomUUID6().replace(/-/g, "");
 }
 async function writeAnthropicStream(stream, modelId, write, log13, observer, tools) {
   const messageId = translatedMessageId();
@@ -13567,12 +13551,12 @@ function createTranslationLifecycle(logPath, requestId, claudeSessionId, modelId
 function appendSecureLog(logPath, line) {
   const redacted = redactTraceLine(line);
   try {
-    const fd = openSync7(logPath, "a", 384);
+    const fd = openSync8(logPath, "a", 384);
     try {
-      writeSync4(fd, `${(/* @__PURE__ */ new Date()).toISOString()} ${redacted}
+      writeSync3(fd, `${(/* @__PURE__ */ new Date()).toISOString()} ${redacted}
 `);
     } finally {
-      closeSync7(fd);
+      closeSync8(fd);
     }
   } catch {
     try {
@@ -13619,7 +13603,7 @@ function configuredAliasLookupNames(alias) {
   }))].map(normalizeRouteLookupId);
 }
 async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenceLogPath, debugLogPath, webSocketDiagnosticsLogPath, modelAliases) {
-  const proxyToken = randomUUID6();
+  const proxyToken = randomUUID7();
   silenceSdkWarnings();
   if (routes.length === 0) {
     throw new Error("Proxy catalog requires at least one route");
@@ -14042,7 +14026,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
               res,
               upstreamStatus === 500 ? 502 : upstreamStatus,
               clientMessage,
-              contextLengthExceeded ? relayRequestId ?? randomUUID6() : void 0
+              contextLengthExceeded ? relayRequestId ?? randomUUID7() : void 0
             );
           } else {
             const errorType = anthropicErrorType(upstreamStatus, details?.transportCode);
@@ -14050,7 +14034,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
 data: ${JSON.stringify({
               type: "error",
               error: { type: errorType, message: clientMessage },
-              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID6() } : {}
+              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID7() } : {}
             })}
 
 `);
@@ -14440,10 +14424,10 @@ function tryAcquirePatchLock(lockPath = getPatchLockPath(), opts = {}) {
   mkdirSync5(join8(lockPath, ".."), { recursive: true, mode: 448 });
   for (let attempt = 0; attempt < 2; attempt++) {
     try {
-      const fd = openSync8(lockPath, "wx");
+      const fd = openSync9(lockPath, "wx");
       const content = { pid: process.pid, startedAt: now };
       writeFileSync5(fd, JSON.stringify(content));
-      closeSync8(fd);
+      closeSync9(fd);
       return () => {
         try {
           unlinkSync3(lockPath);
@@ -14647,7 +14631,7 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
     const candidatePath = join8(candidateDir, basename(binaryPath));
     const seedCandidate = async (from) => {
       copyFileSync(from, candidatePath);
-      const shim = shimEntryModuleName(candidatePath);
+      assertRecognizedEntryModule(candidatePath);
       const installation = await tryDetectInstallation({ path: candidatePath });
       const bundle = readClaudeBundle(candidatePath);
       if (!bundle && installation.kind === "native") {
@@ -14656,7 +14640,6 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
         );
       }
       const source = bundle ? bundle.source : await readContent(installation);
-      if (shim) restoreEntryModuleName(candidatePath, shim, { resign: false });
       return { installation, source, bundle };
     };
     const facts = collectPristineFacts({
@@ -14766,8 +14749,6 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
       local = discardLocalPatchOutcome(builtIn.content, local.results);
     }
     results = [...results, ...local.results];
-    const writeShim = shimEntryModuleName(candidatePath);
-    let publishedBlob = false;
     if (loaded.bundle) {
       const writable = writableModuleIndex(candidatePath);
       if (writable === null) {
@@ -14783,14 +14764,12 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
       await writeContent(loaded.installation, plan2.content);
       if (bunPointerShim) restoreBunCompiledPointer(candidatePath, bunPointerShim);
       applyBundleWritePlan(candidatePath, plan2);
-      publishedBlob = true;
     } else {
       const bunPointerShim = shimBunCompiledPointer(candidatePath);
       await writeContent(loaded.installation, local.content);
       if (bunPointerShim) restoreBunCompiledPointer(candidatePath, bunPointerShim);
     }
-    if (writeShim) restoreEntryModuleName(candidatePath, writeShim, { resign: true });
-    else if (publishedBlob) resignMachOBinary(candidatePath);
+    signAndVerifyMachOCandidate(candidatePath, binaryPath);
     patchedSize = statSync7(candidatePath).size;
     patchedSha256 = sha256File(candidatePath);
     renameSync2(candidatePath, binaryPath);
@@ -15380,15 +15359,15 @@ function localProvidersToServerModels(localProviders) {
 }
 
 // src/registry/credential-cleanup-journal.ts
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 import {
-  closeSync as closeSync9,
+  closeSync as closeSync10,
   existsSync as existsSync5,
   fstatSync as fstatSync3,
   fsyncSync as fsyncSync2,
   lstatSync,
   mkdirSync as mkdirSync6,
-  openSync as openSync9,
+  openSync as openSync10,
   readFileSync as readFileSync11,
   renameSync as renameSync3,
   unlinkSync as unlinkSync4,
@@ -15480,7 +15459,7 @@ function readJournalUnlocked(path) {
     if (before.isSymbolicLink() || !before.isFile()) {
       throw new Error("Credential cleanup journal must be a regular file.");
     }
-    fd = openSync9(path, "r");
+    fd = openSync10(path, "r");
     const opened = fstatSync3(fd);
     if (before.dev !== opened.dev || before.ino !== opened.ino) {
       throw new Error("Credential cleanup journal changed while opening.");
@@ -15501,39 +15480,39 @@ function readJournalUnlocked(path) {
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Could not read credential cleanup journal: ${message}`);
   } finally {
-    if (fd !== void 0) closeSync9(fd);
+    if (fd !== void 0) closeSync10(fd);
   }
 }
 function syncParentDirectory(path) {
   let fd;
   try {
-    fd = openSync9(dirname6(path), "r");
+    fd = openSync10(dirname6(path), "r");
     fsyncSync2(fd);
   } catch (error) {
     const code = error.code;
     if (code !== "EINVAL" && code !== "ENOTSUP" && code !== "EPERM") throw error;
   } finally {
-    if (fd !== void 0) closeSync9(fd);
+    if (fd !== void 0) closeSync10(fd);
   }
 }
 function writeJournalUnlocked(journal, path) {
   assertRegistryWriteOwnership(path);
   ensureSecureAppHome();
   mkdirSync6(dirname6(path), { recursive: true, mode: DIR_MODE2 });
-  const tmp = `${path}.${process.pid}.${randomUUID7()}.tmp`;
+  const tmp = `${path}.${process.pid}.${randomUUID8()}.tmp`;
   let fd;
   try {
-    fd = openSync9(tmp, "wx", FILE_MODE4);
+    fd = openSync10(tmp, "wx", FILE_MODE4);
     writeFileSync6(fd, `${JSON.stringify(journal, null, 2)}
 `);
     fsyncSync2(fd);
-    closeSync9(fd);
+    closeSync10(fd);
     fd = void 0;
     assertRegistryWriteOwnership(path);
     renameSync3(tmp, path);
     syncParentDirectory(path);
   } finally {
-    if (fd !== void 0) closeSync9(fd);
+    if (fd !== void 0) closeSync10(fd);
     try {
       unlinkSync4(tmp);
     } catch (error) {
@@ -18637,7 +18616,7 @@ async function askSaveServerPassword() {
 
 // src/server/router.ts
 import { createServer as createServer2 } from "http";
-import { randomUUID as randomUUID8 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 
 // src/openai-adapter.ts
 import { tool as tool2, jsonSchema as jsonSchema2, streamText as streamText2, generateText as generateText2 } from "ai";
@@ -19053,7 +19032,7 @@ async function handleAnthropicMessages(req, res, options, modelCache, plog) {
     plog(`model not found: ${body.model}`);
     return;
   }
-  const requestId = randomUUID8();
+  const requestId = randomUUID9();
   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);
@@ -19727,7 +19706,7 @@ import * as http2 from "http";
 import * as https from "https";
 import * as net from "net";
 import { PassThrough } from "stream";
-import { randomUUID as randomUUID9 } from "crypto";
+import { randomUUID as randomUUID10 } from "crypto";
 import { URL as URL2 } from "url";
 import { createBrotliDecompress, createGunzip, createInflate } from "zlib";
 
@@ -20019,7 +19998,7 @@ function requestHeadersWithoutProxyHeaders(req) {
   const headers = [];
   for (let i = 0; i < req.rawHeaders.length; i += 2) {
     const name = req.rawHeaders[i];
-    if (/^proxy-(authorization|connection)$/i.test(name)) continue;
+    if (/^proxy-(authorization|connection)$/i.test(name) || name.toLowerCase() === OUTBOUND_PROXY_HOP_HEADER) continue;
     headers.push(name, req.rawHeaders[i + 1] ?? "");
   }
   return headers;
@@ -20556,6 +20535,7 @@ async function startHttpProxy(options) {
   const anthropicOrigin = new URL2(options.anthropicOrigin ?? "https://api.anthropic.com");
   const anthropicProxyUrl = outboundProxyUrlForTarget(anthropicOrigin.href);
   let anthropicAgent;
+  let anthropicViaProxy = false;
   let adapter = options.adapterHandle ?? null;
   if (options.routes.length > 0) {
     adapter ??= await startProxyCatalog(
@@ -20570,11 +20550,27 @@ async function startHttpProxy(options) {
   }
   const adapterAgent = adapter ? new http2.Agent({ keepAlive: true }) : void 0;
   let shuttingDown = false;
+  let warnedProxyLoop = false;
+  const rejectProxyLoop = (target) => {
+    if (warnedProxyLoop) return;
+    warnedProxyLoop = true;
+    const secure = target.startsWith("https:");
+    const candidates = secure ? ["HTTPS_PROXY", "https_proxy"] : ["HTTP_PROXY", "http_proxy"];
+    const name = candidates.find((key) => process.env[key]?.trim()) ?? candidates[0];
+    emitParentNotice(`clodex: outbound proxy loop detected; check ${name} (request returned to this proxy)`);
+  };
   const mitmServer = https.createServer({
     key: certificates.serverKey,
     cert: certificates.serverCert,
     minVersion: "TLSv1.2"
   }, async (req, res) => {
+    if (isOwnOutboundProxyHop(req.headers[OUTBOUND_PROXY_HOP_HEADER])) {
+      rejectProxyLoop("https://api.anthropic.com");
+      res.writeHead(508, { "Content-Type": "text/plain" });
+      res.end("Outbound proxy loop detected");
+      return;
+    }
+    delete req.headers[OUTBOUND_PROXY_HOP_HEADER];
     let rawBody;
     try {
       rawBody = await readRawBody(req);
@@ -20585,7 +20581,7 @@ async function startHttpProxy(options) {
     }
     const messagesEndpoint = anthropicMessagesEndpoint(req.url);
     if (req.method === "POST" && messagesEndpoint) {
-      const requestId = randomUUID9();
+      const requestId = randomUUID10();
       let parsed = null;
       let route;
       let adapterBody = rawBody;
@@ -20733,6 +20729,12 @@ async function startHttpProxy(options) {
     return connectTunnelAgents.get(proxyUrl);
   };
   mitmServer.on("upgrade", (req, socket, head) => {
+    if (isOwnOutboundProxyHop(req.headers[OUTBOUND_PROXY_HOP_HEADER])) {
+      rejectProxyLoop("https://api.anthropic.com");
+      socket.once("error", () => socket.destroy());
+      socket.end("HTTP/1.1 508 Loop Detected\r\nConnection: close\r\n\r\n", () => socket.destroy());
+      return;
+    }
     forwardAnthropicUpgrade(
       req,
       socket,
@@ -20743,13 +20745,40 @@ async function startHttpProxy(options) {
       sockets
     );
   });
-  const proxyServer = http2.createServer(forwardPlainHttp);
+  const proxyServer = http2.createServer((req, res) => {
+    if (isOwnOutboundProxyHop(req.headers[OUTBOUND_PROXY_HOP_HEADER])) {
+      rejectProxyLoop(req.url ?? "");
+      res.writeHead(508, { "Content-Type": "text/plain" });
+      res.end("Outbound proxy loop detected");
+      return;
+    }
+    forwardPlainHttp(req, res);
+  });
   proxyServer.on("connection", (socket) => {
     sockets.add(socket);
     socket.once("close", () => sockets.delete(socket));
   });
   proxyServer.on("connect", (req, clientSocket, head) => {
+    const ownHop = isOwnOutboundProxyHop(req.headers[OUTBOUND_PROXY_HOP_HEADER]);
+    const rejectOwnHop = () => {
+      rejectProxyLoop(`https://${req.url ?? ""}`);
+      clientSocket.once("error", () => clientSocket.destroy());
+      const body = "Outbound proxy loop detected";
+      clientSocket.end(
+        `HTTP/1.1 508 Loop Detected\r
+Content-Type: text/plain\r
+Content-Length: ${Buffer.byteLength(body)}\r
+Connection: close\r
+\r
+${body}`,
+        () => clientSocket.destroy()
+      );
+    };
     if (shouldInterceptConnect(req.url ?? "")) {
+      if (ownHop && anthropicViaProxy) {
+        rejectOwnHop();
+        return;
+      }
       clientSocket.write("HTTP/1.1 200 Connection Established\r\n\r\n");
       if (head.length > 0) clientSocket.unshift(head);
       mitmServer.emit("connection", clientSocket);
@@ -20772,6 +20801,10 @@ async function startHttpProxy(options) {
       );
     }
     const outboundAgent = outboundProxyUrl !== void 0 && !selfTargeting ? connectTunnelAgent(outboundProxyUrl, targetUrl) : void 0;
+    if (ownHop && outboundAgent) {
+      rejectOwnHop();
+      return;
+    }
     if (outboundAgent) {
       let upstream2;
       let proxyConnectStatus;
@@ -20790,7 +20823,7 @@ async function startHttpProxy(options) {
         if (proxyConnectStatus !== 200 || clientSocket.destroyed) {
           connected.destroy();
           if (!clientSocket.destroyed) {
-            clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n", () => clientSocket.destroy());
+            clientSocket.end(proxyConnectStatus === 508 ? "HTTP/1.1 508 Loop Detected\r\n\r\n" : "HTTP/1.1 502 Bad Gateway\r\n\r\n", () => clientSocket.destroy());
           }
           return;
         }
@@ -20868,6 +20901,7 @@ async function startHttpProxy(options) {
     );
   } else {
     anthropicAgent = outboundHttpProxyAgent(anthropicOrigin.href);
+    anthropicViaProxy = anthropicAgent !== void 0;
   }
   anthropicAgent ??= createPassthroughAgent();
   return {