@bman654/clodex 2.6.0 → 2.6.2

package/dist/cli.js

@@ -374,7 +374,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.6.0",
+  version: "2.6.2",
   publishConfig: {
     access: "public"
   },
@@ -16822,21 +16822,36 @@ function parseBunModuleNamesAtUnchecked(fd, offsetsAt) {
   }
   return { names, entryPointId, offsets: nameOffsets };
 }
-function assertShimGone(fd, fileSize, marker) {
+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;
-    if (window.includes(needle)) {
-      throw new Error(`the entry-module stand-in ${marker} survived restoration`);
+    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);
@@ -16861,6 +16876,9 @@ function shimEntryModuleName(path) {
     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))) {
+      return null;
+    }
     writeNameBytes(fd, marker, offset);
     return { offset, original, marker };
   } finally {
@@ -16879,7 +16897,7 @@ function restoreEntryModuleName(path, shim, { resign }) {
       );
     }
     writeNameBytes(fd, shim.original, offset);
-    assertShimGone(fd, statSync4(path).size, shim.marker);
+    restoreEveryStandIn(fd, statSync4(path).size, shim);
     machO = resign && isMachO(fd);
   } finally {
     closeSync4(fd);
@@ -17043,7 +17061,7 @@ function collectPristineFacts(args) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 6;
+var PATCH_TRANSFORMS_VERSION = 7;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -17222,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 }
       );
     }