clay-server 4.0.0-beta.21 → 4.0.0-beta.22

package/lib/public/app.js

@@ -277,6 +277,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     projectName: projectName,
     cwd: "",
     currentSlug: currentSlug,
+    activeProjectSlug: null,
+    sessionActivatedProjectSlug: null,
+    socketPath: null,
+    pendingHomeProjectSlug: null,
     currentProjectOwnerId: null,
     isOsUsers: false,
     skipPermsEnabled: false,

package/lib/public/modules/app-connection.js

@@ -221,15 +221,24 @@ export function connect() {
   // two sockets can never both be pinging.
   stopHeartbeat();
   if (ws && ws.readyState === 1) setStatus("disconnected");
-  if (ws) { ws.onclose = null; ws.close(); }
+  if (ws) {
+    ws.onopen = null;
+    ws.onmessage = null;
+    ws.onerror = null;
+    ws.onclose = null;
+    ws.close();
+  }
   if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
 
   var protocol = location.protocol === "https:" ? "wss:" : "ws:";
-  var newWs = new WebSocket(protocol + "//" + location.host + store.get('wsPath'));
+  var socketPath = store.get('wsPath');
+  store.set({ socketPath: socketPath, activeProjectSlug: null, sessionActivatedProjectSlug: null });
+  var newWs = new WebSocket(protocol + "//" + location.host + socketPath);
   setWs(newWs);
 
   // If not connected within 3s, force retry
   connectTimeoutId = setTimeout(function () {
+    if (getWs() !== newWs) return;
     if (!store.get('connected')) {
       newWs.onclose = null;
       newWs.onerror = null;
@@ -239,6 +248,7 @@ export function connect() {
   }, 3000);
 
   newWs.onopen = function () {
+    if (getWs() !== newWs) return;
     if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
     if (hasConnectedOnce && disconnectedAt) {
       console.log("[clay] WebSocket reconnected after " + (Date.now() - disconnectedAt) + "ms");
@@ -267,6 +277,7 @@ export function connect() {
   };
 
   newWs.onclose = function (e) {
+    if (getWs() !== newWs) return;
     if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
     stopHeartbeat();
     disconnectedAt = Date.now();
@@ -277,6 +288,7 @@ export function connect() {
         " reason=" + (e.reason || "(none)") + " wasClean=false");
     }
     closeDmUserPicker();
+    store.set({ activeProjectSlug: null, sessionActivatedProjectSlug: null });
     setStatus("disconnected");
     setActivity(null);
     scheduleReconnect();
@@ -285,6 +297,7 @@ export function connect() {
   newWs.onerror = function () {};
 
   newWs.onmessage = function (event) {
+    if (getWs() !== newWs) return;
     // Backup: if we're receiving messages, we're connected
     if (!store.get('connected')) {
       setStatus("connected");

package/lib/public/modules/app-home-hub.js

@@ -3,6 +3,7 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { getCachedProjects, switchProject } from './app-projects.js';
+import { chooseProjectActivationTarget } from './project-activation.js';
 import { mateAvatarUrl } from './avatar.js';
 import { exitDmMode } from './app-dm.js';
 import { closeHomeDock, initHomeDock, renderDock, requestHomeDockPreference } from './home-dock.js';
@@ -45,18 +46,10 @@ function syncHomeCloseControl() {
 }
 
 function getHomeReturnSlug() {
-  var projects = getCachedProjects() || [];
-  var candidates = [store.get('currentSlug'), store.get('homeSurfaceProjectSlug')];
-  for (var ci = 0; ci < candidates.length; ci++) {
-    if (!candidates[ci]) continue;
-    for (var pi = 0; pi < projects.length; pi++) {
-      if (projects[pi] && !projects[pi].isMate && projects[pi].slug === candidates[ci]) return candidates[ci];
-    }
-  }
-  for (var i = 0; i < projects.length; i++) {
-    if (projects[i] && !projects[i].isMate && projects[i].slug) return projects[i].slug;
-  }
-  return null;
+  return chooseProjectActivationTarget(
+    getCachedProjects(),
+    [store.get('currentSlug'), store.get('homeSurfaceProjectSlug')]
+  );
 }
 
 function getVisibleMates() {
@@ -407,7 +400,6 @@ export function hideHomeHub() {
 export function minimizeHomeHub() {
   var slug = getHomeReturnSlug();
   if (!slug || !homeHubVisible) return;
-  rememberHomePrimarySurface("project");
   switchProject(slug);
   var projectInput = document.getElementById("input");
   if (projectInput && !projectInput.disabled) projectInput.focus({ preventScroll: true });

package/lib/public/modules/app-messages.js

@@ -63,7 +63,7 @@ import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
 import { selectDefaultVendorForBlankSession } from './vendor-selection.js';
 import { getModelInfoUpdate, modelEntryValue, modelEntryMatches, handleModelSelectionResult, requestVendorModels } from './model-picker.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
-import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
+import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress, finishProjectSessionActivation } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
 import { hideHomeHub, showHomeHub } from './app-home-hub.js';
 import { handleToolsState, handleToolInstalled, handleToolRemoved, handleToolStorageResult, handleToolLlmResult, handleToolsError, handleToolControlRequest, handleToolServerState, handleToolServerEvent, handleCapsuleGameSession } from './home-tools.js';
@@ -311,7 +311,7 @@ export function processMessage(msg) {
         detachTuiView();
         store.set({ projectName: msg.project || msg.cwd, vendorInfo: msg.vendors || {} });
         if (msg.cwd) store.set({ cwd: msg.cwd });
-        if (msg.slug) store.set({ currentSlug: msg.slug });
+        if (msg.slug) store.set({ currentSlug: msg.slug, activeProjectSlug: msg.slug });
         try { var _is = store.snap(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
         // In mate DM, keep title as mate name and re-apply mate color
         if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) {
@@ -762,7 +762,6 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
-        hideHomeHub();
         closeWhatsNewArticle();
         // Save draft from outgoing session
         var _prevSid = store.get('activeSessionId');
@@ -860,6 +859,7 @@ export function processMessage(msg) {
         // Reload survival: a restored active session that is a split-group
         // member reopens its group (no-op when a split is already open).
         maybeRestoreSplitGroup();
+        if (finishProjectSessionActivation()) hideHomeHub();
         break;
 
       case "session_full_access_changed":

package/lib/public/modules/app-projects.js

@@ -36,6 +36,8 @@ import { resetDebateState } from './debate.js';
 import { removeDebateBottomBar } from './app-debate-ui.js';
 import { closeProjectSettings } from './project-settings.js';
 import { chooseProjectAfterRemoval } from './project-removal-target.js';
+import { isProjectActivated, isProjectActivationPending, isProjectContextConnected, projectWsPath } from './project-activation.js';
+import { rememberHomePrimarySurface } from './home-surface.js';
 
 // --- Module-owned state ---
 var cachedProjects = [];
@@ -417,30 +419,32 @@ export function switchProject(slug) {
   if (!slug) return;
   document.cookie = "clay_last_project=" + encodeURIComponent(slug) + "; Path=/; SameSite=Strict; Max-Age=31536000";
   var st = store.snap();
-  var targetWsPath = "/p/" + slug + "/ws";
-  var alreadyInProject = slug === st.currentSlug && st.wsPath === targetWsPath;
+  var ws = getWs();
+  var targetWsPath = projectWsPath(slug);
+  var homeVisible = isHomeHubVisible();
+  var alreadyInProject = isProjectActivated(st, slug, ws);
   var wasDm = st.dmMode;
   var wasMate = st.dmMode && st.dmTargetUser && st.dmTargetUser.isMate;
   if (st.dmMode) exitDmMode(wasMate);
   closeWhatsNewArticle();
-  if (isHomeHubVisible()) {
+  if (homeVisible && alreadyInProject) {
+    rememberHomePrimarySurface("project", slug);
     hideHomeHub();
-    if (alreadyInProject) {
-      if (document.documentElement.classList.contains("pwa-standalone")) {
-        history.replaceState(null, "", "/p/" + slug + "/");
-      } else {
-        history.pushState(null, "", "/p/" + slug + "/");
-      }
-      return;
+    if (document.documentElement.classList.contains("pwa-standalone")) {
+      history.replaceState(null, "", "/p/" + slug + "/");
+    } else {
+      history.pushState(null, "", "/p/" + slug + "/");
     }
+    return;
   }
   if (alreadyInProject) {
-    var ws = getWs();
     if (wasDm && ws && ws.readyState === 1) {
       ws.send(JSON.stringify({ type: "switch_session", id: store.get('activeSessionId') }));
     }
     return;
   }
+  if (homeVisible) store.set({ pendingHomeProjectSlug: slug });
+  if (isProjectActivationPending(store.snap(), slug, ws)) return;
   resetFileBrowser();
   closeNotesBrowser();
   hideMemory();
@@ -449,13 +453,42 @@ export function switchProject(slug) {
   store.set({ currentSlug: slug });
   store.set({ basePath: "/p/" + slug + "/" });
   store.set({ wsPath: targetWsPath });
+  if (!homeVisible) {
+    if (document.documentElement.classList.contains("pwa-standalone")) {
+      history.replaceState(null, "", "/p/" + slug + "/");
+    } else {
+      history.pushState(null, "", "/p/" + slug + "/");
+    }
+  }
+  resetClientState();
+  connect();
+}
+
+export function completePendingProjectActivation() {
+  var slug = store.get('pendingHomeProjectSlug');
+  if (!slug || !isProjectActivated(store.snap(), slug, getWs())) return false;
+  store.set({ pendingHomeProjectSlug: null });
+  rememberHomePrimarySurface("project", slug);
   if (document.documentElement.classList.contains("pwa-standalone")) {
     history.replaceState(null, "", "/p/" + slug + "/");
   } else {
     history.pushState(null, "", "/p/" + slug + "/");
   }
-  resetClientState();
-  connect();
+  return true;
+}
+
+export function confirmCurrentProjectSessionActivation() {
+  var slug = store.get('activeProjectSlug');
+  if (!slug || !isProjectContextConnected(store.snap(), slug, getWs())) return false;
+  store.set({ sessionActivatedProjectSlug: slug });
+  return true;
+}
+
+export function finishProjectSessionActivation() {
+  var confirmed = confirmCurrentProjectSessionActivation();
+  if (!confirmed) return false;
+  if (!store.get('pendingHomeProjectSlug')) return true;
+  return completePendingProjectActivation();
 }
 
 export function showUpdateAvailable(msg) {

package/lib/public/modules/project-activation.js

@@ -0,0 +1,45 @@
+// Pure project activation and Home-return selection helpers.
+
+export function projectWsPath(slug) {
+  return slug ? "/p/" + slug + "/ws" : null;
+}
+
+export function chooseProjectActivationTarget(projects, candidates) {
+  var available = Array.isArray(projects) ? projects : [];
+  var preferred = Array.isArray(candidates) ? candidates : [];
+  for (var ci = 0; ci < preferred.length; ci++) {
+    if (!preferred[ci]) continue;
+    for (var pi = 0; pi < available.length; pi++) {
+      if (available[pi] && !available[pi].isMate && available[pi].slug === preferred[ci]) return preferred[ci];
+    }
+  }
+  for (var i = 0; i < available.length; i++) {
+    if (available[i] && !available[i].isMate && available[i].slug) return available[i].slug;
+  }
+  return null;
+}
+
+export function isProjectActivationPending(state, slug, socket) {
+  var target = projectWsPath(slug);
+  return !!target
+    && state.currentSlug === slug
+    && state.wsPath === target
+    && state.socketPath === target
+    && !!socket
+    && (socket.readyState === 0 || socket.readyState === 1);
+}
+
+export function isProjectActivated(state, slug, socket) {
+  return isProjectActivationPending(state, slug, socket)
+    && socket.readyState === 1
+    && state.connected === true
+    && state.activeProjectSlug === slug
+    && state.sessionActivatedProjectSlug === slug;
+}
+
+export function isProjectContextConnected(state, slug, socket) {
+  return isProjectActivationPending(state, slug, socket)
+    && socket.readyState === 1
+    && state.connected === true
+    && state.activeProjectSlug === slug;
+}

package/lib/session-visibility.js

@@ -25,9 +25,11 @@ function handleChange(ctx, ws, msg) {
 
 function revokeViewers(ctx, session) {
   if (ctx.usersModule.isMultiUser() && session.sessionVisibility === "private") {
+    var project = ctx.getProjectAccess ? ctx.getProjectAccess() : null;
     ctx.clients.forEach(function(client) {
       if (client._clayActiveSession !== session.localId) return;
-      if (client._clayUser && client._clayUser.id === session.ownerId) return;
+      var userId = client._clayUser && client._clayUser.id;
+      if (userId && ctx.usersModule.canAccessSession(userId, session, project)) return;
       // Clear the server-side selection before reconnecting so no further
       // session events or input can cross the revoked access boundary.
       client._clayActiveSession = null;

package/lib/users-permissions.js

@@ -89,11 +89,11 @@ function attachPermissions(deps) {
   function canAccessSession(userId, session, project) {
     // Must have project access first
     if (!canAccessProject(userId, project)) return false;
+    // Resolve the stored user record so client-supplied roles cannot elevate access.
+    var user = findUserById(userId);
+    if (user && user.role === "admin") return true;
     // Sessions without ownerId are legacy -- only admin can see them
-    if (!session.ownerId) {
-      var user = findUserById(userId);
-      return !!(user && user.role === "admin");
-    }
+    if (!session.ownerId) return false;
     // Owner can always see their own sessions
     if (session.ownerId === userId) return true;
     // Sharing is opt-in; missing or invalid visibility stays private.

package/package.json

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