clay-server 2.23.0-beta.1 → 2.23.0-beta.3

package/lib/daemon.js

@@ -791,9 +791,10 @@ var relay = createServer({
   onGetProjectAccess: function (slug) {
     for (var i = 0; i < config.projects.length; i++) {
       if (config.projects[i].slug === slug) {
+        var isMateProject = slug.indexOf("mate-") === 0;
         return {
           slug: slug,
-          visibility: config.projects[i].visibility || "public",
+          visibility: isMateProject ? "private" : (config.projects[i].visibility || "public"),
           allowedUsers: config.projects[i].allowedUsers || [],
           ownerId: config.projects[i].ownerId || null,
         };

package/lib/mates.js

@@ -409,17 +409,12 @@ function enforceTeamAwareness(filePath) {
     content = content.substring(0, teamIdx).trimEnd() + content.substring(endOfTeam);
   }
 
-  // Insert before project registry, session memory, or crisis safety section if present, otherwise append
-  var projRegPos = content.indexOf(PROJECT_REGISTRY_MARKER);
-  var sessionMemPos = content.indexOf(SESSION_MEMORY_MARKER);
-  var crisisPos = content.indexOf(crisisSafety.MARKER);
+  // Insert before the first subsequent system section (in order)
   var insertBefore = -1;
-  if (projRegPos !== -1) {
-    insertBefore = projRegPos;
-  } else if (sessionMemPos !== -1) {
-    insertBefore = sessionMemPos;
-  } else if (crisisPos !== -1) {
-    insertBefore = crisisPos;
+  var teamInsertCandidates = [PROJECT_REGISTRY_MARKER, SESSION_MEMORY_MARKER, STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+  for (var ti = 0; ti < teamInsertCandidates.length; ti++) {
+    var tip = content.indexOf(teamInsertCandidates[ti]);
+    if (tip !== -1) { insertBefore = tip; break; }
   }
   if (insertBefore !== -1) {
     content = content.substring(0, insertBefore).trimEnd() + TEAM_SECTION + "\n\n" + content.substring(insertBefore);

package/lib/project.js

@@ -1367,7 +1367,7 @@ function createProjectContext(opts) {
     if (active) {
       userPresence.setPresence(slug, presenceKey, active.localId, storedPresence ? storedPresence.mateDm : null);
     }
-    if (storedPresence && storedPresence.mateDm) {
+    if (storedPresence && storedPresence.mateDm && !isMate) {
       sendTo(ws, { type: "restore_mate_dm", mateId: storedPresence.mateDm });
     }
 
@@ -1870,8 +1870,12 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "set_mate_dm") {
-      var dmPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-      userPresence.setMateDm(slug, dmPresKey, msg.mateId || null);
+      // Only store mateDm on non-mate projects (main project presence).
+      // Mate projects should never hold mateDm to avoid circular restore loops.
+      if (!isMate) {
+        var dmPresKey = ws._clayUser ? ws._clayUser.id : "_default";
+        userPresence.setMateDm(slug, dmPresKey, msg.mateId || null);
+      }
       return;
     }
 
@@ -7041,11 +7045,6 @@ function createProjectContext(opts) {
     var claudeMdPath = path.join(cwd, "CLAUDE.md");
     // Enforce immediately on startup
     try { matesModule.enforceTeamAwareness(claudeMdPath); } catch (e) {}
-    try {
-      var _projList = getProjectList();
-      var _projData = _projList.filter(function (p) { return !p.isMate && !p.isWorktree; }).map(function (p) { return { slug: p.slug, path: p.path, title: p.title || p.project, icon: p.icon }; });
-      matesModule.enforceProjectRegistry(claudeMdPath, _projData);
-    } catch (e) {}
     try { matesModule.enforceSessionMemory(claudeMdPath); } catch (e) {}
     try { matesModule.enforceStickyNotes(claudeMdPath); } catch (e) {}
     try { matesModule.enforceDebateAwareness(claudeMdPath); } catch (e) {}
@@ -7069,11 +7068,8 @@ function createProjectContext(opts) {
         crisisDebounce = setTimeout(function () {
           crisisDebounce = null;
           try { matesModule.enforceTeamAwareness(claudeMdPath); } catch (e) {}
-          try {
-            var _projList2 = getProjectList();
-            var _projData2 = _projList2.filter(function (p) { return !p.isMate && !p.isWorktree; }).map(function (p) { return { slug: p.slug, path: p.path, title: p.title || p.project, icon: p.icon }; });
-            matesModule.enforceProjectRegistry(claudeMdPath, _projData2);
-          } catch (e) {}
+          // Note: project registry is NOT enforced in the watcher to avoid
+          // write cascades (server.js scheduleProjectRegistryRefresh handles updates)
           try { matesModule.enforceSessionMemory(claudeMdPath); } catch (e) {}
           try { matesModule.enforceStickyNotes(claudeMdPath); } catch (e) {}
           try { matesModule.enforceDebateAwareness(claudeMdPath); } catch (e) {}

package/lib/public/app.js

@@ -607,8 +607,16 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     dmTargetUser = targetUser;
 
     // Notify server of active mate DM (server-side presence tracking)
-    if (targetUser && targetUser.isMate && ws && ws.readyState === 1) {
-      try { ws.send(JSON.stringify({ type: "set_mate_dm", mateId: targetUser.id })); } catch(e) {}
+    // IMPORTANT: set_mate_dm must go to the MAIN project, not a mate project WS.
+    // When switching between mates, ws points to the current mate project,
+    // so we defer sending set_mate_dm until we reconnect to the main project's context.
+    // The server will also receive it via the mate project's onDmMessage handler,
+    // but the presence should only be stored on the main project slug.
+    if (targetUser && targetUser.isMate) {
+      // Send to the current WS only if it's the main project (not another mate)
+      if (!mateProjectSlug && ws && ws.readyState === 1) {
+        try { ws.send(JSON.stringify({ type: "set_mate_dm", mateId: targetUser.id })); } catch(e) {}
+      }
     }
 
     // Clear unread for this user
@@ -972,7 +980,8 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
   function connectMateProject(slug) {
     mateProjectSlug = slug;
-    savedMainSlug = currentSlug;
+    // Only save the main slug on the FIRST mate switch (preserve original main project)
+    if (!savedMainSlug) savedMainSlug = currentSlug;
     currentSlug = slug;
     wsPath = "/p/" + slug + "/ws";
     resetClientState();

package/lib/public/modules/admin.js

@@ -764,8 +764,8 @@ function renderSmtpTab(body, cfg) {
 // --- Projects ---
 function loadProjectsTab(body) {
   var projectList = (ctx && ctx.projectList) || [];
-  // Exclude worktree projects (they inherit parent settings)
-  projectList = projectList.filter(function (p) { return !p.isWorktree; });
+  // Exclude worktree and mate projects (mates are always private to their owner)
+  projectList = projectList.filter(function (p) { return !p.isWorktree && !p.isMate; });
   cachedProjects = projectList;
 
   if (projectList.length === 0) {

package/lib/server.js

@@ -2931,28 +2931,9 @@ function createServer(opts) {
     });
     projects.set(slug, ctx);
     ctx.warmup();
-    refreshMateProjectRegistries();
     return true;
   }
 
-  // --- Refresh project registry on all mate CLAUDE.md files ---
-  function refreshMateProjectRegistries() {
-    var projList = [];
-    projects.forEach(function (ctx) {
-      var status = ctx.getStatus();
-      if (!status.isMate && !status.isWorktree) {
-        projList.push({ slug: status.slug, path: status.path, title: status.title || status.project, icon: status.icon });
-      }
-    });
-    projects.forEach(function (ctx) {
-      var status = ctx.getStatus();
-      if (status.isMate) {
-        var claudeMdPath = path.join(status.path, "CLAUDE.md");
-        try { mates.enforceProjectRegistry(claudeMdPath, projList); } catch (e) {}
-      }
-    });
-  }
-
   // --- DM message handler (server-level, cross-project) ---
   function handleDmMessage(ws, msg) {
     if (!users.isMultiUser() || !ws._clayUser) return;
@@ -3335,7 +3316,6 @@ function createServer(opts) {
     if (!ctx) return false;
     ctx.destroy();
     projects.delete(slug);
-    refreshMateProjectRegistries();
     return true;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.23.0-beta.1",
+  "version": "2.23.0-beta.3",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",