@bman654/clodex 2.18.1 → 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.1",
+  version: "2.18.2",
   publishConfig: {
     access: "public"
   },
@@ -3438,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) {
@@ -3616,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)];
@@ -3641,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) {
@@ -4147,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) {
@@ -4214,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;/