theclawbay 0.3.79 → 0.3.81

package/dist/commands/setup.js

@@ -672,6 +672,54 @@ function shellQuote(value) {
 function powerShellQuote(value) {
     return `'${value.replace(/'/g, "''")}'`;
 }
+function shellCommandForCurrentPlatform(command) {
+    if (node_os_1.default.platform() === "win32") {
+        return { executable: "cmd.exe", args: ["/c", command] };
+    }
+    return { executable: "bash", args: ["-lc", command] };
+}
+function installPlanForSetupClient(clientId) {
+    if (clientId === "codex") {
+        return {
+            summary: "Install Codex CLI",
+            command: "npm install -g @openai/codex",
+        };
+    }
+    if (clientId === "claude") {
+        return {
+            summary: "Install Claude Code CLI",
+            command: "npm install -g @anthropic-ai/claude-code",
+        };
+    }
+    if (clientId === "opencode") {
+        return {
+            summary: "Install OpenCode CLI",
+            command: "npm install -g opencode-ai",
+        };
+    }
+    if (clientId === "aider") {
+        return {
+            summary: "Install Aider",
+            command: node_os_1.default.platform() === "win32"
+                ? "py -m pip install --user --upgrade aider-chat"
+                : "python3 -m pip install --user --upgrade aider-chat",
+        };
+    }
+    return null;
+}
+function isSetupClientInstallable(clientId) {
+    return installPlanForSetupClient(clientId) !== null;
+}
+function runInstallPlan(plan) {
+    const { executable, args } = shellCommandForCurrentPlatform(plan.command);
+    const run = (0, node_child_process_1.spawnSync)(executable, args, {
+        stdio: "inherit",
+        env: process.env,
+    });
+    if (run.status === 0)
+        return;
+    throw new Error(`${plan.summary} failed.`);
+}
 function modelDisplayName(modelId) {
     return MODEL_DISPLAY_NAMES[modelId] ?? prettyModelId(modelId);
 }
@@ -1149,17 +1197,18 @@ async function promptForSetupClients(clients) {
             stdout.write(`${paint("Move to Apply setup and press Enter when you're ready.", ansi.dim, ansi.gray)}\n\n`);
             for (const [index, option] of options.entries()) {
                 const pointer = index === cursor ? paint(">", ansi.bold) : " ";
-                const mark = option.detected
+                const selectable = option.detected || option.installable;
+                const mark = selectable
                     ? option.checked
                         ? paint("[x]", ansi.green, ansi.bold)
                         : paint("[ ]", ansi.gray)
                     : paint("[-]", ansi.red, ansi.bold);
                 const badge = option.detected
-                    ? option.recommended
-                        ? paint("recommended", ansi.green)
-                        : paint("optional", ansi.yellow)
-                    : paint("not detected", ansi.red);
-                const label = option.detected
+                    ? paint("found", ansi.green)
+                    : option.installable
+                        ? paint(option.checked ? "will install" : "available to install", ansi.yellow)
+                        : paint("not found", ansi.red);
+                const label = selectable
                     ? formatSetupClientLabel(option, hyperlinksEnabled)
                     : paint(formatSetupClientLabel(option, hyperlinksEnabled), ansi.dim, ansi.gray);
                 stdout.write(`${pointer} ${index + 1}. ${mark} ${label}  ${badge}\n`);
@@ -1189,13 +1238,18 @@ async function promptForSetupClients(clients) {
             if (!option)
                 return;
             cursor = index;
-            if (!option.detected) {
+            if (!option.detected && !option.installable) {
                 hint = `${option.label} is not detected on this machine yet, so it cannot be selected.`;
                 render();
                 return;
             }
             option.checked = !option.checked;
-            hint = `${option.label} ${option.checked ? "selected" : "cleared"}.`;
+            if (option.checked && !option.detected && option.installable) {
+                hint = `${option.label} selected. Setup will install it first.`;
+            }
+            else {
+                hint = `${option.label} ${option.checked ? "selected" : "cleared"}.`;
+            }
             render();
         };
         const onKeypress = (_str, key) => {
@@ -1252,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");
@@ -1265,7 +1320,7 @@ function resolveSetupClientSelection(params) {
         for (const client of setupClients) {
             if (!flagSelection.has(client.id))
                 continue;
-            if (!client.detected) {
+            if (!client.detected && !client.installable) {
                 throw new Error(`${client.label} is not detected on this machine, so it cannot be selected yet.`);
             }
         }
@@ -1276,6 +1331,20 @@ function resolveSetupClientSelection(params) {
         return Promise.resolve(defaults);
     return promptForSetupClients(setupClients);
 }
+function installSelectedMissingClients(params) {
+    const installed = [];
+    for (const client of params.setupClients) {
+        if (!params.selectedClientIds.has(client.id) || client.detected || !client.installable)
+            continue;
+        const plan = installPlanForSetupClient(client.id);
+        if (!plan)
+            continue;
+        params.log(`Installing ${client.summaryLabel}...`);
+        runInstallPlan(plan);
+        installed.push(client.summaryLabel);
+    }
+    return installed;
+}
 async function promptForCodexConversationMigration() {
     if (!process.stdin.isTTY || !process.stdout.isTTY)
         return false;
@@ -1290,6 +1359,7 @@ async function promptForCodexConversationMigration() {
     }
     finally {
         rl.close();
+        process.stdin.resume();
     }
 }
 async function resolveCodexConversationMigrationSelection(params) {
@@ -1319,6 +1389,7 @@ async function resolveDeviceLabel(params) {
     }
     finally {
         rl.close();
+        process.stdin.resume();
     }
 }
 async function promptForGroupedModelSelection(params) {
@@ -1480,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");
@@ -1562,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");
@@ -1950,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, '\\"')}"`;
@@ -2033,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;
@@ -2060,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) })),
@@ -3485,6 +3562,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Codex",
                     detected: codexDetected,
                     recommended: true,
+                    installable: true,
                     icon: "◎",
                     siteUrl: "https://openai.com/codex",
                 },
@@ -3494,6 +3572,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Claude",
                     detected: claudeDetected,
                     recommended: true,
+                    installable: true,
                     icon: "✳",
                     siteUrl: "https://code.claude.com",
                 },
@@ -3503,6 +3582,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Continue",
                     detected: continueDetected,
                     recommended: true,
+                    installable: false,
                     icon: "▶",
                     siteUrl: "https://continue.dev",
                 },
@@ -3512,6 +3592,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Cline",
                     detected: clineDetected,
                     recommended: true,
+                    installable: false,
                     icon: "◈",
                     siteUrl: "https://cline.bot",
                 },
@@ -3521,6 +3602,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "GSD",
                     detected: gsdDetected,
                     recommended: true,
+                    installable: false,
                     icon: "▣",
                     siteUrl: "https://github.com/gsd-build/gsd-2",
                 },
@@ -3530,6 +3612,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "OpenClaw",
                     detected: hasCommand("openclaw"),
                     recommended: true,
+                    installable: false,
                     icon: "🦞",
                     siteUrl: "https://openclaw.ai",
                 },
@@ -3539,6 +3622,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "OpenCode",
                     detected: openCodeDetected,
                     recommended: true,
+                    installable: true,
                     icon: "⌘",
                     siteUrl: "https://opencode.ai",
                 },
@@ -3548,6 +3632,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Kilo Code",
                     detected: kiloDetected,
                     recommended: true,
+                    installable: false,
                     icon: "⚡",
                     siteUrl: "https://kilo.ai",
                 },
@@ -3557,6 +3642,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Roo Code",
                     detected: rooDetected,
                     recommended: true,
+                    installable: false,
                     icon: "🦘",
                     siteUrl: "https://roocode.com",
                 },
@@ -3566,6 +3652,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Trae",
                     detected: traeDetected,
                     recommended: false,
+                    installable: false,
                     icon: "△",
                     siteUrl: "https://www.trae.ai",
                 },
@@ -3575,6 +3662,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Aider",
                     detected: aiderDetected,
                     recommended: true,
+                    installable: true,
                     icon: "✦",
                     siteUrl: "https://aider.chat",
                 },
@@ -3584,6 +3672,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Zo",
                     detected: zoDetected,
                     recommended: false,
+                    installable: false,
                     icon: "◉",
                     siteUrl: "https://www.zo.computer",
                 },
@@ -3593,6 +3682,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                     summaryLabel: "Hermes",
                     detected: hermesDetected,
                     recommended: true,
+                    installable: false,
                     icon: "☿",
                     siteUrl: "https://hermes-agent.nousresearch.com/docs/",
                 },
@@ -3602,6 +3692,11 @@ class SetupCommand extends base_command_1.BaseCommand {
                 flagSelection: parseSetupClientFlags(flags.clients),
                 skipPrompt: flags.yes,
             });
+            const installedMissingClients = installSelectedMissingClients({
+                setupClients,
+                selectedClientIds: selectedSetupClients,
+                log: (message) => this.log(message),
+            });
             const migrateCodexConversations = await resolveCodexConversationMigrationSelection({
                 codexSelected: selectedSetupClients.has("codex"),
                 flagValue: flags["migrate-conversations"],
@@ -3654,6 +3749,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             let authSeedCleanup = null;
             let stateDbMigration = null;
             let modelCacheMigration = null;
+            let installedClientsSummary = installedMissingClients;
             let continueConfigPath = null;
             let clineConfigPaths = [];
             let gsdConfigPaths = [];
@@ -3716,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;
@@ -3923,6 +4020,9 @@ class SetupCommand extends base_command_1.BaseCommand {
             if (backupSummary) {
                 summaryNotes.add(`Created a local backup snapshot (${backupSummary.id}) before changing client configs.`);
             }
+            if (installedClientsSummary.length > 0) {
+                summaryNotes.add(`Installed missing clients: ${installedClientsSummary.join(", ")}.`);
+            }
             if (selectedSetupClients.has("claude") && claudeAccess?.enabled) {
                 summaryNotes.add("Claude Code: exported ANTHROPIC_BASE_URL and ANTHROPIC_API_KEY.");
                 if (claudeDesktop3pConfigPathManaged) {
@@ -3977,6 +4077,9 @@ class SetupCommand extends base_command_1.BaseCommand {
             this.log(`- Managed config: ${paths_1.managedConfigPath}`);
             this.log(`- Backend: ${backendUrl}`);
             this.log(`- Auth mode: ${authType}`);
+            if (installedClientsSummary.length > 0) {
+                this.log(`- Installed missing clients: ${installedClientsSummary.join(", ")}`);
+            }
             if (backupSummary) {
                 this.log(`- Backup: ${backupSummary.id} (${backupSummary.directory})`);
             }

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.79",
+  "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": {