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

package/lib/public/modules/stt-controller.js

@@ -12,7 +12,8 @@ export function speechContext() {
   var s = store.snap();
   return JSON.stringify([s.currentSlug, s.activeSessionId, s.dmMode, s.dmKey,
     s.dmTargetUser && s.dmTargetUser.id, s.homePrimarySurface, s.homeSubSurface,
-    s.homeChatMateId, s.homeChatSessionId]);
+    s.homeChatMateId, s.homeChatSessionId, s.sessionOriginId, s.myUserId, s.sessionActionEpoch || 0,
+    s.paneCommittedBinding && s.paneCommittedBinding.generation]);
 }
 
 export function setSpeechStatus(id, message, isError) {
@@ -76,6 +77,7 @@ export function claimSpeech(id, input, recognition) {
   var active = { id: id, input: input, recognition: recognition, context: speechContext(),
     before: input.value, lastValue: input.value, writing: false, started: false, timeout: null };
   active.traceId = Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 7);
+  active.paneBinding = store.get('paneCommittedBinding') || null;
   active.traceStarted = Date.now();
   store.set({ speechActive: active, speechRetry: null });
   return active;
@@ -113,6 +115,7 @@ export function startSTT(id, input) {
   var active = { id: id, input: input, recognition: recognition, context: speechContext(),
     before: input.value, lastValue: input.value, writing: false, started: false, timeout: null };
   recognition.lang = store.get('speechLang') || 'en-US';
+  active.paneBinding = store.get('paneCommittedBinding') || null;
   recognition.continuous = true;
   recognition.interimResults = true;
   recognition.onstart = function () {

package/lib/public/modules/stt-recording.js

@@ -26,7 +26,7 @@ async function upload(active, blob) {
       model: active.model, language: active.language, blob: blob };
     failSTT(error.name === 'AbortError' ? 'Transcription timed out. Please try again.' : error.message);
     store.set({ speechRetry: retry });
-    setTimeout(function () { if (store.get('speechRetry') === retry) store.set({ speechRetry: null }); }, 300000);
+    setTimeout(function () { if (store.get('speechRetry') === retry && !store.get('deferredSessionSwitch')) store.set({ speechRetry: null }); }, 300000);
     return false;
   }
 }

package/lib/public/modules/stt.js

@@ -25,6 +25,7 @@ function bindComposer(id, inputId, wrapperId) {
   if (!button || !input || !wrapper || button.dataset.speechBound) return;
   var composer = document.getElementById(id === 'stt-btn' ? 'input-row' : 'home-mate-chat-composer') || wrapper;
   var toolbar = document.getElementById(id === 'stt-btn' ? 'input-bottom' : 'home-mate-chat-composer') || composer;
+  button.addEventListener('click', refreshSpeechBrowser);
   button.dataset.speechBound = 'true'; button.classList.add('stt-button');
   var group = document.createElement('span'); group.className = 'stt-controls';
   button.before(group); group.appendChild(button);
@@ -32,7 +33,7 @@ function bindComposer(id, inputId, wrapperId) {
   picker.className = 'stt-picker-toggle'; picker.innerHTML = iconHtml('chevron-down');
   picker.setAttribute('aria-label', 'Choose voice model'); picker.setAttribute('aria-haspopup', 'dialog'); picker.setAttribute('aria-expanded', 'false');
   picker.title = 'Choose voice model'; group.appendChild(picker);
-  picker.addEventListener('click', function () { openSpeechPicker(picker); });
+  picker.addEventListener('click', function () { refreshSpeechBrowser(); openSpeechPicker(picker); });
   var row = document.createElement('div'); row.className = 'stt-progress'; row.hidden = true;
   var status = document.createElement('span'); status.id = id + '-status'; status.className = 'stt-status'; status.setAttribute('role', 'status');
   var timer = document.createElement('span'); timer.className = 'stt-timer'; timer.setAttribute('aria-hidden', 'true');
@@ -70,7 +71,7 @@ function bindComposer(id, inputId, wrapperId) {
   function render() {
     var active = store.get('speechActive'); var own = !!active && active.id === id;
     var model = voiceModel(); var provider = voiceProvider(model.provider);
-    var browser = model.provider === 'browser' ? browserSpeechInfo() : null;
+    var browser = model.provider === 'browser' ? store.get('speechBrowserIdentity') : null;
     var pending = own && active.model && active.phase !== 'recording';
     var autoSend = own && !!active.autoSend;
     composer.classList.toggle('stt-recording', own);
@@ -117,7 +118,11 @@ function bindComposer(id, inputId, wrapperId) {
   observer.observe(input, { attributes: true, attributeFilter: ['disabled', 'readonly'] });
   render();
 }
+// Browser identity may read layout; refresh on entry and interaction, not transcript updates.
+function refreshSpeechBrowser() { store.set({ speechBrowserIdentity: browserSpeechInfo() }); }
 export function initSTT() {
+  refreshSpeechBrowser();
+  window.addEventListener('focus', refreshSpeechBrowser);
   initSpeechLifecycle(); initSpeechPicker();
   bindComposer('stt-btn', 'input', 'input-wrapper');
   bindComposer('home-stt-btn', 'home-mate-chat-input', 'home-mate-chat-composer-frame');

package/lib/public/modules/terminal.js

@@ -1,3 +1,4 @@
+import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
 import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
@@ -538,6 +539,8 @@ function renderTabBar() {
     (function (t) {
       var el = document.createElement("div");
       el.className = "terminal-tab";
+      el.dataset.controlTerminalId = String(t.id);
+      el.dataset.controlRuntime = store.get("controlRuntimeId") || "";
       if (t.id === activeTabId) el.classList.add("active");
       if (t.exited) el.classList.add("exited");
 
@@ -696,6 +699,7 @@ function updateTerminalBadge() {
 // --- Handle server messages ---
 
 export function handleTermList(msg) {
+  store.set({ clayControlTerminalViews: (msg.terminals || []).map(function (item) { return { id: item.id, identity: item.controlIdentity, revision: item.controlRevision, runtimeId: store.get('controlRuntimeId') }; }) });
   // TUI session terminals are owned by session-tui-view.js and must not
   // appear in the bottom terminal panel. Filter them out before any tab
   // bookkeeping so the panel never tries to render or auto-attach them.
@@ -762,7 +766,11 @@ export function handleTermCreated(msg) {
   }
 }
 
+export function handleTerminalProjection(msg) {
+  if (msg.controlIdentity && msg.controlRevision) store.set({ clayControlTerminalViews: (store.get('clayControlTerminalViews') || []).map(function (item) { return item.id === msg.id && item.identity === msg.controlIdentity ? Object.assign({}, item, { revision: msg.controlRevision }) : item; }) });
+}
 export function handleTermOutput(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.data) {
@@ -771,6 +779,7 @@ export function handleTermOutput(msg) {
 }
 
 export function handleTermResized(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.cols > 0 && msg.rows > 0) {

package/lib/public/modules/theme.js

@@ -482,8 +482,13 @@ function updateToggleIcon() {
   // User settings toggle
   var usToggle = document.getElementById("us-theme-toggle");
   if (usToggle) usToggle.checked = isLight;
-  // User island button is now a static "skins / themes" trigger; no
-  // icon swap on mode change.
+  var quickToggle = document.getElementById("appearance-mode-toggle");
+  if (quickToggle) {
+    var label = isLight ? "Switch to dark mode" : "Switch to light mode";
+    quickToggle.setAttribute("aria-label", label);
+    quickToggle.title = label;
+    quickToggle.innerHTML = '<i data-lucide="' + (isLight ? "moon" : "sun") + '" class="cursor-share-icon" aria-hidden="true"></i>';
+  }
   refreshIcons();
 }
 
@@ -614,7 +619,14 @@ function rebuildPicker() {
 
 // --- Init ---
 export function initTheme() {
-  currentThemeId = getSystemMode() === 'light' ? DEFAULT_LIGHT_THEME_ID : DEFAULT_DARK_THEME_ID;
+  var seed = window.__clayAppearanceSeed;
+  if (seed && seed.configured) store.set({ appearancePreference: seed });
+  var initialMode = seed && seed.configured && (seed.mode === 'light' || seed.mode === 'dark')
+    ? seed.mode
+    : getSystemMode();
+  currentThemeId = seed && seed.configured && seed[initialMode + 'Theme']
+    ? seed[initialMode + 'Theme']
+    : (initialMode === 'light' ? DEFAULT_LIGHT_THEME_ID : DEFAULT_DARK_THEME_ID);
   document.body.classList.toggle('wide-view', isWideView());
 
   // Load all themes from server, then apply properly
@@ -642,6 +654,9 @@ export function initTheme() {
     }
   }
 
+  var quickToggle = document.getElementById("appearance-mode-toggle");
+  if (quickToggle) quickToggle.addEventListener("click", toggleDarkMode);
+
   // Set initial toggle icon
   updateToggleIcon();
 

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

@@ -27,6 +27,32 @@ function maybeScrollToBottom() {
   if (!store.get('replayingHistory')) scrollToBottom();
 }
 
+function cancelThinkingRender() {
+  var frame = store.get('thinkingRenderFrame');
+  if (frame == null) return;
+  cancelAnimationFrame(frame);
+  store.set({ thinkingRenderFrame: null });
+}
+
+function flushThinkingRender() {
+  cancelThinkingRender();
+  var state = getThinkingState();
+  if (!state) return;
+  updateThinkingView(state.el, state.segmentText || state.latestText, state.detailsText);
+}
+
+function scheduleThinkingRender() {
+  if (store.get('replayingHistory') || store.get('thinkingRenderFrame') != null) return;
+  store.set({ thinkingRenderFrame: requestAnimationFrame(function () {
+    store.set({ thinkingRenderFrame: null });
+    var state = getThinkingState();
+    if (!state || !state.active) return;
+    keepActiveThinkingAtTail();
+    updateThinkingView(state.el, state.segmentText || state.latestText, state.detailsText);
+    maybeScrollToBottom();
+  }) });
+}
+
 function createThinkingElement() {
   var el = document.createElement("div");
   el.className = "thinking-item";
@@ -111,14 +137,13 @@ export function appendThinkingText(text) {
     detailsText: thinkingState.detailsText + separator + text,
     latestText: segmentText.trim() ? segmentText : thinkingState.latestText,
   });
-  if (!store.get('replayingHistory')) keepActiveThinkingAtTail();
-  updateThinkingView(thinkingState.el, thinkingState.segmentText || thinkingState.latestText, thinkingState.detailsText);
-  maybeScrollToBottom();
+  scheduleThinkingRender();
 }
 
 export function stopThinkingSegment(duration) {
   var thinkingState = getThinkingState();
   if (!thinkingState || !thinkingState.active) return;
+  cancelThinkingRender();
   var seconds = typeof duration === "number" ? duration : (Date.now() - thinkingState.startTime) / 1000;
   thinkingState = updateThinkingState(thinkingState, {
     totalDuration: thinkingState.totalDuration + seconds,
@@ -145,20 +170,25 @@ export function resetThinkingTurn() {
 }
 
 export function clearThinkingState() {
+  cancelThinkingRender();
   setThinkingState(null);
 }
 
 export function saveThinkingState() {
+  flushThinkingRender();
   return getThinkingState();
 }
 
 export function restoreThinkingState(saved) {
+  cancelThinkingRender();
   setThinkingState(saved || null);
+  if (saved && saved.active) scheduleThinkingRender();
 }
 
 export function resumeThinkingAfterReplay(processing) {
   var thinkingState = getThinkingState();
   if (!thinkingState || !thinkingState.active || !processing) return;
+  flushThinkingRender();
   keepActiveThinkingAtTail();
   setThinkingViewLive(thinkingState.el, !isMateThinking());
   showMateActivity(thinkingState.el, true, !!thinkingState.detailsText.trim());

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

@@ -1,7 +1,26 @@
 import { thinkingSummary } from './thinking-summary.js';
 import { renderMarkdown } from './markdown.js';
+import { store } from './store.js';
+
+// Retain complete source for each historical entry; parse only on disclosure.
+function thinkingDetailsCache() {
+  var cache = store.get('thinkingDetailsCache');
+  if (!cache) {
+    cache = new WeakMap();
+    store.set({ thinkingDetailsCache: cache });
+  }
+  return cache;
+}
+
+function renderThinkingDetails(el) {
+  var details = thinkingDetailsCache().get(el);
+  if (!details || details.rendered === details.text) return;
+  el.querySelector(".thinking-content").innerHTML = details.text.trim() ? renderMarkdown(details.text) : "";
+  details.rendered = details.text;
+}
 
 export function prepareThinkingView(el) {
+  thinkingDetailsCache().set(el, { text: "", rendered: "" });
   el.hidden = false;
   el.classList.remove("empty", "done", "expanded", "thinking-live");
   var header = el.querySelector(".thinking-header");
@@ -21,6 +40,7 @@ export function bindThinkingView(el) {
   var header = el.querySelector(".thinking-header");
   function toggle() {
     if (header.getAttribute("aria-disabled") === "true") return;
+    if (!el.classList.contains("expanded")) renderThinkingDetails(el);
     el.classList.toggle("expanded");
     header.setAttribute("aria-expanded", el.classList.contains("expanded") ? "true" : "false");
   }
@@ -37,7 +57,9 @@ export function updateThinkingView(el, summaryText, detailsText) {
   var label = el.querySelector(".thinking-label");
   label.textContent = summary;
   label.title = summary;
-  el.querySelector(".thinking-content").innerHTML = detailsText.trim() ? renderMarkdown(detailsText) : "";
+  var details = thinkingDetailsCache().get(el);
+  if (details) details.text = detailsText;
+  if (el.classList.contains("expanded")) renderThinkingDetails(el);
 }
 
 export function setThinkingViewLive(el, live) {

package/lib/public/modules/tools.js

@@ -1,3 +1,6 @@
+import { renderProductReview } from './product-review.js';
+import { clayToolGroupSummary } from './clay-tool-presentation.js';
+import { applyClayToolItem, applyClayToolResult, finishClayToolItem, findEndedClayTool, clayToolResultGroup, bindToolGroupDisclosure, syncToolGroupDisclosure, syncClayToolGroup } from './clay-tool-activity.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
@@ -6,6 +9,7 @@ import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
 import { store } from './store.js';
+import { currentPaneReview } from './pane-binding.js';
 import { applyPermissionHints } from './permission-hints.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
@@ -76,6 +80,8 @@ function findToolGroup(groupId) {
 }
 
 function toolGroupSummary(group) {
+  var claySummary = clayToolGroupSummary(group, tools);
+  if (claySummary) return claySummary;
   var names = group.toolNames;
   var count = names.length;
   var allDone = group.doneCount >= count;
@@ -167,10 +173,13 @@ function updateToolGroupHeader(group) {
     header.style.display = "none";
     group.el.classList.remove("collapsed");
   }
+  syncToolGroupDisclosure(group.el);
+  syncClayToolGroup(group);
 }
 
 function isPlanFile(filePath) {
-  return filePath && filePath.indexOf(".claude/plans/") !== -1;
+  var info = (store.get('vendorInfo') || {})[store.get('currentVendor')] || {};
+  return !!filePath && (info.planPathSegments || []).some(function (segment) { return filePath.indexOf(segment) !== -1; });
 }
 
 export function toolSummary(name, input) {
@@ -244,6 +253,7 @@ export function renderAskUserQuestion(toolId, input) {
 
   var container = document.createElement("div");
   container.className = "ask-user-container";
+  if (input.source === "mcp-import") container.classList.add("mcp-import-consent");
   container.dataset.toolId = toolId;
   var requestKey = getAskUserRequestKey(toolId);
   container.dataset.askUserRequestKey = requestKey;
@@ -290,6 +300,7 @@ export function renderAskUserQuestion(toolId, input) {
     var qText = document.createElement("div");
     qText.className = "ask-user-question-text";
     qText.textContent = q.question || "";
+    if (renderProductReview(qText, q)) qDiv.dataset.answerLabel = q.review.action;
     qDiv.appendChild(qText);
 
     var optionsDiv = document.createElement("div");
@@ -364,7 +375,7 @@ export function renderAskUserQuestion(toolId, input) {
       }
     });
     otherDiv.appendChild(otherInput);
-    qDiv.appendChild(otherDiv);
+    if (q.allowOther !== false || !(q.options || []).length) qDiv.appendChild(otherDiv);
     container.appendChild(qDiv);
   });
 
@@ -384,12 +395,13 @@ export function renderAskUserQuestion(toolId, input) {
   skipBtn.className = "ask-user-skip";
   skipBtn.textContent = "Skip";
   skipBtn.addEventListener("click", function () {
+    if (!currentPaneReview(container)) return;
     if (container.classList.contains("answered")) return;
     container.classList.add("answered");
     markAskUserRequestAnswered(toolId);
     enableMainInput();
     if (ctx.ws && ctx.connected) {
-      ctx.ws.send(JSON.stringify({ type: "stop" }));
+      ctx.ws.send(JSON.stringify({ type: "stop", paneBinding: container.paneBinding || undefined }));
     }
   });
   actions.appendChild(skipBtn);
@@ -409,6 +421,7 @@ export function renderAskUserQuestion(toolId, input) {
     container.appendChild(mateContentWrap);
   }
 
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   disableMainInput();
   ctx.setActivity(null);
@@ -426,6 +439,7 @@ export function enableMainInput() {
 }
 
 function submitAskUserAnswer(container, toolId, questions, answers, multiSelections) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("answered") || container.dataset.askUserSubmitted === "true") return;
 
   var result = {};
@@ -451,6 +465,7 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({
       type: "ask_user_response",
+      paneBinding: container.paneBinding || undefined,
       toolId: toolId,
       answers: result,
     }));
@@ -468,7 +483,8 @@ function showAnswerSummary(container, questions, answers) {
     var row = document.createElement("div");
     row.className = "ask-user-answer-row";
     var qi = parseInt(key, 10);
-    var label = (questions && questions[qi] && questions[qi].question) ? questions[qi].question : "Answer";
+    var questionNode = container.querySelectorAll(".ask-user-question")[qi];
+    var label = questionNode && questionNode.dataset.answerLabel || (questions && questions[qi] && (questions[qi].header || questions[qi].question)) || "Answer";
     row.innerHTML = '<span class="ask-user-answer-label">' + escapeHtml(label) + '</span>' +
       '<span class="ask-user-answer-value">' + escapeHtml(String(answers[key])) + '</span>';
     summary.appendChild(row);
@@ -644,6 +660,7 @@ function renderFormalPermission(requestId, toolName, toolInput, decisionReason)
   container.appendChild(header);
   container.appendChild(body);
   container.appendChild(actions);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingPermissions[requestId] = container;
@@ -751,6 +768,7 @@ function renderPlanPermission(requestId) {
   container.appendChild(body);
   container.appendChild(actions);
   container.appendChild(feedbackRow);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingPermissions[requestId] = container;
@@ -758,10 +776,11 @@ function renderPlanPermission(requestId) {
   ctx.setActivity(null);
   maybeScrollToBottom();
   // Focus the feedback input after render
-  setTimeout(function () { feedbackInput.focus(); }, 50);
+  setTimeout(function () { if (currentPaneReview(container)) feedbackInput.focus(); }, 50);
 }
 
 function sendPlanResponse(container, requestId, decision, feedback) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -789,6 +808,7 @@ function sendPlanResponse(container, requestId, decision, feedback) {
   if (ctx.ws && ctx.connected) {
     var payload = {
       type: "permission_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       decision: decision,
     };
@@ -943,6 +963,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId,
 
   container.appendChild(content);
 
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   pendingPermissions[requestId] = container;
   refreshIcons();
@@ -951,6 +972,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId,
 }
 
 function sendPermissionResponse(container, requestId, decision) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -968,6 +990,7 @@ function sendPermissionResponse(container, requestId, decision) {
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({
       type: "permission_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       decision: decision,
     }));
@@ -1042,6 +1065,7 @@ export function renderElicitationRequest(msg) {
   var container = buildElicitationCard(msg, function () {
     if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
   });
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   pendingElicitations[msg.requestId] = container;
   refreshIcons();
@@ -1068,6 +1092,7 @@ export function markElicitationError(requestId, error, expired) {
 var pendingUserDialogs = {};
 
 function sendUserDialogResponse(container, requestId, behavior, result) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -1083,6 +1108,7 @@ function sendUserDialogResponse(container, requestId, behavior, result) {
   if (ctx.ws && ctx.connected) {
     var msg = {
       type: "user_dialog_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       behavior: isCancel ? "cancelled" : "completed",
     };
@@ -1174,6 +1200,7 @@ export function renderUserDialogRequest(msg) {
   container.appendChild(header);
   container.appendChild(body);
   container.appendChild(actions);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingUserDialogs[msg.requestId] = container;
@@ -1627,9 +1654,9 @@ export function createToolItem(id, name) {
     }
 
     applyProjectAssistantIdentity(groupEl, identity);
-    groupEl.querySelector(".tool-group-header").addEventListener("click", function () {
-      groupEl.classList.toggle("collapsed");
-      if (currentToolGroup) currentToolGroup.userToggled = true;
+    bindToolGroupDisclosure(groupEl, function () {
+      var group = findToolGroup(groupEl.dataset.groupId);
+      if (group) group.userToggled = true;
     });
 
     ctx.addToMessages(groupEl);
@@ -1639,6 +1666,8 @@ export function createToolItem(id, name) {
       el: groupEl,
       id: "g" + toolGroupCounter,
       toolNames: [],
+      toolIds: [],
+      toolRecords: {},
       toolCount: 0,
       doneCount: 0,
       errorCount: 0,
@@ -1665,17 +1694,21 @@ export function createToolItem(id, name) {
 
   el.querySelector(".tool-name").textContent = name;
 
+  tools[id] = { el: el, name: name, input: null, done: false, groupId: currentToolGroup.id };
+  applyClayToolItem(tools[id]);
+
   // Append to group instead of messages directly
   currentToolGroup.el.querySelector(".tool-group-items").appendChild(el);
   currentToolGroup.toolNames.push(name);
+  currentToolGroup.toolIds.push(id);
+  currentToolGroup.toolRecords[id] = tools[id];
   currentToolGroup.toolCount++;
   updateToolGroupHeader(currentToolGroup);
 
   refreshIcons();
   maybeScrollToBottom();
 
-  tools[id] = { el: el, name: name, input: null, done: false, groupId: currentToolGroup.id };
-  ctx.setActivity("Running " + name + "...");
+  ctx.setActivity(tools[id].clayActivity ? tools[id].clayActivity.label : "Running " + name + "...");
 }
 
 export function updateToolExecuting(id, name, input) {
@@ -1683,6 +1716,12 @@ export function updateToolExecuting(id, name, input) {
   if (!tool) return;
 
   tool.input = input;
+  if (applyClayToolItem(tool)) {
+    ctx.setActivity(tool.clayActivity.label);
+    updateToolGroupHeader(findToolGroup(tool.groupId));
+    maybeScrollToBottom();
+    return;
+  }
   var descEl = tool.el.querySelector(".tool-desc");
   descEl.textContent = toolSummary(name, input);
 
@@ -1892,9 +1931,17 @@ function isImagePath(filePath) {
 }
 
 export function updateToolResult(id, content, isError, images) {
-  var tool = tools[id];
+  var tool = tools[id] || findEndedClayTool(ctx.messagesEl, id);
   if (!tool) return;
 
+  if (applyClayToolResult(tool, content, isError)) {
+    markToolDone(id, tool.clayActivity.phase === "error" || tool.clayActivity.phase === "cancelled");
+    applyClayToolItem(tool);
+    updateToolGroupHeader(clayToolResultGroup(tool, findToolGroup(tool.groupId)));
+    maybeScrollToBottom();
+    return;
+  }
+
   // Re-render the sublabel from the now-complete input (streaming can have
   // built it from a partial one), but in its terminal form: a result has
   // arrived, so this call is no longer running.
@@ -2025,6 +2072,7 @@ export function markToolDone(id, isError) {
     icon.innerHTML = '<span class="check">' + iconHtml("check") + '</span>';
   }
   refreshIcons();
+  finishClayToolItem(tool, findToolGroup(tool.groupId));
 
   // Update group state
   if (tool.groupId) {
@@ -2243,6 +2291,7 @@ export function removeToolFromGroup(toolId) {
   var group = findToolGroup(tool.groupId);
   if (!group) return;
   group.toolCount--;
+  if (group.toolIds) group.toolIds = group.toolIds.filter(function (id) { return id !== toolId; });
   // Remove tool name from the names array (remove first occurrence)
   var idx = group.toolNames.indexOf(tool.name);
   if (idx !== -1) group.toolNames.splice(idx, 1);

package/lib/public/modules/tui-grab.js

@@ -635,10 +635,9 @@ export function attachTuiGrab(xterm, containerEl, localId, opts) {
   if (opts && opts.vendor) {
     var vendors = store.get('vendorInfo') || {};
     var info = vendors[opts.vendor];
-    var legacyTuiVendors = ["claude"];
     var supportsTui = info
       ? Array.isArray(info.sessionModes) && info.sessionModes.indexOf("tui") !== -1
-      : legacyTuiVendors.indexOf(opts.vendor) !== -1;
+      : false;
     if (!supportsTui) return;
   }
 

package/lib/public/modules/user-settings-appearance.js

@@ -31,7 +31,11 @@ function addTerminalTypography(section) {
     var option = document.createElement('option'); option.value = font.family; option.textContent = font.label; family.appendChild(option);
   });
   function sync() {
-    if (store.get('userTerminalDirty')) return;
+    if (store.get('userTerminalDirty')) {
+      var dirty = family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize());
+      store.set({userTerminalDirty:dirty});
+      if (dirty) return;
+    }
     var value = getTerminalFontFamily();
     if (!Array.from(family.options).some(function (option) { return option.value === value; })) {
       var option = document.createElement('option'); option.value = value; option.textContent = 'Custom font'; family.appendChild(option);
@@ -41,7 +45,10 @@ function addTerminalTypography(section) {
     family.dispatchEvent(new Event('settings-sync'));
   }
   async function save() {
-    var value = Number(size.value); store.set({ userTerminalDirty: true });
+    var dirty = family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize());
+    store.set({userTerminalDirty:dirty});
+    if (!dirty) {retry.hidden = true;status.textContent = '';status.dataset.state = '';return;}
+    var value = Number(size.value);
     if (!Number.isInteger(value) || value < 9 || value > 32) { status.textContent = 'Choose a whole size from 9 to 32.'; status.dataset.state = 'error'; return; }
     family.disabled = true; size.disabled = true; retry.hidden = true; status.textContent = 'Saving…'; status.dataset.state = '';
     try {
@@ -50,6 +57,6 @@ function addTerminalTypography(section) {
     finally { family.disabled = false; size.disabled = false; family.dispatchEvent(new Event('settings-sync')); }
   }
   family.onchange = save; size.onchange = save; retry.onclick = save;
-  size.oninput = function () { store.set({ userTerminalDirty: true }); };
+  size.oninput = function () { store.set({ userTerminalDirty: family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize()) }); };
   onTerminalFontChange(sync); sync(); enhanceSettingsSelects(content);
 }

package/lib/public/modules/user-settings-editors.js

@@ -19,6 +19,6 @@ function wrapEditor(content, title, summary) {
 }
 export function initPersonalEditors() {
   var allow=document.getElementById('us-claude-allow-list');var permission=wrapEditor(allow.closest('.settings-card'),'Personal allow rules',function(){var count=(store.get('userAllowSaved') || []).length;return count+' personal rules. Managed defaults apply separately.';});
-  permission.done.textContent='Cancel';permission.done.onclick=function(){function cancel(){allow.value=(store.get('userAllowSaved') || []).join('\n');store.set({userAllowDirty:false});permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}if(store.get('userAllowDirty'))showConfirmDialog('Discard unsaved command rules?', 'Discard',cancel);else cancel();};
+  permission.done.textContent='Cancel';permission.done.onclick=function(){function cancel(){allow.value=(store.get('userAllowSaved') || []).join('\n');store.set({userAllowDirty:false,userAllowNeedsRetry:false});permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}if(store.get('userAllowDirty'))showConfirmDialog('Discard unsaved command rules?', 'Discard',cancel);else cancel();};
   store.subscribe(function(state,previous){if(state.userAllowSaved!==previous.userAllowSaved){permission.state.textContent=(state.userAllowSaved || []).length+' personal rules. Managed defaults apply separately.';if(previous.userAllowDirty && !state.userAllowDirty){permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}}});
 }