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

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,8 @@
+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 +30,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';
@@ -83,7 +89,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 +115,7 @@ var connectOverlay = document.getElementById("connect-overlay");
 initMessageDeliveryUi();
 
 export function processMessage(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 +126,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 +179,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 +346,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 +370,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 +409,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;
 
@@ -877,7 +890,8 @@ export function processMessage(msg) {
         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 +972,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;
 
@@ -1745,6 +1759,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 +1951,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 +1989,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 +1998,7 @@ export function processMessage(msg) {
         break;
 
       case "mate_error":
+        handleHomeMateAvatarError(msg);
         showToast(msg.error || "Mate operation failed", "error");
         break;
 

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;
   }
 

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

@@ -17,7 +17,6 @@ import { updateCrossProjectBlink, stopUrgentBlink, setActivity } from './app-fav
 import { spawnDustParticles } from './sidebar.js';
 import { isSearchOpen, closeSearch } from './session-search.js';
 import { exitDmMode } from './app-dm.js';
-import { isHomeHubVisible, hideHomeHub, showHomeHub } from './app-home-hub.js';
 import { resetFileBrowser } from './filebrowser.js';
 import { closeNotesBrowser } from './sticky-notes-browser.js';
 import { hideMemory } from './mate-memory.js';
@@ -40,6 +39,7 @@ import { chooseProjectAfterRemoval } from './project-removal-target.js';
 import { isProjectActivated, isProjectActivationPending, isProjectContextConnected, projectWsPath } from './project-activation.js';
 import { rememberHomePrimarySurface } from './home-surface.js';
 import { clearProjectSplitState } from './split-session-boundary.js';
+import { isMateHeaderWorkspace, renderOrdinaryProjectHeader } from './project-header-identity.js';
 
 // --- Module-owned state ---
 var cachedProjects = [];
@@ -273,17 +273,6 @@ export function updateProjectList(msg) {
         myMessageAvatars[avatarIndex].src = document.body.dataset.myAvatarUrl;
       }
     }
-    // Render my avatar (always present, hidden behind user-island)
-    var meEl = document.getElementById("icon-strip-me");
-    if (meEl && !meEl.hasChildNodes()) {
-      var myUser = st2.cachedAllUsers.find(function (u) { return u.id === st2.myUserId; });
-      if (myUser) {
-        var meAvatar = document.createElement("img");
-        meAvatar.className = "icon-strip-me-avatar";
-        meAvatar.src = userAvatarUrl(myUser, 34);
-        meEl.appendChild(meAvatar);
-      }
-    }
   }
 }
 
@@ -338,29 +327,8 @@ export function renderProjectList() {
   var iconStripActiveSlug = (st.mateProjectSlug && st.savedMainSlug) ? st.savedMainSlug : st.currentSlug;
   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;
-      }
-    }
+  if (!st.mateProjectSlug && !isMateHeaderWorkspace(st)) {
+    renderOrdinaryProjectHeader(Object.assign({}, st, { projectsHubList: cachedProjects }));
   }
   // Re-apply current socket status to the active icon's dot
   var dot = getStatusDot();
@@ -425,14 +393,13 @@ export function switchProject(slug) {
   var st = store.snap();
   var ws = getWs();
   var targetWsPath = projectWsPath(slug);
-  var homeVisible = isHomeHubVisible() || store.get('projectsHubVisible');
+  var homeVisible = store.get('projectsHubVisible');
   var alreadyInProject = isProjectActivated(st, slug, ws);
   var wasDm = st.dmMode;
   var wasMate = st.dmMode && st.dmTargetUser && st.dmTargetUser.isMate;
   if (st.dmMode) exitDmMode(wasMate);
   if (homeVisible && alreadyInProject) {
     rememberHomePrimarySurface("project", slug);
-    hideHomeHub();
     hideProjectsHub();
     completeProjectsOnboarding();
     if (document.documentElement.classList.contains("pwa-standalone")) {
@@ -496,7 +463,7 @@ export function confirmCurrentProjectSessionActivation() {
 export function finishProjectSessionActivation() {
   var confirmed = confirmCurrentProjectSessionActivation();
   if (!confirmed) return false;
-  if (!store.get('pendingHomeProjectSlug')) return !isHomeHubVisible() && !store.get('projectsHubVisible');
+  if (!store.get('pendingHomeProjectSlug')) return !store.get('projectsHubVisible');
   return completePendingProjectActivation();
 }
 

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

@@ -8,7 +8,8 @@ import { refreshIcons } from './icons.js';
 import { closeToolGroup } from './tools.js';
 import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
-import { addToMessages, scrollToBottom, forceScrollToBottom, getMsgTime, shouldGroupMessage, getTurnCounter, getActivityEl, VENDOR_AVATARS, VENDOR_NAMES } from './chat-render-runtime.js';
+import { addToMessages, scrollToBottom, forceScrollToBottom, getMsgTime, shouldGroupMessage, getTurnCounter, getActivityEl } from './chat-render-runtime.js';
+import { resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 export { VENDOR_ORDER, EXPERIMENTAL_VENDORS, isExperimentalVendor } from './vendor-priority.js';
 export { initRendering, addToMessages, scrollToBottom, forceScrollToBottom, getMsgTime, shouldGroupMessage, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp, getStickyBottom, armStickyBottom, disarmStickyBottom, VENDOR_AVATARS, VENDOR_NAMES, VENDOR_HOMEPAGES } from './chat-render-runtime.js';
 export { addUserMessage, addSystemMessage, addConflictMessage, addContextOverflowMessage } from './app-message-cards.js';
@@ -22,15 +23,15 @@ var streamDrainTimer = null;
 export function ensureAssistantBlock() {
   var _el = store.get('currentMsgEl');
   if (!_el) {
-    var _isDm2 = document.body.classList.contains("mate-dm-active") && document.body.dataset.mateAvatarUrl;
     var vendor = store.get('currentVendor') || "claude";
-    var dmTarget = store.get('dmTargetUser');
+    var identity = resolveProjectAssistantIdentity(store.snap(), vendor);
     _el = createAssistantBubble({
       turn: getTurnCounter(),
-      avatarUrl: _isDm2 ? document.body.dataset.mateAvatarUrl : (VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude),
-      name: _isDm2 ? ((dmTarget && dmTarget.displayName) || "Mate") : (VENDOR_NAMES[vendor] || VENDOR_NAMES.claude),
+      avatarUrl: identity.avatarUrl,
+      name: identity.name,
       time: getMsgTime(),
     });
+    applyProjectAssistantIdentity(_el, identity);
     if (shouldGroupMessage("msg-assistant")) _el.classList.add("grouped");
     addToMessages(_el);
     store.set({ currentMsgEl: _el, currentFullText: "" });
@@ -119,20 +120,17 @@ export function showClaudePreThinking() {
   if (getChatLayout() !== "channel") return;
   removeMatePreThinking();
   var vendor = store.get('currentVendor') || "claude";
-  var vendorAvatar = VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude;
-  var vendorName = VENDOR_NAMES[vendor] || VENDOR_NAMES.claude;
-  doShowMatePreThinking(vendorName, vendorAvatar);
+  var identity = resolveProjectAssistantIdentity(store.snap(), vendor);
+  doShowMatePreThinking(identity.name, identity.avatarUrl, identity);
 }
 
 export function showMatePreThinking() {
   removeMatePreThinking();
-  var dmTarget = store.get('dmTargetUser');
-  var mateName = dmTarget ? (dmTarget.displayName || "Mate") : "Mate";
-  var mateAvatar = document.body.dataset.mateAvatarUrl || "";
-  doShowMatePreThinking(mateName, mateAvatar);
+  var identity = resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor'));
+  doShowMatePreThinking(identity.name, identity.avatarUrl, identity);
 }
 
-function doShowMatePreThinking(mateName, mateAvatar) {
+function doShowMatePreThinking(mateName, mateAvatar, identity) {
   var _el = document.createElement("div");
   _el.className = "thinking-item mate-thinking mate-pre-thinking";
   _el.innerHTML =
@@ -141,6 +139,7 @@ function doShowMatePreThinking(mateName, mateAvatar) {
     '<div class="dm-bubble-header"><span class="dm-bubble-name">' + escapeHtml(mateName) + '</span></div>' +
     '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>' +
     '</div>';
+  applyProjectAssistantIdentity(_el, identity);
   store.set({ matePreThinkingEl: _el });
   var activity = getActivityEl();
   if (activity && activity.parentNode) {

package/lib/public/modules/avatar.js

@@ -1,18 +1,30 @@
 // Centralized local avatar URL builder for people and Mates.
 import { imprintDataUrl, mateMarkDataUrl } from './avatar-imprint.js';
 
-var imprintCache = new Map();
 var mateMarkCache = new Map();
 
-// Legacy style remains part of the identity hash so existing selections map
-// deterministically into the local pixel identity system.
+// Historical DiceBear 9.x choices, now generated by Clay's local server.
+export var MATE_AVATAR_STYLES = [
+  { id: 'thumbs', name: 'Thumbs' },
+  { id: 'bottts', name: 'Bots' },
+  { id: 'pixel-art', name: 'Pixel' },
+  { id: 'adventurer', name: 'Adventurer' },
+  { id: 'micah', name: 'Micah' },
+  { id: 'fun-emoji', name: 'Emoji' },
+  { id: 'icons', name: 'Icons' },
+];
+
 export function avatarUrl(style, seed, size) {
-  var cacheKey = [style || 'imprint', seed || 'anonymous', size || 64].join('|');
-  if (imprintCache.has(cacheKey)) return imprintCache.get(cacheKey);
-  var url = imprintDataUrl({ style: style || 'imprint', seed: seed || 'anonymous', size: size || 64 });
-  if (imprintCache.size >= 512) imprintCache.delete(imprintCache.keys().next().value);
-  imprintCache.set(cacheKey, url);
-  return url;
+  var normalizedStyle = style || 'imprint';
+  var normalizedSeed = seed || 'anonymous';
+  var normalizedSize = size || 64;
+  var isHistorical = MATE_AVATAR_STYLES.some(function (entry) { return entry.id === normalizedStyle; });
+  if (isHistorical) {
+    return '/api/generated-avatar?style=' + encodeURIComponent(normalizedStyle)
+      + '&seed=' + encodeURIComponent(normalizedSeed)
+      + '&size=' + encodeURIComponent(normalizedSize);
+  }
+  return imprintDataUrl({ style: normalizedStyle, seed: normalizedSeed, size: normalizedSize });
 }
 
 // Use the same bounded account identity for fresh fallbacks across every surface.
@@ -46,5 +58,9 @@ export function mateAvatarUrl(mate, size) {
   var p = mate.profile || mate;
   if (p.avatarCustom || mate.avatarCustom) return p.avatarCustom || mate.avatarCustom;
   var identity = p.displayName || mate.name || mate.displayName || 'Mate';
+  var style = p.avatarStyle || mate.avatarStyle || 'imprint';
+  if (style !== 'imprint' && style !== 'initial') {
+    return avatarUrl(style, p.avatarSeed || mate.avatarSeed || mate.id || identity, size);
+  }
   return mateMarkUrl(identity, size);
 }

package/lib/public/modules/chat-render-runtime.js

@@ -2,6 +2,7 @@
 
 import { store } from './store.js';
 import { getMessagesEl } from './dom-refs.js';
+import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
@@ -124,11 +125,22 @@ export function disarmStickyBottom() {
 }
 
 export function initRendering() {
+  var lastAssistantPlaceholder = '';
+  function updateInputPlaceholder(state) {
+    var inputEl = document.getElementById("input");
+    if (!inputEl) return;
+    var nextPlaceholder = getProjectAssistantPlaceholder(state, state.currentVendor);
+    var ownsPlaceholder = !lastAssistantPlaceholder || inputEl.placeholder === lastAssistantPlaceholder;
+    lastAssistantPlaceholder = nextPlaceholder;
+    if (inputEl.disabled || document.getElementById("input-mention-chip") || !ownsPlaceholder) return;
+    inputEl.placeholder = nextPlaceholder;
+  }
+  updateInputPlaceholder(store.snap());
   store.subscribe(function (state, prev) {
-    if (state.currentVendor !== prev.currentVendor) {
-      var inputEl = document.getElementById("input");
-      if (inputEl) inputEl.placeholder = "Message " + (VENDOR_NAMES[state.currentVendor] || VENDOR_NAMES.claude) + "...";
-    }
+    if (state.currentVendor !== prev.currentVendor || state.activeSessionMateId !== prev.activeSessionMateId ||
+        state.activeSessionMateName !== prev.activeSessionMateName || state.activeProjectMateId !== prev.activeProjectMateId ||
+        state.activeProjectMateName !== prev.activeProjectMateName || state.cachedMatesList !== prev.cachedMatesList ||
+        state.dmMode !== prev.dmMode || state.dmTargetUser !== prev.dmTargetUser) updateInputPlaceholder(state);
   });
 }