shell-mirror 1.5.39 → 1.5.41

package/mac-agent/agent-debug.log

@@ -1,94 +1,9 @@
-=== Mac Agent Debug Log Started 2025-08-06T23:17:12.104Z ===
-[2025-08-06T23:17:12.119Z] ✅ @koush/wrtc package loaded successfully
-[2025-08-06T23:17:12.122Z] 🆔 Agent ID: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:12.122Z] [AGENT] Host is 0.0.0.0, connecting to localhost instead.
-[2025-08-06T23:17:12.122Z] 🌐 Signaling server URL: ws://localhost:3000
-[2025-08-06T23:17:12.122Z] 🐚 Shell: bash
-[2025-08-06T23:17:12.122Z] 🔌 Connecting to signaling server at ws://localhost:3000?role=agent&agentId=agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:12.132Z] ✅ Connected to signaling server.
-[2025-08-06T23:17:17.684Z] 🔌 Connecting to signaling server at ws://localhost:3000?role=agent&agentId=agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:17.690Z] ✅ Connected to signaling server.
-[2025-08-06T23:17:18.729Z] 📨 Received message of type: ping from: local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731 to: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:18.730Z] [AGENT] ❓ Unknown message type: ping
-[2025-08-06T23:17:19.733Z] 📨 Received message of type: client-hello from: local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731 to: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:19.733Z] 🔄 Received client-hello from local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731. Initiating WebRTC connection.
-[2025-08-06T23:17:19.734Z] Creating new PeerConnection
-[2025-08-06T23:17:19.734Z] 🌐 Configuring ICE servers: stun:stun.l.google.com:19302, stun:stun1.l.google.com:19302, stun:stun.cloudflare.com:3478, stun:stun.services.mozilla.com:3478, turn:openrelay.metered.ca:80, turn:openrelay.metered.ca:443
-[2025-08-06T23:17:19.734Z] ⚙️ WebRTC config: {"iceServers":[{"urls":"stun:stun.l.google.com:19302"},{"urls":"stun:stun1.l.google.com:19302"},{"urls":"stun:stun.cloudflare.com:3478"},{"urls":"stun:stun.services.mozilla.com:3478"},{"urls":"turn:openrelay.metered.ca:80","username":"openrelayproject","credential":"openrelayproject"},{"urls":"turn:openrelay.metered.ca:443","username":"openrelayproject","credential":"openrelayproject"}],"iceCandidatePoolSize":10,"iceTransportPolicy":"all","bundlePolicy":"balanced"}
-[2025-08-06T23:17:19.748Z] [AGENT] 🔧 Attaching ICE candidate event handler...
-[2025-08-06T23:17:19.748Z] [AGENT] Creating data channel...
-[2025-08-06T23:17:19.750Z] [AGENT] Spawning new terminal
-[2025-08-06T23:17:19.753Z] [AGENT] ✅ Terminal spawned (PID: 70587)
-[2025-08-06T23:17:19.753Z] 📡 PeerConnection created, generating offer...
-[2025-08-06T23:17:19.755Z] 📋 Offer created: offer
-[2025-08-06T23:17:19.756Z] 📤 Sending WebRTC offer to client.
-[2025-08-06T23:17:19.756Z] [AGENT] Sending message: offer
-[2025-08-06T23:17:19.757Z] ✅ WebRTC offer sent successfully
-[2025-08-06T23:17:19.757Z] [AGENT] 🔧 Setting up ICE gathering fallback timer...
-[2025-08-06T23:17:19.757Z] [AGENT] 🔍 ICE gathering state changed: gathering
-[2025-08-06T23:17:19.758Z] [AGENT] 🔍 ICE gathering in progress...
-[2025-08-06T23:17:19.758Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.758Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:1431643032 1 udp 2122260224 192.168.31.244 61993 typ host generation 0 ufrag fZih network-id 1 network-cost 50","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.758Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.758Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.759Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.759Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.759Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:559267639 1 udp 2122202368 ::1 59459 typ host generation 0 ufrag fZih network-id 3","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.759Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.759Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.759Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.760Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.760Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:1510613869 1 udp 2122129152 127.0.0.1 52296 typ host generation 0 ufrag fZih network-id 2","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.760Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.760Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.760Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.785Z] 📨 Received message of type: answer from: local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731 to: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:19.785Z] [AGENT] 📥 Received WebRTC answer from client.
-[2025-08-06T23:17:19.786Z] 📨 Received message of type: candidate from: local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731 to: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:19.786Z] [AGENT] 🧊 Received ICE candidate from client.
-[2025-08-06T23:17:19.787Z] [AGENT] 📊 ICE connection state changed: new
-[2025-08-06T23:17:19.787Z] [AGENT] 📊 ICE gathering state: gathering
-[2025-08-06T23:17:19.787Z] [AGENT] 🆕 ICE connection starting...
-[2025-08-06T23:17:19.787Z] [AGENT] 📡 Connection state changed: new
-[2025-08-06T23:17:19.787Z] [AGENT] 🆕 Connection starting...
-[2025-08-06T23:17:19.787Z] [AGENT] ✅ WebRTC answer processed successfully
-[2025-08-06T23:17:19.787Z] [AGENT] ✅ ICE candidate added successfully
-[2025-08-06T23:17:19.791Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.792Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:2581077003 1 udp 1686052607 46.34.249.124 1753 typ srflx raddr 192.168.31.244 rport 61993 generation 0 ufrag fZih network-id 1 network-cost 50","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.792Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.792Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.792Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.797Z] 📨 Received message of type: candidate from: local-test-client-7f2cd128-5a64-4a9e-a565-eab1357ea731 to: agent-496ad28d-dd0c-4fdb-95fd-28bc1023ae3d
-[2025-08-06T23:17:19.797Z] [AGENT] 🧊 Received ICE candidate from client.
-[2025-08-06T23:17:19.797Z] [AGENT] ✅ ICE candidate added successfully
-[2025-08-06T23:17:19.847Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:467066728 1 tcp 1518280447 192.168.31.244 57774 typ host tcptype passive generation 0 ufrag fZih network-id 1 network-cost 50","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.847Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.847Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.847Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:1876313031 1 tcp 1518222591 ::1 57775 typ host tcptype passive generation 0 ufrag fZih network-id 3","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.847Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.847Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.847Z] [AGENT] 🧊 ICE candidate event fired: candidate found
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 ICE candidate details: {"candidate":"candidate:344579997 1 tcp 1518149375 127.0.0.1 57776 typ host tcptype passive generation 0 ufrag fZih network-id 2","sdpMid":"0","sdpMLineIndex":0}
-[2025-08-06T23:17:19.847Z] [AGENT] 📤 Sending ICE candidate to client...
-[2025-08-06T23:17:19.847Z] [AGENT] Sending message: candidate
-[2025-08-06T23:17:19.848Z] [AGENT] ✅ ICE candidate sent successfully
-[2025-08-06T23:17:19.953Z] [AGENT] 🔍 ICE gathering state changed: complete
-[2025-08-06T23:17:19.953Z] [AGENT] ✅ ICE gathering completed
-[2025-08-06T23:17:19.953Z] [AGENT] 🧊 ICE candidate event fired: gathering complete
-[2025-08-06T23:17:19.953Z] [AGENT] 🏁 ICE candidate gathering complete.
-[2025-08-06T23:17:19.955Z] [AGENT] 📊 ICE connection state changed: connected
-[2025-08-06T23:17:19.955Z] [AGENT] 📊 ICE gathering state: complete
-[2025-08-06T23:17:19.955Z] [AGENT] ✅ WebRTC connection established!
-[2025-08-06T23:17:19.956Z] [AGENT] 📡 Connection state changed: connected
-[2025-08-06T23:17:19.956Z] [AGENT] ✅ Peer connection fully established!
-[2025-08-06T23:17:19.957Z] [AGENT] ✅ Data channel is open!
-[2025-08-06T23:17:21.758Z] [AGENT] ✅ ICE gathering is active: complete
-[2025-08-06T23:17:35.042Z] [AGENT] 📊 ICE connection state changed: completed
-[2025-08-06T23:17:35.043Z] [AGENT] 📊 ICE gathering state: complete
-[2025-08-06T23:17:35.044Z] [AGENT] ✅ ICE connection completed successfully!
-[2025-08-06T23:17:35.044Z] [AGENT] 📡 Connection state changed: connected
-[2025-08-06T23:17:35.044Z] [AGENT] ✅ Peer connection fully established!
+=== Mac Agent Debug Log Started 2025-08-17T10:31:27.217Z ===
+[2025-08-17T10:31:27.469Z] ✅ @koush/wrtc package loaded successfully
+[2025-08-17T10:31:27.471Z] 🆔 Agent ID: agent-69bf639a-7e26-4b2e-b34a-8cc840f35203
+[2025-08-17T10:31:27.471Z] [AGENT] Host is 0.0.0.0, connecting to localhost instead.
+[2025-08-17T10:31:27.471Z] 🌐 Using local WebSocket URL: ws://localhost:8080
+[2025-08-17T10:31:27.471Z] 🐚 Shell: bash
+[2025-08-17T10:31:27.471Z] 🔌 Connecting to signaling server at ws://localhost:8080?role=agent&agentId=agent-69bf639a-7e26-4b2e-b34a-8cc840f35203
+[2025-08-17T10:31:32.485Z] 🔌 Connecting to signaling server at ws://localhost:8080?role=agent&agentId=agent-69bf639a-7e26-4b2e-b34a-8cc840f35203
+[2025-08-17T10:31:37.492Z] 🔌 Connecting to signaling server at ws://localhost:8080?role=agent&agentId=agent-69bf639a-7e26-4b2e-b34a-8cc840f35203

package/mac-agent/agent.js

@@ -53,10 +53,268 @@ if (process.env.WEBSOCKET_URL) {
 const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
 logToFile(`🐚 Shell: ${shell}`);
 
+// Circular buffer for session output persistence
+class CircularBuffer {
+  constructor(size = 10000) {
+    this.size = size;
+    this.buffer = [];
+    this.index = 0;
+    this.full = false;
+  }
+
+  add(data) {
+    this.buffer[this.index] = data;
+    this.index = (this.index + 1) % this.size;
+    if (this.index === 0) this.full = true;
+  }
+
+  getAll() {
+    if (!this.full) {
+      return this.buffer.slice(0, this.index).join('');
+    }
+    return this.buffer.slice(this.index).concat(this.buffer.slice(0, this.index)).join('');
+  }
+
+  clear() {
+    this.buffer = [];
+    this.index = 0;
+    this.full = false;
+  }
+}
+
+// Session Manager for multiple persistent terminal sessions
+class SessionManager {
+  constructor() {
+    this.sessions = {};
+    this.maxSessions = 10;
+    this.defaultSessionTimeout = 24 * 60 * 60 * 1000; // 24 hours
+    this.clientSessions = {}; // Maps clientId to sessionId
+  }
+
+  createSession(sessionName = null, clientId = null) {
+    const sessionId = `ses_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+    const name = sessionName || `Session ${Object.keys(this.sessions).length + 1}`;
+
+    logToFile(`[SESSION] Creating new session: ${sessionId} (${name})`);
+
+    // Check session limit
+    if (Object.keys(this.sessions).length >= this.maxSessions) {
+      logToFile(`[SESSION] ❌ Maximum sessions (${this.maxSessions}) reached`);
+      return null;
+    }
+
+    const macShell = os.platform() === 'darwin' ? '/bin/zsh' : shell;
+    const terminalEnv = {
+      ...process.env,
+      TERM: 'xterm-256color',
+      COLORTERM: 'truecolor',
+      LANG: 'en_US.UTF-8',
+      LC_ALL: 'en_US.UTF-8',
+      SHELL: macShell,
+      TERM_PROGRAM: 'Terminal',
+      TERM_PROGRAM_VERSION: '2.12.7'
+    };
+
+    const terminal = pty.spawn(macShell, ['--login'], {
+      name: 'xterm-256color',
+      cols: 120,
+      rows: 30,
+      cwd: process.env.HOME,
+      env: terminalEnv,
+      encoding: 'utf8'
+    });
+
+    const session = {
+      id: sessionId,
+      name: name,
+      terminal: terminal,
+      buffer: new CircularBuffer(10000),
+      connectedClients: [],
+      createdAt: Date.now(),
+      lastActivity: Date.now(),
+      status: 'active'
+    };
+
+    // Set up terminal event handlers
+    terminal.on('data', (data) => {
+      session.buffer.add(data);
+      session.lastActivity = Date.now();
+      
+      // Send to all connected clients for this session
+      session.connectedClients.forEach(clientId => {
+        this.sendToClient(clientId, { type: 'output', data: data });
+      });
+    });
+
+    terminal.on('exit', (code) => {
+      logToFile(`[SESSION] Terminal process exited for session ${sessionId} with code ${code}`);
+      session.status = 'crashed';
+      // Notify connected clients
+      session.connectedClients.forEach(clientId => {
+        this.sendToClient(clientId, { 
+          type: 'session-ended', 
+          sessionId: sessionId,
+          reason: 'terminal-exit',
+          code: code 
+        });
+      });
+    });
+
+    this.sessions[sessionId] = session;
+    
+    // Associate with client if provided
+    if (clientId) {
+      this.clientSessions[clientId] = sessionId;
+      session.connectedClients.push(clientId);
+    }
+
+    logToFile(`[SESSION] ✅ Session created: ${sessionId} (PID: ${terminal.pid})`);
+    return sessionId;
+  }
+
+  getSession(sessionId) {
+    return this.sessions[sessionId] || null;
+  }
+
+  connectClientToSession(clientId, sessionId) {
+    const session = this.sessions[sessionId];
+    if (!session) {
+      logToFile(`[SESSION] ❌ Cannot connect client ${clientId} - session ${sessionId} not found`);
+      return false;
+    }
+
+    // Disconnect client from any existing session
+    this.disconnectClient(clientId);
+
+    // Connect to new session
+    this.clientSessions[clientId] = sessionId;
+    if (!session.connectedClients.includes(clientId)) {
+      session.connectedClients.push(clientId);
+    }
+    session.lastActivity = Date.now();
+
+    logToFile(`[SESSION] ✅ Client ${clientId} connected to session ${sessionId}`);
+
+    // Send buffered output to newly connected client
+    const bufferedOutput = session.buffer.getAll();
+    if (bufferedOutput) {
+      this.sendToClient(clientId, { type: 'output', data: bufferedOutput });
+    }
+
+    return true;
+  }
+
+  disconnectClient(clientId) {
+    const sessionId = this.clientSessions[clientId];
+    if (sessionId && this.sessions[sessionId]) {
+      const session = this.sessions[sessionId];
+      session.connectedClients = session.connectedClients.filter(id => id !== clientId);
+      logToFile(`[SESSION] Client ${clientId} disconnected from session ${sessionId}`);
+    }
+    delete this.clientSessions[clientId];
+  }
+
+  getClientSession(clientId) {
+    const sessionId = this.clientSessions[clientId];
+    return sessionId ? this.sessions[sessionId] : null;
+  }
+
+  getAllSessions() {
+    return Object.values(this.sessions).map(session => ({
+      id: session.id,
+      name: session.name,
+      lastActivity: session.lastActivity,
+      createdAt: session.createdAt,
+      status: session.status,
+      connectedClients: session.connectedClients.length
+    }));
+  }
+
+  terminateSession(sessionId) {
+    const session = this.sessions[sessionId];
+    if (!session) return false;
+
+    logToFile(`[SESSION] Terminating session: ${sessionId}`);
+
+    // Notify connected clients
+    session.connectedClients.forEach(clientId => {
+      this.sendToClient(clientId, { 
+        type: 'session-terminated', 
+        sessionId: sessionId 
+      });
+      delete this.clientSessions[clientId];
+    });
+
+    // Kill terminal process
+    if (session.terminal) {
+      session.terminal.kill();
+    }
+
+    delete this.sessions[sessionId];
+    logToFile(`[SESSION] ✅ Session terminated: ${sessionId}`);
+    return true;
+  }
+
+  sendToClient(clientId, message) {
+    // This will be connected to the WebRTC data channel sending logic
+    // For now, we'll use a global dataChannel reference
+    // In a full implementation, this would use a clientId-to-dataChannel mapping
+    if (typeof dataChannel !== 'undefined' && dataChannel && dataChannel.readyState === 'open') {
+      try {
+        dataChannel.send(JSON.stringify(message));
+      } catch (err) {
+        logToFile(`[SESSION] Error sending to client ${clientId}: ${err.message}`);
+      }
+    } else {
+      logToFile(`[SESSION] ⚠️ Cannot send to client ${clientId} - data channel not available`);
+    }
+  }
+
+  writeToSession(sessionId, data) {
+    const session = this.sessions[sessionId];
+    if (session && session.terminal) {
+      session.terminal.write(data);
+      session.lastActivity = Date.now();
+      return true;
+    }
+    return false;
+  }
+
+  resizeSession(sessionId, cols, rows) {
+    const session = this.sessions[sessionId];
+    if (session && session.terminal) {
+      session.terminal.resize(cols, rows);
+      session.lastActivity = Date.now();
+      return true;
+    }
+    return false;
+  }
+
+  cleanupIdleSessions() {
+    const now = Date.now();
+    Object.keys(this.sessions).forEach(sessionId => {
+      const session = this.sessions[sessionId];
+      const idleTime = now - session.lastActivity;
+      
+      if (idleTime > this.defaultSessionTimeout && session.connectedClients.length === 0) {
+        logToFile(`[SESSION] Auto-cleanup idle session: ${sessionId} (idle for ${Math.floor(idleTime / 60000)} minutes)`);
+        this.terminateSession(sessionId);
+      }
+    });
+  }
+}
+
+// Initialize session manager
+const sessionManager = new SessionManager();
+
+// Cleanup idle sessions every 30 minutes
+setInterval(() => {
+  sessionManager.cleanupIdleSessions();
+}, 30 * 60 * 1000);
+
 let ws;
 let peerConnection;
 let dataChannel;
-let term;
 
 const iceServers = [
   // Google STUN servers (primary)
@@ -95,16 +353,71 @@ function connectToSignalingServer() {
 
       switch (data.type) {
         case 'client-hello':
-          logToFile(`🔄 Received client-hello from ${data.from}. Initiating WebRTC connection.`);
+          logToFile(`🔄 Received client-hello from ${data.from}. Processing session request.`);
           try {
+            let sessionId;
+            let isNewSession = false;
+            let availableSessions = sessionManager.getAllSessions();
+
+            // Handle session request from client
+            if (data.sessionRequest) {
+              if (data.sessionRequest.sessionId) {
+                // Connect to existing session
+                sessionId = data.sessionRequest.sessionId;
+                logToFile(`[SESSION] Client requesting existing session: ${sessionId}`);
+                if (!sessionManager.getSession(sessionId)) {
+                  logToFile(`[SESSION] ⚠️ Requested session ${sessionId} not found, creating new session`);
+                  sessionId = sessionManager.createSession(data.sessionRequest.sessionName, data.from);
+                  isNewSession = true;
+                }
+              } else if (data.sessionRequest.newSession) {
+                // Create new session
+                sessionId = sessionManager.createSession(data.sessionRequest.sessionName, data.from);
+                isNewSession = true;
+                logToFile(`[SESSION] Client requesting new session: ${sessionId}`);
+              } else {
+                // Default: create new session if no specific request
+                sessionId = sessionManager.createSession(null, data.from);
+                isNewSession = true;
+              }
+            } else {
+              // Backward compatibility: no session request means create default session
+              sessionId = sessionManager.createSession(null, data.from);
+              isNewSession = true;
+            }
+
+            if (!sessionId) {
+              logToFile(`[SESSION] ❌ Failed to create/connect to session`);
+              sendMessage({ 
+                type: 'error', 
+                message: 'Failed to create session - maximum sessions reached', 
+                to: data.from, 
+                from: AGENT_ID 
+              });
+              break;
+            }
+
+            // Connect client to session
+            sessionManager.connectClientToSession(data.from, sessionId);
+
             await createPeerConnection(data.from);
             logToFile('📡 PeerConnection created, generating offer...');
             const offer = await peerConnection.createOffer();
             logToFile(`📋 Offer created: ${offer.type}`);
             await peerConnection.setLocalDescription(offer);
-            logToFile('📤 Sending WebRTC offer to client.');
-            sendMessage({ type: 'offer', sdp: offer.sdp, to: data.from, from: AGENT_ID });
-            logToFile('✅ WebRTC offer sent successfully');
+            
+            // Send WebRTC offer with session assignment
+            sendMessage({ 
+              type: 'offer', 
+              sdp: offer.sdp, 
+              to: data.from, 
+              from: AGENT_ID,
+              sessionId: sessionId,
+              sessionName: sessionManager.getSession(sessionId).name,
+              isNewSession: isNewSession,
+              availableSessions: availableSessions
+            });
+            logToFile('✅ WebRTC offer sent with session assignment');
             
             // Force ICE gathering if it hasn't started within 2 seconds
             logToFile('[AGENT] 🔧 Setting up ICE gathering fallback timer...');
@@ -204,14 +517,18 @@ async function createPeerConnection(clientId) {
   dataChannel = peerConnection.createDataChannel('terminal', {
     ordered: true
   });
-  setupDataChannel();
-  setupTerminal();
+  setupDataChannel(clientId);
   
   peerConnection.ondatachannel = (event) => {
     logToFile('[AGENT] Additional data channel received (this should not happen)');
   };
 
   peerConnection.oniceconnectionstatechange = () => {
+    if (!peerConnection) {
+      logToFile('[AGENT] ⚠️ ICE connection state change after peerConnection was closed');
+      return;
+    }
+    
     logToFile(`[AGENT] 📊 ICE connection state changed: ${peerConnection.iceConnectionState}`);
     logToFile(`[AGENT] 📊 ICE gathering state: ${peerConnection.iceGatheringState}`);
     
@@ -230,11 +547,11 @@ async function createPeerConnection(clientId) {
         break;
       case 'failed':
         logToFile('[AGENT] ❌ ICE connection failed - no viable candidates');
-        cleanup();
+        cleanup(clientId);
         break;
       case 'disconnected':
         logToFile('[AGENT] ⚠️ ICE connection disconnected');
-        cleanup();
+        cleanup(clientId);
         break;
       case 'closed':
         logToFile('[AGENT] 🔐 ICE connection closed');
@@ -243,6 +560,11 @@ async function createPeerConnection(clientId) {
   };
 
   peerConnection.onconnectionstatechange = () => {
+    if (!peerConnection) {
+      logToFile('[AGENT] ⚠️ Connection state change after peerConnection was closed');
+      return;
+    }
+    
     logToFile(`[AGENT] 📡 Connection state changed: ${peerConnection.connectionState}`);
     
     switch (peerConnection.connectionState) {
@@ -268,6 +590,11 @@ async function createPeerConnection(clientId) {
   };
 
   peerConnection.onicegatheringstatechange = () => {
+    if (!peerConnection) {
+      logToFile('[AGENT] ⚠️ ICE gathering state change after peerConnection was closed');
+      return;
+    }
+    
     logToFile(`[AGENT] 🔍 ICE gathering state changed: ${peerConnection.iceGatheringState}`);
     
     switch (peerConnection.iceGatheringState) {
@@ -284,11 +611,12 @@ async function createPeerConnection(clientId) {
   };
 }
 
-function cleanup() {
-  if (term) {
-    term.kill();
-    term = null;
+function cleanup(clientId = null) {
+  // Disconnect client from session manager
+  if (clientId) {
+    sessionManager.disconnectClient(clientId);
   }
+  
   if (dataChannel) {
     dataChannel.close();
     dataChannel = null;
@@ -299,7 +627,7 @@ function cleanup() {
   }
 }
 
-function setupDataChannel() {
+function setupDataChannel(clientId) {
   dataChannel.onopen = () => {
     logToFile('[AGENT] ✅ Data channel is open!');
   };
@@ -307,11 +635,35 @@ function setupDataChannel() {
   dataChannel.onmessage = (event) => {
     try {
       const message = JSON.parse(event.data);
-      if (term && message.type === 'input') {
-        term.write(message.data);
-      } else if (term && message.type === 'resize') {
-        logToFile(`[AGENT] Resizing terminal to ${message.cols}x${message.rows}`);
-        term.resize(message.cols, message.rows);
+      const session = sessionManager.getClientSession(clientId);
+      
+      if (!session) {
+        logToFile(`[AGENT] ⚠️ No session found for client ${clientId}`);
+        return;
+      }
+
+      if (message.type === 'input') {
+        sessionManager.writeToSession(session.id, message.data);
+      } else if (message.type === 'resize') {
+        logToFile(`[AGENT] Resizing session ${session.id} to ${message.cols}x${message.rows}`);
+        sessionManager.resizeSession(session.id, message.cols, message.rows);
+      } else if (message.type === 'session-switch') {
+        // Handle session switching
+        logToFile(`[AGENT] Client ${clientId} switching to session ${message.sessionId}`);
+        if (sessionManager.connectClientToSession(clientId, message.sessionId)) {
+          // Send confirmation and buffered output
+          const newSession = sessionManager.getSession(message.sessionId);
+          dataChannel.send(JSON.stringify({
+            type: 'session-switched',
+            sessionId: message.sessionId,
+            sessionName: newSession.name
+          }));
+        } else {
+          dataChannel.send(JSON.stringify({
+            type: 'error',
+            message: `Session ${message.sessionId} not found`
+          }));
+        }
       }
     } catch (err) {
       logToFile(`[AGENT] Error parsing data channel message: ${err.message}`);
@@ -320,7 +672,7 @@ function setupDataChannel() {
 
   dataChannel.onclose = () => {
     logToFile('[AGENT] Data channel closed.');
-    cleanup();
+    cleanup(clientId);
   };
 
   dataChannel.onerror = (error) => {
@@ -328,50 +680,6 @@ function setupDataChannel() {
   };
 }
 
-function setupTerminal() {
-  logToFile('[AGENT] Spawning new terminal');
-  
-  // Use zsh (default on modern macOS) instead of bash for Mac-like experience
-  const macShell = os.platform() === 'darwin' ? '/bin/zsh' : shell;
-  
-  // Create enhanced environment for Mac terminal appearance
-  const terminalEnv = {
-    ...process.env,
-    TERM: 'xterm-256color',        // Enable full 256 color support
-    COLORTERM: 'truecolor',        // Enable true color support
-    LANG: 'en_US.UTF-8',          // Proper locale for Mac
-    LC_ALL: 'en_US.UTF-8',        // Full UTF-8 support
-    SHELL: macShell,               // Set proper shell
-    TERM_PROGRAM: 'Terminal',      // Mimic macOS Terminal.app
-    TERM_PROGRAM_VERSION: '2.12.7' // Recent Terminal.app version
-  };
-  
-  term = pty.spawn(macShell, ['--login'], {
-    name: 'xterm-256color',        // Full color terminal emulation
-    cols: 120,                     // Wider default like Mac terminal
-    rows: 30,
-    cwd: process.env.HOME,
-    env: terminalEnv,
-    encoding: 'utf8'               // Ensure UTF-8 encoding
-  });
-
-  term.on('data', (data) => {
-    if (dataChannel && dataChannel.readyState === 'open') {
-      try {
-        dataChannel.send(JSON.stringify({ type: 'output', data: data }));
-      } catch (err) {
-        logToFile(`[AGENT] Error sending terminal output: ${err.message}`);
-      }
-    }
-  });
-
-  term.on('exit', (code) => {
-    logToFile(`[AGENT] Terminal process exited with code ${code}`);
-    cleanup();
-  });
-
-  logToFile(`[AGENT] ✅ Terminal spawned (PID: ${term.pid})`);
-}
 
 function sendMessage(message) {
   if (ws && ws.readyState === WebSocket.OPEN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.5.39",
+  "version": "1.5.41",
   "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": {