shell-mirror 1.5.96 → 1.5.98

package/mac-agent/agent.js

@@ -519,7 +519,6 @@ function connectToSignalingServer() {
           try {
             let sessionId;
             let isNewSession = false;
-            let availableSessions = sessionManager.getAllSessions();
 
             // Handle session request from client
             if (data.sessionRequest) {
@@ -569,15 +568,16 @@ function connectToSignalingServer() {
             await peerConnection.setLocalDescription(offer);
             
             // Send WebRTC offer with session assignment
-            sendMessage({ 
-              type: 'offer', 
-              sdp: offer.sdp, 
-              to: data.from, 
+            // Get availableSessions AFTER session creation so new session is included
+            sendMessage({
+              type: 'offer',
+              sdp: offer.sdp,
+              to: data.from,
               from: AGENT_ID,
               sessionId: sessionId,
               sessionName: sessionManager.getSession(sessionId).name,
               isNewSession: isNewSession,
-              availableSessions: availableSessions
+              availableSessions: sessionManager.getAllSessions()
             });
             logToFile('✅ WebRTC offer sent with session assignment');
             
@@ -1007,6 +1007,9 @@ process.on('SIGTERM', () => {
 });
 
 // --- Local WebSocket Server for Direct Connections ---
+// Sessions storage for direct WebSocket connections
+const directSessions = {};
+
 function startLocalServer() {
   const localPort = process.env.LOCAL_PORT || 8080;
   const localServer = require('ws').Server;
@@ -1039,57 +1042,96 @@ function startLocalServer() {
             break;
 
           case 'create_session':
-            // Create new terminal session for direct connection
-            const sessionId = uuidv4();
-            const ptyProcess = pty.spawn(shell, [], {
-              name: 'xterm-color',
-              cols: message.cols || 120,
-              rows: message.rows || 30,
-              cwd: process.env.HOME,
-              env: process.env
-            });
+            // Check if client requested an existing session
+            let sessionId;
+            let isNewSession = false;
 
-            // Store session
-            sessions[sessionId] = {
-              pty: ptyProcess,
-              buffer: new CircularBuffer(),
-              lastActivity: Date.now()
-            };
+            if (message.sessionId && directSessions[message.sessionId]) {
+              // Reconnect to existing session
+              sessionId = message.sessionId;
+              logToFile(`[LOCAL] Reconnecting to existing session: ${sessionId}`);
+
+              // Update activity timestamp
+              directSessions[sessionId].lastActivity = Date.now();
+
+              // Re-attach output handler for this connection
+              directSessions[sessionId].pty.onData((data) => {
+                if (localWs.readyState === WebSocket.OPEN) {
+                  localWs.send(JSON.stringify({
+                    type: 'output',
+                    sessionId,
+                    data
+                  }));
+                }
+              });
 
-            // Send session output to direct connection
-            ptyProcess.onData((data) => {
-              if (localWs.readyState === WebSocket.OPEN) {
+              // Send buffered output if available
+              const bufferedOutput = directSessions[sessionId].buffer.getAll();
+              if (bufferedOutput.length > 0) {
                 localWs.send(JSON.stringify({
                   type: 'output',
                   sessionId,
-                  data
+                  data: bufferedOutput.join('')
                 }));
               }
-            });
+            } else {
+              // Create new terminal session
+              sessionId = uuidv4();
+              isNewSession = true;
+
+              const ptyProcess = pty.spawn(shell, [], {
+                name: 'xterm-color',
+                cols: message.cols || 120,
+                rows: message.rows || 30,
+                cwd: process.env.HOME,
+                env: process.env
+              });
+
+              // Store session
+              directSessions[sessionId] = {
+                pty: ptyProcess,
+                buffer: new CircularBuffer(),
+                lastActivity: Date.now()
+              };
+
+              // Send session output to direct connection
+              ptyProcess.onData((data) => {
+                if (localWs.readyState === WebSocket.OPEN) {
+                  localWs.send(JSON.stringify({
+                    type: 'output',
+                    sessionId,
+                    data
+                  }));
+                }
+                // Store in buffer for reconnection
+                directSessions[sessionId].buffer.add(data);
+              });
+
+              logToFile(`[LOCAL] Created new direct session: ${sessionId}`);
+            }
 
             localWs.send(JSON.stringify({
               type: 'session_created',
               sessionId,
               sessionName: `Session ${sessionId.slice(0, 8)}`,
+              isNewSession: isNewSession,
               cols: message.cols || 120,
               rows: message.rows || 30
             }));
-
-            logToFile(`[LOCAL] Created direct session: ${sessionId}`);
             break;
 
           case 'input':
             // Handle terminal input for direct connection
-            if (sessions[message.sessionId]) {
-              sessions[message.sessionId].pty.write(message.data);
-              sessions[message.sessionId].lastActivity = Date.now();
+            if (directSessions[message.sessionId]) {
+              directSessions[message.sessionId].pty.write(message.data);
+              directSessions[message.sessionId].lastActivity = Date.now();
             }
             break;
 
           case 'resize':
             // Handle terminal resize for direct connection
-            if (sessions[message.sessionId]) {
-              sessions[message.sessionId].pty.resize(message.cols, message.rows);
+            if (directSessions[message.sessionId]) {
+              directSessions[message.sessionId].pty.resize(message.cols, message.rows);
             }
             break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.5.96",
+  "version": "1.5.98",
   "description": "Access your Mac shell from any device securely. Perfect for mobile coding with Claude Code CLI, Gemini CLI, and any shell tool.",
   "main": "server.js",
   "bin": {

package/public/app/dashboard.js

@@ -383,7 +383,8 @@ class ShellMirrorDashboard {
     updateAgentsDisplay() {
         const agentsCard = document.querySelector('.dashboard-card');
         if (agentsCard) {
-            agentsCard.innerHTML = this.renderActiveAgents();
+            // Use outerHTML to replace the entire card, not nest inside it
+            agentsCard.outerHTML = this.renderActiveAgents();
         }
     }
 
@@ -946,7 +947,7 @@ class ShellMirrorDashboard {
             if (response.ok) {
                 const data = await response.json();
                 console.log('[DASHBOARD] 🔍 Ping response:', data);
-                return data.success && data.reachable;
+                return data.success && data.data && data.data.reachable;
             }
             
             console.log('[DASHBOARD] ⚠️ Ping request failed:', response.status);