genbox 1.0.31 → 1.0.33

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());
@@ -1770,11 +1845,24 @@ function convertDetectedToScan(detected) {
     }));
     // Convert infrastructure to compose analysis
     let compose = null;
-    if (detected.infrastructure && detected.infrastructure.length > 0) {
+    const hasInfra = detected.infrastructure && detected.infrastructure.length > 0;
+    const hasDockerServices = detected.docker_services && detected.docker_services.length > 0;
+    if (hasInfra || hasDockerServices) {
         compose = {
             files: ['docker-compose.yml'],
-            applications: [],
-            databases: detected.infrastructure
+            applications: (detected.docker_services || []).map(svc => ({
+                name: svc.name,
+                image: svc.image,
+                build: svc.build_context ? {
+                    context: svc.build_context,
+                    dockerfile: svc.dockerfile,
+                } : undefined,
+                ports: svc.port ? [{ host: svc.port, container: svc.port }] : [],
+                environment: {},
+                dependsOn: svc.depends_on || [],
+                volumes: [],
+            })),
+            databases: (detected.infrastructure || [])
                 .filter(i => i.type === 'database')
                 .map(i => ({
                 name: i.name,
@@ -1784,7 +1872,7 @@ function convertDetectedToScan(detected) {
                 dependsOn: [],
                 volumes: [],
             })),
-            caches: detected.infrastructure
+            caches: (detected.infrastructure || [])
                 .filter(i => i.type === 'cache')
                 .map(i => ({
                 name: i.name,
@@ -1794,7 +1882,7 @@ function convertDetectedToScan(detected) {
                 dependsOn: [],
                 volumes: [],
             })),
-            queues: detected.infrastructure
+            queues: (detected.infrastructure || [])
                 .filter(i => i.type === 'queue')
                 .map(i => ({
                 name: i.name,

package/dist/commands/scan.js

@@ -239,6 +239,30 @@ async function interactiveSelection(detected) {
         // Filter scripts to only selected ones
         result.scripts = detected.scripts.filter(s => selectedScripts.includes(s.path));
     }
+    // === Docker Services Selection ===
+    if (detected.docker_services && detected.docker_services.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Detected Docker Services ===\n'));
+        for (const svc of detected.docker_services) {
+            const portInfo = svc.port ? ` port:${svc.port}` : '';
+            console.log(`  ${chalk_1.default.cyan(svc.name)}${portInfo}`);
+            if (svc.build_context) {
+                console.log(chalk_1.default.dim(`    build: ${svc.dockerfile || 'Dockerfile'}`));
+            }
+        }
+        console.log();
+        const dockerChoices = detected.docker_services.map(svc => ({
+            name: `${svc.name}${svc.port ? ` (port ${svc.port})` : ''}`,
+            value: svc.name,
+            checked: true, // Default: include all
+        }));
+        const selectedDocker = await prompts.checkbox({
+            message: 'Select Docker services to include:',
+            choices: dockerChoices,
+        });
+        // Filter docker services to only selected ones
+        result.docker_services = detected.docker_services.filter(svc => selectedDocker.includes(svc.name));
+    }
     // === Infrastructure Selection ===
     if (detected.infrastructure && detected.infrastructure.length > 0) {
         console.log('');
@@ -482,6 +506,18 @@ function convertScanToDetected(scan, root) {
                 source: 'docker-compose.yml',
             });
         }
+        // Save Docker application services (services with build context)
+        if (scan.compose.applications && scan.compose.applications.length > 0) {
+            detected.docker_services = scan.compose.applications.map(app => ({
+                name: app.name,
+                build_context: app.build?.context,
+                dockerfile: app.build?.dockerfile,
+                image: app.image,
+                port: app.ports?.[0]?.host,
+                depends_on: app.dependsOn?.length ? app.dependsOn : undefined,
+                source: 'docker-compose.yml',
+            }));
+        }
     }
     // Git info
     if (scan.git) {
@@ -649,6 +685,17 @@ function showSummary(detected) {
             console.log(`    ${parts.join(' ')}`);
         }
     }
+    // Docker Services (applications with build context)
+    if (detected.docker_services && detected.docker_services.length > 0) {
+        console.log(`\n  Docker Services (${detected.docker_services.length}):`);
+        for (const svc of detected.docker_services) {
+            const portInfo = svc.port ? ` port:${svc.port}` : '';
+            console.log(`    ${chalk_1.default.cyan(svc.name)}${portInfo}`);
+            if (svc.build_context) {
+                console.log(chalk_1.default.dim(`      build: ${svc.build_context}`));
+            }
+        }
+    }
     // Infrastructure
     if (detected.infrastructure && detected.infrastructure.length > 0) {
         console.log(`\n  Infrastructure (${detected.infrastructure.length}):`);

package/package.json

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