genbox 1.0.214 → 1.0.217

package/dist/commands/rename.js

@@ -0,0 +1,201 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renameCommand = void 0;
+const commander_1 = require("commander");
+const chalk_1 = __importDefault(require("chalk"));
+const confirm_1 = __importDefault(require("@inquirer/confirm"));
+const select_1 = __importDefault(require("@inquirer/select"));
+const input_1 = __importDefault(require("@inquirer/input"));
+const ora_1 = __importDefault(require("ora"));
+const api_1 = require("../api");
+const genbox_selector_1 = require("../genbox-selector");
+const ssh_config_1 = require("../ssh-config");
+// Name validation regex - must be lowercase alphanumeric with optional hyphens
+const NAME_REGEX = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+exports.renameCommand = new commander_1.Command('rename')
+    .description('Rename a Genbox environment')
+    .argument('<name>', 'Current name of the Genbox')
+    .argument('<new-name>', 'New name for the Genbox')
+    .option('-y, --yes', 'Skip confirmation prompt')
+    .addHelpText('after', `
+Examples:
+  $ gb rename old-feature new-feature
+  $ gb rename my-env my-new-env -y
+  $ gb rename feat-1 feat-2
+
+Notes:
+  - The genbox name must be unique within the workspace
+  - Subdomain URLs will automatically update to use the new name
+  - SSH config will be updated (old alias removed, new alias added)
+`)
+    .action(async (name, newName, options) => {
+    try {
+        // Normalize and validate new name format
+        const normalizedNewName = newName.toLowerCase();
+        if (!NAME_REGEX.test(normalizedNewName)) {
+            console.log(chalk_1.default.red('Invalid name format'));
+            console.log(chalk_1.default.dim('  Name must be lowercase alphanumeric with optional hyphens'));
+            console.log(chalk_1.default.dim('  Cannot start or end with a hyphen'));
+            console.log(chalk_1.default.dim('  Examples: my-feature, feat-1, api'));
+            return;
+        }
+        if (normalizedNewName.length < 2 || normalizedNewName.length > 63) {
+            console.log(chalk_1.default.red('Name must be between 2 and 63 characters'));
+            return;
+        }
+        // Find the genbox by name
+        const { genbox, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
+            selectMessage: 'Select genbox to rename:',
+        });
+        if (cancelled || !genbox) {
+            console.log(chalk_1.default.dim('Cancelled.'));
+            return;
+        }
+        // Check if same name
+        if (genbox.name === normalizedNewName) {
+            console.log(chalk_1.default.yellow('New name is the same as current name'));
+            return;
+        }
+        // Check if terminated
+        if (genbox.status === 'terminated') {
+            console.log(chalk_1.default.red('Cannot rename a terminated genbox'));
+            return;
+        }
+        // Check name availability BEFORE confirmation
+        let finalNewName = normalizedNewName;
+        const checkResult = await (0, api_1.fetchApi)(`/genboxes/check-name?name=${encodeURIComponent(normalizedNewName)}&workspace=${encodeURIComponent(genbox.workspace || 'default')}`);
+        if (!checkResult.available) {
+            console.log(chalk_1.default.red(`Name '${normalizedNewName}' is already in use in workspace '${genbox.workspace || 'default'}'`));
+            // Interactive selection of alternatives
+            if (checkResult.suggestions && checkResult.suggestions.length > 0) {
+                console.log('');
+                const choices = [
+                    ...checkResult.suggestions.map((s) => ({
+                        name: s,
+                        value: s,
+                    })),
+                    {
+                        name: chalk_1.default.dim('Enter custom name...'),
+                        value: '__custom__',
+                    },
+                    {
+                        name: chalk_1.default.dim('Cancel'),
+                        value: '__cancel__',
+                    },
+                ];
+                const selected = await (0, select_1.default)({
+                    message: 'Select an alternative name:',
+                    choices,
+                });
+                if (selected === '__cancel__') {
+                    console.log(chalk_1.default.dim('Cancelled.'));
+                    return;
+                }
+                if (selected === '__custom__') {
+                    const customName = await (0, input_1.default)({
+                        message: 'Enter new name:',
+                        validate: (value) => {
+                            const normalized = value.toLowerCase();
+                            if (!NAME_REGEX.test(normalized)) {
+                                return 'Name must be lowercase alphanumeric with optional hyphens';
+                            }
+                            if (normalized.length < 2 || normalized.length > 63) {
+                                return 'Name must be between 2 and 63 characters';
+                            }
+                            return true;
+                        },
+                    });
+                    // Check if custom name is available
+                    const customCheck = await (0, api_1.fetchApi)(`/genboxes/check-name?name=${encodeURIComponent(customName.toLowerCase())}&workspace=${encodeURIComponent(genbox.workspace || 'default')}`);
+                    if (!customCheck.available) {
+                        console.log(chalk_1.default.red(`Name '${customName}' is also taken. Please try again.`));
+                        return;
+                    }
+                    finalNewName = customName.toLowerCase();
+                }
+                else {
+                    finalNewName = selected;
+                }
+            }
+            else {
+                // No suggestions available
+                return;
+            }
+        }
+        // Show current info
+        console.log('');
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log(`  ${chalk_1.default.bold('Current name:')} ${genbox.name}`);
+        console.log(`  ${chalk_1.default.bold('New name:')}     ${chalk_1.default.cyan(finalNewName)}`);
+        console.log(`  ${chalk_1.default.bold('Workspace:')}    ${genbox.workspace || 'default'}`);
+        console.log(`  ${chalk_1.default.bold('Status:')}       ${genbox.status}`);
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log('');
+        // Confirm rename
+        let confirmed = options.yes;
+        if (!confirmed) {
+            confirmed = await (0, confirm_1.default)({
+                message: `Rename genbox from '${genbox.name}' to '${finalNewName}'?`,
+                default: true,
+            });
+        }
+        if (!confirmed) {
+            console.log(chalk_1.default.dim('Cancelled.'));
+            return;
+        }
+        // Perform rename via API
+        const spinner = (0, ora_1.default)(`Renaming '${genbox.name}' to '${finalNewName}'...`).start();
+        const result = await (0, api_1.fetchApi)(`/genboxes/${genbox._id}/rename`, {
+            method: 'PATCH',
+            body: JSON.stringify({ newName: finalNewName }),
+        });
+        // Check for error response
+        if (result.error) {
+            spinner.fail(chalk_1.default.red(result.message || 'Failed to rename genbox'));
+            return;
+        }
+        // Update SSH config - remove old, add new
+        const oldName = result.oldName || genbox.name;
+        (0, ssh_config_1.removeSshConfigEntry)(oldName);
+        if (genbox.ipAddress) {
+            (0, ssh_config_1.addSshConfigEntry)({
+                name: finalNewName,
+                ipAddress: genbox.ipAddress,
+            });
+        }
+        spinner.succeed(chalk_1.default.green(`Renamed '${oldName}' to '${finalNewName}'`));
+        // Display new URLs
+        if (result.urls && Object.keys(result.urls).length > 0) {
+            console.log('');
+            console.log(chalk_1.default.bold('New URLs:'));
+            for (const [service, url] of Object.entries(result.urls)) {
+                console.log(`  ${chalk_1.default.cyan(service.padEnd(12))} ${url}`);
+            }
+        }
+        // Display SSH info
+        console.log('');
+        console.log(chalk_1.default.bold('SSH Access:'));
+        console.log(`  ${chalk_1.default.dim('Old alias:')} ${chalk_1.default.strikethrough((0, ssh_config_1.getSshAlias)(oldName))}`);
+        console.log(`  ${chalk_1.default.dim('New alias:')} ${chalk_1.default.cyan((0, ssh_config_1.getSshAlias)(finalNewName))}`);
+        // Display helpful commands
+        console.log('');
+        console.log(chalk_1.default.bold('Commands:'));
+        console.log(`  Connect: ${chalk_1.default.cyan(`gb connect ${finalNewName}`)}`);
+        console.log(`  Status:  ${chalk_1.default.cyan(`gb status ${finalNewName}`)}`);
+    }
+    catch (error) {
+        // Handle user cancellation (Ctrl+C)
+        if (error.name === 'ExitPromptError' || error.message?.includes('force closed')) {
+            console.log(chalk_1.default.dim('\nCancelled.'));
+            return;
+        }
+        if (error instanceof api_1.AuthenticationError) {
+            (0, api_1.handleApiError)(error);
+            return;
+        }
+        console.error(chalk_1.default.red(`Error: ${error.message}`));
+    }
+});

package/dist/commands/session/logs.js

@@ -50,11 +50,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sessionLogsCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const fs = __importStar(require("fs"));
 const unified_session_1 = require("../../lib/unified-session");
 const api_1 = require("../../api");
+/**
+ * Query genbox daemon directly via SSH to get session data
+ */
+async function queryGenboxDaemon(genboxName, sessionName) {
+    try {
+        const result = (0, child_process_1.execSync)(`ssh genbox-${genboxName} 'curl -s http://127.0.0.1:47191/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47192/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47193/api/storage/sessions 2>/dev/null' 2>/dev/null`, { encoding: 'utf8', timeout: 10000 });
+        const data = JSON.parse(result);
+        const sessions = data.sessions || [];
+        if (sessionName && sessions.length > 0) {
+            const provider = sessionName.split('-')[0];
+            return sessions.find((s) => s.provider === provider) || sessions[0];
+        }
+        return sessions[0] || null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Query genbox daemon for events via SSH
+ */
+async function queryGenboxDaemonEvents(genboxName, sessionId, limit = 50) {
+    try {
+        const result = (0, child_process_1.execSync)(`ssh genbox-${genboxName} 'curl -s "http://127.0.0.1:47191/api/storage/events?sessionId=${sessionId}&limit=${limit}" 2>/dev/null || curl -s "http://127.0.0.1:47192/api/storage/events?sessionId=${sessionId}&limit=${limit}" 2>/dev/null' 2>/dev/null`, { encoding: 'utf8', timeout: 10000 });
+        const data = JSON.parse(result);
+        return data.events || [];
+    }
+    catch {
+        return [];
+    }
+}
 /**
  * Get SSH key path
  */
@@ -356,10 +388,92 @@ Examples:
             process.exit(1);
         }
         if (found.remoteSession) {
-            console.log(chalk_1.default.yellow(`\nRemote session: ${found.remoteSession.name}`));
+            // Query daemon for session data and events
+            const daemonSession = await queryGenboxDaemon(found.remoteSession.genboxName, found.remoteSession.name);
+            if (!daemonSession) {
+                console.log(chalk_1.default.yellow(`\nRemote session: ${found.remoteSession.name}`));
+                console.log(chalk_1.default.dim(`Running on: ${found.remoteSession.genboxName}`));
+                console.log(chalk_1.default.dim('\nNo data available from daemon. Session may be starting up.'));
+                console.log(chalk_1.default.cyan(`\n  gb ${found.remoteSession.name.split('-')[0]} attach ${found.remoteSession.name}\n`));
+                process.exit(0);
+            }
+            const events = await queryGenboxDaemonEvents(found.remoteSession.genboxName, daemonSession.id, parseInt(options.tail || '50'));
+            if (options.json) {
+                console.log(JSON.stringify({ session: daemonSession, events }, null, 2));
+                process.exit(0);
+            }
+            if (options.events) {
+                // Show events from daemon
+                console.log(chalk_1.default.bold(`\nSession Events: ${found.remoteSession.name}`));
+                console.log(chalk_1.default.dim(`Running on: ${found.remoteSession.genboxName}`));
+                console.log(chalk_1.default.dim('─'.repeat(70)));
+                if (events.length === 0) {
+                    console.log(chalk_1.default.dim('\nNo events recorded yet.'));
+                    console.log(chalk_1.default.dim('Events will appear as Claude/Gemini processes prompts.\n'));
+                }
+                else {
+                    for (const evt of events.reverse()) {
+                        const icon = getEventIcon(evt.type);
+                        const time = chalk_1.default.dim(`[${formatTime(evt.createdAt)}]`);
+                        const eventLabel = (evt.type || '').replace(/_/g, ' ');
+                        let output = `${time} ${icon} ${eventLabel}`;
+                        if (evt.data) {
+                            if (evt.data.toolName) {
+                                output += chalk_1.default.cyan(` ${evt.data.toolName}`);
+                            }
+                            if (evt.data.currentState) {
+                                output += chalk_1.default.yellow(` → ${evt.data.currentState}`);
+                            }
+                        }
+                        console.log(output);
+                    }
+                }
+                console.log('');
+                process.exit(0);
+            }
+            // Show session info and recent activity
+            console.log(chalk_1.default.bold(`\nSession: ${found.remoteSession.name}`));
             console.log(chalk_1.default.dim(`Running on: ${found.remoteSession.genboxName}`));
-            console.log(chalk_1.default.dim('\nRemote sessions must be attached to view logs.'));
-            console.log(chalk_1.default.cyan(`\n  gb ${found.remoteSession.name.split('-')[0]} attach ${found.remoteSession.name}\n`));
+            console.log(chalk_1.default.dim('─'.repeat(70)));
+            // Session status
+            const statusIcon = daemonSession.status === 'active' ? chalk_1.default.green('●') :
+                daemonSession.status === 'idle' ? chalk_1.default.yellow('●') : chalk_1.default.green('●');
+            console.log(`  Status:   ${statusIcon} ${daemonSession.status || 'running'}`);
+            if (daemonSession.currentState) {
+                const stateLabel = daemonSession.currentState.replace(/_/g, ' ');
+                console.log(`  State:    ${stateLabel}${daemonSession.currentToolName ? ` (${daemonSession.currentToolName})` : ''}`);
+            }
+            console.log(`  Messages: ${daemonSession.messageCount || 0} total (${daemonSession.userPromptCount || 0} user, ${daemonSession.assistantResponseCount || 0} assistant)`);
+            console.log(`  Tools:    ${daemonSession.toolUseCount || 0} calls`);
+            if (daemonSession.totalInputTokens || daemonSession.totalOutputTokens) {
+                console.log(`  Tokens:   ${daemonSession.totalInputTokens || 0} in / ${daemonSession.totalOutputTokens || 0} out`);
+            }
+            if (daemonSession.estimatedCostUsd) {
+                console.log(`  Cost:     $${daemonSession.estimatedCostUsd.toFixed(2)}`);
+            }
+            // Show recent events
+            if (events.length > 0) {
+                console.log(chalk_1.default.dim('\n─'.repeat(70)));
+                console.log(chalk_1.default.dim('Recent activity:'));
+                for (const evt of events.slice(0, 10).reverse()) {
+                    const icon = getEventIcon(evt.type);
+                    const time = chalk_1.default.dim(`[${formatTime(evt.createdAt)}]`);
+                    const eventLabel = (evt.type || '').replace(/_/g, ' ');
+                    let output = `  ${time} ${icon} ${eventLabel}`;
+                    if (evt.data?.toolName)
+                        output += chalk_1.default.cyan(` ${evt.data.toolName}`);
+                    console.log(output);
+                }
+                if (events.length > 10) {
+                    console.log(chalk_1.default.dim(`  ... and ${events.length - 10} more events`));
+                }
+            }
+            console.log('');
+            console.log(chalk_1.default.dim('Commands:'));
+            const provider = found.remoteSession.name.split('-')[0];
+            console.log(chalk_1.default.dim('  ') + chalk_1.default.cyan(`gb session logs ${found.remoteSession.name} --events`) + chalk_1.default.dim(' # Full event log'));
+            console.log(chalk_1.default.dim('  ') + chalk_1.default.cyan(`gb ${provider} attach ${found.remoteSession.name}`) + chalk_1.default.dim('       # Attach to session'));
+            console.log('');
             process.exit(0);
         }
         const session = found.session;

package/dist/commands/session/show.js

@@ -16,8 +16,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sessionShowCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
 const unified_session_1 = require("../../lib/unified-session");
 const api_1 = require("../../api");
+/**
+ * Query genbox daemon directly via SSH to get session data
+ */
+async function queryGenboxDaemon(genboxName, sessionName) {
+    try {
+        const result = (0, child_process_1.execSync)(`ssh genbox-${genboxName} 'curl -s http://127.0.0.1:47191/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47192/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47193/api/storage/sessions 2>/dev/null' 2>/dev/null`, { encoding: 'utf8', timeout: 10000 });
+        const data = JSON.parse(result);
+        const sessions = data.sessions || [];
+        if (sessionName && sessions.length > 0) {
+            // Find matching session by name prefix (e.g., "claude-e2e-test" matches provider "claude")
+            const provider = sessionName.split('-')[0];
+            return sessions.find((s) => s.provider === provider) || sessions[0];
+        }
+        return sessions[0] || null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Query genbox daemon for events
+ */
+async function queryGenboxDaemonEvents(genboxName, limit = 50) {
+    try {
+        const result = (0, child_process_1.execSync)(`ssh genbox-${genboxName} 'curl -s "http://127.0.0.1:47191/api/storage/events?limit=${limit}" 2>/dev/null || curl -s "http://127.0.0.1:47192/api/storage/events?limit=${limit}" 2>/dev/null' 2>/dev/null`, { encoding: 'utf8', timeout: 10000 });
+        const data = JSON.parse(result);
+        return data.events || [];
+    }
+    catch {
+        return [];
+    }
+}
 /**
  * Find session by name or ID
  */
@@ -298,20 +331,86 @@ Examples:
             process.exit(1);
         }
         if (found.remoteSession) {
-            // Remote session - limited info
+            // Remote session - query daemon for live data
+            const daemonSession = await queryGenboxDaemon(found.remoteSession.genboxName, found.remoteSession.name);
             if (options.json) {
-                console.log(JSON.stringify(found.remoteSession, null, 2));
+                console.log(JSON.stringify({
+                    ...found.remoteSession,
+                    daemonData: daemonSession || undefined,
+                }, null, 2));
+                process.exit(0);
             }
-            else {
-                console.log(chalk_1.default.bold(`\nRemote Session: ${found.remoteSession.name}`));
-                console.log(chalk_1.default.dim('─'.repeat(50)));
-                console.log(`  Genbox:    ${found.remoteSession.genboxName}`);
-                console.log(`  IP:        ${found.remoteSession.ipAddress}`);
-                console.log(`  Status:    ${chalk_1.default.green('running')}`);
+            console.log('');
+            // Header section
+            const headerContent = [''];
+            const statusIcon = daemonSession?.status === 'active' ? chalk_1.default.green('●') :
+                daemonSession?.status === 'idle' ? chalk_1.default.yellow('●') : chalk_1.default.green('●');
+            headerContent.push(`  ${statusIcon} Status:     ${chalk_1.default.bold(daemonSession?.status || 'running')}`);
+            if (daemonSession?.currentState) {
+                const stateLabel = daemonSession.currentState.replace(/_/g, ' ');
+                const stateIcon = getStateIcon(daemonSession.currentState);
+                headerContent.push(`  ${stateIcon} State:      ${chalk_1.default.cyan(stateLabel)}${daemonSession.currentToolName ? ` (${daemonSession.currentToolName})` : ''}`);
+            }
+            headerContent.push(`     Provider:   ${chalk_1.default.magenta(daemonSession?.provider || found.remoteSession.name.split('-')[0])}`);
+            headerContent.push(`     Type:       cloud`);
+            headerContent.push(`     Genbox:     ${chalk_1.default.cyan(found.remoteSession.genboxName)}`);
+            headerContent.push(`     IP:         ${found.remoteSession.ipAddress}`);
+            if (daemonSession?.projectPath) {
+                headerContent.push(`     Project:    ${chalk_1.default.dim(daemonSession.projectPath)}`);
+            }
+            headerContent.push('');
+            renderBox(`Session: ${found.remoteSession.name}`, headerContent);
+            // Metrics section if daemon data available
+            if (daemonSession) {
                 console.log('');
-                console.log(chalk_1.default.dim('Attach to see full details:'));
-                console.log(chalk_1.default.cyan(`  gb session attach ${found.remoteSession.name}\n`));
+                const metricsContent = [''];
+                // Duration
+                const duration = daemonSession.startedAt
+                    ? formatDuration(Date.now() - daemonSession.startedAt)
+                    : '--';
+                metricsContent.push(`     Duration:       ${duration}`);
+                // Tokens
+                const inputTokens = daemonSession.totalInputTokens || 0;
+                const outputTokens = daemonSession.totalOutputTokens || 0;
+                const cacheTokens = daemonSession.totalCacheReadTokens || 0;
+                const cacheRate = calculateCacheHitRate(cacheTokens, inputTokens);
+                metricsContent.push(`     Tokens:         Input: ${formatTokens(inputTokens)}  Output: ${formatTokens(outputTokens)}  Cache: ${cacheRate}`);
+                // Context usage
+                if (daemonSession.contextTokens && daemonSession.maxContextTokens) {
+                    const contextPercent = ((daemonSession.contextTokens / daemonSession.maxContextTokens) * 100).toFixed(0);
+                    metricsContent.push(`     Context:        ${formatTokens(daemonSession.contextTokens)} / ${formatTokens(daemonSession.maxContextTokens)} (${contextPercent}%)`);
+                }
+                // Cost
+                if (daemonSession.estimatedCostUsd !== undefined) {
+                    metricsContent.push(`     Cost:           $${daemonSession.estimatedCostUsd.toFixed(2)} USD`);
+                }
+                // Messages
+                metricsContent.push(`     Messages:       User: ${daemonSession.userPromptCount || 0}  Assistant: ${daemonSession.assistantResponseCount || 0}`);
+                // Tools
+                if (daemonSession.toolUseCount) {
+                    metricsContent.push(`     Tools:          ${daemonSession.toolUseCount} total`);
+                }
+                metricsContent.push('');
+                renderBox('Metrics', metricsContent);
+            }
+            // Last message preview
+            if (daemonSession?.lastMessagePreview) {
+                console.log('');
+                const previewContent = [
+                    '',
+                    `     ${chalk_1.default.italic(daemonSession.lastMessagePreview.substring(0, 200))}${daemonSession.lastMessagePreview.length > 200 ? '...' : ''}`,
+                    '',
+                ];
+                renderBox('Last Message', previewContent);
             }
+            // Actions hint
+            console.log('');
+            console.log(chalk_1.default.dim('  Commands:'));
+            const provider = found.remoteSession.name.split('-')[0];
+            console.log(chalk_1.default.dim('    ') + chalk_1.default.cyan(`gb ${provider} attach ${found.remoteSession.name}`) + chalk_1.default.dim('  # Attach to session'));
+            console.log(chalk_1.default.dim('    ') + chalk_1.default.cyan(`gb session logs ${found.remoteSession.name} -f`) + chalk_1.default.dim('       # Follow logs'));
+            console.log(chalk_1.default.dim('    ') + chalk_1.default.cyan(`gb session send ${found.remoteSession.name}`) + chalk_1.default.dim('          # Send prompt'));
+            console.log('');
             process.exit(0);
         }
         const session = found.session;

package/dist/commands/session/watch.js

@@ -98,17 +98,59 @@ async function fetchLiveState(sessionId) {
     }
 }
 /**
- * Fetch Claude sessions for a specific genbox from API
+ * Query genbox daemon directly via SSH to get live session data
+ * Uses /api/storage/sessions which returns sessions from SQLite with currentState, currentToolName, etc.
  */
-async function fetchGenboxSessions(genboxId) {
+async function queryGenboxDaemon(genboxName) {
     try {
-        const response = await (0, api_1.fetchApi)(`/claude/sessions/genbox/${genboxId}`);
-        return Array.isArray(response) ? response : [];
+        // Query the storage sessions endpoint for richer session data
+        const result = (0, child_process_1.execSync)(`ssh genbox-${genboxName} 'curl -s http://127.0.0.1:47191/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47192/api/storage/sessions 2>/dev/null || curl -s http://127.0.0.1:47193/api/storage/sessions 2>/dev/null' 2>/dev/null`, { encoding: 'utf8', timeout: 5000 });
+        const data = JSON.parse(result);
+        return data.sessions || [];
     }
     catch {
         return [];
     }
 }
+/**
+ * Fetch sessions for a specific genbox from API
+ * Queries both ClaudeSession (monitoring) and Session (sync) collections
+ */
+async function fetchGenboxSessions(genboxId) {
+    const allSessions = [];
+    try {
+        // Try ClaudeSession (monitoring) first
+        const claudeSessions = await (0, api_1.fetchApi)(`/claude/sessions/genbox/${genboxId}`);
+        if (Array.isArray(claudeSessions)) {
+            allSessions.push(...claudeSessions);
+        }
+    }
+    catch {
+        // Ignore errors
+    }
+    try {
+        // Query Session (sync) collection filtered by genboxId
+        const sessions = await (0, api_1.fetchApi)(`/sessions/v2?genboxId=${encodeURIComponent(genboxId)}&limit=50`);
+        if (sessions && Array.isArray(sessions.sessions)) {
+            allSessions.push(...sessions.sessions);
+        }
+    }
+    catch {
+        // Ignore errors - try unfiltered if genboxId filter not supported
+        try {
+            const sessions = await (0, api_1.fetchApi)(`/sessions/v2?limit=50`);
+            if (sessions && Array.isArray(sessions.sessions)) {
+                // Fallback: filter locally by genboxId or type=cloud
+                const cloudSessions = sessions.sessions.filter((s) => s.genboxId === genboxId || (s.type === 'cloud' && !s.genboxId));
+                allSessions.push(...cloudSessions);
+            }
+        }
+        catch {
+            // Ignore errors
+        }
+    }
+    return allSessions;
+}
 /**
  * Match a remote session name to an API session
  * Remote session names are like "claude-abc123" (from socket file)
@@ -198,17 +240,22 @@ async function collectSessionStates(options) {
     // Group remote sessions by genbox to batch API calls
     const remoteByGenbox = new Map();
     for (const remote of result.remoteSessions) {
-        const key = remote.genboxId;
+        const key = remote.genboxName || remote.genboxId; // Use genboxName as primary key
         if (!remoteByGenbox.has(key)) {
             remoteByGenbox.set(key, []);
         }
         remoteByGenbox.get(key).push(remote);
     }
-    // Fetch API sessions for each genbox in parallel
+    // Fetch API sessions and daemon sessions for each genbox in parallel
     const genboxSessionsMap = new Map();
+    const genboxDaemonSessionsMap = new Map();
     await Promise.all(Array.from(remoteByGenbox.keys()).map(async (genboxId) => {
-        const apiSessions = await fetchGenboxSessions(genboxId);
+        const [apiSessions, daemonSessions] = await Promise.all([
+            fetchGenboxSessions(genboxId),
+            queryGenboxDaemon(genboxId),
+        ]);
         genboxSessionsMap.set(genboxId, apiSessions);
+        genboxDaemonSessionsMap.set(genboxId, daemonSessions);
     }));
     for (const remote of result.remoteSessions) {
         // Filter by genbox if specified
@@ -220,25 +267,39 @@ async function collectSessionStates(options) {
         // Remote sessions are running by definition (we found their socket)
         if (options.status === 'stopped')
             continue;
-        // Try to match this remote session to an API session (ClaudeSession)
-        const apiSessions = genboxSessionsMap.get(remote.genboxId) || [];
+        // Try to match this remote session to API or daemon sessions
+        const genboxKey = remote.genboxName || remote.genboxId;
+        const apiSessions = genboxSessionsMap.get(genboxKey) || [];
+        const daemonSessions = genboxDaemonSessionsMap.get(genboxKey) || [];
         const matchedApiSession = matchRemoteSessionToApiSession(remote.name, apiSessions);
-        // ClaudeSession has status: 'active', 'idle', 'waiting_input', 'error', 'ended'
-        // Map to our display states
-        const apiStatus = matchedApiSession?.status;
+        // Find the most recent active daemon session for live state
+        // Daemon sessions have currentState and currentToolName which are most accurate
+        const activeDaemonSessions = daemonSessions.filter((s) => s.status === 'active' || s.status === 'idle' ||
+            s.currentState === 'executing_tool' || s.currentState === 'thinking' || s.currentState === 'waiting_for_input');
+        // Sort by lastActivityAt desc to get the most recent
+        activeDaemonSessions.sort((a, b) => (b.lastActivityAt || 0) - (a.lastActivityAt || 0));
+        const daemonSession = activeDaemonSessions[0] || daemonSessions[0];
         let displayStatus = 'running';
         let displayState;
-        if (matchedApiSession) {
-            // We have API data - use it
+        let currentTool;
+        // Prefer daemon data for live state (most accurate)
+        if (daemonSession?.currentState) {
+            displayState = daemonSession.currentState;
+            currentTool = daemonSession.currentToolName;
+            displayStatus = daemonSession.status === 'active' ? 'running' :
+                daemonSession.status === 'idle' ? 'idle' : 'running';
+        }
+        else if (matchedApiSession) {
+            // Fall back to API data
+            const apiStatus = matchedApiSession.status;
             switch (apiStatus) {
                 case 'active':
+                case 'running':
                     displayStatus = 'running';
-                    displayState = 'thinking';
+                    displayState = matchedApiSession.currentState || 'thinking';
+                    currentTool = matchedApiSession.currentToolName;
                     break;
                 case 'waiting_input':
-                    displayStatus = 'idle';
-                    displayState = 'waiting_for_input';
-                    break;
                 case 'idle':
                     displayStatus = 'idle';
                     displayState = 'waiting_for_input';
@@ -247,6 +308,7 @@ async function collectSessionStates(options) {
                     displayStatus = 'error';
                     break;
                 case 'ended':
+                case 'stopped':
                     displayStatus = 'stopped';
                     break;
                 default:
@@ -254,9 +316,9 @@ async function collectSessionStates(options) {
             }
         }
         else {
-            // No API data - session is running (we found socket) but state is unknown
+            // No data - session is running (we found socket) but state is unknown
             displayStatus = 'running';
-            displayState = undefined; // Will show as "idle" indicator but no state text
+            displayState = undefined;
         }
         states.push({
             id: matchedApiSession?.sessionId?.substring(0, 8) || remote.name.substring(0, 8),
@@ -266,12 +328,17 @@ async function collectSessionStates(options) {
             genbox: remote.genboxName,
             status: displayStatus,
             state: displayState,
-            currentTool: undefined, // ClaudeSession doesn't track current tool
-            lastMessage: matchedApiSession?.lastPrompt?.substring(0, 50),
-            duration: matchedApiSession?.createdAt ? formatDuration(matchedApiSession.createdAt) : '?',
-            createdAt: matchedApiSession?.createdAt,
-            toolCalls: matchedApiSession?.toolUseCount,
-            messagesCount: matchedApiSession?.promptCount,
+            currentTool: currentTool, // From daemon data
+            lastMessage: matchedApiSession?.lastPrompt?.substring(0, 50) || daemonSession?.lastMessagePreview?.substring(0, 50),
+            duration: matchedApiSession?.createdAt ? formatDuration(matchedApiSession.createdAt) :
+                daemonSession?.startedAt ? formatDuration(new Date(daemonSession.startedAt).toISOString()) : '?',
+            createdAt: matchedApiSession?.createdAt || (daemonSession?.startedAt ? new Date(daemonSession.startedAt).toISOString() : undefined),
+            tokens: daemonSession ? Math.round((daemonSession.totalInputTokens + daemonSession.totalOutputTokens) / 1000) : undefined,
+            inputTokens: daemonSession?.totalInputTokens,
+            outputTokens: daemonSession?.totalOutputTokens,
+            cost: daemonSession?.estimatedCostUsd,
+            toolCalls: daemonSession?.toolUseCount || matchedApiSession?.toolUseCount,
+            messagesCount: daemonSession?.messageCount || matchedApiSession?.promptCount,
         });
     }
     // Also add cloud genboxes that might have sessions we didn't scan
@@ -288,8 +355,9 @@ async function collectSessionStates(options) {
             continue;
         if (genbox.status === 'running' && options.status === 'stopped')
             continue;
+        const genboxId = genbox.id || genbox._id;
         states.push({
-            id: genbox.id.substring(0, 8),
+            id: genboxId?.substring(0, 8) || 'unknown',
             name: genbox.name,
             provider: 'claude', // Default, could be any
             type: 'cloud',
@@ -810,8 +878,14 @@ async function runTuiMode(options) {
         process.stdin.setEncoding('utf8');
         process.stdin.on('data', handleInput);
     }
-    // Initial render
+    // Initial render with debug
+    if (process.env.DEBUG) {
+        console.log(`[DEBUG] Fetching sessions...`);
+    }
     await render();
+    if (process.env.DEBUG) {
+        console.log(`[DEBUG] Loaded ${allSessionsCache.length} sessions, showing ${cachedSessions.length} after filters`);
+    }
     // Setup refresh interval (event-loop friendly)
     const refreshInterval = setInterval(async () => {
         if (running && inputMode === 'normal') {

package/dist/index.js

@@ -61,6 +61,7 @@ const validate_1 = require("./commands/validate");
 const migrate_1 = require("./commands/migrate");
 const ssh_setup_1 = require("./commands/ssh-setup");
 const rebuild_1 = require("./commands/rebuild");
+const rename_1 = require("./commands/rename");
 const extend_1 = require("./commands/extend");
 const cleanup_ssh_1 = require("./commands/cleanup-ssh");
 const restart_1 = require("./commands/restart");
@@ -152,6 +153,7 @@ const commandCategories = {
         { name: 'start', aliases: ['resume'], description: 'Start a stopped Genbox' },
         { name: 'stop', aliases: [], description: 'Stop a running Genbox' },
         { name: 'restart', aliases: [], description: 'Restart services in a Genbox' },
+        { name: 'rename', aliases: [], description: 'Rename a Genbox' },
         { name: 'extend', aliases: [], description: 'Extend Genbox lifetime' },
         { name: 'rebuild', aliases: [], description: 'Rebuild a Genbox with new config' },
     ],
@@ -297,6 +299,7 @@ program
     .addCommand(migrate_1.deprecationsCommand, { hidden: true })
     .addCommand(ssh_setup_1.sshSetupCommand, { hidden: true })
     .addCommand(rebuild_1.rebuildCommand)
+    .addCommand(rename_1.renameCommand)
     .addCommand(extend_1.extendCommand)
     .addCommand(cleanup_ssh_1.cleanupSshCommand, { hidden: true })
     .addCommand(restart_1.restartCommand)

package/package.json

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