genbox 1.0.105 → 1.0.107

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;
@@ -60,25 +66,31 @@ exports.listCommand = new commander_1.Command('list')
             // Show project info when listing all
             const projectSuffix = options.all && genbox.project ? ` [${genbox.project}]` : '';
             const nameWithProject = genbox.name + projectSuffix;
-            // Format end hour as relative time
+            // Format end hour as relative time (destroy happens at 58 min mark, not 60)
             let endHourInfo = '';
             if (genbox.currentHourEnd && genbox.status === 'running') {
                 const endTime = new Date(genbox.currentHourEnd);
                 const now = new Date();
-                const diffMs = endTime.getTime() - now.getTime();
+                // Subtract 2 minutes since auto-destroy happens at 58 min mark
+                const destroyTime = endTime.getTime() - (2 * 60 * 1000);
+                const diffMs = destroyTime - 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`;
+                    const timeStr = mins > 0
+                        ? `${mins}m:${secs.toString().padStart(2, '0')}s`
+                        : `${secs}s`;
+                    // Red color if less than 5 minutes
+                    if (mins < 5) {
+                        endHourInfo = chalk_1.default.red(` hour ends in ${timeStr}`);
                     }
                     else {
-                        endHourInfo = ` hour ends in ${secs}s`;
+                        endHourInfo = chalk_1.default.dim(` hour ends in ${timeStr}`);
                     }
                 }
                 else {
-                    endHourInfo = ' hour renewing...';
+                    endHourInfo = chalk_1.default.red(' hour ending...');
                 }
             }
             // Show auto-destroy status
@@ -105,7 +117,7 @@ exports.listCommand = new commander_1.Command('list')
             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;
+            const extraInfo = endHourInfo + protectedInfo;
             console.log(`${namePart} ${statusPart} ${ipPart} ${sizePart}${extraInfo}`);
         });
         console.log(chalk_1.default.dim('────────────────────────────────────────────────────'));

package/dist/commands/status.js

@@ -398,80 +398,48 @@ 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')) {
-                            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'));
-                    }
+                    // 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'));
                 }
                 console.log('');
             }

package/package.json

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