theclawbay 0.3.80 → 0.3.81

package/dist/commands/setup.js

@@ -1306,6 +1306,7 @@ async function promptForSetupClients(clients) {
             }
         };
         (0, node_readline_1.emitKeypressEvents)(stdin);
+        stdin.resume();
         if (stdin.isTTY)
             stdin.setRawMode(true);
         stdout.write("\x1b[?25l");
@@ -1358,6 +1359,7 @@ async function promptForCodexConversationMigration() {
     }
     finally {
         rl.close();
+        process.stdin.resume();
     }
 }
 async function resolveCodexConversationMigrationSelection(params) {
@@ -1387,6 +1389,7 @@ async function resolveDeviceLabel(params) {
     }
     finally {
         rl.close();
+        process.stdin.resume();
     }
 }
 async function promptForGroupedModelSelection(params) {
@@ -1548,6 +1551,7 @@ async function promptForGroupedModelSelection(params) {
         resolvePromise = resolve;
     });
     (0, node_readline_1.emitKeypressEvents)(stdin);
+    stdin.resume();
     if (stdin.isTTY)
         stdin.setRawMode(true);
     stdout.write("\x1b[?25l");
@@ -1630,6 +1634,7 @@ async function promptForPrimaryModel(models, defaultModel) {
         resolvePromise = resolve;
     });
     (0, node_readline_1.emitKeypressEvents)(stdin);
+    stdin.resume();
     if (stdin.isTTY)
         stdin.setRawMode(true);
     stdout.write("\x1b[?25l");
@@ -2018,7 +2023,7 @@ function isOpenAiCompatibleSetupModelId(modelId) {
     const trimmed = modelId.trim();
     if (!trimmed)
         return false;
-    return !trimmed.startsWith("claude-");
+    return !trimmed.startsWith("claude-") && SUPPORTED_MODEL_IDS.includes(trimmed);
 }
 function formatDotEnvValue(value) {
     return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
@@ -2101,7 +2106,7 @@ async function writeHermesConfig(params) {
 }
 async function resolveModels(backendUrl, apiKey) {
     const { ids, failure } = await fetchBackendModelIds(backendUrl, apiKey);
-    const filteredIds = (ids ?? []).filter(isOpenAiCompatibleSetupModelId);
+    const filteredIds = uniqueStrings((ids ?? []).filter(isOpenAiCompatibleSetupModelId));
     const available = new Set(filteredIds);
     let selected = DEFAULT_CODEX_MODEL;
     let note;
@@ -2128,10 +2133,14 @@ async function resolveModels(backendUrl, apiKey) {
         unique.push(modelId);
     };
     pushUnique(selected);
-    for (const modelId of DEFAULT_MODELS)
-        pushUnique(modelId);
-    for (const modelId of filteredIds)
-        pushUnique(modelId);
+    if (filteredIds.length > 0) {
+        for (const modelId of filteredIds)
+            pushUnique(modelId);
+    }
+    else {
+        for (const modelId of DEFAULT_MODELS)
+            pushUnique(modelId);
+    }
     return {
         model: selected,
         models: unique.map((modelId) => ({ id: modelId, name: modelDisplayName(modelId) || prettyModelId(modelId) })),
@@ -3803,6 +3812,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                             this.log(`  - ${modelId}${marker}`);
                         }
                     }
+                    return;
                 }
                 const claudeSelected = selectedSetupClients.has("claude");
                 const claudeEnvEnabled = claudeSelected && claudeAccess.enabled;

package/dist/lib/backups.js

@@ -30,6 +30,21 @@ function shellRcTargets() {
         kind: "file",
     }));
 }
+function codexTargets() {
+    return [
+        ["codex-config", "Codex config", node_path_1.default.join(paths_1.codexDir, "config.toml"), "file"],
+        ["codex-auth", "Codex auth state", node_path_1.default.join(paths_1.codexDir, "auth.json"), "file"],
+        ["codex-credentials", "Codex credentials", node_path_1.default.join(paths_1.codexDir, ".credentials.json"), "file"],
+        ["codex-accounts", "Codex accounts directory", node_path_1.default.join(paths_1.codexDir, "accounts"), "directory"],
+        ["codex-managed", "Codex The Claw Bay managed state", node_path_1.default.join(paths_1.codexDir, "theclawbay.managed.json"), "file"],
+        ["codex-model-cache", "Codex model cache", node_path_1.default.join(paths_1.codexDir, "models_cache.json"), "file"],
+    ].map(([id, label, targetPath, kind]) => ({
+        id,
+        label,
+        targetPath,
+        kind: kind,
+    }));
+}
 function editorSettingsTargets() {
     const home = node_os_1.default.homedir();
     const targets = [];
@@ -59,12 +74,6 @@ function backupTargets() {
             targetPath: paths_1.theclawbayConfigDir,
             kind: "directory",
         },
-        {
-            id: "codex-home",
-            label: "Codex home directory",
-            targetPath: paths_1.codexDir,
-            kind: "directory",
-        },
         {
             id: "continue-home",
             label: "Continue config directory",
@@ -127,7 +136,7 @@ function backupTargets() {
         },
     ];
     const deduped = new Map();
-    for (const target of [...targets, ...shellRcTargets(), ...editorSettingsTargets()]) {
+    for (const target of [...targets, ...codexTargets(), ...shellRcTargets(), ...editorSettingsTargets()]) {
         deduped.set(target.targetPath, target);
     }
     return [...deduped.values()];
@@ -174,7 +183,13 @@ function formatBackupTimestamp(isoString) {
 }
 async function createBackup(reason) {
     const now = new Date();
-    const id = backupIdFromDate(now);
+    const baseId = backupIdFromDate(now);
+    let id = baseId;
+    let suffix = 2;
+    while (await pathExists(node_path_1.default.join(paths_1.theclawbayBackupDir, id))) {
+        id = `${baseId}-${suffix}`;
+        suffix += 1;
+    }
     const backupDirectory = node_path_1.default.join(paths_1.theclawbayBackupDir, id);
     const snapshotRoot = node_path_1.default.join(backupDirectory, "files");
     await ensureCleanDirectory(snapshotRoot);

package/package.json

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