clay-server 4.0.0 → 4.1.0-beta.1

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

@@ -0,0 +1,141 @@
+import { escapeHtml } from './utils.js';
+import { iconHtml, refreshIcons } from './icons.js';
+
+var projectAccessPopover = null;
+
+function closeAccessOnOutside(e) {
+  if (projectAccessPopover && !projectAccessPopover.contains(e.target)) closeProjectAccessPopover();
+}
+
+function closeAccessOnEscape(e) {
+  if (e.key === "Escape") closeProjectAccessPopover();
+}
+
+export function closeProjectAccessPopover() {
+  if (!projectAccessPopover) return;
+  projectAccessPopover.remove();
+  projectAccessPopover = null;
+  document.removeEventListener("click", closeAccessOnOutside);
+  document.removeEventListener("keydown", closeAccessOnEscape);
+}
+
+function positionPopover(popover, anchorEl) {
+  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";
+}
+
+function selectedExactUsers(popover) {
+  var selected = [];
+  popover.querySelectorAll('.project-access-user-item input[type="checkbox"]:checked').forEach(function (checkbox) {
+    if (!checkbox.disabled || checkbox.dataset.explicit === "true") selected.push(checkbox.dataset.uid);
+  });
+  return selected;
+}
+
+function renderAccessPopover(popover, slug, access, allUsers) {
+  var visibility = access.visibility || "public";
+  var isWorktree = access.isWorktree === true;
+  var allowedUsers = isWorktree ? (access.worktreeAllowedUsers || []) : (access.allowedUsers || []);
+  var inheritedUsers = isWorktree ? (access.parentAllowedUsers || []) : [];
+  var ownerId = access.ownerId;
+  var selectableUsers = allUsers.filter(function (user) { return user.id !== ownerId; });
+  var html = '';
+  html += '<div class="project-access-header">';
+  html += '<span class="project-access-title">' + (isWorktree ? 'Worktree Access' : 'Project Access') + '</span>';
+  html += '<button class="project-access-close" aria-label="Close access settings">&times;</button>';
+  html += '</div>';
+
+  if (isWorktree) {
+    var scopeTitle = visibility === "public" ? "Public parent project" : "This worktree only";
+    var scopeText = visibility === "public"
+      ? "Every authenticated user can access this worktree. Exact grants are retained if the parent becomes private."
+      : "Entire-project access is inherited automatically.";
+    html += '<div class="project-access-scope">';
+    html += '<span class="project-access-scope-icon">' + iconHtml(visibility === "public" ? "globe" : "git-branch") + '</span>';
+    html += '<span><strong>' + scopeTitle + '</strong><small>' + scopeText + '</small></span>';
+    html += '</div>';
+  } else {
+    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">' + iconHtml("lock") + ' Private</button>';
+    html += '<button class="project-access-vis-btn' + (visibility === "public" ? ' active' : '') + '" data-vis="public">' + iconHtml("globe") + ' Public</button>';
+    html += '</div></div>';
+  }
+
+  html += '<div class="project-access-section project-access-users-section"' + (!isWorktree && visibility !== "private" ? ' style="display:none"' : '') + '>';
+  html += '<label class="project-access-label">' + (isWorktree ? 'People with exact access' : 'Allowed Users') + '</label>';
+  html += '<div class="project-access-user-list">';
+  for (var i = 0; i < selectableUsers.length; i++) {
+    var user = selectableUsers[i];
+    var explicit = allowedUsers.indexOf(user.id) !== -1;
+    var inherited = inheritedUsers.indexOf(user.id) !== -1;
+    html += '<label class="project-access-user-item' + (inherited ? ' is-inherited' : '') + '">';
+    html += '<input type="checkbox" data-uid="' + user.id + '" data-explicit="' + (explicit ? 'true' : 'false') + '"' + (explicit || inherited ? ' checked' : '') + (inherited ? ' disabled' : '') + '>';
+    html += '<span>' + escapeHtml(user.displayName || user.username || user.id) + '</span>';
+    if (inherited) html += '<small>Entire project</small>';
+    html += '</label>';
+  }
+  if (selectableUsers.length === 0) html += '<div class="project-access-empty">No other users</div>';
+  html += '</div></div>';
+  popover.innerHTML = html;
+  refreshIcons();
+
+  popover.querySelector(".project-access-close").addEventListener("click", closeProjectAccessPopover);
+  popover.querySelectorAll(".project-access-vis-btn").forEach(function (button) {
+    button.addEventListener("click", function () {
+      var visibilityValue = button.dataset.vis;
+      popover.querySelectorAll(".project-access-vis-btn").forEach(function (item) { item.classList.remove("active"); });
+      button.classList.add("active");
+      var usersSection = popover.querySelector(".project-access-users-section");
+      if (usersSection) usersSection.style.display = visibilityValue === "private" ? "" : "none";
+      fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/visibility", {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ visibility: visibilityValue }),
+      });
+    });
+  });
+  popover.querySelectorAll('.project-access-user-item input[type="checkbox"]').forEach(function (checkbox) {
+    checkbox.addEventListener("change", function () {
+      fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/users", {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ allowedUsers: selectedExactUsers(popover) }),
+      });
+    });
+  });
+}
+
+export 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 () { positionPopover(popover, anchorEl); });
+  setTimeout(function () {
+    document.addEventListener("click", closeAccessOnOutside);
+    document.addEventListener("keydown", closeAccessOnEscape);
+  }, 0);
+  Promise.all([
+    fetch("/api/admin/projects/" + encodeURIComponent(slug) + "/access").then(function (response) { return response.json(); }),
+    fetch("/api/admin/users").then(function (response) { return response.json(); }),
+  ]).then(function (results) {
+    if (results[0].error || results[1].error) {
+      popover.innerHTML = '<div class="project-access-loading">Failed to load</div>';
+      return;
+    }
+    renderAccessPopover(popover, slug, results[0], results[1].users || []);
+  }).catch(function () {
+    popover.innerHTML = '<div class="project-access-loading">Failed to load</div>';
+  });
+}

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

@@ -0,0 +1,22 @@
+// Groups visible parent projects with their visible worktrees. A worktree whose
+// parent is not in the authorized projection remains a standalone item.
+
+export function groupProjects(projects) {
+  var source = Array.isArray(projects) ? projects : [];
+  var parentSlugs = {};
+  var parents = [];
+  var wtByParent = {};
+  for (var i = 0; i < source.length; i++) {
+    if (!source[i].isWorktree) parentSlugs[source[i].slug] = true;
+  }
+  for (var j = 0; j < source.length; j++) {
+    var project = source[j];
+    if (project.isWorktree && project.parentSlug && parentSlugs[project.parentSlug]) {
+      if (!wtByParent[project.parentSlug]) wtByParent[project.parentSlug] = [];
+      wtByParent[project.parentSlug].push(project);
+    } else {
+      parents.push(project);
+    }
+  }
+  return { parents: parents, wtByParent: wtByParent };
+}

package/lib/public/modules/search-clay-chat.js

@@ -6,8 +6,9 @@ import { refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { mateAvatarUrl } from './avatar.js';
 import { createAssistantBubble, createUserBubble, finalizeAssistantBubble, renderAssistantBubbleText } from './chat-bubble-renderer.js';
+import { isExactSearchControlMessage, replaceSearchPermissions, applySearchPermissionMessage, createSearchPermissionCard } from './search-clay-controls.js';
 
-var state = null;
+var state = store.get('searchClayChatState') || null;
 var hostEl = null;
 var backHandler = null;
 var closeHandler = null;
@@ -213,6 +214,22 @@ function submit(input, sendButton) {
   render();
 }
 
+function stopSearchClayChat() {
+  if (!state || !state.processing || state.stopping || !state.mateId || !state.sessionId) return false;
+  if (!send({ type: "home_mate_stop", mateId: state.mateId, sessionId: state.sessionId, requestId: state.requestId })) return false;
+  state.stopping = true;
+  render();
+  return true;
+}
+
+function respondToPermission(permission, decision) {
+  if (!state || permission.status !== "pending") return false;
+  if (!send({ type: "home_mate_permission_response", mateId: state.mateId, sessionId: state.sessionId, requestId: state.requestId, permissionRequestId: permission.permissionRequestId, decision: decision })) return false;
+  permission.status = "answering";
+  render();
+  return true;
+}
+
 function expand() {
   if (!state || !state.mateId || !state.sessionId) return;
   var mateId = state.mateId;
@@ -260,9 +277,9 @@ function render() {
     freshSendButton.className = "search-clay-send";
     freshSendButton.setAttribute("aria-label", "Send to Clay");
     freshSendButton.innerHTML = '<i data-lucide="arrow-up" aria-hidden="true"></i>';
-    freshInput.addEventListener("input", function () { state.draft = freshInput.value; freshSendButton.disabled = !state.sessionId || !freshInput.value.trim(); });
+    freshInput.addEventListener("input", function () { state.draft = freshInput.value; freshSendButton.disabled = state.processing ? (!state.sessionId || state.stopping) : (!state.sessionId || !freshInput.value.trim()); });
     freshInput.addEventListener("keydown", function (event) { if (event.key === "Enter" && !event.shiftKey && !event.isComposing) { event.preventDefault(); submit(freshInput, freshSendButton); } });
-    freshSendButton.addEventListener("click", function () { submit(freshInput, freshSendButton); });
+    freshSendButton.addEventListener("click", function () { if (state.processing) stopSearchClayChat(); else submit(freshInput, freshSendButton); });
     composer.appendChild(freshInput);
     composer.appendChild(freshSendButton);
     shell.appendChild(composer);
@@ -271,6 +288,7 @@ function render() {
   transcript.innerHTML = "";
   for (var i = 0; i < state.messages.length; i++) transcript.appendChild(renderMessage(state.messages[i], false));
   if (state.activities.length || state.stream) transcript.appendChild(renderMessage({ role: "assistant", text: state.stream, activities: state.activities, activitiesExpanded: state.activityExpanded, toggleActivities: function (expanded) { state.activityExpanded = expanded; } }, true));
+  for (var p = 0; p < state.permissions.length; p++) transcript.appendChild(createSearchPermissionCard(state.permissions[p], respondToPermission));
   if (state.processing && !state.stream && !state.activities.length) {
     var progress = progressCopy();
     var pending = document.createElement("div");
@@ -297,7 +315,9 @@ function render() {
   var sendButton = shell.querySelector(".search-clay-send");
   input.placeholder = state.sessionId ? "Message Clay…" : "Starting Clay…";
   input.disabled = !state.sessionId;
-  sendButton.disabled = !state.sessionId || !input.value.trim();
+  sendButton.disabled = state.processing ? (!state.sessionId || state.stopping) : (!state.sessionId || !input.value.trim());
+  sendButton.setAttribute("aria-label", state.processing ? (state.stopping ? "Stopping Clay" : "Stop Clay") : "Send to Clay");
+  sendButton.innerHTML = state.processing ? '<i data-lucide="square" aria-hidden="true"></i>' : '<i data-lucide="arrow-up" aria-hidden="true"></i>';
   var expandButton = shell.querySelector('.search-clay-icon-button[aria-label="Open this conversation in Home"]');
   if (expandButton) expandButton.disabled = !state.sessionId;
   refreshIcons();
@@ -311,7 +331,8 @@ export function startSearchClayChat(query, host, onBack, onClose) {
   backHandler = onBack;
   closeHandler = onClose;
   var startedAt = Date.now();
-  state = { requestId: requestId(), mateId: null, sessionId: null, messages: [{ role: "user", text: clean }], queuedUsers: [], pendingTurns: 1, activities: [], activityExpanded: false, stream: "", draft: "", processing: true, awaitingCompletion: true, activity: "thinking", step: 0, startedAt: startedAt, updatedAt: startedAt };
+  state = { requestId: requestId(), mateId: null, sessionId: null, messages: [{ role: "user", text: clean }], queuedUsers: [], pendingTurns: 1, activities: [], permissions: [], activityExpanded: false, stream: "", draft: "", processing: true, stopping: false, awaitingCompletion: true, activity: "thinking", step: 0, startedAt: startedAt, updatedAt: startedAt, query: clean };
+  store.set({ searchClayChatState: state });
   startProgressTimer();
   render();
   if (!send({ type: "home_clay_ask", requestId: state.requestId, text: clean })) {
@@ -330,6 +351,7 @@ export function attachSearchClayChat(host, onBack, onClose) {
   hostEl = host;
   backHandler = onBack;
   closeHandler = onClose;
+  if (state.processing) send({ type: "home_clay_ask", requestId: state.requestId, text: state.query });
   render();
   return true;
 }
@@ -349,7 +371,7 @@ export function getSearchClayChatSummary() {
 export function detachSearchClayChat() { hostEl = null; }
 
 export function handleSearchClayMessage(msg) {
-  if (!state || !msg || msg.requestId !== state.requestId) return false;
+  if (!isExactSearchControlMessage(state, msg)) return false;
   state.updatedAt = Date.now();
   if (msg.mateId) state.mateId = msg.mateId;
   if (msg.type === "home_mate_session_identity" && msg.sessionId) state.sessionId = msg.sessionId;
@@ -366,6 +388,12 @@ export function handleSearchClayMessage(msg) {
     state.pendingTurns = state.processing ? Math.max(1, state.pendingTurns) : 0;
     if (state.processing) startProgressTimer();
     state.stream = "";
+    state.stopping = false;
+    replaceSearchPermissions(state, msg.pendingPermissions);
+  } else if (msg.type === "home_mate_permission_request" || msg.type === "home_mate_permission_resolved" || msg.type === "home_mate_permission_cancelled") {
+    applySearchPermissionMessage(state, msg);
+  } else if (msg.type === "home_mate_stopping") {
+    state.stopping = true;
   } else if (msg.type === "home_mate_delta") {
     if (!state.awaitingCompletion) return true;
     state.sessionId = msg.sessionId || state.sessionId;
@@ -381,6 +409,7 @@ export function handleSearchClayMessage(msg) {
     state.activityExpanded = false;
     state.pendingTurns = Math.max(0, state.pendingTurns - 1);
     state.processing = state.pendingTurns > 0;
+    state.stopping = false;
     state.awaitingCompletion = state.processing;
     state.startedAt = Date.now();
     if (!state.processing) stopProgressTimer();
@@ -393,6 +422,7 @@ export function handleSearchClayMessage(msg) {
     state.pendingTurns = Math.max(0, state.pendingTurns - 1);
     state.activityExpanded = false;
     state.processing = state.pendingTurns > 0;
+    state.stopping = false;
     state.awaitingCompletion = state.processing;
     state.startedAt = Date.now();
     if (!state.processing) stopProgressTimer();
@@ -400,3 +430,14 @@ export function handleSearchClayMessage(msg) {
   render();
   return true;
 }
+
+store.subscribe(function (appState, previous) {
+  if (!state || appState.connected === previous.connected) return;
+  if (!appState.connected) {
+    replaceSearchPermissions(state, []);
+    state.stopping = false;
+    render();
+    return;
+  }
+  if (state.processing) send({ type: "home_clay_ask", requestId: state.requestId, text: state.query });
+});

package/lib/public/modules/search-clay-controls.js

@@ -0,0 +1,86 @@
+function cleanText(value, fallback) {
+  if (typeof value !== "string") return fallback || "";
+  var clean = value.replace(/[\u0000-\u001f\u007f]/g, " ").replace(/\s+/g, " ").trim();
+  return clean || fallback || "";
+}
+
+export function isExactSearchControlMessage(state, message) {
+  if (!state || !message || message.requestId !== state.requestId) return false;
+  if (state.mateId && message.mateId && message.mateId !== state.mateId) return false;
+  if (state.sessionId) {
+    if (message.type === "home_mate_session_identity") return message.previousSessionId === state.sessionId;
+    if (message.sessionId !== state.sessionId) return false;
+  }
+  return true;
+}
+
+export function replaceSearchPermissions(state, permissions) {
+  state.permissions = Array.isArray(permissions) ? permissions.filter(function (item) {
+    return item && typeof item.permissionRequestId === "string" && item.permissionRequestId;
+  }).map(function (item) {
+    return { permissionRequestId: item.permissionRequestId, toolName: cleanText(item.toolName, "Tool"), toolInput: item.toolInput || {}, decisionReason: cleanText(item.decisionReason, ""), status: "pending" };
+  }) : [];
+}
+
+export function applySearchPermissionMessage(state, message) {
+  if (!isExactSearchControlMessage(state, message)) return false;
+  if (!Array.isArray(state.permissions)) state.permissions = [];
+  var permissionRequestId = message.permissionRequestId;
+  var index = -1;
+  for (var i = 0; i < state.permissions.length; i++) {
+    if (state.permissions[i].permissionRequestId === permissionRequestId) index = i;
+  }
+  if (message.type === "home_mate_permission_request") {
+    var permission = { permissionRequestId: permissionRequestId, toolName: cleanText(message.toolName, "Tool"), toolInput: message.toolInput || {}, decisionReason: cleanText(message.decisionReason, ""), status: "pending" };
+    if (index === -1) state.permissions.push(permission);
+    else state.permissions[index] = permission;
+    return true;
+  }
+  if (index === -1) return true;
+  if (message.type === "home_mate_permission_resolved") {
+    state.permissions[index].status = message.decision === "allow" ? "allowed" : "denied";
+  } else if (message.type === "home_mate_permission_cancelled") {
+    state.permissions[index].status = "cancelled";
+  }
+  return true;
+}
+
+function permissionTarget(permission) {
+  var input = permission.toolInput && typeof permission.toolInput === "object" ? permission.toolInput : {};
+  return cleanText(input.file_path || input.command || input.url || input.query || input.pattern || permission.decisionReason, "Clay needs your approval to continue.");
+}
+
+export function createSearchPermissionCard(permission, onDecision) {
+  var card = document.createElement("section");
+  card.className = "search-clay-permission is-" + permission.status;
+  card.setAttribute("role", "group");
+  card.setAttribute("aria-label", "Permission request for " + permission.toolName);
+  var title = document.createElement("strong");
+  title.textContent = "Allow " + permission.toolName + "?";
+  card.appendChild(title);
+  var target = document.createElement("p");
+  target.textContent = permissionTarget(permission);
+  card.appendChild(target);
+  if (permission.status === "pending" || permission.status === "answering") {
+    var actions = document.createElement("div");
+    var deny = document.createElement("button");
+    deny.type = "button";
+    deny.textContent = "Deny";
+    deny.disabled = permission.status === "answering";
+    deny.addEventListener("click", function () { onDecision(permission, "deny"); });
+    var allow = document.createElement("button");
+    allow.type = "button";
+    allow.className = "is-primary";
+    allow.textContent = "Approve";
+    allow.disabled = permission.status === "answering";
+    allow.addEventListener("click", function () { onDecision(permission, "allow"); });
+    actions.appendChild(deny);
+    actions.appendChild(allow);
+    card.appendChild(actions);
+  } else {
+    var result = document.createElement("small");
+    result.textContent = permission.status === "allowed" ? "Approved" : (permission.status === "denied" ? "Denied" : "Cancelled");
+    card.appendChild(result);
+  }
+  return card;
+}

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/public/style.css

@@ -41,7 +41,7 @@
 @import url("css/session-search.css");
 @import url("css/tooltip.css");
 @import url("css/mates.css?v=20260407");
-@import url("css/command-palette.css?v=20260908-log-links2");
+@import url("css/command-palette.css?v=20260910-ask-clay-controls1");
 @import url("css/mention.css");
 @import url("css/debate.css");
 @import url("css/home-debate-planning.css");