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

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

@@ -93,42 +93,6 @@ var MODE_OPTIONS = [
 var MODE_FULL_AUTO = { value: "auto", label: "Auto" };
 var MODE_SKIP = { value: "bypassPermissions", label: "Skip permissions" };
 var EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
-var EFFORT_LEVELS_BY_VENDOR = {
-  claude: ["low", "medium", "high", "xhigh", "max"],
-  codex: ["low", "medium", "high", "xhigh", "max"],
-  antigravity: [],
-  opencode: [],
-  kiro: ["low", "medium", "high", "xhigh", "max"],
-};
-var THINKING_OPTIONS = ["disabled", "adaptive", "budget"];
-var CODEX_APPROVAL_OPTIONS = [
-  { value: "never", label: "Auto" },
-  { value: "untrusted", label: "Untrusted" },
-  { value: "on-request", label: "Ask" },
-];
-var CODEX_SANDBOX_OPTIONS = [
-  { value: "read-only", label: "Read Only" },
-  { value: "workspace-write", label: "Workspace" },
-  { value: "danger-full-access", label: "Full Access" },
-];
-var CODEX_WEBSEARCH_OPTIONS = [
-  { value: "disabled", label: "Off" },
-  { value: "cached", label: "Cached" },
-  { value: "live", label: "Live" },
-];
-var KNOWN_CONTEXT_WINDOWS = {
-  "opus-4-6": 1000000,
-  "claude-sonnet-4": 1000000,
-  "gpt-6-astra": 1050000,
-  "gpt-5.6": 1050000,
-  "gpt-5.5": 1048576,
-  "gpt-5.4": 1048576,
-  "gpt-5.3": 1048576,
-  "gpt-5.2": 1048576,
-  "gpt-4.1": 1047576,
-  "o3": 200000,
-  "o4-mini": 200000,
-};
 // Categories to hide from the legend (noise, not actionable)
 var CTX_HIDDEN_CATS = { "Free space": 1, "Autocompact buffer": 1 };
 
@@ -160,12 +124,12 @@ export function effortDisplayName(value) {
 // uses this for sessions other than the active one). Falls back from the
 // model's own supportedEffortLevels to the vendor table.
 export function effortLevelsFor(vendor, models, modelValue) {
-  var defaults = EFFORT_LEVELS_BY_VENDOR[vendor] || EFFORT_LEVELS;
+  var defaults = ((store.get("vendorInfo") || {})[vendor] || {}).effortLevels || [];
   var list = models || [];
   for (var i = 0; i < list.length; i++) {
     var value = typeof list[i] === "string" ? list[i] : (list[i] && (list[i].value || list[i].id)) || "";
     if (value === modelValue) {
-      if (list[i].supportedEffortLevels && list[i].supportedEffortLevels.length > 0) {
+      if (Array.isArray(list[i].supportedEffortLevels)) {
         return list[i].supportedEffortLevels;
       }
       return defaults;
@@ -182,9 +146,8 @@ function thinkingDisplayName(value) {
 }
 
 function isSonnetModel(model) {
-  if (!model) return false;
-  var lower = model.toLowerCase();
-  return lower.indexOf("sonnet") !== -1;
+  var models = store.get("currentModels") || [];
+  return models.some(function(entry) { return entry && entry.value === model && entry.supportsBetaContext === true; });
 }
 
 function hasBeta(name) {
@@ -198,7 +161,7 @@ function hasBeta(name) {
 function rebuildModeList() {
   if (!configModeList) return;
   configModeList.innerHTML = "";
-  var options = MODE_OPTIONS.slice();
+  var options = (providerConfiguration().permissionModes || []).slice();
   options.push(MODE_FULL_AUTO);
   options.push(MODE_SKIP);
   var autoSupported = store.get('permissionCapabilities').auto === true;
@@ -212,8 +175,8 @@ function rebuildModeList() {
     btn.textContent = opt.label;
     if (opt.value === "auto" && !autoSupported) {
       btn.disabled = true;
-      btn.title = "Auto permissions require a Claude session.";
-      btn.setAttribute("aria-description", "Unavailable because this is not a Claude session.");
+      btn.title = "Auto permissions are unavailable for this session.";
+      btn.setAttribute("aria-description", "The current runtime does not support Auto permissions.");
     }
     if (globallyForced) {
       btn.disabled = true;
@@ -232,13 +195,13 @@ function rebuildModeList() {
 function rebuildEffortBar() {
   if (!configEffortBar || !configEffortSection) return;
   var supportsEffort = getModelSupportsEffort();
-  if (!supportsEffort) {
+  var levels = getModelEffortLevels();
+  if (!supportsEffort || !levels.length) {
     configEffortSection.style.display = "none";
     return;
   }
   configEffortSection.style.display = "";
   configEffortBar.innerHTML = "";
-  var levels = getModelEffortLevels();
   for (var i = 0; i < levels.length; i++) {
     var level = levels[i];
     var btn = document.createElement("button");
@@ -277,8 +240,9 @@ function rebuildThinkingSection() {
   configThinkingSection.style.display = "";
   configThinkingBar.innerHTML = "";
   var s = store.snap();
-  for (var i = 0; i < THINKING_OPTIONS.length; i++) {
-    var opt = THINKING_OPTIONS[i];
+  var thinkingOptions = (providerConfiguration().thinking || {}).options || [];
+  for (var i = 0; i < thinkingOptions.length; i++) {
+    var opt = thinkingOptions[i];
     var btn = document.createElement("button");
     btn.className = "config-segment-btn";
     if (opt === s.currentThinking) btn.classList.add("active");
@@ -329,22 +293,21 @@ function buildSegmentedBar(barEl, options, currentValue, msgType, msgKey) {
   }
 }
 
-function rebuildCodexSections() {
-  var s = store.snap();
-  var isCodex = (s.currentVendor || "claude") === "codex";
+function providerConfiguration() {
+  var state = store.snap();
+  return ((state.vendorInfo || {})[state.currentVendor] || {}).configuration || {};
+}
 
-  if (configApprovalSection) {
-    configApprovalSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configApprovalBar, CODEX_APPROVAL_OPTIONS, s.codexApproval, "set_codex_approval", "approval");
-  }
-  if (configSandboxSection) {
-    configSandboxSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configSandboxBar, CODEX_SANDBOX_OPTIONS, s.codexSandbox, "set_codex_sandbox", "sandbox");
-  }
-  if (configWebsearchSection) {
-    configWebsearchSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configWebsearchBar, CODEX_WEBSEARCH_OPTIONS, s.codexWebSearch, "set_codex_websearch", "webSearch");
+function rebuildProviderSections() {
+  var state = store.snap(), config = providerConfiguration();
+  function section(element, bar, description) {
+    if (!element) return;
+    element.style.display = description ? "" : "none";
+    if (description) buildSegmentedBar(bar, description.options || [], state[description.state], description.message, description.key);
   }
+  section(configApprovalSection, configApprovalBar, config.approval);
+  section(configSandboxSection, configSandboxBar, config.sandbox);
+  section(configWebsearchSection, configWebsearchBar, config.webSearch);
 }
 
 function escHtml(s) {
@@ -584,25 +547,17 @@ export function updateConfigChip() {
   if (!configChipWrap || !configChip) return;
   configChipWrap.classList.remove("hidden");
   var s = store.snap();
-  var vendor = s.currentVendor || "claude";
   configChipLabel.textContent = modelDisplayName(s.currentModel, s.currentModels);
   renderModelPicker();
   rebuildModeList();
   rebuildEffortBar();
 
-  // MODE remains Claude-specific until adapter modes become capabilities.
-  var isClaude = vendor === "claude";
-  if (configModeList && configModeList.parentElement) configModeList.parentElement.style.display = isClaude ? "" : "none";
+  var configuration = providerConfiguration();
+  if (configModeList && configModeList.parentElement) configModeList.parentElement.style.display = configuration.permissionModes ? "" : "none";
   rebuildThinkingSection();
-  // capabilities.thinking means "emits a thinking stream" (true for every
-  // vendor), NOT "accepts thinking config". The adaptive/extended toggle and
-  // budget only feed Claude queries (sm.currentThinking), so the section
-  // stays Claude-only until a dedicated thinkingConfig capability exists.
-  if (configThinkingSection) configThinkingSection.style.display = isClaude ? "" : "none";
-  // BETA section deprecated (1M context is now standard)
+  if (configThinkingSection) configThinkingSection.style.display = configuration.thinking ? "" : "none";
   if (configBetaSection) configBetaSection.style.display = "none";
-  // APPROVAL, SANDBOX, WEB SEARCH are Codex-only
-  rebuildCodexSections();
+  rebuildProviderSections();
 }
 
 export function getModelSupportsEffort() {
@@ -645,10 +600,10 @@ export function accumulateUsage(cost, usage) {
   // Assign directly instead of summing to avoid overcounting.
   if (cost != null) sessionUsage.cost = cost;
   if (usage) {
-    sessionUsage.input += usage.input_tokens || usage.inputTokens || 0;
-    sessionUsage.output += usage.output_tokens || usage.outputTokens || 0;
-    sessionUsage.cacheRead += usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
-    sessionUsage.cacheWrite += usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
+    sessionUsage.input += usage.inputTokens || 0;
+    sessionUsage.output += usage.outputTokens || 0;
+    sessionUsage.cacheRead += usage.cacheReadInputTokens || 0;
+    sessionUsage.cacheWrite += usage.cacheCreationInputTokens || 0;
   }
   sessionUsage.turns++;
   if (!store.get('replayingHistory')) updateUsagePanel();
@@ -724,14 +679,8 @@ export function toggleStatusPanel() {
 
 // --- Context panel ---
 
-export function resolveContextWindow(model, sdkValue) {
-  var lc = (model || "").toLowerCase();
-  if (lc.includes("[1m]")) return 1000000;
-  if (sdkValue) return sdkValue;
-  for (var key in KNOWN_CONTEXT_WINDOWS) {
-    if (lc.includes(key)) return KNOWN_CONTEXT_WINDOWS[key];
-  }
-  return 200000;
+export function resolveContextWindow(model, reported) {
+  return typeof reported === "number" && reported > 0 ? reported : 0;
 }
 
 export function contextPctClass(pct) {
@@ -744,21 +693,21 @@ export function updateContextPanel() {
   // only supplies currentInput from a verified last-turn snapshot; rich
   // context usage is more authoritative when available.
   var rich = store.get('richContextUsage');
-  var hasRich = rich && (
-    (typeof rich.totalTokens === "number" && typeof rich.maxTokens === "number" && rich.maxTokens > 0) ||
-    (typeof rich.input_tokens === "number" && typeof rich.contextWindow === "number" && rich.contextWindow > 0)
-  );
+  var richContext = rich && rich.context;
+  var hasRich = richContext && typeof richContext.usedTokens === "number" && typeof richContext.windowTokens === "number" && richContext.windowTokens > 0;
   var hasCurrent = typeof contextData.currentInput === "number";
   var hasContext = !!(hasRich || hasCurrent);
-  var used = hasRich ? (typeof rich.totalTokens === "number" ? rich.totalTokens : rich.input_tokens) : (hasCurrent ? contextData.currentInput : 0);
-  var win = hasRich ? (typeof rich.maxTokens === "number" ? rich.maxTokens : rich.contextWindow) : (hasCurrent ? contextData.contextWindow : 0);
+  var used = hasRich ? richContext.usedTokens : (hasCurrent ? contextData.currentInput : 0);
+  var win = hasRich ? richContext.windowTokens : (hasCurrent ? contextData.contextWindow : 0);
+  hasContext = hasContext && win > 0;
+  var measurement = hasRich ? richContext.measurement : store.get("contextMeasurement");
   var pct = win > 0 ? Math.min(100, (used / win) * 100) : 0;
   var cls = contextPctClass(pct);
   reportPaneContext({ pct: pct, used: used, win: win, cls: cls, model: contextData.model, cost: contextData.cost });
   // Panel bar
   contextBarFill.style.width = pct.toFixed(1) + "%";
   contextBarFill.className = "context-bar-fill" + cls;
-  contextBarPct.textContent = pct.toFixed(0) + "%";
+  contextBarPct.textContent = hasContext ? pct.toFixed(0) + "%" : "-";
   // Mini bar
   if (contextMiniFill) {
     contextMiniFill.style.width = pct.toFixed(1) + "%";
@@ -807,7 +756,8 @@ export function updateContextPanel() {
       }
     }
   }
-  contextUsedEl.textContent = formatTokens(used);
+  contextUsedEl.textContent = hasRich || hasCurrent ? (measurement === "estimated" ? "~" : "") + formatTokens(used) : "-";
+  contextUsedEl.title = hasRich || hasCurrent ? (measurement === "estimated" ? "Estimated current context" : "Observed current context") : "Current context unavailable";
   contextWindowEl.textContent = win > 0 ? formatTokens(win) : "-";
   contextMaxOutputEl.textContent = contextData.maxOutputTokens > 0 ? formatTokens(contextData.maxOutputTokens) : "-";
   contextInputEl.textContent = formatTokens(contextData.input);
@@ -829,7 +779,13 @@ export function updateContextPanel() {
   contextTurnsEl.textContent = String(contextData.turns);
 }
 
-export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens) {
+export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens, context) {
+  if (context) {
+    if (context.source === "last_turn") store.set({ richContextUsage: null });
+    store.set({ contextMeasurement: context.measurement || "unavailable" });
+    contextData.currentInput = typeof context.usedTokens === "number" ? context.usedTokens : null;
+    if (typeof context.windowTokens === "number") contextData.contextWindow = context.windowTokens;
+  }
   // cost is the SDK's total_cost_usd -- a cumulative running total, not a delta.
   if (cost != null) contextData.cost = cost;
   // Use latest turn values (not cumulative) since each turn's input_tokens
@@ -842,17 +798,14 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
     if (typeof lastStreamInputTokens === "number") {
       contextData.input = lastStreamInputTokens;
     } else {
-      contextData.input = (usage.input_tokens || usage.inputTokens || 0)
-          + (usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0);
-    }
-    contextData.output = usage.output_tokens || usage.outputTokens || 0;
-    contextData.cacheRead = usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
-    contextData.cacheWrite = usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
-    if (store.get('currentVendor') === "codex") {
-      contextData.currentInput = typeof lastStreamInputTokens === "number" ? lastStreamInputTokens : null;
-    } else {
-      contextData.currentInput = typeof lastStreamInputTokens === "number" ? lastStreamInputTokens : contextData.input;
+      contextData.input = (usage.inputTokens || 0)
+          + (usage.cacheReadInputTokens || 0);
     }
+    contextData.output = usage.outputTokens || 0;
+    contextData.cacheRead = usage.cacheReadInputTokens || 0;
+    contextData.cacheWrite = usage.cacheCreationInputTokens || 0;
+    contextData.currentInput = context && typeof context.usedTokens === "number" ? context.usedTokens : null;
+    if (context && typeof context.windowTokens === "number") contextData.contextWindow = context.windowTokens;
   }
   contextData.turns++;
   if (modelUsage) {
@@ -864,23 +817,8 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
       // (e.g. CLI reports "claude-sonnet-4-6" even when running as opus[1m])
       var displayModel = store.get('currentModel') || m;
       contextData.model = displayModel;
-      contextData.contextWindow = resolveContextWindow(displayModel, mu.contextWindow);
+      contextData.contextWindow = context && typeof context.windowTokens === "number" ? context.windowTokens : resolveContextWindow(displayModel, mu.contextWindow);
       if (mu.maxOutputTokens) contextData.maxOutputTokens = mu.maxOutputTokens;
-      if (store.get('currentVendor') === "codex") {
-        var snapshot = mu.contextSnapshot;
-        if (snapshot) store.set({ richContextUsage: null });
-        if (snapshot && snapshot.valid === true
-            && typeof snapshot.inputTokens === "number"
-            && typeof snapshot.contextWindow === "number"
-            && snapshot.contextWindow > 0) {
-          contextData.currentInput = snapshot.inputTokens;
-          contextData.contextWindow = snapshot.contextWindow;
-        } else {
-          // An explicit invalid marker is authoritative: do not retain an
-          // occupancy value from the previous live turn or history replay.
-          contextData.currentInput = null;
-        }
-      }
 
       // thinkingTokens and costBasis are per-model and optional: absent on
       // older CLI builds and, for a resumed session, on the turns that ran
@@ -1009,8 +947,8 @@ export function renderCtxPopover() {
   if (!ctxPopoverEl || !richContextUsage) return;
   var d = richContextUsage;
   var cats = d.categories || [];
-  var total = d.totalTokens != null ? d.totalTokens : (d.input_tokens || 0);
-  var max = d.maxTokens != null ? d.maxTokens : (d.contextWindow || 0);
+  var total = d.context && d.context.usedTokens || 0;
+  var max = d.context && d.context.windowTokens || 0;
   var pct = d.percentage != null ? d.percentage : (max > 0 ? (total / max) * 100 : 0);
 
   var html = "";

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

@@ -1,3 +1,5 @@
+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)
 
@@ -311,6 +313,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 +392,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();

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";
@@ -350,7 +330,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 +388,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));
 }

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

@@ -7,6 +7,7 @@ import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",
+  muse: "/muse-avatar.svg",
   antigravity: "/antigravity-avatar.png",
   opencode: "/opencode-avatar.svg",
   kimi: "/kimi-avatar.svg",
@@ -20,6 +21,7 @@ export var VENDOR_AVATARS = {
 export var VENDOR_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
+  muse: "Muse Code",
   antigravity: "Antigravity CLI",
   opencode: "OpenCode",
   kimi: "Kimi Code",
@@ -33,6 +35,7 @@ export var VENDOR_NAMES = {
 export var VENDOR_HOMEPAGES = {
   claude: "https://claude.com/product/claude-code",
   codex: "https://openai.com/codex/",
+  muse: "https://dev.meta.ai/docs/muse-code",
   antigravity: "https://antigravity.google/product/antigravity-cli",
   opencode: "https://opencode.ai/",
   kimi: "https://www.kimi.com/code/",
@@ -155,11 +158,28 @@ export function setIsUserScrolledUp(value) { isUserScrolledUp = value; }
 
 export function addToMessages(element) {
   var messagesEl = getMessagesEl();
+  addHistoryIndex(element, store.get('currentHistoryIndexes') || store.get('currentHistoryIndex'));
   if (prependAnchor) messagesEl.insertBefore(element, prependAnchor);
   else messagesEl.appendChild(element);
   keepActiveThinkingAtTail();
 }
 
+export function addHistoryIndex(element, historyIndex) {
+  if (Array.isArray(historyIndex)) {
+    if (!element) return;
+    var indexes = new Set((element.dataset.historyIndexes || "").split(",").filter(Boolean));
+    for (var i = 0; i < historyIndex.length; i++) {
+      if (Number.isSafeInteger(historyIndex[i]) && historyIndex[i] >= 0) indexes.add(String(historyIndex[i]));
+    }
+    element.dataset.historyIndexes = Array.from(indexes).join(",");
+    return;
+  }
+  if (!element || !Number.isSafeInteger(historyIndex) || historyIndex < 0) return;
+  var existing = element.dataset.historyIndexes || "";
+  if (existing.split(",").indexOf(String(historyIndex)) !== -1) return;
+  element.dataset.historyIndexes = existing ? existing + "," + historyIndex : String(historyIndex);
+}
+
 // Thinking is a single accumulating record for the active turn. Other live
 // transcript entries may arrive between reasoning segments, so keep only the
 // currently active record after the tail activity indicator.

package/lib/public/modules/clay-browser-links.js

@@ -0,0 +1,47 @@
+import { store } from './store.js';
+import { iconHtml, refreshIcons } from './icons.js';
+import { showToast } from './utils.js';
+import { forwardPaneBrowserLink } from './pane-browser-bridge.js';
+
+function escape(value) { return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;'); }
+export function browserLinkTarget(href) {
+  if (typeof href !== 'string' || !href.startsWith('browser:') || href.length > 8200) return null;
+  var raw = href.slice(8);
+  if (!/^https?:\/\//i.test(raw) || /[\u0000-\u0020]/.test(raw)) return null;
+  try {
+    var url = new URL(raw);
+    if (url.username || url.password || !['http:', 'https:'].includes(url.protocol)) return null;
+    return url.href;
+  } catch (error) { return null; }
+}
+export function renderBrowserLink(href, title, text) {
+  var url = browserLinkTarget(href);
+  if (!url) return null;
+  var label = String(text || '').replace(/<[^>]*>/g, '').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
+  if (!label || label === href || label === url) label = new URL(url).host;
+  return '<button type="button" class="clay-browser-link clayos-record-link" data-browser-url="' + escape(url) + '" data-browser-project="' + escape(store.get('currentSlug') || '') + '" title="' + escape('Open in Clay Browser · ' + url) + '" aria-label="' + escape('Open in Clay Browser: ' + label) + '">' + iconHtml('globe') + '<span>Browser</span><small>' + escape(label) + '</small></button>';
+}
+export function enhanceBrowserLinks(root) {
+  if (!root || typeof document === 'undefined') return;
+  root.querySelectorAll('a[href]').forEach(function (anchor) {
+    if (anchor.closest('pre, code, button')) return;
+    var html = renderBrowserLink(anchor.getAttribute('href'), '', anchor.textContent);
+    if (html) { var template = document.createElement('template'); template.innerHTML = html; anchor.replaceWith(template.content); }
+  });
+  initBrowserLinks();
+  refreshIcons();
+}
+export function initBrowserLinks() {
+  if (store.get('browserLinksBound')) return;
+  store.set({ browserLinksBound: true });
+  document.addEventListener('click', function (event) {
+    var button = event.target.closest && event.target.closest('.clay-browser-link');
+    if (!button) return;
+    event.preventDefault(); event.stopPropagation();
+    var url = browserLinkTarget('browser:' + button.dataset.browserUrl);
+    if (!url) { showToast('This browser link is invalid.', 'warn'); return; }
+    if (button.dataset.browserProject && button.dataset.browserProject !== store.get('currentSlug')) { showToast('Open this link from its original project.', 'warn'); return; }
+    if (forwardPaneBrowserLink(url)) return;
+    import('./shared-browser.js').then(function (module) { module.openSharedBrowserAt(url); }).catch(function (error) { showToast(error.message || 'Could not open the browser.', 'warn'); });
+  });
+}