clay-server 4.0.0-beta.19 → 4.0.0-beta.20

package/lib/project-session-handoff.js

@@ -78,7 +78,7 @@ function attachSessionHandoff(ctx) {
     ) || null;
     var target = sm.createSessionRaw({
       ownerId: source.ownerId || null,
-      sessionVisibility: source.sessionVisibility || "shared",
+      sessionVisibility: "private",
       vendor: targetVendor,
       model: targetModel || null,
       effort: targetEffort,

package/lib/project-session-spawn.js

@@ -198,7 +198,7 @@ function attachSessionSpawn(ctx) {
     var create = typeof sm.createSessionRaw === "function" ? sm.createSessionRaw : sm.createSession;
     var session = create.call(sm, {
       ownerId: parent.ownerId || null,
-      sessionVisibility: parent.sessionVisibility || "shared",
+      sessionVisibility: "private",
       vendor: vendor,
     });
     session.spawn = { parentId: parent.localId, index: index, batchId: batchId };

package/lib/project-sessions.js

@@ -5,6 +5,7 @@ var { execFileSync } = require("child_process");
 var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
 var updateSnooze = require("./update-snooze");
 var yoke = require("./yoke");
+var sessionVisibility = require("./session-visibility");
 
 function vendorSupportsTui(vendor) {
   var info = yoke.getVendorInfo(vendor);
@@ -496,7 +497,7 @@ function attachSessions(ctx) {
       sm.sweepBlankSessions();
       var sessionOpts = {};
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
-      if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
+      sessionOpts.sessionVisibility = sessionVisibility.normalize(msg.sessionVisibility);
       if (msg.vendor) sessionOpts.vendor = msg.vendor;
       // Mode resolution: vendors without a TUI session mode are always GUI.
       // TUI-capable sessions honor the explicit msg.mode if provided, otherwise
@@ -581,7 +582,8 @@ function attachSessions(ctx) {
         if (reusable) {
           if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
           if (!reusable.effort) reusable.effort = sessionOpts.effort;
-          if (msg.sessionVisibility) reusable.sessionVisibility = msg.sessionVisibility;
+          sm.setSessionVisibility(reusable.localId, sessionOpts.sessionVisibility);
+          sessionVisibility.revokeViewers(ctx, reusable);
           sm.switchSession(reusable.localId, ws);
           newSess = reusable;
         } else {
@@ -609,9 +611,7 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "set_session_visibility") {
-      if (typeof msg.sessionId === "number" && (msg.visibility === "shared" || msg.visibility === "private")) {
-        sm.setSessionVisibility(msg.sessionId, msg.visibility);
-      }
+      sessionVisibility.handleChange(ctx, ws, msg);
       return true;
     }
 

package/lib/public/modules/sidebar-sessions.js

@@ -697,7 +697,7 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
 
   // Session visibility toggle (only the session owner can change)
   if (store.get('isMultiUserMode') && sessionData && sessionData.ownerId && sessionData.ownerId === store.get('myUserId')) {
-    var currentVis = (sessionData && sessionData.sessionVisibility) || "shared";
+    var currentVis = (sessionData && sessionData.sessionVisibility) || "private";
     var isPrivate = currentVis === "private";
     var visItem = document.createElement("button");
     visItem.className = "session-ctx-item";
@@ -1290,7 +1290,7 @@ function renderSessionItem(s, options) {
   if (s.loop && s.loop.source === "debate") {
     textHtml += '<span class="session-debate-icon" title="Debate">' + iconHtml("mic") + '</span>';
   }
-  if (store.get('isMultiUserMode') && s.sessionVisibility === "private") {
+  if (store.get('isMultiUserMode') && s.sessionVisibility !== "shared") {
     textHtml += '<span class="session-private-icon" title="Private session">' + iconHtml("lock") + '</span>';
   }
   textHtml += highlightMatch(s.title || "New Session", searchQuery);

package/lib/session-visibility.js

@@ -0,0 +1,39 @@
+function normalize(value) {
+  return value === "shared" ? "shared" : "private";
+}
+
+function restore(meta) {
+  // Older releases persisted the shared default without recording intent.
+  return meta.sessionVisibilityExplicit === true ? normalize(meta.sessionVisibility) : "private";
+}
+
+function handleChange(ctx, ws, msg) {
+  if (typeof msg.sessionId !== "number" || (msg.visibility !== "shared" && msg.visibility !== "private")) return;
+  var session = ctx.sm.sessions.get(msg.sessionId);
+  if (!session) return;
+  if (ctx.usersModule.isMultiUser()) {
+    var user = ws._clayUser;
+    var project = ctx.getProjectAccess ? ctx.getProjectAccess() : { visibility: "public" };
+    if (!user || !session.ownerId || session.ownerId !== user.id ||
+        !ctx.usersModule.canAccessSession(user.id, session, project)) return;
+  } else if (session.ownerId) {
+    return;
+  }
+  ctx.sm.setSessionVisibility(msg.sessionId, msg.visibility);
+  revokeViewers(ctx, session);
+}
+
+function revokeViewers(ctx, session) {
+  if (ctx.usersModule.isMultiUser() && session.sessionVisibility === "private") {
+    ctx.clients.forEach(function(client) {
+      if (client._clayActiveSession !== session.localId) return;
+      if (client._clayUser && client._clayUser.id === session.ownerId) return;
+      // Clear the server-side selection before reconnecting so no further
+      // session events or input can cross the revoked access boundary.
+      client._clayActiveSession = null;
+      if (client.readyState === 1) client.close(1008, "Session access changed");
+    });
+  }
+}
+
+module.exports = { normalize: normalize, restore: restore, handleChange: handleChange, revokeViewers: revokeViewers };

package/lib/sessions.js

@@ -7,6 +7,7 @@ var { CODEX_DEFAULTS } = require("./codex-defaults");
 var hygiene = require("./session-hygiene");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionProvenance = require("./session-provenance");
+var sessionVisibility = require("./session-visibility");
 
 function createSessionManager(opts) {
   var cwd = opts.cwd;
@@ -166,7 +167,8 @@ function createSessionManager(opts) {
       if (session.dangerouslySkipPermissions) metaObj.dangerouslySkipPermissions = true;
       if (session.permissionMode) metaObj.permissionMode = session.permissionMode;
       if (session.permissionModeBeforeFullAccess) metaObj.permissionModeBeforeFullAccess = session.permissionModeBeforeFullAccess;
-      if (session.sessionVisibility) metaObj.sessionVisibility = session.sessionVisibility;
+      metaObj.sessionVisibility = sessionVisibility.normalize(session.sessionVisibility);
+      if (session.sessionVisibilityExplicit) metaObj.sessionVisibilityExplicit = true;
       if (session.bookmarked) metaObj.bookmarked = true;
       if (typeof session.favoriteOrder === "number") metaObj.favoriteOrder = session.favoriteOrder;
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
@@ -321,7 +323,8 @@ function createSessionManager(opts) {
       session.terminalId = null;
       session.runtimeMode = null;
       session.runtimeTerminalId = null;
-      session.sessionVisibility = m.sessionVisibility || "shared";
+      session.sessionVisibility = sessionVisibility.restore(m);
+      session.sessionVisibilityExplicit = m.sessionVisibilityExplicit === true;
       session.bookmarked = !!m.bookmarked;
       session.favoriteOrder = typeof m.favoriteOrder === "number" ? m.favoriteOrder : null;
       sessions.set(localId, session);
@@ -447,7 +450,7 @@ function createSessionManager(opts) {
         terminalId: null,
         runtimeMode: null,
         runtimeTerminalId: null,
-        sessionVisibility: "shared",
+        sessionVisibility: "private",
         bookmarked: false,
         favoriteOrder: null,
       };
@@ -536,7 +539,7 @@ function createSessionManager(opts) {
       loop: loop,
       spawn: s.spawn || null,
       ownerId: s.ownerId || null,
-      sessionVisibility: s.sessionVisibility || "shared",
+      sessionVisibility: sessionVisibility.normalize(s.sessionVisibility),
       bookmarked: !!s.bookmarked,
       favoriteOrder: typeof s.favoriteOrder === "number" ? s.favoriteOrder : null,
       unread: unreadMap[s.localId] || 0,
@@ -620,7 +623,8 @@ function createSessionManager(opts) {
       history: [],
       messageUUIDs: [],
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
-      sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
+      sessionVisibility: sessionVisibility.normalize(sessionOpts && sessionOpts.sessionVisibility),
+      sessionVisibilityExplicit: !!(sessionOpts && sessionOpts.sessionVisibility === "shared"),
       bookmarked: false,
       favoriteOrder: null,
       vendor: (sessionOpts && sessionOpts.vendor) || null,
@@ -661,7 +665,8 @@ function createSessionManager(opts) {
       history: [],
       messageUUIDs: [],
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
-      sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
+      sessionVisibility: sessionVisibility.normalize(sessionOpts && sessionOpts.sessionVisibility),
+      sessionVisibilityExplicit: !!(sessionOpts && sessionOpts.sessionVisibility === "shared"),
       bookmarked: false,
       favoriteOrder: null,
       vendor: (sessionOpts && sessionOpts.vendor) || null,
@@ -916,7 +921,8 @@ function createSessionManager(opts) {
     // Send to active clients without recording to history/disk (ephemeral data)
     if (sendEach) {
       var data = JSON.stringify(obj);
-      sendEach(function (ws) {
+      sendEach(function (ws, filterFn) {
+        if (filterFn && !filterFn(session)) return;
         if (session.homeDebatePlanning === true) return;
         if (ws._clayActiveSession === session.localId && ws.readyState === 1) {
           ws.send(data);
@@ -947,7 +953,8 @@ function createSessionManager(opts) {
       // Multi-user: send to clients whose active session matches this one
       var data = JSON.stringify(outgoingObj);
       var ioData = null;
-      sendEach(function (ws) {
+      sendEach(function (ws, filterFn) {
+        if (filterFn && !filterFn(session)) return;
         if (session.homeDebatePlanning === true) return;
         if (ws._clayActiveSession === session.localId) {
           if (ws.readyState === 1) ws.send(data);
@@ -1290,7 +1297,9 @@ function createSessionManager(opts) {
     setSessionVisibility: function (localId, visibility) {
       var session = sessions.get(localId);
       if (!session) return { error: "Session not found" };
+      if (visibility !== "shared" && visibility !== "private") return { error: "Invalid session visibility" };
       session.sessionVisibility = visibility;
+      session.sessionVisibilityExplicit = true;
       saveSessionFile(session);
       broadcastSessionList();
       return { ok: true };

package/lib/users-permissions.js

@@ -96,8 +96,8 @@ function attachPermissions(deps) {
     }
     // Owner can always see their own sessions
     if (session.ownerId === userId) return true;
-    // Shared sessions are visible to all project members (default)
-    if (!session.sessionVisibility || session.sessionVisibility === "shared") return true;
+    // Sharing is opt-in; missing or invalid visibility stays private.
+    if (session.sessionVisibility === "shared") return true;
     // Private sessions are only visible to the owner
     return false;
   }

package/lib/yoke/adapters/claude-worker.js

@@ -424,22 +424,32 @@ async function handleQueryStart(msg) {
   function perf(label) { console.log("[PERF] sdk-worker: " + label + " +" + (Date.now() - t0) + "ms (local +" + (Date.now() - localT0) + "ms)"); }
   perf("handleQueryStart entered");
 
+  // Socket messages keep arriving while the SDK import awaits. Accept input
+  // and cancellation synchronously, before yielding to the next IPC message.
+  messageQueue = createMessageQueue();
+  abortController = new AbortController();
+  if (msg.prompt) messageQueue.push(msg.prompt);
+
   var sdk;
   try {
     perf("loading SDK");
     sdk = await getSDK();
     perf("SDK loaded");
   } catch (e) {
+    messageQueue.end();
+    messageQueue = null;
+    abortController = null;
+    sdkModule = null;
     sendToDaemon({ type: "query_error", error: "Failed to load SDK: " + (e.message || e), exitCode: null, stderr: null });
     return;
   }
 
-  messageQueue = createMessageQueue();
-  abortController = new AbortController();
-
-  // Push the initial user message
-  if (msg.prompt) {
-    messageQueue.push(msg.prompt);
+  if (abortController.signal.aborted) {
+    messageQueue.end();
+    messageQueue = null;
+    abortController = null;
+    sendToDaemon({ type: "query_done" });
+    return;
   }
 
   // Build query options (callbacks are local, everything else from daemon)

package/package.json

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