genbox 1.0.16 → 1.0.18

package/dist/commands/init.js

@@ -365,6 +365,81 @@ function findAppEnvFiles(apps, rootDir) {
     }
     return envFiles;
 }
+/**
+ * Read existing values from .env.genbox file
+ */
+function readExistingEnvGenbox() {
+    const envPath = path_1.default.join(process.cwd(), ENV_FILENAME);
+    const values = {};
+    if (!fs_1.default.existsSync(envPath)) {
+        return values;
+    }
+    try {
+        const content = fs_1.default.readFileSync(envPath, 'utf8');
+        for (const line of content.split('\n')) {
+            // Skip comments and empty lines
+            const trimmed = line.trim();
+            if (!trimmed || trimmed.startsWith('#'))
+                continue;
+            // Parse KEY=value
+            const match = trimmed.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
+            if (match) {
+                let value = match[2].trim();
+                // Remove quotes if present
+                if ((value.startsWith('"') && value.endsWith('"')) ||
+                    (value.startsWith("'") && value.endsWith("'"))) {
+                    value = value.slice(1, -1);
+                }
+                values[match[1]] = value;
+            }
+        }
+    }
+    catch {
+        // Ignore read errors
+    }
+    return values;
+}
+/**
+ * Mask a secret value for display (show first 4 and last 4 chars)
+ */
+function maskSecret(value) {
+    if (value.length <= 8) {
+        return '*'.repeat(value.length);
+    }
+    return value.slice(0, 4) + '*'.repeat(value.length - 8) + value.slice(-4);
+}
+/**
+ * Prompt for a secret with existing value support
+ */
+async function promptForSecret(message, existingValue, options = {}) {
+    if (existingValue) {
+        console.log(chalk_1.default.dim(`  Found existing value: ${maskSecret(existingValue)}`));
+        const useExisting = await prompts.confirm({
+            message: 'Use existing value?',
+            default: true,
+        });
+        if (useExisting) {
+            return existingValue;
+        }
+    }
+    if (options.showInstructions) {
+        console.log('');
+        console.log(chalk_1.default.dim('  To create a token:'));
+        console.log(chalk_1.default.dim('  1. Go to https://github.com/settings/tokens'));
+        console.log(chalk_1.default.dim('  2. Click "Generate new token" → "Classic"'));
+        console.log(chalk_1.default.dim('  3. Select scope: "repo" (Full control of private repositories)'));
+        console.log(chalk_1.default.dim('  4. Generate and copy the token'));
+        console.log('');
+    }
+    let value = await prompts.password({
+        message,
+    });
+    if (value) {
+        // Strip any "KEY=" prefix if user pasted the whole line
+        value = value.replace(/^[A-Z_]+=/, '');
+    }
+    return value || undefined;
+}
 exports.initCommand = new commander_1.Command('init')
     .description('Initialize a new Genbox configuration')
     .option('--v2', 'Use legacy v2 format (single-app only)')
@@ -397,6 +472,8 @@ exports.initCommand = new commander_1.Command('init')
         }
         console.log(chalk_1.default.blue('Initializing Genbox...'));
         console.log('');
+        // Read existing .env.genbox values (for defaults when overwriting)
+        const existingEnvValues = readExistingEnvGenbox();
         // Track env vars to add to .env.genbox
         const envVarsToAdd = {};
         // Get initial exclusions from CLI options only
@@ -589,19 +666,8 @@ exports.initCommand = new commander_1.Command('init')
                 if (hasHttpsRepos && !nonInteractive) {
                     console.log('');
                     console.log(chalk_1.default.yellow('Private repositories require a GitHub token for cloning.'));
-                    console.log('');
-                    console.log(chalk_1.default.dim('  To create a token:'));
-                    console.log(chalk_1.default.dim('  1. Go to https://github.com/settings/tokens'));
-                    console.log(chalk_1.default.dim('  2. Click "Generate new token" → "Classic"'));
-                    console.log(chalk_1.default.dim('  3. Select scope: "repo" (Full control of private repositories)'));
-                    console.log(chalk_1.default.dim('  4. Generate and copy the token'));
-                    console.log('');
-                    let gitToken = await prompts.password({
-                        message: 'GitHub Personal Access Token (leave empty to skip):',
-                    });
+                    const gitToken = await promptForSecret('GitHub Personal Access Token (leave empty to skip):', existingEnvValues['GIT_TOKEN'], { showInstructions: !existingEnvValues['GIT_TOKEN'] });
                     if (gitToken) {
-                        // Strip any "GIT_TOKEN=" prefix if user pasted the whole line
-                        gitToken = gitToken.replace(/^GIT_TOKEN=/i, '');
                         envVarsToAdd['GIT_TOKEN'] = gitToken;
                         console.log(chalk_1.default.green('✓ GIT_TOKEN will be added to .env.genbox'));
                     }
@@ -625,12 +691,8 @@ exports.initCommand = new commander_1.Command('init')
                 if (scan.git.type === 'https' && !nonInteractive) {
                     console.log('');
                     console.log(chalk_1.default.yellow('Private repositories require a GitHub token for cloning.'));
-                    let gitToken = await prompts.password({
-                        message: 'GitHub Personal Access Token (leave empty to skip):',
-                    });
+                    const gitToken = await promptForSecret('GitHub Personal Access Token (leave empty to skip):', existingEnvValues['GIT_TOKEN'], { showInstructions: !existingEnvValues['GIT_TOKEN'] });
                     if (gitToken) {
-                        // Strip any "GIT_TOKEN=" prefix if user pasted the whole line
-                        gitToken = gitToken.replace(/^GIT_TOKEN=/i, '');
                         envVarsToAdd['GIT_TOKEN'] = gitToken;
                         console.log(chalk_1.default.green('✓ GIT_TOKEN will be added to .env.genbox'));
                     }
@@ -672,19 +734,8 @@ exports.initCommand = new commander_1.Command('init')
                     if (hasHttpsRepos) {
                         console.log('');
                         console.log(chalk_1.default.yellow('Private repositories require a GitHub token for cloning.'));
-                        console.log('');
-                        console.log(chalk_1.default.dim('  To create a token:'));
-                        console.log(chalk_1.default.dim('  1. Go to https://github.com/settings/tokens'));
-                        console.log(chalk_1.default.dim('  2. Click "Generate new token" → "Classic"'));
-                        console.log(chalk_1.default.dim('  3. Select scope: "repo" (Full control of private repositories)'));
-                        console.log(chalk_1.default.dim('  4. Generate and copy the token'));
-                        console.log('');
-                        let gitToken = await prompts.password({
-                            message: 'GitHub Personal Access Token (leave empty to skip):',
-                        });
+                        const gitToken = await promptForSecret('GitHub Personal Access Token (leave empty to skip):', existingEnvValues['GIT_TOKEN'], { showInstructions: !existingEnvValues['GIT_TOKEN'] });
                         if (gitToken) {
-                            // Strip any "GIT_TOKEN=" prefix if user pasted the whole line
-                            gitToken = gitToken.replace(/^GIT_TOKEN=/i, '');
                             envVarsToAdd['GIT_TOKEN'] = gitToken;
                             console.log(chalk_1.default.green('✓ GIT_TOKEN will be added to .env.genbox'));
                         }
@@ -756,7 +807,7 @@ exports.initCommand = new commander_1.Command('init')
         // Environment configuration (skip only in non-interactive mode)
         // For --from-scan, we still want to prompt for environments since they're required for genbox to work
         if (!nonInteractive) {
-            const envConfig = await setupEnvironments(scan, v4Config, isMultiRepo);
+            const envConfig = await setupEnvironments(scan, v4Config, isMultiRepo, existingEnvValues);
             if (envConfig) {
                 v4Config.environments = envConfig;
             }
@@ -1032,7 +1083,7 @@ async function setupGitAuth(gitInfo, projectName) {
 /**
  * Setup staging/production environments (v4 format)
  */
-async function setupEnvironments(scan, config, isMultiRepo = false) {
+async function setupEnvironments(scan, config, isMultiRepo = false, existingEnvValues = {}) {
     const setupEnvs = await prompts.confirm({
         message: 'Configure staging/production environments?',
         default: true,
@@ -1046,6 +1097,9 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
     console.log(chalk_1.default.dim('Actual secrets go in .env.genbox'));
     console.log('');
     const environments = {};
+    // Get existing staging API URL if available
+    const existingStagingApiUrl = existingEnvValues['STAGING_API_URL'];
+    const existingProductionApiUrl = existingEnvValues['PRODUCTION_API_URL'] || existingEnvValues['PROD_API_URL'];
     if (isMultiRepo) {
         // For multi-repo: configure API URLs per backend app
         const backendApps = scan.apps.filter(a => a.type === 'backend' || a.type === 'api');
@@ -1053,6 +1107,20 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
             console.log(chalk_1.default.dim('Configure staging API URLs for each backend service:'));
             const urls = {};
             for (const app of backendApps) {
+                // Check for existing app-specific URL or use general staging URL for 'api' app
+                const existingUrl = existingEnvValues[`STAGING_${app.name.toUpperCase()}_URL`] ||
+                    (app.name === 'api' ? existingStagingApiUrl : '');
+                if (existingUrl) {
+                    console.log(chalk_1.default.dim(`  Found existing value for ${app.name}: ${existingUrl}`));
+                    const useExisting = await prompts.confirm({
+                        message: `  Use existing ${app.name} staging URL?`,
+                        default: true,
+                    });
+                    if (useExisting) {
+                        urls[app.name] = existingUrl;
+                        continue;
+                    }
+                }
                 const url = await prompts.input({
                     message: `  ${app.name} staging URL (leave empty to skip):`,
                     default: '',
@@ -1073,10 +1141,23 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
         }
         else {
             // No backend apps, just ask for a single URL
-            const stagingApiUrl = await prompts.input({
-                message: 'Staging API URL (leave empty to skip):',
-                default: '',
-            });
+            let stagingApiUrl = '';
+            if (existingStagingApiUrl) {
+                console.log(chalk_1.default.dim(`  Found existing value: ${existingStagingApiUrl}`));
+                const useExisting = await prompts.confirm({
+                    message: 'Use existing staging API URL?',
+                    default: true,
+                });
+                if (useExisting) {
+                    stagingApiUrl = existingStagingApiUrl;
+                }
+            }
+            if (!stagingApiUrl) {
+                stagingApiUrl = await prompts.input({
+                    message: 'Staging API URL (leave empty to skip):',
+                    default: '',
+                });
+            }
             if (stagingApiUrl) {
                 environments.staging = {
                     description: 'Staging environment',
@@ -1091,10 +1172,23 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
     }
     else {
         // Single repo: simple single URL
-        const stagingApiUrl = await prompts.input({
-            message: 'Staging API URL (leave empty to skip):',
-            default: '',
-        });
+        let stagingApiUrl = '';
+        if (existingStagingApiUrl) {
+            console.log(chalk_1.default.dim(`  Found existing value: ${existingStagingApiUrl}`));
+            const useExisting = await prompts.confirm({
+                message: 'Use existing staging API URL?',
+                default: true,
+            });
+            if (useExisting) {
+                stagingApiUrl = existingStagingApiUrl;
+            }
+        }
+        if (!stagingApiUrl) {
+            stagingApiUrl = await prompts.input({
+                message: 'Staging API URL (leave empty to skip):',
+                default: '',
+            });
+        }
         if (stagingApiUrl) {
             environments.staging = {
                 description: 'Staging environment',
@@ -1117,6 +1211,21 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
                 console.log(chalk_1.default.dim('Configure production API URLs for each backend service:'));
                 const prodUrls = {};
                 for (const app of backendApps) {
+                    // Check for existing app-specific URL or use general production URL for 'api' app
+                    const existingUrl = existingEnvValues[`PRODUCTION_${app.name.toUpperCase()}_URL`] ||
+                        existingEnvValues[`PROD_${app.name.toUpperCase()}_URL`] ||
+                        (app.name === 'api' ? existingProductionApiUrl : '');
+                    if (existingUrl) {
+                        console.log(chalk_1.default.dim(`  Found existing value for ${app.name}: ${existingUrl}`));
+                        const useExisting = await prompts.confirm({
+                            message: `  Use existing ${app.name} production URL?`,
+                            default: true,
+                        });
+                        if (useExisting) {
+                            prodUrls[app.name] = existingUrl;
+                            continue;
+                        }
+                    }
                     const url = await prompts.input({
                         message: `  ${app.name} production URL:`,
                         default: '',
@@ -1139,10 +1248,23 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
             }
         }
         else {
-            const prodApiUrl = await prompts.input({
-                message: 'Production API URL:',
-                default: '',
-            });
+            let prodApiUrl = '';
+            if (existingProductionApiUrl) {
+                console.log(chalk_1.default.dim(`  Found existing value: ${existingProductionApiUrl}`));
+                const useExisting = await prompts.confirm({
+                    message: 'Use existing production API URL?',
+                    default: true,
+                });
+                if (useExisting) {
+                    prodApiUrl = existingProductionApiUrl;
+                }
+            }
+            if (!prodApiUrl) {
+                prodApiUrl = await prompts.input({
+                    message: 'Production API URL:',
+                    default: '',
+                });
+            }
             if (prodApiUrl) {
                 environments.production = {
                     description: 'Production (use with caution)',

package/dist/commands/scan.js

@@ -127,16 +127,20 @@ exports.scanCommand = new commander_1.Command('scan')
         });
         // Convert scan result to DetectedConfig format
         let detected = convertScanToDetected(scan, cwd);
-        // Interactive mode: let user select apps
-        if (isInteractive && Object.keys(detected.apps).length > 0) {
-            detected = await interactiveAppSelection(detected);
+        // Interactive mode: let user select apps, scripts, infrastructure
+        if (isInteractive) {
+            detected = await interactiveSelection(detected);
         }
         // Scan env files for service URLs (only for selected frontend apps)
         const frontendApps = Object.entries(detected.apps)
             .filter(([, app]) => app.type === 'frontend')
             .map(([name]) => name);
         if (frontendApps.length > 0) {
-            const serviceUrls = scanEnvFilesForUrls(detected.apps, cwd);
+            let serviceUrls = scanEnvFilesForUrls(detected.apps, cwd);
+            // In interactive mode, let user select which URLs to configure
+            if (isInteractive && serviceUrls.length > 0) {
+                serviceUrls = await interactiveUrlSelection(serviceUrls);
+            }
             if (serviceUrls.length > 0) {
                 detected.service_urls = serviceUrls;
             }
@@ -160,44 +164,132 @@ exports.scanCommand = new commander_1.Command('scan')
     }
 });
 /**
- * Interactive app selection
+ * Interactive app and script selection
  */
-async function interactiveAppSelection(detected) {
+async function interactiveSelection(detected) {
+    let result = { ...detected };
+    // === App Selection ===
     const appEntries = Object.entries(detected.apps);
-    console.log(chalk_1.default.blue('=== Detected Apps ===\n'));
-    // Show detected apps
-    for (const [name, app] of appEntries) {
-        const parts = [
-            chalk_1.default.cyan(name),
-            app.type ? `(${app.type})` : '',
-            app.framework ? `[${app.framework}]` : '',
-            app.port ? `port:${app.port}` : '',
-        ].filter(Boolean);
-        console.log(`  ${parts.join(' ')}`);
-        if (app.git) {
-            console.log(chalk_1.default.dim(`    └─ ${app.git.remote}`));
+    if (appEntries.length > 0) {
+        console.log(chalk_1.default.blue('=== Detected Apps ===\n'));
+        // Show detected apps
+        for (const [name, app] of appEntries) {
+            const parts = [
+                chalk_1.default.cyan(name),
+                app.type ? `(${app.type})` : '',
+                app.framework ? `[${app.framework}]` : '',
+                app.port ? `port:${app.port}` : '',
+            ].filter(Boolean);
+            console.log(`  ${parts.join(' ')}`);
+            if (app.git) {
+                console.log(chalk_1.default.dim(`    └─ ${app.git.remote}`));
+            }
+        }
+        console.log();
+        // Let user select which apps to include
+        const appChoices = appEntries.map(([name, app]) => ({
+            name: `${name} (${app.type || 'unknown'}${app.framework ? `, ${app.framework}` : ''})`,
+            value: name,
+            checked: app.type !== 'library', // Default: include non-libraries
+        }));
+        const selectedApps = await prompts.checkbox({
+            message: 'Select apps to include:',
+            choices: appChoices,
+        });
+        // Filter apps to only selected ones
+        const filteredApps = {};
+        for (const appName of selectedApps) {
+            filteredApps[appName] = detected.apps[appName];
+        }
+        result.apps = filteredApps;
+    }
+    // === Script Selection ===
+    if (detected.scripts && detected.scripts.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Detected Scripts ===\n'));
+        // Group scripts by directory for display
+        const scriptsByDir = new Map();
+        for (const script of detected.scripts) {
+            const dir = script.path.includes('/') ? script.path.split('/')[0] : '(root)';
+            const existing = scriptsByDir.get(dir) || [];
+            existing.push(script);
+            scriptsByDir.set(dir, existing);
+        }
+        // Show grouped scripts
+        for (const [dir, scripts] of scriptsByDir) {
+            console.log(chalk_1.default.dim(`  ${dir}/ (${scripts.length} scripts)`));
+            for (const script of scripts.slice(0, 3)) {
+                console.log(`    ${chalk_1.default.cyan(script.name)} (${script.stage})`);
+            }
+            if (scripts.length > 3) {
+                console.log(chalk_1.default.dim(`    ... and ${scripts.length - 3} more`));
+            }
+        }
+        console.log();
+        // Let user select which scripts to include
+        const scriptChoices = detected.scripts.map(s => ({
+            name: `${s.path} (${s.stage})`,
+            value: s.path,
+            checked: s.path.startsWith('scripts/'), // Default: include scripts/ directory
+        }));
+        const selectedScripts = await prompts.checkbox({
+            message: 'Select scripts to include:',
+            choices: scriptChoices,
+        });
+        // Filter scripts to only selected ones
+        result.scripts = detected.scripts.filter(s => selectedScripts.includes(s.path));
+    }
+    // === Infrastructure Selection ===
+    if (detected.infrastructure && detected.infrastructure.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Detected Infrastructure ===\n'));
+        for (const infra of detected.infrastructure) {
+            console.log(`  ${chalk_1.default.cyan(infra.name)}: ${infra.type} (${infra.image})`);
         }
+        console.log();
+        const infraChoices = detected.infrastructure.map(i => ({
+            name: `${i.name} (${i.type}, ${i.image})`,
+            value: i.name,
+            checked: true, // Default: include all
+        }));
+        const selectedInfra = await prompts.checkbox({
+            message: 'Select infrastructure to include:',
+            choices: infraChoices,
+        });
+        // Filter infrastructure to only selected ones
+        result.infrastructure = detected.infrastructure.filter(i => selectedInfra.includes(i.name));
+    }
+    return result;
+}
+/**
+ * Interactive service URL selection
+ */
+async function interactiveUrlSelection(serviceUrls) {
+    if (serviceUrls.length === 0) {
+        return [];
+    }
+    console.log('');
+    console.log(chalk_1.default.blue('=== Detected Service URLs ==='));
+    console.log(chalk_1.default.dim('These are local/development URLs found in frontend env files.'));
+    console.log(chalk_1.default.dim('Select which ones need staging URL equivalents.\n'));
+    // Show detected URLs
+    for (const svc of serviceUrls) {
+        console.log(`  ${chalk_1.default.cyan(svc.base_url)}`);
+        console.log(chalk_1.default.dim(`    Used by: ${svc.used_by.slice(0, 3).join(', ')}${svc.used_by.length > 3 ? ` +${svc.used_by.length - 3} more` : ''}`));
     }
     console.log();
-    // Let user select which apps to include
-    const choices = appEntries.map(([name, app]) => ({
-        name: `${name} (${app.type || 'unknown'}${app.framework ? `, ${app.framework}` : ''})`,
-        value: name,
-        checked: app.type !== 'library', // Default: include non-libraries
+    // Let user select which URLs to configure
+    const urlChoices = serviceUrls.map(svc => ({
+        name: `${svc.base_url} (${svc.used_by.length} var${svc.used_by.length > 1 ? 's' : ''})`,
+        value: svc.base_url,
+        checked: true, // Default: include all
     }));
-    const selectedApps = await prompts.checkbox({
-        message: 'Select apps to include in detected.yaml:',
-        choices,
+    const selectedUrls = await prompts.checkbox({
+        message: 'Select service URLs to configure for staging:',
+        choices: urlChoices,
     });
-    // Filter apps to only selected ones
-    const filteredApps = {};
-    for (const appName of selectedApps) {
-        filteredApps[appName] = detected.apps[appName];
-    }
-    return {
-        ...detected,
-        apps: filteredApps,
-    };
+    // Filter to selected URLs
+    return serviceUrls.filter(svc => selectedUrls.includes(svc.base_url));
 }
 /**
  * Scan env files in app directories for service URLs
@@ -212,25 +304,37 @@ function scanEnvFilesForUrls(apps, rootDir) {
         const appDir = path.join(rootDir, app.path);
         // Find env file
         let envContent;
-        let envSource;
         for (const pattern of envPatterns) {
             const envPath = path.join(appDir, pattern);
             if (fs.existsSync(envPath)) {
                 envContent = fs.readFileSync(envPath, 'utf8');
-                envSource = pattern;
                 break;
             }
         }
         if (!envContent)
             continue;
-        // Find all HTTP URLs
-        const urlRegex = /^([A-Z_][A-Z0-9_]*)=["']?(https?:\/\/[a-zA-Z0-9_.-]+(?::\d+)?[^"'\s]*)["']?/gm;
-        let match;
-        while ((match = urlRegex.exec(envContent)) !== null) {
-            const varName = match[1];
-            const fullUrl = match[2];
+        // Process each line individually
+        for (const line of envContent.split('\n')) {
+            // Skip comments and empty lines
+            const trimmedLine = line.trim();
+            if (!trimmedLine || trimmedLine.startsWith('#'))
+                continue;
+            // Parse VAR=value format
+            const lineMatch = trimmedLine.match(/^([A-Z_][A-Z0-9_]*)=["']?(.+?)["']?$/);
+            if (!lineMatch)
+                continue;
+            const varName = lineMatch[1];
+            const value = lineMatch[2];
+            // Skip URLs with @ symbol (credentials, connection strings)
+            if (value.includes('@'))
+                continue;
+            // Check if it's a URL
+            const urlMatch = value.match(/^(https?:\/\/[a-zA-Z0-9_.-]+(?::\d+)?)/);
+            if (!urlMatch)
+                continue;
+            const baseUrl = urlMatch[1];
             // Extract hostname
-            const hostMatch = fullUrl.match(/^https?:\/\/([a-zA-Z0-9_.-]+)/);
+            const hostMatch = baseUrl.match(/^https?:\/\/([a-zA-Z0-9_.-]+)/);
             if (!hostMatch)
                 continue;
             const hostname = hostMatch[1];
@@ -240,11 +344,6 @@ function scanEnvFilesForUrls(apps, rootDir) {
                 /^\d+\.\d+\.\d+\.\d+$/.test(hostname);
             if (!isLocalUrl)
                 continue;
-            // Extract base URL
-            const baseMatch = fullUrl.match(/^(https?:\/\/[a-zA-Z0-9_.-]+(?::\d+)?)/);
-            if (!baseMatch)
-                continue;
-            const baseUrl = baseMatch[1];
             // Add to map
             if (!serviceUrls.has(baseUrl)) {
                 serviceUrls.set(baseUrl, { vars: new Set(), apps: new Set() });

package/package.json

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