clay-server 5.2.0-beta.3 → 5.2.0-beta.5

package/lib/public/modules/sticky-notes-state.js

@@ -0,0 +1,66 @@
+// Reconcile canonical broadcasts with optimistic checklist actions and text drafts.
+import { store } from './store.js';
+import { getNoteUiState, setNoteUiState, send } from './sticky-notes-shared.js';
+
+function project(ui, pending, error) {
+  var canonical = ui.canonical || {};
+  var text = ui.draft ? ui.text : canonical.text || "";
+  var mode = canonical.checklistMode === true;
+  var state = Object.assign({}, canonical.checklistState || {});
+  pending.forEach(function (request) {
+    var changes = request.changes;
+    if (changes.text !== undefined) text = changes.text;
+    if (changes.checklistMode !== undefined) mode = changes.checklistMode;
+    if (changes.checklistKey) state[decodeURIComponent(changes.checklistKey)] = changes.checklistChecked;
+  });
+  return setNoteUiState(canonical.id, {
+    text: text,
+    checklistMode: mode, checklistState: state, pending: pending, error: error || '',
+  });
+}
+
+export function reconcileNote(data) {
+  var ui = getNoteUiState(data.id, data);
+  var draft = ui.draft && ui.text !== (data.text || '');
+  ui = setNoteUiState(data.id, { canonical: data, canonicalRevision: (ui.canonicalRevision || 0) + 1, draft: draft });
+  project(ui, ui.pending || [], ui.error);
+}
+
+export function mutateChecklist(id, changes) {
+  var ui = getNoteUiState(id);
+  var requestId = 'note-update-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+  var pending = (ui.pending || []).concat([{ requestId: requestId, changes: changes, revision: ui.canonicalRevision, draftText: ui.text }]);
+  project(ui, pending, '');
+  if (!send(Object.assign({}, changes, { type: changes.humanClose ? 'note_close' : 'note_update', id: id, requestId: requestId }))) {
+    project(getNoteUiState(id), pending.slice(0, -1), 'Connection unavailable');
+  }
+}
+
+export function reconcileNoteResult(msg) {
+  var ui = getNoteUiState(msg.noteId);
+  var request = (ui.pending || []).find(function (item) { return item.requestId === msg.requestId; });
+  if (!request) return;
+  // The server broadcasts before acknowledgement. Use the returned note when
+  // that broadcast was absent, but never replace a newer remote canonical note.
+  if (msg.ok && msg.note && ui.canonicalRevision === request.revision) {
+    reconcileNote(msg.note);
+    ui = getNoteUiState(msg.noteId);
+  }
+  if (msg.ok && request.changes.checklistConvert && ui.text === request.draftText) {
+    ui = setNoteUiState(msg.noteId, { draft: false, text: ui.canonical.text || '' });
+  }
+  if (msg.ok && (request.changes.checklistEdit || request.changes.checklistConvert || request.changes.humanClose)) {
+    ui = setNoteUiState(msg.noteId, { checklistInputs: null });
+  }
+  var remaining = ui.pending.filter(function (item) { return item.requestId !== msg.requestId; });
+  project(ui, remaining, msg.ok ? '' : msg.error || 'Could not save checklist change');
+  return ui.canonical;
+}
+
+store.subscribe(function (next, previous) {
+  if (next.connected || next.connected === previous.connected) return;
+  var all = next.stickyNoteUiState || {};
+  Object.keys(all).forEach(function (id) {
+    if (all[id].pending && all[id].pending.length) project(all[id], [], 'Connection unavailable');
+  });
+});

package/lib/public/modules/sticky-notes.js

@@ -1,24 +1,21 @@
 // The sticky-note canvas: the board of floating cards over the conversation.
-//
 // This module owns the notes map, visibility, the badges, and the WebSocket
 // handlers. Card markup and interactions live in sticky-notes-card.js, text
-// editing in sticky-notes-editor.js, and the leaf helpers in
+// editing in sticky-notes-editor.js, and leaf helpers in
 // sticky-notes-shared.js. The browse/index pane is sticky-notes-browser.js.
 
 import { refreshIcons, iconHtml } from './icons.js';
-import { renderMiniMarkdown } from './sticky-note-markdown.js';
-import { enhanceClayLogLinks } from './clay-log-links.js';
-import { isClosedNote, send, clampPos, clearNoteTimers, syncTitle } from './sticky-notes-shared.js';
+import { isClosedNote, send, clampPos, clearNoteTimers, deleteNoteUiState } from './sticky-notes-shared.js';
 import { renderNote, closeColorPicker } from './sticky-notes-card.js';
 import { closeFormatToolbar, isFormatToolbarOpen } from './sticky-notes-editor.js';
 import { store } from './store.js';
+import { reconcileNote, reconcileNoteResult } from './sticky-notes-state.js';
 
 var notes = new Map();  // id -> { data, el }
 var notesVisible = false;
 var notesResizeObserver = null;
 
-// The canvas shows open notes only. Closed notes leave the canvas and live in
-// the browser's Closed tab until they are reopened.
+// The canvas shows open notes only. Closed notes live in the browser's Closed tab.
 function openCount() {
   var count = 0;
   notes.forEach(function (entry) {
@@ -259,9 +256,7 @@ export function handleNotesList(msg) {
   var container = document.getElementById("sticky-notes-container");
   if (!container) return;
 
-  // Keyed reconciliation, never a clear-and-rebuild. A reconnect re-sends this
-  // list unchanged; tearing every note down and recreating it made all the
-  // floating cards vanish and reappear, and destroyed any open editor.
+  // Reconcile keyed cards in place so reconnects retain the active editor.
   var list = msg.notes || [];
   var seen = {};
   var created = false;
@@ -283,28 +278,27 @@ export function handleNotesList(msg) {
     created = true;
   }
 
-  // Remove notes the server no longer lists.
+  // Remove subscriptions and delayed writes along with stale cards.
   var staleIds = [];
   notes.forEach(function (value, id) {
     if (!seen[id]) staleIds.push(id);
   });
   for (i = 0; i < staleIds.length; i++) {
     var stale = notes.get(staleIds[i]);
+    if (stale && stale.el && stale.el._stickyNoteDispose) stale.el._stickyNoteDispose();
     if (stale && stale.el && stale.el.parentNode) stale.el.parentNode.removeChild(stale.el);
+    clearNoteTimers(staleIds[i]);
+    deleteNoteUiState(staleIds[i]);
     notes.delete(staleIds[i]);
   }
 
-  // renderNote already refreshes icons for the nodes it builds; an all-patch
-  // pass introduces no new Lucide markup and must not trigger a document scan.
+  // An all-patch list adds no icon markup and needs no document-wide scan.
   if (created) refreshIcons();
 
   updateBadge();
   updateSidebarBadge();
   refreshBrowser();
 
-  // Auto-show only when something is actually asking for attention. A board of
-  // nothing but closed notes must not pop the canvas open. Temporary hiding is
-  // explicit view state and must survive reconnects and list updates.
   if (openCount() > 0 && !notesVisible) {
     notesVisible = true;
     applyCanvasVisibility();
@@ -337,18 +331,13 @@ export function handleNoteCreated(msg) {
   syncFlightControls();
 }
 
-// Patch one existing note element in place from a server payload.
-//
-// Geometry, z-order, colour, and opacity are plain style writes and are always
-// applied. The rendered markdown is only replaced when the text actually
-// changed and the note is not being edited, so a geometry-only or z-only
-// update never destroys the user's caret, selection, or in-progress draft.
-// Returns true when icon markup was replaced, so the caller can decide whether
-// a Lucide pass is needed at all.
+// Canonical content reconciles through the store; geometry patches independently
+// so movement and stacking updates preserve the editor and its draft.
+// Return whether the minimize control introduced fresh icon markup.
 function patchNote(entry, next) {
   if (!entry || !next) return false;
-  var previous = entry.data || {};
   entry.data = next;
+  reconcileNote(next);
   var el = entry.el;
 
   el.style.left = next.x + "px";
@@ -358,26 +347,6 @@ function patchNote(entry, next) {
   el.style.zIndex = 100 + (next.zIndex || 0);
   el.dataset.color = next.color || "purple";
 
-  var textarea = el.querySelector(".sticky-note-text");
-  var rendered = el.querySelector(".sticky-note-rendered");
-  var nextText = next.text || "";
-  var editing = rendered === document.activeElement || textarea === document.activeElement;
-  // A draft the user typed but has not committed must survive a redraw.
-  var hasDraft = !!(textarea && textarea.value !== (previous.text || ""));
-  var textChanged = nextText !== (previous.text || "");
-  if (rendered && !editing && !hasDraft && textChanged) {
-    if (textarea) textarea.value = nextText;
-    if (nextText.trim()) {
-      rendered.innerHTML = renderMiniMarkdown(nextText);
-      enhanceClayLogLinks(rendered);
-      rendered.classList.remove("is-empty");
-    } else {
-      rendered.innerHTML = "";
-      rendered.classList.add("is-empty");
-    }
-    syncTitle(el, nextText);
-  }
-
   if (typeof next.opacity === "number") {
     el.style.setProperty("--note-opacity", next.opacity);
     var slider = el.querySelector(".sticky-note-opacity-slider");
@@ -388,8 +357,6 @@ function patchNote(entry, next) {
   else el.classList.remove("hidden");
   syncFlightState(el, true);
 
-  // The minimize button swaps its icon, which is the only path here that can
-  // introduce fresh Lucide markup.
   var iconsReplaced = false;
   var wasMinimized = el.classList.contains("minimized");
   var minBtn = el.querySelector(".sticky-note-min-btn");
@@ -419,13 +386,18 @@ export function handleNoteUpdated(msg) {
   if (patchNote(entry, msg.note)) refreshIcons();
   reclampAllNotes();
 
-  // A close or reopen arrives as an ordinary update, so the canvas count and
-  // the browser both follow from the same message.
   updateBadge();
   updateSidebarBadge();
   refreshBrowser();
 }
 
+export function handleNoteUpdateResult(msg) {
+  var entry = notes.get(msg.noteId);
+  if (!entry || !msg.requestId) return;
+  var canonical = reconcileNoteResult(msg);
+  if (canonical) { entry.data = canonical; refreshBrowser(); }
+}
+
 export function handleNoteWritten(msg) {
   var entry = notes.get(msg.id);
   if (!entry) return;
@@ -437,11 +409,11 @@ export function handleNoteWritten(msg) {
   }, 2100);
 }
 
-// Defensive only. The server no longer deletes notes and never sends this, but
-// an older daemon on the other end of the socket still must not corrupt state.
 export function handleNoteDeleted(msg) {
   var entry = notes.get(msg.id);
+  if (entry && entry.el._stickyNoteDispose) entry.el._stickyNoteDispose();
   if (entry) entry.el.remove();
+  deleteNoteUiState(msg.id);
   clearNoteTimers(msg.id);
   notes.delete(msg.id);
   updateBadge();
@@ -467,3 +439,14 @@ function updateSidebarBadge() {
 export function isNotesVisible() {
   return notesVisible;
 }
+
+// Project navigation must cancel writes and detach subscriptions before reuse.
+export function resetStickyNotes() {
+  handleNotesList({ notes: [] });
+  closeFormatToolbar();
+  closeColorPicker();
+}
+
+store.subscribe(function (next, previous) {
+  if (next.currentSlug !== previous.currentSlug) resetStickyNotes();
+});

package/lib/public/modules/theme.js

@@ -614,7 +614,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

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,5 @@
+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';
@@ -76,6 +78,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,6 +171,8 @@ function updateToolGroupHeader(group) {
     header.style.display = "none";
     group.el.classList.remove("collapsed");
   }
+  syncToolGroupDisclosure(group.el);
+  syncClayToolGroup(group);
 }
 
 function isPlanFile(filePath) {
@@ -244,6 +250,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;
@@ -364,7 +371,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);
   });
 
@@ -1627,9 +1634,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 +1646,8 @@ export function createToolItem(id, name) {
       el: groupEl,
       id: "g" + toolGroupCounter,
       toolNames: [],
+      toolIds: [],
+      toolRecords: {},
       toolCount: 0,
       doneCount: 0,
       errorCount: 0,
@@ -1665,17 +1674,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 +1696,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 +1911,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 +2052,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 +2271,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/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();}}});
 }

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

@@ -69,12 +69,21 @@ export function loadUserSettingsExtras(page) {
   if (page === 'us-ai') { mountDefaultAi(document.getElementById('us-default-ai')); requestDefaultAi(); var ws=getWs();if(ws && ws.readyState===1)ws.send(JSON.stringify({type:'get_claude_allow_list'})); }
 }
 export function finishUserSettingsExtras() {closeSpeechPicker();unmountDefaultAi(document.getElementById('us-default-ai'));}
-export function guardUserSettingsLeave(done) {
+export function guardUserSettingsLeave(done, destination) {
+  var active = document.querySelector('#user-settings .us-section.active');
+  var page = active && active.dataset.section;
+  if (destination && resolveUserSettingsPage(destination) === page) {done();return;}
+  function leaving(id) {return !destination || page === id;}
   var pin = document.getElementById('us-pin-form');
   var pinDirty = pin && !pin.classList.contains('hidden') && Array.from(pin.querySelectorAll('input')).some(function (input) {return !!input.value;});
   var key = document.getElementById('us-linear-key');
   if(store.get('speechPopup'))return;
-  var dirty = store.get('personalEmailDirty') || store.get('personalLinearDirty') || store.get('userVoiceDirty') || store.get('notificationDraft') || store.get('appearanceSaveError') || store.get('userProfileDirty') || store.get('userTerminalDirty') || pinDirty || key && key.value || store.get('defaultAiDraftDirty') || store.get('userAllowDirty');
+  var dirty = leaving('us-integrations') && (store.get('personalEmailDirty') || store.get('personalLinearDirty') || key && key.value) ||
+    leaving('us-chat') && store.get('userVoiceDirty') ||
+    leaving('us-notifications') && store.get('notificationDraft') ||
+    leaving('us-appearance') && (store.get('appearanceDraft') || store.get('userTerminalDirty')) ||
+    leaving('us-account') && (store.get('userProfileDirty') || pinDirty) ||
+    leaving('us-ai') && (store.get('defaultAiDraftDirty') || store.get('userAllowDirty'));
   if (!dirty) {done();return;}
   showConfirmDialog('Your unsaved changes will remain in this tab. Leave this editor and keep the draft?', 'Keep draft and leave', done);
 }

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

@@ -27,7 +27,10 @@ export function initPersonalPreferences() {
     catch(error){preferenceStatus('us-layout-switcher',error.message+' Try again.',true);}
     finally{controls.forEach(function(el){el.disabled=false;});}
   };});
-  var textarea=document.getElementById('us-claude-allow-list');textarea.oninput=function(){store.set({userAllowDirty:true});};
+  var textarea=document.getElementById('us-claude-allow-list');textarea.oninput=function(){
+    var patterns=textarea.value.split('\n').map(function(line){return line.trim();}).filter(Boolean);
+    store.set({userAllowDirty:!!store.get('userAllowNeedsRetry') || JSON.stringify(patterns)!==JSON.stringify(store.get('userAllowSaved') || [])});
+  };
   document.getElementById('us-claude-allow-save').onclick=function(){
     var ws=getWs();if(!ws || ws.readyState!==1){preferenceStatus('us-claude-allow-list','Disconnected. Your draft is retained.',true);return;}
     this.disabled=true;preferenceStatus('us-claude-allow-list','Saving…');ws.send(JSON.stringify({type:'set_claude_user_allow_list',patterns:textarea.value.split('\n').map(function(line){return line.trim();}).filter(Boolean)}));
@@ -37,11 +40,12 @@ export function initPersonalPreferences() {
 export function handlePersonalSettingsMessage(msg) {
   if(msg.type==='claude_allow_list') {
     store.set({userAllowSaved:msg.user || []});
+    if(store.get('userAllowDirty'))document.getElementById('us-claude-allow-list').oninput();
     if(store.get('userAllowDirty'))return;
   }
   if(msg.type==='set_claude_user_allow_list_result') {
     document.getElementById('us-claude-allow-save').disabled=false;
-    if(msg.ok)store.set({userAllowDirty:msg.effective===false,userAllowSaved:msg.patterns || []});
+    if(msg.ok)store.set({userAllowDirty:msg.effective===false,userAllowNeedsRetry:msg.effective===false,userAllowSaved:msg.patterns || []});
     var message=msg.ok ? (msg.effective===false ? 'Saved to your account, but not installed in Claude. Check filesystem access, then Save to retry.' : 'Saved. Applies on the next Claude invocation.') : msg.error || 'Save failed. Your draft is retained.';
     preferenceStatus('us-claude-allow-list',message,!msg.ok || msg.effective===false);
   }

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

@@ -13,10 +13,20 @@ export function initPersonalProfile() {
   name.after(form); var input = form.querySelector('input');
   function close() { form.hidden = true; name.hidden = false; edit.hidden = false; edit.focus(); }
   edit.onclick = function () {
-    if (!store.get('userProfileDirty')) input.value = getProfile().name || name.textContent;
+    if (!store.get('userProfileDirty')) {
+      input.value = name.textContent || getProfile().name;
+      store.set({userProfileSavedName:input.value.trim()});
+    }
     form.hidden = false; name.hidden = true; edit.hidden = true; input.focus(); input.select();
   };
-  input.oninput = function () { store.set({ userProfileDirty: true }); };
+  input.oninput = function () { store.set({ userProfileDirty: input.value.trim() !== store.get('userProfileSavedName') }); };
+  store.subscribe(function (state, previous) {
+    if (state.userSettingsProfile === previous.userSettingsProfile || !state.userSettingsProfile) return;
+    var data = state.userSettingsProfile;
+    var saved = data.name || data.displayName || data.username || 'Clay User';
+    if (!state.userProfileDirty) input.value = saved;
+    store.set({userProfileSavedName:saved.trim(), userProfileDirty:input.value.trim() !== saved.trim()});
+  });
   form.onsubmit = async function (event) {
     event.preventDefault(); var save = form.querySelector('[type=submit]'); var status = form.querySelector('[role=status]');
     if (!input.value.trim()) { status.textContent = 'Enter a display name.'; return; }

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

@@ -75,7 +75,7 @@ export function initUserSettings() {
   for (var i = 0; i < navItems.length; i++) {
     navItems[i].addEventListener('click', function () {
       var section = this.dataset.section;
-      guardUserSettingsLeave(function () { switchSection(section); });
+      guardUserSettingsLeave(function () { switchSection(section); }, section);
     });
   }
 
@@ -83,7 +83,8 @@ export function initUserSettings() {
   var navDropdown = document.getElementById('user-settings-nav-dropdown');
   if (navDropdown) {
     navDropdown.addEventListener('change', function () {
-      var value = this.value; guardUserSettingsLeave(function () {switchSection(value);});
+      var value = this.value; guardUserSettingsLeave(function () {switchSection(value);}, value);
+      this.value = settingsEl.querySelector('.us-section.active').dataset.section;
     });
   }