genbox 1.0.107 → 1.0.109

package/dist/commands/init.js

@@ -1164,35 +1164,30 @@ async function setupProfiles(detected, environments) {
     }
     // Start with default profiles
     let profiles = { ...defaultProfiles };
-    // If there are existing profiles (including user-created ones), offer to retain them
-    if (Object.keys(existingProfiles).length > 0) {
-        console.log(chalk_1.default.dim('Found existing profiles in genbox.yaml:'));
+    // If there are user-created profiles, offer to retain them
+    if (Object.keys(userCreatedProfiles).length > 0) {
+        console.log(chalk_1.default.dim('Found user-created profiles in genbox.yaml:'));
         console.log('');
-        // Display existing profiles with indication if they're user-created
-        for (const [name, profile] of Object.entries(existingProfiles)) {
-            const isUserCreated = !defaultProfileNames.has(name);
-            const label = isUserCreated ? chalk_1.default.yellow(' (user-created)') : chalk_1.default.dim(' (auto-generated)');
-            console.log(`  ${chalk_1.default.cyan(name)}${label}`);
+        // Display user-created profiles
+        for (const [name, profile] of Object.entries(userCreatedProfiles)) {
+            console.log(`  ${chalk_1.default.cyan(name)}`);
             console.log(chalk_1.default.dim(`    ${profile.description || 'No description'}`));
             console.log(chalk_1.default.dim(`    Apps: ${profile.apps?.join(', ') || 'all'}`));
             console.log('');
         }
-        // Let user select which existing profiles to retain
-        const retainChoices = Object.entries(existingProfiles).map(([name, profile]) => {
-            const isUserCreated = !defaultProfileNames.has(name);
-            return {
-                name: `${name}${isUserCreated ? ' (user-created)' : ''} - ${profile.description || 'No description'}`,
-                value: name,
-                checked: isUserCreated, // User-created profiles are checked by default
-            };
-        });
+        // Let user select which user-created profiles to retain
+        const retainChoices = Object.entries(userCreatedProfiles).map(([name, profile]) => ({
+            name: `${name} - ${profile.description || 'No description'}`,
+            value: name,
+            checked: true, // All user-created profiles are checked by default
+        }));
         const retainedNames = await prompts.checkbox({
-            message: 'Select existing profiles to retain:',
+            message: 'Select user-created profiles to retain:',
             choices: retainChoices,
         });
-        // Add retained profiles (they override defaults with same name)
+        // Add retained user-created profiles
         for (const name of retainedNames) {
-            profiles[name] = existingProfiles[name];
+            profiles[name] = userCreatedProfiles[name];
         }
     }
     if (Object.keys(profiles).length === 0) {
@@ -1204,8 +1199,8 @@ async function setupProfiles(detected, environments) {
     console.log(chalk_1.default.dim('Final profiles:'));
     console.log('');
     for (const [name, profile] of Object.entries(profiles)) {
-        const isRetained = existingProfiles[name] && !defaultProfileNames.has(name);
-        const label = isRetained ? chalk_1.default.yellow(' (retained)') : '';
+        const isUserCreated = userCreatedProfiles[name] !== undefined;
+        const label = isUserCreated ? chalk_1.default.yellow(' (user-created)') : '';
         console.log(`  ${chalk_1.default.cyan(name)}${label}`);
         console.log(chalk_1.default.dim(`    ${profile.description || 'No description'}`));
         console.log(chalk_1.default.dim(`    Apps: ${profile.apps?.join(', ') || 'all'}`));
@@ -1560,12 +1555,23 @@ function generateEnvFile(projectName, detected, envVars, serviceUrlMappings) {
         content += `\n# Git authentication\n# GIT_TOKEN=ghp_xxxxxxxxxxxx\n`;
     }
     // Add app-specific sections from existing env files
+    // Convert hardcoded localhost URLs to placeholders so they can be expanded based on profile
     const appEnvFiles = findAppEnvFiles(detected.apps, detected._meta.scanned_root);
     for (const envFile of appEnvFiles) {
         try {
-            const fileContent = fs_1.default.readFileSync(envFile.fullPath, 'utf8').trim();
+            let fileContent = fs_1.default.readFileSync(envFile.fullPath, 'utf8').trim();
             if (fileContent) {
+                // Replace hardcoded localhost URLs with placeholders
+                // This allows the URLs to be expanded to local/staging/production based on profile
+                for (const mapping of serviceUrlMappings) {
+                    // Escape special regex characters in the URL
+                    const escapedUrl = mapping.localUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+                    // Match the URL with optional quotes around it
+                    const urlPattern = new RegExp(`(["']?)${escapedUrl}\\1`, 'g');
+                    fileContent = fileContent.replace(urlPattern, `"\${${mapping.varName}}"`);
+                }
                 content += `\n# === ${envFile.appName} ===\n`;
+                content += `# URLs use placeholders that get expanded based on profile (local vs staging)\n`;
                 content += fileContent;
                 content += '\n';
             }

package/dist/commands/status.js

@@ -438,8 +438,35 @@ exports.statusCommand = new commander_1.Command('status')
                     console.log(chalk_1.default.dim('  Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
                 }
                 else {
-                    // No errors in DB - services might just need to be started
-                    console.log(chalk_1.default.dim('  Try: cd ~/goodpass/api && docker compose up -d'));
+                    // No errors in DB - try SSH fallback for older genboxes
+                    // First check ~/.genbox-errors file (fast)
+                    const savedErrors = sshExec(target.ipAddress, keyPath, 'cat ~/.genbox-errors 2>/dev/null || echo ""', 10);
+                    if (savedErrors && savedErrors.trim()) {
+                        console.log(chalk_1.default.red('[ERROR] Build failed during setup:'));
+                        console.log(savedErrors);
+                        console.log('');
+                        console.log(chalk_1.default.dim('  Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
+                    }
+                    else {
+                        // No saved errors - check if there's a docker compose error
+                        console.log(chalk_1.default.dim('  Checking for build errors...'));
+                        const buildResult = sshExec(target.ipAddress, keyPath, 'cd ~/goodpass/api 2>/dev/null && docker compose build 2>&1 | tail -60 || echo ""', 120);
+                        if (buildResult && (buildResult.includes('ERROR') || buildResult.includes('TS2') ||
+                            buildResult.includes('failed') || buildResult.includes('ELIFECYCLE'))) {
+                            console.log(chalk_1.default.red('[ERROR] Docker build failed:'));
+                            const lines = buildResult.split('\n');
+                            const errorLines = lines.filter(line => line.includes('ERROR') || line.includes('TS2') || line.includes('TS1') ||
+                                line.includes('failed') || line.includes('exit code') ||
+                                line.includes('>') || line.includes('^') ||
+                                line.match(/^\s*\d+\s*\|/)).slice(-20);
+                            console.log(errorLines.length > 0 ? errorLines.join('\n') : lines.slice(-25).join('\n'));
+                            console.log('');
+                            console.log(chalk_1.default.dim('  Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
+                        }
+                        else {
+                            console.log(chalk_1.default.dim('  Try: cd ~/goodpass/api && docker compose up -d'));
+                        }
+                    }
                 }
                 console.log('');
             }

package/package.json

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