clay-server 2.47.0-beta.4 → 2.47.0-beta.6

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

@@ -10,9 +10,10 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { closeSidebar } from './sidebar.js';
 import { showIconTooltip, hideIconTooltip, closeUserCtxMenu, getCurrentDmUserId } from './sidebar-mates.js';
-import { switchProject, openAddProjectModal, getCachedProjects } from './app-projects.js';
+import { switchProject, openAddProjectModal } from './app-projects.js';
 import { showHomeHub } from './app-home-hub.js';
 import { getPendingTuiAttention } from './app-notifications.js';
+import { aggregateFamily } from './worktree-family.js';
 
 // --- Project state ---
 var cachedProjectList = [];
@@ -31,12 +32,6 @@ var emojiPickerEl = null;
 var draggedSlug = null;
 var draggedEl = null;
 
-// --- Worktree folder collapse state (persisted in localStorage) ---
-var wtCollapsed = {};
-try {
-  wtCollapsed = JSON.parse(localStorage.getItem("clay-wt-collapsed") || "{}");
-} catch (e) {}
-
 var EMOJI_CATEGORIES = [
   { id: "frequent", icon: "🕐", label: "Frequent", emojis: [
     "😀","😎","🤓","🧠","💡","🔥","⚡","🚀",
@@ -524,17 +519,8 @@ function showIconCtxMenu(anchorEl, slug, name) {
       }
     });
     menu.appendChild(removeWtItem);
-  } else {
-    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);
   }
+  // Worktree creation lives in the title-bar branch chip, not here.
 
   document.body.appendChild(menu);
   projectCtxMenu = menu;
@@ -619,20 +605,7 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
     }
   }
 
-  var sep2 = document.createElement("div");
-  sep2.className = "project-ctx-separator";
-  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);
+  // Worktree creation lives in the title-bar branch chip, not here.
 
   if (!store.get('permissions') || store.get('permissions').deleteProject !== false) {
     var sep3 = document.createElement("div");
@@ -953,13 +926,6 @@ function setupDragHandlers(el, slug) {
   });
 }
 
-// --- Worktree folder collapse ---
-
-function setWtCollapsed(slug, collapsed) {
-  wtCollapsed[slug] = collapsed;
-  try { localStorage.setItem("clay-wt-collapsed", JSON.stringify(wtCollapsed)); } catch (e) {}
-}
-
 function groupProjects(projects) {
   var parents = [];
   var wtByParent = {};
@@ -975,6 +941,21 @@ function groupProjects(projects) {
   return { parents: parents, wtByParent: wtByParent };
 }
 
+function aggregateProjectFamily(parent, worktrees) {
+  var aggregate = aggregateFamily(parent, worktrees);
+  aggregate.hasFamilyPendingAttention = getPendingTuiAttention(parent.slug) > 0;
+  aggregate.hasWorktreeUnread = false;
+  aggregate.hasWorktreePending = false;
+  for (var i = 0; i < worktrees.length; i++) {
+    if (getPendingTuiAttention(worktrees[i].slug) > 0) aggregate.hasFamilyPendingAttention = true;
+    if (worktrees[i].unread > 0) aggregate.hasWorktreeUnread = true;
+    if (worktrees[i].pendingPermissions > 0 || getPendingTuiAttention(worktrees[i].slug) > 0) {
+      aggregate.hasWorktreePending = true;
+    }
+  }
+  return aggregate;
+}
+
 // --- Icon item creation ---
 
 function createIconItem(p, currentSlug) {
@@ -1006,7 +987,7 @@ function createIconItem(p, currentSlug) {
 
   var projectBadge = document.createElement("span");
   projectBadge.className = "icon-strip-project-badge";
-  if (p.unread > 0 && !isActive) {
+  if (p.unread > 0 && (!isActive || p.hasWorktreeUnread)) {
     projectBadge.textContent = p.unread > 99 ? "99+" : String(p.unread);
     projectBadge.classList.add("has-unread");
   }
@@ -1016,7 +997,8 @@ function createIconItem(p, currentSlug) {
   // broadcast — they surface via tui_attention notifications. We shake the
   // same icon for either, so the user notices regardless of which engine
   // is asking.
-  if (!isActive && (p.pendingPermissions > 0 || getPendingTuiAttention(p.slug) > 0)) {
+  if ((!isActive && (p.pendingPermissions > 0 || p.hasFamilyPendingAttention || getPendingTuiAttention(p.slug) > 0)) ||
+      p.hasWorktreePending) {
     el.classList.add("has-pending-perm");
   }
 
@@ -1037,7 +1019,7 @@ function createIconItem(p, currentSlug) {
 
 // --- Worktree creation modal ---
 
-function showWorktreeModal(parentSlug, parentName) {
+export function showWorktreeModal(parentSlug, parentName) {
   var existing = document.getElementById("wt-modal-container");
   if (existing) existing.remove();
 
@@ -1192,164 +1174,17 @@ export function renderIconStrip(projects, currentSlug) {
   for (var i = 0; i < grouped.parents.length; i++) {
     var p = grouped.parents[i];
     var worktrees = grouped.wtByParent[p.slug] || [];
-    var hasWorktrees = worktrees.length > 0;
-
-    if (!hasWorktrees) {
-      var el = createIconItem(p, currentSlug);
-      (function (slug, name, elem) {
-        elem.addEventListener("contextmenu", function (e) {
-          e.preventDefault();
-          e.stopPropagation();
-          showIconCtxMenu(elem, slug, name);
-        });
-      })(p.slug, p.name || p.slug, el);
-      setupDragHandlers(el, p.slug);
-      container.appendChild(el);
-      continue;
-    }
-
-    // Folder group for parent + worktrees
-    var folder = document.createElement("div");
-    folder.className = "icon-strip-group";
-    folder.dataset.parentSlug = p.slug;
-    if (wtCollapsed[p.slug]) folder.classList.add("collapsed");
-
-    if (!p.isProcessing) {
-      for (var wpi = 0; wpi < worktrees.length; wpi++) {
-        if (worktrees[wpi].isProcessing) { p.isProcessing = true; break; }
-      }
-    }
-
-    var header = createIconItem(p, currentSlug);
-    header.classList.add("folder-header");
+    var familyProject = aggregateProjectFamily(p, worktrees);
+    var el = createIconItem(familyProject, currentSlug);
     (function (slug, name, elem) {
       elem.addEventListener("contextmenu", function (e) {
         e.preventDefault();
         e.stopPropagation();
         showIconCtxMenu(elem, slug, name);
       });
-    })(p.slug, p.name || p.slug, header);
-    setupDragHandlers(header, p.slug);
-
-    var chevron = document.createElement("span");
-    chevron.className = "icon-strip-group-chevron";
-    chevron.innerHTML = '<i data-lucide="git-branch"></i>';
-    (function (parentSlug, folderEl) {
-      chevron.addEventListener("click", function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-        var nowCollapsed = folderEl.classList.toggle("collapsed");
-        setWtCollapsed(parentSlug, nowCollapsed);
-      });
-      chevron.addEventListener("contextmenu", function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-      });
-    })(p.slug, folder);
-    chevron.setAttribute("data-tip", "Toggle worktrees");
-    header.appendChild(chevron);
-    folder.appendChild(header);
-
-    var itemsContainer = document.createElement("div");
-    itemsContainer.className = "icon-strip-group-items";
-
-    for (var wi = 0; wi < worktrees.length; wi++) {
-      (function (wt) {
-        var wtEl = document.createElement("a");
-        var isWtActive = wt.slug === currentSlug && !currentDmUserId;
-        var isAccessible = wt.worktreeAccessible !== false;
-        wtEl.className = "icon-strip-wt-item" + (isWtActive ? " active" : "") + (!isAccessible ? " wt-disabled" : "");
-        wtEl.href = "/p/" + wt.slug + "/";
-        wtEl.dataset.slug = wt.slug;
-
-        if (wt.icon) {
-          var wtEmoji = document.createElement("span");
-          wtEmoji.className = "wt-branch-abbrev project-emoji";
-          wtEmoji.textContent = wt.icon;
-          parseEmojis(wtEmoji);
-          wtEl.appendChild(wtEmoji);
-        } else {
-          var abbrev = document.createElement("span");
-          abbrev.className = "wt-branch-abbrev";
-          abbrev.textContent = getProjectAbbrev(wt.name);
-          wtEl.appendChild(abbrev);
-        }
-
-        var wtStatus = document.createElement("span");
-        wtStatus.className = "icon-strip-status";
-        if (wt.isProcessing) wtStatus.classList.add("processing");
-        wtEl.appendChild(wtStatus);
-
-        var tooltipText = wt.name;
-        if (!isAccessible) {
-          tooltipText += " (outside project path, cannot be accessed)";
-        }
-        (function (text, elem) {
-          elem.addEventListener("mouseenter", function () { showIconTooltip(elem, text); });
-          elem.addEventListener("mouseleave", hideIconTooltip);
-        })(tooltipText, wtEl);
-
-        if (isAccessible) {
-          (function (slug) {
-            wtEl.addEventListener("click", function (e) {
-              e.preventDefault();
-              if (switchProject) switchProject(slug);
-            });
-          })(wt.slug);
-        } else {
-          wtEl.addEventListener("click", function (e) {
-            e.preventDefault();
-          });
-        }
-
-        if (isAccessible) {
-          (function (slug, name, elem) {
-            elem.addEventListener("contextmenu", function (e) {
-              e.preventDefault();
-              e.stopPropagation();
-              showIconCtxMenu(elem, slug, name);
-            });
-          })(wt.slug, wt.name, wtEl);
-        } else {
-          wtEl.addEventListener("contextmenu", function (e) {
-            e.preventDefault();
-            e.stopPropagation();
-          });
-        }
-
-        if (!isWtActive && (wt.pendingPermissions > 0 || getPendingTuiAttention(wt.slug) > 0)) {
-          wtEl.classList.add("has-pending-perm");
-        }
-
-        itemsContainer.appendChild(wtEl);
-      })(worktrees[wi]);
-    }
-
-    var hasWtPendingPerm = false;
-    for (var wpi2 = 0; wpi2 < worktrees.length; wpi2++) {
-      if (worktrees[wpi2].pendingPermissions > 0 || getPendingTuiAttention(worktrees[wpi2].slug) > 0) {
-        hasWtPendingPerm = true;
-        break;
-      }
-    }
-    if (hasWtPendingPerm) folder.classList.remove("collapsed");
-
-    var addBtn = document.createElement("button");
-    addBtn.className = "icon-strip-group-add";
-    addBtn.textContent = "+";
-    (function (parentSlug, parentName, btn) {
-      btn.addEventListener("click", function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-        showWorktreeModal(parentSlug, parentName);
-      });
-      btn.addEventListener("mouseenter", function () { showIconTooltip(btn, "New worktree"); });
-      btn.addEventListener("mouseleave", hideIconTooltip);
-    })(p.slug, p.name, addBtn);
-    itemsContainer.appendChild(addBtn);
-
-    folder.appendChild(itemsContainer);
-    container.appendChild(folder);
+    })(p.slug, p.name || p.slug, el);
+    setupDragHandlers(el, p.slug);
+    container.appendChild(el);
   }
 
   // Update home icon active state
@@ -1377,50 +1212,17 @@ function renderProjectList(projects, currentSlug) {
   for (var i = 0; i < grouped.parents.length; i++) {
     var p = grouped.parents[i];
     var worktrees = grouped.wtByParent[p.slug] || [];
-
-    if (worktrees.length === 0) {
-      list.appendChild(createMobileProjectItem(p, currentSlug, false));
-      continue;
-    }
-
-    var folderDiv = document.createElement("div");
-    folderDiv.className = "mobile-project-folder";
-    if (wtCollapsed[p.slug]) folderDiv.classList.add("collapsed");
-
-    var headerEl = createMobileProjectItem(p, currentSlug, false);
-    var chevron = document.createElement("span");
-    chevron.className = "mobile-folder-chevron";
-    chevron.innerHTML = "&#9660;";
-    (function (parentSlug, fDiv) {
-      chevron.addEventListener("click", function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-        var nowCollapsed = fDiv.classList.toggle("collapsed");
-        setWtCollapsed(parentSlug, nowCollapsed);
-      });
-    })(p.slug, folderDiv);
-    headerEl.appendChild(chevron);
-    folderDiv.appendChild(headerEl);
-
-    var wtList = document.createElement("div");
-    wtList.className = "mobile-folder-items";
-    for (var wi = 0; wi < worktrees.length; wi++) {
-      var isAccessible = worktrees[wi].worktreeAccessible !== false;
-      var wtItem = createMobileProjectItem(worktrees[wi], currentSlug, true);
-      if (!isAccessible) wtItem.classList.add("wt-disabled");
-      if (!isAccessible) {
-        wtItem.addEventListener("click", function (e) { e.preventDefault(); e.stopPropagation(); });
-      }
-      wtList.appendChild(wtItem);
-    }
-    folderDiv.appendChild(wtList);
-    list.appendChild(folderDiv);
+    list.appendChild(createMobileProjectItem(aggregateProjectFamily(p, worktrees), currentSlug));
   }
 }
 
-function createMobileProjectItem(p, currentSlug, isWorktree) {
+function createMobileProjectItem(p, currentSlug) {
   var el = document.createElement("button");
-  el.className = "mobile-project-item" + (p.slug === currentSlug ? " active" : "") + (isWorktree ? " wt-item" : "");
+  var isActive = p.slug === currentSlug;
+  el.className = "mobile-project-item" + (isActive ? " active" : "");
+  if ((!isActive && (p.pendingPermissions > 0 || p.hasFamilyPendingAttention)) || p.hasWorktreePending) {
+    el.classList.add("has-pending-perm");
+  }
 
   var abbrev = document.createElement("span");
   abbrev.className = "mobile-project-abbrev";
@@ -1443,6 +1245,13 @@ function createMobileProjectItem(p, currentSlug, isWorktree) {
     el.appendChild(dot);
   }
 
+  if (p.unread > 0 && (!isActive || p.hasWorktreeUnread)) {
+    var badge = document.createElement("span");
+    badge.className = "mobile-project-unread";
+    badge.textContent = p.unread > 99 ? "99+" : String(p.unread);
+    el.appendChild(badge);
+  }
+
   el.addEventListener("click", function () {
     if (switchProject) switchProject(p.slug);
     if (closeSidebar) closeSidebar();
@@ -1454,12 +1263,30 @@ function createMobileProjectItem(p, currentSlug, isWorktree) {
 export function getEmojiCategories() { return EMOJI_CATEGORIES; }
 
 export function updateProjectBadge(slug, count) {
-  var icon = document.querySelector('.icon-strip-item[data-slug="' + slug + '"]');
+  var targetSlug = slug;
+  for (var i = 0; i < cachedProjectList.length; i++) {
+    if (cachedProjectList[i].slug !== slug) continue;
+    cachedProjectList[i].unread = count;
+    if (cachedProjectList[i].isWorktree && cachedProjectList[i].parentSlug) {
+      targetSlug = cachedProjectList[i].parentSlug;
+    }
+    break;
+  }
+
+  var displayCount = count;
+  var grouped = groupProjects(cachedProjectList);
+  for (var pi = 0; pi < grouped.parents.length; pi++) {
+    if (grouped.parents[pi].slug !== targetSlug) continue;
+    displayCount = aggregateFamily(grouped.parents[pi], grouped.wtByParent[targetSlug] || []).unread;
+    break;
+  }
+
+  var icon = document.querySelector('.icon-strip-item[data-slug="' + targetSlug + '"]');
   if (!icon) return;
   var badge = icon.querySelector(".icon-strip-project-badge");
   if (!badge) return;
-  if (count > 0) {
-    badge.textContent = count > 99 ? "99+" : String(count);
+  if (displayCount > 0) {
+    badge.textContent = displayCount > 99 ? "99+" : String(displayCount);
     badge.classList.add("has-unread");
   } else {
     badge.textContent = "";

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

@@ -1148,6 +1148,11 @@ function renderSessionItem(s) {
   var textSpan = document.createElement("span");
   textSpan.className = "session-item-text";
   var textHtml = "";
+  // Which agent runtime this session ran on. Legacy sessions without a
+  // recorded vendor are Claude (pre-multi-vendor era).
+  var itemVendor = s.vendor || "claude";
+  textHtml += '<img class="session-vendor-icon" src="' + (VENDOR_AVATARS[itemVendor] || VENDOR_AVATARS.claude) +
+    '" alt="" title="' + escapeHtml(VENDOR_NAMES[itemVendor] || itemVendor) + '">';
   if (s.isProcessing) {
     textHtml += '<span class="session-processing"></span>';
   }

package/lib/public/modules/worktree-family.js

@@ -0,0 +1,60 @@
+// Pure helpers for presenting worktree projects as branches of one family.
+
+function projectName(project) {
+  return project ? (project.title || project.project || project.name || project.slug) : "";
+}
+
+export function familyOf(projects, slug) {
+  var list = projects || [];
+  var current = null;
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].slug === slug) { current = list[i]; break; }
+  }
+  if (!current) return { parent: null, worktrees: [] };
+
+  var parentSlug = current.isWorktree ? current.parentSlug : current.slug;
+  var parent = current.isWorktree ? null : current;
+  var worktrees = [];
+  for (var j = 0; j < list.length; j++) {
+    var project = list[j];
+    if (!parent && project.slug === parentSlug && !project.isWorktree) parent = project;
+    if (project.isWorktree && project.parentSlug === parentSlug) worktrees.push(project);
+  }
+  if (current.isWorktree && worktrees.indexOf(current) === -1) worktrees.push(current);
+  worktrees.sort(function (a, b) { return projectName(a).localeCompare(projectName(b)); });
+  return { parent: parent, worktrees: worktrees };
+}
+
+export function parentProjects(projects) {
+  return (projects || []).filter(function (project) { return !project.isWorktree; });
+}
+
+export function displayProject(projects, slug) {
+  var family = familyOf(projects, slug);
+  if (family.parent) return family.parent;
+  for (var i = 0; i < (projects || []).length; i++) {
+    if (projects[i].slug === slug) return projects[i];
+  }
+  return null;
+}
+
+export function aggregateFamily(parent, worktrees) {
+  var result = Object.assign({}, parent);
+  var children = worktrees || [];
+  result.isProcessing = !!result.isProcessing;
+  result.unread = result.unread || 0;
+  result.pendingPermissions = result.pendingPermissions || 0;
+  for (var i = 0; i < children.length; i++) {
+    result.isProcessing = result.isProcessing || !!children[i].isProcessing;
+    result.unread += children[i].unread || 0;
+    result.pendingPermissions += children[i].pendingPermissions || 0;
+  }
+  return result;
+}
+
+export function switcherProjectName(projects, project) {
+  if (!project || !project.isWorktree) return projectName(project);
+  var family = familyOf(projects, project.slug);
+  var parentName = family.parent ? projectName(family.parent) : (project.parentSlug || "Project");
+  return parentName + " \u2387 " + (project.branch || projectName(project));
+}

package/lib/sessions.js

@@ -1091,6 +1091,7 @@ function createSessionManager(opts) {
     searchSessions: searchSessions,
     searchSessionContent: searchSessionContent,
     setResolveLoopInfo: setResolveLoopInfo,
+    mapSessionForClient: mapSessionForClient,
     migrateSessionTitles: migrateSessionTitles,
     setSessionVisibility: function (localId, visibility) {
       var session = sessions.get(localId);

package/package.json

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