genbox 1.0.73 → 1.0.75

package/dist/commands/init.js

@@ -690,13 +690,15 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
     console.log('');
     console.log(chalk_1.default.blue('=== Environment Configuration ==='));
     console.log('');
-    // Auto-detect database URLs from project
+    // Auto-detect database URLs from project (informational only)
+    // Note: These are typically LOCAL dev databases, not production sources for snapshots
     const detectedDbUrls = detectDatabaseUrls(detected._meta.scanned_root, detected);
     if (detectedDbUrls.length > 0) {
-        console.log(chalk_1.default.dim('Detected database URLs in project:'));
+        console.log(chalk_1.default.dim('Detected database URLs in project (for reference):'));
         for (const db of detectedDbUrls) {
+            const info = db.varName ? `${db.varName} in ${db.source}` : db.source;
             console.log(chalk_1.default.dim(`  • ${db.url}`));
-            console.log(chalk_1.default.dim(`    └─ from ${db.source}${db.database ? ` (database: ${db.database})` : ''}`));
+            console.log(chalk_1.default.dim(`    └─ from ${info}${db.database ? ` (database: ${db.database})` : ''}`));
         }
         console.log('');
     }
@@ -714,11 +716,9 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
     if (envChoice !== 'skip') {
         console.log('');
         console.log(chalk_1.default.dim('These URLs will be used when connecting to external services.'));
-        console.log(chalk_1.default.dim('MongoDB URLs are used for taking database snapshots to copy to genbox.'));
+        console.log(chalk_1.default.dim('MongoDB URLs should point to PRODUCTION/STAGING databases (source for snapshots).'));
         const configureStaging = envChoice === 'staging' || envChoice === 'both';
         const configureProduction = envChoice === 'production' || envChoice === 'both';
-        // Build suggested MongoDB URL from detected sources
-        const suggestedMongoUrl = buildMongoDbUrl(detectedDbUrls);
         if (configureStaging) {
             console.log('');
             console.log(chalk_1.default.cyan('Staging Environment:'));
@@ -730,13 +730,9 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
                 };
                 envVars['STAGING_API_URL'] = stagingApiUrl;
             }
-            // Use auto-detected URL as default if no existing value
+            // Keep existing value - don't auto-suggest local dev URLs for snapshot sources
             const existingStagingMongo = existingEnvValues['STAGING_MONGODB_URL'];
-            const stagingMongoDefault = existingStagingMongo || suggestedMongoUrl;
-            if (stagingMongoDefault && !existingStagingMongo) {
-                console.log(chalk_1.default.dim(`  Auto-detected: ${stagingMongoDefault}`));
-            }
-            const stagingMongoUrl = await promptWithExisting('  Staging MongoDB URL (for snapshots):', stagingMongoDefault, true);
+            const stagingMongoUrl = await promptWithExisting('  Staging MongoDB URL (for snapshots):', existingStagingMongo, true);
             if (stagingMongoUrl) {
                 envVars['STAGING_MONGODB_URL'] = stagingMongoUrl;
             }
@@ -756,13 +752,9 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
                 };
                 envVars['PRODUCTION_API_URL'] = prodApiUrl;
             }
-            // Use auto-detected URL as default if no existing value
+            // Keep existing value - don't auto-suggest local dev URLs for snapshot sources
             const existingProdMongo = existingEnvValues['PROD_MONGODB_URL'] || existingEnvValues['PRODUCTION_MONGODB_URL'];
-            const prodMongoDefault = existingProdMongo || suggestedMongoUrl;
-            if (prodMongoDefault && !existingProdMongo) {
-                console.log(chalk_1.default.dim(`  Auto-detected: ${prodMongoDefault}`));
-            }
-            const prodMongoUrl = await promptWithExisting('  Production MongoDB URL (for snapshots):', prodMongoDefault, true);
+            const prodMongoUrl = await promptWithExisting('  Production MongoDB URL (for snapshots):', existingProdMongo, true);
             if (prodMongoUrl) {
                 envVars['PROD_MONGODB_URL'] = prodMongoUrl;
             }

package/dist/commands/rebuild.js

@@ -337,12 +337,17 @@ async function runSoftRebuild(options) {
                 log(`Warning: Database restore failed: ${error.message}`, 'error');
             }
         }
-        // Step 8: Start PM2 services
+        // Step 8: Start PM2 services (only for apps with runner: pm2 or unspecified)
         onStep?.('Starting application services...');
         for (const app of resolved.apps) {
             const appConfig = config.apps[app.name];
             if (!appConfig)
                 continue;
+            // Skip apps with runner: docker - they're already running via Docker Compose
+            if (appConfig.runner === 'docker') {
+                log(`Skipping ${app.name} (runner: docker, already started via Docker Compose)`, 'dim');
+                continue;
+            }
             // Find the repo path for this app
             const appPath = appConfig.path || app.name;
             const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
@@ -362,11 +367,12 @@ async function runSoftRebuild(options) {
                 }
             }
             else {
-                // Check for start script in package.json
-                const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
-                if (hasStartScript.output === 'yes') {
-                    log(`Starting ${app.name} with PM2 (npm start)...`, 'info');
-                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start npm --name ${app.name} -- start`, {
+                // Use configured dev command, or fall back to dev script, then start script
+                const devCommand = appConfig.commands?.dev;
+                if (devCommand) {
+                    // Use the configured dev command
+                    log(`Starting ${app.name} with PM2 (${devCommand})...`, 'info');
+                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run ${devCommand}" --name ${app.name}`, {
                         onStdout: (line) => log(line, 'dim'),
                         timeoutSecs: 60,
                     });
@@ -374,6 +380,34 @@ async function runSoftRebuild(options) {
                         log(`✓ Started ${app.name}`, 'success');
                     }
                 }
+                else {
+                    // Check for dev script in package.json first, then start
+                    const hasDevScript = await sshExec(ip, keyPath, `grep -q '"dev"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                    if (hasDevScript.output === 'yes') {
+                        log(`Starting ${app.name} with PM2 (pnpm dev)...`, 'info');
+                        const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run dev" --name ${app.name}`, {
+                            onStdout: (line) => log(line, 'dim'),
+                            timeoutSecs: 60,
+                        });
+                        if (pm2Result.success) {
+                            log(`✓ Started ${app.name}`, 'success');
+                        }
+                    }
+                    else {
+                        // Fall back to start script
+                        const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                        if (hasStartScript.output === 'yes') {
+                            log(`Starting ${app.name} with PM2 (pnpm start)...`, 'info');
+                            const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run start" --name ${app.name}`, {
+                                onStdout: (line) => log(line, 'dim'),
+                                timeoutSecs: 60,
+                            });
+                            if (pm2Result.success) {
+                                log(`✓ Started ${app.name}`, 'success');
+                            }
+                        }
+                    }
+                }
             }
         }
         // Step 9: Save PM2 process list

package/package.json

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