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

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

@@ -12,7 +12,6 @@ import { dismissOverlayPanels, closeSidebar, updatePageTitle, spawnDustParticles
 import { showConfirm } from './app-misc.js';
 import { getUpcomingSchedules } from './scheduler.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
-import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { openGroup, openWorkerWithDriver, separateGroup } from './split-view.js';
 import { groupedSessionIds } from './split-group-helpers.js';
 import { resolvePreferredVendor } from './default-vendor.js';
@@ -24,6 +23,7 @@ import { renderFolderToolbar, captureFolderInputs, folderToolbarNeedsRender } fr
 import { captureFolderCollapseAnimations } from './session-folder-collapse.js';
 import { getListSearchQuery, getListSearchMatchIds, applyListSearchResults, filterItemsBySearch } from './session-list-search.js';
 import { expectCreatedSession } from './session-create.js';
+import { isMateWorkspace } from './project-mate-navigation.js';
 import { describeSessionDelete } from './session-delete-scope.js';
 import { renderSessionPresence, setSessionPresence } from './session-presence-ui.js';
 import {
@@ -31,6 +31,9 @@ import {
   renderDesktopDriverHierarchy,
   renderDesktopOrphanHierarchy
 } from './sidebar-session-hierarchy.js';
+import { ordinarySessionListSessions } from './session-list-visibility.js';
+import { formatSessionActivity } from './session-activity-tooltip.js';
+import { bindSessionTitleMarquee } from './session-title-marquee.js';
 import { summarizeSidebarItems } from './sidebar-session-counts.js';
 import {
   cancelSessionInlineRename,
@@ -272,7 +275,7 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
 
 
   // Session visibility toggle (only the session owner can change)
-  if (store.get('isMultiUserMode') && sessionData && sessionData.ownerId && sessionData.ownerId === store.get('myUserId')) {
+  if (!isMateWorkspace(store.snap()) && store.get('isMultiUserMode') && sessionData && !sessionData.isMate && sessionData.ownerId && sessionData.ownerId === store.get('myUserId')) {
     var currentVis = (sessionData && sessionData.sessionVisibility) || "private";
     var isPrivate = currentVis === "private";
     var visItem = document.createElement("button");
@@ -514,6 +517,17 @@ function isSessionVisibleBySearch(sessionId) {
   return getListSearchMatchIds().has(sessionId);
 }
 
+function appendSessionTitleLine(el, textSpan) {
+  var processingDot = textSpan.querySelector('.session-processing');
+  if (processingDot) processingDot.remove();
+  var titleLine = document.createElement('span');
+  titleLine.className = 'session-item-title-line';
+  titleLine.appendChild(textSpan);
+  if (processingDot) titleLine.appendChild(processingDot);
+  el.appendChild(titleLine);
+  return titleLine;
+}
+
 // --- Loop child / run / group rendering ---
 
 function renderLoopChild(s) {
@@ -539,7 +553,7 @@ function renderLoopChild(s) {
     textHtml += '<span class="session-loop-role-badge' + roleCls + '">' + roleName + iterSuffix + '</span>';
   }
   textSpan.innerHTML = textHtml;
-  el.appendChild(textSpan);
+  appendSessionTitleLine(el, textSpan);
   appendSessionCloseButton(el, s);
 
   el.addEventListener("click", (function (id) {
@@ -665,7 +679,7 @@ function renderLoopGroup(loopId, children, groupKey) {
     textHtml += '<span class="session-loop-count' + countClass + '">' + countLabel + '</span>';
   }
   textSpan.innerHTML = textHtml;
-  el.appendChild(textSpan);
+  appendSessionTitleLine(el, textSpan);
 
   // More button (ellipsis)
   var moreBtn = document.createElement("button");
@@ -768,7 +782,7 @@ function renderLoopRun(parentGk, startedAtKey, sessions, isRalph) {
   textHtml += '<span class="session-loop-run-time">' + escapeHtml(timeLabel) + '</span>';
   textHtml += '<span class="session-loop-count' + (isRalph ? "" : " scheduled") + '">' + sessions.length + '</span>';
   textSpan.innerHTML = textHtml;
-  el.appendChild(textSpan);
+  appendSessionTitleLine(el, textSpan);
 
   // Click row -> switch to latest session of this run
   el.addEventListener("click", (function (id) {
@@ -799,26 +813,24 @@ function renderLoopRun(parentGk, startedAtKey, sessions, isRalph) {
 
 function renderSessionItem(s, options) {
   var itemOptions = options || {};
+  var displaySession = s;
+  if (itemOptions.promotedActive || itemOptions.promotedProcessing || itemOptions.promotedUnread !== undefined) {
+    displaySession = Object.assign({}, s, {
+      active: !!(s.active || itemOptions.promotedActive),
+      isProcessing: !!(s.isProcessing || itemOptions.promotedProcessing),
+      unread: (s.unread || 0) + (itemOptions.promotedUnread || 0),
+    });
+  }
   var el = document.createElement("div");
   var isMatch = getListSearchMatchIds() !== null && getListSearchMatchIds().has(s.id);
-  el.className = "session-item" + (s.active ? " active" : "") + (isMatch ? " search-match" : "");
+  el.className = "session-item" + (displaySession.active ? " active" : "") + (isMatch ? " search-match" : "");
   if (itemOptions.worker) el.classList.add("session-worker-item");
   el.dataset.sessionId = s.id;
 
-  // Keep agent identity separate from the title so each row has a stable
-  // visual anchor instead of mixing a tiny inline logo into the text.
-  var itemVendor = s.vendor || "claude";
-  var vendorIcon = document.createElement("img");
-  vendorIcon.className = "session-vendor-icon session-vendor-mark";
-  vendorIcon.src = VENDOR_AVATARS[itemVendor] || VENDOR_AVATARS.claude;
-  vendorIcon.alt = "";
-  vendorIcon.title = VENDOR_NAMES[itemVendor] || itemVendor;
-  el.appendChild(vendorIcon);
-
   var textSpan = document.createElement("span");
   textSpan.className = "session-item-text";
   var textHtml = "";
-  if (s.isProcessing) {
+  if (displaySession.isProcessing) {
     textHtml += '<span class="session-processing"></span>';
   }
   if (s.backgroundTaskCount) {
@@ -832,8 +844,12 @@ function renderSessionItem(s, options) {
   }
   textHtml += '<span class="session-item-title">' + highlightMatch(s.title || "New Session", getListSearchQuery()) + '</span>';
   textSpan.innerHTML = textHtml;
-  el.appendChild(textSpan);
-  appendGithubWork(el, s, textSpan);
+  textSpan.setAttribute("aria-label", s.title || "New Session");
+  var titleEl = textSpan.querySelector(".session-item-title");
+  var activityTitle = formatSessionActivity(s.lastActivity);
+  if (titleEl && activityTitle) titleEl.title = activityTitle;
+  var titleLine = appendSessionTitleLine(el, textSpan);
+  appendGithubWork(el, s, titleLine);
 
   if (itemOptions.worker) {
     var workerLabel = document.createElement("span");
@@ -844,13 +860,6 @@ function renderSessionItem(s, options) {
 
   var trailing = document.createElement("span");
   trailing.className = "session-row-trailing";
-  var ageText = relativeTime(s.lastActivity || 0);
-  if (ageText) {
-    var age = document.createElement("span");
-    age.className = "session-item-age";
-    age.textContent = ageText;
-    trailing.appendChild(age);
-  }
 
   // Right-click / long-press: context menu
   el.addEventListener("contextmenu", (function(id, title, cliSid, anchor, sData) {
@@ -865,8 +874,8 @@ function renderSessionItem(s, options) {
   var unreadBadge = document.createElement("span");
   unreadBadge.className = "session-unread-badge";
   unreadBadge.dataset.sessionId = s.id;
-  if (s.unread > 0) {
-    unreadBadge.textContent = s.unread > 99 ? "99+" : String(s.unread);
+  if (displaySession.unread > 0) {
+    unreadBadge.textContent = displaySession.unread > 99 ? "99+" : String(displaySession.unread);
     unreadBadge.classList.add("has-unread");
   }
   el.appendChild(unreadBadge);
@@ -877,6 +886,7 @@ function renderSessionItem(s, options) {
     if (isFavoriteSession(s)) el.classList.add("is-favorite");
   }
   appendSessionCloseButton(actions, s);
+  el.style.setProperty("--session-actions-width", (actions.childNodes.length * 18 + Math.max(0, actions.childNodes.length - 1) * 4 + 21) + "px");
   if (actions.childNodes.length) trailing.appendChild(actions);
   if (trailing.childNodes.length) el.appendChild(trailing);
 
@@ -898,6 +908,7 @@ function renderSessionItem(s, options) {
 
   // Presence avatars (multi-user)
   renderSessionPresence(el, String(s.id));
+  bindSessionTitleMarquee(el, textSpan.querySelector(".session-item-title"), actions);
   if (!itemOptions.worker) setupFolderDrag(el, s);
 
   return el;
@@ -911,14 +922,7 @@ function renderSplitGroupItem(group, members) {
 
   var text = document.createElement("span");
   text.className = "session-item-text split-group-text";
-  var html = '<span class="split-group-glyph" aria-hidden="true">' + iconHtml("columns-2") + '</span><span class="split-group-vendors">';
-  for (var i = 0; i < members.length; i++) {
-    var vendor = members[i].vendor || "claude";
-    html += '<img class="session-vendor-icon split-group-vendor" src="' +
-      (VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude) + '" alt="" title="' +
-      escapeHtml(VENDOR_NAMES[vendor] || vendor) + '">';
-  }
-  html += "</span>";
+  var html = '<span class="split-group-glyph" aria-hidden="true">' + iconHtml("columns-2") + '</span>';
   var splitProcessing = false;
   var splitBackgroundTaskCount = 0;
   for (var si = 0; si < members.length; si++) {
@@ -929,7 +933,7 @@ function renderSplitGroupItem(group, members) {
   if (splitBackgroundTaskCount) html += '<span class="session-background-task-count">' + splitBackgroundTaskCount + '</span>';
   html += '<span class="split-group-name">' + highlightMatch(group.name || "Split", getListSearchQuery()) + "</span>";
   text.innerHTML = html;
-  el.appendChild(text);
+  appendSessionTitleLine(el, text);
 
   var unread = 0;
   for (var ui = 0; ui < members.length; ui++) unread += members[ui].unread || 0;
@@ -938,7 +942,6 @@ function renderSplitGroupItem(group, members) {
   badge.dataset.splitGroupId = group.id;
   if (unread > 0) badge.textContent = unread > 99 ? "99+" : String(unread);
   el.appendChild(badge);
-
   el.addEventListener("click", function () {
     if (openGroup(group)) {
       dismissOverlayPanels();
@@ -994,22 +997,23 @@ export function renderSessionList(sessions) {
 
   // Partition: loop sessions vs normal sessions
   // Group by loopId + date so all runs of the same task on the same day are merged
+  var visibleSessions = ordinarySessionListSessions(cachedSessions);
   var splitGroups = store.get('splitGroups') || [];
   var groupedIds = groupedSessionIds(splitGroups);
-  var hierarchy = prepareSidebarHierarchy(cachedSessions);
+  var hierarchy = prepareSidebarHierarchy(visibleSessions);
   var hierarchyByDriver = hierarchy.byDriver;
   var hierarchySessionIds = hierarchy.sessionIds;
   hierarchySessionIds.forEach(function (id) { groupedIds.delete(id); });
   var sessionsById = new Map();
-  for (var si = 0; si < cachedSessions.length; si++) sessionsById.set(cachedSessions[si].id, cachedSessions[si]);
+  for (var si = 0; si < visibleSessions.length; si++) sessionsById.set(visibleSessions[si].id, visibleSessions[si]);
   var loopGroups = {}; // groupKey -> [sessions]
   var normalSessions = [];
-  for (var i = 0; i < cachedSessions.length; i++) {
-    var s = cachedSessions[i];
+  for (var i = 0; i < visibleSessions.length; i++) {
+    var s = visibleSessions[i];
     if (s.sessionRole === "worker") continue;
     if (groupedIds.has(s.id)) continue;
-    if (s.loop && s.loop.loopId && s.loop.role === "crafting" && s.loop.source !== "ralph" && s.loop.source !== "debate") {
-      // Task crafting sessions live in the scheduler calendar, not the main list (except debate)
+    if (s.loop && s.loop.loopId && s.loop.role === "crafting" && s.loop.source !== "ralph") {
+      // Task crafting sessions live in the scheduler calendar, not the main list.
       continue;
     } else if (s.loop && s.loop.loopId) {
       var startedAt = s.loop.startedAt || 0;
@@ -1029,11 +1033,6 @@ export function renderSessionList(sessions) {
     if (driverRoot) items.push({ type: "driver-hierarchy", root: driverRoot, data: driverRoot.driver, lastActivity: driverRoot.lastActivity });
     else items.push({ type: "session", data: normalSessions[j], lastActivity: normalSessions[j].lastActivity || 0 });
   }
-  if (hierarchy.orphans.length) {
-    var orphanActivity = 0;
-    for (var oi = 0; oi < hierarchy.orphans.length; oi++) orphanActivity = Math.max(orphanActivity, hierarchy.orphans[oi].lastActivity || 0);
-    items.push({ type: "orphan-workers", workers: hierarchy.orphans, lastActivity: orphanActivity });
-  }
   for (var sg = 0; sg < splitGroups.length; sg++) {
     var splitGroup = splitGroups[sg];
     var splitMembers = [];
@@ -1083,7 +1082,7 @@ export function renderSessionList(sessions) {
       if (it.type === "loop") return renderLoopGroup(it.loopId, it.children, it.groupKey) || document.createElement("div");
       if (it.type === "split-group") return renderSplitGroupItem(it.group, it.members);
       if (it.type === "driver-hierarchy") return renderDesktopDriverHierarchy(it.root, renderSessionItem, rerender, matchIds);
-      if (it.type === "orphan-workers") return renderDesktopOrphanHierarchy(it.workers, renderSessionItem, rerender, matchIds);
+      if (it.type === "orphan-workers") return document.createElement("div");
       return renderSessionItem(it.data);
     },
   };

package/lib/public/modules/sidebar.js

@@ -62,6 +62,14 @@ export function closeSidebar() {
   ctx.sidebarOverlay.classList.remove("visible");
 }
 
+export function toggleSidebarCollapse() {
+  if (!ctx) return;
+  var layout = ctx.$("layout");
+  var collapsed = layout.classList.toggle("sidebar-collapsed");
+  try { localStorage.setItem("sidebar-collapsed", collapsed ? "1" : ""); } catch (e) {}
+  setTimeout(function () { syncResizeHandles(); }, 210);
+}
+
 export function initSidebar(_ctx) {
   ctx = _ctx;
 
@@ -87,13 +95,6 @@ export function initSidebar(_ctx) {
   ctx.sidebarOverlay.addEventListener("click", closeSidebar);
 
   // --- Desktop sidebar collapse/expand ---
-  function toggleSidebarCollapse() {
-    var layout = ctx.$("layout");
-    var collapsed = layout.classList.toggle("sidebar-collapsed");
-    try { localStorage.setItem("sidebar-collapsed", collapsed ? "1" : ""); } catch (e) {}
-    setTimeout(function () { syncUserIslandWidth(); syncResizeHandle(); }, 210);
-  }
-
   if (ctx.sidebarToggleBtn) ctx.sidebarToggleBtn.addEventListener("click", toggleSidebarCollapse);
   if (ctx.sidebarExpandBtn) ctx.sidebarExpandBtn.addEventListener("click", toggleSidebarCollapse);
   var mateSidebarToggle = document.getElementById("mate-sidebar-toggle-btn");
@@ -245,12 +246,9 @@ export function initSidebar(_ctx) {
 
   function syncUserIslandWidth() {
     if (!userIsland) return;
-    var mateSidebarColumn = document.getElementById("mate-sidebar-column");
-    var isMateDM = document.body.classList.contains("mate-dm-active");
-    var col = (isMateDM && mateSidebarColumn && !mateSidebarColumn.classList.contains("hidden")) ? mateSidebarColumn : sidebarColumn;
-    if (!col) return;
-    var rect = col.getBoundingClientRect();
-    userIsland.style.width = (rect.right - 8 - 8) + "px";
+    var iconStrip = document.getElementById("icon-strip");
+    var stripWidth = iconStrip ? iconStrip.getBoundingClientRect().width : 0;
+    userIsland.style.width = (stripWidth > 0 ? stripWidth : 72) + "px";
   }
 
   // --- Sidebar resize handle ---

package/lib/public/modules/thinking-lifecycle.js

@@ -3,6 +3,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { addToMessages, keepActiveThinkingAtTail, scrollToBottom } from './chat-render-runtime.js';
 import { prepareThinkingView, bindThinkingView, updateThinkingView, beginThinkingView, setThinkingViewLive, finishThinkingView } from './thinking-view.js';
+import { resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 
 function getThinkingState() {
   return store.get('thinkingState') || null;
@@ -19,8 +20,7 @@ function updateThinkingState(state, patch) {
 }
 
 function isMateThinking() {
-  var target = store.get('dmTargetUser');
-  return !!(store.get('dmMode') && target && target.isMate);
+  return resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor')).kind === 'mate';
 }
 
 function maybeScrollToBottom() {
@@ -30,10 +30,10 @@ function maybeScrollToBottom() {
 function createThinkingElement() {
   var el = document.createElement("div");
   el.className = "thinking-item";
-  if (isMateThinking()) {
-    var target = store.get('dmTargetUser');
-    var mateName = (target && target.displayName) || "Mate";
-    var mateAvatar = document.body.dataset.mateAvatarUrl || "";
+  var identity = resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor'));
+  if (identity.kind === 'mate') {
+    var mateName = identity.name;
+    var mateAvatar = identity.avatarUrl;
     el.classList.add("mate-thinking");
     el.innerHTML =
       '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="">' +
@@ -48,6 +48,7 @@ function createThinkingElement() {
       '</div>' +
       '<div class="thinking-content"></div>' +
       '</div>';
+    applyProjectAssistantIdentity(el, identity);
   } else {
     el.innerHTML =
       '<div class="thinking-header">' +

package/lib/public/modules/tool-palette-order.js

@@ -33,13 +33,14 @@ var MATE_TOOLS = [
   { id: "mate-memory-btn",       icon: "brain",          label: "Memory",          countId: "mate-memory-count" },
   { id: "mate-knowledge-btn",    icon: "book-open",      label: "Knowledge",       countId: "mate-knowledge-count" },
   { id: "mate-sticky-notes-btn", icon: "sticky-note",    label: "Sticky Notes" },
-  { id: "mate-debate-btn",       icon: "mic",            label: "Debate" },
+  { id: "mate-debates-btn",      icon: "messages-square", label: "Debates" },
   { id: "mate-mcp-btn",          icon: "cable",          label: "MCP / Skills",     countId: "mate-mcp-sidebar-count" },
 ];
 
 export var PALETTES = {
   session: {
     tools: SESSION_TOOLS,
+    fixedTools: [{ id: "you-button", icon: "user-round", label: "Me", countId: "me-unread-badge", fixed: true, scope: "clay" }],
     activeContainerId: "session-actions",
     hiddenSectionId: "session-actions-hidden",
   },
@@ -57,13 +58,13 @@ export var PALETTES = {
 //
 // Skills now shares the MCP / Skills entry; explicit MCP placement wins.
 var LEGACY_SESSION_TOOL_IDS = { "skills-btn": "mcp-btn" };
-var LEGACY_MATE_TOOL_IDS = { "mate-skills-btn": "mate-mcp-btn" };
+var LEGACY_MATE_TOOL_IDS = { "mate-skills-btn": "mate-mcp-btn", "mate-debate-btn": "mate-debates-btn" };
 
 // Tools withdrawn from the session palette with no replacement. Git moved to
 // the always-visible repository placard below the tool strip, so it no longer
 // consumes an icon slot. A saved preference naming it is dropped rather than
 // left to linger in stored order forever.
-var RETIRED_SESSION_TOOL_IDS = ["git-sidebar-btn", "loop-tool-btn"];
+var RETIRED_SESSION_TOOL_IDS = ["git-sidebar-btn", "loop-tool-btn", "debates-btn"];
 
 function indexOfId(list, id) {
   for (var i = 0; i < list.length; i++) {

package/lib/public/modules/tool-palette.js

@@ -37,6 +37,8 @@ function buildPalette(name) {
   var active = document.getElementById(palette.activeContainerId);
   if (!active) return;
 
+  (palette.fixedTools || []).forEach(function (tool) { active.appendChild(buildToolButton(tool, name)); });
+
   // Create buttons with stable IDs and append in registry order (default).
   for (var i = 0; i < palette.tools.length; i++) {
     active.appendChild(buildToolButton(palette.tools[i], name));
@@ -73,8 +75,11 @@ function buildToolButton(tool, paletteName) {
   btn.setAttribute('aria-label', tool.label);
   btn.dataset.toolId = tool.id;
   btn.dataset.palette = paletteName;
-  // Draggable at all times so users can reorder in place.
+  // Ordinary tools can be reordered; fixed tools retain their first slots.
   btn.draggable = true;
+  if (tool.fixed) { btn.draggable = false; btn.dataset.fixed = 'true'; }
+  if (tool.scope) btn.dataset.scope = tool.scope;
+  if (tool.id === 'you-button') { btn.classList.add('you-button'); btn.setAttribute('aria-pressed', 'false'); }
 
   var icon = document.createElement('i');
   icon.setAttribute('data-lucide', tool.icon);
@@ -89,10 +94,12 @@ function buildToolButton(tool, paletteName) {
     var count = document.createElement('span');
     count.id = tool.countId;
     count.className = 'sidebar-badge hidden';
+    if (tool.id === 'you-button') { count.className = 'sidebar-badge me-unread-badge'; count.hidden = true; }
     btn.appendChild(count);
   }
 
   btn.addEventListener('dragstart', function (e) {
+    if (tool.fixed) { e.preventDefault(); return; }
     var container = btn.parentNode;
     if (!container || container.id !== PALETTES[paletteName].activeContainerId) {
       e.preventDefault();
@@ -122,6 +129,7 @@ function getDragAfterElement(container, x, y) {
   var closest = null;
   var closestDist = Number.POSITIVE_INFINITY;
   for (var i = 0; i < tiles.length; i++) {
+    if (tiles[i].dataset.fixed === 'true') continue;
     var rect = tiles[i].getBoundingClientRect();
     // Pointer is "before" the tile if it's left of the tile's horizontal
     // midpoint on the same row (or on a higher row).
@@ -164,7 +172,7 @@ function applyPreferences(name, prefs) {
   function place(id) {
     if (placed[id]) return;
     var btn = document.getElementById(id);
-    if (!btn) return;
+    if (!btn || btn.dataset.fixed === 'true') return;
     active.appendChild(btn);
     placed[id] = true;
   }
@@ -201,7 +209,9 @@ function savePreferences(name) {
 
   var order = [];
   var activeTiles = active.querySelectorAll('[data-tool-id]');
-  for (var i = 0; i < activeTiles.length; i++) order.push(activeTiles[i].dataset.toolId);
+  for (var i = 0; i < activeTiles.length; i++) {
+    if (activeTiles[i].dataset.fixed !== 'true') order.push(activeTiles[i].dataset.toolId);
+  }
 
   // Every tool is visible, so the explicit order is the whole preference.
   fetch('/api/user/tool-palettes', {

package/lib/public/modules/tools.js

@@ -11,6 +11,7 @@ import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
 import { buildElicitationCard, markElicitationCard, showElicitationError } from './elicitation-form.js';
 import { findAskUserCard, getAskUserRequestKey, hasAskUserRequest, rememberAskUserRequest, markAskUserRequestAnswered, saveAskUserState, restoreAskUserState, resetAskUserState } from './ask-user-state.js';
+import { getProjectAssistantPlaceholder, resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 
 var ctx;
 
@@ -142,11 +143,11 @@ function updateToolGroupHeader(group) {
     refreshIcons();
   }
 
-  // Show group header only when 2+ visible tools (or always in mate DM)
+  // Show group header only when 2+ visible tools (or always in a Mate conversation)
   var header = group.el.querySelector(".tool-group-header");
   var isMate = group.el.classList.contains("mate-tool-group");
   if (isMate) {
-    // Mate DM: hide entire group when no tools, show collapsed when tools exist
+    // Mate conversation: hide entire group when no tools, show collapsed when tools exist
     if (group.toolCount === 0) {
       group.el.style.display = "none";
     } else {
@@ -248,12 +249,13 @@ export function renderAskUserQuestion(toolId, input) {
   container.dataset.askUserRequestKey = requestKey;
   rememberAskUserRequest(toolId);
 
-  // Mate DM: wrap in avatar + content layout (same as msg-assistant)
+  // Mate conversation: wrap in avatar + content layout (same as msg-assistant)
   var mateContentWrap = null;
-  if (ctx.isMateDm && ctx.isMateDm()) {
+  if (resolveProjectAssistantIdentity().kind === 'mate') {
     container.classList.add("mate-ask-user");
-    var mateName = ctx.getMateName();
-    var mateAvatar = ctx.getMateAvatarUrl();
+    var identity = resolveProjectAssistantIdentity();
+    var mateName = identity.name;
+    var mateAvatar = identity.avatarUrl;
 
     var avi = document.createElement("img");
     avi.className = "dm-bubble-avatar";
@@ -393,7 +395,7 @@ export function renderAskUserQuestion(toolId, input) {
   actions.appendChild(skipBtn);
   container.appendChild(actions);
 
-  // Mate DM: move all content into the bubble content wrapper
+  // Mate conversation: move all content into the bubble content wrapper
   if (mateContentWrap) {
     var children = [];
     for (var ci = 0; ci < container.childNodes.length; ci++) {
@@ -420,12 +422,7 @@ export function disableMainInput() {
 
 export function enableMainInput() {
   ctx.inputEl.disabled = false;
-  if (document.body.classList.contains("mate-dm-active") && document.body.dataset.mateName) {
-    ctx.inputEl.placeholder = "Message " + document.body.dataset.mateName + "...";
-  } else {
-    var _v = store.get('currentVendor') || "claude";
-    ctx.inputEl.placeholder = "Message " + (VENDOR_NAMES[_v] || VENDOR_NAMES.claude) + "...";
-  }
+  ctx.inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
 }
 
 function submitAskUserAnswer(container, toolId, questions, answers, multiSelections) {
@@ -557,8 +554,8 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
     return;
   }
 
-  // Channel layout or Mate DM: conversational "Can I ...?" style
-  if ((ctx.isMateDm && ctx.isMateDm()) || getChatLayout() === "channel") {
+  // Channel layout or Mate conversation: conversational "Can I ...?" style
+  if (resolveProjectAssistantIdentity().kind === "mate" || getChatLayout() === "channel") {
     renderConversationalPermission(requestId, toolName, toolInput, mateId, vendor);
     applyPermissionHints(pendingPermissions[requestId], hints);
     return;
@@ -824,10 +821,11 @@ function matePermissionInfo(toolName, toolInput) {
 }
 
 function resolvePermissionIdentity(mateId, vendor) {
-  // Mate DM: use DM target mate info
-  if (ctx.isMateDm && ctx.isMateDm()) {
-    var name = ctx.getMateName();
-    var avatar = ctx.getMateAvatarUrl();
+  // Use the Mate bound to this session, including legacy DM targets.
+  if (resolveProjectAssistantIdentity().kind === 'mate') {
+    var identity = resolveProjectAssistantIdentity();
+    var name = identity.name;
+    var avatar = identity.avatarUrl;
     // Override if specific mateId provided (e.g. @mention)
     if (mateId && ctx.getMateById) {
       var mentionMate = ctx.getMateById(mateId);
@@ -1577,7 +1575,7 @@ function updateTodoSticky() {
 export function startThinking() {
   ctx.finalizeAssistantBlock();
   var el = startThinkingSegment();
-  if (!ctx.isMateDm()) {
+  if (resolveProjectAssistantIdentity().kind !== 'mate') {
     ctx.setActivity("thinking");
   }
   return el;
@@ -1605,7 +1603,8 @@ export function createToolItem(id, name) {
     toolGroupCounter++;
     var groupEl = document.createElement("div");
     groupEl.className = "tool-group";
-    var isMateToolGroup = ctx.isMateDm();
+    var identity = resolveProjectAssistantIdentity();
+    var isMateToolGroup = identity.kind === 'mate';
     if (isMateToolGroup) groupEl.classList.add("mate-tool-group");
     groupEl.dataset.groupId = "g" + toolGroupCounter;
 
@@ -1619,7 +1618,7 @@ export function createToolItem(id, name) {
       '<div class="tool-group-items"></div>';
 
     if (isMateToolGroup) {
-      var mateAvatar = ctx.getMateAvatarUrl();
+      var mateAvatar = identity.avatarUrl;
       groupEl.innerHTML =
         '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="">' +
         '<div class="dm-bubble-content">' + toolGroupInner + '</div>';
@@ -1627,6 +1626,7 @@ export function createToolItem(id, name) {
       groupEl.innerHTML = toolGroupInner;
     }
 
+    applyProjectAssistantIdentity(groupEl, identity);
     groupEl.querySelector(".tool-group-header").addEventListener("click", function () {
       groupEl.classList.toggle("collapsed");
       if (currentToolGroup) currentToolGroup.userToggled = true;