genbox 1.0.28 → 1.0.30

package/dist/commands/init.js

@@ -153,44 +153,65 @@ function getServiceNameFromUrl(baseUrl) {
     return { name: 'unknown', varPrefix: 'UNKNOWN', description: 'Unknown Service' };
 }
 /**
- * Prompt user for staging URLs for each unique service URL found in frontend apps
+ * Create service URL mappings based on configured environments
+ * Uses URLs from configured environments instead of prompting again
  */
-async function promptForStagingUrls(serviceUrls, existingStagingApiUrl) {
+async function createServiceUrlMappings(serviceUrls, configuredEnvs) {
     const mappings = [];
     if (serviceUrls.size === 0) {
         return mappings;
     }
-    console.log('');
-    console.log(chalk_1.default.blue('=== Frontend Service URL Configuration ==='));
-    console.log(chalk_1.default.dim('Frontend apps have service URLs that need staging equivalents.'));
-    console.log(chalk_1.default.dim('This enables profiles like admin-quick to connect to staging backend.'));
-    console.log('');
+    // Determine which environment to use (prefer staging, then production)
+    const envNames = Object.keys(configuredEnvs || {});
+    const primaryEnv = envNames.includes('staging') ? 'staging' :
+        envNames.includes('production') ? 'production' :
+            envNames[0];
+    if (!primaryEnv || !configuredEnvs?.[primaryEnv]) {
+        // No environments configured - skip service URL mapping
+        return mappings;
+    }
+    const envConfig = configuredEnvs[primaryEnv];
+    const apiUrl = envConfig.urls?.api;
+    if (!apiUrl) {
+        // No API URL configured - skip
+        return mappings;
+    }
     // Sort by port number for consistent ordering
     const sortedServices = Array.from(serviceUrls.entries()).sort((a, b) => {
         const portA = parseInt(a[0].match(/:(\d+)/)?.[1] || '0');
         const portB = parseInt(b[0].match(/:(\d+)/)?.[1] || '0');
         return portA - portB;
     });
-    for (const [baseUrl, { urls, vars }] of sortedServices) {
+    console.log('');
+    console.log(chalk_1.default.blue('=== Service URL Mapping ==='));
+    console.log(chalk_1.default.dim(`Mapping localhost URLs to ${primaryEnv} environment`));
+    console.log('');
+    for (const [baseUrl, { vars }] of sortedServices) {
         const serviceInfo = getServiceNameFromUrl(baseUrl);
-        // Show what URLs use this service
-        console.log(chalk_1.default.cyan(`${serviceInfo.description} (${baseUrl})`));
-        console.log(chalk_1.default.dim(`  Used by: ${vars.slice(0, 3).join(', ')}${vars.length > 3 ? ` +${vars.length - 3} more` : ''}`));
-        // For gateway, suggest existing staging URL if available
-        let defaultUrl = '';
-        if ((serviceInfo.name === 'gateway' || baseUrl.includes(':3050')) && existingStagingApiUrl) {
-            defaultUrl = existingStagingApiUrl;
-        }
-        const stagingUrl = await prompts.input({
-            message: `  Staging URL (leave empty to skip):`,
-            default: defaultUrl,
-        });
-        mappings.push({
-            varName: `${serviceInfo.varPrefix}_URL`,
-            localUrl: baseUrl,
-            stagingUrl: stagingUrl || undefined,
-            description: serviceInfo.description,
-        });
+        // Auto-map API/gateway URLs to the configured API URL
+        const isApiService = serviceInfo.name === 'gateway' ||
+            baseUrl.includes(':3050') ||
+            baseUrl.includes(':3105') ||
+            vars.some(v => v.toLowerCase().includes('api'));
+        if (isApiService && apiUrl) {
+            console.log(chalk_1.default.green(`✓ ${serviceInfo.description}: ${baseUrl} → ${apiUrl}`));
+            mappings.push({
+                varName: `${serviceInfo.varPrefix}_URL`,
+                localUrl: baseUrl,
+                remoteUrl: apiUrl,
+                remoteEnv: primaryEnv,
+                description: serviceInfo.description,
+            });
+        }
+        else {
+            // For non-API services, just record the local URL without remote
+            console.log(chalk_1.default.dim(`  ${serviceInfo.description}: ${baseUrl} (local only)`));
+            mappings.push({
+                varName: `${serviceInfo.varPrefix}_URL`,
+                localUrl: baseUrl,
+                description: serviceInfo.description,
+            });
+        }
     }
     return mappings;
 }
@@ -202,19 +223,19 @@ function transformEnvWithVariables(envContent, mappings, frontendApps) {
         return envContent;
     }
     let result = envContent;
+    // Determine the environment name for comments
+    const envName = mappings.find(m => m.remoteEnv)?.remoteEnv?.toUpperCase() || 'REMOTE';
     // Build GLOBAL section additions
     const globalAdditions = [
         '',
         '# Service URL Configuration',
-        '# These expand based on profile: ${GATEWAY_URL} → LOCAL or STAGING value',
+        `# These expand based on profile: \${GATEWAY_URL} → LOCAL or ${envName} value`,
     ];
     for (const mapping of mappings) {
         globalAdditions.push(`LOCAL_${mapping.varName}=${mapping.localUrl}`);
-        if (mapping.stagingUrl) {
-            globalAdditions.push(`STAGING_${mapping.varName}=${mapping.stagingUrl}`);
-        }
-        else {
-            globalAdditions.push(`# STAGING_${mapping.varName}=https://your-staging-url.com`);
+        if (mapping.remoteUrl && mapping.remoteEnv) {
+            const prefix = mapping.remoteEnv.toUpperCase();
+            globalAdditions.push(`${prefix}_${mapping.varName}=${mapping.remoteUrl}`);
         }
     }
     globalAdditions.push('');
@@ -597,6 +618,14 @@ exports.initCommand = new commander_1.Command('init')
         const v4Config = convertV2ToV4(generated.config, scan);
         // Update project name
         v4Config.project.name = projectName;
+        // 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;
+            }
+        }
         // Ask about profiles (skip prompt when using --from-scan)
         let createProfiles = true;
         if (!nonInteractive && !options.fromScan) {
@@ -819,14 +848,6 @@ 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, existingEnvValues);
-            if (envConfig) {
-                v4Config.environments = envConfig;
-            }
-        }
         // Script selection - always show multi-select UI (skip in non-interactive mode and --from-scan)
         if (!nonInteractive && !options.fromScan) {
             // Scan for scripts
@@ -914,32 +935,6 @@ exports.initCommand = new commander_1.Command('init')
                 console.log(chalk_1.default.dim(`  - ${warning}`));
             }
         }
-        // Show API URL guidance if environments are configured
-        if (v4Config.environments && Object.keys(v4Config.environments).length > 0) {
-            console.log('');
-            console.log(chalk_1.default.blue('=== API URL Configuration ==='));
-            console.log(chalk_1.default.dim('The following API URLs were added to .env.genbox:'));
-            console.log('');
-            console.log(chalk_1.default.dim('  LOCAL_API_URL=http://localhost:3050'));
-            for (const [envName, envConfig] of Object.entries(v4Config.environments)) {
-                // v4 format: urls.api contains the API URL
-                const apiUrl = envConfig.urls?.api || envConfig.urls?.gateway;
-                if (apiUrl) {
-                    const varName = `${envName.toUpperCase()}_API_URL`;
-                    console.log(chalk_1.default.dim(`  ${varName}=${apiUrl}`));
-                }
-            }
-            console.log('');
-            console.log(chalk_1.default.yellow('To use dynamic API URLs:'));
-            console.log(chalk_1.default.dim('  Use ${API_URL} in your app env vars, e.g.:'));
-            console.log(chalk_1.default.cyan('    VITE_API_BASE_URL=${API_URL}'));
-            console.log(chalk_1.default.cyan('    NEXT_PUBLIC_API_URL=${API_URL}'));
-            console.log('');
-            console.log(chalk_1.default.dim('  At create time, ${API_URL} expands based on profile:'));
-            console.log(chalk_1.default.dim('    • default_connection: staging → uses STAGING_API_URL'));
-            console.log(chalk_1.default.dim('    • default_connection: production → uses PRODUCTION_API_URL'));
-            console.log(chalk_1.default.dim('    • local/no default_connection → uses LOCAL_API_URL'));
-        }
         // CORS Configuration Warning
         const hasBackendApps = scan.apps.some(a => a.type === 'backend' || a.type === 'api');
         const hasFrontendApps = scan.apps.some(a => a.type === 'frontend');
@@ -1495,17 +1490,18 @@ async function setupEnvFile(projectName, config, nonInteractive = false, scan, i
             // Fall back to extracting from collected env content
             serviceUrls = extractFrontendHttpUrls(segregatedContent, frontendApps);
         }
-        if (serviceUrls.size > 0) {
-            // Get existing staging API URL if configured
-            const existingStagingApiUrl = extraEnvVars['STAGING_API_URL'] ||
-                (config.environments?.staging?.urls?.api);
-            // Prompt for staging equivalents
-            const urlMappings = await promptForStagingUrls(serviceUrls, existingStagingApiUrl);
+        if (serviceUrls.size > 0 && config.environments) {
+            // Create mappings based on configured environments (no prompting needed)
+            const urlMappings = await createServiceUrlMappings(serviceUrls, config.environments);
             // Transform content with expandable variables
             if (urlMappings.length > 0) {
-                segregatedContent = transformEnvWithVariables(segregatedContent, urlMappings, frontendApps);
-                console.log('');
-                console.log(chalk_1.default.green(`✓ Configured ${urlMappings.length} service URL(s) for staging support`));
+                const mappedCount = urlMappings.filter(m => m.remoteUrl).length;
+                if (mappedCount > 0) {
+                    segregatedContent = transformEnvWithVariables(segregatedContent, urlMappings, frontendApps);
+                    const envName = urlMappings.find(m => m.remoteEnv)?.remoteEnv || 'remote';
+                    console.log('');
+                    console.log(chalk_1.default.green(`✓ Configured ${mappedCount} service URL(s) for ${envName} environment`));
+                }
             }
         }
     }

package/package.json

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