clay-server 2.11.0-beta.8 → 2.11.0

package/lib/sessions.js

@@ -10,6 +10,7 @@ function createSessionManager(opts) {
   var sendTo = opts.sendTo || null; // function(ws, obj) - send to specific client
   var sendEach = opts.sendEach || null; // function(fn) - call fn(ws) for each connected client
   var sendAndRecord = null;      // set after init via setSendAndRecord
+  var onSessionDone = opts.onSessionDone || function () {};
 
   // --- Multi-session state ---
   var nextLocalId = 1;
@@ -17,6 +18,7 @@ function createSessionManager(opts) {
   var activeSessionId = null;   // currently active local ID
   var slashCommands = null;     // shared across sessions
   var skillNames = null;        // Claude-only skills to filter from slash menu
+  var singleUserUnread = {};    // sessionLocalId -> unread count (single-user mode)
 
   // --- Session persistence (centralized in ~/.clay/sessions/{encoded-cwd}/) ---
   var sessionsBase = path.join(config.CONFIG_DIR, "sessions");
@@ -191,7 +193,7 @@ function createSessionManager(opts) {
     resolveLoopInfo = fn;
   }
 
-  function mapSessionForClient(s, clientActiveId) {
+  function mapSessionForClient(s, clientActiveId, wsUnread) {
     var loop = s.loop ? Object.assign({}, s.loop) : null;
     if (loop && loop.loopId && resolveLoopInfo) {
       var info = resolveLoopInfo(loop.loopId);
@@ -201,6 +203,7 @@ function createSessionManager(opts) {
       }
     }
     var isActive = (typeof clientActiveId === "number") ? s.localId === clientActiveId : s.localId === activeSessionId;
+    var unreadMap = wsUnread || singleUserUnread;
     return {
       id: s.localId,
       cliSessionId: s.cliSessionId || null,
@@ -211,6 +214,7 @@ function createSessionManager(opts) {
       loop: loop,
       ownerId: s.ownerId || null,
       sessionVisibility: s.sessionVisibility || "shared",
+      unread: unreadMap[s.localId] || 0,
     };
   }
 
@@ -234,10 +238,11 @@ function createSessionManager(opts) {
       sendEach(function (ws, filterFn) {
         var filtered = filterFn ? allVisible.filter(filterFn) : allVisible;
         var clientActiveId = ws._clayActiveSession;
+        var wsUnread = ws._clayUnread || {};
         if (ws.readyState === 1) {
           ws.send(JSON.stringify({
             type: "session_list",
-            sessions: filtered.map(function (s) { return mapSessionForClient(s, clientActiveId); }),
+            sessions: filtered.map(function (s) { return mapSessionForClient(s, clientActiveId, wsUnread); }),
           }));
         }
       });
@@ -325,7 +330,13 @@ function createSessionManager(opts) {
     if (!session) return;
 
     activeSessionId = localId;
-    if (targetWs) targetWs._clayActiveSession = localId;
+    if (targetWs) {
+      targetWs._clayActiveSession = localId;
+      // Clear unread for this session (multi-user)
+      if (targetWs._clayUnread) targetWs._clayUnread[localId] = 0;
+    }
+    // Clear unread for single-user mode
+    singleUserUnread[localId] = 0;
 
     // In multi-user mode with a specific client, only send to that client
     var _send = (targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send;
@@ -357,6 +368,9 @@ function createSessionManager(opts) {
     var session = sessions.get(localId);
     if (!session) return;
 
+    // Clean up unread tracking
+    delete singleUserUnread[localId];
+
     if (session.abortController) {
       try { session.abortController.abort(); } catch(e) {}
     }
@@ -385,6 +399,7 @@ function createSessionManager(opts) {
   function deleteSessionQuiet(localId) {
     var session = sessions.get(localId);
     if (!session) return;
+    delete singleUserUnread[localId];
     if (session.abortController) {
       try { session.abortController.abort(); } catch(e) {}
     }
@@ -411,6 +426,14 @@ function createSessionManager(opts) {
           if (!ioData) ioData = JSON.stringify({ type: "session_io", id: session.localId });
           if (ws.readyState === 1) ws.send(ioData);
         }
+        // Track unread: increment on "done" for clients not viewing this session
+        if (obj.type === "done" && ws._clayActiveSession !== session.localId) {
+          if (!ws._clayUnread) ws._clayUnread = {};
+          ws._clayUnread[session.localId] = (ws._clayUnread[session.localId] || 0) + 1;
+          if (ws.readyState === 1) {
+            ws.send(JSON.stringify({ type: "session_unread", id: session.localId, count: ws._clayUnread[session.localId] }));
+          }
+        }
       });
       if (session.isProcessing && !session._ioThrottle && ioData) {
         session._ioThrottle = true;
@@ -418,11 +441,20 @@ function createSessionManager(opts) {
       }
     } else if (session.localId === activeSessionId) {
       send(obj);
-    } else if (session.isProcessing && !session._ioThrottle) {
-      session._ioThrottle = true;
-      send({ type: "session_io", id: session.localId });
-      setTimeout(function () { session._ioThrottle = false; }, 80);
+    } else {
+      // Track unread for single-user mode on "done"
+      if (obj.type === "done") {
+        singleUserUnread[session.localId] = (singleUserUnread[session.localId] || 0) + 1;
+        send({ type: "session_unread", id: session.localId, count: singleUserUnread[session.localId] });
+      }
+      if (session.isProcessing && !session._ioThrottle) {
+        session._ioThrottle = true;
+        send({ type: "session_io", id: session.localId });
+        setTimeout(function () { session._ioThrottle = false; }, 80);
+      }
     }
+    // Notify server for cross-project unread tracking
+    if (obj.type === "done") onSessionDone();
   }
 
   function resumeSession(cliSessionId, opts, targetWs) {
@@ -550,6 +582,15 @@ function createSessionManager(opts) {
     deleteSessionQuiet: deleteSessionQuiet,
     resumeSession: resumeSession,
     broadcastSessionList: broadcastSessionList,
+    getTotalUnread: function (ws) {
+      var unreadMap = ws && ws._clayUnread ? ws._clayUnread : singleUserUnread;
+      var total = 0;
+      var keys = Object.keys(unreadMap);
+      for (var i = 0; i < keys.length; i++) {
+        total += unreadMap[keys[i]] || 0;
+      }
+      return total;
+    },
     saveSessionFile: saveSessionFile,
     appendToSessionFile: appendToSessionFile,
     sendAndRecord: doSendAndRecord,

package/lib/terminal-manager.js

@@ -74,10 +74,12 @@ function createTerminalManager(opts) {
     var session = terminals.get(id);
     if (!session) return false;
 
+    // Skip scrollback replay if already subscribed (e.g. create then activate)
+    var alreadySubscribed = session.subscribers.has(ws);
     session.subscribers.add(ws);
 
-    // Replay scrollback
-    if (session.scrollback.length > 0) {
+    // Replay scrollback only for newly attached clients
+    if (!alreadySubscribed && session.scrollback.length > 0) {
       var replay = session.scrollback.join("");
       sendTo(ws, { type: "term_output", id: id, data: replay });
     }

package/lib/terminal.js

@@ -32,7 +32,8 @@ function createTerminal(cwd, cols, rows, osUserInfo) {
     if (osUserInfo.shell) shell = osUserInfo.shell;
   }
 
-  var term = pty.spawn(shell, [], spawnOpts);
+  var args = osUserInfo ? ["-l"] : [];
+  var term = pty.spawn(shell, args, spawnOpts);
 
   return term;
 }

package/lib/users.js

@@ -455,6 +455,90 @@ function removeExpiredInvites() {
   if (data.invites.length !== before) saveUsers(data);
 }
 
+// --- DM Favorites ---
+
+function getDmFavorites(userId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      return data.users[i].dmFavorites || [];
+    }
+  }
+  return [];
+}
+
+function addDmFavorite(userId, targetUserId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].dmFavorites) data.users[i].dmFavorites = [];
+      if (data.users[i].dmFavorites.indexOf(targetUserId) === -1) {
+        data.users[i].dmFavorites.push(targetUserId);
+        saveUsers(data);
+      }
+      return data.users[i].dmFavorites;
+    }
+  }
+  return [];
+}
+
+function removeDmFavorite(userId, targetUserId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].dmFavorites) data.users[i].dmFavorites = [];
+      data.users[i].dmFavorites = data.users[i].dmFavorites.filter(function (id) {
+        return id !== targetUserId;
+      });
+      saveUsers(data);
+      return data.users[i].dmFavorites;
+    }
+  }
+  return [];
+}
+
+// --- DM Hidden (dismissed from strip) ---
+
+function getDmHidden(userId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      return data.users[i].dmHidden || [];
+    }
+  }
+  return [];
+}
+
+function addDmHidden(userId, targetUserId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].dmHidden) data.users[i].dmHidden = [];
+      if (data.users[i].dmHidden.indexOf(targetUserId) === -1) {
+        data.users[i].dmHidden.push(targetUserId);
+        saveUsers(data);
+      }
+      return data.users[i].dmHidden;
+    }
+  }
+  return [];
+}
+
+function removeDmHidden(userId, targetUserId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].dmHidden) data.users[i].dmHidden = [];
+      data.users[i].dmHidden = data.users[i].dmHidden.filter(function (id) {
+        return id !== targetUserId;
+      });
+      saveUsers(data);
+      return data.users[i].dmHidden;
+    }
+  }
+  return [];
+}
+
 // --- Project access helpers ---
 
 function canAccessProject(userId, project) {
@@ -464,6 +548,8 @@ function canAccessProject(userId, project) {
   // Admin always has access
   var user = findUserById(userId);
   if (user && user.role === "admin") return true;
+  // Owner always has access to their own project
+  if (project.ownerId && project.ownerId === userId) return true;
   // Private project — check allowedUsers
   var allowed = project.allowedUsers || [];
   return allowed.indexOf(userId) >= 0;
@@ -535,4 +621,10 @@ module.exports = {
   updateLinuxUser: updateLinuxUser,
   generatePin: generatePin,
   createUserByAdmin: createUserByAdmin,
+  getDmFavorites: getDmFavorites,
+  addDmFavorite: addDmFavorite,
+  removeDmFavorite: removeDmFavorite,
+  getDmHidden: getDmHidden,
+  addDmHidden: addDmHidden,
+  removeDmHidden: removeDmHidden,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.11.0-beta.8",
+  "version": "2.11.0",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",