genbox 1.0.72 → 1.0.74

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;
             }
@@ -1539,11 +1531,17 @@ function sshToHttps(url) {
 /**
  * Auto-detect database URLs from project configuration
  * Scans .env files, docker-compose, and other config sources
+ *
+ * Priority order:
+ * 1. MONGODB_URI from .env files (what the app actually uses)
+ * 2. Other database URL variables from .env files
+ * 3. Docker-compose MongoDB port mappings (fallback)
  */
 function detectDatabaseUrls(rootDir, detected) {
     const results = [];
     const seenUrls = new Set();
     // 1. Scan .env files in various locations for MONGODB_URI, DATABASE_URL, etc.
+    // Check multiple locations where .env files might exist
     const envPatterns = [
         '.env',
         '.env.local',
@@ -1551,15 +1549,22 @@ function detectDatabaseUrls(rootDir, detected) {
         'api/.env',
         'api/.env.local',
         'api/.env.development',
+        'packages/api/.env',
+        'packages/api/.env.local',
+        'packages/api/.env.development',
     ];
-    // Also check microservice-specific env files
+    // Also check microservice-specific env files (NestJS monorepo pattern)
     const microserviceDirs = ['gateway', 'auth', 'products', 'notifications', 'partner-api'];
     for (const service of microserviceDirs) {
         envPatterns.push(`api/apps/${service}/.env`);
         envPatterns.push(`api/apps/${service}/.env.local`);
         envPatterns.push(`api/apps/${service}/.env.development`);
+        envPatterns.push(`packages/api/apps/${service}/.env`);
+        envPatterns.push(`packages/api/apps/${service}/.env.local`);
+        envPatterns.push(`packages/api/apps/${service}/.env.development`);
     }
-    // Database URL variable patterns to look for
+    // Database URL variable patterns to look for (in priority order)
+    // MONGODB_URI is the standard variable name used by most apps
     const dbVarPatterns = [
         'MONGODB_URI',
         'MONGODB_URL',
@@ -1607,11 +1612,23 @@ function detectDatabaseUrls(rootDir, detected) {
                 // Extract port from URL
                 const portMatch = value.match(/mongodb:\/\/[^:]+:(\d+)/);
                 const port = portMatch ? parseInt(portMatch[1], 10) : undefined;
+                // Calculate priority: MONGODB_URI with database name gets highest priority
+                let priority = 10;
+                if (varName === 'MONGODB_URI' && database)
+                    priority = 1;
+                else if (varName === 'MONGODB_URI')
+                    priority = 2;
+                else if (database)
+                    priority = 3;
+                else
+                    priority = 5;
                 results.push({
                     url: value,
                     source: envPattern,
                     database,
                     port,
+                    priority,
+                    varName,
                 });
             }
         }
@@ -1619,7 +1636,7 @@ function detectDatabaseUrls(rootDir, detected) {
             // Skip if can't read
         }
     }
-    // 2. Check docker-compose for MongoDB services and construct URLs
+    // 2. Check docker-compose for MongoDB services and construct URLs (lower priority)
     if (detected.infrastructure) {
         for (const infra of detected.infrastructure) {
             if (infra.type !== 'database')
@@ -1635,27 +1652,32 @@ function detectDatabaseUrls(rootDir, detected) {
                     url,
                     source: `docker-compose (${infra.name})`,
                     port,
+                    priority: 20, // Lower priority than .env file URLs
                 });
             }
         }
     }
+    // Sort by priority (lower is better)
+    results.sort((a, b) => a.priority - b.priority);
     return results;
 }
 /**
  * Build a suggested MongoDB URL from detected info
+ * Returns the highest priority URL (already sorted by detectDatabaseUrls)
  */
 function buildMongoDbUrl(detected, preferredDatabase) {
     if (detected.length === 0)
         return undefined;
-    // Prefer URLs that have a database name
+    // If preferredDatabase specified, try to find a match first
+    if (preferredDatabase) {
+        const match = detected.find(d => d.database === preferredDatabase);
+        if (match)
+            return match.url;
+    }
+    // Return the highest priority URL (list is already sorted)
+    // Prefer URLs with database names
     const withDb = detected.filter(d => d.database);
     if (withDb.length > 0) {
-        // Prefer the one matching preferredDatabase if specified
-        if (preferredDatabase) {
-            const match = withDb.find(d => d.database === preferredDatabase);
-            if (match)
-                return match.url;
-        }
         return withDb[0].url;
     }
     // Fall back to first detected URL

package/package.json

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