genbox 1.0.30 → 1.0.32

package/dist/commands/init.js

@@ -621,10 +621,12 @@ exports.initCommand = new commander_1.Command('init')
         // Environment configuration - do this BEFORE profiles so profiles can reference environments
         // (skip only in non-interactive mode, always show for --from-scan since environments are required)
         if (!nonInteractive) {
-            const envConfig = await setupEnvironments(scan, v4Config, isMultiRepoStructure, existingEnvValues);
-            if (envConfig) {
-                v4Config.environments = envConfig;
+            const envResult = await setupEnvironments(scan, v4Config, isMultiRepoStructure, existingEnvValues);
+            if (envResult.environments) {
+                v4Config.environments = envResult.environments;
             }
+            // Add collected database URLs to envVarsToAdd (for .env.genbox)
+            Object.assign(envVarsToAdd, envResult.databaseUrls);
         }
         // Ask about profiles (skip prompt when using --from-scan)
         let createProfiles = true;
@@ -1170,6 +1172,7 @@ async function setupGitAuth(gitInfo, projectName) {
  * Setup staging/production environments (v4 format)
  */
 async function setupEnvironments(scan, config, isMultiRepo = false, existingEnvValues = {}) {
+    const databaseUrls = {};
     // First ask which environments they want to configure
     const envChoice = await prompts.select({
         message: 'Which environments do you want to configure?',
@@ -1182,16 +1185,18 @@ async function setupEnvironments(scan, config, isMultiRepo = false, existingEnvV
         default: 'staging',
     });
     if (envChoice === 'skip') {
-        return undefined;
+        return { environments: undefined, databaseUrls };
     }
     console.log('');
     console.log(chalk_1.default.blue('=== Environment Setup ==='));
     console.log(chalk_1.default.dim('These URLs will be used when connecting to external services.'));
-    console.log(chalk_1.default.dim('Actual secrets go in .env.genbox'));
+    console.log(chalk_1.default.dim('Database URLs are stored in .env.genbox for database copy operations.'));
     const environments = {};
     // Get existing URLs if available
     const existingStagingApiUrl = existingEnvValues['STAGING_API_URL'];
     const existingProductionApiUrl = existingEnvValues['PRODUCTION_API_URL'] || existingEnvValues['PROD_API_URL'];
+    const existingStagingMongoUrl = existingEnvValues['STAGING_MONGODB_URL'];
+    const existingProdMongoUrl = existingEnvValues['PROD_MONGODB_URL'] || existingEnvValues['PRODUCTION_MONGODB_URL'];
     const configureStaging = envChoice === 'staging' || envChoice === 'both';
     const configureProduction = envChoice === 'production' || envChoice === 'both';
     // Configure staging if selected
@@ -1250,6 +1255,36 @@ async function setupEnvironments(scan, config, isMultiRepo = false, existingEnvV
                 };
             }
         }
+        // Prompt for staging database URL (for database copy operations)
+        console.log('');
+        console.log(chalk_1.default.dim('  Database URL (for "Copy from staging" database mode):'));
+        console.log(chalk_1.default.dim('  Format: mongodb+srv://user:password@staging.mongodb.net/dbname'));
+        if (existingStagingMongoUrl) {
+            console.log(chalk_1.default.dim(`  Found existing value: ${existingStagingMongoUrl.substring(0, 50)}...`));
+            const useExisting = await prompts.confirm({
+                message: '  Use existing staging MongoDB URL?',
+                default: true,
+            });
+            if (useExisting) {
+                databaseUrls['STAGING_MONGODB_URL'] = existingStagingMongoUrl;
+            }
+            else {
+                const mongoUrl = await prompts.input({
+                    message: '  Staging MongoDB URL:',
+                });
+                if (mongoUrl) {
+                    databaseUrls['STAGING_MONGODB_URL'] = mongoUrl;
+                }
+            }
+        }
+        else {
+            const mongoUrl = await prompts.input({
+                message: '  Staging MongoDB URL (optional, press Enter to skip):',
+            });
+            if (mongoUrl) {
+                databaseUrls['STAGING_MONGODB_URL'] = mongoUrl;
+            }
+        }
     }
     // Configure production if selected
     if (configureProduction) {
@@ -1320,8 +1355,41 @@ async function setupEnvironments(scan, config, isMultiRepo = false, existingEnvV
                 };
             }
         }
+        // Prompt for production database URL (for database copy operations)
+        console.log('');
+        console.log(chalk_1.default.dim('  Database URL (for "Copy from production" database mode):'));
+        console.log(chalk_1.default.dim('  Format: mongodb+srv://readonly:password@prod.mongodb.net/dbname'));
+        if (existingProdMongoUrl) {
+            console.log(chalk_1.default.dim(`  Found existing value: ${existingProdMongoUrl.substring(0, 50)}...`));
+            const useExisting = await prompts.confirm({
+                message: '  Use existing production MongoDB URL?',
+                default: true,
+            });
+            if (useExisting) {
+                databaseUrls['PROD_MONGODB_URL'] = existingProdMongoUrl;
+            }
+            else {
+                const mongoUrl = await prompts.input({
+                    message: '  Production MongoDB URL:',
+                });
+                if (mongoUrl) {
+                    databaseUrls['PROD_MONGODB_URL'] = mongoUrl;
+                }
+            }
+        }
+        else {
+            const mongoUrl = await prompts.input({
+                message: '  Production MongoDB URL (optional, press Enter to skip):',
+            });
+            if (mongoUrl) {
+                databaseUrls['PROD_MONGODB_URL'] = mongoUrl;
+            }
+        }
     }
-    return Object.keys(environments).length > 0 ? environments : undefined;
+    return {
+        environments: Object.keys(environments).length > 0 ? environments : undefined,
+        databaseUrls,
+    };
 }
 /**
  * Prompt for a single API URL with existing value support
@@ -1378,12 +1446,19 @@ async function setupEnvFile(projectName, config, nonInteractive = false, scan, i
     if (!extraEnvVars['GIT_TOKEN']) {
         segregatedContent += `# GIT_TOKEN=ghp_xxxxxxxxxxxx\n`;
     }
-    segregatedContent += `
-# Database URLs (used by profiles with database mode)
-# STAGING_MONGODB_URL=mongodb+srv://user:password@staging.mongodb.net
-# PROD_MONGODB_URL=mongodb+srv://readonly:password@prod.mongodb.net
-
-`;
+    // Add database URL section (only show templates for missing URLs)
+    const hasStagingMongo = !!extraEnvVars['STAGING_MONGODB_URL'];
+    const hasProdMongo = !!extraEnvVars['PROD_MONGODB_URL'];
+    if (!hasStagingMongo || !hasProdMongo) {
+        segregatedContent += `\n# Database URLs (used by profiles with database mode)\n`;
+        if (!hasStagingMongo) {
+            segregatedContent += `# STAGING_MONGODB_URL=mongodb+srv://user:password@staging.mongodb.net\n`;
+        }
+        if (!hasProdMongo) {
+            segregatedContent += `# PROD_MONGODB_URL=mongodb+srv://readonly:password@prod.mongodb.net\n`;
+        }
+    }
+    segregatedContent += '\n';
     // For multi-repo: find env files in app directories
     if (isMultiRepo && scan) {
         const appEnvFiles = findAppEnvFiles(scan.apps, process.cwd());

package/dist/commands/status.js

@@ -79,6 +79,72 @@ function sshExec(ip, keyPath, command, timeoutSecs = 10) {
         return '';
     }
 }
+function formatDuration(secs) {
+    const mins = Math.floor(secs / 60);
+    const remainingSecs = secs % 60;
+    return `${mins}m ${remainingSecs}s`;
+}
+function getTimingBreakdown(ip, keyPath) {
+    const timing = {
+        sshReady: null,
+        cloudInit: null,
+        total: null,
+    };
+    // Get total system uptime
+    const uptime = sshExec(ip, keyPath, "cat /proc/uptime 2>/dev/null | cut -d' ' -f1 | cut -d'.' -f1");
+    if (uptime) {
+        timing.total = parseInt(uptime, 10);
+    }
+    // Get SSH ready time (sshd service start time relative to boot)
+    // ActiveEnterTimestampMonotonic gives microseconds since boot when service became active
+    const sshdTimestamp = sshExec(ip, keyPath, "systemctl show sshd --property=ActiveEnterTimestampMonotonic 2>/dev/null | cut -d'=' -f2");
+    if (sshdTimestamp && sshdTimestamp.trim()) {
+        const microseconds = parseInt(sshdTimestamp.trim(), 10);
+        if (!isNaN(microseconds) && microseconds > 0) {
+            timing.sshReady = Math.round(microseconds / 1000000); // Convert to seconds
+        }
+    }
+    // Get cloud-init execution time from logs
+    const cloudInitTime = sshExec(ip, keyPath, "sudo grep -oP 'Setup Complete in \\K[0-9]+m [0-9]+s' /var/log/cloud-init-output.log 2>/dev/null | tail -1");
+    if (cloudInitTime && cloudInitTime.trim()) {
+        // Parse "Xm Ys" format
+        const match = cloudInitTime.trim().match(/(\d+)m\s*(\d+)s/);
+        if (match) {
+            timing.cloudInit = parseInt(match[1], 10) * 60 + parseInt(match[2], 10);
+        }
+    }
+    // Fallback: calculate cloud-init time from result.json if not in logs
+    if (timing.cloudInit === null && timing.sshReady !== null && timing.total !== null) {
+        // Get cloud-init finish timestamp
+        const resultTimestamp = sshExec(ip, keyPath, "stat -c %Y /run/cloud-init/result.json 2>/dev/null");
+        const bootTimestamp = sshExec(ip, keyPath, "date -d \"$(uptime -s)\" +%s 2>/dev/null");
+        if (resultTimestamp && bootTimestamp) {
+            const resultTime = parseInt(resultTimestamp.trim(), 10);
+            const bootTime = parseInt(bootTimestamp.trim(), 10);
+            if (!isNaN(resultTime) && !isNaN(bootTime) && resultTime > bootTime) {
+                // Cloud-init time = (finish time - boot time) - ssh ready time
+                const totalFromBoot = resultTime - bootTime;
+                timing.cloudInit = Math.max(0, totalFromBoot - timing.sshReady);
+            }
+        }
+    }
+    return timing;
+}
+function displayTimingBreakdown(timing) {
+    if (timing.sshReady !== null || timing.cloudInit !== null || timing.total !== null) {
+        console.log(chalk_1.default.blue('[INFO] === Timing Breakdown ==='));
+        if (timing.sshReady !== null) {
+            console.log(`  SSH Ready:   ${formatDuration(timing.sshReady)}`);
+        }
+        if (timing.cloudInit !== null) {
+            console.log(`  Cloud-init:  ${formatDuration(timing.cloudInit)}`);
+        }
+        if (timing.total !== null) {
+            console.log(`  ${chalk_1.default.bold('Total:        ' + formatDuration(timing.total))}`);
+        }
+        console.log('');
+    }
+}
 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)')
@@ -145,18 +211,24 @@ exports.statusCommand = new commander_1.Command('status')
             return;
         }
         if (status.includes('running')) {
-            // Get elapsed time since server boot
-            const uptime = sshExec(target.ipAddress, keyPath, "cat /proc/uptime 2>/dev/null | cut -d' ' -f1 | cut -d'.' -f1");
-            if (uptime) {
-                const uptimeSecs = parseInt(uptime, 10);
-                const mins = Math.floor(uptimeSecs / 60);
-                const secs = uptimeSecs % 60;
-                console.log(chalk_1.default.yellow(`[WARN] Cloud-init is still running... (elapsed: ${mins}m ${secs}s)`));
+            // Get timing breakdown
+            const timing = getTimingBreakdown(target.ipAddress, keyPath);
+            if (timing.total !== null) {
+                console.log(chalk_1.default.yellow(`[WARN] Cloud-init is still running... (elapsed: ${formatDuration(timing.total)})`));
             }
             else {
                 console.log(chalk_1.default.yellow('[WARN] Cloud-init is still running...'));
             }
             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] Latest setup progress:'));
             // Tail cloud-init output log for progress
             const logOutput = sshExec(target.ipAddress, keyPath, "sudo tail -30 /var/log/cloud-init-output.log 2>/dev/null | grep -E '^===|^#|Progress:|DONE|error|Error|failed|Failed' || sudo tail -20 /var/log/cloud-init-output.log", 15);
@@ -165,29 +237,12 @@ exports.statusCommand = new commander_1.Command('status')
             }
         }
         else if (status.includes('done')) {
-            // Try to get actual cloud-init completion time from logs first
-            let completionTimeFormatted = '';
-            // First, try to extract "Setup Complete in Xm Ys" from cloud-init logs
-            const setupTime = sshExec(target.ipAddress, keyPath, "sudo grep -oP 'Setup Complete in \\K[0-9]+m [0-9]+s' /var/log/cloud-init-output.log 2>/dev/null | tail -1");
-            if (setupTime && setupTime.trim()) {
-                completionTimeFormatted = setupTime.trim();
-            }
-            else {
-                // Fallback: Calculate from cloud-init result.json timestamp vs boot time
-                // Get boot timestamp and cloud-init finish timestamp
-                const timestamps = sshExec(target.ipAddress, keyPath, "echo $(date -d \"$(uptime -s)\" +%s) $(stat -c %Y /run/cloud-init/result.json 2>/dev/null || echo 0)");
-                if (timestamps && timestamps.trim()) {
-                    const [bootTime, finishTime] = timestamps.trim().split(' ').map(Number);
-                    if (bootTime && finishTime && finishTime > bootTime) {
-                        const elapsedSecs = finishTime - bootTime;
-                        const mins = Math.floor(elapsedSecs / 60);
-                        const secs = elapsedSecs % 60;
-                        completionTimeFormatted = mins > 0 ? `${mins}m ${secs}s` : `${secs}s`;
-                    }
-                }
-            }
-            console.log(chalk_1.default.green(`[SUCCESS] Cloud-init completed!${completionTimeFormatted ? ` (${completionTimeFormatted})` : ''}`));
+            // Get timing breakdown
+            const timing = getTimingBreakdown(target.ipAddress, keyPath);
+            console.log(chalk_1.default.green(`[SUCCESS] Cloud-init completed!${timing.total !== null ? ` (${formatDuration(timing.total)})` : ''}`));
             console.log('');
+            // Show detailed timing breakdown
+            displayTimingBreakdown(timing);
             // Show Database Stats - only if configured
             let dbContainer = '';
             let dbName = '';

package/package.json

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