theclawbay 0.3.68 → 0.3.70

package/dist/commands/setup.js

@@ -28,7 +28,9 @@ const DEFAULT_PROVIDER_ID = "theclawbay";
 const CLI_HTTP_USER_AGENT = "theclawbay-cli";
 const SUPPORTED_MODEL_IDS = (0, supported_models_1.getSupportedModelIds)();
 const MODEL_DISPLAY_NAMES = (0, supported_models_1.getSupportedModelDisplayNames)();
-const DEFAULT_CODEX_MODEL = SUPPORTED_MODEL_IDS.includes("gpt-5.4") ? "gpt-5.4" : (SUPPORTED_MODEL_IDS[0] ?? "gpt-5.4");
+const DEFAULT_CODEX_MODEL = (["gpt-5.5", "gpt-5.4"].find((modelId) => SUPPORTED_MODEL_IDS.includes(modelId)) ??
+    SUPPORTED_MODEL_IDS[0] ??
+    "gpt-5.4");
 const DEFAULT_CONTINUE_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_CLINE_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_OPENCLAW_MODEL = DEFAULT_CODEX_MODEL;

package/dist/lib/codex-desktop-model-picker.js

@@ -40,6 +40,16 @@ function readWindowsCommandStdout(command) {
     const output = result.stdout.replace(/\r/g, "").trim();
     return output || null;
 }
+function desktopClientsLikelyRunning() {
+    if (node_os_1.default.platform() === "win32" || isWslInteropRuntime()) {
+        const running = readWindowsCommandStdout("Get-Process Code,Codex -ErrorAction SilentlyContinue | Select-Object -ExpandProperty ProcessName");
+        return Boolean(running);
+    }
+    const result = (0, node_child_process_1.spawnSync)("sh", ["-lc", "pgrep -if '(^|/)(code|codex)$' >/dev/null"], {
+        stdio: "ignore",
+    });
+    return result.status === 0;
+}
 function resolveWindowsPathForHost(input) {
     if (!input)
         return null;
@@ -333,31 +343,18 @@ function buildStatsigPatchScript() {
         "    finally:",
         "        db.close()",
         "    print(json.dumps(result))",
-    ].join("\\n");
+    ].join("\n");
 }
-async function patchDesktopStatsigCaches() {
-    const dbDirs = await desktopStatsigLevelDbCandidates();
-    if (dbDirs.length === 0)
-        return { patched: 0, warnings: [] };
-    const python = await ensureLocalPythonWithLevelDbSupport();
-    if (!python) {
-        return {
-            patched: 0,
-            warnings: [
-                "Could not install the local desktop model-picker helper, so Codex app model labels may stay stale until the next supported cache refresh.",
-            ],
-        };
-    }
-    const run = (0, node_child_process_1.spawnSync)(python.command, [...python.args, "-c", buildStatsigPatchScript(), JSON.stringify(DESKTOP_MODEL_IDS), ...dbDirs], {
+function patchStatsigCache(python, dbDir) {
+    const run = (0, node_child_process_1.spawnSync)(python.command, [...python.args, "-c", buildStatsigPatchScript(), JSON.stringify(DESKTOP_MODEL_IDS), dbDir], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"],
     });
     if (run.status !== 0) {
+        const detail = (run.stderr || run.stdout || "").trim();
         return {
             patched: 0,
-            warnings: [
-                "Could not refresh the desktop model-picker cache. Close Codex app / VS Code and rerun setup if the picker still shows Custom.",
-            ],
+            warning: detail ? `${dbDir}: ${detail}` : `${dbDir}: desktop cache helper exited with status ${run.status}`,
         };
     }
     let patched = 0;
@@ -368,7 +365,7 @@ async function patchDesktopStatsigCaches() {
             const parsed = JSON.parse(line);
             patched += typeof parsed.patched === "number" ? parsed.patched : 0;
             if (typeof parsed.error === "string" && parsed.error.trim()) {
-                const dbLabel = typeof parsed.db === "string" ? parsed.db : "desktop cache";
+                const dbLabel = typeof parsed.db === "string" ? parsed.db : dbDir;
                 warnings.push(`${dbLabel}: ${parsed.error.trim()}`);
             }
         }
@@ -376,7 +373,45 @@ async function patchDesktopStatsigCaches() {
             continue;
         }
     }
-    return { patched, warnings };
+    return { patched, warning: warnings.length > 0 ? warnings.join(" ") : undefined };
+}
+async function patchDesktopStatsigCaches() {
+    const dbDirs = await desktopStatsigLevelDbCandidates();
+    if (dbDirs.length === 0)
+        return { patched: 0, warnings: [] };
+    const python = await ensureLocalPythonWithLevelDbSupport();
+    if (!python) {
+        return {
+            patched: 0,
+            warnings: [
+                "Could not install the local desktop model-picker helper, so Codex app model labels may stay stale until the next supported cache refresh.",
+            ],
+        };
+    }
+    let patched = 0;
+    const warnings = [];
+    for (const dbDir of dbDirs) {
+        const result = patchStatsigCache(python, dbDir);
+        patched += result.patched;
+        if (result.warning)
+            warnings.push(result.warning);
+    }
+    if (patched === 0 && warnings.length > 0) {
+        const prefix = desktopClientsLikelyRunning()
+            ? "Could not refresh the desktop model-picker cache because VS Code or Codex app is still running."
+            : "Could not refresh the desktop model-picker cache.";
+        return {
+            patched,
+            warnings: [`${prefix} ${warnings.join(" ")}`],
+        };
+    }
+    if (patched > 0 && warnings.length > 0) {
+        const filteredWarnings = warnings.filter((warning) => !/does not exist|No such file/i.test(warning));
+        if (filteredWarnings.length > 0) {
+            return { patched, warnings: filteredWarnings };
+        }
+    }
+    return { patched, warnings: [] };
 }
 async function ensureCodexDesktopModelPickerSupport() {
     try {

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

@@ -64,7 +64,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 +73,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 +169,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]);
 }
@@ -497,16 +517,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 +545,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 +556,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.68",
+  "version": "0.3.70",
   "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": {