genbox 1.0.66 → 1.0.68

package/dist/commands/db-sync.js

@@ -227,10 +227,7 @@ exports.dbSyncCommand
                     uploadSpinner.succeed(chalk_1.default.green('Database snapshot uploaded'));
                     snapshotId = snapshotResult.snapshotId;
                     snapshotS3Key = snapshotResult.s3Key;
-                    // Only cleanup if we created the dump (not user-provided)
-                    if (!options.dump) {
-                        (0, db_utils_1.cleanupDump)(localDumpPath);
-                    }
+                    // Don't cleanup yet - we still need the file for SCP to genbox
                 }
                 else {
                     uploadSpinner.fail(chalk_1.default.red('Database snapshot upload failed'));
@@ -261,6 +258,9 @@ exports.dbSyncCommand
             if (!uploadResult.success) {
                 restoreSpinner.fail(chalk_1.default.red('Upload failed'));
                 console.error(chalk_1.default.red(`  Error: ${uploadResult.error}`));
+                if (localDumpPath && !options.dump) {
+                    (0, db_utils_1.cleanupDump)(localDumpPath);
+                }
                 return;
             }
             restoreSpinner.text = 'Restoring database...';
@@ -271,15 +271,26 @@ exports.dbSyncCommand
             if (!restoreResult.success) {
                 restoreSpinner.fail(chalk_1.default.red('Restore failed'));
                 console.error(chalk_1.default.red(`  Error: ${restoreResult.error}`));
+                if (localDumpPath && !options.dump) {
+                    (0, db_utils_1.cleanupDump)(localDumpPath);
+                }
                 return;
             }
             restoreSpinner.succeed(chalk_1.default.green('Database sync completed!'));
             console.log('');
             console.log(chalk_1.default.dim(`  Database has been restored from ${source} snapshot.`));
+            // Cleanup local dump file now that we're done
+            if (localDumpPath && !options.dump) {
+                (0, db_utils_1.cleanupDump)(localDumpPath);
+            }
         }
         catch (error) {
             restoreSpinner.fail(chalk_1.default.red('Database restore failed'));
             console.error(chalk_1.default.red(`  Error: ${error.message}`));
+            // Cleanup on error too
+            if (localDumpPath && !options.dump) {
+                (0, db_utils_1.cleanupDump)(localDumpPath);
+            }
         }
     }
     catch (error) {

package/dist/commands/rebuild.js

@@ -137,7 +137,7 @@ async function scpUpload(localPath, ip, remotePath, keyPath) {
     });
 }
 async function runSoftRebuild(options) {
-    const { genbox, resolved, config, keyPath, envFiles, snapshotId, snapshotS3Key, gitToken, onStep, onLog } = options;
+    const { genbox, resolved, config, keyPath, envFiles, snapshotId, snapshotS3Key, gitToken, hardMode, onStep, onLog } = options;
     const ip = genbox.ipAddress;
     const log = (line, type) => {
         if (onLog) {
@@ -150,9 +150,16 @@ async function runSoftRebuild(options) {
         log('Stopping PM2 processes...', 'dim');
         await sshExec(ip, keyPath, 'source ~/.nvm/nvm.sh 2>/dev/null; pm2 kill 2>/dev/null || true', 30);
         // Find and stop docker compose in repo directories
+        // In hard mode, use -v flag to remove volumes
+        const dockerDownFlags = hardMode ? 'down -v' : 'down';
         for (const repo of resolved.repos) {
-            log(`Stopping Docker Compose in ${repo.path}...`, 'dim');
-            await sshExec(ip, keyPath, `cd ${repo.path} 2>/dev/null && docker compose down 2>/dev/null || true`, 60);
+            log(`Stopping Docker Compose in ${repo.path}${hardMode ? ' (removing volumes)' : ''}...`, 'dim');
+            await sshExec(ip, keyPath, `cd ${repo.path} 2>/dev/null && docker compose ${dockerDownFlags} 2>/dev/null || true`, 60);
+        }
+        // In hard mode, also prune docker volumes
+        if (hardMode) {
+            log('Pruning unused Docker volumes...', 'dim');
+            await sshExec(ip, keyPath, 'docker volume prune -f 2>/dev/null || true', 30);
         }
         // Step 2: Clean up repo directories
         onStep?.('Cleaning up repositories...');
@@ -272,8 +279,9 @@ async function runSoftRebuild(options) {
                 }
             }
         }
-        // Step 7: Restore database if snapshot provided
-        if (snapshotId && snapshotS3Key) {
+        // Step 7: Restore database if snapshot provided (only in hard mode)
+        // In soft mode (default), database is preserved
+        if (hardMode && snapshotId && snapshotS3Key) {
             onStep?.('Restoring database...');
             log('Fetching database snapshot...', 'info');
             try {
@@ -377,107 +385,9 @@ async function runSoftRebuild(options) {
         return { success: false, error: error.message };
     }
 }
-async function rebuildGenbox(id, payload) {
-    return (0, api_1.fetchApi)(`/genboxes/${id}/rebuild`, {
-        method: 'POST',
-        body: JSON.stringify(payload),
-    });
-}
-/**
- * Build rebuild payload from resolved config
- */
-function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoader) {
-    const envVars = configLoader.loadEnvVars(process.cwd());
-    // Build services map
-    const services = {};
-    for (const app of resolved.apps) {
-        if (app.port) {
-            services[app.name] = { port: app.port, healthcheck: app.healthcheck };
-        }
-    }
-    // Build files bundle
-    const files = [];
-    const envFilesToMove = [];
-    // Process .env.genbox
-    const envGenboxPath = path.join(process.cwd(), '.env.genbox');
-    if (fs.existsSync(envGenboxPath)) {
-        const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
-        const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
-        const globalSection = sections.get('GLOBAL') || '';
-        const envVarsFromFile = (0, utils_1.parseEnvVarsFromSection)(globalSection);
-        let connectTo;
-        if (resolved.profile && config.profiles?.[resolved.profile]) {
-            const profile = config.profiles[resolved.profile];
-            connectTo = (0, config_loader_1.getProfileConnection)(profile);
-        }
-        const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
-        if (connectTo && Object.keys(serviceUrlMap).length > 0) {
-            console.log(chalk_1.default.dim(`  Using ${connectTo} URLs for variable expansion`));
-        }
-        for (const app of resolved.apps) {
-            const appPath = config.apps[app.name]?.path || app.name;
-            const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
-                (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
-            const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
-            if (servicesSections.length > 0) {
-                for (const serviceSectionName of servicesSections) {
-                    const serviceName = serviceSectionName.split('/')[1];
-                    const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
-                    const stagingName = `${app.name}-${serviceName}.env`;
-                    const targetPath = `${repoPath}/apps/${serviceName}/.env`;
-                    files.push({
-                        path: `/home/dev/.env-staging/${stagingName}`,
-                        content: serviceEnvContent,
-                        permissions: '0644',
-                    });
-                    envFilesToMove.push({ stagingName, targetPath });
-                }
-            }
-            else {
-                const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
-                files.push({
-                    path: `/home/dev/.env-staging/${app.name}.env`,
-                    content: appEnvContent,
-                    permissions: '0644',
-                });
-                envFilesToMove.push({
-                    stagingName: `${app.name}.env`,
-                    targetPath: `${repoPath}/.env`,
-                });
-            }
-        }
-    }
-    // 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 = [];
-    // Build repos
-    const repos = {};
-    for (const repo of resolved.repos) {
-        repos[repo.name] = {
-            url: repo.url,
-            path: repo.path,
-            branch: repo.branch,
-            newBranch: repo.newBranch,
-            sourceBranch: repo.sourceBranch,
-        };
-    }
-    // Get local git config for commits
-    const gitConfig = (0, utils_1.getGitConfig)();
-    return {
-        publicKey,
-        services,
-        files,
-        postDetails,
-        repos,
-        privateKey,
-        gitToken: envVars.GIT_TOKEN,
-        gitUserName: gitConfig.userName,
-        gitUserEmail: gitConfig.userEmail,
-    };
-}
+// ============================================================================
+// End of Soft Rebuild
+// ============================================================================
 exports.rebuildCommand = new commander_1.Command('rebuild')
     .description('Rebuild an existing Genbox environment with updated configuration')
     .argument('[name]', 'Name of the Genbox to rebuild (optional - will prompt if not provided)')
@@ -490,7 +400,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
     .option('--db-source <source>', 'Database source for copy mode: staging, production')
     .option('--db-dump <path>', 'Path to existing database dump file')
     .option('-y, --yes', 'Skip interactive prompts')
-    .option('--hard', 'Full rebuild (reinstall OS) instead of soft rebuild')
+    .option('--hard', 'Wipe docker volumes and restore database from snapshot')
     .action(async (name, options) => {
     try {
         // Select genbox (interactive if no name provided)
@@ -562,9 +472,10 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         // For branch: CLI options override, then stored newBranch (if it was created), then stored branch
         const effectiveBranch = options.branch || storedNewBranch || storedBranch;
         // For new branch creation: use CLI options OR stored values (to re-create branch if first attempt failed)
-        // If storedNewBranch exists with storedSourceBranch, the branch may not have been created yet
-        const effectiveNewBranch = newBranchName || (storedNewBranch && storedSourceBranch ? storedNewBranch : undefined);
-        const effectiveSourceBranch = options.fromBranch || (storedNewBranch && storedSourceBranch ? storedSourceBranch : undefined);
+        // If storedNewBranch exists, we need to re-create it - default sourceBranch to 'main' if not stored
+        const defaultSourceBranch = config.defaults?.branch || 'main';
+        const effectiveNewBranch = newBranchName || storedNewBranch;
+        const effectiveSourceBranch = options.fromBranch || (storedNewBranch ? (storedSourceBranch || defaultSourceBranch) : undefined);
         // For database: use CLI option, or stored database config (convert 'snapshot' to 'copy')
         const storedDbMode = genbox.database?.mode === 'snapshot' ? 'copy' : genbox.database?.mode;
         const effectiveDbMode = options.db || storedDbMode;
@@ -627,13 +538,19 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         if (!options.yes) {
             console.log('');
             if (options.hard) {
-                console.log(chalk_1.default.yellow('Warning: Hard rebuild will reinstall the OS and rerun setup.'));
-                console.log(chalk_1.default.yellow('All unsaved work on the server will be lost.'));
+                console.log(chalk_1.default.blue('Hard rebuild will:'));
+                console.log(chalk_1.default.dim('  • Stop services (PM2, Docker Compose)'));
+                console.log(chalk_1.default.dim('  • Delete and re-clone repositories'));
+                console.log(chalk_1.default.dim('  • Wipe Docker volumes (fresh containers)'));
+                console.log(chalk_1.default.dim('  • Restore database from snapshot'));
+                console.log(chalk_1.default.dim('  • Reinstall dependencies and restart services'));
+                console.log(chalk_1.default.yellow('Note: All local data (volumes, DB) will be reset.'));
             }
             else {
-                console.log(chalk_1.default.blue('Soft rebuild will:'));
+                console.log(chalk_1.default.blue('Rebuild will:'));
                 console.log(chalk_1.default.dim('  • Stop services (PM2, Docker Compose)'));
                 console.log(chalk_1.default.dim('  • Delete and re-clone repositories'));
+                console.log(chalk_1.default.dim('  • Preserve Docker volumes and database'));
                 console.log(chalk_1.default.dim('  • Reinstall dependencies and restart services'));
                 console.log(chalk_1.default.yellow('Note: Uncommitted changes in repos will be lost.'));
             }
@@ -812,188 +729,149 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             }
         }
         // ================================================================
-        // SOFT REBUILD (default)
+        // REBUILD VIA SSH
         // ================================================================
-        if (!options.hard) {
-            // Verify server is accessible
-            if (!genbox.ipAddress) {
-                console.log(chalk_1.default.red('Error: Genbox has no IP address. It may still be provisioning.'));
-                console.log(chalk_1.default.dim('  Use --hard for a full rebuild, or wait for provisioning to complete.'));
-                return;
-            }
-            // Get SSH key path
-            let sshKeyPath;
-            try {
-                sshKeyPath = (0, utils_1.getPrivateSshKeyPath)();
-            }
-            catch (error) {
-                console.log(chalk_1.default.red(error.message));
-                return;
-            }
-            // Test SSH connection
-            console.log('');
-            console.log(chalk_1.default.dim('Testing SSH connection...'));
-            const testResult = sshExec(genbox.ipAddress, sshKeyPath, 'echo ok', 10);
-            if (!testResult.success || testResult.output !== 'ok') {
-                console.log(chalk_1.default.red('Error: Cannot connect to genbox via SSH.'));
-                console.log(chalk_1.default.dim(`  ${testResult.error || 'Connection failed'}`));
-                console.log(chalk_1.default.dim('  Use --hard for a full rebuild if the server is unresponsive.'));
-                return;
-            }
-            console.log(chalk_1.default.green('✓ SSH connection verified'));
-            // Build env files for soft rebuild
-            const envFilesForSoftRebuild = [];
-            const envGenboxPath = path.join(process.cwd(), '.env.genbox');
-            if (fs.existsSync(envGenboxPath)) {
-                const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
-                const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
-                const globalSection = sections.get('GLOBAL') || '';
-                const envVarsFromFile = {};
-                for (const line of globalSection.split('\n')) {
-                    const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
-                    if (match) {
-                        let value = match[2].trim();
-                        if ((value.startsWith('"') && value.endsWith('"')) ||
-                            (value.startsWith("'") && value.endsWith("'"))) {
-                            value = value.slice(1, -1);
-                        }
-                        envVarsFromFile[match[1]] = value;
+        // Verify server is accessible
+        if (!genbox.ipAddress) {
+            console.log(chalk_1.default.red('Error: Genbox has no IP address. It may still be provisioning.'));
+            console.log(chalk_1.default.dim('  Wait for provisioning to complete before rebuilding.'));
+            return;
+        }
+        // Get SSH key path
+        let sshKeyPath;
+        try {
+            sshKeyPath = (0, utils_1.getPrivateSshKeyPath)();
+        }
+        catch (error) {
+            console.log(chalk_1.default.red(error.message));
+            return;
+        }
+        // Test SSH connection
+        console.log('');
+        console.log(chalk_1.default.dim('Testing SSH connection...'));
+        const testResult = sshExec(genbox.ipAddress, sshKeyPath, 'echo ok', 10);
+        if (!testResult.success || testResult.output !== 'ok') {
+            console.log(chalk_1.default.red('Error: Cannot connect to genbox via SSH.'));
+            console.log(chalk_1.default.dim(`  ${testResult.error || 'Connection failed'}`));
+            console.log(chalk_1.default.dim('  Check if the server is running with: genbox status'));
+            return;
+        }
+        console.log(chalk_1.default.green('✓ SSH connection verified'));
+        // Build env files for soft rebuild
+        const envFilesForSoftRebuild = [];
+        const envGenboxPath = path.join(process.cwd(), '.env.genbox');
+        if (fs.existsSync(envGenboxPath)) {
+            const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
+            const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
+            const globalSection = sections.get('GLOBAL') || '';
+            const envVarsFromFile = {};
+            for (const line of globalSection.split('\n')) {
+                const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
+                if (match) {
+                    let value = match[2].trim();
+                    if ((value.startsWith('"') && value.endsWith('"')) ||
+                        (value.startsWith("'") && value.endsWith("'"))) {
+                        value = value.slice(1, -1);
                     }
+                    envVarsFromFile[match[1]] = value;
                 }
-                let connectTo;
-                if (resolved.profile && config.profiles?.[resolved.profile]) {
-                    const profile = config.profiles[resolved.profile];
-                    connectTo = (0, config_loader_1.getProfileConnection)(profile);
-                }
-                const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
-                for (const app of resolved.apps) {
-                    const appConfig = config.apps[app.name];
-                    const appPath = appConfig?.path || app.name;
-                    const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
-                        (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
-                    const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
-                    if (servicesSections.length > 0) {
-                        for (const serviceSectionName of servicesSections) {
-                            const serviceName = serviceSectionName.split('/')[1];
-                            const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
-                            envFilesForSoftRebuild.push({
-                                stagingName: `${app.name}-${serviceName}.env`,
-                                remotePath: `${repoPath}/apps/${serviceName}/.env`,
-                                content: serviceEnvContent,
-                            });
-                        }
-                    }
-                    else {
-                        const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
+            }
+            let connectTo;
+            if (resolved.profile && config.profiles?.[resolved.profile]) {
+                const profile = config.profiles[resolved.profile];
+                connectTo = (0, config_loader_1.getProfileConnection)(profile);
+            }
+            const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
+            for (const app of resolved.apps) {
+                const appConfig = config.apps[app.name];
+                const appPath = appConfig?.path || app.name;
+                const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
+                    (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
+                const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+                if (servicesSections.length > 0) {
+                    for (const serviceSectionName of servicesSections) {
+                        const serviceName = serviceSectionName.split('/')[1];
+                        const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
                         envFilesForSoftRebuild.push({
-                            stagingName: `${app.name}.env`,
-                            remotePath: `${repoPath}/.env`,
-                            content: appEnvContent,
+                            stagingName: `${app.name}-${serviceName}.env`,
+                            remotePath: `${repoPath}/apps/${serviceName}/.env`,
+                            content: serviceEnvContent,
                         });
                     }
                 }
+                else {
+                    const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
+                    envFilesForSoftRebuild.push({
+                        stagingName: `${app.name}.env`,
+                        remotePath: `${repoPath}/.env`,
+                        content: appEnvContent,
+                    });
+                }
             }
-            // Get git token from env
-            const envVars = configLoader.loadEnvVars(process.cwd());
-            // Run soft rebuild
-            console.log('');
-            console.log(chalk_1.default.blue('=== Starting Soft Rebuild ==='));
-            console.log('');
-            let currentStep = '';
-            const rebuildResult = await runSoftRebuild({
-                genbox,
-                resolved,
-                config,
-                keyPath: sshKeyPath,
-                envFiles: envFilesForSoftRebuild,
-                snapshotId,
-                snapshotS3Key,
-                gitToken: envVars.GIT_TOKEN,
-                onStep: (step) => {
-                    currentStep = step;
-                    console.log(chalk_1.default.blue(`\n=== ${step} ===`));
-                },
-                onLog: (line, type) => {
-                    switch (type) {
-                        case 'error':
-                            console.log(chalk_1.default.red(`  ${line}`));
-                            break;
-                        case 'success':
-                            console.log(chalk_1.default.green(`  ${line}`));
-                            break;
-                        case 'info':
-                            console.log(chalk_1.default.cyan(`  ${line}`));
-                            break;
-                        case 'dim':
-                        default:
-                            console.log(chalk_1.default.dim(`  ${line}`));
-                            break;
-                    }
-                },
-            });
+        }
+        // Get git token from env
+        const envVars = configLoader.loadEnvVars(process.cwd());
+        // Run soft rebuild
+        console.log('');
+        console.log(chalk_1.default.blue(`=== Starting ${options.hard ? 'Hard' : 'Soft'} Rebuild ===`));
+        console.log('');
+        let currentStep = '';
+        const rebuildResult = await runSoftRebuild({
+            genbox,
+            resolved,
+            config,
+            keyPath: sshKeyPath,
+            envFiles: envFilesForSoftRebuild,
+            snapshotId,
+            snapshotS3Key,
+            gitToken: envVars.GIT_TOKEN,
+            hardMode: options.hard, // Pass hard mode flag
+            onStep: (step) => {
+                currentStep = step;
+                console.log(chalk_1.default.blue(`\n=== ${step} ===`));
+            },
+            onLog: (line, type) => {
+                switch (type) {
+                    case 'error':
+                        console.log(chalk_1.default.red(`  ${line}`));
+                        break;
+                    case 'success':
+                        console.log(chalk_1.default.green(`  ${line}`));
+                        break;
+                    case 'info':
+                        console.log(chalk_1.default.cyan(`  ${line}`));
+                        break;
+                    case 'dim':
+                    default:
+                        console.log(chalk_1.default.dim(`  ${line}`));
+                        break;
+                }
+            },
+        });
+        console.log('');
+        if (rebuildResult.success) {
+            console.log(chalk_1.default.green(`✓ ${options.hard ? 'Hard' : 'Soft'} rebuild completed successfully!`));
             console.log('');
-            if (rebuildResult.success) {
-                console.log(chalk_1.default.green(`✓ Soft rebuild completed successfully!`));
-                console.log('');
-                console.log(`Run ${chalk_1.default.cyan(`genbox status ${selectedName}`)} to check service status.`);
-            }
-            else {
-                console.log(chalk_1.default.red(`✗ Soft rebuild failed: ${rebuildResult.error}`));
-                console.log(chalk_1.default.dim(`  Failed during: ${currentStep}`));
-                console.log(chalk_1.default.dim(`  Use --hard for a full OS reinstall if needed.`));
-            }
-            // Notify API about the rebuild (for tracking)
-            try {
-                await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/soft-rebuild-completed`, {
-                    method: 'POST',
-                    body: JSON.stringify({
-                        success: rebuildResult.success,
-                        branch: resolved.repos[0]?.branch,
-                        newBranch: resolved.repos[0]?.newBranch,
-                        sourceBranch: resolved.repos[0]?.sourceBranch,
-                    }),
-                });
-            }
-            catch {
-                // Silently ignore API notification failures
-            }
-            return;
+            console.log(`Run ${chalk_1.default.cyan(`genbox status ${selectedName}`)} to check service status.`);
         }
-        // ================================================================
-        // HARD REBUILD (--hard flag)
-        // ================================================================
-        // Build payload
-        const payload = buildRebuildPayload(resolved, config, publicKey, privateKeyContent, configLoader);
-        // Add database info to payload if we have a snapshot
-        if (snapshotId && snapshotS3Key) {
-            payload.database = {
-                mode: 'snapshot',
-                source: dbSource,
-                snapshotId,
-                s3Key: snapshotS3Key,
-            };
-        }
-        else if (dbMode === 'local' || dbMode === 'fresh') {
-            payload.database = { mode: 'local' };
-        }
-        // Execute hard rebuild via API
-        const rebuildSpinner = (0, ora_1.default)(`Hard rebuilding Genbox '${selectedName}'...`).start();
+        else {
+            console.log(chalk_1.default.red(`✗ Rebuild failed: ${rebuildResult.error}`));
+            console.log(chalk_1.default.dim(`  Failed during: ${currentStep}`));
+        }
+        // Notify API about the rebuild (for tracking)
         try {
-            await rebuildGenbox(genbox._id, payload);
-            rebuildSpinner.succeed(chalk_1.default.green(`Genbox '${selectedName}' hard rebuild initiated!`));
-            console.log('');
-            console.log(chalk_1.default.dim('Server is rebuilding. This may take a few minutes.'));
-            console.log(chalk_1.default.dim('SSH connection will be temporarily unavailable.'));
-            console.log('');
-            console.log(`Run ${chalk_1.default.cyan(`genbox status ${selectedName}`)} to check progress.`);
+            await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/soft-rebuild-completed`, {
+                method: 'POST',
+                body: JSON.stringify({
+                    success: rebuildResult.success,
+                    branch: resolved.repos[0]?.branch,
+                    newBranch: resolved.repos[0]?.newBranch,
+                    sourceBranch: resolved.repos[0]?.sourceBranch,
+                }),
+            });
         }
-        catch (error) {
-            rebuildSpinner.fail(chalk_1.default.red(`Failed to rebuild: ${error.message}`));
-            if (error instanceof api_1.AuthenticationError) {
-                console.log('');
-                console.log(chalk_1.default.yellow('  Please authenticate first:'));
-                console.log(chalk_1.default.cyan('  $ genbox login'));
-            }
+        catch {
+            // Silently ignore API notification failures
         }
     }
     catch (error) {

package/dist/db-utils.js

@@ -286,23 +286,26 @@ async function runRemoteMongoRestoreDynamic(ipAddress, options = {}) {
     return new Promise((resolve) => {
         options.onProgress?.('Detecting MongoDB and restoring database...');
         // The restore command - detects MongoDB port dynamically
+        // Note: Uses sed/awk instead of grep -P for portability (grep -P not available on Alpine)
         const restoreCmd = `
 set -e
 
 # Detect MongoDB port from running docker containers
 # Different projects use different port mappings (e.g., 27037, 27117, etc.)
-MONGO_PORT=$(docker ps --format '{{.Ports}}' | grep -oP '\\d+(?=->27017)' | head -1)
+# Use sed instead of grep -P for portability
+MONGO_PORT=$(docker ps --format '{{.Ports}}' | sed -n 's/.*:\\([0-9]*\\)->27017.*/\\1/p' | head -1)
 
 if [ -z "$MONGO_PORT" ]; then
   echo "ERROR: Could not detect MongoDB port from running containers"
-  docker ps
+  echo "Running containers:"
+  docker ps --format '{{.Names}}: {{.Ports}}'
   exit 1
 fi
 
 echo "MongoDB detected on port: $MONGO_PORT"
 
 # Wait for MongoDB to be responsive
-for i in {1..30}; do
+for i in $(seq 1 30); do
   if mongosh --quiet --host localhost --port $MONGO_PORT --eval "db.runCommand({ping:1})" 2>/dev/null; then
     echo "MongoDB is ready"
     break
@@ -331,6 +334,7 @@ fi
         const proc = (0, child_process_1.spawn)('ssh', [
             '-o', 'StrictHostKeyChecking=no',
             '-o', 'UserKnownHostsFile=/dev/null',
+            '-o', 'LogLevel=ERROR',
             '-o', 'ConnectTimeout=30',
             `dev@${ipAddress}`,
             'bash', '-c', `'${restoreCmd.replace(/'/g, "'\\''")}'`,
@@ -351,13 +355,35 @@ fi
             stderr += data.toString();
         });
         proc.on('close', (code) => {
+            // Filter out SSH warnings from stderr
+            const filteredStderr = stderr
+                .split('\n')
+                .filter(line => !line.includes('Permanently added') && !line.includes('Warning:'))
+                .join('\n')
+                .trim();
             if (code === 0) {
                 resolve({ success: true });
             }
             else {
+                // Include both stdout and filtered stderr for better error diagnosis
+                // stdout often contains the actual error messages from the script
+                let errorMsg = '';
+                if (filteredStderr) {
+                    errorMsg = filteredStderr;
+                }
+                if (stdout) {
+                    // Look for ERROR lines in stdout
+                    const errorLines = stdout.split('\n').filter(line => line.includes('ERROR') || line.includes('Error') || line.includes('error'));
+                    if (errorLines.length > 0) {
+                        errorMsg = errorLines.join('; ');
+                    }
+                    else if (!errorMsg) {
+                        errorMsg = stdout.trim().split('\n').slice(-3).join('\n'); // Last 3 lines
+                    }
+                }
                 resolve({
                     success: false,
-                    error: stderr || stdout || 'Restore failed',
+                    error: errorMsg || `Restore failed with exit code ${code}`,
                 });
             }
         });

package/package.json

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