genbox 1.0.13 → 1.0.15

package/dist/commands/connect.js

@@ -41,6 +41,7 @@ const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
+const ssh_config_1 = require("../ssh-config");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -80,9 +81,13 @@ exports.connectCommand = new commander_1.Command('connect')
             console.error(chalk_1.default.yellow(`Genbox '${target.name}' is still provisioning (no IP). Please wait.`));
             return;
         }
-        // 2. Get Key
+        // 2. Ensure SSH config exists (in case background setup hasn't finished)
+        if (!(0, ssh_config_1.hasSshConfigEntry)(target.name)) {
+            (0, ssh_config_1.addSshConfigEntry)({ name: target.name, ipAddress: target.ipAddress });
+        }
+        // 3. Get Key
         const keyPath = getPrivateSshKey();
-        // 3. Connect
+        // 4. Connect
         console.log(chalk_1.default.dim(`Connecting to ${chalk_1.default.bold(target.name)} (${target.ipAddress})...`));
         const sshArgs = [
             '-i', keyPath,

package/dist/commands/create.js

@@ -48,64 +48,22 @@ const config_loader_1 = require("../config-loader");
 const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const ssh_config_1 = require("../ssh-config");
+const schema_v4_1 = require("../schema-v4");
 const child_process_1 = require("child_process");
 /**
- * Poll for genbox IP address (servers take a few seconds to get an IP assigned)
+ * Spawn a background process to poll for IP and add SSH config
+ * This runs detached so the main process can exit immediately
  */
-async function waitForIpAddress(genboxId, maxAttempts = 30, delayMs = 2000) {
-    for (let i = 0; i < maxAttempts; i++) {
-        try {
-            const genbox = await (0, api_1.fetchApi)(`/genboxes/${genboxId}`);
-            if (genbox.ipAddress) {
-                return genbox.ipAddress;
-            }
-        }
-        catch {
-            // Ignore errors during polling
-        }
-        await new Promise(resolve => setTimeout(resolve, delayMs));
-    }
-    return null;
-}
-/**
- * Find SSH private key
- */
-function findSshKeyPath() {
-    const home = os.homedir();
-    const keyPaths = [
-        path.join(home, '.ssh', 'id_ed25519'),
-        path.join(home, '.ssh', 'id_rsa'),
-    ];
-    for (const keyPath of keyPaths) {
-        if (fs.existsSync(keyPath)) {
-            return keyPath;
-        }
-    }
-    return null;
-}
-/**
- * Wait for SSH to be available on the server
- */
-async function waitForSsh(ipAddress, maxAttempts = 30, delayMs = 5000) {
-    const keyPath = findSshKeyPath();
-    if (!keyPath)
-        return false;
-    const sshOpts = `-i ${keyPath} -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -o ConnectTimeout=5`;
-    for (let i = 0; i < maxAttempts; i++) {
-        try {
-            (0, child_process_1.execSync)(`ssh ${sshOpts} dev@${ipAddress} "echo 'SSH ready'"`, {
-                encoding: 'utf8',
-                timeout: 10000,
-                stdio: ['pipe', 'pipe', 'pipe'],
-            });
-            return true;
-        }
-        catch {
-            // SSH not ready yet
-        }
-        await new Promise(resolve => setTimeout(resolve, delayMs));
-    }
-    return false;
+function spawnSshConfigSetup(genboxId, name) {
+    // Get the path to the CLI executable
+    const cliPath = process.argv[1];
+    // Spawn genbox ssh-setup in background
+    const child = (0, child_process_1.spawn)(process.execPath, [cliPath, 'ssh-setup', genboxId, name], {
+        detached: true,
+        stdio: 'ignore',
+    });
+    // Allow parent to exit independently
+    child.unref();
 }
 async function provisionGenbox(payload) {
     return (0, api_1.fetchApi)('/genboxes', {
@@ -159,11 +117,13 @@ exports.createCommand = new commander_1.Command('create')
         // Load configuration
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        if (!loadResult.config || loadResult.config.version !== '3.0') {
+        const configVersion = (0, schema_v4_1.getConfigVersion)(loadResult.config);
+        if (!loadResult.config || configVersion === 'unknown') {
             // Fall back to legacy v1/v2 handling
             await createLegacy(name, options);
             return;
         }
+        // Support both v3 and v4 configs
         const config = loadResult.config;
         const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
         // Build create options
@@ -210,7 +170,8 @@ exports.createCommand = new commander_1.Command('create')
         const publicKey = getPublicSshKey();
         // Check if SSH auth is needed for git
         let privateKeyContent;
-        const usesSSH = config.git_auth?.method === 'ssh' ||
+        const v3Config = config;
+        const usesSSH = v3Config.git_auth?.method === 'ssh' ||
             Object.values(config.repos || {}).some(r => r.auth === 'ssh');
         if (usesSSH && !options.yes) {
             const injectKey = await prompts.confirm({
@@ -231,40 +192,23 @@ exports.createCommand = new commander_1.Command('create')
         try {
             const genbox = await provisionGenbox(payload);
             spinner.succeed(chalk_1.default.green(`Genbox '${name}' created!`));
-            // Wait for IP if not immediately available
-            let ipAddress = genbox.ipAddress;
-            if (!ipAddress && genbox._id) {
-                spinner.start('Waiting for IP address...');
-                ipAddress = await waitForIpAddress(genbox._id);
-                if (ipAddress) {
-                    spinner.succeed(`IP address assigned: ${ipAddress}`);
-                    genbox.ipAddress = ipAddress;
-                }
-                else {
-                    spinner.fail('Timed out waiting for IP. Run `genbox status` to check later.');
-                    displayGenboxInfo(genbox, resolved);
-                    return;
+            // Add SSH config immediately if IP available, otherwise spawn background process
+            if (genbox.ipAddress) {
+                const sshAdded = (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress: genbox.ipAddress });
+                if (sshAdded) {
+                    console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
                 }
             }
-            // Wait for SSH to be available
-            spinner.start('Waiting for SSH to be ready...');
-            const sshReady = await waitForSsh(ipAddress);
-            if (sshReady) {
-                spinner.succeed(chalk_1.default.green('SSH is ready!'));
-            }
-            else {
-                spinner.warn('SSH not ready yet. Server may still be booting.');
-            }
-            // Add SSH config
-            const sshAdded = (0, ssh_config_1.addSshConfigEntry)({
-                name,
-                ipAddress,
-            });
-            if (sshAdded) {
-                console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
+            else if (genbox._id) {
+                // Spawn background process to poll for IP and add SSH config
+                spawnSshConfigSetup(genbox._id, name);
+                console.log(chalk_1.default.dim('  SSH config will be added once IP is assigned.'));
             }
             // Display results
             displayGenboxInfo(genbox, resolved);
+            // Inform user about server provisioning
+            console.log('');
+            console.log(chalk_1.default.dim('Server is provisioning. Run `genbox connect` once ready.'));
         }
         catch (error) {
             spinner.fail(chalk_1.default.red(`Failed to create Genbox: ${error.message}`));
@@ -449,9 +393,12 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
                 envVarsFromFile[match[1]] = value;
             }
         }
-        // Determine API_URL based on profile's connect_to setting
-        const connectTo = resolved.profile ?
-            (config.profiles?.[resolved.profile]?.connect_to) : undefined;
+        // Determine API_URL based on profile's connect_to (v3) or default_connection (v4)
+        let connectTo;
+        if (resolved.profile && config.profiles?.[resolved.profile]) {
+            const profile = config.profiles[resolved.profile];
+            connectTo = (0, config_loader_1.getProfileConnection)(profile);
+        }
         let apiUrl;
         if (connectTo) {
             // Use the environment-specific API URL (e.g., STAGING_API_URL)
@@ -699,39 +646,28 @@ async function createLegacy(name, options) {
             gitToken: envVars.GIT_TOKEN,
         });
         spinner.succeed(chalk_1.default.green(`Genbox '${name}' created!`));
-        // Wait for IP if not immediately available
-        let ipAddress = genbox.ipAddress;
-        if (!ipAddress && genbox._id) {
-            spinner.start('Waiting for IP address...');
-            ipAddress = await waitForIpAddress(genbox._id);
-            if (ipAddress) {
-                spinner.succeed(`IP address assigned: ${ipAddress}`);
-                genbox.ipAddress = ipAddress;
-            }
-            else {
-                spinner.fail('Timed out waiting for IP. Run `genbox status` to check later.');
-                return;
+        // Add SSH config immediately if IP available, otherwise spawn background process
+        if (genbox.ipAddress) {
+            const sshAdded = (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress: genbox.ipAddress });
+            if (sshAdded) {
+                console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
             }
         }
-        // Wait for SSH to be available
-        spinner.start('Waiting for SSH to be ready...');
-        const sshReady = await waitForSsh(ipAddress);
-        if (sshReady) {
-            spinner.succeed(chalk_1.default.green('SSH is ready!'));
-        }
-        else {
-            spinner.warn('SSH not ready yet. Server may still be booting.');
-        }
-        // Add SSH config
-        const sshAdded = (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress });
-        if (sshAdded) {
-            console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
+        else if (genbox._id) {
+            // Spawn background process to poll for IP and add SSH config
+            spawnSshConfigSetup(genbox._id, name);
+            console.log(chalk_1.default.dim('  SSH config will be added once IP is assigned.'));
         }
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         console.log(`  ${chalk_1.default.bold('Environment:')} ${name}`);
         console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.yellow(genbox.status)}`);
-        console.log(`  ${chalk_1.default.bold('IP:')}          ${ipAddress}`);
+        if (genbox.ipAddress) {
+            console.log(`  ${chalk_1.default.bold('IP:')}          ${genbox.ipAddress}`);
+        }
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        // Inform user about server provisioning
+        console.log('');
+        console.log(chalk_1.default.dim('Server is provisioning. Run `genbox connect` once ready.'));
     }
     catch (error) {
         spinner.fail(chalk_1.default.red(`Failed: ${error.message}`));

package/dist/commands/destroy.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,21 +40,152 @@ exports.destroyCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const confirm_1 = __importDefault(require("@inquirer/confirm"));
+const select_1 = __importDefault(require("@inquirer/select"));
+const prompts = __importStar(require("@inquirer/prompts"));
 const ora_1 = __importDefault(require("ora"));
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 const ssh_config_1 = require("../ssh-config");
+/**
+ * Format genbox for display in selection list
+ */
+function formatGenboxChoice(g) {
+    const statusColor = g.status === 'running' ? chalk_1.default.green :
+        g.status === 'terminated' ? chalk_1.default.red : chalk_1.default.yellow;
+    const projectInfo = g.project ? chalk_1.default.dim(` [${g.project}]`) : '';
+    return {
+        name: `${g.name} ${statusColor(`(${g.status})`)} ${chalk_1.default.dim(g.ipAddress || 'No IP')}${projectInfo}`,
+        value: g,
+    };
+}
+/**
+ * Handle bulk delete flow when --all flag is used without a name
+ */
+async function handleBulkDelete(options) {
+    const projectName = (0, genbox_selector_1.getProjectContext)();
+    // Fetch both project and global genboxes for counts
+    const allGenboxes = await (0, genbox_selector_1.getGenboxes)({ all: true });
+    const projectGenboxes = projectName
+        ? allGenboxes.filter(g => g.project === projectName || g.workspace === projectName)
+        : [];
+    if (allGenboxes.length === 0) {
+        console.log(chalk_1.default.yellow('No genboxes found.'));
+        return;
+    }
+    let targetGenboxes;
+    let scopeLabel;
+    // If in project context, ask user to choose scope
+    if (projectName && projectGenboxes.length > 0) {
+        const scopeChoices = [
+            {
+                name: `Delete from ${chalk_1.default.cyan(projectName)} project ${chalk_1.default.dim(`(${projectGenboxes.length} genbox${projectGenboxes.length === 1 ? '' : 'es'})`)}`,
+                value: 'project',
+            },
+            {
+                name: `Delete globally ${chalk_1.default.dim(`(${allGenboxes.length} genbox${allGenboxes.length === 1 ? '' : 'es'})`)}`,
+                value: 'global',
+            },
+        ];
+        const scope = await (0, select_1.default)({
+            message: 'Select deletion scope:',
+            choices: scopeChoices,
+        });
+        if (scope === 'project') {
+            targetGenboxes = projectGenboxes;
+            scopeLabel = `project '${projectName}'`;
+        }
+        else {
+            targetGenboxes = allGenboxes;
+            scopeLabel = 'all projects';
+        }
+    }
+    else {
+        // Not in project context or no project genboxes - show all
+        targetGenboxes = allGenboxes;
+        scopeLabel = 'all projects';
+        console.log(chalk_1.default.dim(`Found ${allGenboxes.length} genbox${allGenboxes.length === 1 ? '' : 'es'} globally.\n`));
+    }
+    if (targetGenboxes.length === 0) {
+        console.log(chalk_1.default.yellow(`No genboxes found in ${scopeLabel}.`));
+        return;
+    }
+    // Show checkbox selection for genboxes
+    const choices = targetGenboxes.map(g => ({
+        ...formatGenboxChoice(g),
+        checked: false, // Default to unchecked for safety
+    }));
+    console.log(''); // Add spacing
+    const selectedGenboxes = await prompts.checkbox({
+        message: `Select genboxes to destroy from ${scopeLabel}:`,
+        choices,
+        required: true,
+    });
+    if (selectedGenboxes.length === 0) {
+        console.log(chalk_1.default.yellow('No genboxes selected.'));
+        return;
+    }
+    // Show summary and confirm
+    console.log('');
+    console.log(chalk_1.default.yellow.bold('⚠️  The following genboxes will be PERMANENTLY destroyed:'));
+    console.log('');
+    selectedGenboxes.forEach(g => {
+        const statusColor = g.status === 'running' ? chalk_1.default.green : chalk_1.default.yellow;
+        console.log(`  ${chalk_1.default.red('•')} ${g.name} ${statusColor(`(${g.status})`)} ${chalk_1.default.dim(g.ipAddress || 'No IP')}`);
+    });
+    console.log('');
+    let confirmed = options.yes;
+    if (!confirmed) {
+        confirmed = await (0, confirm_1.default)({
+            message: `Are you sure you want to destroy ${chalk_1.default.red(selectedGenboxes.length)} genbox${selectedGenboxes.length === 1 ? '' : 'es'}?`,
+            default: false,
+        });
+    }
+    if (!confirmed) {
+        console.log(chalk_1.default.dim('Operation cancelled.'));
+        return;
+    }
+    // Delete each genbox
+    console.log('');
+    let successCount = 0;
+    let failCount = 0;
+    for (const genbox of selectedGenboxes) {
+        const spinner = (0, ora_1.default)(`Destroying ${genbox.name}...`).start();
+        try {
+            await (0, api_1.fetchApi)(`/genboxes/${genbox._id}`, { method: 'DELETE' });
+            (0, ssh_config_1.removeSshConfigEntry)(genbox.name);
+            spinner.succeed(chalk_1.default.green(`Destroyed '${genbox.name}'`));
+            successCount++;
+        }
+        catch (error) {
+            spinner.fail(chalk_1.default.red(`Failed to destroy '${genbox.name}': ${error.message}`));
+            failCount++;
+        }
+    }
+    // Summary
+    console.log('');
+    if (failCount === 0) {
+        console.log(chalk_1.default.green.bold(`✓ Successfully destroyed ${successCount} genbox${successCount === 1 ? '' : 'es'}.`));
+    }
+    else {
+        console.log(chalk_1.default.yellow(`Completed: ${successCount} destroyed, ${failCount} failed.`));
+    }
+}
 exports.destroyCommand = new commander_1.Command('destroy')
     .alias('delete')
-    .description('Destroy a Genbox')
+    .description('Destroy one or more Genboxes')
     .argument('[name]', 'Name of the Genbox to destroy (optional - will prompt if not provided)')
     .option('-y, --yes', 'Skip confirmation')
-    .option('-a, --all', 'Select from all genboxes (not just current project)')
+    .option('-a, --all', 'Bulk delete mode - select multiple genboxes to destroy')
     .action(async (name, options) => {
     try {
-        // 1. Select Genbox (interactive if no name provided)
+        // Bulk delete mode when --all is used without a specific name
+        if (options.all && !name) {
+            await handleBulkDelete(options);
+            return;
+        }
+        // Single genbox deletion flow
         const { genbox: target, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
-            all: options.all,
+            all: options.all, // If --all with name, search in all genboxes
             selectMessage: 'Select a genbox to destroy:',
         });
         if (cancelled) {
@@ -31,7 +195,7 @@ exports.destroyCommand = new commander_1.Command('destroy')
         if (!target) {
             return;
         }
-        // 2. Confirm
+        // Confirm
         let confirmed = options.yes;
         if (!confirmed) {
             confirmed = await (0, confirm_1.default)({
@@ -43,7 +207,7 @@ exports.destroyCommand = new commander_1.Command('destroy')
             console.log('Operation cancelled.');
             return;
         }
-        // 3. Delete
+        // Delete
         const spinner = (0, ora_1.default)(`Destroying ${target.name}...`).start();
         await (0, api_1.fetchApi)(`/genboxes/${target._id}`, {
             method: 'DELETE',