theclawbay 0.3.69 → 0.3.71

package/dist/lib/codex-model-cache-migration.js

@@ -26,6 +26,7 @@ const SEED_MARKER_KEY = "_theclawbay_seeded";
 const SEED_MARKER_VALUE = "theclawbay";
 const LEGACY_SEED_MARKER_VALUES = new Set([...TRACKED_MODEL_ID_SET, SEED_MARKER_VALUE, true]);
 const SEEDED_CACHE_FRESHNESS_ISO = "2099-12-31T23:59:59.000Z";
+const MINIMUM_CATALOG_CLIENT_VERSION = "0.124.0";
 function objectRecordOr(value) {
     if (typeof value === "object" && value !== null && !Array.isArray(value)) {
         return value;
@@ -64,7 +65,7 @@ function fingerprintModel(model) {
 async function readJsonIfExists(filePath) {
     try {
         const raw = await promises_1.default.readFile(filePath, "utf8");
-        return JSON.parse(raw);
+        return JSON.parse(raw.replace(/^\uFEFF/, ""));
     }
     catch (error) {
         const err = error;
@@ -73,6 +74,29 @@ async function readJsonIfExists(filePath) {
         throw error;
     }
 }
+async function readModelsCacheIfExists(filePath) {
+    try {
+        const raw = await promises_1.default.readFile(filePath, "utf8");
+        const hadBom = raw.charCodeAt(0) === 0xfeff;
+        try {
+            return { exists: true, parsed: JSON.parse(raw.replace(/^\uFEFF/, "")), hadBom };
+        }
+        catch (error) {
+            return {
+                exists: true,
+                parsed: null,
+                hadBom,
+                parseError: error instanceof Error ? error.message : String(error),
+            };
+        }
+    }
+    catch (error) {
+        const err = error;
+        if (err.code === "ENOENT")
+            return { exists: false, parsed: null, hadBom: false };
+        throw error;
+    }
+}
 async function removeFileIfExists(filePath) {
     try {
         await promises_1.default.unlink(filePath);
@@ -146,9 +170,6 @@ async function writePatchState(statePath, fingerprints) {
     }, null, 2);
     await promises_1.default.writeFile(statePath, `${contents}\n`, "utf8");
 }
-function findModel(models, slug) {
-    return models.find((entry) => entry.slug === slug) ?? null;
-}
 function hasSeedMarker(model) {
     return LEGACY_SEED_MARKER_VALUES.has(model[SEED_MARKER_KEY]);
 }
@@ -361,6 +382,51 @@ async function inferCodexClientVersionsFromInstalledExtensions() {
     }
     return [...versions];
 }
+function desktopAppCodexBinaryCandidates() {
+    const candidates = [];
+    const home = node_os_1.default.homedir();
+    if (node_os_1.default.platform() === "darwin") {
+        for (const appRoot of [
+            "/Applications/Codex.app",
+            "/Applications/OpenAI Codex.app",
+            node_path_1.default.join(home, "Applications", "Codex.app"),
+            node_path_1.default.join(home, "Applications", "OpenAI Codex.app"),
+        ]) {
+            candidates.push(node_path_1.default.join(appRoot, "Contents", "Resources", "codex"), node_path_1.default.join(appRoot, "Contents", "Resources", "app", "resources", "codex"));
+        }
+    }
+    if (node_os_1.default.platform() === "win32" || isWslInteropRuntime()) {
+        const installLocations = readWindowsCommandStdout("Get-AppxPackage OpenAI.Codex | ForEach-Object { $_.InstallLocation }");
+        if (installLocations) {
+            for (const installLocation of installLocations.split("\n")) {
+                const hostPath = resolveWindowsPathForHost(installLocation);
+                if (!hostPath)
+                    continue;
+                candidates.push(node_path_1.default.join(hostPath, "app", "resources", "codex.exe"));
+            }
+        }
+    }
+    return uniqueStrings(candidates);
+}
+async function inferCodexClientVersionsFromInstalledDesktopApps() {
+    const versions = new Set();
+    for (const candidate of desktopAppCodexBinaryCandidates()) {
+        if (!(await pathExists(candidate)))
+            continue;
+        const parsed = runVersionCommand(candidate, ["--version"]);
+        versions.add(parsed ?? MINIMUM_CATALOG_CLIENT_VERSION);
+    }
+    return [...versions];
+}
+function preferredPickerCacheClientVersion(pickerVersions) {
+    const compatible = pickerVersions.some((version) => compareCodexVersions(version, MINIMUM_CATALOG_CLIENT_VERSION) >= 0);
+    if (!compatible)
+        return null;
+    // The shared models_cache.json is accepted by newer picker builds when stamped
+    // with the oldest model-catalog version, but older app builds reject a cache
+    // stamped with a newer VS Code/CLI version.
+    return MINIMUM_CATALOG_CLIENT_VERSION;
+}
 async function inferCodexClientVersionFromVersionJson(codexHome) {
     const parsed = await readJsonIfExists(node_path_1.default.join(codexHome, "version.json"));
     const obj = objectRecordOr(parsed);
@@ -474,7 +540,13 @@ async function inferCodexClientVersion(codexHome) {
                 versions.push(parsed);
         }
     }
-    versions.push(...await inferCodexClientVersionsFromInstalledExtensions());
+    const pickerVersions = [
+        ...await inferCodexClientVersionsFromInstalledDesktopApps(),
+        ...await inferCodexClientVersionsFromInstalledExtensions(),
+    ];
+    const pickerCacheClientVersion = preferredPickerCacheClientVersion(pickerVersions);
+    if (pickerCacheClientVersion)
+        return pickerCacheClientVersion;
     const versionJsonVersion = await inferCodexClientVersionFromVersionJson(codexHome);
     if (versionJsonVersion)
         versions.push(versionJsonVersion);
@@ -497,16 +569,19 @@ async function ensureCodexModelCacheHasGpt54(params) {
     const statePath = node_path_1.default.join(params.codexHome, MODELS_CACHE_STATE_FILE);
     try {
         const existingState = await readPatchState(statePath);
-        const parsed = await readJsonIfExists(cachePath);
+        const cacheRead = await readModelsCacheIfExists(cachePath);
+        const parsed = cacheRead.parsed;
         const catalogModels = buildCatalogModels();
         const catalogModelMap = buildCatalogModelMap();
-        if (parsed === null) {
+        if (!cacheRead.exists || parsed === null) {
             const clientVersion = await inferCodexClientVersion(params.codexHome);
             if (!clientVersion) {
                 await removeFileIfExists(statePath);
                 return {
                     action: "skipped",
-                    warning: "Codex models cache was not found, and Codex version could not be inferred for a safe The Claw Bay model catalog refresh.",
+                    warning: cacheRead.exists
+                        ? "Codex models cache is not valid JSON, and Codex version could not be inferred for a safe The Claw Bay model catalog repair."
+                        : "Codex models cache was not found, and Codex version could not be inferred for a safe The Claw Bay model catalog refresh.",
                 };
             }
             const docModels = cloneJson(catalogModels);
@@ -522,7 +597,7 @@ async function ensureCodexModelCacheHasGpt54(params) {
             await promises_1.default.mkdir(params.codexHome, { recursive: true });
             await promises_1.default.writeFile(cachePath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
             await writePatchState(statePath, nextState);
-            return { action: "created" };
+            return { action: cacheRead.exists ? "refreshed" : "created" };
         }
         const doc = normalizeCacheDocument(parsed);
         if (!doc) {
@@ -533,7 +608,7 @@ async function ensureCodexModelCacheHasGpt54(params) {
         }
         const clientVersion = (await inferCodexClientVersion(params.codexHome)) ??
             (typeof doc.client_version === "string" && doc.client_version ? doc.client_version : null);
-        let changed = false;
+        let changed = cacheRead.hadBom;
         let seeded = false;
         const currentCatalogEntries = new Map();
         const rest = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theclawbay",
-  "version": "0.3.69",
+  "version": "0.3.71",
   "description": "CLI for connecting Codex, Continue, Cline, GSD, OpenClaw, OpenCode, Kilo, Roo Code, Aider, experimental Trae, and experimental Zo to The Claw Bay.",
   "license": "MIT",
   "repository": {