clay-server 3.5.0-beta.1 → 3.5.0-beta.2

package/lib/project-connection.js

@@ -106,13 +106,7 @@ function attachConnection(ctx) {
     var presenceKey = wsUser ? wsUser.id : "_default";
     var storedPresence = userPresence.getPresence(slug, presenceKey);
     if (storedPresence && storedPresence.sessionId) {
-      if (sm.sessions.has(storedPresence.sessionId)) {
-        active = sm.sessions.get(storedPresence.sessionId);
-      } else {
-        sm.sessions.forEach(function (s) {
-          if (s.cliSessionId && s.cliSessionId === storedPresence.sessionId) active = s;
-        });
-      }
+      active = userPresence.findSession(sm.sessions, storedPresence.sessionId);
       if (active && usersModule.isMultiUser() && wsUser) {
         if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) active = null;
       } else if (active && !usersModule.isMultiUser() && active.ownerId) {
@@ -311,7 +305,7 @@ function attachConnection(ctx) {
     }
 
     if (active && !ws._clayPane) {
-      userPresence.setPresence(slug, presenceKey, active.localId, storedPresence ? storedPresence.mateDm : null);
+      userPresence.setPresence(slug, presenceKey, userPresence.sessionIdForPersistence(active), storedPresence ? storedPresence.mateDm : null);
       if (autoCreated) {
         sendTo(ws, { type: "context_sources_state", active: [] });
       }
@@ -338,7 +332,8 @@ function attachConnection(ctx) {
     if (ws._clayActiveSession && !ws._clayPane) {
       var dcPresKey = ws._clayUser ? ws._clayUser.id : "_default";
       var dcExisting = userPresence.getPresence(slug, dcPresKey);
-      userPresence.setPresence(slug, dcPresKey, ws._clayActiveSession, dcExisting ? dcExisting.mateDm : null);
+      var dcSession = sm.sessions.get(ws._clayActiveSession);
+      userPresence.setPresence(slug, dcPresKey, userPresence.sessionIdForPersistence(dcSession), dcExisting ? dcExisting.mateDm : null);
     }
     tm.detachAll(ws);
     clients.delete(ws);

package/lib/project-sessions.js

@@ -542,7 +542,7 @@ function attachSessions(ctx) {
         send({ type: "last_vendor", vendor: msg.vendor });
       }
       var nsPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-      if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, newSess.localId, null);
+      if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, userPresence.sessionIdForPersistence(newSess), null);
       if (usersModule.isMultiUser() && !ws._clayPane) {
         broadcastPresence();
       }
@@ -684,7 +684,7 @@ function attachSessions(ctx) {
           sendTo(ws, { type: "context_sources_state", active: switchedSources });
         }
         var swPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-        if (!ws._clayPane) userPresence.setPresence(slug, swPresKey, msg.id, null);
+        if (!ws._clayPane) userPresence.setPresence(slug, swPresKey, userPresence.sessionIdForPersistence(switchTargetSess), null);
       }
       return true;
     }

package/lib/user-presence.js

@@ -7,6 +7,21 @@ var store = {};
 var presencePath = path.join(config.CONFIG_DIR, "user-presence.json");
 var saveTimer = null;
 
+function sessionIdForPersistence(session) {
+  if (!session) return null;
+  return session.cliSessionId || session.localId || null;
+}
+
+function findSession(sessions, sessionId) {
+  if (!sessions || sessionId == null) return null;
+  var found = null;
+  sessions.forEach(function (session) {
+    if (session.cliSessionId && session.cliSessionId === sessionId) found = session;
+  });
+  if (found) return found;
+  return typeof sessionId === "number" ? (sessions.get(sessionId) || null) : null;
+}
+
 // Load from disk on startup
 function load() {
   try {
@@ -84,6 +99,8 @@ function clearSession(slug, sessionId) {
 load();
 
 module.exports = {
+  sessionIdForPersistence: sessionIdForPersistence,
+  findSession: findSession,
   setPresence: setPresence,
   getPresence: getPresence,
   setMateDm: setMateDm,

package/package.json

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