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

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

@@ -80,7 +80,6 @@ export function openDm(targetUserId, opts) {
     if (mates[i] && mates[i].id === targetUserId) isMateTarget = true;
   }
   if (isMateTarget) {
-    if (store.get('projectMateDmsEnabled') === false) return;
     showHomeHub();
     openHomeChat(targetUserId);
     return;
@@ -152,7 +151,6 @@ function showMateOnboarding(callback) {
 export function enterDmMode(key, targetUser, messages) {
   console.log("[DEBUG enterDmMode] key=" + key, "isMate=" + (targetUser && targetUser.isMate), "messages=" + (messages ? messages.length : 0));
   if (targetUser && targetUser.isMate) {
-    if (store.get('projectMateDmsEnabled') === false) return;
     showHomeHub();
     openHomeChat(targetUser.id);
     return;

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

@@ -1,3 +1,5 @@
+import { handlePersonalSettingsMessage } from './user-settings-preferences.js';
+import { handleServerUpdate } from './server-settings-controls.js';
 import { handleYouMessage } from './you.js';
 import { handleYouActivity } from './you-activity.js';
 import { handleProjectDebateMessage } from './project-debate-workspace.js';
@@ -53,9 +55,10 @@ import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundE
 import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch, presentMarkdownEdit } from './filebrowser.js';
 import { beginMarkdownTurn, finishMarkdownTurn, markdownPathFromToolInput } from './markdown-live-edit.js';
 import { forwardPaneMarkdownPresentation } from './pane-bridge.js';
-import { isProjectSettingsOpen, handleInstructionsRead, handleInstructionsWrite, handleProjectEnv, handleProjectEnvSaved, handleProjectSharedEnv, handleProjectSharedEnvSaved, handleProjectOwnerChanged } from './project-settings.js';
+import { handleProjectOwnerChanged } from './project-settings.js';
+import { handleProjectEnv, handleProjectEnvSaved } from './project-settings-environment.js';
 import { handleProjectSessionVisibilityDefault, refreshProjectSessionVisibilitySettings } from './project-session-visibility-settings.js';
-import { updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleInheritGroupsChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleGlobalClaudeMdRead, handleGlobalClaudeMdWrite } from './server-settings.js';
+import { updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleServerSettingResult } from './server-settings.js';
 import { handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
 import { attachTuiView, detachTuiView, setTuiSuspendedView, tuiHandleTermOutput, tuiHandleTermResized, tuiHandleTermExited, tuiHandleTermClosed } from './session-tui-view.js';
 import { handleTuiTranscriptState } from './tui-grab.js';
@@ -115,6 +118,8 @@ var connectOverlay = document.getElementById("connect-overlay");
 initMessageDeliveryUi();
 
 export function processMessage(msg) {
+  if (["update_available", "up_to_date", "update_started", "update_check_failed"].indexOf(msg.type) !== -1) handleServerUpdate(msg);
+  if (/^(set_pin|set_keep_awake|set_inherit_groups|set_image_retention|set_update_channel|restart_server|shutdown_server)_result$/.test(msg.type)) handleServerSettingResult(msg);
   if (handleProjectDebateMessage(msg)) return;
   if (handleMcpConnectionMessage(msg)) return;
   if (handleSharedBrowserMessage(msg)) return;
@@ -881,11 +886,8 @@ export function processMessage(msg) {
         } else if (_prevSid) {
           delete store.get('sessionDrafts')[_prevSid];
         }
-        // runtimeMode/runtimeTerminalId take precedence over the session's
-        // born mode so the user's current claudeOpenMode preference applies
-        // to existing sessions too (born-GUI viewed under TUI pref runs
-        // claude --resume in xterm; born-TUI viewed under GUI pref was
-        // in-place converted to GUI by the server before this message).
+        // Live legacy terminals keep their runtime presentation. Idle legacy
+        // sessions are hydrated into chat by the server before this message.
         var _effectiveMode = msg.runtimeMode || msg.mode || "gui";
         var _effectiveTerminalId = (typeof msg.runtimeTerminalId === "number")
           ? msg.runtimeTerminalId
@@ -1572,15 +1574,10 @@ export function processMessage(msg) {
         break;
 
       case "fs_read_result":
-        if (msg.path === "CLAUDE.md" && isProjectSettingsOpen()) {
-          handleInstructionsRead(msg);
-        } else {
-          handleFsRead(msg);
-        }
+        handleFsRead(msg);
         break;
 
       case "fs_write_result":
-        handleInstructionsWrite(msg);
         break;
 
       case "project_env_result":
@@ -1591,22 +1588,12 @@ export function processMessage(msg) {
         handleProjectEnvSaved(msg);
         break;
 
-      case "global_claude_md_result":
-        handleGlobalClaudeMdRead(msg);
-        break;
-
-      case "write_global_claude_md_result":
-        handleGlobalClaudeMdWrite(msg);
-        break;
-
       case "shared_env_result":
         handleSharedEnv(msg);
-        handleProjectSharedEnv(msg);
         break;
 
       case "set_shared_env_result":
         handleSharedEnvSaved(msg);
-        handleProjectSharedEnvSaved(msg);
         break;
 
       case "fs_file_changed":
@@ -2187,30 +2174,16 @@ export function processMessage(msg) {
         handleKeepAwakeChanged(msg);
         break;
 
-      case "set_inherit_groups_result":
-      case "inherit_groups_changed":
-        handleInheritGroupsChanged(msg);
-        break;
-
       case "set_auto_continue_result":
       case "auto_continue_changed":
         handleAutoContinueChanged(msg);
         break;
 
-      case "set_claude_open_mode_result":
-      case "claude_open_mode_changed":
-        if (msg.claudeOpenMode === "tui" || msg.claudeOpenMode === "gui") {
-          store.set({ claudeOpenMode: msg.claudeOpenMode });
-          // Reflect into the user-settings toggle if it's already in the DOM.
-          var _comToggle = document.getElementById("us-claude-open-mode");
-          if (_comToggle) _comToggle.checked = msg.claudeOpenMode === "tui";
-        }
-        break;
-
       case "claude_allow_list":
+        handlePersonalSettingsMessage(msg);
         // Initial state for the user-settings allow-list editor.
         var _alTa = document.getElementById("us-claude-allow-list");
-        if (_alTa && Array.isArray(msg.user)) {
+        if (_alTa && Array.isArray(msg.user) && !store.get("userAllowDirty")) {
           _alTa.value = msg.user.join("\n");
         }
         var _alManaged = document.getElementById("us-claude-allow-managed");
@@ -2226,19 +2199,7 @@ export function processMessage(msg) {
         break;
 
       case "set_claude_user_allow_list_result":
-        var _alStatus = document.getElementById("us-claude-allow-status");
-        if (_alStatus) {
-          if (msg.ok) {
-            _alStatus.textContent = "Saved (applies on next claude invocation)";
-            _alStatus.classList.remove("error");
-            setTimeout(function () {
-              if (_alStatus.textContent.indexOf("Saved") === 0) _alStatus.textContent = "";
-            }, 4000);
-          } else {
-            _alStatus.textContent = "Save failed: " + (msg.error || "unknown");
-            _alStatus.classList.add("error");
-          }
-        }
+        handlePersonalSettingsMessage(msg);
         break;
 
       case "restart_server_result":

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

@@ -83,6 +83,22 @@ function setActiveRateLimitState(next) {
   rateLimitResetState = 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";
+  if (reason && reason !== "unknown") return "Extra usage is unavailable for this account";
+  if (msg.overageStatus === "rejected") {
+    var reset = formatResetTime(msg.overageResetsAt);
+    return "Extra usage limit reached" + (reset ? "; resets in " + reset : "");
+  }
+  if (msg.isUsingOverage) return "Extra usage is currently being used";
+  if (msg.overageEnabled === false) return "Extra usage is turned off";
+  if (msg.overageEnabled === true) return "Extra usage is enabled";
+  return "";
+}
+
 function rateLimitTypeLabel(type) {
   if (!type) return "Usage";
   var labels = {
@@ -90,7 +106,8 @@ function rateLimitTypeLabel(type) {
     "seven_day": "7-day",
     "seven_day_opus": "7-day Opus",
     "seven_day_sonnet": "7-day Sonnet",
-    "overage": "Overage",
+    "overage": "Extra usage",
+    "seven_day_overage_included": "7-day included extra usage",
   };
   return labels[type] || type;
 }
@@ -163,6 +180,12 @@ function showRateLimitPopover(text, isRejected) {
   pop.className = "rate-limit-popover" + (isRejected ? " rejected" : "");
   pop.textContent = text;
   rateLimitIndicatorEl.appendChild(pop);
+  if (typeof pop.getBoundingClientRect === "function") {
+    var bounds = pop.getBoundingClientRect();
+    var viewportWidth = document.documentElement.clientWidth;
+    var shift = bounds.left < 16 ? 16 - bounds.left : Math.min(0, viewportWidth - 16 - bounds.right);
+    pop.style.marginLeft = shift + "px";
+  }
 
   // Auto-dismiss after 5s
   var fadeTimer = setTimeout(function () {
@@ -182,9 +205,7 @@ function clearRateLimitIndicator() {
 
 function formatResetTime(resetsAt) {
   if (!resetsAt) return "";
-  var d = new Date(resetsAt);
-  var now = new Date();
-  var diff = resetsAt - now.getTime();
+  var diff = resetsAt - Date.now();
   if (diff <= 0) return "";
   var hrs = Math.floor(diff / 3600000);
   var mins = Math.floor((diff % 3600000) / 60000);
@@ -200,10 +221,31 @@ function rateLimitTypeShortLabel(type) {
   return type || "";
 }
 
+function quotaWindowLabel(entry) {
+  var mins = entry.windowDurationMins;
+  if (!Number.isFinite(mins) || mins <= 0) return "Usage";
+  if (mins % 1440 === 0) return (mins / 1440) + "d";
+  if (mins % 60 === 0) return (mins / 60) + "h";
+  return mins + "m";
+}
+
+function applyQuotaSnapshot(msg) {
+  var next = Object.assign({}, getActiveRateLimitState());
+  Object.keys(next).forEach(function (key) {
+    // Retire the old inferred Codex windows as soon as real metadata arrives.
+    if (!next[key].source || next[key].limitId === msg.limitId) delete next[key];
+  });
+  msg.quotaWindows.forEach(function (window) {
+    if (window.resetsAt && window.resetsAt <= Date.now()) return;
+    var key = JSON.stringify([msg.limitId, window.key]);
+    next[key] = Object.assign({}, window, { source: "account_snapshot", limitId: msg.limitId });
+  });
+  setActiveRateLimitState(next);
+}
+
 function tickRateLimitUsage() {
   if (!rateLimitUsageEl) return;
-  var parts = [];
-  var types = ["five_hour", "seven_day", "seven_day_opus", "seven_day_sonnet"];
+  var types = Object.keys(rateLimitResetState);
   var nextState = Object.assign({}, rateLimitResetState);
   var changed = false;
   for (var i = 0; i < types.length; i++) {
@@ -211,13 +253,8 @@ function tickRateLimitUsage() {
     if (!entry || !entry.resetsAt) continue;
     var timeStr = formatResetTime(entry.resetsAt);
     if (!timeStr) { delete nextState[types[i]]; changed = true; continue; }
-    parts.push(rateLimitTypeShortLabel(types[i]) + " resets " + timeStr);
   }
   if (changed) setActiveRateLimitState(nextState);
-  if (parts.length === 0) {
-    renderRateLimitUsage();
-    return;
-  }
   renderRateLimitUsage();
 }
 
@@ -247,9 +284,19 @@ function renderRateLimitUsage() {
   rateLimitUsageEl.style.display = "";
 
   var parts = [];
-  var types = ["five_hour", "seven_day", "seven_day_opus", "seven_day_sonnet"];
+  var types = Object.keys(rateLimitResetState);
+  var hasWarning = false;
   for (var i = 0; i < types.length; i++) {
     var entry = rateLimitResetState[types[i]];
+    if (entry && entry.source === "account_snapshot") {
+      if (entry.resetsAt && entry.resetsAt <= Date.now()) continue;
+      var quotaText = quotaWindowLabel(entry);
+      if (Number.isFinite(entry.usedPercent)) quotaText += " " + Math.round(entry.usedPercent) + "% used";
+      if (entry.resetsAt) quotaText += " · resets " + formatResetTime(entry.resetsAt);
+      if (entry.usedPercent >= 80) hasWarning = true;
+      parts.push(quotaText);
+      continue;
+    }
     if (!entry || !entry.resetsAt) continue;
     var timeStr = formatResetTime(entry.resetsAt);
     if (!timeStr) continue;
@@ -257,6 +304,7 @@ function renderRateLimitUsage() {
   }
 
   var label = parts.length > 0 ? parts.join(" · ") : "Check usage";
+  rateLimitUsageEl.className = "top-bar-pill usage-check-link " + (hasWarning ? "pill-warning" : "pill-dim");
   var meta = getVendorUsageMeta(activeVendor);
   if (meta) {
     rateLimitUsageEl.href = meta.href;
@@ -301,6 +349,8 @@ 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.resetsAt && msg.resetsAt <= Date.now()) {
     var expiredState = Object.assign({}, getActiveRateLimitState());
     if (msg.rateLimitType) delete expiredState[msg.rateLimitType];
@@ -351,11 +401,19 @@ export function handleRateLimitEvent(msg) {
     updateRateLimitIndicator(msg);
   }
 
+  var extraUsage = extraUsageDescription(msg);
+  if (extraUsage) popoverText += ". " + extraUsage;
   showRateLimitPopover(popoverText, isRejected);
 }
 
 export function updateRateLimitUsage(msg) {
   if (!rateLimitEventAppliesToPane(msg, store.snap())) return;
+  if (msg.vendor === "codex" && msg.source === "account_snapshot" && Array.isArray(msg.quotaWindows)) {
+    applyQuotaSnapshot(msg);
+    renderRateLimitUsage();
+    return;
+  }
+  if (msg.vendor === "codex" && !msg.source) return;
   var activeVendor = store.get('currentVendor') || "claude";
   if (!vendorTracksRateLimits(activeVendor)) {
     renderRateLimitUsage();

package/lib/public/modules/context-sources.js

@@ -1,3 +1,5 @@
+import { showToast } from './utils.js';
+import { preparePersonalConnectionDialog } from './personal-settings-dialog.js';
 // Context Sources — attach terminal output, browser tabs, and email accounts as context for Claude
 
 var ctx = null;
@@ -433,25 +435,32 @@ export function getEmailAccountListCache() {
   return emailAccountList;
 }
 
-export function showEmailSetupModal() {
+export function showEmailSetupModal(provider, host) {
+  var providerNames = { gmail: "Gmail", outlook: "Outlook Mail", yahoo: "Yahoo Mail", custom: "Custom email" };
+  if (!Object.hasOwn(providerNames, provider)) provider = null;
   // Remove any existing modal
   var existing = document.getElementById("email-setup-modal");
-  if (existing) existing.remove();
+  if (existing) {existing.querySelector("input:not([type=hidden]),button").focus();return;}
 
   var overlay = document.createElement("div");
   overlay.id = "email-setup-modal";
-  overlay.className = "email-setup-overlay";
-
-  var providerOptions = '<option value="gmail">Gmail</option><option value="outlook">Outlook</option><option value="yahoo">Yahoo</option><option value="custom">Custom</option>';
-
+  overlay.className = host ? "email-setup-inline" : "email-setup-overlay";
+
+  if (!provider) {
+    var picker = document.createElement('div'); picker.className = 'email-setup-dialog';
+    picker.innerHTML = '<h3>Choose an email provider</h3><div class="us-integration-tiles"></div><button id="email-setup-cancel" type="button" class="email-setup-btn">Cancel</button>';
+    Object.keys(providerNames).forEach(function (id) {
+      var button = document.createElement('button'); button.type = 'button'; button.className = 'email-setup-btn'; button.textContent = providerNames[id];
+      button.onclick = function () { closePicker(); showEmailSetupModal(id, host); };
+      picker.querySelector('.us-integration-tiles').appendChild(button);
+    });
+    overlay.appendChild(picker); (host || document.body).appendChild(overlay); var closePicker = preparePersonalConnectionDialog(overlay, !!host); return;
+  }
   var modal = document.createElement("div");
   modal.className = "email-setup-dialog";
   modal.innerHTML =
-    '<h3 class="email-setup-title">Add Email Account</h3>' +
-    '<div class="email-setup-field">' +
-      '<label class="email-setup-label">Provider</label>' +
-      '<select id="email-setup-provider" class="email-setup-input">' + providerOptions + '</select>' +
-    '</div>' +
+    '<h3 class="email-setup-title">Add ' + providerNames[provider] + ' account</h3>' +
+    '<input type="hidden" id="email-setup-provider" value="' + provider + '">' +
     '<div class="email-setup-field">' +
       '<label class="email-setup-label">Email Address</label>' +
       '<input id="email-setup-address" type="email" placeholder="you@example.com" class="email-setup-input" />' +
@@ -488,11 +497,12 @@ export function showEmailSetupModal() {
     '</div>';
 
   overlay.appendChild(modal);
-  document.body.appendChild(overlay);
+  (host || document.body).appendChild(overlay);
+  preparePersonalConnectionDialog(overlay, !!host);
 
   // Event: close on overlay click
   overlay.addEventListener("click", function (e) {
-    if (e.target === overlay) overlay.remove();
+    if (!host && e.target === overlay) overlay.remove();
   });
 
   // Event: cancel button
@@ -547,9 +557,7 @@ export function showEmailSetupModal() {
     }
   }
 
-  providerSelect.addEventListener("change", function () {
-    applyProviderMeta(providerSelect.value);
-  });
+  applyProviderMeta(provider);
 
   // Reset test state
   _emailTestPassed = false;
@@ -564,7 +572,7 @@ export function showEmailSetupModal() {
   }
   document.getElementById("email-setup-address").addEventListener("input", onInputChange);
   document.getElementById("email-setup-password").addEventListener("input", onInputChange);
-  providerSelect.addEventListener("change", onInputChange);
+
 
   function runTest() {
     var statusEl = document.getElementById("email-setup-status");
@@ -701,7 +709,8 @@ export function handleEmailAddResult(msg) {
 
 // Handle email_account_remove_result from server
 export function handleEmailRemoveResult(msg) {
-  // Account removed; list will be refreshed via email_accounts_list message
+  showToast(msg.ok ? 'Personal mailbox disconnected.' : msg.error || 'Could not disconnect mailbox. Retry from Email settings.');
+  // The acknowledged list arrives separately through email_accounts_list.
 }
 
 function getSourceLabel(id) {

package/lib/public/modules/default-ai.js

@@ -1,3 +1,5 @@
+import { confirmSettingsAction } from './server-settings-state.js';
+import { enhanceSettingsSelects } from './settings-select.js';
 // User-island Default AI picker. Canonical state and the unsaved draft are separate.
 
 import { store } from './store.js';
@@ -135,6 +137,7 @@ function renderInlineSummary() {
   summary.appendChild(icon);
   popover.appendChild(summary);
   summary.addEventListener('click', function () { store.set({ defaultAiInlineEditing: true }); });
+  if(state.error)addStatus(state.error,true);
   refreshIcons();
 }
 
@@ -157,6 +160,16 @@ function render() {
   } else {
     popover.innerHTML = '<div class="default-ai-title">Default AI</div><div class="default-ai-copy">Used for new Clay interviews and built-in AI assistance.</div>';
   }
+  if (inlineTarget) {
+    var cancel = popover.querySelector(".default-ai-cancel");
+    cancel.addEventListener("click", function () {
+      function discard() {
+      var canonical = inlineCurrentSelection(store.get("defaultAiState") || {}, store.get("defaultAiDraft") || {});
+      store.set({ defaultAiDraft: Object.assign({}, canonical), defaultAiDraftDirty: false, defaultAiInlineEditing: false });
+      }
+      if(store.get("defaultAiDraftDirty"))confirmSettingsAction("Discard unsaved AI defaults?", "Discard", discard);else discard();
+    });
+  }
   if (state.loading && !vendors.length) {
     addStatus("Loading available AI providers…", false);
     position();
@@ -228,14 +241,8 @@ function render() {
     }
     render();
   });
-  if (inlineTarget) {
-    var cancel = popover.querySelector(".default-ai-cancel");
-    cancel.addEventListener("click", function () {
-      var canonical = inlineCurrentSelection(store.get("defaultAiState") || {}, store.get("defaultAiDraft") || {});
-      store.set({ defaultAiDraft: Object.assign({}, canonical), defaultAiDraftDirty: false, defaultAiInlineEditing: false });
-    });
-  }
   popover.appendChild(save);
+  enhanceSettingsSelects(popover);
   if (state.error) addStatus(state.error, true);
   position();
   refreshIcons();

package/lib/public/modules/header-tui-font.js

@@ -7,23 +7,14 @@
 // PUT /api/user/terminal-font.
 
 import {
-  applyTerminalFont,
+  saveTerminalFont,
+  TERMINAL_FONT_OPTIONS,
   getTerminalFontFamily,
   getTerminalFontSize,
   onTerminalFontChange,
 } from './terminal-prefs.js';
 
-var FONT_OPTIONS = [
-  { label: "SF Mono",         family: "'SF Mono', Menlo, Monaco, 'Courier New', monospace" },
-  { label: "JetBrains Mono",  family: "'JetBrains Mono', 'SF Mono', Menlo, monospace" },
-  { label: "Fira Code",       family: "'Fira Code', 'SF Mono', Menlo, monospace" },
-  { label: "Cascadia Code",   family: "'Cascadia Code', 'SF Mono', Menlo, monospace" },
-  { label: "IBM Plex Mono",   family: "'IBM Plex Mono', 'SF Mono', Menlo, monospace" },
-  { label: "Source Code Pro", family: "'Source Code Pro', 'SF Mono', Menlo, monospace" },
-  { label: "Roboto Mono",     family: "'Roboto Mono', 'SF Mono', Menlo, monospace" },
-  { label: "D2 Coding",       family: "'D2 coding', 'D2Coding', 'SF Mono', Menlo, monospace" },
-  { label: "System mono",     family: "ui-monospace, monospace" },
-];
+var FONT_OPTIONS = TERMINAL_FONT_OPTIONS;
 
 var MIN_SIZE = 9;
 var MAX_SIZE = 32;
@@ -48,11 +39,12 @@ function escapeHtml(s) {
 }
 
 function persistTermFont(family, size) {
-  fetch('/api/user/terminal-font', {
-    method: 'PUT',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ family: family, size: size }),
-  }).catch(function () {});
+  var status = popoverEl.querySelector('[role=status]');
+  status.textContent = 'Saving…';
+  popoverEl.querySelectorAll('button').forEach(function (button) {button.disabled = true;});
+  saveTerminalFont(family, size).then(function () {status.textContent = 'Saved.';})
+    .catch(function (error) {status.textContent = error.message;})
+    .finally(function () {popoverEl.querySelectorAll('button').forEach(function (button) {button.disabled = false;});syncSize();});
 }
 
 function syncSize() {
@@ -96,7 +88,6 @@ function buildPopover() {
     (function (family) {
       item.addEventListener('click', function (e) {
         e.stopPropagation();
-        applyTerminalFont(family, undefined);
         persistTermFont(family, undefined);
       });
     })(opt.family);
@@ -127,16 +118,15 @@ function buildPopover() {
   sizeDecEl.addEventListener('click', function (e) {
     e.stopPropagation();
     var next = Math.max(MIN_SIZE, getTerminalFontSize() - 1);
-    applyTerminalFont(undefined, next);
     persistTermFont(undefined, next);
   });
   sizeIncEl.addEventListener('click', function (e) {
     e.stopPropagation();
     var next = Math.min(MAX_SIZE, getTerminalFontSize() + 1);
-    applyTerminalFont(undefined, next);
     persistTermFont(undefined, next);
   });
 
+  var status = document.createElement('p');status.setAttribute('role','status');status.className='settings-status';popoverEl.appendChild(status);
   document.body.appendChild(popoverEl);
   return popoverEl;
 }

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

@@ -40,13 +40,14 @@ export function initLinearSettings() {
     try {
       var response = await fetch('/api/linear/connection', { method: disconnect ? 'DELETE' : 'PUT',
         headers: { 'Content-Type': 'application/json' }, body: disconnect ? undefined : JSON.stringify({ key: input.value }) });
-      clearLinearKeyInput();
       if (store.get('myUserId') !== actor) return;
       var data = await response.json();
       if (!response.ok) throw new Error(data.error || 'Could not update Linear connection.');
+      clearLinearKeyInput();
       store.set({ linearConnection: data, githubWorkRefresh: null });
+      form.hidden = true;
       setLinearStatus(data.connected ? 'Connected to ' + data.workspace.name : 'Disconnected', data.connected ? 'connected' : '');
-    } catch (error) { clearLinearKeyInput(); setLinearStatus(error.message, 'error'); }
+    } catch (error) { setLinearStatus(error.message, 'error'); }
     finally {
       store.set({ linearConnectionSaving: false });
       buttons.forEach(function (button) { button.disabled = false; });

package/lib/public/modules/markdown.js

@@ -32,14 +32,12 @@ marked.use({
   }
 });
 
-// Initialize mermaid
-mermaid.initialize({
-  startOnLoad: false,
-  theme: "dark",
-  themeVariables: getMermaidThemeVars()
-});
+// Theme and Markdown import each other. Read theme state only after module
+// initialization, when a theme is applied or the first diagram is rendered.
+var mermaidInitialized = false;
 
 export function updateMermaidTheme(vars) {
+  mermaidInitialized = true;
   mermaid.initialize({
     startOnLoad: false,
     theme: "dark",
@@ -183,6 +181,7 @@ export function renderMermaidBlocks(el) {
     container.className = "mermaid-diagram";
 
     try {
+      if (!mermaidInitialized) updateMermaidTheme(getMermaidThemeVars());
       mermaid.render(id, source.trim()).then(function (result) {
         container.innerHTML = result.svg;
         container.addEventListener("click", function () {

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

@@ -0,0 +1,81 @@
+import { store } from './store.js';
+
+function status(text) { var el = document.getElementById('personal-notification-status'); if (el) el.textContent = text; }
+function apply(values) {
+  store.set({ notificationPreferences: values });
+  ['alert', 'sound'].forEach(function (key) {
+    var source = document.getElementById('notif-toggle-' + key);
+    var target = document.getElementById('settings-notif-' + key);
+    if (source) source.checked = values[key];
+    if (target) target.checked = values[key];
+  });
+  window.dispatchEvent(new CustomEvent('clay:notification-preferences', { detail: values }));
+}
+export async function loadNotificationSettings() {
+  if (store.get('notificationDraft') || store.get('notificationSaving')) return;
+  try {
+    var response = await fetch('/api/user/notifications');
+    var data = await response.json();
+    if (!response.ok) throw new Error(data.error);
+    if (store.get('notificationDraft') || store.get('notificationSaving')) return;
+    apply(data);
+    if (!data.configured) {
+      var legacyAlert = localStorage.getItem('notif-alert');
+      var legacySound = localStorage.getItem('notif-sound');
+      if (legacyAlert !== null || legacySound !== null) {
+        store.set({ notificationPreferences: { alert: legacyAlert !== '0', sound: legacySound !== '0' } });
+        await saveNotificationPreference('alert', legacyAlert !== '0');
+        return;
+      }
+    }
+    status('Preferences saved on this server. Browser permission: ' + ('Notification' in window ? Notification.permission : 'unsupported') + '.');
+  } catch (error) { status(error.message || 'Notifications unavailable. Reopen Personal settings to retry.'); }
+}
+export async function saveNotificationPreference(key, value) {
+  if (store.get('notificationSaving')) return;
+  var saved = store.get('notificationDraft') || store.get('notificationPreferences');
+  if (!saved) { status('Preferences have not loaded. Reopen Personal settings to retry.'); return; }
+  var draft = Object.assign({}, saved); draft[key] = value;
+  store.set({ notificationDraft: draft, notificationSaving: true });
+  setPending(true);
+  status('Saving…');
+  try {
+    var response = await fetch('/api/user/notifications', { method: 'PUT', headers: { 'Content-Type': 'application/json', 'X-Clay-Settings': '1' }, body: JSON.stringify(draft) });
+    var data = await response.json();
+    if (!response.ok) throw new Error(data.error);
+    store.set({ notificationDraft: null });
+    localStorage.removeItem('notif-alert'); localStorage.removeItem('notif-sound');
+    apply(data); status('Saved. Browser permissions and push subscriptions are managed separately on this device.');
+  } catch (error) { status(error.message || 'Could not save. Your selection is retained; retry below.'); }
+  finally { store.set({ notificationSaving: false }); setPending(false); }
+}
+function setPending(pending) {
+  ['settings-notif-alert', 'settings-notif-sound', 'notif-toggle-alert', 'notif-toggle-sound'].forEach(function (id) {
+    var input = document.getElementById(id); if (input) input.disabled = pending;
+  });
+  var retry = document.getElementById('notification-save-retry');
+  if (retry) retry.hidden = pending || !store.get('notificationDraft');
+}
+export function initNotificationSettings() {
+  var retry = document.createElement('button'); retry.id = 'notification-save-retry'; retry.textContent = 'Retry save'; retry.className = 'settings-btn-sm'; retry.hidden = true;
+  retry.onclick = function () { var draft = store.get('notificationDraft'); if (draft) saveNotificationPreference('alert', draft.alert); };
+  document.getElementById('personal-notification-status').insertAdjacentElement('afterend', retry);
+  ['alert', 'sound', 'push'].forEach(function (key) {
+    var target = document.getElementById('settings-notif-' + key);
+    if (!target) return;
+    target.onchange = function () {
+      var source = document.getElementById('notif-toggle-' + key);
+      if (!source) { target.checked = false; status('Push requires the installed app on this device.'); return; }
+      source.checked = target.checked;
+      source.dispatchEvent(new Event('change', { bubbles: true }));
+    };
+  });
+  var push = document.getElementById('settings-notif-push');
+  push.disabled = !('serviceWorker' in navigator) || !window.isSecureContext || !('PushManager' in window);
+  loadNotificationSettings();
+}
+export function updatePushSettings(checked, message, pending) {
+  var input = document.getElementById('settings-notif-push');
+  if (input) { input.checked = checked; if (pending !== undefined) input.disabled = pending; }
+  if (message) status(message);
+}