genbox 1.0.11 → 1.0.12

package/dist/commands/create.js

@@ -348,6 +348,64 @@ function displayResolvedConfig(resolved) {
     console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
     console.log('');
 }
+/**
+ * Parse .env.genbox file into segregated sections
+ */
+function parseEnvGenboxSections(content) {
+    const sections = new Map();
+    let currentSection = 'GLOBAL';
+    let currentContent = [];
+    for (const line of content.split('\n')) {
+        const sectionMatch = line.match(/^# === ([^=]+) ===$/);
+        if (sectionMatch) {
+            // Save previous section
+            if (currentContent.length > 0) {
+                sections.set(currentSection, currentContent.join('\n').trim());
+            }
+            currentSection = sectionMatch[1].trim();
+            currentContent = [];
+        }
+        else if (currentSection !== 'END') {
+            currentContent.push(line);
+        }
+    }
+    // Save last section
+    if (currentContent.length > 0 && currentSection !== 'END') {
+        sections.set(currentSection, currentContent.join('\n').trim());
+    }
+    return sections;
+}
+/**
+ * Build env content for a specific app by combining GLOBAL + app-specific sections
+ */
+function buildAppEnvContent(sections, appName, apiUrl) {
+    const parts = [];
+    // Always include GLOBAL section
+    const globalSection = sections.get('GLOBAL');
+    if (globalSection) {
+        parts.push(globalSection);
+    }
+    // Include app-specific section if exists
+    const appSection = sections.get(appName);
+    if (appSection) {
+        parts.push(appSection);
+    }
+    let envContent = parts.join('\n\n');
+    // Expand ${API_URL} references
+    envContent = envContent.replace(/\$\{API_URL\}/g, apiUrl);
+    // Keep only actual env vars (filter out pure comment lines but keep var definitions)
+    envContent = envContent
+        .split('\n')
+        .filter(line => {
+        const trimmed = line.trim();
+        // Keep empty lines, lines with = (even if commented), and non-comment lines
+        return trimmed === '' || trimmed.includes('=') || !trimmed.startsWith('#');
+    })
+        .join('\n')
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+    return envContent;
+}
 /**
  * Build API payload from resolved config
  */
@@ -368,24 +426,82 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
     }
     // Build files bundle
     const files = [];
+    // Track env files to move in setup script (staging approach to avoid blocking git clone)
+    const envFilesToMove = [];
     // Send .env.genbox content to server for each app
     const envGenboxPath = path.join(process.cwd(), '.env.genbox');
     if (fs.existsSync(envGenboxPath)) {
-        const envContent = fs.readFileSync(envGenboxPath, 'utf-8');
-        // Add env file for each app (user should have already updated URLs manually)
+        const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
+        // Parse into sections
+        const sections = parseEnvGenboxSections(rawEnvContent);
+        // Parse GLOBAL section to get API URL values
+        const globalSection = sections.get('GLOBAL') || '';
+        const envVarsFromFile = {};
+        for (const line of globalSection.split('\n')) {
+            const match = line.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);
+                }
+                envVarsFromFile[match[1]] = value;
+            }
+        }
+        // Determine API_URL based on profile's connect_to setting
+        const connectTo = resolved.profile ?
+            (config.profiles?.[resolved.profile]?.connect_to) : undefined;
+        let apiUrl;
+        if (connectTo) {
+            // Use the environment-specific API URL (e.g., STAGING_API_URL)
+            const envApiVarName = `${connectTo.toUpperCase()}_API_URL`;
+            apiUrl = envVarsFromFile[envApiVarName] || resolved.env['API_URL'] || 'http://localhost:3050';
+        }
+        else {
+            // Use local API URL
+            apiUrl = envVarsFromFile['LOCAL_API_URL'] || 'http://localhost:3050';
+        }
+        // Add env file for each app - filtered by selected apps only
         for (const app of resolved.apps) {
             const appPath = config.apps[app.name]?.path || app.name;
             const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
                 (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
-            files.push({
-                path: `${repoPath}/.env`,
-                content: envContent,
-                permissions: '0644',
-            });
+            // Check if this app has microservices (sections like api/gateway, api/auth)
+            const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+            if (servicesSections.length > 0) {
+                // App has microservices - create env file for each service
+                for (const serviceSectionName of servicesSections) {
+                    const serviceName = serviceSectionName.split('/')[1];
+                    // Build service-specific env content (GLOBAL + service section)
+                    const serviceEnvContent = buildAppEnvContent(sections, serviceSectionName, apiUrl);
+                    const stagingName = `${app.name}-${serviceName}.env`;
+                    const targetPath = `${repoPath}/apps/${serviceName}/.env`;
+                    files.push({
+                        path: `/home/dev/.env-staging/${stagingName}`,
+                        content: serviceEnvContent,
+                        permissions: '0644',
+                    });
+                    envFilesToMove.push({ stagingName, targetPath });
+                }
+            }
+            else {
+                // Regular app - build app-specific env content (GLOBAL + app section)
+                const appEnvContent = buildAppEnvContent(sections, app.name, apiUrl);
+                files.push({
+                    path: `/home/dev/.env-staging/${app.name}.env`,
+                    content: appEnvContent,
+                    permissions: '0644',
+                });
+                envFilesToMove.push({
+                    stagingName: `${app.name}.env`,
+                    targetPath: `${repoPath}/.env`,
+                });
+            }
         }
     }
     // Add setup script if generated
-    const setupScript = generateSetupScript(resolved, config);
+    const setupScript = generateSetupScript(resolved, config, envFilesToMove);
     if (setupScript) {
         files.push({
             path: '/home/dev/setup-genbox.sh',
@@ -431,13 +547,27 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
 /**
  * Generate setup script
  */
-function generateSetupScript(resolved, config) {
+function generateSetupScript(resolved, config, envFilesToMove = []) {
     const lines = [
         '#!/bin/bash',
         '# Generated by genbox create',
         'set -e',
         '',
     ];
+    // Move .env files from staging to their correct locations
+    // This runs after git clone has completed
+    if (envFilesToMove.length > 0) {
+        lines.push('# Move .env files from staging to app directories');
+        for (const { stagingName, targetPath } of envFilesToMove) {
+            lines.push(`if [ -f "/home/dev/.env-staging/${stagingName}" ]; then`);
+            lines.push(`  mkdir -p "$(dirname "${targetPath}")"`);
+            lines.push(`  mv "/home/dev/.env-staging/${stagingName}" "${targetPath}"`);
+            lines.push(`  echo "Moved .env to ${targetPath}"`);
+            lines.push('fi');
+        }
+        lines.push('rm -rf /home/dev/.env-staging 2>/dev/null || true');
+        lines.push('');
+    }
     // Change to project directory
     if (resolved.repos.length > 0) {
         lines.push(`cd ${resolved.repos[0].path} || exit 1`);

package/dist/commands/init.js

@@ -103,13 +103,15 @@ function detectAppGitRepos(apps, rootDir) {
     return repos;
 }
 /**
- * Find .env files in app directories
+ * Find .env files in app directories (including nested microservices)
  */
 function findAppEnvFiles(apps, rootDir) {
     const envFiles = [];
     const envPatterns = ['.env', '.env.local', '.env.development'];
     for (const app of apps) {
         const appDir = path_1.default.join(rootDir, app.path);
+        // Check for direct .env file in app directory
+        let foundDirectEnv = false;
         for (const pattern of envPatterns) {
             const envPath = path_1.default.join(appDir, pattern);
             if (fs_1.default.existsSync(envPath)) {
@@ -118,7 +120,35 @@ function findAppEnvFiles(apps, rootDir) {
                     envFile: pattern,
                     fullPath: envPath,
                 });
-                break; // Only take the first match per app
+                foundDirectEnv = true;
+                break;
+            }
+        }
+        // Check for nested microservices (e.g., api/apps/*)
+        const appsSubdir = path_1.default.join(appDir, 'apps');
+        if (fs_1.default.existsSync(appsSubdir) && fs_1.default.statSync(appsSubdir).isDirectory()) {
+            try {
+                const services = fs_1.default.readdirSync(appsSubdir);
+                for (const service of services) {
+                    const serviceDir = path_1.default.join(appsSubdir, service);
+                    if (!fs_1.default.statSync(serviceDir).isDirectory())
+                        continue;
+                    for (const pattern of envPatterns) {
+                        const envPath = path_1.default.join(serviceDir, pattern);
+                        if (fs_1.default.existsSync(envPath)) {
+                            envFiles.push({
+                                appName: `${app.name}/${service}`,
+                                envFile: pattern,
+                                fullPath: envPath,
+                                isService: true,
+                            });
+                            break;
+                        }
+                    }
+                }
+            }
+            catch {
+                // Ignore errors reading subdirectories
             }
         }
     }
@@ -454,6 +484,20 @@ exports.initCommand = new commander_1.Command('init')
         });
         fs_1.default.writeFileSync(configPath, yamlContent);
         console.log(chalk_1.default.green(`\n✔ Configuration saved to ${CONFIG_FILENAME}`));
+        // Add API URLs from environments to envVarsToAdd
+        // Always add LOCAL_API_URL for local development
+        envVarsToAdd['LOCAL_API_URL'] = 'http://localhost:3050';
+        if (v3Config.environments) {
+            for (const [envName, envConfig] of Object.entries(v3Config.environments)) {
+                const apiUrl = envConfig.api?.api ||
+                    envConfig.api?.url ||
+                    envConfig.api?.gateway;
+                if (apiUrl) {
+                    const varName = `${envName.toUpperCase()}_API_URL`;
+                    envVarsToAdd[varName] = apiUrl;
+                }
+            }
+        }
         // Generate .env.genbox
         await setupEnvFile(projectName, v3Config, nonInteractive, scan, isMultiRepo, envVarsToAdd, overwriteExisting);
         // Show warnings
@@ -467,26 +511,35 @@ exports.initCommand = new commander_1.Command('init')
         // Show API URL guidance if environments are configured
         if (v3Config.environments && Object.keys(v3Config.environments).length > 0) {
             console.log('');
-            console.log(chalk_1.default.yellow('Important: Update API URLs in .env.genbox for remote environments'));
+            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(v3Config.environments)) {
                 const apiUrl = envConfig.api?.api ||
                     envConfig.api?.url ||
                     envConfig.api?.gateway;
                 if (apiUrl) {
-                    console.log(chalk_1.default.dim(`  For ${envName} profiles (connect_to: ${envName}):`));
-                    console.log(chalk_1.default.cyan(`    VITE_API_BASE_URL="${apiUrl}"`));
-                    console.log(chalk_1.default.cyan(`    VITE_AUTH_SERVICE_URL="${apiUrl}"`));
-                    console.log(chalk_1.default.cyan(`    NEXT_PUBLIC_API_BASE_URL="${apiUrl}"`));
-                    console.log('');
+                    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('    • connect_to: staging → uses STAGING_API_URL'));
+            console.log(chalk_1.default.dim('    • connect_to: production → uses PRODUCTION_API_URL'));
+            console.log(chalk_1.default.dim('    • local/no connect_to → uses LOCAL_API_URL'));
         }
         // Next steps
         console.log('');
         console.log(chalk_1.default.bold('Next steps:'));
         console.log(chalk_1.default.dim(`  1. Review and edit ${CONFIG_FILENAME}`));
-        console.log(chalk_1.default.dim(`  2. Update API URLs in ${ENV_FILENAME} for staging/production`));
+        console.log(chalk_1.default.dim(`  2. Update ${ENV_FILENAME} to use API URL variables where needed`));
         console.log(chalk_1.default.dim(`  3. Run 'genbox profiles' to see available profiles`));
         console.log(chalk_1.default.dim(`  4. Run 'genbox create <name> --profile <profile>' to create an environment`));
     }
@@ -764,7 +817,7 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
     return Object.keys(environments).length > 0 ? environments : undefined;
 }
 /**
- * Setup .env.genbox file
+ * Setup .env.genbox file with segregated app sections
  */
 async function setupEnvFile(projectName, config, nonInteractive = false, scan, isMultiRepo = false, extraEnvVars = {}, overwriteExisting = false) {
     const envPath = path_1.default.join(process.cwd(), ENV_FILENAME);
@@ -778,66 +831,84 @@ async function setupEnvFile(projectName, config, nonInteractive = false, scan, i
             return;
         }
     }
+    // Build segregated content with GLOBAL section first
+    let segregatedContent = `# Genbox Environment Variables
+# Project: ${projectName}
+# DO NOT COMMIT THIS FILE
+#
+# This file uses segregated sections for each app/service.
+# At 'genbox create' time, only GLOBAL + selected app sections are used.
+# Use \${API_URL} for dynamic API URLs based on profile's connect_to setting.
+
+# === GLOBAL ===
+# These variables are always included regardless of which apps are selected
+
+`;
+    // Add global env vars
+    for (const [key, value] of Object.entries(extraEnvVars)) {
+        segregatedContent += `${key}=${value}\n`;
+    }
+    // Add GIT authentication placeholder if not already added
+    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
+
+`;
     // For multi-repo: find env files in app directories
     if (isMultiRepo && scan) {
         const appEnvFiles = findAppEnvFiles(scan.apps, process.cwd());
         if (appEnvFiles.length > 0 && !nonInteractive) {
             console.log('');
             console.log(chalk_1.default.blue('=== Environment Files ==='));
-            console.log(chalk_1.default.dim(`Found .env files in ${appEnvFiles.length} app directories`));
+            // Group by app type
+            const directApps = appEnvFiles.filter(e => !e.isService);
+            const serviceApps = appEnvFiles.filter(e => e.isService);
+            if (directApps.length > 0) {
+                console.log(chalk_1.default.dim(`Found ${directApps.length} app env files`));
+            }
+            if (serviceApps.length > 0) {
+                console.log(chalk_1.default.dim(`Found ${serviceApps.length} microservice env files`));
+            }
             const envChoices = appEnvFiles.map(env => ({
-                name: `${env.appName}/${env.envFile}`,
+                name: env.isService ? `${env.appName} (service)` : env.appName,
                 value: env.fullPath,
                 checked: true,
             }));
             const selectedEnvFiles = await prompts.checkbox({
-                message: 'Select .env files to merge into .env.genbox:',
+                message: 'Select .env files to include in .env.genbox:',
                 choices: envChoices,
             });
             if (selectedEnvFiles.length > 0) {
-                let mergedContent = `# Genbox Environment Variables
-# Merged from: ${selectedEnvFiles.map(f => path_1.default.relative(process.cwd(), f)).join(', ')}
-# DO NOT COMMIT THIS FILE
-#
-# Add staging/production URLs:
-# STAGING_MONGODB_URL=mongodb+srv://...
-# STAGING_REDIS_URL=redis://...
-# PROD_MONGODB_URL=mongodb+srv://...
-#
-# Git authentication:
-# GIT_TOKEN=ghp_xxxxxxxxxxxx
-
-`;
                 for (const envFilePath of selectedEnvFiles) {
                     const appInfo = appEnvFiles.find(e => e.fullPath === envFilePath);
-                    const content = fs_1.default.readFileSync(envFilePath, 'utf8');
-                    mergedContent += `\n# === ${appInfo?.appName || path_1.default.dirname(envFilePath)} ===\n`;
-                    mergedContent += content;
-                    mergedContent += '\n';
+                    if (!appInfo)
+                        continue;
+                    const content = fs_1.default.readFileSync(envFilePath, 'utf8').trim();
+                    // Add section header and content
+                    segregatedContent += `# === ${appInfo.appName} ===\n`;
+                    segregatedContent += content;
+                    segregatedContent += '\n\n';
                 }
-                fs_1.default.writeFileSync(envPath, mergedContent);
-                console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME} from ${selectedEnvFiles.length} app env files`));
             }
         }
         else if (appEnvFiles.length > 0 && nonInteractive) {
             // Non-interactive: merge all env files
-            let mergedContent = `# Genbox Environment Variables
-# Merged from app directories
-# DO NOT COMMIT THIS FILE
-
-`;
             for (const envFile of appEnvFiles) {
-                const content = fs_1.default.readFileSync(envFile.fullPath, 'utf8');
-                mergedContent += `\n# === ${envFile.appName} ===\n`;
-                mergedContent += content;
-                mergedContent += '\n';
+                const content = fs_1.default.readFileSync(envFile.fullPath, 'utf8').trim();
+                segregatedContent += `# === ${envFile.appName} ===\n`;
+                segregatedContent += content;
+                segregatedContent += '\n\n';
             }
-            fs_1.default.writeFileSync(envPath, mergedContent);
-            console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME} from ${appEnvFiles.length} app env files`));
         }
     }
-    // If no env file created yet, check for root .env
-    if (!fs_1.default.existsSync(envPath)) {
+    // If no app env files found, check for root .env
+    const hasAppSections = segregatedContent.includes('# === ') &&
+        !segregatedContent.endsWith('# === GLOBAL ===\n');
+    if (!hasAppSections) {
         const existingEnvFiles = ['.env.local', '.env', '.env.development'];
         let existingEnvPath;
         for (const envFile of existingEnvFiles) {
@@ -849,51 +920,28 @@ async function setupEnvFile(projectName, config, nonInteractive = false, scan, i
         }
         if (existingEnvPath) {
             const copyExisting = nonInteractive ? true : await prompts.confirm({
-                message: `Found ${path_1.default.basename(existingEnvPath)}. Copy to ${ENV_FILENAME}?`,
+                message: `Found ${path_1.default.basename(existingEnvPath)}. Include in ${ENV_FILENAME}?`,
                 default: true,
             });
             if (copyExisting) {
-                const content = fs_1.default.readFileSync(existingEnvPath, 'utf8');
-                const header = `# Genbox Environment Variables
-# Generated from ${path_1.default.basename(existingEnvPath)}
-# DO NOT COMMIT THIS FILE
-#
-# Add staging/production URLs:
-# STAGING_MONGODB_URL=mongodb+srv://...
-# STAGING_REDIS_URL=redis://...
-# PROD_MONGODB_URL=mongodb+srv://...
-#
-# Git authentication:
-# GIT_TOKEN=ghp_xxxxxxxxxxxx
-
-`;
-                fs_1.default.writeFileSync(envPath, header + content);
-                console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME} from ${path_1.default.basename(existingEnvPath)}`));
-            }
-        }
-        else {
-            const createEnv = nonInteractive ? true : await prompts.confirm({
-                message: `Create ${ENV_FILENAME} template?`,
-                default: true,
-            });
-            if (createEnv) {
-                const template = generateEnvTemplate(projectName, config);
-                fs_1.default.writeFileSync(envPath, template);
-                console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME} template`));
+                const content = fs_1.default.readFileSync(existingEnvPath, 'utf8').trim();
+                segregatedContent += `# === root ===\n`;
+                segregatedContent += `# From ${path_1.default.basename(existingEnvPath)}\n`;
+                segregatedContent += content;
+                segregatedContent += '\n\n';
             }
         }
     }
-    // Append extra env vars (like GIT_TOKEN) to the file
-    if (Object.keys(extraEnvVars).length > 0 && fs_1.default.existsSync(envPath)) {
-        let content = fs_1.default.readFileSync(envPath, 'utf8');
-        // Add extra env vars section
-        let extraSection = '\n# === Added by genbox init ===\n';
-        for (const [key, value] of Object.entries(extraEnvVars)) {
-            // Remove any existing commented placeholder
-            content = content.replace(new RegExp(`^#\\s*${key}=.*$`, 'gm'), '');
-            extraSection += `${key}=${value}\n`;
-        }
-        fs_1.default.writeFileSync(envPath, content.trim() + '\n' + extraSection);
+    // Add END marker
+    segregatedContent += `# === END ===\n`;
+    // Write the file
+    fs_1.default.writeFileSync(envPath, segregatedContent);
+    const sectionCount = (segregatedContent.match(/# === [^=]+ ===/g) || []).length - 2; // Exclude GLOBAL and END
+    if (sectionCount > 0) {
+        console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME} with ${sectionCount} app section(s)`));
+    }
+    else {
+        console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME}`));
     }
     // Add to .gitignore
     const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
@@ -915,6 +963,19 @@ function generateEnvTemplate(projectName, config) {
         '# DO NOT COMMIT THIS FILE',
         '',
         '# ============================================',
+        '# API URL CONFIGURATION',
+        '# ============================================',
+        '# Use ${API_URL} in your app env vars (e.g., VITE_API_BASE_URL=${API_URL})',
+        '# At create time, ${API_URL} expands based on profile:',
+        '#   - connect_to: staging → uses STAGING_API_URL',
+        '#   - connect_to: production → uses PRODUCTION_API_URL',
+        '#   - local/no connect_to → uses LOCAL_API_URL',
+        '',
+        'LOCAL_API_URL=http://localhost:3050',
+        'STAGING_API_URL=https://api.staging.example.com',
+        '# PRODUCTION_API_URL=https://api.example.com',
+        '',
+        '# ============================================',
         '# STAGING ENVIRONMENT',
         '# ============================================',
         '',
@@ -957,6 +1018,15 @@ function generateEnvTemplate(projectName, config) {
         'STRIPE_SECRET_KEY=sk_test_xxx',
         'STRIPE_WEBHOOK_SECRET=whsec_xxx',
         '',
+        '# ============================================',
+        '# APPLICATION ENV VARS',
+        '# ============================================',
+        '# Use ${API_URL} for dynamic API URLs',
+        '',
+        '# Example:',
+        '# VITE_API_BASE_URL=${API_URL}',
+        '# NEXT_PUBLIC_API_URL=${API_URL}',
+        '',
     ];
     return lines.join('\n');
 }

package/package.json

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