genbox 1.0.223 → 1.0.224

package/dist/commands/list.js

@@ -104,107 +104,172 @@ function detectOrphanedGenboxes(trackedNames) {
     }
     return orphaned;
 }
-exports.listCommand = new commander_1.Command('list')
-    .alias('ls')
-    .description('List genboxes (scoped to current project by default)')
-    .option('-a, --all', 'Show all genboxes across all projects')
-    .option('--terminated', 'Include terminated genboxes')
-    .option('--json', 'Output as JSON (for scripting)')
-    .addHelpText('after', '\nAliases: gb ls')
-    .action(async (options) => {
-    try {
-        const projectName = (0, genbox_selector_1.getProjectContext)();
-        const projectPath = (0, genbox_selector_1.isInProjectContext)() ? process.cwd() : undefined;
-        // JSON output mode - use legacy detailed format
-        if (options.json) {
-            const [cloudGenboxes, localSessions] = await Promise.all([
-                (0, genbox_selector_1.getGenboxes)({ all: options.all, includeTerminated: options.terminated }).catch(() => []),
-                getLocalGenboxesForJson(projectName, options.all),
-            ]);
-            const trackedNames = new Set(localSessions.map(s => s.name));
-            for (const s of localSessions) {
-                if (s.vmName)
-                    trackedNames.add(s.vmName);
+/**
+ * Render a cloud genbox with detailed billing/status info
+ */
+function renderCloudGenbox(genbox, nameWidth, showProject) {
+    const statusColor = genbox.status === 'running' ? chalk_1.default.green :
+        genbox.status === 'terminated' ? chalk_1.default.red :
+            genbox.status === 'provisioning' ? chalk_1.default.cyan : chalk_1.default.yellow;
+    // Show project info when listing all
+    const projectSuffix = showProject && genbox.project ? ` [${genbox.project}]` : '';
+    const nameWithProject = genbox.name + projectSuffix;
+    // 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();
+        // 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;
+            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 = chalk_1.default.dim(` hour ends in ${timeStr}`);
             }
-            const orphanedGenboxes = detectOrphanedGenboxes(trackedNames);
-            const cloudOutput = cloudGenboxes.map(g => ({
-                name: g.name,
-                type: 'cloud',
-                status: g.status,
-                ipAddress: g.ipAddress,
-                size: g.size,
-                project: g.project,
-                createdAt: g.createdAt,
-                autoDestroyOnInactivity: g.autoDestroyOnInactivity,
-                protectedUntil: g.protectedUntil,
-            }));
-            const localOutput = localSessions.map(s => ({
-                name: s.name,
-                type: 'local',
-                status: s.apps.some((a) => a.status === 'running') ? 'running' : 'stopped',
-                isolation: s.isolation,
-                size: s.size,
-                project: s.projectName,
-                createdAt: s.createdAt,
-            }));
-            const orphanedOutput = orphanedGenboxes.map(o => ({
-                name: o.name,
-                type: 'orphaned',
-                status: o.state === 'Running' ? 'running' : 'stopped',
-                isolation: o.type,
-                ipAddress: o.ipAddress,
-                cpus: o.cpus,
-                memoryGB: o.memoryGB,
-                diskGB: o.diskGB,
-            }));
-            console.log(JSON.stringify([...cloudOutput, ...localOutput, ...orphanedOutput], null, 2));
-            return;
         }
-        // Use unified display format
-        const result = await (0, unified_session_1.listAllSessions)({
-            projectPath: options.all ? undefined : projectPath,
-            includeEnded: options.terminated,
-        });
-        // Check for orphaned VMs/containers
-        const trackedNames = new Set(result.sessions.map(s => s.name));
-        const orphanedGenboxes = detectOrphanedGenboxes(trackedNames);
-        // Display unified format
-        (0, unified_session_1.displaySessions)(result, { terminology: 'genboxes' });
-        // Show ORPHANED genboxes section if any
-        if (orphanedGenboxes.length > 0) {
-            console.log(chalk_1.default.yellow.bold('  Orphaned VMs/Containers:'));
-            console.log(chalk_1.default.dim('  ' + '─'.repeat(70)));
-            const orphanedNameWidth = Math.max(12, ...orphanedGenboxes.map(o => o.name.length));
-            for (const orphan of orphanedGenboxes) {
-                renderOrphanedGenbox(orphan, orphanedNameWidth);
+        else {
+            endHourInfo = chalk_1.default.red(' hour ending...');
+        }
+    }
+    // Show auto-destroy status (not applicable for stopped/terminated)
+    let protectedInfo = '';
+    if (genbox.status === 'stopped') {
+        // Show snapshot status if available
+        if (genbox.snapshot) {
+            if (genbox.snapshot.status === 'creating') {
+                const progress = genbox.snapshot.progress || 0;
+                protectedInfo = chalk_1.default.yellow(` (snapshot: ${progress}%)`);
+            }
+            else if (genbox.snapshot.status === 'ready') {
+                protectedInfo = chalk_1.default.dim(' -> gb start to resume (instant)');
+            }
+            else {
+                protectedInfo = chalk_1.default.dim(' -> gb start to resume');
             }
-            console.log('');
-            console.log(chalk_1.default.yellow(`  ${orphanedGenboxes.length} orphaned VM/container(s) found.`));
-            console.log(chalk_1.default.dim(`  These exist in ${chalk_1.default.cyan('Multipass/Docker')} but aren't tracked by genbox.`));
-            console.log(chalk_1.default.dim(`  Use ${chalk_1.default.cyan('gb delete <name>')} to clean them up.`));
-            console.log('');
         }
-        // Hint for --all
-        if (projectName && !options.all) {
-            console.log(chalk_1.default.dim(`  Use ${chalk_1.default.cyan('--all')} to see genboxes from all projects.`));
-            console.log('');
+        else {
+            protectedInfo = chalk_1.default.dim(' -> gb start to resume');
         }
-        // Force exit since fetch may leave connections open
-        process.exit(0);
     }
-    catch (error) {
-        if (error instanceof api_1.AuthenticationError) {
-            (0, api_1.handleApiError)(error);
-            process.exit(1);
+    else if (genbox.status === 'provisioning') {
+        // Show restore progress if available
+        if (genbox.restoreProgress) {
+            const progress = genbox.restoreProgress.progress || 0;
+            const source = genbox.restoreProgress.bootSource || 'snapshot';
+            if (progress < 100) {
+                protectedInfo = chalk_1.default.cyan(` (restoring from ${source}: ${progress}%)`);
+            }
+            else {
+                protectedInfo = chalk_1.default.cyan(' (booting...)');
+            }
+        }
+        else {
+            protectedInfo = chalk_1.default.cyan(' (provisioning...)');
         }
-        console.error(chalk_1.default.red(`Error: ${error.message}`));
-        process.exit(1);
     }
-});
+    else if (genbox.status === 'terminated') {
+        // No extra info for terminated
+    }
+    else 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 {
+        // Check if auto-destroy is paused due to recent activity
+        const now = new Date();
+        const minutesInactive = genbox.lastActivityAt
+            ? Math.floor((now.getTime() - new Date(genbox.lastActivityAt).getTime()) / (60 * 1000))
+            : 999; // Assume inactive if no activity data
+        if (minutesInactive < 5) {
+            protectedInfo = chalk_1.default.green(' [auto-destroy paused]');
+        }
+        else {
+            protectedInfo = chalk_1.default.dim(' [auto-destroy]');
+        }
+    }
+    const namePart = chalk_1.default.cyan(nameWithProject.padEnd(nameWidth));
+    const statusPart = statusColor(genbox.status.padEnd(14));
+    // Show appropriate IP text based on status
+    let ipText = genbox.ipAddress || 'Pending IP';
+    if (!genbox.ipAddress) {
+        if (genbox.status === 'stopped') {
+            ipText = '(paused)';
+        }
+        else if (genbox.status === 'terminated') {
+            ipText = '-';
+        }
+    }
+    const ipPart = chalk_1.default.dim(ipText.padEnd(16));
+    const sizePart = chalk_1.default.dim(`(${genbox.size})`);
+    const extraInfo = endHourInfo + protectedInfo;
+    console.log(`  ${namePart} ${statusPart} ${ipPart} ${sizePart}${extraInfo}`);
+    // Show URL if available
+    if (genbox.urls && Object.keys(genbox.urls).length > 0) {
+        const firstUrl = Object.values(genbox.urls)[0];
+        console.log(chalk_1.default.dim(`  ${''.padEnd(nameWidth)} └─ ${firstUrl}`));
+    }
+}
 /**
- * Get local genboxes for JSON output (preserves legacy format)
+ * Render a local genbox
  */
-async function getLocalGenboxesForJson(projectName, showAll) {
+function renderLocalGenbox(session, nameWidth) {
+    const isRunning = session.apps.some(a => a.status === 'running');
+    const status = isRunning ? 'running' : 'stopped';
+    const statusColor = isRunning ? chalk_1.default.green : chalk_1.default.red;
+    const namePart = chalk_1.default.magenta(session.name.padEnd(nameWidth));
+    const statusPart = statusColor(status.padEnd(14));
+    const typePart = chalk_1.default.dim(`(${session.isolation})`.padEnd(16));
+    const sizePart = chalk_1.default.dim(`(${session.size})`);
+    console.log(`  ${namePart} ${statusPart} ${typePart} ${sizePart}`);
+}
+/**
+ * Render an orphaned VM/container in the list
+ */
+function renderOrphanedGenbox(orphan, nameWidth) {
+    const status = orphan.state === 'Running' || orphan.state === 'running' ? 'running' : 'stopped';
+    const statusColor = status === 'running' ? chalk_1.default.green : chalk_1.default.red;
+    const namePart = chalk_1.default.yellow(orphan.name.padEnd(nameWidth));
+    const statusPart = statusColor(status.padEnd(14));
+    const typePart = chalk_1.default.dim(`orphaned/${orphan.type}`.padEnd(16));
+    // Show resource info if available
+    let resourcePart = '';
+    if (orphan.cpus || orphan.memoryGB) {
+        const parts = [];
+        if (orphan.cpus)
+            parts.push(`${orphan.cpus} CPU`);
+        if (orphan.memoryGB)
+            parts.push(`${orphan.memoryGB}GB`);
+        if (orphan.diskGB)
+            parts.push(`${orphan.diskGB}GB disk`);
+        resourcePart = chalk_1.default.dim(` (${parts.join(', ')})`);
+    }
+    console.log(`  ${namePart} ${statusPart} ${typePart}${resourcePart}`);
+}
+/**
+ * Get local genboxes
+ */
+function getLocalGenboxes(projectName, showAll) {
     const sessions = [];
     const seenNames = new Set();
     // Get sessions from LocalGenboxProvisioner (for legacy local genboxes)
@@ -288,26 +353,156 @@ async function getLocalGenboxesForJson(projectName, showAll) {
     }
     return sessions;
 }
-/**
- * Render an orphaned VM/container in the list
- */
-function renderOrphanedGenbox(orphan, nameWidth) {
-    const status = orphan.state === 'Running' || orphan.state === 'running' ? 'running' : 'stopped';
-    const statusColor = status === 'running' ? chalk_1.default.green : chalk_1.default.red;
-    const namePart = chalk_1.default.yellow(orphan.name.padEnd(nameWidth));
-    const statusPart = statusColor(status.padEnd(12));
-    const typePart = chalk_1.default.dim(`orphaned/${orphan.type}`.padEnd(18));
-    // Show resource info if available
-    let resourcePart = '';
-    if (orphan.cpus || orphan.memoryGB) {
+exports.listCommand = new commander_1.Command('list')
+    .alias('ls')
+    .description('List genboxes (scoped to current project by default)')
+    .option('-a, --all', 'Show all genboxes across all projects')
+    .option('--terminated', 'Include terminated genboxes')
+    .option('--json', 'Output as JSON (for scripting)')
+    .addHelpText('after', '\nAliases: gb ls')
+    .action(async (options) => {
+    try {
+        const projectName = (0, genbox_selector_1.getProjectContext)();
+        // Fetch cloud and local genboxes in parallel
+        const [cloudGenboxes, localSessions] = await Promise.all([
+            (0, genbox_selector_1.getGenboxes)({ all: options.all, includeTerminated: options.terminated }).catch(() => []),
+            Promise.resolve(getLocalGenboxes(projectName, options.all)),
+        ]);
+        // Track names for orphan detection
+        const trackedNames = new Set();
+        for (const g of cloudGenboxes)
+            trackedNames.add(g.name);
+        for (const s of localSessions) {
+            trackedNames.add(s.name);
+            if (s.vmName)
+                trackedNames.add(s.vmName);
+        }
+        const orphanedGenboxes = detectOrphanedGenboxes(trackedNames);
+        // JSON output mode
+        if (options.json) {
+            const cloudOutput = cloudGenboxes.map(g => ({
+                name: g.name,
+                type: 'cloud',
+                status: g.status,
+                ipAddress: g.ipAddress,
+                size: g.size,
+                project: g.project,
+                urls: g.urls,
+                createdAt: g.createdAt,
+                currentHourEnd: g.currentHourEnd,
+                autoDestroyOnInactivity: g.autoDestroyOnInactivity,
+                protectedUntil: g.protectedUntil,
+            }));
+            const localOutput = localSessions.map(s => ({
+                name: s.name,
+                type: 'local',
+                status: s.apps.some((a) => a.status === 'running') ? 'running' : 'stopped',
+                isolation: s.isolation,
+                size: s.size,
+                project: s.projectName,
+                createdAt: s.createdAt,
+            }));
+            const orphanedOutput = orphanedGenboxes.map(o => ({
+                name: o.name,
+                type: 'orphaned',
+                status: o.state === 'Running' ? 'running' : 'stopped',
+                isolation: o.type,
+                ipAddress: o.ipAddress,
+                cpus: o.cpus,
+                memoryGB: o.memoryGB,
+                diskGB: o.diskGB,
+            }));
+            console.log(JSON.stringify([...cloudOutput, ...localOutput, ...orphanedOutput], null, 2));
+            process.exit(0);
+        }
+        // Calculate name width
+        const allNames = [
+            ...cloudGenboxes.map(g => g.name + (options.all && g.project ? ` [${g.project}]` : '')),
+            ...localSessions.map(s => s.name),
+            ...orphanedGenboxes.map(o => o.name),
+        ];
+        const nameWidth = Math.max(18, ...allNames.map(n => n.length));
+        // No genboxes found
+        if (cloudGenboxes.length === 0 && localSessions.length === 0 && orphanedGenboxes.length === 0) {
+            console.log('');
+            if (projectName && !options.all) {
+                console.log(chalk_1.default.yellow(`  No genboxes found for project '${projectName}'.`));
+                console.log('');
+                console.log(chalk_1.default.dim('  Create one with:'));
+                console.log(chalk_1.default.cyan('    $ gb new'));
+                console.log('');
+                console.log(chalk_1.default.dim(`  Or see all genboxes with:`));
+                console.log(chalk_1.default.cyan('    $ gb ls --all'));
+            }
+            else {
+                console.log(chalk_1.default.yellow('  No genboxes found.'));
+                console.log('');
+                console.log(chalk_1.default.dim('  Create one with:'));
+                console.log(chalk_1.default.cyan('    $ gb new'));
+            }
+            console.log('');
+            process.exit(0);
+        }
+        console.log('');
+        // Sort cloud genboxes by createdAt (newest first)
+        cloudGenboxes.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;
+        });
+        // Display CLOUD genboxes
+        if (cloudGenboxes.length > 0) {
+            console.log(chalk_1.default.bold('  Cloud Genboxes:'));
+            console.log(chalk_1.default.dim('  ' + '─'.repeat(70)));
+            for (const genbox of cloudGenboxes) {
+                renderCloudGenbox(genbox, nameWidth, options.all);
+            }
+            console.log('');
+        }
+        // Display LOCAL genboxes
+        if (localSessions.length > 0) {
+            console.log(chalk_1.default.bold('  Local Genboxes:'));
+            console.log(chalk_1.default.dim('  ' + '─'.repeat(70)));
+            for (const session of localSessions) {
+                renderLocalGenbox(session, nameWidth);
+            }
+            console.log('');
+        }
+        // Display ORPHANED genboxes
+        if (orphanedGenboxes.length > 0) {
+            console.log(chalk_1.default.yellow.bold('  Orphaned VMs/Containers:'));
+            console.log(chalk_1.default.dim('  ' + '─'.repeat(70)));
+            for (const orphan of orphanedGenboxes) {
+                renderOrphanedGenbox(orphan, nameWidth);
+            }
+            console.log('');
+            console.log(chalk_1.default.yellow(`  ${orphanedGenboxes.length} orphaned VM/container(s) found.`));
+            console.log(chalk_1.default.dim(`  These exist in ${chalk_1.default.cyan('Multipass/Docker')} but aren't tracked by genbox.`));
+            console.log(chalk_1.default.dim(`  Use ${chalk_1.default.cyan('gb destroy <name>')} to clean them up.`));
+            console.log('');
+        }
+        // Summary
+        const total = cloudGenboxes.length + localSessions.length;
         const parts = [];
-        if (orphan.cpus)
-            parts.push(`${orphan.cpus} CPU`);
-        if (orphan.memoryGB)
-            parts.push(`${orphan.memoryGB}GB`);
-        if (orphan.diskGB)
-            parts.push(`${orphan.diskGB}GB disk`);
-        resourcePart = chalk_1.default.dim(` (${parts.join(', ')})`);
+        if (cloudGenboxes.length > 0)
+            parts.push(`${cloudGenboxes.length} cloud`);
+        if (localSessions.length > 0)
+            parts.push(`${localSessions.length} local`);
+        console.log(chalk_1.default.dim(`  ${total} genbox${total !== 1 ? 'es' : ''} (${parts.join(', ')})`));
+        // Hint for --all
+        if (projectName && !options.all) {
+            console.log(chalk_1.default.dim(`  Use ${chalk_1.default.cyan('--all')} to see genboxes from all projects.`));
+        }
+        console.log('');
+        // Force exit since fetch may leave connections open
+        process.exit(0);
     }
-    console.log(`${namePart} ${statusPart} ${typePart}${resourcePart}`);
-}
+    catch (error) {
+        if (error instanceof api_1.AuthenticationError) {
+            (0, api_1.handleApiError)(error);
+            process.exit(1);
+        }
+        console.error(chalk_1.default.red(`Error: ${error.message}`));
+        process.exit(1);
+    }
+});

package/package.json

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