genbox 1.0.102 → 1.0.104

package/dist/commands/extend.js

@@ -53,9 +53,15 @@ exports.extendCommand = new commander_1.Command('extend')
                     { name: '4 hours', value: 4 },
                     { name: '8 hours', value: 8 },
                     { name: 'Custom...', value: 0 },
+                    { name: 'Remove auto expiry', value: -1 },
                 ],
             });
-            if (choice === 0) {
+            if (choice === -1) {
+                // Remove auto expiry - set minimal hours and disable auto-destroy
+                hours = 1;
+                options.autoDestroy = false; // This will set disableAutoDestroy = true
+            }
+            else if (choice === 0) {
                 const customHours = await (0, input_1.default)({
                     message: 'Enter number of hours:',
                     validate: (val) => {
@@ -81,7 +87,10 @@ exports.extendCommand = new commander_1.Command('extend')
         else if (options.enableAutoDestroy) {
             disableAutoDestroy = false; // --enable-auto-destroy flag
         }
-        const spinner = (0, ora_1.default)(`Extending ${target.name} by ${hours} hour${hours > 1 ? 's' : ''}...`).start();
+        const spinnerText = disableAutoDestroy
+            ? `Removing auto expiry for ${target.name}...`
+            : `Extending ${target.name} by ${hours} hour${hours > 1 ? 's' : ''}...`;
+        const spinner = (0, ora_1.default)(spinnerText).start();
         const result = await (0, api_1.fetchApi)(`/genboxes/${target._id}/extend`, {
             method: 'POST',
             body: JSON.stringify({

package/dist/commands/init.js

@@ -333,6 +333,21 @@ function loadDetectedConfig(rootDir) {
         return null;
     }
 }
+/**
+ * Load existing genbox.yaml config if present
+ */
+function loadExistingConfig(rootDir) {
+    const configPath = path_1.default.join(rootDir, CONFIG_FILENAME);
+    if (!fs_1.default.existsSync(configPath))
+        return null;
+    try {
+        const content = fs_1.default.readFileSync(configPath, 'utf8');
+        return yaml.load(content);
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Save detected config to .genbox/detected.yaml
  */
@@ -922,7 +937,8 @@ async function selectScripts(detected) {
 /**
  * Combined environment and service URL configuration
  */
-async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
+async function setupEnvironmentsAndServiceUrls(detected, existingEnvData) {
+    const existingEnvValues = existingEnvData.values;
     const envVars = {};
     let environments = {};
     console.log('');
@@ -998,8 +1014,8 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
             }
         }
     }
-    // Service URL detection and mapping
-    const serviceUrlMappings = await setupServiceUrls(detected, environments, existingEnvValues);
+    // Service URL detection and mapping (pass existing mappings for retention option)
+    const serviceUrlMappings = await setupServiceUrls(detected, environments, existingEnvData);
     // Always add LOCAL_API_URL - get port from detected api app
     const apiApp = detected.apps?.['api'];
     const apiPort = apiApp?.port || 3050;
@@ -1013,29 +1029,64 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
 /**
  * Setup service URL mappings for frontend apps
  */
-async function setupServiceUrls(detected, environments, existingEnvValues) {
+async function setupServiceUrls(detected, environments, existingEnvData) {
+    const existingMappings = existingEnvData.serviceUrlMappings;
+    const mappings = [];
+    // Check for existing service URL mappings first
+    if (existingMappings.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Existing Service URL Mappings ==='));
+        console.log(chalk_1.default.dim('Found service URL mappings in existing .env.genbox:'));
+        console.log('');
+        for (const mapping of existingMappings) {
+            console.log(`  ${chalk_1.default.cyan(mapping.localUrl)}`);
+            if (mapping.remoteUrl && mapping.remoteEnv) {
+                console.log(chalk_1.default.dim(`    → ${mapping.remoteEnv}: ${mapping.remoteUrl}`));
+            }
+        }
+        console.log('');
+        // Let user select which existing mappings to retain
+        const retainChoices = existingMappings.map(m => ({
+            name: `${m.localUrl}${m.remoteUrl ? ` → ${m.remoteUrl}` : ''}`,
+            value: m.localUrl,
+            checked: true,
+        }));
+        const retainedUrls = await prompts.checkbox({
+            message: 'Select existing service URL mappings to retain:',
+            choices: retainChoices,
+        });
+        // Add retained mappings
+        for (const mapping of existingMappings) {
+            if (retainedUrls.includes(mapping.localUrl)) {
+                mappings.push(mapping);
+            }
+        }
+    }
     const frontendApps = Object.entries(detected.apps)
         .filter(([, app]) => app.type === 'frontend')
         .map(([name]) => name);
     if (frontendApps.length === 0) {
-        return [];
+        return mappings;
     }
     // Scan env files for service URLs
     const serviceUrls = scanEnvFilesForUrls(detected.apps, detected._meta.scanned_root);
-    if (serviceUrls.length === 0) {
-        return [];
+    // Filter out URLs that are already in retained mappings
+    const retainedLocalUrls = new Set(mappings.map(m => m.localUrl));
+    const newServiceUrls = serviceUrls.filter(svc => !retainedLocalUrls.has(svc.base_url));
+    if (newServiceUrls.length === 0) {
+        return mappings;
     }
     console.log('');
     console.log(chalk_1.default.blue('=== Service URL Configuration ==='));
     console.log(chalk_1.default.dim('Detected local service URLs in frontend env files:'));
     console.log('');
-    for (const svc of serviceUrls) {
+    for (const svc of newServiceUrls) {
         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 to configure
-    const urlChoices = serviceUrls.map(svc => ({
+    const urlChoices = newServiceUrls.map(svc => ({
         name: `${svc.base_url} (${svc.used_by.length} var${svc.used_by.length > 1 ? 's' : ''})`,
         value: svc.base_url,
         checked: true,
@@ -1044,8 +1095,7 @@ async function setupServiceUrls(detected, environments, existingEnvValues) {
         message: 'Select service URLs to configure for remote environments:',
         choices: urlChoices,
     });
-    const selectedServices = serviceUrls.filter(svc => selectedUrls.includes(svc.base_url));
-    const mappings = [];
+    const selectedServices = newServiceUrls.filter(svc => selectedUrls.includes(svc.base_url));
     // Determine primary remote environment
     const envNames = Object.keys(environments || {});
     const primaryEnv = envNames.includes('staging') ? 'staging' :
@@ -1100,16 +1150,63 @@ async function setupProfiles(detected, environments) {
     console.log(chalk_1.default.blue('=== Profile Configuration ==='));
     console.log('');
     // Generate default profiles
-    const profiles = generateDefaultProfiles(detected, environments);
+    const defaultProfiles = generateDefaultProfiles(detected, environments);
+    const defaultProfileNames = new Set(Object.keys(defaultProfiles));
+    // Load existing profiles from genbox.yaml
+    const existingConfig = loadExistingConfig(detected._meta.scanned_root);
+    const existingProfiles = existingConfig?.profiles || {};
+    // Identify user-created profiles (profiles that don't match auto-generated names)
+    const userCreatedProfiles = {};
+    for (const [name, profile] of Object.entries(existingProfiles)) {
+        if (!defaultProfileNames.has(name)) {
+            userCreatedProfiles[name] = profile;
+        }
+    }
+    // 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:'));
+        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}`);
+            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
+            };
+        });
+        const retainedNames = await prompts.checkbox({
+            message: 'Select existing profiles to retain:',
+            choices: retainChoices,
+        });
+        // Add retained profiles (they override defaults with same name)
+        for (const name of retainedNames) {
+            profiles[name] = existingProfiles[name];
+        }
+    }
     if (Object.keys(profiles).length === 0) {
         console.log(chalk_1.default.dim('  No profiles generated (no runnable apps detected).'));
         return {};
     }
-    // Display profiles
-    console.log(chalk_1.default.dim('Generated profiles:'));
+    // Display final profiles
+    console.log('');
+    console.log(chalk_1.default.dim('Final profiles:'));
     console.log('');
     for (const [name, profile] of Object.entries(profiles)) {
-        console.log(`  ${chalk_1.default.cyan(name)}`);
+        const isRetained = existingProfiles[name] && !defaultProfileNames.has(name);
+        const label = isRetained ? chalk_1.default.yellow(' (retained)') : '';
+        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'}`));
         console.log(chalk_1.default.dim(`    Size: ${profile.size || 'default'}`));
@@ -1968,11 +2065,17 @@ function httpsToSsh(url) {
 }
 function readExistingEnvGenbox() {
     const envPath = path_1.default.join(process.cwd(), ENV_FILENAME);
-    const values = {};
+    const result = {
+        values: {},
+        serviceUrlMappings: [],
+        rawContent: '',
+    };
     if (!fs_1.default.existsSync(envPath))
-        return values;
+        return result;
     try {
         const content = fs_1.default.readFileSync(envPath, 'utf8');
+        result.rawContent = content;
+        // Parse all key-value pairs
         for (const line of content.split('\n')) {
             const trimmed = line.trim();
             if (!trimmed || trimmed.startsWith('#'))
@@ -1983,12 +2086,44 @@ function readExistingEnvGenbox() {
                 if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
                     value = value.slice(1, -1);
                 }
-                values[match[1]] = value;
+                result.values[match[1]] = value;
+            }
+        }
+        // Parse service URL mappings from the "# Service URL Configuration" section
+        // Pattern: LOCAL_<name>_URL=<url> and <ENV>_<name>_URL=<url>
+        const localUrlEntries = {};
+        const remoteUrlEntries = {};
+        for (const [key, value] of Object.entries(result.values)) {
+            // Match LOCAL_*_URL patterns
+            const localMatch = key.match(/^LOCAL_(.+)_URL$/);
+            if (localMatch && value.startsWith('http')) {
+                localUrlEntries[localMatch[1]] = value;
+            }
+            // Match STAGING_*_URL or PRODUCTION_*_URL patterns (for service URLs)
+            const remoteMatch = key.match(/^(STAGING|PRODUCTION)_(.+)_URL$/);
+            if (remoteMatch && value.startsWith('http')) {
+                const envName = remoteMatch[1].toLowerCase();
+                const varName = remoteMatch[2];
+                // Skip environment-level API URLs like STAGING_API_URL (no PORT_ prefix)
+                if (varName !== 'API' && varName !== 'MONGODB') {
+                    remoteUrlEntries[varName] = { url: value, env: envName };
+                }
             }
         }
+        // Build service URL mappings from local entries
+        for (const [varName, localUrl] of Object.entries(localUrlEntries)) {
+            const remote = remoteUrlEntries[varName];
+            result.serviceUrlMappings.push({
+                varName: `${varName}_URL`,
+                localUrl,
+                remoteUrl: remote?.url,
+                remoteEnv: remote?.env,
+                description: `Service at ${localUrl}`,
+            });
+        }
     }
     catch { }
-    return values;
+    return result;
 }
 // =============================================================================
 // Main Command
@@ -2017,8 +2152,9 @@ exports.initCommand = new commander_1.Command('init')
                 return;
         }
         console.log(chalk_1.default.blue('\nInitializing Genbox...\n'));
-        // Read existing .env.genbox values
-        const existingEnvValues = readExistingEnvGenbox();
+        // Read existing .env.genbox values and service URL mappings
+        const existingEnvData = readExistingEnvGenbox();
+        const existingEnvValues = existingEnvData.values;
         // =========================================
         // PHASE 1: Scan or Load
         // =========================================
@@ -2126,7 +2262,7 @@ exports.initCommand = new commander_1.Command('init')
         // =========================================
         // PHASE 5: Environments & Service URLs
         // =========================================
-        const { environments, serviceUrlMappings, envVars: envEnvVars } = await setupEnvironmentsAndServiceUrls(detected, existingEnvValues);
+        const { environments, serviceUrlMappings, envVars: envEnvVars } = await setupEnvironmentsAndServiceUrls(detected, existingEnvData);
         // =========================================
         // PHASE 6: Profiles
         // =========================================

package/dist/commands/list.js

@@ -49,14 +49,64 @@ exports.listCommand = new commander_1.Command('list')
             }
             return;
         }
+        // Calculate column widths
+        const nameWidth = Math.max(12, ...genboxes.map(g => g.name.length + (options.all && g.project ? g.project.length + 3 : 0)));
+        const statusWidth = 12;
+        const ipWidth = 16;
+        const sizeWidth = 8;
         genboxes.forEach((genbox) => {
             const statusColor = genbox.status === 'running' ? chalk_1.default.green :
                 genbox.status === 'terminated' ? chalk_1.default.red : chalk_1.default.yellow;
             // Show project info when listing all
-            const projectInfo = options.all && genbox.project
-                ? chalk_1.default.dim(` [${genbox.project}]`)
-                : '';
-            console.log(`${chalk_1.default.cyan(genbox.name)}${projectInfo} \t ${statusColor(genbox.status)} \t ${chalk_1.default.dim(genbox.ipAddress || 'Pending IP')} \t (${genbox.size})`);
+            const projectSuffix = options.all && genbox.project ? ` [${genbox.project}]` : '';
+            const nameWithProject = genbox.name + projectSuffix;
+            // Format end hour as relative time
+            let endHourInfo = '';
+            if (genbox.currentHourEnd && genbox.status === 'running') {
+                const endTime = new Date(genbox.currentHourEnd);
+                const now = new Date();
+                const diffMs = endTime.getTime() - now.getTime();
+                if (diffMs > 0) {
+                    const totalSeconds = Math.floor(diffMs / 1000);
+                    const mins = Math.floor(totalSeconds / 60);
+                    const secs = totalSeconds % 60;
+                    if (mins > 0) {
+                        endHourInfo = ` hour ends in ${mins}m:${secs.toString().padStart(2, '0')}s`;
+                    }
+                    else {
+                        endHourInfo = ` hour ends in ${secs}s`;
+                    }
+                }
+                else {
+                    endHourInfo = ' hour renewing...';
+                }
+            }
+            // Show auto-destroy status
+            let protectedInfo = '';
+            if (genbox.autoDestroyOnInactivity === false) {
+                protectedInfo = chalk_1.default.yellow(' [protected]');
+            }
+            else if (genbox.protectedUntil) {
+                const protectedUntil = new Date(genbox.protectedUntil);
+                const now = new Date();
+                const diffMs = protectedUntil.getTime() - now.getTime();
+                const hoursRemaining = Math.ceil(diffMs / (1000 * 60 * 60));
+                if (hoursRemaining > 0) {
+                    protectedInfo = chalk_1.default.cyan(` [extended ${hoursRemaining}h]`);
+                }
+                else {
+                    protectedInfo = chalk_1.default.dim(' [auto-destroy]');
+                }
+            }
+            else {
+                protectedInfo = chalk_1.default.dim(' [auto-destroy]');
+            }
+            const namePart = chalk_1.default.cyan(nameWithProject.padEnd(nameWidth));
+            const statusPart = statusColor(genbox.status.padEnd(statusWidth));
+            const ipPart = chalk_1.default.dim((genbox.ipAddress || 'Pending IP').padEnd(ipWidth));
+            const sizePart = `(${genbox.size})`.padEnd(sizeWidth);
+            const extraInfo = chalk_1.default.dim(endHourInfo) + protectedInfo;
+            console.log(`${namePart} ${statusPart} ${ipPart} ${sizePart}${extraInfo}`);
         });
         console.log(chalk_1.default.dim('────────────────────────────────────────────────────'));
         // Show hint if in project context and not showing all

package/dist/commands/status.js

@@ -400,19 +400,81 @@ exports.statusCommand = new commander_1.Command('status')
             }
             // Show Docker containers status
             const dockerStatus = sshExec(target.ipAddress, keyPath, 'docker ps --format "{{.Names}}\\t{{.Status}}" 2>/dev/null', 10);
-            if (dockerStatus && dockerStatus.trim()) {
+            const hasDockerServices = dockerStatus && dockerStatus.trim();
+            if (hasDockerServices) {
                 console.log(chalk_1.default.blue('[INFO] === Docker Services ==='));
                 console.log('NAMES\tSTATUS');
                 console.log(dockerStatus);
                 console.log('');
             }
-            // Show PM2 processes
+            // Show PM2 processes (only if there are actual apps)
             const pm2Status = sshExec(target.ipAddress, keyPath, 'source ~/.nvm/nvm.sh 2>/dev/null; pm2 list 2>/dev/null || echo ""', 10);
-            if (pm2Status && pm2Status.trim() && !pm2Status.includes('No process')) {
+            // Check for actual PM2 apps - empty tables don't contain status keywords
+            const hasPm2Apps = pm2Status && pm2Status.trim() &&
+                !pm2Status.includes('No process') &&
+                (pm2Status.includes('online') || pm2Status.includes('stopped') ||
+                    pm2Status.includes('errored') || pm2Status.includes('launching'));
+            if (hasPm2Apps) {
                 console.log(chalk_1.default.blue('[INFO] === PM2 Services ==='));
                 console.log(pm2Status);
                 console.log('');
             }
+            // Warn if no services are running and try to diagnose why
+            if (!hasDockerServices && !hasPm2Apps) {
+                console.log(chalk_1.default.yellow('[WARN] No Docker or PM2 services are running!'));
+                // First, check for saved errors from setup (fast - just read a file)
+                const savedErrors = sshExec(target.ipAddress, keyPath, 'cat ~/.genbox-errors 2>/dev/null || echo ""', 10);
+                if (savedErrors && savedErrors.trim()) {
+                    // Found saved errors from setup
+                    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 - try docker compose build to diagnose (uses cache, fails fast)
+                    console.log(chalk_1.default.dim('  Checking for build errors...'));
+                    console.log('');
+                    const buildResult = sshExec(target.ipAddress, keyPath, 'cd ~/goodpass/api 2>/dev/null && docker compose build 2>&1 | tail -60 || echo "No compose file found"', 120);
+                    if (buildResult && buildResult.trim()) {
+                        // Check for common error patterns
+                        if (buildResult.includes('ERROR') || buildResult.includes('TS2') ||
+                            buildResult.includes('failed') || buildResult.includes('ELIFECYCLE') ||
+                            buildResult.includes('exit code') || buildResult.includes('did not complete successfully')) {
+                            console.log(chalk_1.default.red('[ERROR] Docker build failed:'));
+                            // Extract just the error portion
+                            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*\|/) // Source code lines with line numbers
+                            ).slice(-20);
+                            if (errorLines.length > 0) {
+                                console.log(errorLines.join('\n'));
+                            }
+                            else {
+                                // Show last 25 lines if no specific error pattern found
+                                console.log(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 if (buildResult.includes('Built') || buildResult.includes('FINISHED')) {
+                            // Build succeeded, services just need to start
+                            console.log(chalk_1.default.dim('  Build OK. Start services with: cd ~/goodpass/api && docker compose up -d'));
+                        }
+                        else {
+                            console.log(chalk_1.default.dim(buildResult));
+                            console.log('');
+                            console.log(chalk_1.default.dim('  Try: cd ~/goodpass/api && docker compose up -d'));
+                        }
+                    }
+                    else {
+                        console.log(chalk_1.default.dim('  Try: cd ~/goodpass/api && docker compose up -d'));
+                    }
+                }
+                console.log('');
+            }
             // Show URLs if available
             if (target.urls && Object.keys(target.urls).length > 0) {
                 console.log(chalk_1.default.blue('[INFO] === Service URLs ==='));
@@ -786,13 +848,17 @@ exports.statusCommand = new commander_1.Command('status')
                     console.log(chalk_1.default.dim(pkgError));
                 }
                 console.log('');
-                // Show PM2 processes
-                console.log(chalk_1.default.blue('[INFO] === Running Services (PM2) ==='));
-                const pm2List = sshExec(target.ipAddress, keyPath, "source ~/.nvm/nvm.sh 2>/dev/null; pm2 list 2>/dev/null || echo 'PM2 not running'", 10);
-                if (pm2List) {
+                // Show PM2 processes (only if there are actual apps)
+                const pm2List = sshExec(target.ipAddress, keyPath, "source ~/.nvm/nvm.sh 2>/dev/null; pm2 list 2>/dev/null || echo ''", 10);
+                const hasPm2Apps = pm2List && pm2List.trim() &&
+                    !pm2List.includes('No process') &&
+                    (pm2List.includes('online') || pm2List.includes('stopped') ||
+                        pm2List.includes('errored') || pm2List.includes('launching'));
+                if (hasPm2Apps) {
+                    console.log(chalk_1.default.blue('[INFO] === Running Services (PM2) ==='));
                     console.log(pm2List);
+                    console.log('');
                 }
-                console.log('');
                 // Show URLs if available
                 if (target.urls && Object.keys(target.urls).length > 0) {
                     console.log(chalk_1.default.blue('[INFO] === Service URLs ==='));

package/package.json

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