shell-mirror 1.5.107 → 1.5.109

package/mac-agent/agent.js

@@ -980,19 +980,41 @@ function setupDataChannel(clientId) {
         // Handle session closure request from client
         logToFile(`[AGENT] Client ${clientId} closing session ${message.sessionId}`);
 
-        sessionManager.terminateSession(message.sessionId);
+        // Get remaining sessions BEFORE termination
+        const closingSessionId = message.sessionId;
+        sessionManager.terminateSession(closingSessionId);
+
+        const remainingSessions = sessionManager.getAllSessions();
 
         // Send confirmation with updated session list
         dataChannel.send(JSON.stringify({
           type: 'session-closed',
-          sessionId: message.sessionId,
-          availableSessions: sessionManager.getAllSessions()
+          sessionId: closingSessionId,
+          availableSessions: remainingSessions
         }));
 
+        // If client requested auto-switch to next session, do it atomically
+        if (message.switchToSessionId && remainingSessions.find(s => s.id === message.switchToSessionId)) {
+          logToFile(`[AGENT] Auto-switching client to session ${message.switchToSessionId}`);
+          if (sessionManager.connectClientToSession(clientId, message.switchToSessionId)) {
+            const newSession = sessionManager.getSession(message.switchToSessionId);
+            dataChannel.send(JSON.stringify({
+              type: 'session-switched',
+              sessionId: message.switchToSessionId,
+              sessionName: newSession.name
+            }));
+            // Send buffered output
+            const bufferedOutput = newSession.buffer.getAll();
+            if (bufferedOutput) {
+              sendLargeMessage(dataChannel, { type: 'output', data: bufferedOutput }, '[AGENT]');
+            }
+          }
+        }
+
         // Send immediate heartbeat to update dashboard
         sendHeartbeat();
 
-        logToFile(`[AGENT] ✅ Session closed: ${message.sessionId}`);
+        logToFile(`[AGENT] ✅ Session closed: ${closingSessionId}`);
       }
     } catch (err) {
       logToFile(`[AGENT] Error parsing data channel message: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.5.107",
+  "version": "1.5.109",
   "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/terminal.html

@@ -176,12 +176,8 @@
         font-weight: 600;
       }
 
-      .session-tab-btn {
-        background: none;
-        border: none;
-        color: inherit;
-        font: inherit;
-        cursor: pointer;
+      .session-tab-name {
+        flex: 1;
         padding: 2px 4px;
       }
 
@@ -576,6 +572,6 @@
         }
     </script>
 
-    <script src="/app/terminal.js?v=1.5.91"></script>
+    <script src="/app/terminal.js?v=1.5.93"></script>
   </body>
 </html>

package/public/app/terminal.js

@@ -1030,13 +1030,9 @@ function renderTabs() {
                 : `color: ${color.muted};`;
 
             return `
-                <div class="session-tab ${isActive ? 'active' : ''}" style="${tabStyle}" title="${displayName}" data-color-index="${sessionColorMap[session.id]}">
-                    <button class="session-tab-btn"
-                            onclick="switchToSession('${session.id}')"
-                            style="${textStyle}">
-                        <span class="session-tab-name">${displayName}</span>
-                    </button>
-                    <button class="session-tab-close" onclick="closeSession('${session.id}', event)" title="Close session" style="color: ${isActive ? color.text : color.muted}">×</button>
+                <div class="session-tab ${isActive ? 'active' : ''}" style="${tabStyle}; cursor: pointer;" title="${displayName}" data-color-index="${sessionColorMap[session.id]}" onclick="switchToSession('${session.id}')">
+                    <span class="session-tab-name" style="${textStyle}">${displayName}</span>
+                    <button class="session-tab-close" onclick="event.stopPropagation(); closeSession('${session.id}', event)" title="Close session" style="color: ${isActive ? color.text : color.muted}">×</button>
                 </div>
             `;
         }).join('');
@@ -1080,10 +1076,16 @@ function closeSession(sessionId, event) {
 function doCloseSession(sessionId) {
     console.log('[CLIENT] 🗑️ Closing session:', sessionId);
 
-    // Send close request to agent
+    // Remove from available sessions
+    const remainingSessions = availableSessions.filter(s => s.id !== sessionId);
+    const isClosingCurrentSession = currentSession && currentSession.id === sessionId;
+    const nextSession = isClosingCurrentSession && remainingSessions.length > 0 ? remainingSessions[0] : null;
+
+    // Send close request to agent (with auto-switch if closing active session)
     const closeMessage = {
         type: 'close_session',
-        sessionId: sessionId
+        sessionId: sessionId,
+        switchToSessionId: nextSession ? nextSession.id : null  // Atomic close + switch
     };
 
     if (dataChannel && dataChannel.readyState === 'open') {
@@ -1092,25 +1094,25 @@ function doCloseSession(sessionId) {
         ws.send(JSON.stringify(closeMessage));
     }
 
-    // Remove from available sessions
-    availableSessions = availableSessions.filter(s => s.id !== sessionId);
+    // Update local state
+    availableSessions = remainingSessions;
 
-    // If closing current session, switch to another or show message
-    if (currentSession && currentSession.id === sessionId) {
-        if (availableSessions.length > 0) {
+    // If closing current session, update UI immediately
+    if (isClosingCurrentSession) {
+        // Clear terminal IMMEDIATELY to prevent garbage from closed session
+        term.clear();
+
+        if (nextSession) {
             // Update currentSession IMMEDIATELY so renderTabs shows correct active tab
-            const nextSession = availableSessions[0];
             currentSession = {
                 id: nextSession.id,
                 name: nextSession.name || 'Terminal Session'
             };
-            // Tell agent to switch (will send session-switched confirmation)
-            switchToSession(nextSession.id);
             // Update URL
             updateUrlWithSession(nextSession.id);
+            // Note: Agent will send session-switched with buffered output
         } else {
             currentSession = null;
-            term.clear();
             term.write('\r\n\x1b[33mSession closed. Click + to create a new session.\x1b[0m\r\n');
         }
     }
@@ -1258,14 +1260,20 @@ function handleSessionMessage(message) {
             term.focus();
             break;
         case 'session-ended':
-            term.write(`\r\n\x1b[31m❌ Session ended: ${message.reason}\x1b[0m\r\n`);
-            if (message.code) {
-                term.write(`Exit code: ${message.code}\r\n`);
+            // Only show if this is for the current session (ignore closed session messages)
+            if (!message.sessionId || (currentSession && message.sessionId === currentSession.id)) {
+                term.write(`\r\n\x1b[31m❌ Session ended: ${message.reason}\x1b[0m\r\n`);
+                if (message.code) {
+                    term.write(`Exit code: ${message.code}\r\n`);
+                }
             }
             break;
         case 'session-terminated':
-            term.write(`\r\n\x1b[31m❌ Session terminated\x1b[0m\r\n`);
-            term.write('🔄 Click Dashboard to start a new session\r\n');
+            // Only show if this is for the current session (ignore closed session messages)
+            if (!message.sessionId || (currentSession && message.sessionId === currentSession.id)) {
+                term.write(`\r\n\x1b[31m❌ Session terminated\x1b[0m\r\n`);
+                term.write('🔄 Click Dashboard to start a new session\r\n');
+            }
             break;
         case 'session-closed':
             console.log('[CLIENT] ✅ Session closed confirmed:', message.sessionId);