genbox 1.0.213 → 1.0.215

package/dist/commands/session/watch.js

@@ -97,6 +97,61 @@ async function fetchLiveState(sessionId) {
         return null;
     }
 }
+/**
+ * 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 {
+        // Also query Session (sync) collection
+        const sessions = await (0, api_1.fetchApi)(`/sessions/v2?limit=50`);
+        if (sessions && Array.isArray(sessions.sessions)) {
+            // Filter to cloud type sessions that might belong to this genbox
+            const cloudSessions = sessions.sessions.filter((s) => s.type === 'cloud');
+            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)
+ * API sessions have dtachSocket paths like "/home/dev/.genbox/sockets/claude-abc123.sock"
+ */
+function matchRemoteSessionToApiSession(remoteName, apiSessions) {
+    for (const apiSession of apiSessions) {
+        // Match by socket path
+        if (apiSession.dtachSocket) {
+            const socketName = apiSession.dtachSocket.split('/').pop()?.replace('.sock', '');
+            if (socketName === remoteName) {
+                return apiSession;
+            }
+        }
+        // Match by tmux session name (legacy)
+        if (apiSession.tmuxSession === remoteName) {
+            return apiSession;
+        }
+        // Match by session ID prefix
+        if (apiSession.sessionId?.startsWith(remoteName) || remoteName.includes(apiSession.sessionId?.substring(0, 8))) {
+            return apiSession;
+        }
+    }
+    return null;
+}
 /**
  * Collect session states from all sources
  */
@@ -158,6 +213,21 @@ async function collectSessionStates(options) {
         });
     }
     // Process remote sessions from cloud genboxes
+    // Group remote sessions by genbox to batch API calls
+    const remoteByGenbox = new Map();
+    for (const remote of result.remoteSessions) {
+        const key = remote.genboxId;
+        if (!remoteByGenbox.has(key)) {
+            remoteByGenbox.set(key, []);
+        }
+        remoteByGenbox.get(key).push(remote);
+    }
+    // Fetch API sessions for each genbox in parallel
+    const genboxSessionsMap = new Map();
+    await Promise.all(Array.from(remoteByGenbox.keys()).map(async (genboxId) => {
+        const apiSessions = await fetchGenboxSessions(genboxId);
+        genboxSessionsMap.set(genboxId, apiSessions);
+    }));
     for (const remote of result.remoteSessions) {
         // Filter by genbox if specified
         if (options.genbox && !remote.genboxName.toLowerCase().includes(options.genbox.toLowerCase()))
@@ -168,14 +238,58 @@ 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) || [];
+        const matchedApiSession = matchRemoteSessionToApiSession(remote.name, apiSessions);
+        // ClaudeSession has status: 'active', 'idle', 'waiting_input', 'error', 'ended'
+        // Map to our display states
+        const apiStatus = matchedApiSession?.status;
+        let displayStatus = 'running';
+        let displayState;
+        if (matchedApiSession) {
+            // We have API data - use it
+            switch (apiStatus) {
+                case 'active':
+                    displayStatus = 'running';
+                    displayState = 'thinking';
+                    break;
+                case 'waiting_input':
+                    displayStatus = 'idle';
+                    displayState = 'waiting_for_input';
+                    break;
+                case 'idle':
+                    displayStatus = 'idle';
+                    displayState = 'waiting_for_input';
+                    break;
+                case 'error':
+                    displayStatus = 'error';
+                    break;
+                case 'ended':
+                    displayStatus = 'stopped';
+                    break;
+                default:
+                    displayStatus = 'running';
+            }
+        }
+        else {
+            // No API data - session is running (we found socket) but state is unknown
+            displayStatus = 'running';
+            displayState = undefined; // Will show as "idle" indicator but no state text
+        }
         states.push({
-            id: remote.name.substring(0, 8),
+            id: matchedApiSession?.sessionId?.substring(0, 8) || remote.name.substring(0, 8),
             name: remote.name,
             provider: remote.provider,
             type: 'cloud',
             genbox: remote.genboxName,
-            status: 'running',
-            duration: '?',
+            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,
         });
     }
     // Also add cloud genboxes that might have sessions we didn't scan

package/package.json

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