clay-server 5.1.0-beta.1 → 5.1.0-beta.3

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

@@ -199,50 +199,26 @@ function findClosestTurn(clientY) {
 
 // Cursor sharing toggle button in user island (multi-user only)
 export function initCursorToggle() {
-  if (!store.get('isMultiUserMode')) return;
-  var actionsEl = document.querySelector(".user-island-actions");
-  if (!actionsEl) return;
-  if (document.getElementById("cursor-share-toggle")) return;
-
-  var btn = document.createElement("button");
-  btn.id = "cursor-share-toggle";
-  btn.className = "cursor-share-btn";
-  btn.innerHTML = '<i data-lucide="mouse-pointer-2"></i>';
-  var settingsBtn = document.getElementById("user-settings-btn");
-  if (settingsBtn) {
-    actionsEl.insertBefore(btn, settingsBtn);
-  } else {
-    actionsEl.appendChild(btn);
-  }
-
-  function updateToggleStyle() {
-    if (store.get("cursorSharingHydrated") && store.get("cursorSharingEnabled")) {
-      btn.classList.remove("off");
-      btn.classList.add("on");
-      registerTooltip(btn, "Cursor sharing on");
-    } else {
-      btn.classList.remove("on");
-      btn.classList.add("off");
-      registerTooltip(btn, "Cursor sharing off");
-    }
-  }
-
-  store.subscribe(function (state, prev) {
-    if (state.cursorSharingEnabled !== prev.cursorSharingEnabled || state.cursorSharingHydrated !== prev.cursorSharingHydrated) {
-      updateToggleStyle();
-    }
-  });
+  // The labeled rail control is owned by account-island.js.
+  return;
+}
 
-  updateToggleStyle();
-  lucide.createIcons({ nodes: [btn] });
+export function setCursorSharing(enabled) {
+  if (!store.get('cursorSharingHydrated') || store.get('cursorSharingPending') !== null && store.get('cursorSharingPending') !== undefined) return false;
+  if (enabled === true && store.get('isMultiUserMode') !== true) return false;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: enabled });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_set', enabled: enabled === true, requestId: 'cursor-sharing-' + Date.now() }));
+  return true;
+}
 
-  btn.addEventListener("click", function () {
-    if (!store.get("cursorSharingHydrated")) return;
-    var next = !store.get("cursorSharingEnabled");
-    var ws = getWs();
-    if (!ws || ws.readyState !== 1) return;
-    ws.send(JSON.stringify({ type: "cursor_sharing_set", enabled: next, requestId: "cursor-sharing-" + Date.now() }));
-  });
+export function requestCursorSharingState() {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: 'refresh' });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_get', requestId: 'cursor-sharing-refresh-' + Date.now() }));
+  return true;
 }
 
 // --- Exported functions ---
@@ -393,7 +369,7 @@ export function initCursors() {
       if (cursorThrottleTimer) { clearTimeout(cursorThrottleTimer); cursorThrottleTimer = null; }
       if (selectionThrottleTimer) { clearTimeout(selectionThrottleTimer); selectionThrottleTimer = null; }
       lastSelectionKey = "";
-      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null });
+      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null, cursorSharingPending: null, cursorSharingError: disconnected ? "disconnected" : "account-changed" });
       if (identityChanged && state.myUserId && state.connected) {
         var ws = getWs();
         if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "cursor_sharing_get", requestId: "cursor-sharing-refresh-" + Date.now() }));

package/lib/public/modules/app-debate-ui.js

@@ -6,6 +6,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { scrollToBottom } from './app-rendering.js';
 import { exportDebateAsPdf } from './debate.js';
+import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 
 // Module-internal UI var (not in store)
 var debateHandRaiseOpen = false;
@@ -64,7 +65,7 @@ export function exitDebateConcludeMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }
@@ -129,7 +130,7 @@ export function exitDebateEndedMode() {
   if (banner) banner.remove();
   var inputEl2 = document.getElementById("input");
   if (inputEl2 && inputEl2._origPlaceholder) {
-    inputEl2.placeholder = inputEl2._origPlaceholder;
+    inputEl2.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl2._origPlaceholder;
   }
 }
@@ -191,7 +192,7 @@ export function exitDebateFloorMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }

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

@@ -80,7 +80,6 @@ export function openDm(targetUserId, opts) {
     if (mates[i] && mates[i].id === targetUserId) isMateTarget = true;
   }
   if (isMateTarget) {
-    if (store.get('projectMateDmsEnabled') === false) return;
     showHomeHub();
     openHomeChat(targetUserId);
     return;
@@ -152,7 +151,6 @@ function showMateOnboarding(callback) {
 export function enterDmMode(key, targetUser, messages) {
   console.log("[DEBUG enterDmMode] key=" + key, "isMate=" + (targetUser && targetUser.isMate), "messages=" + (messages ? messages.length : 0));
   if (targetUser && targetUser.isMate) {
-    if (store.get('projectMateDmsEnabled') === false) return;
     showHomeHub();
     openHomeChat(targetUser.id);
     return;

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

@@ -1,3 +1,4 @@
+import { beginProjectDebatePrepend, endProjectDebatePrepend } from './project-debate-workspace.js';
 // app-header.js - Session rename, session info popover, progressive history loading
 // Extracted from app.js (PR-34)
 
@@ -12,6 +13,9 @@ import { saveToolState, resetToolState, restoreToolState } from './tools.js';
 import { getSessionUsage, setSessionUsage, getContextData, setContextData, updateContextPanel, updateUsagePanel } from './app-panels.js';
 import { onHistoryPrepended as onSessionSearchHistoryPrepended } from './session-search.js';
 import { getCachedSessions } from './sidebar-sessions.js';
+import { buildSessionHierarchy } from './session-hierarchy.js';
+import { splitGroupRoles } from './split-group-helpers.js';
+import { createWorkerHistoryControl } from './sidebar-session-hierarchy.js';
 import { bindPermissionControl, renderPermissionControl } from './permission-control.js';
 import { startHeaderSessionInlineRename } from './session-context-menu.js';
 
@@ -19,11 +23,104 @@ import { startHeaderSessionInlineRename } from './session-context-menu.js';
 var sessionInfoPopover = null;
 var historySentinelObserver = null;
 
+function splitHistoryOwner(state, sessions) {
+  var split = state.splitPanes;
+  if (!split || !Array.isArray(split.panes)) return null;
+  var groups = state.splitGroups || [];
+  var group = null;
+  var roles = null;
+  for (var gi = 0; gi < groups.length; gi++) {
+    var candidateRoles = splitGroupRoles(groups[gi]);
+    if (!candidateRoles) continue;
+    var matches = false;
+    for (var pi = 0; pi < split.panes.length; pi++) {
+      if (candidateRoles.orderedIds.indexOf(split.panes[pi].sessionId) !== -1) matches = true;
+    }
+    if (matches) { group = groups[gi]; roles = candidateRoles; break; }
+  }
+  if (!group || !roles) return null;
+  var hierarchy = buildSessionHierarchy(sessions || []);
+  for (var hi = 0; hi < hierarchy.roots.length; hi++) {
+    var root = hierarchy.roots[hi];
+    if (root.driver.id === roles.driverId && root.workers.length) return { root: root, group: group, roles: roles };
+  }
+  return null;
+}
+
+function splitPaneHistoryUrl(slug, sessionId) {
+  return "/p/" + encodeURIComponent(slug) + "/?pane=1&session=" + encodeURIComponent(sessionId);
+}
+
+function createHeaderWorkerHistoryControl(root, context) {
+  var capturedWs = context.ws;
+  var capturedSlug = context.slug;
+  var capturedMateId = context.mateId;
+  var capturedActiveSessionId = context.activeSessionId;
+  var capturedSplit = context.split;
+  var historyControl = createWorkerHistoryControl(root.driver, root.workers, {
+    className: "header-worker-history-btn",
+    label: "Show Split Worker history",
+    validate: function (driver) {
+      var current = store.snap();
+      var ws = getWs();
+      if (!ws || ws !== capturedWs || ws.readyState !== 1 || !current.connected || current.currentSlug !== capturedSlug ||
+          (current.activeProjectMateId || null) !== capturedMateId || current.dmMode) return false;
+      if (!capturedSplit) return current.activeSessionId === driver.id && !current.splitPanes;
+      var split = current.splitPanes;
+      if (!split || split.groupId !== capturedSplit.groupId || !Array.isArray(split.panes) || split.panes.length !== capturedSplit.panes.length) return false;
+      if (current.activeSessionId !== capturedActiveSessionId) return false;
+      for (var i = 0; i < split.panes.length; i++) {
+        if (split.panes[i].sessionId !== capturedSplit.panes[i].sessionId || split.panes[i].slug !== capturedSplit.panes[i].slug) return false;
+      }
+      return true;
+    },
+    navigate: capturedSplit ? function (worker) {
+      var opened = window.open(splitPaneHistoryUrl(capturedSlug, worker.id), "_blank", "noopener");
+      return !!opened;
+    } : null,
+  });
+  return historyControl;
+}
+
 export function initHeader() {
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
   var headerFullAccessBtn = document.getElementById("header-full-access-btn");
+  var headerSearchBtn = document.getElementById("find-in-session-btn");
+  var headerWorkerHistoryBtn = null;
+
+  function refreshHeaderWorkerHistory() {
+    if (!headerSearchBtn) return;
+    if (headerWorkerHistoryBtn) {
+      headerWorkerHistoryBtn.remove();
+      headerWorkerHistoryBtn = null;
+    }
+    var state = store.snap();
+    var sessions = getCachedSessions() || [];
+    var hierarchy = buildSessionHierarchy(sessions);
+    var owner = null;
+    var context = null;
+    if (state.splitPanes && state.splitPanes.panes) {
+      var splitOwner = splitHistoryOwner(state, sessions);
+      owner = splitOwner ? splitOwner.root : null;
+      if (owner) {
+        context = {
+          ws: getWs(), slug: state.currentSlug, mateId: state.activeProjectMateId || null,
+          activeSessionId: state.activeSessionId,
+          split: { groupId: state.splitPanes.groupId, panes: state.splitPanes.panes.map(function (pane) { return { sessionId: pane.sessionId, slug: pane.slug }; }) },
+        };
+      }
+    } else {
+      for (var hi = 0; hi < hierarchy.roots.length; hi++) {
+        if (hierarchy.roots[hi].driver.id === state.activeSessionId && hierarchy.roots[hi].workers.length) { owner = hierarchy.roots[hi]; break; }
+      }
+      if (owner) context = { ws: getWs(), slug: state.currentSlug, mateId: state.activeProjectMateId || null, activeSessionId: state.activeSessionId, split: null };
+    }
+    if (!owner || !context) return;
+    headerWorkerHistoryBtn = createHeaderWorkerHistoryControl(owner, context);
+    if (headerWorkerHistoryBtn) headerSearchBtn.insertAdjacentElement("afterend", headerWorkerHistoryBtn);
+  }
 
   function permissionControlState() {
     var s = store.snap();
@@ -121,6 +218,12 @@ export function initHeader() {
 
   // --- Session info popover ---
   if (headerInfoBtn) {
+    store.subscribe(function (state, prev) {
+      if (state.activeSessionId !== prev.activeSessionId || state.currentSlug !== prev.currentSlug || state.activeProjectMateId !== prev.activeProjectMateId || state.splitPanes !== prev.splitPanes) {
+        closeSessionInfoPopover();
+        refreshHeaderWorkerHistory();
+      }
+    });
     headerInfoBtn.addEventListener("click", function (e) {
       e.stopPropagation();
       if (sessionInfoPopover) { closeSessionInfoPopover(); return; }
@@ -193,6 +296,7 @@ export function initHeader() {
       }
     });
   }
+  refreshHeaderWorkerHistory();
 }
 
 export function closeSessionInfoPopover() {
@@ -269,11 +373,13 @@ export function prependOlderHistory(items, meta) {
   var anchorEl = getPrependAnchor();
   var anchorOffset = anchorEl ? anchorEl.getBoundingClientRect().top : 0;
 
+  beginProjectDebatePrepend();
   // Process each item through the rendering pipeline
   for (var i = 0; i < items.length; i++) {
     processMessage(items[i]);
   }
 
+  endProjectDebatePrepend();
   // Finalize any open assistant block from the batch
   finalizeAssistantBlock();
 

package/lib/public/modules/app-message-router.js

@@ -2,11 +2,11 @@ import { handleIssueReference } from './clay-issue-links.js';
 // Narrow pre-router for Home and Capsule protocol responses kept out of the legacy router.
 
 import { processMessage as processAppMessage } from './app-messages.js';
-import { handleHomeMateModelsState, handleHomeMateModelResult } from './home-mate-settings.js';
+import { handleMateInstructionsResult, handleHomeMateModelsState, handleHomeMateModelResult } from './home-mate-settings.js';
 import { handleHomeMateSessionIdentity, handleHomeDebateTranscript, handleHomeWorkspaceAssignment } from './home-mate-chat.js';
 import { handleToolLlmConfigState } from './tool-llm-status.js';
 import { handleToolSourceState, handleToolMateAccessState } from './home-tools.js';
-import { handleHomeDebatesState } from './home-debates-archive.js';
+import { handleDebatesWorkbenchState } from './debates-workbench.js';
 import { renderProjectWorkspaceAssignment, showProjectWorkspaceAssignmentError } from './project-workspace-assignment.js';
 import { isHomeWorkspaceAssignmentMessage } from './workspace-assignment-routing.js';
 import { handleSearchClayMessage } from './search-clay-chat.js';
@@ -15,6 +15,8 @@ import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
 import { receiveHistoryReplay } from './history-replay-batch.js';
+import { handleProjectMateCreationMessage } from './project-mate-creation-workspace.js';
+import { handleProjectDebatePlanningMessage } from './project-debate-planning-workspace.js';
 
 export function handleHomeProtocolMessage(msg) {
   if (handleIssueReference(msg)) return true;
@@ -32,9 +34,10 @@ export function handleHomeProtocolMessage(msg) {
     return true;
   }
   if (msg.type === "home_debates_state") {
-    handleHomeDebatesState(msg);
+    handleDebatesWorkbenchState(msg);
     return true;
   }
+  if (msg.type === "mate_instructions_result") { handleMateInstructionsResult(msg); return true; }
   if (msg.type === "home_mate_models_state") {
     handleHomeMateModelsState(msg);
     return true;
@@ -87,6 +90,12 @@ export function processMessage(msg) {
 }
 
 function dispatchMessage(msg) {
+  if (typeof handleProjectDebatePlanningMessage === "function" && handleProjectDebatePlanningMessage(msg)) return;
+  if (msg.type === "home_debate_event" && msg.eventType) {
+    processAppMessage(Object.assign({}, msg, { type: msg.eventType, mateId: msg.speakerMateId || null }));
+    return;
+  }
+  if (handleProjectMateCreationMessage(msg)) return;
   if (handlePendingMessageQueueMessage(msg)) return;
   if (handleDefaultAiMessage(msg)) return;
   if (handleCursorSharingMessage(msg)) return;

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

@@ -1,3 +1,10 @@
+import { handlePersonalSettingsMessage } from './user-settings-preferences.js';
+import { handleServerUpdate } from './server-settings-controls.js';
+import { handleYouMessage } from './you.js';
+import { handleYouActivity } from './you-activity.js';
+import { handleProjectDebateMessage } from './project-debate-workspace.js';
+import { openMateWorkspace, renderProjectMates } from './project-mate-navigation.js';
+import { refreshProjectAssistantIdentities } from './project-chat-identity.js';
 import { handleLinearResult } from './linear-panel.js';
 import { handleSharedBrowserMessage } from './shared-browser.js';
 import { openWireframe } from './wireframe-workbench.js';
@@ -25,12 +32,13 @@ import { updateDmBadge, setMentionActive, renderUserStrip } from './sidebar-mate
 import { renderSidebarPresence } from './sidebar-presence.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
-import { openHomeChat, handleHomeMateHistory, handleHomeMateDelta, handleHomeMateSegment, handleHomeMateDone, handleHomeMateError, handleHomeMateSessionsState } from './home-mate-chat.js';
+import { handleHomeMateHistory, handleHomeMateDelta, handleHomeMateSegment, handleHomeMateDone, handleHomeMateError, handleHomeMateSessionsState } from './home-mate-chat.js';
 import { handleHomeSurfaceState } from './home-surface.js';
 import { handleDefaultVendorMessage } from './default-vendor.js';
 import { handleContextViewMessage } from './context-view-preference.js';
-import { handleHomeMateMemoryState, handleHomeMateKnowledgeState } from './home-mate-settings.js';
-import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
+import { handleHomeMateMemoryState, handleHomeMateKnowledgeState, syncHomeMateSettingsTarget, handleHomeMateAvatarError } from './home-mate-settings.js';
+import { renderKnowledgeList, handleKnowledgeContent, handleKnowledgeMutation } from './mate-knowledge.js';
+import { handleKnowledgeWorkbenchMessage } from './mate-knowledge-workbench.js';
 import { renderMemoryList } from './mate-memory.js';
 import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette.js';
 import { handleFindInSessionResults } from './session-search.js';
@@ -47,9 +55,10 @@ import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundE
 import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch, presentMarkdownEdit } from './filebrowser.js';
 import { beginMarkdownTurn, finishMarkdownTurn, markdownPathFromToolInput } from './markdown-live-edit.js';
 import { forwardPaneMarkdownPresentation } from './pane-bridge.js';
-import { isProjectSettingsOpen, handleInstructionsRead, handleInstructionsWrite, handleProjectEnv, handleProjectEnvSaved, handleProjectSharedEnv, handleProjectSharedEnvSaved, handleProjectOwnerChanged } from './project-settings.js';
+import { handleProjectOwnerChanged } from './project-settings.js';
+import { handleProjectEnv, handleProjectEnvSaved } from './project-settings-environment.js';
 import { handleProjectSessionVisibilityDefault, refreshProjectSessionVisibilitySettings } from './project-session-visibility-settings.js';
-import { updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleInheritGroupsChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleGlobalClaudeMdRead, handleGlobalClaudeMdWrite } from './server-settings.js';
+import { updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleServerSettingResult } from './server-settings.js';
 import { handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
 import { attachTuiView, detachTuiView, setTuiSuspendedView, tuiHandleTermOutput, tuiHandleTermResized, tuiHandleTermExited, tuiHandleTermClosed } from './session-tui-view.js';
 import { handleTuiTranscriptState } from './tui-grab.js';
@@ -83,7 +92,6 @@ import { getModelInfoUpdate, modelEntryValue, modelEntryMatches, handleModelSele
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel, markContextUnavailable } from './app-panels.js';
 import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress, finishProjectSessionActivation } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
-import { hideHomeHub, showHomeHub } from './app-home-hub.js';
 import { handleToolsState, handleToolInstalled, handleToolRemoved, handleToolStorageResult, handleToolLlmResult, handleToolsError, handleToolControlRequest, handleToolServerState, handleToolServerEvent, handleCapsuleGameSession } from './home-tools.js';
 import { handleHomeDockState } from './home-dock.js';
 import { handleToolFrameUrlState } from './home-tool-frame.js';
@@ -110,6 +118,9 @@ var connectOverlay = document.getElementById("connect-overlay");
 initMessageDeliveryUi();
 
 export function processMessage(msg) {
+  if (["update_available", "up_to_date", "update_started", "update_check_failed"].indexOf(msg.type) !== -1) handleServerUpdate(msg);
+  if (/^(set_pin|set_keep_awake|set_inherit_groups|set_image_retention|set_update_channel|restart_server|shutdown_server)_result$/.test(msg.type)) handleServerSettingResult(msg);
+  if (handleProjectDebateMessage(msg)) return;
   if (handleMcpConnectionMessage(msg)) return;
   if (handleSharedBrowserMessage(msg)) return;
   if (msg.type === "vendor_login_browser_frame" || msg.type === "vendor_login_browser_status") {
@@ -120,6 +131,7 @@ export function processMessage(msg) {
   if (handleAutonomousRunMessage(msg)) return;
   if (handleLoopInterviewMessage(msg)) return;
   if (handleScheduledTaskMessage(msg)) return;
+  if (handleKnowledgeWorkbenchMessage(msg)) return;
   if (handleSessionCreateMessage(msg)) return;
   if (msg && msg.type === "new_session_result" && handleNewSessionResult(msg)) return;
   if (handleDefaultVendorMessage(msg)) return;
@@ -172,6 +184,7 @@ export function processMessage(msg) {
         return;
       }
       if (msg.type === "knowledge_saved" || msg.type === "knowledge_deleted" || msg.type === "knowledge_promoted" || msg.type === "knowledge_depromoted") {
+        handleKnowledgeMutation(msg);
         return;
       }
       if (msg.type === "memory_list") {
@@ -338,8 +351,7 @@ export function processMessage(msg) {
             store.set({ dmMode: false });
           }
           messagesEl.innerHTML = "";
-          showHomeHub();
-          openHomeChat(msg.mateId);
+          openMateWorkspace(msg.mateId);
         }
         // Clear the flag and notify server that mate DM is closed
         if (store.get('returningFromMateDm')) {
@@ -363,7 +375,12 @@ export function processMessage(msg) {
           clearProjectSplitState();
         }
         detachTuiView();
-        store.set({ projectName: msg.project || msg.cwd, vendorInfo: msg.vendors || {} });
+        store.set({
+          projectName: msg.project || msg.cwd,
+          vendorInfo: msg.vendors || {},
+          activeProjectMateId: msg.isMate && msg.mateId ? msg.mateId : null,
+          activeProjectMateName: msg.isMate ? (msg.mateDisplayName || msg.project || "Mate") : "",
+        });
         if (msg.cwd) store.set({ cwd: msg.cwd });
         if (msg.slug) store.set({ currentSlug: msg.slug, activeProjectSlug: msg.slug, sessionListProjectSlug: null, splitGroupsProjectSlug: null });
         try { var _is = store.snap(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
@@ -397,6 +414,7 @@ export function processMessage(msg) {
         var spBanner = document.getElementById("skip-perms-pill");
         if (spBanner) spBanner.classList.toggle("hidden", msg.dangerouslySkipPermissions !== true);
         updateProjectList(msg);
+        renderProjectMates();
         refreshProjectSessionVisibilitySettings(msg.projects);
         break;
 
@@ -868,16 +886,14 @@ export function processMessage(msg) {
         } else if (_prevSid) {
           delete store.get('sessionDrafts')[_prevSid];
         }
-        // runtimeMode/runtimeTerminalId take precedence over the session's
-        // born mode so the user's current claudeOpenMode preference applies
-        // to existing sessions too (born-GUI viewed under TUI pref runs
-        // claude --resume in xterm; born-TUI viewed under GUI pref was
-        // in-place converted to GUI by the server before this message).
+        // Live legacy terminals keep their runtime presentation. Idle legacy
+        // sessions are hydrated into chat by the server before this message.
         var _effectiveMode = msg.runtimeMode || msg.mode || "gui";
         var _effectiveTerminalId = (typeof msg.runtimeTerminalId === "number")
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
-        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {} });
+        var _sessionRole = msg.sessionRole === "worker" ? "worker" : "driver";
+        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
         handleScheduledTaskSessionSwitched(msg);
         requestLoopInterviewState();
         activateDeliverySession(msg.id, msg.cliSessionId || null, msg.sessionOriginId || null);
@@ -958,7 +974,7 @@ export function processMessage(msg) {
         }
         // Reload survival: a restored active session that is a split-group
         // member reopens its group (no-op when a split is already open).
-        if (finishProjectSessionActivation()) hideHomeHub();
+        finishProjectSessionActivation();
         maybeRestoreSplitGroup();
         break;
 
@@ -1558,15 +1574,10 @@ export function processMessage(msg) {
         break;
 
       case "fs_read_result":
-        if (msg.path === "CLAUDE.md" && isProjectSettingsOpen()) {
-          handleInstructionsRead(msg);
-        } else {
-          handleFsRead(msg);
-        }
+        handleFsRead(msg);
         break;
 
       case "fs_write_result":
-        handleInstructionsWrite(msg);
         break;
 
       case "project_env_result":
@@ -1577,22 +1588,12 @@ export function processMessage(msg) {
         handleProjectEnvSaved(msg);
         break;
 
-      case "global_claude_md_result":
-        handleGlobalClaudeMdRead(msg);
-        break;
-
-      case "write_global_claude_md_result":
-        handleGlobalClaudeMdWrite(msg);
-        break;
-
       case "shared_env_result":
         handleSharedEnv(msg);
-        handleProjectSharedEnv(msg);
         break;
 
       case "set_shared_env_result":
         handleSharedEnvSaved(msg);
-        handleProjectSharedEnvSaved(msg);
         break;
 
       case "fs_file_changed":
@@ -1745,6 +1746,13 @@ export function processMessage(msg) {
         handleNoteDeleteResult(msg);
         break;
 
+      case "you_result":
+      case "you_changed":
+      case "you_reviewed":
+        handleYouMessage(msg);
+        handleYouActivity(msg);
+        break;
+
       case "project_logs_state":
         handleProjectLogsState(msg);
         break;
@@ -1930,6 +1938,8 @@ export function processMessage(msg) {
             }
           }
           store.set({ cachedMatesList: _cml });
+          refreshProjectAssistantIdentities(messagesEl);
+          syncHomeMateSettingsTarget(msg);
           // renderUserStrip is handled by the store subscriber
           // Update mate sidebar if currently viewing this mate
           if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate && store.get('dmTargetUser').id === msg.mate.id) {
@@ -1966,6 +1976,7 @@ export function processMessage(msg) {
 
       case "mate_list":
         store.set({ cachedMatesList: msg.mates || [], cachedAvailableBuiltins: msg.availableBuiltins || [] });
+        refreshProjectAssistantIdentities(messagesEl);
         // renderUserStrip is handled by the store subscriber
         break;
 
@@ -1974,6 +1985,7 @@ export function processMessage(msg) {
         break;
 
       case "mate_error":
+        handleHomeMateAvatarError(msg);
         showToast(msg.error || "Mate operation failed", "error");
         break;
 
@@ -2162,30 +2174,16 @@ export function processMessage(msg) {
         handleKeepAwakeChanged(msg);
         break;
 
-      case "set_inherit_groups_result":
-      case "inherit_groups_changed":
-        handleInheritGroupsChanged(msg);
-        break;
-
       case "set_auto_continue_result":
       case "auto_continue_changed":
         handleAutoContinueChanged(msg);
         break;
 
-      case "set_claude_open_mode_result":
-      case "claude_open_mode_changed":
-        if (msg.claudeOpenMode === "tui" || msg.claudeOpenMode === "gui") {
-          store.set({ claudeOpenMode: msg.claudeOpenMode });
-          // Reflect into the user-settings toggle if it's already in the DOM.
-          var _comToggle = document.getElementById("us-claude-open-mode");
-          if (_comToggle) _comToggle.checked = msg.claudeOpenMode === "tui";
-        }
-        break;
-
       case "claude_allow_list":
+        handlePersonalSettingsMessage(msg);
         // Initial state for the user-settings allow-list editor.
         var _alTa = document.getElementById("us-claude-allow-list");
-        if (_alTa && Array.isArray(msg.user)) {
+        if (_alTa && Array.isArray(msg.user) && !store.get("userAllowDirty")) {
           _alTa.value = msg.user.join("\n");
         }
         var _alManaged = document.getElementById("us-claude-allow-managed");
@@ -2201,19 +2199,7 @@ export function processMessage(msg) {
         break;
 
       case "set_claude_user_allow_list_result":
-        var _alStatus = document.getElementById("us-claude-allow-status");
-        if (_alStatus) {
-          if (msg.ok) {
-            _alStatus.textContent = "Saved (applies on next claude invocation)";
-            _alStatus.classList.remove("error");
-            setTimeout(function () {
-              if (_alStatus.textContent.indexOf("Saved") === 0) _alStatus.textContent = "";
-            }, 4000);
-          } else {
-            _alStatus.textContent = "Save failed: " + (msg.error || "unknown");
-            _alStatus.classList.add("error");
-          }
-        }
+        handlePersonalSettingsMessage(msg);
         break;
 
       case "restart_server_result":

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

@@ -7,8 +7,8 @@ import { refreshIcons, iconHtml } from './icons.js';
 import { escapeHtml } from './utils.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { showHomeHub } from './app-home-hub.js';
-import { openHomeChat } from './home-mate-chat.js';
+import { openProjectSession } from './project-session-navigation.js';
+import { openMateWorkspace } from './project-mate-navigation.js';
 import { getCachedProjects, switchProject, renderProjectList } from './app-projects.js';
 import { mateAvatarUrl, userAvatarUrl } from './avatar.js';
 import { openTuiModal } from './tui-attention.js';
@@ -618,11 +618,8 @@ function navigateToNotification(notif) {
 
   var mateId = notif.mateId || deriveMateIdFromNotification(notif);
   if (mateId) {
-    if (notif.sessionId) {
-      try { sessionStorage.setItem("pending-notif-session", notif.sessionId); } catch (e) {}
-    }
-    showHomeHub();
-    openHomeChat(mateId);
+    if (notif.sessionId) openProjectSession(notif.slug || 'mate-' + mateId, notif.sessionId);
+    else openMateWorkspace(mateId);
     return;
   }