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

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

@@ -32,6 +32,7 @@ import { resetRateLimitState } from './app-rate-limit.js';
 import { closeSessionInfoPopover } from './app-header.js';
 import { resetDebateState } from './debate.js';
 import { removeDebateBottomBar } from './app-debate-ui.js';
+import { familyOf as deriveFamily, displayProject } from './worktree-family.js';
 
 // --- Module-owned state ---
 var cachedProjects = [];
@@ -201,6 +202,32 @@ export function setCachedProjectCount(v) { cachedProjectCount = v; }
 export function getCachedRemovedProjects() { return cachedRemovedProjects; }
 export function setCachedRemovedProjects(v) { cachedRemovedProjects = v; }
 
+export function familyOf(slug) { return deriveFamily(cachedProjects, slug); }
+export function currentFamily() { return familyOf(store.get('currentSlug')); }
+
+export function updateTitleBarProjectIdentity(fallbackName, fallbackIcon) {
+  if (store.get('dmMode') || store.get('mateProjectSlug')) {
+    var dmNameEl = document.getElementById("title-bar-project-name");
+    if (dmNameEl && fallbackName) dmNameEl.textContent = fallbackName;
+    return;
+  }
+  var identity = displayProject(cachedProjects, store.get('currentSlug'));
+  var name = identity ? (identity.title || identity.project || identity.slug) : fallbackName;
+  var icon = identity ? (identity.icon || null) : (fallbackIcon || null);
+  var nameEl = document.getElementById("title-bar-project-name");
+  if (nameEl && name) nameEl.textContent = name;
+  var iconEl = document.getElementById("title-bar-project-icon");
+  if (!iconEl) return;
+  if (icon) {
+    iconEl.textContent = icon;
+    parseEmojis(iconEl);
+    iconEl.classList.add("has-icon");
+  } else {
+    iconEl.textContent = "";
+    iconEl.classList.remove("has-icon");
+  }
+}
+
 // --- Functions ---
 
 export function updateProjectList(msg) {
@@ -215,6 +242,7 @@ export function updateProjectList(msg) {
       _lastProjectsJson = projectsJson;
     }
     cachedProjects = msg.projects;
+    store.set({ projects: cachedProjects });
   }
   if (msg.removedProjects) cachedRemovedProjects = msg.removedProjects;
   else if (msg.removedProjects === undefined) { /* keep cached */ }
@@ -326,31 +354,12 @@ export function renderProjectList() {
   });
   var st = store.snap();
   var iconStripActiveSlug = (st.mateProjectSlug && st.savedMainSlug) ? st.savedMainSlug : st.currentSlug;
+  var activeFamily = deriveFamily(cachedProjects, iconStripActiveSlug);
+  if (activeFamily.parent) iconStripActiveSlug = activeFamily.parent.slug;
   renderIconStrip(iconStripProjects, iconStripActiveSlug);
   // Update title bar project name and icon if it changed
   if (!st.mateProjectSlug) {
-    for (var pi = 0; pi < cachedProjects.length; pi++) {
-      if (cachedProjects[pi].slug === st.currentSlug) {
-        var updatedName = cachedProjects[pi].title || cachedProjects[pi].project;
-        var tbName = document.getElementById("title-bar-project-name");
-        if (tbName && updatedName) tbName.textContent = updatedName;
-        var tbIcon = document.getElementById("title-bar-project-icon");
-        if (tbIcon) {
-          var pIcon = cachedProjects[pi].icon || null;
-          if (pIcon) {
-            tbIcon.textContent = pIcon;
-            parseEmojis(tbIcon);
-            tbIcon.classList.add("has-icon");
-            try { localStorage.setItem("clay-project-icon-" + (st.currentSlug || "default"), pIcon); } catch (e) {}
-          } else {
-            tbIcon.textContent = "";
-            tbIcon.classList.remove("has-icon");
-            try { localStorage.removeItem("clay-project-icon-" + (st.currentSlug || "default")); } catch (e) {}
-          }
-        }
-        break;
-      }
-    }
+    updateTitleBarProjectIdentity(store.get('projectName'), null);
   }
   // Re-apply current socket status to the active icon's dot
   var dot = getStatusDot();
@@ -557,9 +566,13 @@ function showRemoveProjectTaskDialog(slug, name, taskCount) {
 export function handleRemoveProjectResult(msg) {
   if (msg.ok) {
     var currentSlug = store.get('currentSlug');
+    var removedProj = null;
+    for (var ri = 0; ri < cachedProjects.length; ri++) {
+      if (cachedProjects[ri].slug === msg.slug) { removedProj = cachedProjects[ri]; break; }
+    }
+    var isWorktree = removedProj ? !!removedProj.isWorktree : msg.slug.indexOf("--") !== -1;
     if (msg.slug === currentSlug) {
-      var isWorktree = msg.slug.indexOf("--") !== -1;
-      var parentSlug = isWorktree ? msg.slug.split("--")[0] : null;
+      var parentSlug = isWorktree ? ((removedProj && removedProj.parentSlug) || msg.slug.split("--")[0]) : null;
 
       showToast(isWorktree ? "Worktree removed" : "Project removed", "success");
 
@@ -570,10 +583,6 @@ export function handleRemoveProjectResult(msg) {
       store.set({ connected: false });
       document.getElementById("connect-overlay").classList.add("hidden");
       if (!isWorktree) {
-        var removedProj = null;
-        for (var ri = 0; ri < cachedProjects.length; ri++) {
-          if (cachedProjects[ri].slug === msg.slug) { removedProj = cachedProjects[ri]; break; }
-        }
         if (removedProj) {
           cachedRemovedProjects.push({
             path: removedProj.path || "",
@@ -585,7 +594,7 @@ export function handleRemoveProjectResult(msg) {
       }
       cachedProjects = cachedProjects.filter(function (p) { return p.slug !== msg.slug; });
       cachedProjectCount = cachedProjects.length;
-      store.set({ currentSlug: null });
+      store.set({ currentSlug: null, projects: cachedProjects });
       renderProjectList();
       resetClientState();
 
@@ -595,7 +604,11 @@ export function handleRemoveProjectResult(msg) {
         showHomeHub();
       }
     } else {
-      showToast(msg.slug.indexOf("--") !== -1 ? "Worktree removed" : "Project removed", "success");
+      showToast(isWorktree ? "Worktree removed" : "Project removed", "success");
+      cachedProjects = cachedProjects.filter(function (p) { return p.slug !== msg.slug; });
+      cachedProjectCount = cachedProjects.length;
+      store.set({ projects: cachedProjects });
+      renderProjectList();
     }
   } else {
     showToast(msg.error || "Failed to remove project", "error");

package/lib/public/modules/branch-switcher.js

@@ -0,0 +1,178 @@
+// Title-bar branch switcher for a project and its worktrees.
+
+import { store } from './store.js';
+import { iconHtml, refreshIcons } from './icons.js';
+import { escapeHtml } from './utils.js';
+import { familyOf } from './worktree-family.js';
+import { switchProject, confirmRemoveProject } from './app-projects.js';
+import { showWorktreeModal } from './sidebar-projects.js';
+
+var chip = null;
+var label = null;
+var menu = null;
+var menuOpen = false;
+var defaultBranches = {};
+// slug -> true/false once /api/branches answers; undefined while unknown.
+// Non-git projects hide the chip (no worktrees to manage there).
+var gitRepoBySlug = {};
+
+function projectName(project) {
+  return project ? (project.title || project.project || project.name || project.slug) : "";
+}
+
+function currentProject(projects) {
+  var slug = store.get('currentSlug');
+  for (var i = 0; i < projects.length; i++) {
+    if (projects[i].slug === slug) return projects[i];
+  }
+  return null;
+}
+
+function defaultBranch(parent) {
+  return defaultBranches[parent.slug] || "default";
+}
+
+function requestDefaultBranch(parent) {
+  if (!parent || Object.prototype.hasOwnProperty.call(defaultBranches, parent.slug)) return;
+  defaultBranches[parent.slug] = null;
+  fetch("/p/" + encodeURIComponent(parent.slug) + "/api/branches")
+    .then(function (response) { return response.json(); })
+    .then(function (data) {
+      defaultBranches[parent.slug] = data.defaultBranch || "default";
+      gitRepoBySlug[parent.slug] = data.isGitRepo !== false;
+      renderBranchSwitcher();
+    })
+    .catch(function () {
+      defaultBranches[parent.slug] = "default";
+      renderBranchSwitcher();
+    });
+}
+
+function closeMenu() {
+  menuOpen = false;
+  if (menu) menu.classList.add("hidden");
+  if (chip) {
+    chip.classList.remove("open");
+    chip.setAttribute("aria-expanded", "false");
+  }
+}
+
+function positionMenu() {
+  if (!chip || !menu || !menuOpen) return;
+  var rect = chip.getBoundingClientRect();
+  var left = Math.min(rect.left, window.innerWidth - menu.offsetWidth - 8);
+  var top = rect.bottom + 6;
+  if (top + menu.offsetHeight > window.innerHeight - 8) top = rect.top - menu.offsetHeight - 6;
+  menu.style.left = Math.max(8, left) + "px";
+  menu.style.top = Math.max(8, top) + "px";
+}
+
+function branchLabel(project, parent) {
+  return project.isWorktree ? (project.branch || projectName(project)) : defaultBranch(parent);
+}
+
+function appendProjectRow(container, project, parent, isCurrent) {
+  var row = document.createElement("div");
+  row.className = "branch-chip-row" + (isCurrent ? " current" : "");
+  var inaccessible = project.isWorktree && project.worktreeAccessible === false;
+  var main = document.createElement("button");
+  main.className = "branch-chip-row-main";
+  main.disabled = inaccessible;
+  if (inaccessible) main.title = "Outside project path";
+  main.innerHTML = iconHtml("git-branch") + '<span class="branch-chip-row-label">' +
+    escapeHtml(branchLabel(project, parent)) + "</span>";
+  if (project.isProcessing) {
+    var dot = document.createElement("span");
+    dot.className = "branch-chip-processing";
+    main.appendChild(dot);
+  }
+  if (project.pendingPermissions > 0) {
+    var badge = document.createElement("span");
+    badge.className = "branch-chip-pending";
+    badge.textContent = project.pendingPermissions > 99 ? "99+" : String(project.pendingPermissions);
+    main.appendChild(badge);
+  }
+  if (isCurrent) main.insertAdjacentHTML("beforeend", iconHtml("check"));
+  if (!inaccessible) {
+    main.addEventListener("click", function () { closeMenu(); switchProject(project.slug); });
+  }
+  row.appendChild(main);
+
+  if (project.isWorktree && (!store.get('permissions') || store.get('permissions').deleteProject !== false)) {
+    var remove = document.createElement("button");
+    remove.className = "branch-chip-row-action";
+    remove.title = "Remove worktree";
+    remove.innerHTML = iconHtml("trash-2");
+    remove.addEventListener("click", function (event) {
+      event.stopPropagation();
+      closeMenu();
+      confirmRemoveProject(project.slug, projectName(project));
+    });
+    row.appendChild(remove);
+  }
+  container.appendChild(row);
+}
+
+function renderMenu(family, current) {
+  menu.innerHTML = "";
+  if (family.parent) appendProjectRow(menu, family.parent, family.parent, current.slug === family.parent.slug);
+  for (var i = 0; i < family.worktrees.length; i++) {
+    appendProjectRow(menu, family.worktrees[i], family.parent || family.worktrees[i], current.slug === family.worktrees[i].slug);
+  }
+  if (family.parent) {
+    var footer = document.createElement("button");
+    footer.className = "branch-chip-new";
+    footer.innerHTML = iconHtml("plus") + " <span>New worktree...</span>";
+    footer.addEventListener("click", function () {
+      closeMenu();
+      showWorktreeModal(family.parent.slug, projectName(family.parent));
+    });
+    menu.appendChild(footer);
+  }
+  refreshIcons();
+  positionMenu();
+}
+
+export function renderBranchSwitcher() {
+  if (!chip) return;
+  var projects = store.get('projects') || [];
+  var current = currentProject(projects);
+  var family = current ? familyOf(projects, current.slug) : { parent: null, worktrees: [] };
+  // The chip is the project's worktree management surface, so it shows even
+  // with zero worktrees (the menu then offers the default branch and "New
+  // worktree"). Hidden where there is no project context to manage, and for
+  // non-git projects (optimistically visible until /api/branches answers).
+  var gateSlug = family.parent ? family.parent.slug : (current ? current.slug : null);
+  var hidden = !current || store.get('dmMode') || store.get('mateProjectSlug') ||
+    store.get('homeHubVisible') || (gateSlug && gitRepoBySlug[gateSlug] === false);
+  chip.classList.toggle("hidden", hidden);
+  if (hidden) { closeMenu(); return; }
+  if (family.parent) requestDefaultBranch(family.parent);
+  label.textContent = branchLabel(current, family.parent || current);
+  if (menuOpen) renderMenu(family, current);
+}
+
+export function initBranchSwitcher() {
+  chip = document.getElementById("branch-chip");
+  label = document.getElementById("branch-chip-label");
+  menu = document.getElementById("branch-chip-menu");
+  if (!chip || !label || !menu) return;
+  chip.addEventListener("click", function (event) {
+    event.stopPropagation();
+    menuOpen = !menuOpen;
+    chip.classList.toggle("open", menuOpen);
+    chip.setAttribute("aria-expanded", menuOpen ? "true" : "false");
+    menu.classList.toggle("hidden", !menuOpen);
+    renderBranchSwitcher();
+  });
+  document.addEventListener("click", function (event) {
+    if (menuOpen && !menu.contains(event.target) && !chip.contains(event.target)) closeMenu();
+  });
+  window.addEventListener("resize", positionMenu);
+  store.subscribe(function (state, prev) {
+    if (state.projects !== prev.projects || state.currentSlug !== prev.currentSlug ||
+        state.dmMode !== prev.dmMode || state.mateProjectSlug !== prev.mateProjectSlug ||
+        state.homeHubVisible !== prev.homeHubVisible) renderBranchSwitcher();
+  });
+  renderBranchSwitcher();
+}

package/lib/public/modules/dom-refs.js

@@ -16,6 +16,5 @@ export function getSessionListEl() { return ref("session-list"); }
 
 export function getStatusDot() {
   return document.querySelector("#icon-strip-projects .icon-strip-item.active .icon-strip-status") ||
-         document.querySelector("#icon-strip-projects .icon-strip-wt-item.active .icon-strip-status") ||
          document.querySelector("#icon-strip-users .icon-strip-mate.active .icon-strip-status");
 }

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

@@ -19,6 +19,7 @@ import { getCachedProjects, switchProject } from './app-projects.js';
 import { openDm } from './app-dm.js';
 import { mateAvatarUrl } from './avatar.js';
 import { parseEmojis } from './markdown.js';
+import { switcherProjectName } from './worktree-family.js';
 
 var _projectMru = [];   // project slugs, most recent first
 var _mateMru = [];      // mate ids (mate_XXX), most recent first
@@ -263,7 +264,7 @@ function buildProjectEntries() {
     var unreachable = p.isWorktree && p.worktreeAccessible === false;
     return {
       key: p.slug,
-      title: p.title || p.project || p.slug,
+      title: switcherProjectName(projects, p),
       icon: p.icon || null,
       fallbackIcon: 'folder',
       isCurrent: p.slug === store.get('currentSlug'),

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

@@ -38,6 +38,7 @@ import { showHomeHub } from './app-home-hub.js';
 import { openTerminal } from './terminal.js';
 import { requestKnowledgeList } from './mate-knowledge.js';
 import { loadRootDirectory } from './filebrowser.js';
+import { aggregateFamily, familyOf, parentProjects } from './worktree-family.js';
 
 // --- Mobile state ---
 var mobileChatSheetOpen = false;
@@ -147,10 +148,22 @@ function closeMobileSheet() {
 }
 
 function renderSheetProjects(listEl) {
-  for (var i = 0; i < getCachedProjectList().length; i++) {
+  var projects = getCachedProjectList();
+  var parents = parentProjects(projects);
+  var activeFamily = familyOf(projects, getCachedCurrentSlug());
+  var activeSlug = activeFamily.parent ? activeFamily.parent.slug : getCachedCurrentSlug();
+
+  for (var i = 0; i < parents.length; i++) {
     (function (p) {
+      var family = familyOf(projects, p.slug);
+      var displayProject = aggregateFamily(p, family.worktrees);
+      var hasWorktreeUnread = family.worktrees.some(function (worktree) { return worktree.unread > 0; });
+      var hasWorktreePending = family.worktrees.some(function (worktree) { return worktree.pendingPermissions > 0; });
       var el = document.createElement("button");
-      el.className = "mobile-project-item" + (p.slug === getCachedCurrentSlug() ? " active" : "");
+      el.className = "mobile-project-item" + (p.slug === activeSlug ? " active" : "");
+      if ((displayProject.pendingPermissions > 0 && p.slug !== activeSlug) || hasWorktreePending) {
+        el.classList.add("has-pending-perm");
+      }
 
       var abbrev = document.createElement("span");
       abbrev.className = "mobile-project-abbrev";
@@ -167,16 +180,16 @@ function renderSheetProjects(listEl) {
       name.textContent = p.name;
       el.appendChild(name);
 
-      if (p.isProcessing) {
+      if (displayProject.isProcessing) {
         var dot = document.createElement("span");
         dot.className = "mobile-project-processing";
         el.appendChild(dot);
       }
 
-      if (p.unread > 0 && p.slug !== getCachedCurrentSlug()) {
+      if (displayProject.unread > 0 && (p.slug !== activeSlug || hasWorktreeUnread)) {
         var mBadge = document.createElement("span");
         mBadge.className = "mobile-project-unread";
-        mBadge.textContent = p.unread > 99 ? "99+" : String(p.unread);
+        mBadge.textContent = displayProject.unread > 99 ? "99+" : String(displayProject.unread);
         el.appendChild(mBadge);
       }
 
@@ -186,7 +199,7 @@ function renderSheetProjects(listEl) {
       });
 
       listEl.appendChild(el);
-    })(getCachedProjectList()[i]);
+    })(parents[i]);
   }
 }
 
@@ -383,6 +396,14 @@ function createMobileSessionItem(s) {
   var el = document.createElement("button");
   el.className = "mobile-session-item" + (s.active ? " active" : "");
 
+  // Vendor badge (legacy sessions without a vendor are Claude)
+  var mVendor = s.vendor || "claude";
+  var vendorIcon = document.createElement("img");
+  vendorIcon.className = "mobile-session-vendor-icon";
+  vendorIcon.src = VENDOR_AVATARS[mVendor] || VENDOR_AVATARS.claude;
+  vendorIcon.alt = "";
+  el.appendChild(vendorIcon);
+
   // Processing dot (left side, before title)
   if (s.isProcessing) {
     var dot = document.createElement("span");