clay-server 5.2.0-beta.1 → 5.2.0-beta.11

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

@@ -1,10 +1,11 @@
+import { prepareContextualWorkspaceDeparture } from './contextual-clay-workspace.js';
+import { checkComposerDeparture, saveSessionRichDraft } from './session-rich-drafts.js';
 // app-projects.js - Project list, switching, add/remove project modals
 // Extracted from app.js (PR-29)
 
 import { showProjectsHub, hideProjectsHub, completeProjectsOnboarding } from './projects-hub.js';
-import { escapeHtml, showToast } from './utils.js';
+import { showToast } from './utils.js';
 import { refreshIcons } from './icons.js';
-import { parseEmojis } from './markdown.js';
 import { store } from './store.js';
 import { resetModelPickerState } from './model-picker.js';
 import { getWs, setWs } from './ws-ref.js';
@@ -48,157 +49,6 @@ var cachedRemovedProjects = [];
 var pendingRemoveSlug = null;
 var pendingRemoveName = null;
 
-// Add-project modal state
-var addProjectModal = null;
-var addProjectInput = null;
-var addProjectCreateInput = null;
-var addProjectCloneInput = null;
-var addProjectCloneProgress = null;
-var addProjectSuggestions = null;
-var addProjectError = null;
-var addProjectOk = null;
-var addProjectCancel = null;
-var addProjectModeBtns = null;
-var addProjectPanels = null;
-var addProjectRemoved = null;
-var addProjectPrefixEl = null;
-var addProjectPrefixValue = "";
-var addProjectDebounce = null;
-var addProjectActiveIdx = -1;
-var addProjectMode = "existing";
-
-export function initProjects() {
-  // Init add-project modal DOM refs
-  addProjectModal = document.getElementById("add-project-modal");
-  addProjectInput = document.getElementById("add-project-input");
-  addProjectCreateInput = document.getElementById("add-project-create-input");
-  addProjectCloneInput = document.getElementById("add-project-clone-input");
-  addProjectCloneProgress = document.getElementById("add-project-clone-progress");
-  addProjectSuggestions = document.getElementById("add-project-suggestions");
-  addProjectError = document.getElementById("add-project-error");
-  addProjectOk = document.getElementById("add-project-ok");
-  addProjectCancel = document.getElementById("add-project-cancel");
-  addProjectModeBtns = addProjectModal.querySelectorAll(".add-project-mode-btn");
-  addProjectPanels = addProjectModal.querySelectorAll(".add-project-panel");
-  addProjectRemoved = document.getElementById("add-project-removed");
-  addProjectPrefixEl = document.getElementById("add-project-prefix");
-
-  // Mode button click listeners
-  for (var mbi = 0; mbi < addProjectModeBtns.length; mbi++) {
-    addProjectModeBtns[mbi].addEventListener("click", function () {
-      if (this.disabled) return;
-      switchAddProjectMode(this.dataset.mode);
-    });
-  }
-
-  // Existing project input listeners
-  addProjectInput.addEventListener("focus", function () {
-    var val = addProjectInput.value;
-    if ((val || addProjectPrefixValue) && addProjectSuggestions.children.length === 0) {
-      requestBrowseDir(val);
-    } else if (addProjectSuggestions.children.length > 0) {
-      addProjectSuggestions.classList.remove("hidden");
-    }
-  });
-
-  addProjectModal.querySelector(".confirm-dialog").addEventListener("click", function (e) {
-    if (e.target === addProjectInput || addProjectInput.contains(e.target)) return;
-    if (e.target === addProjectSuggestions || addProjectSuggestions.contains(e.target)) return;
-    addProjectSuggestions.classList.add("hidden");
-    addProjectActiveIdx = -1;
-  });
-
-  addProjectInput.addEventListener("input", function () {
-    var val = addProjectInput.value;
-    addProjectError.classList.add("hidden");
-    if (addProjectDebounce) clearTimeout(addProjectDebounce);
-    addProjectDebounce = setTimeout(function () {
-      requestBrowseDir(val);
-    }, 200);
-  });
-
-  addProjectInput.addEventListener("keydown", function (e) {
-    var items = addProjectSuggestions.querySelectorAll(".add-project-suggestion-item");
-
-    if (e.key === "ArrowDown") {
-      e.preventDefault();
-      if (items.length > 0) {
-        var next = addProjectActiveIdx < items.length - 1 ? addProjectActiveIdx + 1 : 0;
-        setActiveIdx(next);
-      }
-      return;
-    }
-
-    if (e.key === "ArrowUp") {
-      e.preventDefault();
-      if (items.length > 0) {
-        var prev = addProjectActiveIdx > 0 ? addProjectActiveIdx - 1 : items.length - 1;
-        setActiveIdx(prev);
-      }
-      return;
-    }
-
-    if (e.key === "Tab") {
-      e.preventDefault();
-      var target = addProjectActiveIdx >= 0 && addProjectActiveIdx < items.length
-        ? items[addProjectActiveIdx]
-        : items.length > 0 ? items[0] : null;
-      if (target) {
-        var fullP = target.dataset.path + "/";
-        addProjectInput.value = stripPrefix(fullP);
-        addProjectError.classList.add("hidden");
-        requestBrowseDir(addProjectInput.value);
-      }
-      return;
-    }
-
-    if (e.key === "Enter") {
-      e.preventDefault();
-      if (addProjectActiveIdx >= 0 && addProjectActiveIdx < items.length) {
-        var fullPicked = items[addProjectActiveIdx].dataset.path + "/";
-        addProjectInput.value = stripPrefix(fullPicked);
-        addProjectError.classList.add("hidden");
-        requestBrowseDir(addProjectInput.value);
-        return;
-      }
-      submitAddProject();
-      return;
-    }
-
-    if (e.key === "Escape") {
-      e.preventDefault();
-      closeAddProjectModal();
-      return;
-    }
-  });
-
-  // Enter key on create/clone inputs
-  addProjectCreateInput.addEventListener("keydown", function (e) {
-    if (e.key === "Enter") { e.preventDefault(); submitAddProject(); }
-    if (e.key === "Escape") { e.preventDefault(); closeAddProjectModal(); }
-  });
-
-  addProjectCloneInput.addEventListener("keydown", function (e) {
-    if (e.key === "Enter") { e.preventDefault(); submitAddProject(); }
-    if (e.key === "Escape") { e.preventDefault(); closeAddProjectModal(); }
-  });
-
-  addProjectOk.addEventListener("click", function () { submitAddProject(); });
-  addProjectCancel.addEventListener("click", function () { closeAddProjectModal(); });
-
-  // Close on backdrop click
-  addProjectModal.querySelector(".confirm-backdrop").addEventListener("click", function () {
-    closeAddProjectModal();
-  });
-
-  // Project list add button
-  var projectListAddBtn = document.getElementById("project-list-add");
-  if (projectListAddBtn) {
-    projectListAddBtn.addEventListener("click", function () {
-      openAddProjectModal();
-    });
-  }
-}
 
 // --- State accessors ---
 
@@ -311,6 +161,7 @@ export function renderProjectList() {
   }).map(function (p) {
     return {
       slug: p.slug,
+      controlRuntimeId: p.controlRuntimeId || null,
       name: p.title || p.project,
       icon: p.icon || null,
       isProcessing: p.isProcessing,
@@ -389,6 +240,16 @@ export function resetClientState() {
 
 export function switchProject(slug) {
   if (!slug) return;
+  if (slug !== store.get('currentSlug')) {
+    try { checkComposerDeparture(); saveSessionRichDraft(); }
+    catch (error) { showToast(error.message, 'warn'); return; }
+  }
+  if (prepareContextualWorkspaceDeparture(slug) === false) return;
+  var target = cachedProjects.find(function (project) { return project.slug === slug; });
+  if (target && target.contentAccess === false && target.administrativeAccess === true) {
+    window.location.assign("/p/" + encodeURIComponent(slug) + "/");
+    return;
+  }
   document.cookie = "clay_last_project=" + encodeURIComponent(slug) + "; Path=/; SameSite=Strict; Max-Age=31536000";
   var st = store.snap();
   var ws = getWs();
@@ -630,257 +491,3 @@ export function handleRemoveProjectResult(msg) {
     showToast(msg.error || "Failed to remove project", "error");
   }
 }
-
-// --- Add project modal ---
-
-function switchAddProjectMode(mode) {
-  addProjectMode = mode;
-  for (var mi = 0; mi < addProjectModeBtns.length; mi++) {
-    var btn = addProjectModeBtns[mi];
-    if (btn.dataset.mode === mode) {
-      btn.classList.add("active");
-    } else {
-      btn.classList.remove("active");
-    }
-  }
-  for (var pi = 0; pi < addProjectPanels.length; pi++) {
-    var panel = addProjectPanels[pi];
-    if (panel.dataset.panel === mode) {
-      panel.classList.add("active");
-    } else {
-      panel.classList.remove("active");
-    }
-  }
-  addProjectError.classList.add("hidden");
-  addProjectCloneProgress.classList.add("hidden");
-  if (mode === "existing") {
-    addProjectOk.textContent = "Add";
-  } else if (mode === "create") {
-    addProjectOk.textContent = "Create";
-  } else if (mode === "clone") {
-    addProjectOk.textContent = "Clone";
-  }
-  setTimeout(function () {
-    if (mode === "existing") {
-      addProjectInput.focus();
-    } else if (mode === "create") {
-      addProjectCreateInput.focus();
-    } else if (mode === "clone") {
-      addProjectCloneInput.focus();
-    }
-  }, 50);
-}
-
-export function openAddProjectModal(mode) {
-  addProjectModal.classList.remove("hidden");
-  addProjectCreateInput.value = "";
-  addProjectCloneInput.value = "";
-  addProjectError.classList.add("hidden");
-  addProjectError.textContent = "";
-  addProjectCloneProgress.classList.add("hidden");
-  addProjectSuggestions.classList.add("hidden");
-  addProjectSuggestions.innerHTML = "";
-  addProjectActiveIdx = -1;
-  addProjectOk.disabled = false;
-  var existingBtn = addProjectModal.querySelector('.add-project-mode-btn[data-mode="existing"]');
-  var st = store.snap();
-  if (st.isOsUsers) {
-    existingBtn.disabled = false;
-    var myUser = st.cachedAllUsers.find(function (u) { return u.id === st.myUserId; });
-    var isAdmin = myUser && myUser.role === "admin";
-    if (!isAdmin && myUser && myUser.linuxUser) {
-      // Non-admin: lock prefix to home directory
-      addProjectPrefixValue = "/home/" + myUser.linuxUser + "/";
-      addProjectPrefixEl.textContent = addProjectPrefixValue;
-      addProjectPrefixEl.classList.remove("hidden");
-      addProjectInput.value = "";
-      addProjectInput.placeholder = "subdirectory";
-    } else {
-      // Admin: no prefix restriction
-      addProjectPrefixValue = "";
-      addProjectPrefixEl.classList.add("hidden");
-      addProjectInput.value = "/";
-      addProjectInput.placeholder = "/";
-    }
-    switchAddProjectMode("existing");
-  } else {
-    addProjectPrefixValue = "";
-    addProjectPrefixEl.classList.add("hidden");
-    addProjectInput.value = "/";
-    addProjectInput.placeholder = "/";
-    existingBtn.disabled = false;
-    switchAddProjectMode("existing");
-  }
-  if (mode === "create" || mode === "clone") switchAddProjectMode(mode);
-  renderRemovedProjectsList();
-}
-
-function renderRemovedProjectsList() {
-  if (!addProjectRemoved) return;
-  addProjectRemoved.innerHTML = "";
-  if (!cachedRemovedProjects || cachedRemovedProjects.length === 0) {
-    addProjectRemoved.classList.add("hidden");
-    return;
-  }
-  addProjectRemoved.classList.remove("hidden");
-  for (var ri = 0; ri < cachedRemovedProjects.length; ri++) {
-    var rp = cachedRemovedProjects[ri];
-    var item = document.createElement("div");
-    item.className = "add-project-removed-item";
-    item.dataset.path = rp.path;
-    item.addEventListener("click", function () {
-      var p = this.dataset.path;
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({ type: "add_project", path: p }));
-      }
-      closeAddProjectModal();
-    });
-    var iconEl = document.createElement("span");
-    iconEl.className = "add-project-removed-icon";
-    iconEl.textContent = rp.icon || "\uD83D\uDCC1";
-    item.appendChild(iconEl);
-    var info = document.createElement("div");
-    info.className = "add-project-removed-info";
-    var nameEl = document.createElement("div");
-    nameEl.className = "add-project-removed-name";
-    nameEl.textContent = rp.title || rp.path.split("/").pop() || rp.path;
-    info.appendChild(nameEl);
-    var pathEl = document.createElement("div");
-    pathEl.className = "add-project-removed-path";
-    pathEl.textContent = rp.path;
-    info.appendChild(pathEl);
-    item.appendChild(info);
-    addProjectRemoved.appendChild(item);
-  }
-  try { parseEmojis(addProjectRemoved); } catch (e) {}
-}
-
-export function closeAddProjectModal() {
-  addProjectModal.classList.add("hidden");
-  addProjectInput.value = "";
-  addProjectCreateInput.value = "";
-  addProjectCloneInput.value = "";
-  addProjectSuggestions.classList.add("hidden");
-  addProjectSuggestions.innerHTML = "";
-  addProjectError.classList.add("hidden");
-  addProjectCloneProgress.classList.add("hidden");
-  addProjectActiveIdx = -1;
-  addProjectPrefixValue = "";
-  addProjectPrefixEl.classList.add("hidden");
-  if (addProjectDebounce) { clearTimeout(addProjectDebounce); addProjectDebounce = null; }
-}
-
-function getFullPath(inputVal) {
-  return addProjectPrefixValue + inputVal;
-}
-
-function stripPrefix(fullPath) {
-  if (addProjectPrefixValue && fullPath.indexOf(addProjectPrefixValue) === 0) {
-    return fullPath.slice(addProjectPrefixValue.length);
-  }
-  return fullPath;
-}
-
-function requestBrowseDir(val) {
-  var ws = getWs();
-  if (!ws || ws.readyState !== 1) return;
-  ws.send(JSON.stringify({ type: "browse_dir", path: getFullPath(val) }));
-}
-
-export function handleBrowseDirResult(msg) {
-  addProjectSuggestions.innerHTML = "";
-  addProjectActiveIdx = -1;
-  if (msg.error) {
-    addProjectSuggestions.classList.add("hidden");
-    return;
-  }
-  var entries = msg.entries || [];
-  if (entries.length === 0) {
-    addProjectSuggestions.classList.add("hidden");
-    return;
-  }
-  for (var si = 0; si < entries.length; si++) {
-    var entry = entries[si];
-    var item = document.createElement("div");
-    item.className = "add-project-suggestion-item";
-    item.dataset.path = entry.path;
-    item.innerHTML = '<i data-lucide="folder"></i><span class="add-project-suggestion-name">' +
-      escapeHtml(entry.name) + '</span>';
-    item.addEventListener("click", function (e) {
-      var fullP = this.dataset.path + "/";
-      addProjectInput.value = stripPrefix(fullP);
-      addProjectInput.focus();
-      addProjectError.classList.add("hidden");
-      requestBrowseDir(addProjectInput.value);
-    });
-    addProjectSuggestions.appendChild(item);
-  }
-  addProjectSuggestions.classList.remove("hidden");
-  refreshIcons();
-}
-
-export function handleAddProjectResult(msg) {
-  addProjectCloneProgress.classList.add("hidden");
-  if (msg.ok) {
-    closeAddProjectModal();
-    if (msg.existing) {
-      showToast("Project already registered", "info");
-    } else {
-      var toastMsg = addProjectMode === "create" ? "Project created" : addProjectMode === "clone" ? "Project cloned" : "Project added";
-      showToast(toastMsg, "success");
-    }
-    if (msg.slug) switchProject(msg.slug);
-  } else {
-    addProjectError.textContent = msg.error || "Failed to add project";
-    addProjectError.classList.remove("hidden");
-    addProjectOk.disabled = false;
-  }
-}
-
-export function handleCloneProgress(msg) {
-  if (msg.status === "cloning") {
-    addProjectCloneProgress.classList.remove("hidden");
-  }
-}
-
-function setActiveIdx(idx) {
-  var items = addProjectSuggestions.querySelectorAll(".add-project-suggestion-item");
-  addProjectActiveIdx = idx;
-  for (var ai = 0; ai < items.length; ai++) {
-    if (ai === idx) {
-      items[ai].classList.add("active");
-      items[ai].scrollIntoView({ block: "nearest" });
-    } else {
-      items[ai].classList.remove("active");
-    }
-  }
-}
-
-function submitAddProject() {
-  addProjectError.classList.add("hidden");
-  addProjectOk.disabled = true;
-
-  if (addProjectMode === "existing") {
-    var val = getFullPath(addProjectInput.value).replace(/\/+$/, "");
-    if (!val) { addProjectOk.disabled = false; return; }
-    var ws = getWs();
-    if (ws && ws.readyState === 1) {
-      ws.send(JSON.stringify({ type: "add_project", path: val }));
-    }
-  } else if (addProjectMode === "create") {
-    var name = addProjectCreateInput.value.trim();
-    if (!name) { addProjectOk.disabled = false; return; }
-    var ws2 = getWs();
-    if (ws2 && ws2.readyState === 1) {
-      ws2.send(JSON.stringify({ type: "create_project", name: name }));
-    }
-  } else if (addProjectMode === "clone") {
-    var url = addProjectCloneInput.value.trim();
-    if (!url) { addProjectOk.disabled = false; return; }
-    var ws3 = getWs();
-    if (ws3 && ws3.readyState === 1) {
-      ws3.send(JSON.stringify({ type: "clone_project", url: url }));
-    }
-  }
-}

package/lib/public/modules/app-rate-limit.js

@@ -22,34 +22,15 @@ function getVendorUsageMeta(vendor) {
   var vendors = store.get('vendorInfo') || {};
   var info = vendors[vendor];
   if (info && info.usageDashboard) return info.usageDashboard;
-  var fallbacks = {
-    codex: {
-      icon: "/codex-avatar.png",
-      alt: "Codex",
-      href: "https://chatgpt.com/codex/settings/usage",
-      title: "Check usage on ChatGPT",
-    },
-    claude: {
-      icon: "/claude-code-avatar.png",
-      alt: "Claude Code",
-      href: "https://claude.ai/settings/usage",
-      title: "Check usage on claude.ai",
-    },
-  };
-  return fallbacks[vendor] || null;
+  return null;
 }
 
 function vendorTracksRateLimits(vendor) {
-  var vendors = store.get('vendorInfo') || {};
-  var info = vendors[vendor];
-  if (info) return info.rateLimitTracking !== false;
-  var legacyTrackedVendors = ["claude", "codex"];
-  return legacyTrackedVendors.indexOf(vendor) !== -1;
+  return ((store.get('vendorInfo') || {})[vendor] || {}).rateLimitTracking === true;
 }
 
 function vendorSupportsScheduledMessages(vendor) {
-  var scheduledMessageVendors = ["claude"];
-  return scheduledMessageVendors.indexOf(vendor) !== -1;
+  return ((store.get('vendorInfo') || {})[vendor] || {}).rateLimitScheduling === true;
 }
 
 function rateLimitEventAppliesToPane(msg, state) {
@@ -60,7 +41,7 @@ function rateLimitEventAppliesToPane(msg, state) {
   if (msg.vendor) return msg.vendor === activeVendor;
   // Legacy Claude records predate vendor/session stamps. Never project them
   // into a non-Claude pane, where they would look like Claude usage.
-  return activeVendor === "claude";
+  return ((state.vendorInfo || {})[activeVendor] || {}).acceptsUnstampedQuota === true;
 }
 
 function rateLimitStateKey(sessionId, vendor) {
@@ -84,7 +65,6 @@ function setActiveRateLimitState(next) {
 }
 
 function extraUsageDescription(msg) {
-  if (msg.vendor && msg.vendor !== "claude") return "";
   var reason = msg.overageDisabledReason;
   if (reason === "out_of_credits") return "Extra usage has no credits remaining";
   if (reason === "fetch_error") return "Extra usage availability could not be checked";
@@ -258,9 +238,16 @@ function tickRateLimitUsage() {
   renderRateLimitUsage();
 }
 
+// Once the server's vendor overview has answered, every vendor including the
+// displayed one is shown by the overview chips, so this session-scoped link
+// stands down. Rejection, warning and scheduling state is untouched.
+function overviewOwnsUsageDisplay() {
+  return !!store.get('vendorUsageOverview');
+}
+
 function renderRateLimitUsage() {
   var activeVendor = store.get('currentVendor') || "claude";
-  if (!vendorTracksRateLimits(activeVendor)) {
+  if (!vendorTracksRateLimits(activeVendor) || overviewOwnsUsageDisplay()) {
     if (rateLimitUsageEl) {
       rateLimitUsageEl.remove();
       rateLimitUsageEl = null;
@@ -340,6 +327,10 @@ export function initRateLimit() {
         || state.currentSlug !== prev.currentSlug || state.myUserId !== prev.myUserId) {
       resetRateLimitState();
     }
+    if (state.vendorUsageOverview !== prev.vendorUsageOverview && state.currentVendor === prev.currentVendor && state.activeSessionId === prev.activeSessionId
+        && state.currentSlug === prev.currentSlug && state.myUserId === prev.myUserId) {
+      renderRateLimitUsage();
+    }
     if (state.vendorInfo !== prev.vendorInfo && state.currentVendor === prev.currentVendor && state.activeSessionId === prev.activeSessionId
         && state.currentSlug === prev.currentSlug && state.myUserId === prev.myUserId) {
       renderRateLimitUsage();
@@ -350,7 +341,7 @@ export function initRateLimit() {
 export function handleRateLimitEvent(msg) {
   if (!rateLimitEventAppliesToPane(msg, store.snap())) return;
   // Old Codex history contains quota snapshots misrecorded as rejections.
-  if (msg.vendor === "codex" && !msg.source) return;
+  if (msg.ignored === true) return;
   if (msg.resetsAt && msg.resetsAt <= Date.now()) {
     var expiredState = Object.assign({}, getActiveRateLimitState());
     if (msg.rateLimitType) delete expiredState[msg.rateLimitType];
@@ -408,12 +399,12 @@ export function handleRateLimitEvent(msg) {
 
 export function updateRateLimitUsage(msg) {
   if (!rateLimitEventAppliesToPane(msg, store.snap())) return;
-  if (msg.vendor === "codex" && msg.source === "account_snapshot" && Array.isArray(msg.quotaWindows)) {
+  if (msg.source === "account_snapshot" && Array.isArray(msg.quotaWindows)) {
     applyQuotaSnapshot(msg);
     renderRateLimitUsage();
     return;
   }
-  if (msg.vendor === "codex" && !msg.source) return;
+  if (msg.ignored === true) return;
   var activeVendor = store.get('currentVendor') || "claude";
   if (!vendorTracksRateLimits(activeVendor)) {
     renderRateLimitUsage();

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

@@ -8,10 +8,10 @@ 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 } from './chat-render-runtime.js';
+import { addToMessages, addHistoryIndex, 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 { initRendering, addToMessages, addHistoryIndex, 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';
 
 // --- Module-owned state (not in store) ---
@@ -44,7 +44,8 @@ export function addCopyHandler(msgEl, rawText) {
 }
 
 export function appendDelta(text) {
-  ensureAssistantBlock();
+  var assistantEl = ensureAssistantBlock();
+  if (store.get('replayingHistory')) addHistoryIndex(assistantEl, store.get('currentHistoryIndexes') || store.get('currentHistoryIndex'));
   streamBuffer += text;
   if (store.get('replayingHistory')) {
     store.set({ currentFullText: store.get('currentFullText') + streamBuffer });

package/lib/public/modules/avatar.js

@@ -1,37 +1,11 @@
 // Centralized local avatar URL builder for people and Mates.
-import { imprintDataUrl, mateMarkDataUrl } from './avatar-imprint.js';
-
-var mateMarkCache = new Map();
-
-// 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' },
-];
+import { imprintDataUrl } from './avatar-imprint.js';
 
 export function avatarUrl(style, seed, size) {
   // Legacy user styles remain part of the seed identity, never the artwork.
   return imprintDataUrl({ style: style || 'imprint', seed: seed || 'anonymous', size: size || 64 });
 }
 
-export function mateStyleAvatarUrl(style, seed, size) {
-  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.
 export function userAvatarSeed(user) {
   var profile = user && user.profile ? user.profile : user;
@@ -48,24 +22,24 @@ export function userAvatarUrl(user, size) {
   return avatarUrl(style, userAvatarSeed(user), size);
 }
 
-export function mateMarkUrl(seed, size) {
-  var cacheKey = [seed || 'mate', size || 64].join('|');
-  if (mateMarkCache.has(cacheKey)) return mateMarkCache.get(cacheKey);
-  var url = mateMarkDataUrl({ seed: seed || 'mate', size: size || 64 });
-  if (mateMarkCache.size >= 256) mateMarkCache.delete(mateMarkCache.keys().next().value);
-  mateMarkCache.set(cacheKey, url);
-  return url;
+function mappedMateAvatarId(mate) {
+  var p = mate.profile || mate;
+  var key = JSON.stringify([mate.id || '', p.avatarStyle || 'imprint', p.avatarSeed || mate.id || p.displayName || mate.name || 'Mate']);
+  var hash = 2166136261;
+  for (var i = 0; i < key.length; i++) hash = Math.imul(hash ^ key.charCodeAt(i), 16777619) >>> 0;
+  var index = hash % 96;
+  return (index < 48 ? 'B' : 'C') + String(index % 48 + 1).padStart(2, '0');
+}
+
+export function mateCatalogAvatarUrl(id) {
+  if (id === 'lead-clay') return '/mate-avatars/lead-clay.png?v=4';
+  return typeof id === 'string' && /^[BC](0[1-9]|[1-3][0-9]|4[0-8])$/.test(id) ? '/mate-avatars/' + id + '.png?v=4' : '';
 }
 
 // Build avatar URL for a mate object, preferring custom avatar if set.
 export function mateAvatarUrl(mate, size) {
-  if (!mate) return mateMarkUrl('mate', size);
+  if (!mate) return mateCatalogAvatarUrl('B01');
   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 mateStyleAvatarUrl(style, p.avatarSeed || mate.avatarSeed || mate.id || identity, size);
-  }
-  return mateMarkUrl(identity, size);
+  return mateCatalogAvatarUrl(p.avatarCatalogId) || mateCatalogAvatarUrl(mate.builtinKey === 'clay' ? 'lead-clay' : mappedMateAvatarId(mate));
 }