genbox 1.0.106 → 1.0.108

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'}`));

package/dist/commands/list.js

@@ -49,6 +49,12 @@ exports.listCommand = new commander_1.Command('list')
             }
             return;
         }
+        // Sort by createdAt (newest first)
+        genboxes.sort((a, b) => {
+            const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+            const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
+            return dateB - dateA;
+        });
         // 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;

package/dist/commands/status.js

@@ -398,80 +398,75 @@ exports.statusCommand = new commander_1.Command('status')
                 console.log(chalk_1.default.dim(`  (updated ${statsAge < 60 ? 'just now' : Math.floor(statsAge / 60) + 'm ago'})`));
                 console.log('');
             }
-            // Show Docker containers status
-            const dockerStatus = sshExec(target.ipAddress, keyPath, 'docker ps --format "{{.Names}}\\t{{.Status}}" 2>/dev/null', 10);
-            const hasDockerServices = dockerStatus && dockerStatus.trim();
+            // Show Docker containers status from DB (updated by heartbeat)
+            const dockerServices = systemStats?.dockerServices || [];
+            const hasDockerServices = dockerServices.length > 0;
             if (hasDockerServices) {
                 console.log(chalk_1.default.blue('[INFO] === Docker Services ==='));
-                console.log('NAMES\tSTATUS');
-                console.log(dockerStatus);
+                console.log('NAME\t\t\tSTATUS');
+                for (const svc of dockerServices) {
+                    const healthBadge = svc.health
+                        ? (svc.health === 'healthy' ? chalk_1.default.green(' ✓') : chalk_1.default.red(` (${svc.health})`))
+                        : '';
+                    console.log(`${svc.name}\t${svc.status}${healthBadge}`);
+                }
                 console.log('');
             }
-            // 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);
-            // 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'));
+            // Show PM2 processes from DB (updated by heartbeat)
+            const pm2Services = systemStats?.pm2Services || [];
+            const hasPm2Apps = pm2Services.length > 0;
             if (hasPm2Apps) {
                 console.log(chalk_1.default.blue('[INFO] === PM2 Services ==='));
-                console.log(pm2Status);
+                console.log('NAME\t\tSTATUS\t\tCPU\tMEM');
+                for (const app of pm2Services) {
+                    const statusColor = app.status === 'online' ? chalk_1.default.green :
+                        app.status === 'stopped' ? chalk_1.default.yellow : chalk_1.default.red;
+                    console.log(`${app.name}\t\t${statusColor(app.status)}\t\t${app.cpu || 0}%\t${app.memory || 0}MB`);
+                }
                 console.log('');
             }
-            // Warn if no services are running and try to diagnose why
+            // Warn if no services are running and show setup errors from DB (no SSH needed)
             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
+                // Check for setup errors stored in DB (sent by setup callback)
+                const setupErrors = target.setupErrors;
+                if (setupErrors && setupErrors.trim()) {
+                    // Found errors from setup - display them
                     console.log(chalk_1.default.red('[ERROR] Build failed during setup:'));
-                    console.log(savedErrors);
+                    console.log(setupErrors);
                     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')) {
+                    // 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:'));
-                            // 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'));
-                            }
+                                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 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('');
             }

package/package.json

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