clay-server 2.40.0 → 2.40.1-beta.1

package/lib/project-sessions.js

@@ -314,19 +314,38 @@ function attachSessions(ctx) {
     if (!session) return;
     if (session.vendor && session.vendor !== "claude") { session.tuiSuspended = false; return; }
     var pref = getClaudeOpenModeForWs(ws);
+    // A LIVE runtime always wins over the viewer's claudeOpenMode pref:
+    // another user (or this user in another tab) may be in the session right
+    // now, so we join it in whatever mode it is actually running and never
+    // convert or kill it. "tui stays tui, gui stays gui."
+    var liveNativePty = tm && typeof session.terminalId === "number" && tm.has(session.terminalId);
+    var liveResumePty = tm && typeof session.runtimeTerminalId === "number" && tm.has(session.runtimeTerminalId);
+    var liveSdk = !!session.queryInstance || !!session.isProcessing;
+    if (liveNativePty) {
+      session.runtimeMode = "tui";
+      session.runtimeTerminalId = session.terminalId;
+      session.tuiSuspended = false;
+      return;
+    }
+    if (liveResumePty) {
+      session.runtimeMode = "tui";
+      session.tuiSuspended = false;
+      return;
+    }
+    if (liveSdk) {
+      // Actively running as a GUI/SDK session - show GUI for everyone.
+      session.runtimeMode = (session.mode === "tui") ? "gui" : null;
+      session.runtimeTerminalId = null;
+      session.tuiSuspended = false;
+      return;
+    }
+    // Cold session: apply the viewer's pref.
     if (session.mode === "tui") {
       if (pref === "gui") {
         prepareTuiSessionForGuiView(session);
         session.runtimeMode = "gui";
         session.runtimeTerminalId = null;
         session.tuiSuspended = false;
-      } else if (tm && typeof session.terminalId === "number" && tm.has(session.terminalId)) {
-        session.runtimeMode = "tui";
-        session.runtimeTerminalId = session.terminalId;
-        session.tuiSuspended = false;
-      } else if (tm && typeof session.runtimeTerminalId === "number" && tm.has(session.runtimeTerminalId)) {
-        session.runtimeMode = "tui";
-        session.tuiSuspended = false;
       } else {
         prepareTuiSessionForGuiView(session);
         session.runtimeMode = null;
@@ -334,31 +353,14 @@ function attachSessions(ctx) {
         session.tuiSuspended = true;
       }
     } else {
-      // Born-GUI: reattach a live resume PTY if one exists; never spawn here.
-      if (pref === "tui" && tm && typeof session.runtimeTerminalId === "number" && tm.has(session.runtimeTerminalId)) {
-        session.runtimeMode = "tui";
-      } else {
-        session.runtimeMode = null;
-      }
+      // Born-GUI: always GUI. We no longer auto-convert a GUI session to a
+      // `claude --resume` terminal on a pref=tui click - that hijacked shared
+      // GUI sessions in multi-user. Such sessions render as their SDK chat.
+      session.runtimeMode = null;
       session.tuiSuspended = false;
     }
   }
 
-  // Compute the runtimeMode the client should render for this session given
-  // the user's current preference. Pure function over session + pref; the
-  // caller decides whether to also mutate state (spawn PTY, convert, etc.)
-  // via the helpers above.
-  function computeRuntimeMode(session, pref) {
-    if (!session) return "gui";
-    if (session.vendor && session.vendor !== "claude") return session.mode || "gui";
-    var effPref = (pref === "gui") ? "gui" : "tui";
-    if (session.mode === "tui") {
-      return effPref === "gui" ? "gui" : "tui";
-    }
-    // session.mode === 'gui'
-    return effPref === "tui" ? "tui" : "gui";
-  }
-
   function handleSessionsMessage(ws, msg) {
 
     if (msg.type === "push_subscribe") {
@@ -568,33 +570,17 @@ function attachSessions(ctx) {
 
     if (msg.type === "switch_session") {
       if (msg.id && sm.sessions.has(msg.id)) {
-        // Apply the claudeOpenMode preference to the target Claude session
-        // before sm.switchSession fires session_switched. Two transforms:
-        //
-        //  - born-GUI viewed under TUI pref:  spawn a transient PTY running
-        //    `claude --resume <cliSessionId>`; the session record stays GUI
-        //    so a later pref flip back to GUI just hides the runtime link.
-        //  - born-TUI viewed under GUI pref:  hydrate session.history from
-        //    the jsonl transcript and tear down the PTY so the session
-        //    renders via the SDK chat. The born-TUI marker stays on the
-        //    record so a later pref flip back to TUI restores the
-        //    embedded-terminal experience.
-        //
-        // runtimeMode / runtimeTerminalId are set on the session record so
-        // the session_switched and session_list broadcasts surface them to
-        // the client without sessions.js needing to know about the pref.
+        // resolveSessionForView sets runtimeMode / runtimeTerminalId /
+        // tuiSuspended (and hydrates the transcript) before sm.switchSession
+        // broadcasts session_switched. A live runtime keeps its actual mode
+        // for every viewer; only cold sessions follow the clicker's
+        // claudeOpenMode pref. Nothing is spawned here.
         var xmTarget = sm.sessions.get(msg.id);
         if (xmTarget && (xmTarget.vendor === "claude" || !xmTarget.vendor)) {
-          var xmPref = getClaudeOpenModeForWs(ws);
-          // Born-GUI under TUI pref with no live resume PTY: spawn a transient
-          // `claude --resume` now (only switch_session spawns; born-TUI sessions
-          // stay lazy and the connect path never spawns). resolveSessionForView
-          // then turns the live PTY into runtimeMode='tui'.
-          if (xmTarget.mode === "gui" && xmTarget.cliSessionId &&
-              computeRuntimeMode(xmTarget, xmPref) === "tui" &&
-              !(tm && typeof xmTarget.runtimeTerminalId === "number" && tm.has(xmTarget.runtimeTerminalId))) {
-            spawnRuntimeTuiPty(xmTarget, ws);
-          }
+          // Single source of truth: live runtime wins (tui stays tui, gui stays
+          // gui); only cold sessions follow the viewer's pref. No PTY is spawned
+          // on switch - born-TUI resumes lazily via the Resume bar
+          // (resume_tui_session), and born-GUI never auto-converts to a terminal.
           resolveSessionForView(xmTarget, ws);
         }
         // If the target session's vendor doesn't own the currently cached

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.40.0",
+  "version": "2.40.1-beta.1",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",