genbox 1.0.83 → 1.0.85

package/dist/commands/create.js

@@ -728,7 +728,9 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
     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
+    // Send .env.genbox content to server for processing
+    // OPTIMIZATION: Instead of duplicating GLOBAL section for each app,
+    // send ONE .env.genbox file and let server extract app-specific content
     const envGenboxPath = path.join(process.cwd(), '.env.genbox');
     if (fs.existsSync(envGenboxPath)) {
         const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
@@ -751,42 +753,77 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         if (connectTo && Object.keys(serviceUrlMap).length > 0) {
             console.log(chalk_1.default.dim(`  Using ${connectTo} URLs for variable expansion`));
         }
-        // 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}`);
-            // 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 = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
-                    const stagingName = `${app.name}-${serviceName}.env`;
-                    const targetPath = `${repoPath}/apps/${serviceName}/.env`;
+        // For projects with many apps, send ONE processed .env file to avoid duplicating GLOBAL
+        // This significantly reduces cloud-init size (Hetzner has 32KB limit)
+        if (resolved.apps.length > 3) {
+            // Send single .env.genbox with expansions applied, let server split into app files
+            let expandedEnvContent = rawEnvContent;
+            for (const [varName, value] of Object.entries(serviceUrlMap)) {
+                const pattern = new RegExp(`\\$\\{${varName}\\}`, 'g');
+                expandedEnvContent = expandedEnvContent.replace(pattern, value);
+            }
+            files.push({
+                path: '/home/dev/.env.genbox',
+                content: expandedEnvContent,
+                permissions: '0644',
+            });
+            // Track which apps need .env files (server will process)
+            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}`);
+                const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+                if (servicesSections.length > 0) {
+                    for (const serviceSectionName of servicesSections) {
+                        const serviceName = serviceSectionName.split('/')[1];
+                        envFilesToMove.push({
+                            stagingName: serviceSectionName, // e.g., "api/gateway" - server will parse
+                            targetPath: `${repoPath}/apps/${serviceName}/.env`,
+                        });
+                    }
+                }
+                else {
+                    envFilesToMove.push({
+                        stagingName: app.name,
+                        targetPath: `${repoPath}/.env`,
+                    });
+                }
+            }
+        }
+        else {
+            // For small projects, use the original per-app approach (simpler)
+            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}`);
+                const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+                if (servicesSections.length > 0) {
+                    for (const serviceSectionName of servicesSections) {
+                        const serviceName = serviceSectionName.split('/')[1];
+                        const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
+                        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 {
+                    const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
                     files.push({
-                        path: `/home/dev/.env-staging/${stagingName}`,
-                        content: serviceEnvContent,
+                        path: `/home/dev/.env-staging/${app.name}.env`,
+                        content: appEnvContent,
                         permissions: '0644',
                     });
-                    envFilesToMove.push({ stagingName, targetPath });
+                    envFilesToMove.push({
+                        stagingName: `${app.name}.env`,
+                        targetPath: `${repoPath}/.env`,
+                    });
                 }
             }
-            else {
-                // Regular app - build app-specific env content (GLOBAL + app section)
-                const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
-                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
@@ -870,9 +907,45 @@ function generateSetupScript(resolved, config, envFilesToMove = []) {
         'set -e',
         '',
     ];
-    // Move .env files from staging to their correct locations
-    // This runs after git clone has completed
-    if (envFilesToMove.length > 0) {
+    // Check if we're using the optimized single-file approach (for projects with many apps)
+    // or the legacy per-app staging approach
+    const useOptimizedEnv = resolved.apps.length > 3;
+    if (useOptimizedEnv && envFilesToMove.length > 0) {
+        // OPTIMIZED: Parse single .env.genbox and create app-specific .env files
+        lines.push('# Process .env.genbox and create app-specific .env files');
+        lines.push('if [ -f "/home/dev/.env.genbox" ]; then');
+        lines.push('  echo "Processing .env.genbox for app-specific .env files..."');
+        lines.push('');
+        lines.push('  # Function to extract section content');
+        lines.push('  extract_section() {');
+        lines.push('    local section="$1"');
+        lines.push('    local file="$2"');
+        lines.push('    awk -v section="$section" \'');
+        lines.push('      BEGIN { in_global=0; in_section=0; }');
+        lines.push('      /^# === GLOBAL ===/ { in_global=1; next }');
+        lines.push('      /^# === [^=]+ ===/ {');
+        lines.push('        in_global=0;');
+        lines.push('        if ($0 ~ "# === "section" ===") { in_section=1 }');
+        lines.push('        else { in_section=0 }');
+        lines.push('        next');
+        lines.push('      }');
+        lines.push('      in_global || in_section { print }');
+        lines.push('    \' "$file" | grep -v "^$" | head -n -1');
+        lines.push('  }');
+        lines.push('');
+        for (const { stagingName, targetPath } of envFilesToMove) {
+            lines.push(`  # Create .env for ${stagingName}`);
+            lines.push(`  mkdir -p "$(dirname "${targetPath}")"`);
+            lines.push(`  extract_section "${stagingName}" /home/dev/.env.genbox > "${targetPath}"`);
+            lines.push(`  echo "  Created ${targetPath}"`);
+        }
+        lines.push('');
+        lines.push('  rm -f /home/dev/.env.genbox');
+        lines.push('fi');
+        lines.push('');
+    }
+    else if (envFilesToMove.length > 0) {
+        // LEGACY: Move pre-staged .env files
         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`);

package/dist/commands/destroy.js

@@ -170,132 +170,139 @@ async function handleBulkDelete(options) {
         console.log(chalk_1.default.yellow(`Completed: ${successCount} destroyed, ${failCount} failed.`));
     }
 }
+/**
+ * Trigger save-work on genbox and display progress
+ * Returns the result with status and repo details
+ */
+async function triggerSaveWork(genbox) {
+    const spinner = (0, ora_1.default)('Saving uncommitted changes...').start();
+    spinner.text = 'Checking for uncommitted changes...';
+    try {
+        const result = await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/save-work`, {
+            method: 'POST',
+        });
+        // Handle different statuses
+        switch (result.status) {
+            case 'no_changes':
+                spinner.succeed(chalk_1.default.dim('No uncommitted changes found'));
+                return result;
+            case 'success':
+                spinner.succeed(chalk_1.default.green('All changes saved successfully'));
+                break;
+            case 'partial':
+                spinner.warn(chalk_1.default.yellow('Some changes saved (partial success)'));
+                break;
+            case 'failed':
+                spinner.fail(chalk_1.default.red('Failed to save changes'));
+                if (result.error) {
+                    console.log(chalk_1.default.dim(`  Error: ${result.error}`));
+                }
+                break;
+            case 'unreachable':
+                spinner.fail(chalk_1.default.red('Genbox is not reachable'));
+                if (result.error) {
+                    console.log(chalk_1.default.dim(`  ${result.error}`));
+                }
+                return result;
+            default:
+                spinner.info(chalk_1.default.dim(`Save work status: ${result.status}`));
+        }
+        // Display repo results
+        if (result.repos && result.repos.length > 0) {
+            console.log('');
+            for (const repo of result.repos) {
+                const repoName = repo.path.split('/').pop() || repo.path;
+                if (!repo.hadChanges) {
+                    console.log(chalk_1.default.dim(`  ${repoName}: No changes`));
+                    continue;
+                }
+                if (repo.committed && repo.pushed) {
+                    const statusIcon = repo.prCreated ? chalk_1.default.green('✓') : chalk_1.default.yellow('↑');
+                    const branchInfo = chalk_1.default.cyan(repo.branch);
+                    if (repo.prCreated && repo.prUrl) {
+                        console.log(`  ${statusIcon} ${repoName}: PR created → ${chalk_1.default.underline(repo.prUrl)}`);
+                    }
+                    else {
+                        console.log(`  ${statusIcon} ${repoName}: Pushed to ${branchInfo}`);
+                    }
+                }
+                else if (repo.error) {
+                    console.log(`  ${chalk_1.default.red('✗')} ${repoName}: ${chalk_1.default.red(repo.error)}`);
+                }
+                else {
+                    console.log(`  ${chalk_1.default.red('✗')} ${repoName}: Failed to save`);
+                }
+            }
+        }
+        return result;
+    }
+    catch (error) {
+        spinner.fail(chalk_1.default.red(`Failed to save work: ${error.message}`));
+        return { status: 'failed', error: error.message };
+    }
+}
 /**
  * Check for uncommitted changes and handle them before destroy
  */
 async function handleUncommittedChanges(genbox, options) {
-    // Skip if --yes flag is used (user explicitly wants to skip this)
+    // Skip if --yes flag is used without save-changes (user explicitly wants to skip)
     if (options.yes && !options.saveChanges) {
         return { proceed: true };
     }
-    // If save-changes is explicitly set, use that value
+    // If save-changes is set to 'trash' or 'skip', don't save
     if (options.saveChanges === 'trash' || options.saveChanges === 'skip') {
-        return { proceed: true, action: options.saveChanges };
+        return { proceed: true };
+    }
+    // If save-changes is set to 'save', auto-save without prompting
+    if (options.saveChanges === 'save') {
+        console.log('');
+        const result = await triggerSaveWork(genbox);
+        return { proceed: true, saveWorkResult: result };
     }
-    // Check for uncommitted changes by running git status on the genbox
+    // Interactive mode - ask user what to do
     console.log('');
     console.log(chalk_1.default.blue('Checking for uncommitted changes...'));
-    try {
-        // Try to get git status from the genbox
-        const statusResponse = await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/exec`, {
-            method: 'POST',
-            body: JSON.stringify({
-                command: 'cd /home/dev/* 2>/dev/null && git status --porcelain 2>/dev/null || echo ""',
-                timeout: 10000,
-            }),
-        });
-        const gitStatus = statusResponse?.stdout?.trim() || '';
-        if (!gitStatus) {
-            console.log(chalk_1.default.dim('  No uncommitted changes detected.'));
-            return { proceed: true, action: 'none' };
-        }
-        // There are uncommitted changes
-        const changeCount = gitStatus.split('\n').filter(line => line.trim()).length;
-        console.log(chalk_1.default.yellow(`  Found ${changeCount} uncommitted change${changeCount === 1 ? '' : 's'}.`));
+    // First, do a quick check via save-work to see if there are changes
+    // The save-work endpoint will return 'no_changes' if nothing to save
+    const result = await triggerSaveWork(genbox);
+    // If no changes or unreachable, just proceed
+    if (result.status === 'no_changes' || result.status === 'unreachable') {
+        return { proceed: true, saveWorkResult: result };
+    }
+    // If save was successful or partial, we're done
+    if (result.status === 'success' || result.status === 'partial') {
+        return { proceed: true, saveWorkResult: result };
+    }
+    // If failed, ask user if they want to continue
+    if (result.status === 'failed') {
         console.log('');
-        // If save-changes is set to 'pr', auto-select that option
-        if (options.saveChanges === 'pr') {
-            return { proceed: true, action: 'pr' };
-        }
-        // Prompt user for action
         const action = await (0, select_1.default)({
-            message: 'What would you like to do with uncommitted changes?',
+            message: 'Save work failed. What would you like to do?',
             choices: [
                 {
-                    name: 'Commit, push, and create PR (recommended)',
-                    value: 'pr',
-                    description: 'Creates a PR with your changes before destroying',
-                },
-                {
-                    name: 'Trash changes',
-                    value: 'trash',
-                    description: 'Discard all uncommitted changes',
+                    name: 'Continue with destroy (changes will be lost)',
+                    value: 'continue',
                 },
                 {
                     name: 'Cancel destroy',
                     value: 'cancel',
-                    description: 'Keep the genbox running',
                 },
             ],
-            default: 'pr',
+            default: 'cancel',
         });
         if (action === 'cancel') {
-            return { proceed: false };
-        }
-        return { proceed: true, action };
-    }
-    catch (error) {
-        // If we can't check (e.g., genbox is not running), just proceed
-        console.log(chalk_1.default.dim('  Could not check for changes (genbox may not be accessible).'));
-        return { proceed: true, action: 'skip' };
-    }
-}
-/**
- * Commit, push and create PR for changes
- */
-async function createPRForChanges(genbox) {
-    const spinner = (0, ora_1.default)('Creating PR for uncommitted changes...').start();
-    try {
-        // Execute git commands on the genbox to commit, push, and create PR
-        const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-        const branchName = `genbox-save/${genbox.name}-${timestamp}`;
-        const commands = [
-            // Ensure we're in the project directory
-            'cd /home/dev/*',
-            // Create a new branch for the changes
-            `git checkout -b "${branchName}"`,
-            // Stage all changes
-            'git add -A',
-            // Commit with a descriptive message
-            `git commit -m "Save changes from genbox '${genbox.name}' before destroy"`,
-            // Push to origin
-            `git push -u origin "${branchName}"`,
-            // Try to create PR using gh CLI if available
-            `gh pr create --title "Changes from genbox '${genbox.name}'" --body "Auto-saved changes before genbox destroy" 2>/dev/null || echo "PR_SKIP"`,
-        ].join(' && ');
-        const result = await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/exec`, {
-            method: 'POST',
-            body: JSON.stringify({
-                command: commands,
-                timeout: 60000,
-            }),
-        });
-        if (result?.exitCode !== 0 && !result?.stdout?.includes('PR_SKIP')) {
-            spinner.fail(chalk_1.default.red('Failed to save changes'));
-            console.log(chalk_1.default.dim(`  Error: ${result?.stderr || 'Unknown error'}`));
-            return false;
-        }
-        if (result?.stdout?.includes('PR_SKIP')) {
-            spinner.succeed(chalk_1.default.green(`Changes pushed to branch '${branchName}'`));
-            console.log(chalk_1.default.dim('  Note: Could not create PR automatically. Create it manually on GitHub.'));
-        }
-        else {
-            spinner.succeed(chalk_1.default.green('PR created successfully'));
+            return { proceed: false, saveWorkResult: result };
         }
-        return true;
-    }
-    catch (error) {
-        spinner.fail(chalk_1.default.red(`Failed to save changes: ${error.message}`));
-        return false;
     }
+    return { proceed: true, saveWorkResult: result };
 }
 exports.destroyCommand = new commander_1.Command('destroy')
     .alias('delete')
     .description('Destroy one or more Genboxes')
     .argument('[name]', 'Name of the Genbox to destroy (optional - will prompt if not provided)')
-    .option('-y, --yes', 'Skip confirmation')
+    .option('-y, --yes', 'Skip confirmation and save-work prompts')
     .option('-a, --all', 'Bulk delete mode - select multiple genboxes to destroy')
-    .option('--save-changes <action>', 'Handle uncommitted changes: pr (commit/push/PR), trash (discard), skip (ignore)')
+    .option('--save-changes <action>', 'Handle uncommitted changes: save (commit/push/PR), trash (discard), skip (ignore)')
     .action(async (name, options) => {
     try {
         // Bulk delete mode when --all is used without a specific name
@@ -317,27 +324,14 @@ exports.destroyCommand = new commander_1.Command('destroy')
         }
         // Check for uncommitted changes if genbox is running
         if (target.status === 'running') {
-            const { proceed, action } = await handleUncommittedChanges(target, options);
+            const { proceed } = await handleUncommittedChanges(target, options);
             if (!proceed) {
                 console.log(chalk_1.default.dim('Destroy cancelled.'));
                 return;
             }
-            // Handle the action
-            if (action === 'pr') {
-                const success = await createPRForChanges(target);
-                if (!success) {
-                    const continueAnyway = await (0, confirm_1.default)({
-                        message: 'Failed to save changes. Continue with destroy anyway?',
-                        default: false,
-                    });
-                    if (!continueAnyway) {
-                        console.log(chalk_1.default.dim('Destroy cancelled.'));
-                        return;
-                    }
-                }
-            }
         }
         // Confirm
+        console.log('');
         let confirmed = options.yes;
         if (!confirmed) {
             confirmed = await (0, confirm_1.default)({

package/package.json

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