genbox 1.0.58 → 1.0.60

package/dist/commands/rebuild.js

@@ -244,19 +244,12 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
             }
         }
     }
-    // Generate setup script
-    const setupScript = generateSetupScript(resolved, config, envFilesToMove);
-    if (setupScript) {
-        files.push({
-            path: '/home/dev/setup-genbox.sh',
-            content: setupScript,
-            permissions: '0755',
-        });
-    }
+    // NOTE: Setup script generation removed from CLI.
+    // The API generates a comprehensive setup script with clone commands at /root/setup-genbox.sh
+    // and copies it to /home/dev/setup-genbox.sh via runcmd. This avoids having two conflicting
+    // scripts in write_files where the CLI version lacked clone commands.
+    // The envFilesToMove variable is kept as API needs this info for .env file movement.
     const postDetails = [];
-    if (setupScript) {
-        postDetails.push('su - dev -c "/home/dev/setup-genbox.sh"');
-    }
     // Build repos
     const repos = {};
     for (const repo of resolved.repos) {
@@ -298,58 +291,6 @@ function validateGitCredentials(repos, gitToken, privateKey) {
     }
     return { warnings, errors };
 }
-/**
- * Generate setup script
- */
-function generateSetupScript(resolved, config, envFilesToMove = []) {
-    const lines = [
-        '#!/bin/bash',
-        '# Generated by genbox rebuild',
-        'set -e',
-        '',
-    ];
-    if (envFilesToMove.length > 0) {
-        lines.push('# Move .env files from staging to app directories');
-        for (const { stagingName, targetPath } of envFilesToMove) {
-            lines.push(`if [ -f "/home/dev/.env-staging/${stagingName}" ]; then`);
-            lines.push(`  mkdir -p "$(dirname "${targetPath}")"`);
-            lines.push(`  mv "/home/dev/.env-staging/${stagingName}" "${targetPath}"`);
-            lines.push(`  echo "Moved .env to ${targetPath}"`);
-            lines.push('fi');
-        }
-        lines.push('rm -rf /home/dev/.env-staging 2>/dev/null || true');
-        lines.push('');
-    }
-    if (resolved.repos.length > 0) {
-        lines.push(`cd ${resolved.repos[0].path} || exit 1`);
-        lines.push('');
-    }
-    lines.push('# Install dependencies');
-    lines.push('if [ -f "pnpm-lock.yaml" ]; then');
-    lines.push('  echo "Installing dependencies with pnpm..."');
-    lines.push('  pnpm install --frozen-lockfile');
-    lines.push('elif [ -f "yarn.lock" ]; then');
-    lines.push('  echo "Installing dependencies with yarn..."');
-    lines.push('  yarn install --frozen-lockfile');
-    lines.push('elif [ -f "bun.lockb" ]; then');
-    lines.push('  echo "Installing dependencies with bun..."');
-    lines.push('  bun install --frozen-lockfile');
-    lines.push('elif [ -f "package-lock.json" ]; then');
-    lines.push('  echo "Installing dependencies with npm..."');
-    lines.push('  npm ci');
-    lines.push('fi');
-    const hasLocalApi = resolved.apps.some(a => a.name === 'api' || a.type === 'backend');
-    if (hasLocalApi) {
-        lines.push('');
-        lines.push('echo "Starting Docker services..."');
-        lines.push('if [ -f "docker-compose.yml" ] || [ -f "compose.yml" ]; then');
-        lines.push('  docker compose up -d');
-        lines.push('fi');
-    }
-    lines.push('');
-    lines.push('echo "Setup complete!"');
-    return lines.join('\n');
-}
 /**
  * Prompt for branch options interactively
  */

package/dist/commands/status.js

@@ -145,10 +145,55 @@ function displayTimingBreakdown(timing) {
         console.log('');
     }
 }
+// Watch mode: tail cloud-init logs in realtime
+function tailCloudInitLogs(ip, keyPath) {
+    const sshOpts = [
+        '-i', keyPath,
+        '-o', 'IdentitiesOnly=yes',
+        '-o', 'StrictHostKeyChecking=no',
+        '-o', 'UserKnownHostsFile=/dev/null',
+        '-o', 'LogLevel=ERROR',
+        '-o', 'ConnectTimeout=10',
+        `dev@${ip}`,
+        'sudo tail -f /var/log/cloud-init-output.log 2>/dev/null'
+    ];
+    const child = (0, child_process_1.spawn)('ssh', sshOpts, {
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    child.stdout?.on('data', (data) => {
+        const lines = data.toString().split('\n');
+        for (const line of lines) {
+            if (line.trim()) {
+                // Color-code certain log lines
+                if (line.startsWith('===') || line.includes('===')) {
+                    console.log(chalk_1.default.cyan(line));
+                }
+                else if (line.toLowerCase().includes('error') || line.toLowerCase().includes('failed')) {
+                    console.log(chalk_1.default.red(line));
+                }
+                else if (line.toLowerCase().includes('done') || line.toLowerCase().includes('complete')) {
+                    console.log(chalk_1.default.green(line));
+                }
+                else {
+                    console.log(line);
+                }
+            }
+        }
+    });
+    child.stderr?.on('data', (data) => {
+        // Ignore SSH stderr (connection warnings, etc.)
+    });
+    return child;
+}
+// Sleep helper for async code
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
 exports.statusCommand = new commander_1.Command('status')
     .description('Check cloud-init progress and service status of a Genbox')
     .argument('[name]', 'Name of the Genbox (optional - will prompt if not provided)')
     .option('-a, --all', 'Select from all genboxes (not just current project)')
+    .option('-w, --watch', 'Watch mode: tail logs in realtime during setup, refresh status periodically when running')
     .action(async (name, options) => {
     try {
         // 1. Select Genbox (interactive if no name provided)
@@ -256,7 +301,118 @@ exports.statusCommand = new commander_1.Command('status')
         }
         // If DB says PROVISIONING, check if we can SSH to get progress
         if (dbStatus === 'provisioning') {
-            // Try to SSH and check cloud-init progress
+            // In watch mode, handle SSH connection retries and log tailing
+            if (options.watch) {
+                // Set up Ctrl+C handler
+                let stopWatching = false;
+                const cleanup = () => {
+                    stopWatching = true;
+                    console.log('\n' + chalk_1.default.dim('Watch mode stopped.'));
+                    process.exit(0);
+                };
+                process.on('SIGINT', cleanup);
+                process.on('SIGTERM', cleanup);
+                // Wait for SSH to become available
+                let sshAvailable = false;
+                while (!sshAvailable && !stopWatching) {
+                    const status = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
+                    if (!status) {
+                        console.log(chalk_1.default.yellow('[INFO] Waiting for server to boot... (Ctrl+C to exit)'));
+                        await sleep(5000);
+                        continue;
+                    }
+                    const sshErrors = [
+                        'Operation timed out',
+                        'Connection refused',
+                        'Connection timed out',
+                        'No route to host',
+                        'Network is unreachable',
+                        'ssh: connect to host',
+                    ];
+                    if (sshErrors.some(err => status.includes(err))) {
+                        console.log(chalk_1.default.yellow('[INFO] Server is still initializing - SSH is not yet available... (Ctrl+C to exit)'));
+                        await sleep(5000);
+                        continue;
+                    }
+                    sshAvailable = true;
+                    // Check if cloud-init is still running
+                    if (status.includes('running')) {
+                        // Get timing breakdown
+                        const timing = getTimingBreakdown(target.ipAddress, keyPath);
+                        if (timing.total !== null) {
+                            console.log(chalk_1.default.yellow(`[INFO] Setup in progress... (elapsed: ${formatDuration(timing.total)})`));
+                        }
+                        else {
+                            console.log(chalk_1.default.yellow('[INFO] Setup in progress...'));
+                        }
+                        console.log('');
+                        // Show timing breakdown so far
+                        if (timing.sshReady !== null) {
+                            console.log(chalk_1.default.blue('[INFO] === Timing So Far ==='));
+                            console.log(`  SSH Ready:   ${formatDuration(timing.sshReady)}`);
+                            if (timing.total !== null) {
+                                console.log(`  Elapsed:     ${formatDuration(timing.total)}`);
+                            }
+                            console.log('');
+                        }
+                        console.log(chalk_1.default.blue('[INFO] Tailing setup logs in realtime (Ctrl+C to exit):'));
+                        console.log(chalk_1.default.dim('─'.repeat(60)));
+                        const tailProcess = tailCloudInitLogs(target.ipAddress, keyPath);
+                        // Update cleanup to kill tail process
+                        process.removeListener('SIGINT', cleanup);
+                        process.removeListener('SIGTERM', cleanup);
+                        const cleanupWithTail = () => {
+                            stopWatching = true;
+                            tailProcess.kill();
+                            console.log('\n' + chalk_1.default.dim('Watch mode stopped.'));
+                            process.exit(0);
+                        };
+                        process.on('SIGINT', cleanupWithTail);
+                        process.on('SIGTERM', cleanupWithTail);
+                        // Wait for tail process to end
+                        await new Promise((resolve) => {
+                            tailProcess.on('close', () => resolve());
+                            tailProcess.on('error', () => resolve());
+                        });
+                        // Clean up handlers
+                        process.removeListener('SIGINT', cleanupWithTail);
+                        process.removeListener('SIGTERM', cleanupWithTail);
+                        if (!stopWatching) {
+                            console.log('');
+                            console.log(chalk_1.default.blue('[INFO] Log stream ended. Checking final status...'));
+                            console.log('');
+                            await sleep(2000);
+                            // Check final status
+                            const finalStatus = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
+                            if (finalStatus.includes('done')) {
+                                console.log(chalk_1.default.green('[SUCCESS] Setup completed!'));
+                                const finalTiming = getTimingBreakdown(target.ipAddress, keyPath);
+                                displayTimingBreakdown(finalTiming);
+                            }
+                            else if (finalStatus.includes('error')) {
+                                console.log(chalk_1.default.red('[ERROR] Setup encountered an error!'));
+                                console.log(chalk_1.default.dim('  Run `gb connect` to investigate.'));
+                            }
+                            else {
+                                console.log(chalk_1.default.yellow(`[INFO] Final status: ${finalStatus}`));
+                            }
+                        }
+                    }
+                    else if (status.includes('done')) {
+                        console.log(chalk_1.default.green('[SUCCESS] Setup completed!'));
+                        console.log(chalk_1.default.dim('  (Waiting for status update...)'));
+                    }
+                    else if (status.includes('error')) {
+                        console.log(chalk_1.default.red('[ERROR] Setup encountered an error!'));
+                        console.log(chalk_1.default.dim('  Run `gb connect` to investigate.'));
+                    }
+                    else {
+                        console.log(chalk_1.default.yellow(`[INFO] Status: ${status}`));
+                    }
+                }
+                return;
+            }
+            // Non-watch mode: single status check
             let status = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
             if (!status) {
                 console.log(chalk_1.default.yellow('[WARN] Unable to connect to server. It may still be booting.'));
@@ -275,6 +431,8 @@ exports.statusCommand = new commander_1.Command('status')
                 console.log(chalk_1.default.yellow('[INFO] Server is still initializing - SSH is not yet available.'));
                 console.log(chalk_1.default.dim('       This is normal for newly created servers.'));
                 console.log(chalk_1.default.dim('       Please wait 1-2 minutes and try again.'));
+                console.log('');
+                console.log(chalk_1.default.dim('Tip: Use `gb status -w` to watch progress in realtime'));
                 return;
             }
             // Cloud-init still running
@@ -303,6 +461,8 @@ exports.statusCommand = new commander_1.Command('status')
                 if (logOutput) {
                     console.log(logOutput);
                 }
+                console.log('');
+                console.log(chalk_1.default.dim('Tip: Use `gb status -w` to watch progress in realtime'));
                 return;
             }
             // Cloud-init done but callback might not have been received yet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genbox",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {