@bman654/clodex 2.11.3 → 2.11.5

package/dist/cli.js

@@ -52,7 +52,7 @@ import {
   withProviderMutationLock,
   withRegistryWriteLock,
   withRegistryWriteLockSync
-} from "./chunk-J7WXOD2K.js";
+} from "./chunk-ZM2KYLPH.js";
 
 // src/cli.ts
 import pc13 from "picocolors";
@@ -227,7 +227,7 @@ function printFavoritesOnlyPanel() {
 
 // src/cli.ts
 import * as p12 from "@clack/prompts";
-import { realpathSync as realpathSync2 } from "fs";
+import { realpathSync as realpathSync3 } from "fs";
 import { fileURLToPath } from "url";
 
 // src/launch.ts
@@ -297,7 +297,7 @@ function buildClaudeArgs(model, extraArgs) {
   return model ? ["--model", model, ...extraArgs] : [...extraArgs];
 }
 function launchClaude(env, model, extraArgs) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const claudePath = findClaudeBinary();
     const args = buildClaudeArgs(model, extraArgs);
     const debugFileIdx = extraArgs.indexOf("--debug-file");
@@ -366,11 +366,11 @@ function launchClaude(env, model, extraArgs) {
     process.once("SIGTERM", () => forward("SIGTERM"));
     child.on("exit", (code) => {
       restore();
-      resolve3(code ?? 0);
+      resolve4(code ?? 0);
     });
     child.on("error", (err) => {
       restore();
-      resolve3(1);
+      resolve4(1);
     });
   });
 }
@@ -382,7 +382,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.11.3",
+  version: "2.11.5",
   publishConfig: {
     access: "public"
   },
@@ -584,7 +584,7 @@ async function runCredentialHelper(operation, account, input, expectedHelperId)
       `${CREDENTIAL_HELPER_ENV} does not match the helper that owns this credential; restore the prior helper or reauthenticate`
     );
   }
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const child = spawn2(
       helper.path,
       [operation, CREDENTIAL_HELPER_SERVICE, account],
@@ -625,7 +625,7 @@ async function runCredentialHelper(operation, account, input, expectedHelperId)
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve3({ code: code ?? 1, stdout: Buffer.concat(stdout).toString("utf8") });
+      resolve4({ code: code ?? 1, stdout: Buffer.concat(stdout).toString("utf8") });
     });
     if (input !== void 0) child.stdin.end(input);
     else child.stdin.end();
@@ -852,7 +852,7 @@ function positiveSecondsToMs(value, defaultMs) {
   return Number.isFinite(seconds) && seconds > 0 ? seconds * 1e3 : defaultMs;
 }
 async function sleepMs(ms) {
-  await new Promise((resolve3) => setTimeout(resolve3, ms));
+  await new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 
 // src/oauth/refresh-http.ts
@@ -979,9 +979,9 @@ async function startCallbackServer(options) {
     port: address.port,
     redirectUri: `http://${redirectHost}:${address.port}${path}`,
     waitForCallback(timeoutMs = 3e5) {
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         if (buffered) {
-          resolve3(buffered);
+          resolve4(buffered);
           buffered = void 0;
           return;
         }
@@ -993,7 +993,7 @@ async function startCallbackServer(options) {
         );
         codeResolve = (params) => {
           clearTimeout(timer);
-          resolve3(params);
+          resolve4(params);
         };
         codeReject = (err) => {
           clearTimeout(timer);
@@ -3888,18 +3888,18 @@ import {
   existsSync as existsSync5,
   mkdtempSync,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync8,
+  readFileSync as readFileSync9,
   renameSync as renameSync2,
   rmSync,
-  statSync as statSync6,
+  statSync as statSync7,
   unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync5,
   openSync as openSync6,
   closeSync as closeSync6,
-  realpathSync
+  realpathSync as realpathSync2
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { basename, dirname as dirname3, join as join7 } from "path";
+import { basename, dirname as dirname4, join as join7 } from "path";
 import pc3 from "picocolors";
 import * as p2 from "@clack/prompts";
 
@@ -6874,8 +6874,108 @@ function materializeRegistry(registry, resolveCredential, opts) {
   return result;
 }
 
+// src/npm-shim.ts
+import { readFileSync as readFileSync7, realpathSync, statSync as statSync4 } from "fs";
+import { dirname as dirname3, resolve as resolve2 } from "path";
+var MAX_LAUNCHER_BYTES = 64 * 1024;
+var MAX_LAUNCHER_HOPS = 4;
+var COMMENT_LINE = {
+  cmd: /^[\s@]*(?:rem\b|::)/i,
+  powershell: /^\s*#/,
+  sh: /^\s*#/
+};
+var TARGET_PATTERN = {
+  cmd: /"%(?:~dp0|dp0%)\\([^"]+?)"\s+%\*/g,
+  powershell: /"\$basedir\/([^"]+?)"\s+\$args/g,
+  sh: /"\$basedir(?:_win)?\/([^"]+?)"\s+"\$@"/g
+};
+function launcherKind(shimPath) {
+  const lower = shimPath.toLowerCase();
+  if (lower.endsWith(".cmd")) return "cmd";
+  if (lower.endsWith(".ps1")) return "powershell";
+  return "sh";
+}
+function readLauncherText(path) {
+  try {
+    if (statSync4(path).size > MAX_LAUNCHER_BYTES) return null;
+    return readFileSync7(path, "utf8");
+  } catch {
+    return null;
+  }
+}
+function isLiteralPath(relativeTarget) {
+  return relativeTarget.length > 0 && !/[%$]/.test(relativeTarget);
+}
+function collectTargets(contents, kind) {
+  const comment = COMMENT_LINE[kind];
+  const pattern = TARGET_PATTERN[kind];
+  const targets = [];
+  for (const line of contents.split(/\r?\n/)) {
+    if (comment.test(line)) continue;
+    for (const match of line.matchAll(pattern)) targets.push(match[1]);
+  }
+  return targets;
+}
+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);
+  if (rawTargets.length === 0) return unreadable;
+  if (!rawTargets.every(isLiteralPath)) return unreadable;
+  const absolute = rawTargets.map((target) => resolve2(
+    dirname3(shimPath),
+    kind === "cmd" ? target.replace(/\\/g, "/") : target
+  ));
+  const distinct = [...new Set(absolute)];
+  if (distinct.length > 1) return { kind: "ambiguous-launcher", targets: distinct };
+  return { kind: "target", target: distinct[0] };
+}
+function resolveThroughNpmShims(startPath) {
+  let current = startPath;
+  for (let hop = 0; hop <= MAX_LAUNCHER_HOPS; hop++) {
+    const reading = readNpmShim(current);
+    if (reading.kind === "not-a-shim") return { ok: true, path: current };
+    if (reading.kind === "unreadable-launcher") {
+      return {
+        ok: false,
+        shimPath: current,
+        declaredTarget: null,
+        detail: "it is a launcher script rather than the program itself, and clodex could not read which file it starts"
+      };
+    }
+    if (reading.kind === "ambiguous-launcher") {
+      return {
+        ok: false,
+        shimPath: current,
+        declaredTarget: null,
+        detail: `it names more than one program (${reading.targets.join(", ")}), so clodex cannot tell which one it starts`
+      };
+    }
+    let hopped;
+    try {
+      hopped = realpathSync(reading.target);
+    } catch {
+      return {
+        ok: false,
+        shimPath: current,
+        declaredTarget: reading.target,
+        detail: `it starts ${reading.target}, which does not exist`
+      };
+    }
+    current = hopped;
+  }
+  return {
+    ok: false,
+    shimPath: startPath,
+    declaredTarget: null,
+    detail: `it starts another launcher script, more than ${MAX_LAUNCHER_HOPS} deep`
+  };
+}
+
 // src/bun-entry-module.ts
-import { closeSync as closeSync2, openSync as openSync2, readSync, statSync as statSync4, writeSync as writeSync2 } from "fs";
+import { closeSync as closeSync2, openSync as openSync2, readSync, statSync as statSync5, writeSync as writeSync2 } from "fs";
 import { execFileSync } from "child_process";
 var BUN_TRAILER = Buffer.from("\n---- Bun! ----\n");
 var BUN_OFFSETS_BYTES = 32;
@@ -7054,7 +7154,7 @@ function isMachO(fd) {
 function readBunModuleTable(path) {
   const fd = openSync2(path, "r");
   try {
-    return readBunModuleNames(fd, statSync4(path).size);
+    return readBunModuleNames(fd, statSync5(path).size);
   } finally {
     closeSync2(fd);
   }
@@ -7062,7 +7162,7 @@ function readBunModuleTable(path) {
 function readBunJavaScriptModules(path) {
   const fd = openSync2(path, "r");
   try {
-    const parsed = readBunModuleNames(fd, statSync4(path).size);
+    const parsed = readBunModuleNames(fd, statSync5(path).size);
     if (!parsed) return null;
     const modules = [];
     for (let index = 0; index < parsed.names.length; index++) {
@@ -7088,14 +7188,14 @@ function readBunJavaScriptModules(path) {
 function shimEntryModuleName(path) {
   const fd = openSync2(path, "r+");
   try {
-    const parsed = readBunModuleNames(fd, statSync4(path).size);
+    const parsed = readBunModuleNames(fd, statSync5(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, statSync4(path).size, marker).some((offset2) => isModuleNameAt(fd, offset2, marker))) {
+    if (findStandIn(fd, statSync5(path).size, marker).some((offset2) => isModuleNameAt(fd, offset2, marker))) {
       return null;
     }
     writeNameBytes(fd, marker, offset);
@@ -7108,7 +7208,7 @@ function restoreEntryModuleName(path, shim, { resign }) {
   const fd = openSync2(path, "r+");
   let machO;
   try {
-    const parsed = readBunModuleNames(fd, statSync4(path).size);
+    const parsed = readBunModuleNames(fd, statSync5(path).size);
     const offset = parsed?.offsets[parsed.entryPointId];
     if (!parsed || offset === void 0 || parsed.names[parsed.entryPointId] !== shim.marker) {
       throw new Error(
@@ -7116,7 +7216,7 @@ function restoreEntryModuleName(path, shim, { resign }) {
       );
     }
     writeNameBytes(fd, shim.original, offset);
-    restoreEveryStandIn(fd, statSync4(path).size, shim);
+    restoreEveryStandIn(fd, statSync5(path).size, shim);
     machO = resign;
   } finally {
     closeSync2(fd);
@@ -7577,7 +7677,7 @@ function writeAll(fd, bytes, position, path) {
 
 // src/patch-backup.ts
 import { createHash as createHash5 } from "crypto";
-import { existsSync as existsSync4, readFileSync as readFileSync7, readdirSync, statSync as statSync5 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync8, readdirSync, statSync as statSync6 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join6 } from "path";
 var BACKUP_SHA_PREFIX_LENGTH = 16;
@@ -7585,7 +7685,7 @@ function backupDir() {
   return process.env["TWEAKCC_CONFIG_DIR"]?.trim() || join6(homedir2(), ".tweakcc");
 }
 function sha256File(path) {
-  return createHash5("sha256").update(readFileSync7(path)).digest("hex");
+  return createHash5("sha256").update(readFileSync8(path)).digest("hex");
 }
 function backupVersionTag(version) {
   const tag = version.trim().replace(/[^\w.-]+/g, "_");
@@ -7615,7 +7715,7 @@ function scanPristineBackups(version, dir = backupDir()) {
     const path = join6(dir, entry);
     let sha256;
     try {
-      if (!statSync5(path).isFile()) continue;
+      if (!statSync6(path).isFile()) continue;
       sha256 = sha256File(path);
     } catch {
       corrupt.push(path);
@@ -8443,7 +8543,7 @@ var WsUpgradePacer = class {
    * catch that, because an untested guard is not a guarantee.
    */
   sleep(ms, signal) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       let settled = false;
       let cancelTimer;
       const onAbort = () => {
@@ -8456,7 +8556,7 @@ var WsUpgradePacer = class {
         if (settled) return;
         settled = true;
         signal?.removeEventListener("abort", onAbort);
-        resolve3();
+        resolve4();
       };
       signal?.addEventListener("abort", onAbort, { once: true });
       cancelTimer = this.schedule(ms, fire);
@@ -8663,6 +8763,7 @@ function normalizeToolCallJson(value) {
     }
   }
   if (record.type === "reasoning") {
+    delete out.id;
     if (Array.isArray(record.content) && record.content.length === 0) delete out.content;
     if (typeof record.encrypted_content === "string" && record.encrypted_content) delete out.summary;
   }
@@ -11067,7 +11168,7 @@ function decodeRequestBody(raw, encoding) {
   }
 }
 function readBody(req) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const chunks = [];
     let totalSize = 0;
     req.on("data", (c) => {
@@ -11081,7 +11182,7 @@ function readBody(req) {
     });
     req.on("end", () => {
       try {
-        resolve3(decodeRequestBody(Buffer.concat(chunks), req.headers["content-encoding"]));
+        resolve4(decodeRequestBody(Buffer.concat(chunks), req.headers["content-encoding"]));
       } catch (err) {
         reject(err);
       }
@@ -11606,6 +11707,49 @@ function resolveUpstreamTools(tools, messages) {
   return upstream;
 }
 
+// src/tool-schema-sanitize.ts
+function isCompatiblePattern(pattern) {
+  for (let i = 0; i < pattern.length; i++) {
+    if (pattern[i] === "\\") {
+      const next = pattern[i + 1];
+      if ((next === "p" || next === "P") && pattern[i + 2] === "{") return false;
+      if (next === "k" && pattern[i + 2] === "<") return false;
+      i++;
+      continue;
+    }
+    if (pattern[i] === "(" && pattern[i + 1] === "?" && pattern[i + 2] === "<" && pattern[i + 3] !== "=" && pattern[i + 3] !== "!") return false;
+  }
+  return true;
+}
+function sanitizeToolSchema(schema) {
+  if (Array.isArray(schema)) {
+    let changed2 = false;
+    const out2 = schema.map((entry) => {
+      const next = sanitizeToolSchema(entry);
+      changed2 ||= next !== entry;
+      return next;
+    });
+    return changed2 ? out2 : schema;
+  }
+  if (!schema || typeof schema !== "object") return schema;
+  let changed = false;
+  const out = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (key === "pattern" && typeof value === "string") {
+      if (!isCompatiblePattern(value)) {
+        changed = true;
+        continue;
+      }
+      out[key] = value;
+      continue;
+    }
+    const next = sanitizeToolSchema(value);
+    changed ||= next !== value;
+    out[key] = next;
+  }
+  return changed ? out : schema;
+}
+
 // src/upstream-attempts.ts
 import { APICallError as APICallError2, RetryError as RetryError2, wrapLanguageModel as wrapLanguageModel2 } from "ai";
 function restoreSyntheticRetryAfterHeader(error) {
@@ -11672,6 +11816,71 @@ var CLAUDE_CODE_COMPACT_PROMPT_MARKERS = Object.freeze({
   end: "REMINDER: Do NOT call any tools. Respond with plain text only"
 });
 
+// src/openai-thinking.ts
+var SIGNATURE_PREFIX = "clodex:openai-thinking:";
+var SIGNATURE_V1 = `${SIGNATURE_PREFIX}v1:`;
+function openAiReasoningItemId(part) {
+  const id = part.providerMetadata?.openai?.itemId;
+  return typeof id === "string" && id.length > 0 ? id : void 0;
+}
+var OpenAiThinkingBlock = class {
+  parts = /* @__PURE__ */ new Map();
+  hasText = false;
+  start(part) {
+    const itemId = openAiReasoningItemId(part);
+    if (!itemId || !part.id) throw new Error("OpenAI reasoning part has no identity");
+    if (!this.parts.has(part.id)) this.parts.set(part.id, { itemId, text: "" });
+    this.end(part);
+  }
+  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 separator = entry.text.length === 0 && this.hasText ? "\n\n" : "";
+    entry.text += text5;
+    this.hasText = true;
+    return separator + text5;
+  }
+  end(part) {
+    const entry = this.parts.get(part.id ?? "");
+    const encrypted = part.providerMetadata?.openai?.reasoningEncryptedContent;
+    if (entry && typeof encrypted === "string" && encrypted) entry.encryptedContent = encrypted;
+  }
+  signature() {
+    return SIGNATURE_V1 + JSON.stringify({ parts: [...this.parts.values()] });
+  }
+};
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function restoreOpenAiThinking(text5, signature, npm) {
+  if (!signature?.startsWith(SIGNATURE_PREFIX)) return void 0;
+  if (!signature.startsWith(SIGNATURE_V1)) return [];
+  try {
+    const envelope = JSON.parse(signature.slice(SIGNATURE_V1.length));
+    if (!isRecord(envelope) || !Array.isArray(envelope.parts) || envelope.parts.length === 0) return [];
+    const parts = [];
+    for (const part of envelope.parts) {
+      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 }] : [];
+    return parts.map((part) => ({
+      type: "reasoning",
+      text: part.text,
+      providerOptions: {
+        openai: {
+          itemId: part.itemId,
+          ...part.encryptedContent ? { reasoningEncryptedContent: part.encryptedContent } : {}
+        }
+      }
+    }));
+  } catch {
+    return [];
+  }
+}
+
 // src/sdk-adapter.ts
 function sdkTranslationErrorSignature(error) {
   const message = error instanceof Error ? error.message : typeof error === "string" ? error : void 0;
@@ -11876,8 +12085,12 @@ function translateMessages(messages, npm, openAiPromptCacheBreakpoints = false)
         if (b.type === "text") {
           parts.push({ type: "text", text: b.text ?? "" });
         } else if (b.type === "thinking") {
-          const part = thinkingToSdkPart(b, npm);
-          if (part) parts.push(part);
+          const restored = restoreOpenAiThinking(b.thinking ?? "", b.signature, npm);
+          if (restored) parts.push(...restored);
+          else {
+            const part = thinkingToSdkPart(b, npm);
+            if (part) parts.push(part);
+          }
         } else if (b.type === "tool_use" && b.id) {
           const { rawId, thoughtSignature } = splitToolUseId(b.id);
           const part = {
@@ -11922,12 +12135,13 @@ function toolRequiredProps(tools) {
 }
 function translateTools(anthropicTools, npm) {
   if (!anthropicTools?.length) return void 0;
+  const anthropicFormat = npm === "@ai-sdk/anthropic" || npm === VERTEX_ANTHROPIC_NPM;
   const tools = {};
   for (const t of anthropicTools) {
     if (!t.name || !t.input_schema) continue;
     tools[t.name] = tool({
       description: t.description ?? "",
-      inputSchema: jsonSchema(t.input_schema),
+      inputSchema: jsonSchema(anthropicFormat ? t.input_schema : sanitizeToolSchema(t.input_schema)),
       strict: npm === "@ai-sdk/openai" ? false : void 0
     });
   }
@@ -12119,6 +12333,7 @@ async function writeAnthropicStream(stream, modelId, write, log12, observer, too
   let started = false;
   let openType = null;
   let pendingThinkingSig;
+  let openAiThinking;
   const idToBlock = /* @__PURE__ */ new Map();
   const toolJsonBuffer = /* @__PURE__ */ new Map();
   const flushedTools = /* @__PURE__ */ new Set();
@@ -12158,9 +12373,10 @@ async function writeAnthropicStream(stream, modelId, write, log12, observer, too
       emit("content_block_delta", {
         type: "content_block_delta",
         index: blockIndex,
-        delta: { type: "signature_delta", signature: pendingThinkingSig ?? "" }
+        delta: { type: "signature_delta", signature: openAiThinking?.signature() ?? pendingThinkingSig ?? "" }
       });
       pendingThinkingSig = void 0;
+      openAiThinking = void 0;
     }
     if (openType === "tool" && openToolId !== null && !flushedTools.has(openToolId)) {
       const buffered = toolJsonBuffer.get(openToolId);
@@ -12200,19 +12416,30 @@ async function writeAnthropicStream(stream, modelId, write, log12, observer, too
       case "abort":
         throw streamAbortError(observer?.abortSignal);
       case "reasoning-start":
-        openBlock("thinking", { type: "thinking", thinking: "", signature: "" });
+        if (openAiReasoningItemId(part) && part.id) {
+          if (!openAiThinking) {
+            openBlock("thinking", { type: "thinking", thinking: "", signature: "" });
+            openAiThinking = new OpenAiThinkingBlock();
+          }
+          openAiThinking.start(part);
+        } else {
+          openBlock("thinking", { type: "thinking", thinking: "", signature: "" });
+        }
         break;
       case "reasoning-delta":
         if (openType !== "thinking") openBlock("thinking", { type: "thinking", thinking: "", signature: "" });
         emit("content_block_delta", {
           type: "content_block_delta",
           index: blockIndex,
-          delta: { type: "thinking_delta", thinking: part.text ?? "" }
+          delta: { type: "thinking_delta", thinking: openAiThinking ? openAiThinking.append(part) : part.text ?? "" }
         });
         break;
       case "reasoning-end": {
-        const sig = grabRoundTripSignature(part);
-        if (sig) pendingThinkingSig = sig;
+        if (openAiThinking) openAiThinking.end(part);
+        else {
+          const sig = grabRoundTripSignature(part);
+          if (sig) pendingThinkingSig = sig;
+        }
         break;
       }
       case "text-start":
@@ -13318,7 +13545,7 @@ function getPatchLockPath() {
 }
 function readPatchManifest(path = getPatchManifestPath()) {
   try {
-    const parsed = JSON.parse(readFileSync8(path, "utf8"));
+    const parsed = JSON.parse(readFileSync9(path, "utf8"));
     if (parsed && typeof parsed.binaryPath === "string" && typeof parsed.configHash === "string") {
       return parsed;
     }
@@ -13497,7 +13724,7 @@ function tryAcquirePatchLock(lockPath = getPatchLockPath(), opts = {}) {
     } catch {
       let stale = false;
       try {
-        const existing = JSON.parse(readFileSync8(lockPath, "utf8"));
+        const existing = JSON.parse(readFileSync9(lockPath, "utf8"));
         stale = !existing.pid || !isAlive(existing.pid) || typeof existing.startedAt === "number" && now - existing.startedAt > PATCH_LOCK_STALE_MS;
       } catch {
         stale = true;
@@ -13518,12 +13745,24 @@ function resolveClaudeBinaryForPatch() {
   if (!source) return { ok: false, reason: "binary-not-found" };
   let resolved;
   try {
-    resolved = realpathSync(source);
+    resolved = realpathSync2(source);
   } catch {
     return { ok: false, reason: "binary-not-found" };
   }
+  const followed = resolveThroughNpmShims(resolved);
+  if (!followed.ok) {
+    return {
+      ok: false,
+      reason: "launcher-unresolved",
+      binaryPath: followed.declaredTarget ?? followed.shimPath,
+      shimPath: followed.shimPath,
+      declaredTarget: followed.declaredTarget,
+      detail: followed.detail
+    };
+  }
+  resolved = followed.path;
   try {
-    if (!statSync6(resolved).isFile()) return { ok: false, reason: "binary-not-found" };
+    if (!statSync7(resolved).isFile()) return { ok: false, reason: "binary-not-found" };
   } catch {
     return { ok: false, reason: "binary-not-found" };
   }
@@ -13532,6 +13771,9 @@ function resolveClaudeBinaryForPatch() {
   return { ok: true, binaryPath: resolved, version };
 }
 function describePatchTargetFailure(target) {
+  if (target.reason === "launcher-unresolved") {
+    return `${target.shimPath} starts Claude Code but is not Claude Code itself, and clodex could not follow it: ${target.detail}. clodex will not patch a launcher script \u2014 that fails with "Unable to detect installation type". Set CLODEX_CLAUDE_PATH to the Claude Code program itself (for an npm install on Windows that is node_modules\\@anthropic-ai\\claude-code\\bin\\claude.exe under the directory holding the launcher), then run the command again.`;
+  }
   return target.reason === "binary-not-found" ? "claude binary not found. Install Claude Code or set TWEAKCC_CC_INSTALLATION_PATH." : `Could not determine the version of ${target.binaryPath} (\`claude --version\` failed). clodex will not patch a binary whose version it cannot read, because the version selects the pristine backup it patches from. If a previous patch left the install broken, \`clodex patch --restore\` still works \u2014 it reads the version from the patch manifest.`;
 }
 function summarizePatchResults(results) {
@@ -13628,7 +13870,7 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
   try {
     mkdirSync5(backupDir(), { recursive: true });
     const { tryDetectInstallation, readContent, writeContent } = await import("tweakcc");
-    candidateDir = mkdtempSync(join7(dirname3(binaryPath), ".clodex-patch-"));
+    candidateDir = mkdtempSync(join7(dirname4(binaryPath), ".clodex-patch-"));
     const candidatePath = join7(candidateDir, basename(binaryPath));
     const seedCandidate = async (from) => {
       copyFileSync(from, candidatePath);
@@ -13759,7 +14001,7 @@ async function applyPatch(binaryPath, version, desired, configHash, opts) {
     }
     if (writeShim) restoreEntryModuleName(candidatePath, writeShim, { resign: true });
     else if (publishedBlob) resignMachOBinary(candidatePath);
-    patchedSize = statSync6(candidatePath).size;
+    patchedSize = statSync7(candidatePath).size;
     patchedSha256 = sha256File(candidatePath);
     renameSync2(candidatePath, binaryPath);
   } catch (err) {
@@ -13816,6 +14058,10 @@ function runRestoreCommand(target) {
     p2.log.error(describePatchTargetFailure(target));
     return 1;
   }
+  if (!target.ok && target.reason === "launcher-unresolved" && target.declaredTarget === null) {
+    p2.log.error(describePatchTargetFailure(target));
+    return 1;
+  }
   const binaryPath = target.binaryPath;
   const manifest = readPatchManifest();
   let version;
@@ -13884,7 +14130,7 @@ async function runPatchCommand(opts = {}) {
     binaryPath,
     claudeVersion: version,
     configHash,
-    binarySize: statSync6(binaryPath).size
+    binarySize: statSync7(binaryPath).size
   });
   if (state === "current") {
     p2.log.success(`claude ${version} is already patched with the current model config \u2014 nothing to do.`);
@@ -13921,7 +14167,7 @@ async function runLaunchPatchCheck(opts = {}) {
     if (Object.keys(desired.config).length === 0) return;
     const target = resolveClaudeBinaryForPatch();
     if (!target.ok) {
-      if (target.reason === "version-unknown" && !opts.agentStdout) {
+      if (target.reason !== "binary-not-found" && !opts.agentStdout) {
         console.error(pc3.dim(`clodex: ${describePatchTargetFailure(target)}`));
       }
       return;
@@ -13940,7 +14186,7 @@ async function runLaunchPatchCheck(opts = {}) {
       binaryPath: resolved.binaryPath,
       claudeVersion: resolved.version,
       configHash,
-      binarySize: statSync6(resolved.binaryPath).size
+      binarySize: statSync7(resolved.binaryPath).size
     });
     if (state === "current") return;
     const interactive = !opts.dryRun && !opts.agentStdout && process.stdin.isTTY === true && process.stdout.isTTY === true;
@@ -14283,12 +14529,12 @@ import {
   lstatSync,
   mkdirSync as mkdirSync6,
   openSync as openSync7,
-  readFileSync as readFileSync9,
+  readFileSync as readFileSync10,
   renameSync as renameSync3,
   unlinkSync as unlinkSync4,
   writeFileSync as writeFileSync6
 } from "fs";
-import { dirname as dirname4 } from "path";
+import { dirname as dirname5 } from "path";
 var JOURNAL_SCHEMA_VERSION = 1;
 var DIR_MODE2 = 448;
 var FILE_MODE4 = 384;
@@ -14390,7 +14636,7 @@ function readJournalUnlocked(path) {
     if (opened.size > MAX_JOURNAL_BYTES) {
       throw new Error("Credential cleanup journal is too large.");
     }
-    return parseJournal(JSON.parse(readFileSync9(fd, "utf8")));
+    return parseJournal(JSON.parse(readFileSync10(fd, "utf8")));
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Could not read credential cleanup journal: ${message}`);
@@ -14401,7 +14647,7 @@ function readJournalUnlocked(path) {
 function syncParentDirectory(path) {
   let fd;
   try {
-    fd = openSync7(dirname4(path), "r");
+    fd = openSync7(dirname5(path), "r");
     fsyncSync2(fd);
   } catch (error) {
     const code = error.code;
@@ -14413,7 +14659,7 @@ function syncParentDirectory(path) {
 function writeJournalUnlocked(journal, path) {
   assertRegistryWriteOwnership(path);
   ensureSecureAppHome();
-  mkdirSync6(dirname4(path), { recursive: true, mode: DIR_MODE2 });
+  mkdirSync6(dirname5(path), { recursive: true, mode: DIR_MODE2 });
   const tmp = `${path}.${process.pid}.${randomUUID4()}.tmp`;
   let fd;
   try {
@@ -17656,8 +17902,8 @@ async function startServer(options) {
     url: `http://${tcpListenerUrlHost(address.address)}:${address.port}`,
     server,
     inferenceLogPath: options.inferenceLogPath,
-    close: () => new Promise((resolve3, reject) => {
-      server.close((err) => err ? reject(err) : resolve3());
+    close: () => new Promise((resolve4, reject) => {
+      server.close((err) => err ? reject(err) : resolve4());
     })
   };
 }
@@ -18396,8 +18642,8 @@ import { createBrotliDecompress, createGunzip, createInflate } from "zlib";
 
 // src/http-proxy/ca.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { chmodSync as chmodSync4, existsSync as existsSync7, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync7 } from "fs";
-import { dirname as dirname5, join as join8, resolve as resolve2 } from "path";
+import { chmodSync as chmodSync4, existsSync as existsSync7, mkdirSync as mkdirSync7, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "fs";
+import { dirname as dirname6, join as join8, resolve as resolve3 } from "path";
 import forge from "node-forge";
 var CERT_DIR = "http-proxy";
 var CA_CERT_FILE = "clodex-ca.pem";
@@ -18472,8 +18718,8 @@ function generateCertificates(paths) {
 }
 function storedCertificatesAreCurrent(paths) {
   try {
-    const ca = forge.pki.certificateFromPem(readFileSync10(paths.caCert, "utf8"));
-    const server = forge.pki.certificateFromPem(readFileSync10(paths.serverCert, "utf8"));
+    const ca = forge.pki.certificateFromPem(readFileSync11(paths.caCert, "utf8"));
+    const server = forge.pki.certificateFromPem(readFileSync11(paths.serverCert, "utf8"));
     const now = Date.now();
     const renewalBuffer = 7 * 24 * 60 * 60 * 1e3;
     return ca.validity.notBefore.getTime() <= now && ca.validity.notAfter.getTime() > now + renewalBuffer && server.validity.notBefore.getTime() <= now && server.validity.notAfter.getTime() > now + renewalBuffer && ca.verify(ca) && ca.verify(server);
@@ -18484,13 +18730,13 @@ function storedCertificatesAreCurrent(paths) {
 function ensureHttpProxyCertificates() {
   const paths = certPaths();
   const required = [paths.caCert, paths.caKey, paths.serverCert, paths.serverKey, paths.version];
-  const current = required.every(existsSync7) && readFileSync10(paths.version, "utf8") === CERT_VERSION && storedCertificatesAreCurrent(paths);
+  const current = required.every(existsSync7) && readFileSync11(paths.version, "utf8") === CERT_VERSION && storedCertificatesAreCurrent(paths);
   if (!current) generateCertificates(paths);
   return {
     caCertPath: paths.caCert,
-    caCert: readFileSync10(paths.caCert, "utf8"),
-    serverCert: readFileSync10(paths.serverCert, "utf8"),
-    serverKey: readFileSync10(paths.serverKey, "utf8")
+    caCert: readFileSync11(paths.caCert, "utf8"),
+    serverCert: readFileSync11(paths.serverCert, "utf8"),
+    serverKey: readFileSync11(paths.serverKey, "utf8")
   };
 }
 function ensureHttpProxyCaBundle(relayCaCertPath, additionalCaCertPath, onWarning) {
@@ -18503,8 +18749,8 @@ function ensureHttpProxyCaBundle(relayCaCertPath, additionalCaCertPath, onWarnin
   };
   let additionalCa;
   try {
-    if (resolve2(additionalCaCertPath) === resolve2(relayCaCertPath)) return relayCaCertPath;
-    additionalCa = readFileSync10(additionalCaCertPath, "utf8").trim();
+    if (resolve3(additionalCaCertPath) === resolve3(relayCaCertPath)) return relayCaCertPath;
+    additionalCa = readFileSync11(additionalCaCertPath, "utf8").trim();
   } catch (err) {
     return warn(
       `NODE_EXTRA_CA_CERTS=${additionalCaCertPath} cannot be read (${err instanceof Error ? err.message : String(err)}), so it is not part of the proxy CA bundle. Where node reports this itself it says only "Ignoring extra certs ... load failed", without naming the variable. Clear or correct it.`
@@ -18514,15 +18760,15 @@ function ensureHttpProxyCaBundle(relayCaCertPath, additionalCaCertPath, onWarnin
     return warn(`NODE_EXTRA_CA_CERTS=${additionalCaCertPath} is empty, so it adds nothing.`);
   }
   try {
-    const relayCa = readFileSync10(relayCaCertPath, "utf8").trimEnd();
-    const combinedPath = join8(dirname5(relayCaCertPath), "combined-ca.pem");
+    const relayCa = readFileSync11(relayCaCertPath, "utf8").trimEnd();
+    const combinedPath = join8(dirname6(relayCaCertPath), "combined-ca.pem");
     writePublic(combinedPath, `${relayCa}
 ${additionalCa}
 `);
     return combinedPath;
   } catch (err) {
     return warn(
-      `clodex could not build the combined CA bundle in ${dirname5(relayCaCertPath)} (${err instanceof Error ? err.message : String(err)}), so the readable, non-empty NODE_EXTRA_CA_CERTS=${additionalCaCertPath} was left out of it. Fix the reported error and restart clodex.`
+      `clodex could not build the combined CA bundle in ${dirname6(relayCaCertPath)} (${err instanceof Error ? err.message : String(err)}), so the readable, non-empty NODE_EXTRA_CA_CERTS=${additionalCaCertPath} was left out of it. Fix the reported error and restart clodex.`
     );
   }
 }
@@ -18625,7 +18871,7 @@ function shouldInterceptConnect(authority) {
   return Boolean(target && target.port === 443 && target.host.replace(/\.$/, "").toLowerCase() === ANTHROPIC_HOST);
 }
 function readRawBody(req) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const chunks = [];
     let size = 0;
     req.on("data", (chunk) => {
@@ -18637,7 +18883,7 @@ function readRawBody(req) {
       }
       chunks.push(chunk);
     });
-    req.on("end", () => resolve3(Buffer.concat(chunks)));
+    req.on("end", () => resolve4(Buffer.concat(chunks)));
     req.on("error", reject);
   });
 }
@@ -18688,7 +18934,7 @@ function requestHeadersWithoutProxyHeaders(req) {
   return headers;
 }
 function forwardRawAnthropicRequest(req, res, rawBody, origin, rejectUnauthorized, agent, onErrorResponse, onResponseUsage, lifecycle, isLocalShutdown = () => false) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const startedAt = Date.now();
     const retryBudget = passthroughUpstreamRetries();
     let lastActivityAt = startedAt;
@@ -18737,7 +18983,7 @@ function forwardRawAnthropicRequest(req, res, rawBody, origin, rejectUnauthorize
     const done = () => {
       if (settled) return;
       settled = true;
-      resolve3();
+      resolve4();
     };
     const errorType = (err) => err.code ?? err.name;
     let upstream;
@@ -18886,7 +19132,7 @@ function forwardRawAnthropicRequest(req, res, rawBody, origin, rejectUnauthorize
   });
 }
 function forwardToAdapter(req, res, rawBody, adapter, adapterRequest = http2.request, adapterAgent, lifecycle, isLocalShutdown = () => false) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const startedAt = Date.now();
     let lastActivityAt = startedAt;
     let headersReceived = false;
@@ -18961,11 +19207,11 @@ function forwardToAdapter(req, res, rawBody, adapter, adapterRequest = http2.req
       });
       adapterResponse?.destroy(new Error("Client disconnected"));
       upstream?.destroy(new Error("Client disconnected"));
-      resolve3();
+      resolve4();
     });
     const failAdapterRequest = (err, failureSource) => {
       if (clientDisconnected2) {
-        resolve3();
+        resolve4();
         return;
       }
       if (headersReceived || failed) return;
@@ -18986,7 +19232,7 @@ function forwardToAdapter(req, res, rawBody, adapter, adapterRequest = http2.req
       });
       if (!res.headersSent) res.writeHead(502, { "Content-Type": "text/plain" });
       res.end(`Relay adapter unreachable: ${err.message}`);
-      resolve3();
+      resolve4();
     };
     upstream = adapterRequest({
       hostname: "127.0.0.1",
@@ -19023,7 +19269,7 @@ function forwardToAdapter(req, res, rawBody, adapter, adapterRequest = http2.req
       copyResponse(upstreamRes, res, void 0, lifecycle ? (usage) => writeLifecycle("response_usage", usage) : void 0);
       const failAdapterResponse = (err, failureSource) => {
         if (clientDisconnected2) {
-          resolve3();
+          resolve4();
           return;
         }
         if (adapterEnded || failed) return;
@@ -19044,12 +19290,12 @@ function forwardToAdapter(req, res, rawBody, adapter, adapterRequest = http2.req
           terminationSource: "upstream_failure"
         });
         if (!res.writableEnded) res.destroy(err);
-        resolve3();
+        resolve4();
       };
       upstreamRes.once("end", () => {
         adapterEnded = true;
         lastActivityAt = Date.now();
-        resolve3();
+        resolve4();
       });
       upstreamRes.once("error", (err) => failAdapterResponse(err, "adapter_response_error"));
       upstreamRes.once("aborted", () => failAdapterResponse(
@@ -19475,7 +19721,7 @@ async function startHttpProxy(options) {
     close: async () => {
       shuttingDown = true;
       for (const socket of sockets) socket.destroy();
-      await new Promise((resolve3) => proxyServer.close(() => resolve3()));
+      await new Promise((resolve4) => proxyServer.close(() => resolve4()));
       mitmServer.close();
       anthropicAgent?.destroy();
       adapter?.close();
@@ -19606,11 +19852,11 @@ async function startConfiguredHttpProxy(port, debug = false, inferenceLogPath =
   return { handle, loaded, ...caWarning ? { caWarning } : {} };
 }
 function waitForShutdown() {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const done = () => {
       process.off("SIGINT", done);
       process.off("SIGTERM", done);
-      resolve3();
+      resolve4();
     };
     process.once("SIGINT", done);
     process.once("SIGTERM", done);
@@ -19784,14 +20030,14 @@ function enrichServerModelReasoning(model) {
   return { ...model, defaultEffort: caps.defaultLevel };
 }
 function waitForShutdown2() {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const cleanup = () => {
       process.off("SIGINT", onSignal);
       process.off("SIGTERM", onSignal);
     };
     const onSignal = () => {
       cleanup();
-      resolve3();
+      resolve4();
     };
     process.once("SIGINT", onSignal);
     process.once("SIGTERM", onSignal);
@@ -21770,7 +22016,7 @@ Error: ${resolved.error}
 function isCliEntryPoint() {
   if (!process.argv[1]) return false;
   try {
-    return realpathSync2(fileURLToPath(import.meta.url)) === realpathSync2(process.argv[1]);
+    return realpathSync3(fileURLToPath(import.meta.url)) === realpathSync3(process.argv[1]);
   } catch {
     return false;
   }