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

package/lib/project-http.js

@@ -676,10 +676,13 @@ function attachHTTP(ctx) {
           defBr = hrRef.replace(/^origin\//, "");
         } catch (e) {}
         res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ branches: brList, defaultBranch: defBr }));
+        res.end(JSON.stringify({ branches: brList, defaultBranch: defBr, isGitRepo: true }));
       } catch (e) {
+        // git failed: not a repository (or git missing). The branch chip
+        // hides itself on isGitRepo:false; the fallback branch list keeps
+        // the worktree modal from crashing if it is somehow reached.
         res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ branches: ["main"], defaultBranch: "main" }));
+        res.end(JSON.stringify({ branches: ["main"], defaultBranch: "main", isGitRepo: false }));
       }
       return true;
     }

package/lib/public/app.js

@@ -42,6 +42,7 @@ import { initProfile, getProfileLang } from './modules/profile.js';
 import { initUserSettings } from './modules/user-settings.js';
 import { initToolPalettes } from './modules/tool-palette.js';
 import { initProjectSwitcher } from './modules/project-switcher.js';
+import { initBranchSwitcher } from './modules/branch-switcher.js';
 import { initAdmin, checkAdminAccess } from './modules/admin.js';
 import { initSessionSearch, toggleSearch, closeSearch, isSearchOpen, handleFindInSessionResults, onHistoryPrepended as onSessionSearchHistoryPrepended } from './modules/session-search.js';
 import { initTooltips, registerTooltip } from './modules/tooltip.js';
@@ -85,7 +86,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var sendBtn = $("send-btn");
   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");
   }
   var headerTitleEl = $("header-title");
@@ -270,6 +270,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     projectName: projectName,
     cwd: "",
     currentSlug: currentSlug,
+    projects: [],
+    homeHubVisible: false,
     currentProjectOwnerId: null,
     isOsUsers: false,
     skipPermsEnabled: false,
@@ -461,6 +463,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // keydown listener registers later — capture-phase ordering doesn't
   // matter here but it keeps related bootstrap steps adjacent.
   initProjectSwitcher();
+  initBranchSwitcher();
 
   // --- Connect overlay (animated ASCII logo) ---
   var asciiLogoCanvas = $("ascii-logo-canvas");

package/lib/public/css/icon-strip.css

@@ -223,7 +223,6 @@
 
 /* Show dot only on active item or when processing */
 .icon-strip-item.active .icon-strip-status,
-.icon-strip-wt-item.active .icon-strip-status,
 .icon-strip-status.processing {
   opacity: 1;
 }
@@ -248,7 +247,6 @@
 
 /* Pending permission shake */
 .icon-strip-item.has-pending-perm,
-.icon-strip-wt-item.has-pending-perm,
 .icon-strip-mate.has-pending-perm {
   animation: permShake 2s ease-in-out infinite;
 }
@@ -1146,155 +1144,6 @@
   opacity: 1;
 }
 
-/* --- Worktree folder groups --- */
-.icon-strip-group {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
-}
-
-.icon-strip-group .folder-header {
-  position: relative;
-}
-
-.icon-strip-group-chevron {
-  position: absolute;
-  bottom: 2px;
-  right: 2px;
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-  background: var(--bg-alt);
-  border: 1px solid var(--border);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--text-dimmer);
-  pointer-events: auto;
-  cursor: pointer;
-  transition: transform 0.15s ease, background 0.15s, border-color 0.15s;
-  z-index: 2;
-  line-height: 1;
-}
-
-.icon-strip-group-chevron i,
-.icon-strip-group-chevron svg {
-  width: 10px;
-  height: 10px;
-}
-
-.icon-strip-group-chevron:hover {
-  background: var(--bg-hover, var(--bg-alt));
-  border-color: var(--text-dimmer);
-  color: var(--text-secondary);
-}
-
-.icon-strip-group.collapsed .icon-strip-group-chevron {
-  background: var(--border);
-}
-
-.icon-strip-group-items {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  overflow: hidden;
-  transition: max-height 0.2s ease;
-  max-height: 500px;
-  border-left: 2px solid var(--border);
-  margin-left: 0;
-  padding-left: 0;
-}
-
-.icon-strip-group.collapsed .icon-strip-group-items {
-  max-height: 0;
-}
-
-/* Worktree items (smaller than regular project icons) */
-.icon-strip-wt-item {
-  width: 48px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  position: relative;
-  text-decoration: none;
-  color: var(--text-secondary);
-  transition: background 0.15s;
-}
-
-.icon-strip-wt-item::before {
-  content: "";
-  position: absolute;
-  width: 30px;
-  height: 30px;
-  border-radius: 8px;
-  background: var(--bg-alt);
-  opacity: 0.7;
-  transition: opacity 0.15s, background 0.15s;
-}
-
-.icon-strip-wt-item:hover::before {
-  opacity: 1;
-}
-
-.icon-strip-wt-item.active::before {
-  background: var(--accent);
-  opacity: 1;
-}
-
-.icon-strip-wt-item.active {
-  color: #fff;
-}
-
-.icon-strip-wt-item .wt-branch-abbrev {
-  font-size: 11px;
-  font-weight: 600;
-  letter-spacing: -0.5px;
-  pointer-events: none;
-  position: relative;
-  z-index: 1;
-}
-
-/* Disabled/inaccessible worktree */
-.icon-strip-wt-item.wt-disabled {
-  opacity: 0.35;
-  cursor: not-allowed;
-}
-
-.icon-strip-wt-item.wt-disabled::after {
-  content: "\1F6AB";
-  position: absolute;
-  font-size: 14px;
-  z-index: 3;
-  filter: grayscale(0.3);
-}
-
-/* Group add button */
-.icon-strip-group-add {
-  width: 30px;
-  height: 30px;
-  border-radius: 8px;
-  border: 1.5px dashed var(--border);
-  background: transparent;
-  color: var(--text-dimmer);
-  font-size: 16px;
-  font-weight: 400;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 2px 0 4px 0;
-  transition: border-color 0.15s, color 0.15s, background 0.15s;
-}
-
-.icon-strip-group-add:hover {
-  border-color: var(--accent);
-  color: var(--accent);
-  background: rgba(var(--accent-rgb, 124, 58, 237), 0.08);
-}
-
 /* --- Worktree creation modal --- */
 .wt-modal-overlay {
   position: fixed;
@@ -1409,45 +1258,6 @@ select.wt-modal-input {
   cursor: not-allowed;
 }
 
-/* --- Mobile worktree folder --- */
-.mobile-project-folder {
-  display: flex;
-  flex-direction: column;
-}
-
-.mobile-project-item.wt-item {
-  padding-left: 28px;
-  opacity: 0.85;
-}
-
-.mobile-project-item.wt-disabled {
-  opacity: 0.35;
-  cursor: not-allowed;
-}
-
-.mobile-folder-chevron {
-  font-size: 8px;
-  color: var(--text-dimmer);
-  margin-left: auto;
-  cursor: pointer;
-  transition: transform 0.15s ease;
-  padding: 4px;
-}
-
-.mobile-project-folder.collapsed .mobile-folder-chevron {
-  transform: rotate(-90deg);
-}
-
-.mobile-folder-items {
-  overflow: hidden;
-  transition: max-height 0.2s ease;
-  max-height: 500px;
-}
-
-.mobile-project-folder.collapsed .mobile-folder-items {
-  max-height: 0;
-}
-
 /* --- Per-project presence avatars --- */
 /* --- Mobile: hide icon strip --- */
 /* --- Skeleton loading placeholders --- */

package/lib/public/css/mobile-nav.css

@@ -160,6 +160,10 @@
     background: rgba(var(--overlay-rgb), 0.06);
   }
 
+  .mobile-project-item.has-pending-perm {
+    animation: permShake 2s ease-in-out infinite;
+  }
+
   .mobile-project-abbrev {
     width: 32px;
     height: 32px;

package/lib/public/css/title-bar.css

@@ -272,6 +272,175 @@
   transform: rotate(180deg);
 }
 
+.branch-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+  max-width: 132px;
+  /* Optical alignment: the pill reads slightly high next to the 17px/800
+     project name, so nudge it down within the centered flex row. */
+  margin-top: 2px;
+  padding: 4px 7px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  background: var(--bg-alt);
+  color: var(--text-secondary);
+  font: 600 11px/1.2 "Pretendard", system-ui, sans-serif;
+  cursor: pointer;
+  flex-shrink: 1;
+}
+
+.branch-chip.hidden,
+.branch-chip-menu.hidden {
+  display: none;
+}
+
+.branch-chip:hover,
+.branch-chip.open {
+  border-color: var(--text-dimmer);
+  color: var(--text);
+}
+
+.branch-chip > svg {
+  width: 12px;
+  height: 12px;
+  flex-shrink: 0;
+}
+
+#branch-chip-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.branch-chip-chevron {
+  transition: transform 0.15s;
+}
+
+.branch-chip.open .branch-chip-chevron {
+  transform: rotate(180deg);
+}
+
+.branch-chip-menu {
+  position: fixed;
+  z-index: 10020;
+  width: 250px;
+  padding: 6px;
+  border: 1px solid var(--border);
+  border-radius: 10px;
+  background: var(--bg);
+  box-shadow: 0 12px 32px rgba(0, 0, 0, 0.28);
+}
+
+.branch-chip-row {
+  display: flex;
+  align-items: center;
+  border-radius: 7px;
+}
+
+.branch-chip-row:hover {
+  background: var(--bg-alt);
+}
+
+.branch-chip-row-main,
+.branch-chip-row-action,
+.branch-chip-new {
+  border: 0;
+  background: transparent;
+  color: var(--text-secondary);
+  font-family: inherit;
+  cursor: pointer;
+}
+
+.branch-chip-row-main {
+  min-width: 0;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  padding: 8px;
+  text-align: left;
+}
+
+.branch-chip-row-main:disabled {
+  opacity: 0.38;
+  cursor: not-allowed;
+}
+
+.branch-chip-row-main svg,
+.branch-chip-row-action svg,
+.branch-chip-new svg {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+
+.branch-chip-row-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.branch-chip-row.current .branch-chip-row-label {
+  color: var(--text);
+  font-weight: 700;
+}
+
+.branch-chip-row-main > .lucide-check {
+  margin-left: auto;
+  color: var(--accent);
+}
+
+.branch-chip-processing {
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: var(--success, #23a55a);
+  flex-shrink: 0;
+}
+
+.branch-chip-pending {
+  min-width: 17px;
+  padding: 1px 4px;
+  border-radius: 8px;
+  background: var(--danger, #e74c3c);
+  color: #fff;
+  font-size: 9px;
+  text-align: center;
+}
+
+.branch-chip-row-action {
+  display: flex;
+  padding: 7px;
+  opacity: 0;
+}
+
+.branch-chip-row:hover .branch-chip-row-action,
+.branch-chip-row-action:focus-visible {
+  opacity: 0.7;
+}
+
+.branch-chip-row-action:hover {
+  color: var(--danger, #e74c3c);
+  opacity: 1;
+}
+
+.branch-chip-new {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  margin-top: 5px;
+  padding: 9px 8px 7px;
+  border-top: 1px solid var(--border-subtle);
+  text-align: left;
+}
+
+.branch-chip-new:hover {
+  color: var(--text);
+}
+
 .project-rename-input {
   width: 100%;
   font-family: "Pretendard", system-ui, -apple-system, BlinkMacSystemFont, sans-serif;

package/lib/public/index.html

@@ -210,6 +210,12 @@
           <span class="title-bar-project-name" id="title-bar-project-name"></span>
           <i data-lucide="chevron-down" class="title-bar-chevron"></i>
         </button>
+        <button id="branch-chip" class="branch-chip hidden" type="button" aria-label="Switch branch" aria-expanded="false" aria-haspopup="menu">
+          <i data-lucide="git-branch"></i>
+          <span id="branch-chip-label"></span>
+          <i data-lucide="chevron-down" class="branch-chip-chevron"></i>
+        </button>
+        <div id="branch-chip-menu" class="branch-chip-menu hidden"></div>
         <span id="sidebar-presence" class="sidebar-presence"></span>
         <button id="sidebar-toggle-btn" class="sidebar-collapse-btn" title="Collapse sidebar"><i data-lucide="panel-left-close"></i></button>
       </div>

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

@@ -106,14 +106,6 @@ export function blinkIO() {
   var sessionDot = document.querySelector(".session-item.active .session-processing") ||
                    document.querySelector(".mate-session-item.active .session-processing");
   if (sessionDot) sessionDot.classList.add("io");
-  // If active project is a worktree, also blink the parent project dot
-  var activeWt = document.querySelector("#icon-strip-projects .icon-strip-wt-item.active");
-  var parentDot = null;
-  if (activeWt) {
-    var group = activeWt.closest(".icon-strip-group");
-    if (group) parentDot = group.querySelector(".folder-header .icon-strip-status");
-    if (parentDot) parentDot.classList.add("io");
-  }
   // Mobile chat chip dot + mobile session dot
   var mobileChipDot = null;
   var _s = store.snap();
@@ -132,7 +124,6 @@ export function blinkIO() {
     var sd = document.querySelector(".session-item.active .session-processing.io") ||
              document.querySelector(".mate-session-item.active .session-processing.io");
     if (sd) sd.classList.remove("io");
-    if (parentDot) parentDot.classList.remove("io");
     if (mobileChipDot) mobileChipDot.classList.remove("io");
     if (mobileSessionDot) mobileSessionDot.classList.remove("io");
   }, 80);
@@ -152,7 +143,7 @@ export function blinkSessionDot(sessionId) {
 export function updateCrossProjectBlink() {
   if (crossProjectBlinkTimer) { clearTimeout(crossProjectBlinkTimer); crossProjectBlinkTimer = null; }
   function doBlink() {
-    var dots = document.querySelectorAll("#icon-strip-projects .icon-strip-item:not(.active) .icon-strip-status.processing, #icon-strip-projects .icon-strip-wt-item:not(.active) .icon-strip-status.processing, #icon-strip-users .icon-strip-mate:not(.active) .icon-strip-status.processing");
+    var dots = document.querySelectorAll("#icon-strip-projects .icon-strip-item:not(.active) .icon-strip-status.processing, #icon-strip-users .icon-strip-mate:not(.active) .icon-strip-status.processing");
     // Also blink mobile chat chip dots (same icon-strip-status class inside chips)
     var mobileDots = document.querySelectorAll(".mobile-chat-chip .icon-strip-status.processing");
     var allDots = [];

package/lib/public/modules/app-home-hub.js

@@ -619,6 +619,7 @@ export function showHomeHub() {
   // anywhere via the persistent FAB (#clay-fab), not embedded here.
   if (store.get('dmMode')) exitDmMode();
   homeHubVisible = true;
+  store.set({ homeHubVisible: true });
   homeHub.classList.remove("hidden");
   // Show close button only if there's a project to return to
   if (hubCloseBtn) {
@@ -652,6 +653,7 @@ export function showHomeHub() {
 export function hideHomeHub() {
   if (!homeHubVisible) return;
   homeHubVisible = false;
+  store.set({ homeHubVisible: false });
   homeHub.classList.add("hidden");
   stopTipRotation();
   var mobileHome = document.getElementById("mobile-home-btn");

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

@@ -47,7 +47,7 @@ import { setStatus } from './app-connection.js';
 import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWhatsNewKnownEntries } from './whats-new.js';
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
-import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
+import { updateProjectList, updateTitleBarProjectIdentity, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
 import { hideHomeHub, handleHubSchedules } from './app-home-hub.js';
 import { openDm, enterDmMode, exitDmMode, handleMateCreatedInApp, updateMateIconStatus, appendDmMessage, showDmTypingIndicator, buildMateInterviewPrompt } from './app-dm.js';
@@ -82,8 +82,7 @@ export function processMessage(msg) {
         // Override title bar with mate name and re-apply color
         var _mdn = (store.get('dmTargetUser').displayName || "New Mate");
         if (headerTitleEl) headerTitleEl.textContent = _mdn;
-        var _tbpn = document.getElementById("title-bar-project-name");
-        if (_tbpn) _tbpn.textContent = _mdn;
+        updateTitleBarProjectIdentity(_mdn, null);
         var _mc2 = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
         var _tbc2 = document.querySelector(".title-bar-content");
         if (_tbc2) { _tbc2.style.background = _mc2; _tbc2.classList.add("mate-dm-active"); }
@@ -296,8 +295,7 @@ export function processMessage(msg) {
         if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) {
           var _mateDN = store.get('dmTargetUser').displayName || "New Mate";
           headerTitleEl.textContent = _mateDN;
-          var tbProjectName = document.getElementById("title-bar-project-name");
-          if (tbProjectName) tbProjectName.textContent = _mateDN;
+          updateTitleBarProjectIdentity(_mateDN, null);
           // Re-apply mate title bar styling (may be lost during project switch)
           var _mc = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
           var _tbc = document.querySelector(".title-bar-content");
@@ -305,8 +303,7 @@ export function processMessage(msg) {
           document.body.classList.add("mate-dm-active");
         } else {
           headerTitleEl.textContent = store.get('projectName');
-          var tbProjectName = document.getElementById("title-bar-project-name");
-          if (tbProjectName) tbProjectName.textContent = msg.title || store.get('projectName');
+          updateTitleBarProjectIdentity(msg.title || store.get('projectName'), null);
         }
         updatePageTitle();
         if (msg.version) {

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");