genbox 1.0.53 → 1.0.55

package/dist/commands/create.js

@@ -236,7 +236,7 @@ exports.createCommand = new commander_1.Command('create')
     .option('-a, --apps <apps>', 'Comma-separated list of apps to include')
     .option('--add-apps <apps>', 'Add apps to the profile')
     .option('--api <mode>', 'API mode: local, staging, production')
-    .option('--db <mode>', 'Database mode: none, local, copy, remote')
+    .option('--db <mode>', 'Database mode: none, fresh, copy, remote')
     .option('--db-source <source>', 'Database source: staging, production')
     .option('--db-dump <path>', 'Use existing mongodump file instead of creating one')
     .option('--db-copy-remote', 'Copy database on the server (requires publicly accessible DB)')
@@ -550,14 +550,27 @@ exports.createCommand = new commander_1.Command('create')
                         snapshotId = snapshotResult.snapshotId;
                         snapshotS3Key = snapshotResult.s3Key;
                         // Cleanup local dump since it's now in S3
-                        (0, db_utils_1.cleanupDump)(localDumpPath);
+                        if (localDumpPath)
+                            (0, db_utils_1.cleanupDump)(localDumpPath);
                         localDumpPath = undefined;
                     }
                     else {
-                        uploadSpinner.warn(chalk_1.default.yellow(`Snapshot upload failed: ${snapshotResult.error}`));
-                        console.log(chalk_1.default.dim('  Will fall back to direct SCP upload after genbox creation'));
+                        uploadSpinner.fail(chalk_1.default.red('Database snapshot upload failed'));
+                        console.log(chalk_1.default.dim(`  Error: ${snapshotResult.error}`));
+                        console.log(chalk_1.default.dim('  Try again later or use --db fresh to start with empty database.'));
+                        if (localDumpPath)
+                            (0, db_utils_1.cleanupDump)(localDumpPath);
+                        return;
                     }
                 }
+                else {
+                    // No project synced - can't upload to S3
+                    console.log(chalk_1.default.red('Project not synced - cannot upload database snapshot.'));
+                    console.log(chalk_1.default.dim('  Run `genbox init` first to sync your project, then try again.'));
+                    if (localDumpPath)
+                        (0, db_utils_1.cleanupDump)(localDumpPath);
+                    return;
+                }
             }
         }
         // Build payload
@@ -572,14 +585,6 @@ exports.createCommand = new commander_1.Command('create')
                 s3Key: snapshotS3Key,
             };
         }
-        else if (localDumpPath) {
-            // Fall back to SCP upload mode (no project or S3 upload failed)
-            payloadResolved.database = {
-                ...resolved.database,
-                url: undefined,
-                mode: 'copy-local',
-            };
-        }
         const payload = buildPayload(payloadResolved, config, publicKey, privateKeyContent, configLoader);
         // Create genbox
         const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();
@@ -600,59 +605,6 @@ exports.createCommand = new commander_1.Command('create')
             }
             // Display results
             displayGenboxInfo(genbox, resolved);
-            // Handle database upload if we have a local dump
-            if (localDumpPath && genbox.ipAddress) {
-                console.log('');
-                console.log(chalk_1.default.blue('=== Database Restore ==='));
-                // Wait for SSH access
-                const sshSpinner = (0, ora_1.default)('Waiting for SSH access...').start();
-                const sshReady = await (0, db_utils_1.waitForSshAccess)(genbox.ipAddress, 300, (msg) => {
-                    sshSpinner.text = msg;
-                });
-                if (!sshReady) {
-                    sshSpinner.fail(chalk_1.default.yellow('SSH not ready - database will need manual restore'));
-                    console.log(chalk_1.default.dim('  Run `genbox db sync` after the server is ready'));
-                    (0, db_utils_1.cleanupDump)(localDumpPath);
-                }
-                else {
-                    sshSpinner.succeed('SSH connected');
-                    // Upload dump
-                    const uploadSpinner = (0, ora_1.default)('Uploading database dump...').start();
-                    const uploadResult = await (0, db_utils_1.uploadDumpToGenbox)(localDumpPath, genbox.ipAddress, {
-                        onProgress: (msg) => uploadSpinner.text = msg,
-                    });
-                    if (!uploadResult.success) {
-                        uploadSpinner.fail(chalk_1.default.yellow('Upload failed - database will need manual restore'));
-                        console.log(chalk_1.default.dim(`  ${uploadResult.error}`));
-                        console.log(chalk_1.default.dim('  Run `genbox db sync` after the server is ready'));
-                        (0, db_utils_1.cleanupDump)(localDumpPath);
-                    }
-                    else {
-                        uploadSpinner.succeed('Dump uploaded');
-                        // Trigger restore
-                        const restoreSpinner = (0, ora_1.default)('Restoring database...').start();
-                        const restoreResult = await (0, db_utils_1.runRemoteMongoRestore)(genbox.ipAddress, config.project.name, { onProgress: (msg) => restoreSpinner.text = msg });
-                        if (!restoreResult.success) {
-                            restoreSpinner.fail(chalk_1.default.yellow('Restore failed'));
-                            console.log(chalk_1.default.dim(`  ${restoreResult.error}`));
-                            console.log(chalk_1.default.dim('  The dump file is on the server - you can restore manually'));
-                        }
-                        else {
-                            restoreSpinner.succeed(chalk_1.default.green('Database restored successfully!'));
-                        }
-                        // Cleanup local dump
-                        (0, db_utils_1.cleanupDump)(localDumpPath);
-                    }
-                }
-            }
-            else if (localDumpPath) {
-                // No IP yet - inform user to run db sync later
-                console.log('');
-                console.log(chalk_1.default.yellow('Database dump created but IP not yet assigned.'));
-                console.log(chalk_1.default.dim('  Run `genbox db sync` once the server is ready to restore the database.'));
-                // Keep the dump file - user might want to use it
-                console.log(chalk_1.default.dim(`  Dump file: ${localDumpPath}`));
-            }
             // Inform user about server provisioning
             console.log('');
             console.log(chalk_1.default.dim('Server is provisioning. Run `genbox connect` once ready.'));

package/dist/commands/db-sync.js

@@ -41,31 +41,25 @@ const commander_1 = require("commander");
 const prompts = __importStar(require("@inquirer/prompts"));
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
+const fs = __importStar(require("fs"));
 const config_loader_1 = require("../config-loader");
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
-async function executeDbOperation(payload) {
-    return (0, api_1.fetchApi)('/genboxes/db', {
-        method: 'POST',
-        body: JSON.stringify(payload),
-    });
-}
+const db_utils_1 = require("../db-utils");
 exports.dbSyncCommand = new commander_1.Command('db')
     .description('Database operations for genbox environments');
 // Subcommand: db sync
 exports.dbSyncCommand
     .command('sync [genbox]')
     .description('Sync database from staging/production to a genbox')
-    .option('-s, --source <source>', 'Source environment: staging, production', 'staging')
-    .option('--collections <collections>', 'Comma-separated list of collections to sync')
-    .option('--exclude <collections>', 'Comma-separated list of collections to exclude')
+    .option('-s, --source <source>', 'Source environment: staging, production', 'production')
+    .option('--dump <path>', 'Path to existing database dump file')
     .option('-f, --force', 'Skip confirmation prompt')
-    .option('--dry-run', 'Show what would be synced without actually syncing')
+    .option('--fresh', 'Create new snapshot even if recent one exists')
     .action(async (genboxName, options) => {
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        // Get genbox
         // Select genbox
         const result = await (0, genbox_selector_1.selectGenbox)(genboxName);
         if (!result.genbox) {
@@ -74,21 +68,24 @@ exports.dbSyncCommand
             }
             return;
         }
-        const genbox = result.genbox.name;
-        const config = loadResult.config;
-        const source = options.source;
-        // Validate source environment exists
-        if (config.version === 4 && !config.environments?.[source]) {
-            console.log(chalk_1.default.yellow(`Environment '${source}' not configured in genbox.yaml`));
-            console.log(chalk_1.default.dim('Available environments:'));
-            for (const env of Object.keys(config.environments || {})) {
-                console.log(chalk_1.default.dim(`  - ${env}`));
-            }
+        const genbox = result.genbox;
+        const genboxId = genbox._id;
+        // Check project ID
+        const projectId = genbox.project;
+        if (!projectId) {
+            console.log(chalk_1.default.red('Project not synced - cannot sync database.'));
+            console.log(chalk_1.default.dim('  Run `genbox init` first to sync your project.'));
             return;
         }
-        // Get source URL
+        const config = loadResult.config;
+        const source = options.source;
+        // Get source URL from .env.genbox
         const envVars = configLoader.loadEnvVars(process.cwd());
-        const sourceUrlVar = source === 'production' ? 'PROD_MONGODB_URL' : 'STAGING_MONGODB_URL';
+        const sourceUrlVar = source === 'production'
+            ? 'PROD_MONGODB_URL'
+            : source === 'staging'
+                ? 'STAGING_MONGODB_URL'
+                : `${source.toUpperCase()}_MONGODB_URL`;
         const sourceUrl = envVars[sourceUrlVar];
         if (!sourceUrl) {
             console.log(chalk_1.default.red(`${sourceUrlVar} not found in .env.genbox`));
@@ -99,34 +96,21 @@ exports.dbSyncCommand
         console.log('');
         console.log(chalk_1.default.bold('Database Sync:'));
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-        console.log(`  ${chalk_1.default.bold('Genbox:')}     ${genbox}`);
+        console.log(`  ${chalk_1.default.bold('Genbox:')}     ${genbox.name}`);
         console.log(`  ${chalk_1.default.bold('Source:')}     ${source}`);
-        console.log(`  ${chalk_1.default.bold('Database:')}   ${config.project?.name || 'default'}`);
-        if (options.collections) {
-            console.log(`  ${chalk_1.default.bold('Collections:')} ${options.collections}`);
-        }
-        if (options.exclude) {
-            console.log(`  ${chalk_1.default.bold('Exclude:')}    ${options.exclude}`);
-        }
+        console.log(`  ${chalk_1.default.bold('URL:')}        ${sourceUrl.replace(/\/\/[^:]+:[^@]+@/, '//***:***@')}`);
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         // Warning for production
         if (source === 'production') {
             console.log('');
             console.log(chalk_1.default.yellow('⚠ WARNING: Syncing from production database'));
         }
-        // Dry run mode
-        if (options.dryRun) {
-            console.log('');
-            console.log(chalk_1.default.yellow('Dry run mode - no changes made'));
-            console.log(chalk_1.default.dim('Remove --dry-run to perform the sync'));
-            return;
-        }
         // Confirmation
         if (!options.force) {
             console.log('');
             console.log(chalk_1.default.yellow('⚠ This will replace all data in the genbox database!'));
             const confirm = await prompts.confirm({
-                message: `Sync database from ${source} to ${genbox}?`,
+                message: `Sync database from ${source} to ${genbox.name}?`,
                 default: false,
             });
             if (!confirm) {
@@ -134,147 +118,191 @@ exports.dbSyncCommand
                 return;
             }
         }
-        // Execute sync
-        const spinner = (0, ora_1.default)(`Syncing database from ${source}...`).start();
-        try {
-            const result = await executeDbOperation({
-                genboxName: genbox,
-                operation: 'copy',
-                source,
-                sourceUrl,
-                database: config.project?.name,
-                collections: options.collections?.split(',').map((c) => c.trim()),
-                excludeCollections: options.exclude?.split(',').map((c) => c.trim()),
-            });
-            spinner.succeed(chalk_1.default.green('Database synced successfully!'));
-            if (result.stats) {
-                console.log('');
-                console.log(chalk_1.default.bold('Sync Statistics:'));
-                console.log(`  Collections: ${result.stats.collections || 0}`);
-                console.log(`  Documents:   ${result.stats.documents || 0}`);
-                console.log(`  Size:        ${result.stats.size || 'N/A'}`);
-                console.log(`  Duration:    ${result.stats.duration || 'N/A'}`);
+        // Map source to snapshot source type
+        const snapshotSource = source === 'production' ? 'production' : source === 'staging' ? 'staging' : 'local';
+        let snapshotId;
+        let snapshotS3Key;
+        let localDumpPath;
+        // Check for existing snapshots (unless --fresh specified)
+        if (!options.fresh && !options.dump) {
+            try {
+                const existingSnapshot = await (0, api_1.getLatestSnapshot)(projectId, snapshotSource);
+                if (existingSnapshot) {
+                    const snapshotAge = Date.now() - new Date(existingSnapshot.createdAt).getTime();
+                    const hoursAgo = Math.floor(snapshotAge / (1000 * 60 * 60));
+                    const timeAgoStr = hoursAgo < 1 ? 'less than an hour ago' : `${hoursAgo} hours ago`;
+                    const snapshotChoice = await prompts.select({
+                        message: `Found existing ${snapshotSource} snapshot (${timeAgoStr}):`,
+                        choices: [
+                            {
+                                name: `Use existing snapshot (${timeAgoStr}, ${(0, db_utils_1.formatBytes)(existingSnapshot.sizeBytes)})`,
+                                value: 'existing',
+                            },
+                            {
+                                name: 'Create fresh snapshot (dump now)',
+                                value: 'fresh',
+                            },
+                        ],
+                    });
+                    if (snapshotChoice === 'existing') {
+                        snapshotId = existingSnapshot._id;
+                        snapshotS3Key = existingSnapshot.s3Key;
+                        console.log(chalk_1.default.green(`  ✓ Using existing snapshot`));
+                    }
+                }
             }
-        }
-        catch (error) {
-            spinner.fail(chalk_1.default.red('Sync failed'));
-            console.error(chalk_1.default.red(`Error: ${error.message}`));
-            if (error instanceof api_1.AuthenticationError) {
-                console.log(chalk_1.default.yellow('\nRun: genbox login'));
+            catch {
+                // Silently continue if we can't fetch snapshots
             }
         }
-    }
-    catch (error) {
-        if (error.name === 'ExitPromptError') {
-            console.log(chalk_1.default.dim('\nCancelled.'));
-            return;
-        }
-        console.error(chalk_1.default.red(`Error: ${error.message}`));
-    }
-});
-// Subcommand: db status
-exports.dbSyncCommand
-    .command('status [genbox]')
-    .description('Show database status for a genbox')
-    .action(async (genboxName) => {
-    try {
-        const configLoader = new config_loader_1.ConfigLoader();
-        const loadResult = await configLoader.load();
-        // Select genbox
-        const selectResult = await (0, genbox_selector_1.selectGenbox)(genboxName);
-        if (!selectResult.genbox) {
-            if (!selectResult.cancelled) {
-                console.log(chalk_1.default.yellow('No genbox selected'));
+        // Create new snapshot if needed
+        if (!snapshotId) {
+            // Check for user-provided dump file
+            if (options.dump) {
+                if (!fs.existsSync(options.dump)) {
+                    console.log(chalk_1.default.red(`Database dump file not found: ${options.dump}`));
+                    return;
+                }
+                localDumpPath = options.dump;
+                console.log(chalk_1.default.dim(`  Using provided dump file: ${options.dump}`));
             }
+            else {
+                // Need to run mongodump locally
+                if (!(0, db_utils_1.isMongoDumpAvailable)()) {
+                    console.log(chalk_1.default.red('mongodump not found. Required for database sync.'));
+                    console.log('');
+                    console.log((0, db_utils_1.getMongoDumpInstallInstructions)());
+                    console.log('');
+                    console.log(chalk_1.default.dim('Alternatively:'));
+                    console.log(chalk_1.default.dim('  • Use --dump <path> to provide an existing dump file'));
+                    return;
+                }
+                const dumpSpinner = (0, ora_1.default)('Creating database dump...').start();
+                const dumpResult = await (0, db_utils_1.runLocalMongoDump)(sourceUrl, {
+                    onProgress: (msg) => dumpSpinner.text = msg,
+                });
+                if (!dumpResult.success) {
+                    dumpSpinner.fail(chalk_1.default.red('Database dump failed'));
+                    console.log(chalk_1.default.red(`  ${dumpResult.error}`));
+                    return;
+                }
+                dumpSpinner.succeed(chalk_1.default.green(`Database dump created (${(0, db_utils_1.formatBytes)(dumpResult.sizeBytes || 0)})`));
+                localDumpPath = dumpResult.dumpPath;
+            }
+            // Upload to S3
+            if (localDumpPath) {
+                const uploadSpinner = (0, ora_1.default)('Uploading database snapshot...').start();
+                const snapshotResult = await (0, db_utils_1.createAndUploadSnapshot)(localDumpPath, projectId, snapshotSource, {
+                    sourceUrl: sourceUrl.replace(/\/\/[^:]+:[^@]+@/, '//***:***@'),
+                    onProgress: (msg) => uploadSpinner.text = msg,
+                });
+                if (snapshotResult.success) {
+                    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);
+                    }
+                }
+                else {
+                    uploadSpinner.fail(chalk_1.default.red('Database snapshot upload failed'));
+                    console.log(chalk_1.default.dim(`  Error: ${snapshotResult.error}`));
+                    if (!options.dump) {
+                        (0, db_utils_1.cleanupDump)(localDumpPath);
+                    }
+                    return;
+                }
+            }
+        }
+        // Trigger restore on genbox
+        if (!snapshotId || !snapshotS3Key) {
+            console.log(chalk_1.default.red('No snapshot available to restore'));
             return;
         }
-        const genbox = selectResult.genbox.name;
-        const spinner = (0, ora_1.default)('Fetching database status...').start();
+        const restoreSpinner = (0, ora_1.default)('Restoring database on genbox...').start();
         try {
-            const result = await executeDbOperation({
-                genboxName: genbox,
-                operation: 'status',
+            await (0, api_1.fetchApi)(`/genboxes/${genboxId}/db/restore`, {
+                method: 'POST',
+                body: JSON.stringify({
+                    snapshotId,
+                    s3Key: snapshotS3Key,
+                }),
             });
-            spinner.stop();
+            restoreSpinner.succeed(chalk_1.default.green('Database sync completed!'));
             console.log('');
-            console.log(chalk_1.default.bold(`Database Status: ${genbox}`));
-            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-            if (result.status === 'connected') {
-                console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.green('Connected')}`);
-            }
-            else {
-                console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.red('Disconnected')}`);
-            }
-            if (result.mode) {
-                console.log(`  ${chalk_1.default.bold('Mode:')}        ${result.mode}`);
-            }
-            if (result.source) {
-                console.log(`  ${chalk_1.default.bold('Source:')}      ${result.source}`);
-            }
-            if (result.database) {
-                console.log(`  ${chalk_1.default.bold('Database:')}    ${result.database}`);
-            }
-            if (result.collections) {
-                console.log(`  ${chalk_1.default.bold('Collections:')} ${result.collections}`);
-            }
-            if (result.size) {
-                console.log(`  ${chalk_1.default.bold('Size:')}        ${result.size}`);
-            }
-            if (result.lastSync) {
-                console.log(`  ${chalk_1.default.bold('Last Sync:')}   ${result.lastSync}`);
-            }
-            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+            console.log(chalk_1.default.dim(`  Database has been restored from ${source} snapshot.`));
         }
         catch (error) {
-            spinner.fail(chalk_1.default.red('Failed to get status'));
-            console.error(chalk_1.default.red(`Error: ${error.message}`));
+            restoreSpinner.fail(chalk_1.default.red('Database restore failed'));
+            console.error(chalk_1.default.red(`  Error: ${error.message}`));
+            if (error instanceof api_1.AuthenticationError) {
+                console.log(chalk_1.default.yellow('\nRun: genbox login'));
+            }
         }
     }
     catch (error) {
+        if (error.name === 'ExitPromptError') {
+            console.log(chalk_1.default.dim('\nCancelled.'));
+            return;
+        }
         console.error(chalk_1.default.red(`Error: ${error.message}`));
     }
 });
-// Subcommand: db restore
+// Subcommand: db restore (from existing snapshot)
 exports.dbSyncCommand
     .command('restore [genbox]')
-    .description('Restore database from a backup')
-    .option('-f, --file <file>', 'Path to backup file (local or S3 URL)')
-    .option('--force', 'Skip confirmation prompt')
+    .description('Restore database from an existing snapshot')
+    .option('-s, --source <source>', 'Snapshot source: staging, production', 'production')
+    .option('--snapshot <id>', 'Specific snapshot ID to restore')
+    .option('-f, --force', 'Skip confirmation prompt')
     .action(async (genboxName, options) => {
     try {
-        const configLoader = new config_loader_1.ConfigLoader();
-        const loadResult = await configLoader.load();
         // Select genbox
-        const selectResult = await (0, genbox_selector_1.selectGenbox)(genboxName);
-        if (!selectResult.genbox) {
-            if (!selectResult.cancelled) {
+        const result = await (0, genbox_selector_1.selectGenbox)(genboxName);
+        if (!result.genbox) {
+            if (!result.cancelled) {
                 console.log(chalk_1.default.yellow('No genbox selected'));
             }
             return;
         }
-        const genbox = selectResult.genbox.name;
-        if (!options.file) {
-            // List available backups
-            console.log(chalk_1.default.blue('Fetching available backups...'));
+        const genbox = result.genbox;
+        const genboxId = genbox._id;
+        // Check project ID
+        const projectId = genbox.project;
+        if (!projectId) {
+            console.log(chalk_1.default.red('Project not synced - cannot restore database.'));
+            console.log(chalk_1.default.dim('  Run `genbox init` first to sync your project.'));
+            return;
+        }
+        const source = options.source;
+        const snapshotSource = source === 'production' ? 'production' : source === 'staging' ? 'staging' : 'local';
+        let snapshotId = options.snapshot;
+        let snapshotS3Key;
+        // Find snapshot if not specified
+        if (!snapshotId) {
             try {
-                const result = await (0, api_1.fetchApi)(`/genboxes/${genbox}/backups`);
-                if (!result.backups || result.backups.length === 0) {
-                    console.log(chalk_1.default.yellow('No backups available'));
+                const existingSnapshot = await (0, api_1.getLatestSnapshot)(projectId, snapshotSource);
+                if (!existingSnapshot) {
+                    console.log(chalk_1.default.yellow(`No ${source} snapshots found for this project.`));
+                    console.log(chalk_1.default.dim('  Use `genbox db sync` to create a snapshot first.'));
                     return;
                 }
+                const snapshotAge = Date.now() - new Date(existingSnapshot.createdAt).getTime();
+                const hoursAgo = Math.floor(snapshotAge / (1000 * 60 * 60));
+                const timeAgoStr = hoursAgo < 1 ? 'less than an hour ago' : `${hoursAgo} hours ago`;
                 console.log('');
-                console.log(chalk_1.default.bold('Available Backups:'));
+                console.log(chalk_1.default.bold('Available Snapshot:'));
                 console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-                for (const backup of result.backups.slice(0, 10)) {
-                    console.log(`  ${backup.name}  ${chalk_1.default.dim(backup.date)}  ${chalk_1.default.dim(backup.size)}`);
-                }
+                console.log(`  ${chalk_1.default.bold('Source:')}     ${source}`);
+                console.log(`  ${chalk_1.default.bold('Created:')}    ${timeAgoStr}`);
+                console.log(`  ${chalk_1.default.bold('Size:')}       ${(0, db_utils_1.formatBytes)(existingSnapshot.sizeBytes)}`);
                 console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-                console.log('');
-                console.log(chalk_1.default.dim('Use: genbox db restore <genbox> --file <backup-name>'));
-                return;
+                snapshotId = existingSnapshot._id;
+                snapshotS3Key = existingSnapshot.s3Key;
             }
             catch (error) {
-                console.error(chalk_1.default.red(`Error: ${error.message}`));
+                console.log(chalk_1.default.red(`Failed to fetch snapshots: ${error.message}`));
                 return;
             }
         }
@@ -283,7 +311,7 @@ exports.dbSyncCommand
             console.log('');
             console.log(chalk_1.default.yellow('⚠ This will replace all data in the genbox database!'));
             const confirm = await prompts.confirm({
-                message: `Restore database from ${options.file}?`,
+                message: `Restore database on ${genbox.name}?`,
                 default: false,
             });
             if (!confirm) {
@@ -291,26 +319,24 @@ exports.dbSyncCommand
                 return;
             }
         }
-        // Execute restore
-        const spinner = (0, ora_1.default)('Restoring database...').start();
+        // Trigger restore
+        const restoreSpinner = (0, ora_1.default)('Restoring database...').start();
         try {
-            const result = await executeDbOperation({
-                genboxName: genbox,
-                operation: 'restore',
-                source: options.file,
+            await (0, api_1.fetchApi)(`/genboxes/${genboxId}/db/restore`, {
+                method: 'POST',
+                body: JSON.stringify({
+                    snapshotId,
+                    s3Key: snapshotS3Key,
+                }),
             });
-            spinner.succeed(chalk_1.default.green('Database restored successfully!'));
-            if (result.stats) {
-                console.log('');
-                console.log(chalk_1.default.bold('Restore Statistics:'));
-                console.log(`  Collections: ${result.stats.collections || 0}`);
-                console.log(`  Documents:   ${result.stats.documents || 0}`);
-                console.log(`  Duration:    ${result.stats.duration || 'N/A'}`);
-            }
+            restoreSpinner.succeed(chalk_1.default.green('Database restored successfully!'));
         }
         catch (error) {
-            spinner.fail(chalk_1.default.red('Restore failed'));
-            console.error(chalk_1.default.red(`Error: ${error.message}`));
+            restoreSpinner.fail(chalk_1.default.red('Restore failed'));
+            console.error(chalk_1.default.red(`  Error: ${error.message}`));
+            if (error instanceof api_1.AuthenticationError) {
+                console.log(chalk_1.default.yellow('\nRun: genbox login'));
+            }
         }
     }
     catch (error) {
@@ -321,41 +347,56 @@ exports.dbSyncCommand
         console.error(chalk_1.default.red(`Error: ${error.message}`));
     }
 });
-// Subcommand: db dump
+// Subcommand: db snapshots (list available snapshots)
 exports.dbSyncCommand
-    .command('dump [genbox]')
-    .description('Create a database dump/backup')
-    .option('-o, --output <path>', 'Output path for the dump')
-    .action(async (genboxName, options) => {
+    .command('snapshots')
+    .description('List available database snapshots for current project')
+    .action(async () => {
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        // Select genbox
-        const selectResult = await (0, genbox_selector_1.selectGenbox)(genboxName);
-        if (!selectResult.genbox) {
-            if (!selectResult.cancelled) {
-                console.log(chalk_1.default.yellow('No genbox selected'));
-            }
+        if (!loadResult.config) {
+            console.log(chalk_1.default.red('Not a genbox project'));
+            console.log(chalk_1.default.dim('Run "genbox init" to initialize a project.'));
             return;
         }
-        const genbox = selectResult.genbox.name;
-        const spinner = (0, ora_1.default)('Creating database dump...').start();
+        // Get project ID
+        const config = loadResult.config;
+        const projectName = config.project?.name;
+        if (!projectName) {
+            console.log(chalk_1.default.red('Project name not found in genbox.yaml'));
+            return;
+        }
+        // Fetch project to get ID
+        const spinner = (0, ora_1.default)('Fetching snapshots...').start();
         try {
-            const result = await (0, api_1.fetchApi)(`/genboxes/${genbox}/db/dump`, {
-                method: 'POST',
-                body: JSON.stringify({ output: options.output }),
-            });
-            spinner.succeed(chalk_1.default.green('Database dump created!'));
-            if (result.path) {
-                console.log(`  Location: ${result.path}`);
+            const project = await (0, api_1.fetchApi)(`/projects/by-name/${projectName}`);
+            if (!project?._id) {
+                spinner.fail(chalk_1.default.yellow('Project not synced'));
+                console.log(chalk_1.default.dim('  Run `genbox init` to sync your project.'));
+                return;
             }
-            if (result.size) {
-                console.log(`  Size: ${result.size}`);
+            const snapshots = await (0, api_1.fetchApi)(`/snapshots/project/${project._id}`);
+            spinner.stop();
+            if (!snapshots || snapshots.length === 0) {
+                console.log(chalk_1.default.yellow('No snapshots found for this project.'));
+                console.log(chalk_1.default.dim('  Use `genbox db sync` or `genbox create --db copy` to create snapshots.'));
+                return;
+            }
+            console.log('');
+            console.log(chalk_1.default.bold('Database Snapshots:'));
+            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+            for (const snapshot of snapshots) {
+                const age = Date.now() - new Date(snapshot.createdAt).getTime();
+                const hoursAgo = Math.floor(age / (1000 * 60 * 60));
+                const timeAgoStr = hoursAgo < 1 ? '<1h ago' : hoursAgo < 24 ? `${hoursAgo}h ago` : `${Math.floor(hoursAgo / 24)}d ago`;
+                console.log(`  ${chalk_1.default.cyan(snapshot.source.padEnd(12))} ${(0, db_utils_1.formatBytes)(snapshot.sizeBytes).padEnd(10)} ${chalk_1.default.dim(timeAgoStr)}`);
             }
+            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         }
         catch (error) {
-            spinner.fail(chalk_1.default.red('Dump failed'));
-            console.error(chalk_1.default.red(`Error: ${error.message}`));
+            spinner.fail(chalk_1.default.red('Failed to fetch snapshots'));
+            console.error(chalk_1.default.red(`  Error: ${error.message}`));
         }
     }
     catch (error) {

package/dist/commands/init.js

@@ -858,7 +858,8 @@ async function setupProfiles(detected, environments) {
             console.log(chalk_1.default.dim(`    Connection: ${profile.default_connection}`));
         }
         if (profile.database) {
-            console.log(chalk_1.default.dim(`    Database: ${profile.database.mode}${profile.database.source ? ` from ${profile.database.source}` : ''}`));
+            const dbModeDisplay = profile.database.mode === 'local' ? 'fresh' : profile.database.mode;
+            console.log(chalk_1.default.dim(`    Database: ${dbModeDisplay}${profile.database.source ? ` from ${profile.database.source}` : ''}`));
         }
         console.log('');
     }

package/dist/commands/rebuild.js

@@ -49,6 +49,7 @@ const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 const schema_v4_1 = require("../schema-v4");
+const db_utils_1 = require("../db-utils");
 function getPublicSshKey() {
     const home = os.homedir();
     const potentialKeys = [
@@ -419,6 +420,9 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
     .option('-b, --branch <branch>', 'Git branch to checkout')
     .option('-n, --new-branch <name>', 'Create a new branch with this name')
     .option('-f, --from-branch <branch>', 'Source branch to create new branch from')
+    .option('--db <mode>', 'Database mode: fresh, copy, none')
+    .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')
     .action(async (name, options) => {
     try {
@@ -493,6 +497,10 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         // For new branch creation: only use CLI options (user must explicitly request new branch on rebuild)
         const effectiveNewBranch = newBranchName;
         const effectiveSourceBranch = options.fromBranch;
+        // 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;
+        const effectiveDbSource = options.dbSource || genbox.database?.source;
         // Build options for resolving - use stored config, skip interactive prompts
         const createOptions = {
             name: selectedName,
@@ -501,6 +509,8 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             branch: effectiveBranch,
             newBranch: effectiveNewBranch,
             sourceBranch: effectiveSourceBranch,
+            db: effectiveDbMode,
+            dbSource: effectiveDbSource,
             // Skip interactive prompts if we have stored config
             yes: options.yes || !!(storedProfile || storedApps),
         };
@@ -538,6 +548,12 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                 console.log(`    - ${repo.name}: ${branchInfo}`);
             }
         }
+        // Display database info
+        if (effectiveDbMode && effectiveDbMode !== 'none') {
+            console.log('');
+            const dbModeDisplay = effectiveDbMode === 'local' ? 'fresh' : effectiveDbMode;
+            console.log(`  ${chalk_1.default.bold('Database:')} ${dbModeDisplay}${effectiveDbSource ? ` (from ${effectiveDbSource})` : ''}`);
+        }
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         // Confirm rebuild
         if (!options.yes) {
@@ -573,8 +589,139 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                 }
             }
         }
+        // Handle database copy if requested
+        let snapshotId;
+        let snapshotS3Key;
+        let localDumpPath;
+        // Use the effective database mode/source from createOptions
+        const dbMode = effectiveDbMode || 'none';
+        const dbSource = effectiveDbSource || 'production';
+        if (dbMode === 'copy' && resolved.database?.url) {
+            // Get project ID for S3 upload
+            const projectId = genbox.project;
+            if (!projectId) {
+                console.log(chalk_1.default.red('Project not synced - cannot upload database snapshot.'));
+                console.log(chalk_1.default.dim('  Run `genbox init` first to sync your project.'));
+                return;
+            }
+            // Map source to snapshot source type
+            const snapshotSource = dbSource === 'production' ? 'production' : dbSource === 'staging' ? 'staging' : 'local';
+            // Check for existing snapshots
+            let useExistingSnapshot = false;
+            try {
+                const existingSnapshot = await (0, api_1.getLatestSnapshot)(projectId, snapshotSource);
+                if (existingSnapshot) {
+                    const snapshotAge = Date.now() - new Date(existingSnapshot.createdAt).getTime();
+                    const hoursAgo = Math.floor(snapshotAge / (1000 * 60 * 60));
+                    const timeAgoStr = hoursAgo < 1 ? 'less than an hour ago' : `${hoursAgo} hours ago`;
+                    if (!options.yes) {
+                        const snapshotChoice = await prompts.select({
+                            message: `Found existing ${snapshotSource} snapshot (${timeAgoStr}):`,
+                            choices: [
+                                {
+                                    name: `Use existing snapshot (${timeAgoStr}, ${(0, db_utils_1.formatBytes)(existingSnapshot.sizeBytes)})`,
+                                    value: 'existing',
+                                },
+                                {
+                                    name: 'Create fresh snapshot (dump now)',
+                                    value: 'fresh',
+                                },
+                            ],
+                        });
+                        useExistingSnapshot = snapshotChoice === 'existing';
+                    }
+                    else if (hoursAgo < 24) {
+                        useExistingSnapshot = true;
+                        console.log(chalk_1.default.dim(`  Using existing snapshot from ${timeAgoStr}`));
+                    }
+                    if (useExistingSnapshot) {
+                        snapshotId = existingSnapshot._id;
+                        snapshotS3Key = existingSnapshot.s3Key;
+                        console.log(chalk_1.default.green(`  ✓ Using existing snapshot`));
+                    }
+                }
+            }
+            catch {
+                // Silently continue if we can't fetch snapshots
+            }
+            // If not using existing snapshot, create a new one
+            if (!useExistingSnapshot) {
+                // Check for user-provided dump file
+                if (options.dbDump) {
+                    if (!fs.existsSync(options.dbDump)) {
+                        console.log(chalk_1.default.red(`Database dump file not found: ${options.dbDump}`));
+                        return;
+                    }
+                    localDumpPath = options.dbDump;
+                    console.log(chalk_1.default.dim(`  Using provided dump file: ${options.dbDump}`));
+                }
+                else {
+                    // Need to run mongodump locally
+                    if (!(0, db_utils_1.isMongoDumpAvailable)()) {
+                        console.log(chalk_1.default.red('mongodump not found. Required for database copy.'));
+                        console.log('');
+                        console.log((0, db_utils_1.getMongoDumpInstallInstructions)());
+                        console.log('');
+                        console.log(chalk_1.default.dim('Alternatively:'));
+                        console.log(chalk_1.default.dim('  • Use --db-dump <path> to provide an existing dump file'));
+                        console.log(chalk_1.default.dim('  • Use --db fresh to start with empty database'));
+                        return;
+                    }
+                    const dbUrl = resolved.database.url;
+                    console.log('');
+                    console.log(chalk_1.default.blue('=== Database Copy ==='));
+                    console.log(chalk_1.default.dim(`  Source: ${dbSource}`));
+                    console.log(chalk_1.default.dim(`  URL: ${dbUrl.replace(/\/\/[^:]+:[^@]+@/, '//***:***@')}`));
+                    const dumpSpinner = (0, ora_1.default)('Creating database dump...').start();
+                    const dumpResult = await (0, db_utils_1.runLocalMongoDump)(dbUrl, {
+                        onProgress: (msg) => dumpSpinner.text = msg,
+                    });
+                    if (!dumpResult.success) {
+                        dumpSpinner.fail(chalk_1.default.red('Database dump failed'));
+                        console.log(chalk_1.default.red(`  ${dumpResult.error}`));
+                        return;
+                    }
+                    dumpSpinner.succeed(chalk_1.default.green(`Database dump created (${(0, db_utils_1.formatBytes)(dumpResult.sizeBytes || 0)})`));
+                    localDumpPath = dumpResult.dumpPath;
+                }
+                // Upload to S3
+                if (localDumpPath) {
+                    const uploadSpinner = (0, ora_1.default)('Uploading database snapshot...').start();
+                    const snapshotResult = await (0, db_utils_1.createAndUploadSnapshot)(localDumpPath, projectId, snapshotSource, {
+                        sourceUrl: resolved.database.url?.replace(/\/\/[^:]+:[^@]+@/, '//***:***@'),
+                        onProgress: (msg) => uploadSpinner.text = msg,
+                    });
+                    if (snapshotResult.success) {
+                        uploadSpinner.succeed(chalk_1.default.green('Database snapshot uploaded'));
+                        snapshotId = snapshotResult.snapshotId;
+                        snapshotS3Key = snapshotResult.s3Key;
+                        (0, db_utils_1.cleanupDump)(localDumpPath);
+                        localDumpPath = undefined;
+                    }
+                    else {
+                        uploadSpinner.fail(chalk_1.default.red('Database snapshot upload failed'));
+                        console.log(chalk_1.default.dim(`  Error: ${snapshotResult.error}`));
+                        console.log(chalk_1.default.dim('  Try again later or use --db fresh to start with empty database.'));
+                        (0, db_utils_1.cleanupDump)(localDumpPath);
+                        return;
+                    }
+                }
+            }
+        }
         // 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 rebuild
         const rebuildSpinner = (0, ora_1.default)(`Rebuilding Genbox '${selectedName}'...`).start();
         try {

package/dist/profile-resolver.js

@@ -337,11 +337,13 @@ class ProfileResolver {
         };
         // CLI flag takes precedence
         if (options.db) {
+            // Normalize 'fresh' to 'local' (fresh is the UI name, local is internal)
+            const dbMode = options.db === 'fresh' ? 'local' : options.db;
             const source = options.dbSource || profile.database?.source || 'staging';
             return {
-                mode: options.db,
+                mode: dbMode,
                 source,
-                url: options.db === 'copy' ? getMongoUrl(source) : undefined,
+                url: dbMode === 'copy' ? getMongoUrl(source) : undefined,
             };
         }
         // Profile setting

package/package.json

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