genbox 1.0.52 → 1.0.54

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/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/profile-resolver.js

@@ -321,18 +321,29 @@ class ProfileResolver {
      * Resolve database mode
      */
     async resolveDatabaseMode(config, options, profile) {
-        // Helper to get MongoDB URL for an environment
+        // Load env vars from .env.genbox (where init stores MongoDB URLs)
+        const envVars = this.configLoader.loadEnvVars(process.cwd());
+        // Helper to get MongoDB URL from .env.genbox
+        // Matches what init saves: PROD_MONGODB_URL, STAGING_MONGODB_URL
         const getMongoUrl = (source) => {
-            const envConfig = config.environments?.[source];
-            return envConfig?.urls?.mongodb;
+            if (source === 'production') {
+                return envVars['PROD_MONGODB_URL'] || envVars['PRODUCTION_MONGODB_URL'];
+            }
+            else if (source === 'staging') {
+                return envVars['STAGING_MONGODB_URL'];
+            }
+            // Custom environments: {NAME}_MONGODB_URL
+            return envVars[`${source.toUpperCase()}_MONGODB_URL`];
         };
         // 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
@@ -374,6 +385,18 @@ class ProfileResolver {
      */
     async selectDatabaseModeInteractive(config) {
         console.log(chalk_1.default.cyan('\n🗄️ Database Configuration:\n'));
+        // Load env vars from .env.genbox (where init stores MongoDB URLs)
+        const envVars = this.configLoader.loadEnvVars(process.cwd());
+        // Helper to get MongoDB URL from .env.genbox
+        const getMongoUrl = (source) => {
+            if (source === 'production') {
+                return envVars['PROD_MONGODB_URL'] || envVars['PRODUCTION_MONGODB_URL'];
+            }
+            else if (source === 'staging') {
+                return envVars['STAGING_MONGODB_URL'];
+            }
+            return envVars[`${source.toUpperCase()}_MONGODB_URL`];
+        };
         const modeChoices = [
             { name: 'None (no database)', value: 'none' },
             { name: 'Fresh (empty database)', value: 'local' },
@@ -405,18 +428,14 @@ class ProfileResolver {
         }
         else if (answer.startsWith('copy-')) {
             const source = answer.replace('copy-', '');
-            const envConfig = config.environments?.[source];
-            const mongoUrl = envConfig?.urls?.mongodb;
-            return { mode: 'copy', source, url: mongoUrl };
+            return { mode: 'copy', source, url: getMongoUrl(source) };
         }
         else if (answer.startsWith('remote-')) {
             const source = answer.replace('remote-', '');
-            const envConfig = config.environments?.[source];
-            const mongoUrl = envConfig?.urls?.mongodb;
             return {
                 mode: 'remote',
                 source,
-                url: mongoUrl,
+                url: getMongoUrl(source),
             };
         }
         return { mode: 'local' };

package/package.json

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