@bman654/clodex 2.6.1 → 2.6.3

package/dist/cli.js

@@ -374,7 +374,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.6.1",
+  version: "2.6.3",
   publishConfig: {
     access: "public"
   },
@@ -17061,7 +17061,7 @@ function collectPristineFacts(args) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 6;
+var PATCH_TRANSFORMS_VERSION = 8;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -17240,14 +17240,18 @@ function applyClodexPatches(source, config) {
       // 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 inject = missing.length ? "[" + entries + "].forEach(function(_o){if(!e.some(function(_i){return _i.value===_o.value}))e.push(_o)});" : "";
+    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)];
     if (ALIASES.length === 0) {
-      log12("SKIP", "PATCH 5: model picker options", "no aliases configured");
+      log12("SKIP", pickerSite, "no aliases configured");
+    } else if (modelSelections.length !== 1) {
+      log12("FAIL", pickerSite, "model selection appears " + modelSelections.length + " times (expected 1)");
     } else {
       applyOnce(
-        "PATCH 5: model picker options",
-        /(\?\[[\w$]+,r\]:\[r\];for\(let [\w$]+ of [\w$]+\)[\w$]+\(e,[\w$]+,t\);)/,
-        (m) => m + inject,
+        pickerSite,
+        /\(([\w$]+)==="opus"\|\|\1==="sonnet"\)[^;{}]*\?\[\1,([\w$]+)\]:\[\2\];for\(let ([\w$]+) of [\w$]+\)[\w$]+\(([\w$]+),\3,[\w$]+\);/,
+        (m, _selected, _requested, _item, options) => m + injectInto(options),
         { required: false, noopIsSkip: true }
       );
     }
@@ -17370,11 +17374,87 @@ function applyClodexPatches(source, config) {
       '"OTEL_"',
       "CLAUDE_CODE_OTEL_DIAG_STDERR"
     ];
+    const blockEndIndex = (text5, open2) => {
+      const depths = [0];
+      const templates = [false];
+      for (let i = open2; i < text5.length; i++) {
+        const ch = text5[i];
+        const inTemplate = templates[templates.length - 1];
+        if (inTemplate) {
+          if (ch === "\\") {
+            i++;
+            continue;
+          }
+          if (ch === "`") {
+            templates.pop();
+            depths.pop();
+            continue;
+          }
+          if (ch === "$" && text5[i + 1] === "{") {
+            templates.push(false);
+            depths.push(0);
+            i++;
+          }
+          continue;
+        }
+        if (ch === "\\") {
+          i++;
+          continue;
+        }
+        if (ch === '"' || ch === "'") {
+          const quote = ch;
+          for (i++; i < text5.length; i++) {
+            if (text5[i] === "\\") {
+              i++;
+              continue;
+            }
+            if (text5[i] === quote) break;
+          }
+          continue;
+        }
+        if (ch === "`") {
+          templates.push(true);
+          depths.push(0);
+          continue;
+        }
+        if (ch === "/" && text5[i + 1] === "/") {
+          while (i < text5.length && text5[i] !== "\n") i++;
+          continue;
+        }
+        if (ch === "/" && text5[i + 1] === "*") {
+          i = text5.indexOf("*/", i + 2);
+          if (i < 0) return -1;
+          i++;
+          continue;
+        }
+        if (ch === "{") {
+          depths[depths.length - 1]++;
+          continue;
+        }
+        if (ch === "}") {
+          if (depths[depths.length - 1] === 0 && templates.length > 1) {
+            templates.pop();
+            depths.pop();
+            continue;
+          }
+          depths[depths.length - 1]--;
+          if (depths.length === 1 && depths[0] === 0) return i;
+        }
+      }
+      return -1;
+    };
+    const passthroughSites = source.includes(marker) ? 1 : (source.match(/\)return process\.env;let [\w$]+=\{/g) ?? []).length;
+    if (passthroughSites !== 1) {
+      log12("FAIL", patchName, "child env passthrough appears " + passthroughSites + " times (expected 1)");
+      fail("clodex patch: required patch failed: " + patchName);
+    }
     applyOnce(
       patchName,
-      /(function [\w$]+\(\)\{)(let [\w$]+=[\w$]+\(\),[\w$]+=Object\.keys\([\w$]+\)\.length>0,[^;{}]*?[\w$]+=[\w$]+\(process\.env\.CLAUDE_CODE_REMOTE\)\?(?:(?!\}\s*function )[\s\S])*?for\(let [\w$]+ of [\w$]+\)delete [\w$]+\[[\w$]+\],delete [\w$]+\[`INPUT_\$\{[\w$]+\}`\];return [\w$]+)(\})/,
-      (_match, head, body, tail) => {
-        const targetIsValid = requiredBodyLiterals.every((literal) => body.includes(literal)) && !/\bfunction\s*[\w$]*\(/.test(body);
+      /(function [\w$]+\(\)\{)(let (?:[^;{}]|\{[^;{}]*\})*?[\w$]+\(process\.env\.CLAUDE_CODE_REMOTE\)\?(?:(?!\}\s*function )[\s\S])*?\)return process\.env;let ([\w$]+)=\{(?:(?!\}\s*function )[\s\S])*?return \3)(\})/,
+      (match, head, body, _copyVar, tail) => {
+        const at = js.indexOf(match);
+        const bound = at < 0 ? -1 : blockEndIndex(js, at + head.length - 1) - at - (match.length - 1);
+        const targetIsValid = requiredBodyLiterals.every((literal) => body.includes(literal)) && !/\bfunction\s*[\w$]*\(/.test(body) && bound === 0;
         if (!targetIsValid) {
           log12("FAIL", patchName, "target validation failed");
           fail("clodex patch: child network environment target validation failed");