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

package/lib/public/modules/mate-management.js

@@ -2,7 +2,8 @@
 
 import { getWs } from './ws-ref.js';
 import { showMateProfilePopover } from './profile.js';
-import { showConfirm } from './app-misc.js';
+import { showToast } from './utils.js';
+import { showConfirm, hideConfirm } from './app-misc.js';
 import { iconHtml, refreshIcons } from './icons.js';
 
 var mateMenu = null;
@@ -21,15 +22,58 @@ export function editMateProfile(anchorEl, mate) {
 
 export function confirmMateRemoval(anchorEl, mate, onRemoved) {
   if (!anchorEl || !mate || mate.primary) return;
-  showConfirm(
-    mate.builtinKey ? "Remove this mate? You can restore it from the home switcher." : "Delete this mate permanently?",
-    function () {
-      if (onRemoved) onRemoved();
-      send({ type: "mate_delete", mateId: mate.id });
-    },
-    mate.builtinKey ? "Remove" : "Delete",
-    true
-  );
+  var name = (mate.profile || {}).displayName || mate.name || "this Mate";
+  var modal = document.getElementById("confirm-modal");
+  var panel = modal.querySelector(".confirm-dialog");
+  var ok = document.getElementById("confirm-ok");
+  var cancel = document.getElementById("confirm-cancel");
+  var input;
+  function cleanup() {
+    modal.classList.remove("mate-delete-confirm");
+    panel.removeAttribute("role"); panel.removeAttribute("aria-modal");
+    panel.removeAttribute("aria-labelledby"); panel.removeAttribute("aria-describedby");
+    var field = modal.querySelector(".mate-delete-challenge"); if (field) field.remove();
+    ok.disabled = false;
+    document.removeEventListener("keydown", onKey, true);
+    if (anchorEl.isConnected) anchorEl.focus({preventScroll:true});
+  }
+  function onKey(event) {
+    if (event.key === "Escape") { event.preventDefault(); event.stopImmediatePropagation(); hideConfirm(); return; }
+    if (event.key !== "Tab") return;
+    var controls = ok.disabled ? [input,cancel] : [input,cancel,ok];
+    var index = controls.indexOf(document.activeElement);
+    event.preventDefault(); event.stopImmediatePropagation();
+    controls[(index + (event.shiftKey ? controls.length - 1 : 1)) % controls.length].focus();
+  }
+  showConfirm("", function () {
+    if (input.value !== "understand") { cleanup(); return; }
+    var ws = getWs();
+    if (!ws || ws.readyState !== 1) { cleanup(); showToast("Clay is offline. The Mate was not deleted.", "error"); return; }
+    try { ws.send(JSON.stringify({type:"mate_delete",mateId:mate.id})); }
+    catch (error) { cleanup(); showToast("Could not send the deletion request. Try again.", "error"); return; }
+    cleanup();
+    if (onRemoved) onRemoved(true);
+  }, mate.builtinKey ? "Remove permanently" : "Delete permanently", true, cleanup);
+  modal.classList.add("mate-delete-confirm");
+  panel.setAttribute("role","alertdialog"); panel.setAttribute("aria-modal","true");
+  panel.setAttribute("aria-labelledby","mate-delete-title"); panel.setAttribute("aria-describedby","mate-delete-warning");
+  var text = document.getElementById("confirm-text");
+  var title = document.createElement("h3"); title.id = "mate-delete-title"; title.textContent = "Delete " + name + "?";
+  var warning = document.createElement("p"); warning.id = "mate-delete-warning";
+  warning.textContent = "This permanently deletes the Mate and the data stored in its workspace, including its prompt and files. This cannot be undone.";
+  text.appendChild(title); text.appendChild(warning);
+  if (mate.builtinKey) {
+    var note = document.createElement("p"); note.textContent = "You can add this built-in Mate again, but its deleted data will not be restored."; text.appendChild(note);
+  }
+  var field = document.createElement("label"); field.className = "mate-delete-challenge";
+  field.textContent = 'Type understand to confirm permanent deletion.';
+  input = document.createElement("input"); input.type = "text"; input.autocomplete = "off"; input.spellcheck = false;
+  input.setAttribute("autocapitalize","none"); input.setAttribute("aria-label","Type understand to confirm permanent deletion");
+  field.appendChild(input); text.after(field);
+  ok.disabled = true;
+  input.addEventListener("input",function () { ok.disabled = input.value !== "understand"; });
+  document.addEventListener("keydown",onKey,true);
+  input.focus();
 }
 
 export function closeMateManagementMenu() {

package/lib/public/modules/mate-sidebar.js

@@ -394,6 +394,16 @@ export function handleMateSearchResults(msg) {
 
 var expandedDebateGroups = new Set();
 
+function appendMateSessionTitleLine(el, textSpan) {
+  var processingDot = textSpan.querySelector('.session-processing');
+  if (processingDot) processingDot.remove();
+  var titleLine = document.createElement('span');
+  titleLine.className = 'mate-session-title-line';
+  titleLine.appendChild(textSpan);
+  if (processingDot) titleLine.appendChild(processingDot);
+  el.appendChild(titleLine);
+}
+
 export function renderMateSessionList(sessions) {
   if (sessions) cachedSessions = sessions;
   if (!listEl) return;
@@ -529,7 +539,7 @@ function renderDebateGroup(children, groupKey) {
   textHtml += '<span class="mate-debate-name">' + escapeHtml(debateName) + '</span>';
   textHtml += '<span class="mate-debate-count">' + children.length + '</span>';
   textSpan.innerHTML = textHtml;
-  el.appendChild(textSpan);
+  appendMateSessionTitleLine(el, textSpan);
 
   // Click row -> switch to latest session
   el.addEventListener("click", (function (id) {

package/lib/public/modules/mate-workspace-color.js

@@ -0,0 +1,33 @@
+// Theme-specific surfaces keep user color choices separate from text and actions.
+export var MATE_WORKSPACE_COLORS = [
+  { id: 'mint', label: 'Mint', pigment: '#07e5a3' },
+  { id: 'rose', label: 'Rose', pigment: '#ec82ac' },
+  { id: 'plum', label: 'Plum', pigment: '#b780b3' },
+  { id: 'coral', label: 'Coral', pigment: '#ff7479' },
+  { id: 'peach', label: 'Peach', pigment: '#ed986b' },
+  { id: 'gold', label: 'Gold', pigment: '#e0b45b' },
+  { id: 'sky', label: 'Sky', pigment: '#69b6d4' },
+  { id: 'indigo', label: 'Indigo', pigment: '#8582df' },
+  { id: 'stone', label: 'Stone', pigment: '#a5a59e' }
+];
+function mix(pigment, base, amount) {
+  var channels = [1, 3, 5].map(function (offset) {
+    var a = parseInt(pigment.slice(offset, offset + 2), 16);
+    var b = parseInt(base.slice(offset, offset + 2), 16);
+    return Math.round(a * amount + b * (1 - amount)).toString(16).padStart(2, '0');
+  });
+  return '#' + channels.join('');
+}
+export function workspaceColor(mate) {
+  var id = mate && mate.builtinKey !== 'clay' && !mate.primary ? mate.workspaceColor : 'mint';
+  var color = MATE_WORKSPACE_COLORS.find(function (item) { return item.id === id; }) || MATE_WORKSPACE_COLORS[0];
+  return Object.assign({}, color, {
+    light: mix(color.pigment, '#f2f2ef', color.id === 'mint' ? 0.03 : 0.08),
+    dark: mix(color.pigment, '#232322', color.id === 'mint' ? 0.02 : 0.10)
+  });
+}
+export function applyWorkspaceColor(mate) {
+  var color = workspaceColor(mate);
+  document.body.style.setProperty('--mate-surround-light', color.light);
+  document.body.style.setProperty('--mate-surround-dark', color.dark);
+}

package/lib/public/modules/mention.js

@@ -3,6 +3,7 @@ import { renderMarkdown, highlightCodeBlocks } from './markdown.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { store } from './store.js';
+import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 
 var ctx;
 
@@ -311,10 +312,6 @@ function color_mix_lighten(r, g, b, amount) {
     .map(function (v) { return v.toString(16).padStart(2, "0"); }).join("");
 }
 
-// Saved textarea placeholder so we can restore it when the chip is removed.
-// Set on first chip show, cleared on chip removal.
-var savedInputPlaceholder = null;
-
 function showInputMentionChip(name, color, avatarSrc) {
   removeInputMentionChip();
   var textColor = ensureChipContrast(color);
@@ -333,13 +330,9 @@ function showInputMentionChip(name, color, avatarSrc) {
     inputRow.insertBefore(chip, textareaWrap);
   }
 
-  // Swap the textarea placeholder so the user sees "Ask @{name}..." instead of
-  // the session-vendor placeholder ("Message Claude Code...") while a mention
-  // is queued. Save the original once so re-shows don't clobber it.
+  // Swap the textarea placeholder so the user sees "Ask @{name}..." while a
+  // mention is queued. Restoration is handled only while this prompt owns it.
   if (ctx && ctx.inputEl) {
-    if (savedInputPlaceholder === null) {
-      savedInputPlaceholder = ctx.inputEl.placeholder || "";
-    }
     ctx.inputEl.placeholder = "Ask @" + name + "...";
   }
 
@@ -353,9 +346,8 @@ function showInputMentionChip(name, color, avatarSrc) {
 function removeInputMentionChip() {
   var existing = document.getElementById("input-mention-chip");
   if (existing) existing.remove();
-  if (ctx && ctx.inputEl && savedInputPlaceholder !== null) {
-    ctx.inputEl.placeholder = savedInputPlaceholder;
-    savedInputPlaceholder = null;
+  if (existing && ctx && ctx.inputEl && !ctx.inputEl.disabled && /^Ask @/.test(ctx.inputEl.placeholder || "")) {
+    ctx.inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
   }
 }
 

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);
+}

package/lib/public/modules/notifications.js

@@ -1,3 +1,4 @@
+import { initNotificationSettings, saveNotificationPreference, updatePushSettings } from './notification-settings.js';
 import { initExtensionSettings } from './extension-settings.js';
 import { copyToClipboard, showToast } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
@@ -193,9 +194,8 @@ export function initNotifications(_ctx) {
     if (settingsUpdateCheck) {
       settingsUpdateCheck.addEventListener("click", function (e) {
         e.stopPropagation();
-        if (ctx.ws && ctx.connected) {
-          ctx.ws.send(JSON.stringify({ type: "check_update" }));
-        }
+        if (!ctx.ws || ctx.ws.readyState !== 1) { showToast("Reconnect before checking for updates."); return; }
+        ctx.ws.send(JSON.stringify({ type: "check_update" }));
         setUpdateBtn("Checking…", true, true);
       });
     }
@@ -222,10 +222,14 @@ export function initNotifications(_ctx) {
   })();
   var isStandalone = window.matchMedia("(display-mode:standalone)").matches || navigator.standalone;
 
+  window.addEventListener('clay:notification-preferences', function (event) {
+    notifAlertEnabled = event.detail.alert;
+    notifSoundEnabled = event.detail.sound;
+  });
   // --- Browser notifications ---
   notifPermission = ("Notification" in window) ? Notification.permission : "denied";
-  notifAlertEnabled = localStorage.getItem("notif-alert") !== "0";
-  notifSoundEnabled = localStorage.getItem("notif-sound") !== "0";
+  notifAlertEnabled = true;
+  notifSoundEnabled = true;
 
   var notifBtn = $("notif-btn");
   var notifMenu = $("notif-menu");
@@ -234,7 +238,7 @@ export function initNotifications(_ctx) {
 
   if (notifAlertEnabled && "Notification" in window && Notification.permission === "denied") {
     notifAlertEnabled = false;
-    localStorage.setItem("notif-alert", "0");
+
   }
   notifToggleAlert.checked = notifAlertEnabled;
   notifToggleSound.checked = notifSoundEnabled;
@@ -256,23 +260,24 @@ export function initNotifications(_ctx) {
 
   notifToggleAlert.addEventListener("change", function () {
     notifAlertEnabled = notifToggleAlert.checked;
-    localStorage.setItem("notif-alert", notifAlertEnabled ? "1" : "0");
+    saveNotificationPreference("alert", notifAlertEnabled);
     notifBlockedHint.classList.add("hidden");
     if (notifAlertEnabled && notifPermission !== "granted") {
       if ("Notification" in window && Notification.permission === "denied") {
         notifAlertEnabled = false;
         notifToggleAlert.checked = false;
-        localStorage.setItem("notif-alert", "0");
+
         notifBlockedHint.classList.remove("hidden");
         refreshIcons();
         return;
       }
+      if (!("Notification" in window)) { notifToggleAlert.checked = false; return; }
       Notification.requestPermission().then(function (p) {
         notifPermission = p;
         if (p !== "granted") {
           notifAlertEnabled = false;
           notifToggleAlert.checked = false;
-          localStorage.setItem("notif-alert", "0");
+
           notifBlockedHint.classList.remove("hidden");
           refreshIcons();
         }
@@ -327,7 +332,7 @@ export function initNotifications(_ctx) {
 
   notifToggleSound.addEventListener("change", function () {
     notifSoundEnabled = notifToggleSound.checked;
-    localStorage.setItem("notif-sound", notifSoundEnabled ? "1" : "0");
+    saveNotificationPreference("sound", notifSoundEnabled);
   });
 
   // --- Push notifications toggle ---
@@ -376,14 +381,18 @@ export function initNotifications(_ctx) {
     if (prevEndpoint && prevEndpoint !== sub.endpoint) {
       payload.replaceEndpoint = prevEndpoint;
     }
-    if (ctx.ws && ctx.ws.readyState === 1) {
-      ctx.ws.send(JSON.stringify({ type: "push_subscribe", subscription: json, replaceEndpoint: payload.replaceEndpoint || null }));
-    } else {
-      fetch(basePath + "api/push-subscribe", {
-        method: "POST", headers: { "Content-Type": "application/json" },
-        credentials: "same-origin", body: JSON.stringify(payload),
-      });
-    }
+    updatePushSettings(true, 'Registering push on this device…', true);
+    return fetch('/api/push-subscribe', {
+      method: 'POST', headers: { 'Content-Type': 'application/json' },
+      credentials: 'same-origin', body: JSON.stringify(payload)
+    }).then(function (response) {
+      if (!response.ok) throw new Error('Registration failed');
+      updatePushSettings(true, 'Push enabled on this device.', false);
+      return true;
+    }).catch(function () {
+      updatePushSettings(false, 'Could not register push with Clay. Enable it again to retry.', false);
+      return false;
+    });
   }
 
   function subscribePush() {
@@ -398,8 +407,9 @@ export function initNotifications(_ctx) {
           return reg.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: key });
         });
     }).then(function (sub) {
-      sendPushSubscription(sub);
-      localStorage.setItem("notif-push", "1");
+      return sendPushSubscription(sub);
+    }).then(function (registered) {
+      if (!registered) return;
       hideOnboarding();
       localStorage.setItem("onboarding-dismissed", "1");
       // Show a welcome notification so the user knows it works
@@ -411,18 +421,19 @@ export function initNotifications(_ctx) {
       }).catch(function () {});
     }).catch(function () {
       notifTogglePush.checked = false;
-      localStorage.setItem("notif-push", "0");
+      updatePushSettings(false, "Push is off on this device. Enable it here to retry.");
       notifBlockedHint.classList.remove("hidden");
       refreshIcons();
     });
   }
 
   function unsubscribePush() {
-    if (window._pushSubscription) {
-      window._pushSubscription.unsubscribe().catch(function () {});
+    var subscription = window._pushSubscription;
+    updatePushSettings(false, 'Disabling push on this device…', true);
+    Promise.resolve(subscription ? subscription.unsubscribe() : true).then(function () {
       window._pushSubscription = null;
-    }
-    localStorage.setItem("notif-push", "0");
+      updatePushSettings(false, 'Push is off on this device.', false);
+    }).catch(function () { notifTogglePush.checked = true; updatePushSettings(true, 'Could not disable push. Retry on this device.', false); });
   }
 
   notifTogglePush.addEventListener("change", function () {
@@ -434,6 +445,8 @@ export function initNotifications(_ctx) {
     }
   });
 
+  initNotificationSettings();
+
   // --- Service Worker registration & push state sync ---
   (function initServiceWorker() {
     if (!("serviceWorker" in navigator)) return;
@@ -464,6 +477,7 @@ export function initNotifications(_ctx) {
 
         return Promise.all([reg.pushManager.getSubscription(), vapidPromise]).then(function (results) {
           var sub = results[0];
+          var hadSubscription = !!sub;
           var serverKey = results[1];
 
           // If subscription exists but VAPID key changed, unsubscribe and re-subscribe
@@ -479,9 +493,10 @@ export function initNotifications(_ctx) {
           if (sub) {
             window._pushSubscription = sub;
             notifTogglePush.checked = true;
+            updatePushSettings(true);
             sendPushSubscription(sub);
             hideOnboarding();
-          } else if (serverKey && localStorage.getItem("notif-push") === "1") {
+          } else if (serverKey && hadSubscription) {
             // Had push enabled but subscription is gone (VAPID key change), re-subscribe
             var raw = atob(serverKey.replace(/-/g, "+").replace(/_/g, "/"));
             var key = new Uint8Array(raw.length);
@@ -490,13 +505,14 @@ export function initNotifications(_ctx) {
               .then(function (newSub) {
                 sendPushSubscription(newSub);
                 notifTogglePush.checked = true;
+            updatePushSettings(true);
               }).catch(function () {
                 notifTogglePush.checked = false;
-                localStorage.setItem("notif-push", "0");
+                updatePushSettings(false, "Push is off on this device. Enable it here to retry.");
               });
           } else {
             notifTogglePush.checked = false;
-            localStorage.setItem("notif-push", "0");
+            updatePushSettings(false, "Push is off on this device. Enable it here to retry.");
             // Standalone (PWA) without push: redirect to setup for push onboarding
             // Skip if setup was just completed (setup-done flag)
             var isStandalone = window.matchMedia("(display-mode:standalone)").matches || navigator.standalone;

package/lib/public/modules/personal-settings-dialog.js

@@ -0,0 +1,51 @@
+import { store } from './store.js';
+import { confirmSettingsAction, isolateSettingsDialog, trapSettingsFocus } from './server-settings-state.js';
+import { enhanceSettingsSelects } from './settings-select.js';
+
+// Keep contextual connection forms transactional when opened from settings.
+export function preparePersonalConnectionDialog(overlay, inline) {
+  var previous = document.activeElement;
+  var restore = inline ? function () {} : isolateSettingsDialog(overlay);
+  var dirty = false;
+  var dialog = overlay.querySelector('.email-setup-dialog');
+  dialog.setAttribute('role', inline ? 'region' : 'dialog');
+  if (!inline) dialog.setAttribute('aria-modal', 'true');
+  dialog.setAttribute('aria-label', 'Add personal mailbox');
+  overlay.querySelectorAll('.email-setup-field').forEach(function (field) {
+    var label = field.querySelector('label');
+    var input = field.querySelector('input,select');
+    if (label && input) label.htmlFor = input.id;
+  });
+  enhanceSettingsSelects(overlay);
+  function markDirty() { dirty = true; if (inline) store.set({personalEmailDirty:true}); }
+  overlay.addEventListener('input', markDirty);
+  overlay.addEventListener('change', markDirty);
+  var unsubscribe = inline ? store.subscribe(function (state, previousState) {
+    if (state.myUserId !== previousState.myUserId) close();
+  }) : function () {};
+  function cleanup() { observer.disconnect(); unsubscribe(); restore(); if (inline) store.set({personalEmailDirty:false}); }
+  function close() {
+    cleanup();overlay.remove();
+    if (previous && previous.isConnected) previous.focus();
+  }
+  function leave() {
+    if (dirty) confirmSettingsAction('Discard this unsaved mailbox connection?', 'Discard', close);
+    else close();
+  }
+  overlay.addEventListener('click', function (event) {
+    if (!inline && event.target === overlay || event.target.closest('#email-setup-cancel')) {
+      event.preventDefault();event.stopImmediatePropagation();leave();
+    }
+  }, true);
+  overlay.addEventListener('keydown', function (event) {
+    if (!inline || event.key === 'Escape') event.stopPropagation();
+    if (event.key === 'Escape' && !event.defaultPrevented) {event.preventDefault();leave();}
+    if (!inline) trapSettingsFocus(event, overlay);
+  });
+  var observer = new MutationObserver(function () {
+    if (!overlay.isConnected) {cleanup();if(previous && previous.isConnected)previous.focus();}
+  });
+  observer.observe(inline ? overlay.parentElement : document.body,{childList:true});
+  (overlay.querySelector('#email-setup-address') || overlay.querySelector('button')).focus();
+  return close;
+}