clay-server 4.0.1-beta.1 → 4.1.0-beta.2

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

@@ -14,6 +14,8 @@ import { switchProject, openAddProjectModal, getCachedProjects } from './app-pro
 import { showHomeHub } from './app-home-hub.js';
 import { getPendingTuiAttention } from './app-notifications.js';
 import { isExternalWorktree, externalWorktreeTooltip, appendExternalWorktreeBadge } from './worktree-location.js';
+import { groupProjects } from './project-grouping.js';
+import { showProjectAccessPopover } from './project-access.js';
 
 // --- Project state ---
 var cachedProjectList = [];
@@ -22,9 +24,6 @@ var cachedCurrentSlug = null;
 // --- Project context menu ---
 var projectCtxMenu = null;
 
-// --- Project Access Popover ---
-var projectAccessPopover = null;
-
 // --- Emoji picker ---
 var emojiPickerEl = null;
 
@@ -338,149 +337,6 @@ function getProjectAbbrev(name) {
 
 export { getProjectAbbrev };
 
-// --- Project Access Popover ---
-
-function closeAccessOnOutside(e) {
-  if (projectAccessPopover && !projectAccessPopover.contains(e.target)) closeProjectAccessPopover();
-}
-function closeAccessOnEscape(e) {
-  if (e.key === "Escape") closeProjectAccessPopover();
-}
-
-function closeProjectAccessPopover() {
-  if (projectAccessPopover) {
-    projectAccessPopover.remove();
-    projectAccessPopover = null;
-    document.removeEventListener("click", closeAccessOnOutside);
-    document.removeEventListener("keydown", closeAccessOnEscape);
-  }
-}
-
-function showProjectAccessPopover(anchorEl, slug) {
-  closeProjectAccessPopover();
-
-  var popover = document.createElement("div");
-  popover.className = "project-access-popover";
-  popover.innerHTML = '<div class="project-access-loading">Loading...</div>';
-  popover.addEventListener("click", function (e) { e.stopPropagation(); });
-  document.body.appendChild(popover);
-  projectAccessPopover = popover;
-
-  requestAnimationFrame(function () {
-    var rect = anchorEl.getBoundingClientRect();
-    popover.style.position = "fixed";
-    popover.style.left = (rect.right + 8) + "px";
-    popover.style.top = rect.top + "px";
-    popover.style.zIndex = "9999";
-    var popRect = popover.getBoundingClientRect();
-    if (popRect.right > window.innerWidth - 8) {
-      popover.style.left = (rect.left - popRect.width - 8) + "px";
-    }
-    if (popRect.bottom > window.innerHeight - 8) {
-      popover.style.top = (window.innerHeight - popRect.height - 8) + "px";
-    }
-  });
-
-  setTimeout(function () {
-    document.addEventListener("click", closeAccessOnOutside);
-    document.addEventListener("keydown", closeAccessOnEscape);
-  }, 0);
-
-  Promise.all([
-    fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/access").then(function (r) { return r.json(); }),
-    fetch("/api/admin/users").then(function (r) { return r.json(); }),
-  ]).then(function (results) {
-    var access = results[0];
-    var usersData = results[1];
-    if (access.error || usersData.error) {
-      popover.innerHTML = '<div class="project-access-loading">Failed to load</div>';
-      return;
-    }
-    renderAccessPopover(popover, slug, access, usersData.users || []);
-  }).catch(function () {
-    popover.innerHTML = '<div class="project-access-loading">Failed to load</div>';
-  });
-}
-
-function renderAccessPopover(popover, slug, access, allUsers) {
-  var visibility = access.visibility || "public";
-  var allowedUsers = access.allowedUsers || [];
-  var ownerId = access.ownerId;
-
-  var selectableUsers = allUsers.filter(function (u) { return u.id !== ownerId; });
-
-  var html = '';
-  html += '<div class="project-access-header">';
-  html += '<span class="project-access-title">Project Access</span>';
-  html += '<button class="project-access-close">&times;</button>';
-  html += '</div>';
-
-  html += '<div class="project-access-section">';
-  html += '<label class="project-access-label">Visibility</label>';
-  html += '<div class="project-access-vis-row">';
-  html += '<button class="project-access-vis-btn' + (visibility === "private" ? ' active' : '') + '" data-vis="private">';
-  html += iconHtml("lock") + ' Private';
-  html += '</button>';
-  html += '<button class="project-access-vis-btn' + (visibility === "public" ? ' active' : '') + '" data-vis="public">';
-  html += iconHtml("globe") + ' Public';
-  html += '</button>';
-  html += '</div>';
-  html += '</div>';
-
-  html += '<div class="project-access-section project-access-users-section"' + (visibility !== "private" ? ' style="display:none"' : '') + '>';
-  html += '<label class="project-access-label">Allowed Users</label>';
-  html += '<div class="project-access-user-list">';
-  for (var i = 0; i < selectableUsers.length; i++) {
-    var u = selectableUsers[i];
-    var checked = allowedUsers.indexOf(u.id) !== -1 ? " checked" : "";
-    html += '<label class="project-access-user-item">';
-    html += '<input type="checkbox" data-uid="' + u.id + '"' + checked + '>';
-    html += '<span>' + escapeHtml(u.displayName || u.username || u.id) + '</span>';
-    html += '</label>';
-  }
-  if (selectableUsers.length === 0) {
-    html += '<div class="project-access-empty">No other users</div>';
-  }
-  html += '</div>';
-  html += '</div>';
-
-  popover.innerHTML = html;
-  refreshIcons();
-
-  popover.querySelector(".project-access-close").addEventListener("click", function () {
-    closeProjectAccessPopover();
-  });
-
-  popover.querySelectorAll(".project-access-vis-btn").forEach(function (btn) {
-    btn.addEventListener("click", function () {
-      var newVis = btn.dataset.vis;
-      popover.querySelectorAll(".project-access-vis-btn").forEach(function (b) { b.classList.remove("active"); });
-      btn.classList.add("active");
-      var usersSection = popover.querySelector(".project-access-users-section");
-      if (usersSection) usersSection.style.display = newVis === "private" ? "" : "none";
-      fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/visibility", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ visibility: newVis }),
-      });
-    });
-  });
-
-  popover.querySelectorAll('.project-access-user-item input[type="checkbox"]').forEach(function (cb) {
-    cb.addEventListener("change", function () {
-      var selected = [];
-      popover.querySelectorAll('.project-access-user-item input[type="checkbox"]:checked').forEach(function (c) {
-        selected.push(c.dataset.uid);
-      });
-      fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/users", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ allowedUsers: selected }),
-      });
-    });
-  });
-}
-
 // --- Project context menu ---
 
 export function closeProjectCtxMenu() {
@@ -603,7 +459,7 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
   menu.appendChild(shareItem);
 
   // --- Manage Access ---
-  if (store.get('isMultiUserMode') && slug.indexOf("--") === -1) {
+  if (store.get('isMultiUserMode')) {
     var isProjectOwner = store.get('myUserId') && store.get('currentProjectOwnerId') && store.get('myUserId') === store.get('currentProjectOwnerId');
     var isAdmin = store.get('permissions') && store.get('permissions').projectSettings !== false;
     if (isProjectOwner || isAdmin) {
@@ -624,15 +480,17 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
   menu.appendChild(sep2);
 
   // --- Add Worktree ---
-  var wtItem = document.createElement("button");
-  wtItem.className = "project-ctx-item";
-  wtItem.innerHTML = iconHtml("git-branch") + " <span>Add Worktree</span>";
-  wtItem.addEventListener("click", function (e) {
-    e.stopPropagation();
-    closeProjectCtxMenu();
-    showWorktreeModal(slug, name || slug);
-  });
-  menu.appendChild(wtItem);
+  if (slug.indexOf("--") === -1) {
+    var wtItem = document.createElement("button");
+    wtItem.className = "project-ctx-item";
+    wtItem.innerHTML = iconHtml("git-branch") + " <span>Add Worktree</span>";
+    wtItem.addEventListener("click", function (e) {
+      e.stopPropagation();
+      closeProjectCtxMenu();
+      showWorktreeModal(slug, name || slug);
+    });
+    menu.appendChild(wtItem);
+  }
 
   if (!store.get('permissions') || store.get('permissions').deleteProject !== false) {
     var sep3 = document.createElement("div");
@@ -959,21 +817,6 @@ function setWtCollapsed(slug, collapsed) {
   wtCollapsed[slug] = collapsed;
 }
 
-function groupProjects(projects) {
-  var parents = [];
-  var wtByParent = {};
-  for (var i = 0; i < projects.length; i++) {
-    var p = projects[i];
-    if (p.isWorktree && p.parentSlug) {
-      if (!wtByParent[p.parentSlug]) wtByParent[p.parentSlug] = [];
-      wtByParent[p.parentSlug].push(p);
-    } else {
-      parents.push(p);
-    }
-  }
-  return { parents: parents, wtByParent: wtByParent };
-}
-
 // --- Icon item creation ---
 
 function createIconItem(p, currentSlug) {

package/lib/public/modules/worker-proposal.js

@@ -98,6 +98,8 @@ function statusLabel(status) {
   if (status === "completed") return "Completed";
   if (status === "interrupted") return "Interrupted";
   if (status === "declined") return "Continuing here";
+  if (status === "cancelled") return "Cancelled";
+  if (status === "superseded") return "Superseded";
   if (status === "error") return "Needs attention";
   return "Awaiting your choice";
 }
@@ -106,6 +108,8 @@ function decisionLabel(status, autoAccepted) {
   if (autoAccepted) return "Driver recommendation auto-accepted under Full auto";
   if (status === "pending") return "Runtime choice remains with you";
   if (status === "declined") return "Runtime proposal declined by user";
+  if (status === "cancelled") return "Runtime proposal cancelled by Driver";
+  if (status === "superseded") return "Replaced by a newer runtime proposal";
   return "Runtime configuration accepted by user";
 }
 

package/lib/sdk-bridge.js

@@ -627,8 +627,18 @@ function createSDKBridge(opts) {
     var PAIR_MCP_PREFIX = "mcp__clay-sessions__";
     var pairMcpTools = {
       propose_worker: true,
+      inspect_worker_proposal: true,
+      cancel_worker_proposal: true,
+      worker_runtime_catalog: true,
       send_to_partner: true,
       read_partner: true,
+      message_partner: true,
+      queue_partner_followup: true,
+      inspect_partner_followups: true,
+      cancel_partner_followup: true,
+      replace_partner_task: true,
+      resume_partner_task: true,
+      report_partner_outcome: true,
       partner_status: true,
       replace_partner: true,
       interrupt_partner: true,
@@ -638,6 +648,16 @@ function createSDKBridge(opts) {
     };
     var pairDynamicTools = {
       propose_worker: true,
+      inspect_worker_proposal: true,
+      cancel_worker_proposal: true,
+      worker_runtime_catalog: true,
+      message_partner: true,
+      queue_partner_followup: true,
+      inspect_partner_followups: true,
+      cancel_partner_followup: true,
+      replace_partner_task: true,
+      resume_partner_task: true,
+      report_partner_outcome: true,
       partner_status: true,
       replace_partner: true,
       interrupt_partner: true,

package/lib/server-admin.js

@@ -632,9 +632,9 @@ function attachAdmin(ctx) {
         return true;
       }
       var projSlug = fullUrl.split("/")[4];
-      if (projSlug.indexOf("--") !== -1) {
-        res.writeHead(400, { "Content-Type": "application/json" });
-        res.end('{"error":"Worktree projects inherit parent settings"}');
+      if (!projects.get(projSlug)) {
+        res.writeHead(404, { "Content-Type": "application/json" });
+        res.end('{"error":"Project not found"}');
         return true;
       }
       var body = "";

package/lib/server-global-ws.js

@@ -40,6 +40,8 @@ function attachGlobalWs(opts) {
   var onCloneProject = opts.onCloneProject;
   var onHomePreferenceMessage = opts.onHomePreferenceMessage;
   var onAppMessage = opts.onAppMessage;
+  var onConnection = opts.onConnection;
+  var clients = new Set();
 
   function handleMessage(ws, msg) {
     if (!msg || typeof msg !== "object") return;
@@ -184,16 +186,24 @@ function attachGlobalWs(opts) {
 
   function handleConnection(ws, wsUser) {
     ws._clayUser = wsUser || null;
+    clients.add(ws);
+    ws.on("close", function () { clients.delete(ws); });
     ws.on("message", function (data) {
       var msg;
       try { msg = JSON.parse(data); } catch (e) { return; }
       handleMessage(ws, msg);
     });
+    if (typeof onConnection === "function") onConnection(ws);
+  }
+
+  function forEachClient(visitor) {
+    clients.forEach(function (ws) { visitor(ws); });
   }
 
   return {
     handleConnection: handleConnection,
     handleMessage: handleMessage,
+    forEachClient: forEachClient,
   };
 }
 

package/lib/server-mates.js

@@ -20,11 +20,12 @@ function attachMates(ctx) {
       var projList = [];
       projects.forEach(function (pCtx, pSlug) {
         var st = pCtx.getStatus();
-        if (st.isMate || st.isWorktree) return;
+        if (st.isMate) return;
         // Filter by user access in multi-user mode
-        if (userId && users.isMultiUser() && onGetProjectAccess) {
+        if (users.isMultiUser() && onGetProjectAccess) {
+          if (!userId) return;
           var access = onGetProjectAccess(pSlug);
-          if (access && !access.error && !users.canAccessProject(userId, access)) return;
+          if (!access || access.error || !users.canAccessProject(userId, access)) return;
         }
         projList.push(st);
       });

package/lib/server-palette.js

@@ -5,6 +5,17 @@ function attachPalette(ctx) {
   var projects = ctx.projects;
   var getMultiUserFromReq = ctx.getMultiUserFromReq;
   var onGetProjectAccess = ctx.onGetProjectAccess;
+  var canUserAccessSlug = ctx.canUserAccessSlug;
+
+  function accessFor(user, slug, status) {
+    if (!user) return { visibility: "public" };
+    if (typeof canUserAccessSlug !== "function" || !canUserAccessSlug(user.id, slug)) return null;
+    if (status && status.isMate) {
+      return { visibility: "private", ownerId: status.projectOwnerId || null, allowedUsers: [] };
+    }
+    var access = onGetProjectAccess ? onGetProjectAccess(slug) : null;
+    return access && !access.error ? access : null;
+  }
 
   function handleRequest(req, res, fullUrl) {
     if (req.method !== "GET" || fullUrl !== "/api/palette/search") return false;
@@ -26,17 +37,13 @@ function attachPalette(ctx) {
       // Recent mode: return all sessions sorted by lastActivity
       projects.forEach(function (pCtx, pSlug) {
         var status = pCtx.getStatus();
-        if (status.isWorktree) return;
-        if (paletteUser && onGetProjectAccess) {
-          var pAccess = onGetProjectAccess(pSlug);
-          if (pAccess && !pAccess.error && !users.canAccessProject(paletteUser.id, pAccess)) return;
-        }
+        var pAccess = accessFor(paletteUser, pSlug, status);
+        if (paletteUser && !pAccess) return;
         pCtx.sm.sessions.forEach(function (session) {
           if (session.hidden) return;
           if (paletteUser) {
             if (users.isMultiUser()) {
-              var sAccess = onGetProjectAccess ? onGetProjectAccess(pSlug) : null;
-              if (!users.canAccessSession(paletteUser.id, session, sAccess)) return;
+              if (!users.canAccessSession(paletteUser.id, session, pAccess)) return;
             }
           } else {
             if (session.ownerId) return;
@@ -65,18 +72,14 @@ function attachPalette(ctx) {
       var projectSessions = [];
       projects.forEach(function (pCtx, pSlug) {
         var status = pCtx.getStatus();
-        if (status.isWorktree) return;
-        if (paletteUser && onGetProjectAccess) {
-          var pAccess = onGetProjectAccess(pSlug);
-          if (pAccess && !pAccess.error && !users.canAccessProject(paletteUser.id, pAccess)) return;
-        }
+        var pAccess = accessFor(paletteUser, pSlug, status);
+        if (paletteUser && !pAccess) return;
         var accessibleSessions = [];
         pCtx.sm.sessions.forEach(function (session) {
           if (session.hidden) return;
           if (paletteUser) {
             if (users.isMultiUser()) {
-              var sAccess = onGetProjectAccess ? onGetProjectAccess(pSlug) : null;
-              if (!users.canAccessSession(paletteUser.id, session, sAccess)) return;
+              if (!users.canAccessSession(paletteUser.id, session, pAccess)) return;
             }
           } else {
             if (session.ownerId) return;