clay-server 3.0.0 → 3.1.0-beta.1

package/lib/public/css/messages.css

@@ -165,9 +165,111 @@
   display: flex;
 }
 
+/* --- Delegated work-order card ------------------------------------- */
+/* Self-contained: the generic bubble avatar/name/time are hidden and the
+   identity lives in the card's own header strip. The body stays on a
+   NEUTRAL background -- accent only touches the header and the top rule,
+   so long technical briefs read like a document, not a tinted bubble. */
+.msg-user-delegated .dm-bubble-avatar,
+.msg-user-delegated .dm-bubble-header {
+  display: none;
+}
+
 .msg-user-delegated .bubble {
-  background: color-mix(in srgb, var(--accent) 11%, var(--bg-elevated, var(--bg-hover)));
-  border: 1px solid color-mix(in srgb, var(--accent) 24%, transparent);
+  padding: 0;
+  overflow: hidden;
+  background: var(--bg);
+  border: 1px solid var(--border);
+  border-top: 2px solid var(--accent);
+  border-radius: 12px;
+  max-width: min(720px, 100%);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.14), 0 4px 14px rgba(0, 0, 0, 0.08);
+}
+
+.delegated-card-head {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 14px;
+  background: linear-gradient(to bottom,
+    color-mix(in srgb, var(--accent) 7%, var(--bg-alt)),
+    var(--bg-alt));
+  border-bottom: 1px solid var(--border-subtle);
+}
+
+.delegated-card-avatar {
+  width: 24px;
+  height: 24px;
+  border-radius: 7px;
+  flex-shrink: 0;
+}
+
+.delegated-card-headtext {
+  display: grid;
+  gap: 1px;
+  min-width: 0;
+  flex: 1;
+}
+
+.delegated-card-eyebrow {
+  font-size: 9px;
+  font-weight: 700;
+  letter-spacing: 0.09em;
+  text-transform: uppercase;
+  color: var(--accent);
+  line-height: 1;
+}
+
+.delegated-card-from {
+  font-size: 12.5px;
+  font-weight: 650;
+  color: var(--text);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.delegated-card-time {
+  font-size: 10px;
+  color: var(--text-dimmer);
+  flex-shrink: 0;
+  align-self: flex-start;
+  margin-top: 2px;
+}
+
+.msg-user-delegated .delegated-brief {
+  padding: 13px 16px 15px;
+  font-size: 13px;
+  line-height: 1.7;
+}
+.msg-user-delegated .delegated-brief > :first-child { margin-top: 0; }
+.msg-user-delegated .delegated-brief > :last-child { margin-bottom: 0; }
+.msg-user-delegated .delegated-brief p { margin: 8px 0; }
+.msg-user-delegated .delegated-brief pre {
+  max-width: 100%;
+  overflow-x: auto;
+  border: 1px solid var(--border-subtle);
+  border-radius: 8px;
+}
+.msg-user-delegated .delegated-brief code {
+  font-size: 12px;
+}
+.msg-user-delegated .delegated-brief h1,
+.msg-user-delegated .delegated-brief h2,
+.msg-user-delegated .delegated-brief h3 {
+  font-size: 13px;
+  font-weight: 700;
+  margin: 14px 0 4px;
+}
+.msg-user-delegated .delegated-brief ol,
+.msg-user-delegated .delegated-brief ul {
+  padding-left: 20px;
+  margin: 6px 0;
+}
+.msg-user-delegated .delegated-brief li { margin: 3px 0; }
+.msg-user-delegated .delegated-brief li::marker {
+  color: var(--accent);
+  font-weight: 650;
 }
 
 .msg-user-delegated .dm-bubble-avatar-other {

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

@@ -160,10 +160,6 @@
     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/pane.css

@@ -187,6 +187,33 @@ button.split-pair-role:hover { filter: brightness(1.25); }
 @keyframes pair-divider-flow-left { 0%, 100% { transform: translateX(3px); opacity: 0.65; } 50% { transform: translateX(-3px); opacity: 1; } }
 @keyframes pair-status-pulse { 50% { opacity: 0.55; } }
 
+/* Worker-pane composer notice: shown while this pane's session processes a
+   delegated turn. Informational only -- the composer stays enabled. */
+.pane-delegation-notice {
+  display: none;
+  align-items: center;
+  gap: 6px;
+  margin: 0 12px;
+  padding: 4px 10px;
+  border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent);
+  border-bottom: 0;
+  border-radius: 8px 8px 0 0;
+  background: color-mix(in srgb, var(--accent) 8%, var(--bg));
+  color: var(--text-secondary);
+  font-size: 11px;
+  line-height: 1.4;
+}
+.pane-delegation-notice.visible { display: flex; }
+.pane-delegation-notice::before {
+  content: "";
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background: var(--accent);
+  flex-shrink: 0;
+  animation: pair-status-pulse 1.5s ease-in-out infinite;
+}
+
 /* Pair dialog rides the standard wt-modal pattern; these classes only add
    the two-column role layout on top of it. */
 .pair-modal { min-width: 480px; max-width: 560px; }

package/lib/public/css/rewind.css

@@ -677,3 +677,13 @@
   border: 1px dashed var(--border, #444);
 }
 
+
+/* Attention pulse: shown when the user sends a message while a permission
+   request is still unanswered (the turn is blocked on it). */
+.permission-container.permission-attention {
+  animation: permission-attention-pulse 0.65s ease-in-out 3;
+}
+@keyframes permission-attention-pulse {
+  0%, 100% { box-shadow: none; }
+  50% { box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 45%, transparent); }
+}

package/lib/public/css/sticky-notes.css

@@ -72,6 +72,15 @@
   box-shadow: 0 4px 20px rgba(var(--shadow-rgb), 0.2);
 }
 
+.sticky-note.sticky-note-attention {
+  animation: sticky-note-attention-pulse 0.65s ease-in-out 3;
+}
+
+@keyframes sticky-note-attention-pulse {
+  0%, 100% { box-shadow: 0 2px 12px rgba(var(--shadow-rgb), 0.12); }
+  50% { box-shadow: 0 0 0 4px color-mix(in srgb, var(--accent) 55%, transparent), 0 4px 20px rgba(var(--shadow-rgb), 0.2); }
+}
+
 .sticky-note.dragging,
 .sticky-note.resizing {
   opacity: 0.92;
@@ -109,6 +118,15 @@
 /* On hover, header stays fully visible */
 .sticky-note:hover .sticky-note-header { opacity: 1; }
 
+.sticky-note-agent-badge {
+  width: 16px;
+  height: 16px;
+  border-radius: 4px;
+  object-fit: cover;
+  flex: 0 0 auto;
+  opacity: 0.8;
+}
+
 .sticky-note-spacer {
   flex: 1;
   min-width: 0;

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

@@ -272,175 +272,6 @@
   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,12 +210,6 @@
           <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

@@ -109,6 +109,14 @@ 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();
@@ -127,6 +135,7 @@ 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);
@@ -146,7 +155,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-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-projects .icon-strip-wt-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,7 +619,6 @@ 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) {
@@ -653,7 +652,6 @@ 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

@@ -20,7 +20,7 @@ import { renderMemoryList } from './mate-memory.js';
 import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette.js';
 import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
-import { showPairDialog, handlePairCreated, handleSplitDelegation } from './split-pair-ui.js';
+import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
@@ -33,7 +33,7 @@ import { handleTuiTranscriptState } from './tui-grab.js';
 import { tuiModalHandleTermOutput, tuiModalHandleTermResized, tuiModalHandleTermExited, tuiModalHandleTermClosed, openTuiModal } from './tui-attention.js';
 import { updateTerminalList, handleContextSourcesState, updateEmailAccountList, updateEmailUnreadCounts, handleEmailTestResult, handleEmailAddResult, handleEmailRemoveResult, handleEmailDefaults } from './context-sources.js';
 import { refreshEmailSettings } from './user-settings.js';
-import { handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted } from './sticky-notes.js';
+import { handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted, handleNoteWritten } from './sticky-notes.js';
 import { handleSkillInstalled, handleSkillUninstalled } from './skills.js';
 import { showRewindModal, onRewindComplete, setRewindMode, onRewindError, clearPendingRewindUuid, addRewindButton } from './rewind.js';
 import { checkAdminAccess } from './admin.js';
@@ -50,7 +50,7 @@ import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWh
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
-import { updateProjectList, updateTitleBarProjectIdentity, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
+import { updateProjectList, 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';
@@ -85,7 +85,8 @@ 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;
-        updateTitleBarProjectIdentity(_mdn, null);
+        var _tbpn = document.getElementById("title-bar-project-name");
+        if (_tbpn) _tbpn.textContent = _mdn;
         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"); }
@@ -298,7 +299,8 @@ 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;
-          updateTitleBarProjectIdentity(_mateDN, null);
+          var tbProjectName = document.getElementById("title-bar-project-name");
+          if (tbProjectName) tbProjectName.textContent = _mateDN;
           // 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");
@@ -306,7 +308,8 @@ export function processMessage(msg) {
           document.body.classList.add("mate-dm-active");
         } else {
           headerTitleEl.textContent = store.get('projectName');
-          updateTitleBarProjectIdentity(msg.title || store.get('projectName'), null);
+          var tbProjectName = document.getElementById("title-bar-project-name");
+          if (tbProjectName) tbProjectName.textContent = msg.title || store.get('projectName');
         }
         updatePageTitle();
         if (msg.version) {
@@ -788,6 +791,9 @@ export function processMessage(msg) {
         } else {
           addUserMessage(msg.text, msg.images || null, msg.pastes || null, msg.from, msg.fromName, msg.delegated ? msg : null);
         }
+        // Worker pane: a delegated instruction starts (or replays into) a
+        // driven turn; surface the composer notice. Cleared on "done".
+        if (msg.delegated) showWorkerDelegationNotice(msg.delegatedByTitle || null);
         break;
 
       case "plan_content":
@@ -1108,6 +1114,7 @@ export function processMessage(msg) {
         removeMatePreThinking();
         setActivity(null);
         stopThinking();
+        hideWorkerDelegationNotice();
         markAllToolsDone();
         closeToolGroup();
         finalizeAssistantBlock();
@@ -1441,6 +1448,11 @@ export function processMessage(msg) {
         handleNoteUpdated(msg);
         break;
 
+      case "note_written":
+        showToast((msg.byTitle || "Agent") + ' left a note: "' + (msg.preview || "") + '"');
+        handleNoteWritten(msg);
+        break;
+
       case "note_deleted":
         handleNoteDeleted(msg);
         break;

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

@@ -32,7 +32,6 @@ 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 = [];
@@ -202,32 +201,6 @@ 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) {
@@ -242,7 +215,6 @@ 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 */ }
@@ -354,12 +326,31 @@ 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) {
-    updateTitleBarProjectIdentity(store.get('projectName'), null);
+    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;
+      }
+    }
   }
   // Re-apply current socket status to the active icon's dot
   var dot = getStatusDot();
@@ -566,13 +557,9 @@ 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 parentSlug = isWorktree ? ((removedProj && removedProj.parentSlug) || msg.slug.split("--")[0]) : null;
+      var isWorktree = msg.slug.indexOf("--") !== -1;
+      var parentSlug = isWorktree ? msg.slug.split("--")[0] : null;
 
       showToast(isWorktree ? "Worktree removed" : "Project removed", "success");
 
@@ -583,6 +570,10 @@ 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 || "",
@@ -594,7 +585,7 @@ export function handleRemoveProjectResult(msg) {
       }
       cachedProjects = cachedProjects.filter(function (p) { return p.slug !== msg.slug; });
       cachedProjectCount = cachedProjects.length;
-      store.set({ currentSlug: null, projects: cachedProjects });
+      store.set({ currentSlug: null });
       renderProjectList();
       resetClientState();
 
@@ -604,11 +595,7 @@ export function handleRemoveProjectResult(msg) {
         showHomeHub();
       }
     } else {
-      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();
+      showToast(msg.slug.indexOf("--") !== -1 ? "Worktree removed" : "Project removed", "success");
     }
   } else {
     showToast(msg.error || "Failed to remove project", "error");