@panphora/clayjs 1.15.2 → 1.16.0

package/src/core/conflict-notice.js

@@ -1,715 +1,158 @@
-import { isEditMode } from "./is-edit-mode.js";
-import { rowOf } from "./conflict-presentation.js";
-import { downloadRecovery } from "./conflict-download.js";
 import onDomReady from "../lib/dom-ready.js";
-import { set, make } from "../lib/hostile-css.js";
+import { isEditMode } from "./is-edit-mode.js";
 import { isSaveConflicted } from "./save.js";
-import { gateCaptureToken } from "../lib/dirty-gate.js";
-import { reloadAfterDiscard } from "./unsaved-warning.js";
-import { bevelButton, bevelIconButton, bevelSurface, bevelWell, bevelText, protectIcon, RUNTIME_ONLY } from "../ui/bevel-controls.js";
-import { TOKENS, FONT_SANS, FONT_MONO, GLYPHS } from "../ui/bevel.js";
-
-// One notice for everything this tab holds that the page no longer shows: edits
-// another save replaced (the ledger, clay.conflicts) and a save the host refused.
-// It never decides for the person. Minimize, Escape, a save, a reconnect or a later
-// frame leave every loss where it is; only Accept theirs (or Writer's own merge)
-// acknowledges one, and only the ids the panel actually drew.
-//
-// Ledger changes draw on the next frame, not at once: a listener that claims its
-// own records inside clay:sync-applied (Writer) must get there before the first
-// draw, or the bar flashes a count that is not the person's to deal with.
-
-export const WARN = "light-dark(#D08A1E, #E3A33F)";
-const ARM_MS = 5000;
-const TOAST_MS = 4000;
-const DOUBLE_PRESS_MS = 500;
-
-// The host names what moved the file when it knows. Anything unrecognised falls
-// back to the phrase that is true in every case.
-const SOURCES = {
-  "another-tab": "in another tab",
-  "another-person": "by someone else",
-  "an-agent": "by an agent",
-};
-
-const MINIMIZE_SVG = '<svg viewBox="0 0 12 12" width="12" height="12" aria-hidden="true"><path d="M2.5 9.5h7" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="square"/></svg>';
-
-const plural = (n, word) => `${n} ${word}${n === 1 ? "" : "s"}`;
-
-const BLOCKED_ROW = "This spot changed again. Review the latest edit or download your copy.";
-const DATA_BLOCKED_ROW = "A data value can't be put back from here. Download your copy to keep yours.";
-
-let view = "hidden";
-let listOpen = false;
-let renderedIds = [];
-const seenIds = new Set();
-const freshIds = new Set();
-let refused = null;
-let refusalGeneration = 0;
-let armed = null;
-let armTimer = null;
-let busy = null;
-let keepFailed = false;
-let downloaded = false;
-let downloadFailed = false;
-const blockedRows = new Map();
-let ledgerRevision = 0;
-let frameQueued = false;
-let checkRefusal = false;
-let toastText = null;
-let toastTimer = null;
-let pendingFocus = null;
-let armedAt = 0;
-let armLost = false;
-let keepAttempt = 0;
-let lastAnnounced = null;
-let panelEl = null;
-
-let root = null;
-let wellEl = null;
-let keyed = new Map();
-
+import { storage } from "../lib/doc-storage.js";
+
+// The notice itself lives in conflict-notice-ui.js and is 6.8 KB Brotli: most edit
+// boots have nothing for it to show, so this shell is what every one of them downloads
+// instead. It watches the events that can create something to show and, on the first
+// one, fetches the notice once and hands it that event, which it replays as if it had
+// been listening all along. From then on the notice owns every listener; this file
+// adds no state and draws nothing. Conflicts a reload left in the recovery store have
+// no event to announce them, so a boot that holds some asks for the notice at once.
 const ledger = () => window.clay?.conflicts || null;
-const losses = () => ledger()?.list().filter((r) => !r.claimedBy && r.kind !== "apply-incomplete") ?? [];
-const failures = () => ledger()?.list().filter((r) => !r.claimedBy && r.kind === "apply-incomplete") ?? [];
-
-// A refused save goes first: saving is blocked until it is answered.
-function mode() {
-  if (refused) return "refused";
-  if (losses().length) return "replaced";
-  if (failures().length) return "failed";
-  return null;
-}
-
-function el(tag, rules, text) {
-  const node = make(tag, rules, text);
-  if (rules[0] === "all:initial") set(node, "color-scheme", "inherit");
-  node.setAttribute("clay", RUNTIME_ONLY);
-  return node;
-}
-
-function key(node, name) {
-  keyed.set(name, node);
-  return node;
-}
-
-function schemeOf() {
-  const s = getComputedStyle(document.documentElement).colorScheme;
-  return s === "light" || s === "dark" ? s : "light dark";
-}
-
-// A phone keyboard shrinks the visual viewport but leaves fixed elements pinned to
-// the layout viewport, which parks a bottom-anchored bar behind the keyboard at the
-// exact moment somebody is typing. Lift it by the difference instead.
-function place() {
-  if (!root) return;
-  const vv = window.visualViewport;
-  const lift = vv ? Math.max(0, window.innerHeight - vv.height - vv.offsetTop) : 0;
-  set(root, "bottom", `calc(${16 + lift}px + env(safe-area-inset-bottom,0px))`);
-  if (panelEl) set(panelEl, "max-height", `${Math.max(160, (vv?.height || window.innerHeight) - 32)}px`);
-}
-
-function build() {
-  root = el("div", [
-    "all:initial", "position:fixed", "left:50%", "transform:translateX(-50%)",
-    "z-index:2147483001", "display:none", "flex-direction:column", "align-items:center",
-    "max-width:calc(100vw - 24px)", `font:14px/1.5 ${FONT_SANS}`, `color:${TOKENS.ink}`,
-    "text-align:left",
-  ]);
-  root.setAttribute("data-clay-conflict", "");
-  document.body.appendChild(root);
-  window.visualViewport?.addEventListener("resize", place);
-  window.visualViewport?.addEventListener("scroll", place);
-}
-
-export function schedule() {
-  if (frameQueued) return;
-  frameQueued = true;
-  const run = () => { frameQueued = false; render(); };
-  if (typeof requestAnimationFrame === "function") requestAnimationFrame(run);
-  else setTimeout(run, 16);
-}
-
-function render() {
-  if (checkRefusal) {
-    checkRefusal = false;
-    if (refused && !isSaveConflicted()) refused = null;
-  }
-  const m = mode();
-  if (!m) {
-    view = "hidden";
-    listOpen = false;
-    seenIds.clear();
-    freshIds.clear();
-    renderedIds = [];
-    disarm();
-    lastAnnounced = null;
-    armLost = false;
-  } else if (view === "hidden") {
-    view = "bar";
-  }
-  if (!root) {
-    if (view === "hidden" && !toastText) return;
-    if (!document.body) return;
-    build();
-  }
-  // A body replaced wholesale takes the root with it.
-  if (!root.isConnected && document.body) document.body.appendChild(root);
-
-  const active = document.activeElement;
-  let focusKey = null;
-  for (const [name, node] of keyed) if (node === active) focusKey = name;
-  const scroll = wellEl ? wellEl.scrollTop : 0;
-  keyed = new Map();
-  wellEl = null;
-  panelEl = null;
-  root.replaceChildren();
-  set(root, "color-scheme", schemeOf());
-
-  if (toastText) {
-    root.append(drawToast(toastText));
-  } else if (view === "bar") {
-    root.append(drawBar(m));
-  } else if (view === "panel") {
-    root.append(drawPanel(m));
-  }
-  set(root, "display", toastText || view !== "hidden" ? "flex" : "none");
-  if (wellEl) wellEl.scrollTop = scroll;
-
-  const want = pendingFocus || focusKey;
-  if (want && keyed.has(want)) keyed.get(want).focus({ preventScroll: true });
-  // A request for a control the toast is standing in for waits until the toast goes.
-  if (!toastText) pendingFocus = null;
-  place();
-}
-
-function dot() {
-  return el("span", ["all:initial", "display:inline-block", "flex:none", "width:8px", "height:8px", "border-radius:50%", `background:${WARN}`]);
-}
-
-function refusedSource() {
-  return SOURCES[refused?.changedBy] || null;
-}
-
-function barMessage(m, n) {
-  if (m === "refused") {
-    const named = refusedSource();
-    if (!named && refused.afterTimeout) {
-      return "This page changed elsewhere, possibly by your own save that timed out. Your edits here are safe.";
-    }
-    return `This page changed ${named || "elsewhere"}. Your edits here are safe.`;
-  }
-  if (m === "failed") return "A sync update did not finish. Your edits here are safe.";
-  return `Another edit replaced ${plural(n, "change")}.`;
-}
-
-function titleOf(m, n) {
-  if (m === "refused") return `This page changed ${refusedSource() || "elsewhere"}`;
-  if (m === "failed") return "A sync update did not finish";
-  return `Another edit replaced ${plural(n, "change")}`;
-}
-
-function drawToast(text) {
-  const t = bevelSurface("div", ["display:block", `border-left:3px solid ${TOKENS.teal}`, "padding:10px 14px", "width:max-content", "max-width:calc(100vw - 24px)"]);
-  t.setAttribute("role", "status");
-  t.textContent = text;
-  return t;
-}
-
-function drawBar(m) {
-  const n = m === "failed" ? failures().length : losses().length;
-  const bar = bevelSurface("div", ["display:flex", "flex-wrap:wrap", "align-items:center", "gap:10px 12px", "padding:8px 8px 8px 14px", "width:max-content", "max-width:calc(100vw - 24px)"]);
-  // A redraw rebuilds the bar; only a new message is announced again.
-  const message = barMessage(m, n);
-  if (message !== lastAnnounced) {
-    bar.setAttribute("role", m === "refused" ? "alert" : "status");
-    lastAnnounced = message;
-  }
-  bar.append(dot(), bevelText("span", [], message), key(bevelButton("Review", { onClick: openPanel }), "review"));
-  return bar;
-}
-
-function action(label, name, { variant = "default", onClick, push = false } = {}) {
-  const phone = window.innerWidth < 480;
-  const extra = phone
-    ? ["flex:1 1 100%", ...(variant === "primary" ? ["order:-1"] : [])]
-    : (push ? ["margin-left:auto"] : []);
-  return key(bevelButton(label, { variant, onClick, extra }), name);
-}
-
-function lede(text) {
-  return bevelText("div", ["display:block", "padding:0 16px 12px", `color:${TOKENS["ink-2"]}`, "font-size:13.5px"], text);
-}
-
-function drawPanel(m) {
-  const rows = m === "replaced" ? losses() : m === "failed" ? failures() : [];
-  const held = m === "refused" ? losses() : rows;
-  if (seenIds.size) for (const r of rows) if (!seenIds.has(r.id)) freshIds.add(r.id);
-  for (const id of [...freshIds]) if (!rows.some((r) => r.id === id)) freshIds.delete(id);
-
-  const title = titleOf(m, rows.length);
-  const maxHeight = Math.max(160, (window.visualViewport?.height || window.innerHeight) - 32);
-  const panel = bevelSurface("div", ["display:flex", "flex-direction:column", "width:520px", "max-width:calc(100vw - 24px)", `max-height:${maxHeight}px`]);
-  panelEl = panel;
-  panel.setAttribute("role", "dialog");
-  panel.setAttribute("aria-label", title);
-
-  const head = el("div", ["all:initial", "display:flex", "align-items:center", "gap:8px", "padding:12px 12px 8px 16px", `font:14px/1.5 ${FONT_SANS}`, `color:${TOKENS.ink}`]);
-  const t = key(bevelText("b", ["font-weight:600", "font-size:14.5px", "outline:none"], title), "title");
-  t.setAttribute("tabindex", "-1");
-  head.append(dot(), t);
-  if (m === "replaced" && freshIds.size) {
-    head.append(bevelText("span", [
-      `font:600 10.5px/1 ${FONT_MONO}`, "letter-spacing:.12em", "text-transform:uppercase", "padding:3px 6px",
-      `color:color-mix(in srgb, ${TOKENS.brass} 80%, ${TOKENS.ink})`, `background:${TOKENS["brass-soft"]}`,
-    ], `${freshIds.size} new`));
-  }
-  const minimizeWrap = el("span", ["all:initial", "display:inline-flex", "margin-left:auto"]);
-  const minimize = key(bevelIconButton(MINIMIZE_SVG, { label: "Minimize", onClick: minimizePanel }), "minimize");
-  minimize.title = "Minimize to the bar. Nothing is accepted until you choose.";
-  minimizeWrap.append(minimize);
-  head.append(minimizeWrap);
-  panel.append(head);
-
-  if (m === "refused") {
-    panel.append(lede("Your edits here are safe and not saved yet; nothing will be overwritten until you choose. Their version is not on this page, so there is no list of edits to compare. Keep yours, which saves over theirs, or accept theirs, which reloads the page and drops your unsaved edits."));
-    if (held.length) {
-      panel.append(lede(`${plural(held.length, "earlier replaced edit")} ${held.length === 1 ? "is" : "are"} also held in this tab. Download my copy includes them.`));
-    }
-    if (keepFailed) panel.append(lede("That did not save either. Your edits here are still here."));
-    if (armLost) panel.append(lede("Something changed on the page after your first press, so nothing was dropped. Press Accept theirs again if you still want their version."));
-    if (armed) {
-      const warn = el("div", [
-        "all:initial", "display:block", "margin:0 16px 12px", "padding:8px 10px",
-        `border-left:3px solid ${WARN}`, `background:color-mix(in srgb, ${WARN} 14%, transparent)`,
-        `color:${TOKENS.ink}`, `font:13px/1.5 ${FONT_SANS}`,
-      ]);
-      warn.append(el("b", ["all:initial", "font:inherit", "font-weight:700", "color:inherit"], "This drops your unsaved edits."), document.createTextNode(" Download your copy first if you might want them. Press again to confirm."));
-      panel.append(warn);
-    }
-  } else if (m === "failed") {
-    panel.append(lede("Part of an update from elsewhere could not be applied, so this page may be missing some of it. Your edits here are safe. Download a copy of the page as you had it, or accept to keep the page as it is."));
-  } else {
-    panel.append(lede("The page is showing the other edit. This stays until you choose. You can also save a copy of the page as you had it."));
-  }
-
-  const actions = el("div", ["all:initial", "display:flex", "flex-wrap:wrap", "gap:8px", "padding:0 16px 14px"]);
-  const dl = action(downloadFailed ? "Try again" : downloaded ? "Downloaded" : "Download my copy", "download", { onClick: onDownload });
-  actions.append(dl);
-  if (m === "refused") {
-    const keep = action(busy === "overwrite" ? "Saving…" : keepFailed ? "Try again" : "Keep mine", "keep", { onClick: onKeep });
-    keep.setDisabled(busy === "overwrite");
-    actions.append(keep, action(armed ? "Yes, drop my edits" : "Accept theirs", "accept", { variant: "primary", onClick: onRefusedAccept, push: true }));
-  } else {
-    if (m === "replaced") {
-      const pending = ledger().hasPendingApply();
-      const put = action(pending ? "Finishing the incoming edit…" : busy === "revert" ? "Putting back…" : "Revert to mine", "revert", { onClick: onRevert });
-      put.setDisabled(pending || busy === "revert");
-      actions.append(put);
-    }
-    actions.append(action("Accept theirs", "accept", { variant: "primary", onClick: onAccept, push: true }));
-  }
-  panel.append(actions);
-
-  if (m === "replaced") {
-    if (!listOpen) {
-      const more = el("div", ["all:initial", "display:flex", "align-items:center", "gap:8px", `border-top:1px solid ${TOKENS.line}`, "padding:8px 10px 8px 16px", `color:${TOKENS.muted}`, `font:13px/1.5 ${FONT_SANS}`]);
-      const seeWrap = el("span", ["all:initial", "display:inline-flex", "margin-left:auto"]);
-      seeWrap.append(key(bevelButton("See the edits", { small: true, onClick: toggleList }), "list"));
-      more.append(el("span", ["all:initial", "font:inherit", "color:inherit"], plural(rows.length, "edit")), seeWrap);
-      panel.append(more);
-    } else {
-      panel.append(drawWell(rows));
-    }
-  }
 
-  renderedIds = held.map((r) => r.id);
-  for (const r of rows) seenIds.add(r.id);
-  return panel;
-}
-
-function drawWell(rows) {
-  // The sunk ground, not the recess: the recess's lighter blue glares against the panel in dark mode.
-  const well = bevelWell(["flex:1 1 auto", "margin:0 16px 12px", "min-height:0", "overflow:auto", `background:${TOKENS.sunk}`, `border:1px solid ${TOKENS["line-2"]}`]);
-  const head = el("div", ["all:initial", "position:sticky", "top:0", "z-index:1", "display:flex", "align-items:center", "gap:8px", "padding:8px 12px", `background:${TOKENS.sunk}`, `border-bottom:1px solid ${TOKENS["line-2"]}`, `color:${TOKENS.muted}`, `font:600 10.5px/1 ${FONT_MONO}`, "letter-spacing:.12em", "text-transform:uppercase"]);
-  const hideWrap = el("span", ["all:initial", "display:inline-flex", "margin-left:auto"]);
-  hideWrap.append(key(bevelButton("Hide", { small: true, variant: "quiet", onClick: toggleList }), "list"));
-  head.append(el("span", ["all:initial", "font:inherit", "color:inherit", "letter-spacing:inherit", "text-transform:inherit"], "Replaced edits"), hideWrap);
-  well.append(head);
-  rows.forEach((r, i) => well.append(buildRow(r, i)));
-  wellEl = well;
-  return well;
-}
-
-function valueLine(label, value, { mine }) {
-  const cells = [bevelText("span", [`color:${TOKENS.faint}`, `font-family:${FONT_SANS}`], label)];
-  const box = bevelText("span", [
-    "display:-webkit-box", "-webkit-line-clamp:2", "-webkit-box-orient:vertical", "overflow:hidden",
-    "overflow-wrap:anywhere",
-    ...(mine
-      ? [`color:${TOKENS.ink}`]
-      : [`color:${TOKENS.muted}`]),
-  ]);
-  const full = (value.cutBefore ? "…" : "") + value.before + value.hit + value.after + (value.cutAfter ? "…" : "");
-  box.title = full;
-  if (value.before) box.append(bevelText("span", [`color:${TOKENS.faint}`], (value.cutBefore ? "…" : "") + value.before));
-  const hit = bevelText("span", mine
-    ? [`background:color-mix(in srgb, ${WARN} 18%, transparent)`, "padding:0 4px"]
-    : (value.before || value.after
-      ? ["text-decoration:underline", `text-decoration-color:color-mix(in srgb, ${WARN} 70%, transparent)`, "text-underline-offset:3px"]
-      : []), value.hit || "(empty)");
-  box.append(hit);
-  if (value.after) box.append(bevelText("span", [`color:${TOKENS.faint}`], value.after + (value.cutAfter ? "…" : "")));
-  cells.push(box);
-  return cells;
-}
-
-function buildRow(record, index) {
-  const row = rowOf(record);
-  const box = bevelText("div", ["display:block", "padding:8px 12px 10px", ...(index ? [`border-top:1px solid ${TOKENS.line}`] : [])]);
-  const where = bevelText("div", ["display:flex", "align-items:center", "gap:4px", "font-size:12.5px", "font-weight:600", `color:${TOKENS["ink-2"]}`, "margin-bottom:4px"]);
-  where.append(bevelText("span", [], row.name));
-  if (row.target && row.target.isConnected) where.append(key(eyeButton(row), `eye:${record.id}`));
-  box.append(where);
-  if (row.sentence) box.append(bevelText("div", ["display:block", "font-size:13px", `color:${TOKENS["ink-2"]}`], row.sentence));
-  if (blockedRows.has(record.id)) box.append(bevelText("div", ["display:block", "font-size:13px", "margin-top:4px", `color:${WARN}`], blockedRows.get(record.id)));
-  if (row.yours) {
-    const grid = bevelText("div", ["display:grid", "grid-template-columns:44px 1fr", "gap:3px 10px", "align-items:start", `font:12.5px/1.5 ${FONT_MONO}`, ...(row.sentence ? ["margin-top:4px"] : [])]);
-    grid.append(...valueLine("Yours", row.yours, { mine: true }));
-    if (row.now) grid.append(...valueLine("Now", row.now, { mine: false }));
-    box.append(grid);
-  }
-  return box;
-}
-
-function eyeButton(row) {
-  const base = ["all:initial", "color-scheme:inherit", "box-sizing:border-box", "cursor:pointer", "display:inline-grid", "place-items:center", "width:22px", "height:20px", `color:${TOKENS.ink}`];
-  const b = el("button", base);
-  b.type = "button";
-  b.innerHTML = GLYPHS.conflictEye;
-  protectIcon(b.firstElementChild, 16);
-  b.setAttribute("aria-label", `Show ${row.name} on page`);
-  b.title = "Show on page";
-  const paint = (extra) => { b.style.cssText = ""; for (const r of [...base, ...extra]) { const i = r.indexOf(":"); b.style.setProperty(r.slice(0, i), r.slice(i + 1), "important"); } };
-  b.addEventListener("pointerenter", () => paint([`background:color-mix(in srgb, ${WARN} 16%, transparent)`]));
-  b.addEventListener("pointerleave", () => paint([]));
-  b.addEventListener("focus", () => paint([`outline:2px solid ${TOKENS.brass}`, "outline-offset:1px"]));
-  b.addEventListener("blur", () => paint([]));
-  b.addEventListener("click", () => ring(row.target));
-  return b;
-}
-
-// The eye: scroll the element into view and draw a ring over it. The ring is ours
-// and runtime-only; the page's element gets no attribute, class or style, so the
-// dirty gate and the saved bytes see nothing.
-let ringEl = null;
-let ringTimer = null;
-let ringTarget = null;
-
-function dropRing() {
-  clearTimeout(ringTimer);
-  window.removeEventListener("scroll", placeRing, true);
-  window.removeEventListener("resize", placeRing);
-  ringEl?.remove();
-  ringEl = null;
-  ringTarget = null;
-}
-
-function placeRing() {
-  if (!ringEl || !ringTarget) return;
-  const r = ringTarget.getBoundingClientRect();
-  set(ringEl, "left", `${r.left}px`);
-  set(ringEl, "top", `${r.top}px`);
-  set(ringEl, "width", `${r.width}px`);
-  set(ringEl, "height", `${r.height}px`);
-}
+let loading = false;
+let notice = null;    // the notice module, once it has been fetched
+let listeners = null; // the armed handlers, all of them on one controller
 
-function ring(target) {
-  dropRing();
-  if (!target || !target.isConnected) return;
-  const still = !!window.matchMedia?.("(prefers-reduced-motion: reduce)").matches;
-  const behavior = still ? "instant" : "smooth";
-  // The notice sits at the bottom of the viewport: centre the target in what is left
-  // above it, or the outline lands on the panel instead of the text.
-  const top = root?.getBoundingClientRect().top ?? 0;
-  const cover = root && top > 0 ? Math.max(0, window.innerHeight - top) : 0;
-  if (!cover) {
-    target.scrollIntoView?.({ block: "center", behavior });
-  } else {
-    // Centre first, so a page whose own scroller holds the target still brings it
-    // up; then move the window the rest of the way. A target taller than the free
-    // space shows its top instead.
-    target.scrollIntoView?.({ block: "center", behavior: "instant" });
-    const r = target.getBoundingClientRect();
-    const free = window.innerHeight - cover;
-    const shift = r.height > free - 24 ? r.top - 12 : r.top + r.height / 2 - free / 2;
-    window.scrollBy?.({ top: shift, behavior });
-  }
-  ringTarget = target;
-  ringEl = el("div", ["all:initial", "color-scheme:inherit", "position:fixed", "pointer-events:none", "z-index:2147483001", `outline:2px solid ${WARN}`, "outline-offset:3px", `background:color-mix(in srgb, ${WARN} 14%, transparent)`]);
-  document.body.appendChild(ringEl);
-  placeRing();
-  window.addEventListener("scroll", placeRing, true);
-  window.addEventListener("resize", placeRing);
-  ringTimer = setTimeout(dropRing, 2500);
-}
-
-function openPanel() {
-  view = "panel";
-  pendingFocus = "title";
-  render();
-}
-
-function minimizePanel() {
-  dropRing();
-  view = "bar";
+function load(trigger) {
+  if (loading) return;
+  loading = true;
   disarm();
-  pendingFocus = "review";
-  render();
-}
-
-function toggleList() {
-  listOpen = !listOpen;
-  if (listOpen) freshIds.clear();
-  render();
-}
-
-// The ids copied before anything else runs: a record that landed after the draw was never shown, so this choice does not cover it, and a record something claimed since then is its owner's to settle.
-function onAccept() {
-  const l = ledger();
-  const ids = renderedIds.filter((id) => { const r = l?.get(id); return r && !r.claimedBy; });
-  if (l && ids.length) l.acknowledge(ids, { reason: "accepted" });
-  view = mode() ? "bar" : "hidden";
-  pendingFocus = "review";
-  schedule();
-}
-
-// Revert to mine. The ids are the rendered ones, copied before anything runs, as
-// Accept reads them. The module that does the work loads on first use, and only
-// here, where the sync plugin has published the ledger. What it could not put back
-// keeps its row, with the reason under it, until the ledger moves on.
-async function onRevert() {
-  const l = ledger();
-  if (busy || !l || l.hasPendingApply()) return;
-  const ids = renderedIds.filter((id) => { const r = l.get(id); return r && !r.claimedBy; });
-  if (!ids.length) return;
-  busy = "revert";
-  render();
-  // Focus that lands outside the notice while the revert and its save run is the
-  // person moving on; Review takes focus afterwards only if it stayed here.
-  let stayed = true;
-  const track = (e) => { stayed = !!root?.contains(e.target); };
-  document.addEventListener("focus", track, true);
-  let result;
-  try {
-    const { revertConflicts } = await import("../sync/conflict-revert.js");
-    result = await revertConflicts(ids);
-  } catch (err) {
-    console.error("[clay] Revert to mine did not finish", err);
-    result = { revertedIds: [], blockedIds: ids, saveResult: null };
-  } finally {
-    document.removeEventListener("focus", track, true);
-  }
-  busy = null;
-  for (const id of result.blockedIds) blockedRows.set(id, ledger()?.get(id)?.kind === "json" ? DATA_BLOCKED_ROW : BLOCKED_ROW);
-  view = mode() ? "bar" : "hidden";
-  pendingFocus = stayed ? "review" : null;
-  const saving = result.saveResult && (result.saveResult.ok || result.saveResult.msg === "Save already in progress");
-  if (result.revertedIds.length && saving) toast(`Put back ${plural(result.revertedIds.length, "change")}. Saving.`);
-  else render();
+  import("./conflict-notice-ui.js").then(
+    (module) => {
+      notice = module;
+      module.start(trigger);
+    },
+    (error) => {
+      console.error("clayjs: the conflict notice could not be downloaded; it will try again on the next conflict", error);
+      loading = false;
+      arm();
+    }
+  );
 }
 
-let downloadedTimer = null;
-
-// Download my copy. Nothing here acknowledges or releases a record.
-function onDownload() {
-  const l = ledger();
-  // A refusal ends in a reload that takes every record with it, so its copy carries
-  // all of them; a replaced notice covers the rows it drew.
-  const records = refused ? (l?.list() ?? []) : renderedIds.map((id) => l?.get(id)).filter(Boolean);
-  const ok = downloadRecovery(records, { refused: !!refused });
-  downloadFailed = !ok;
-  downloaded = ok;
-  clearTimeout(downloadedTimer);
-  if (ok) downloadedTimer = setTimeout(() => { downloaded = false; schedule(); }, 1200);
-  render();
+// Arming twice is arming once, so a boot, an event that arrived while the notice was
+// being fetched and a mode lease can all ask for the same handlers.
+function arm() {
+  listeners ||= new AbortController();
+  const { signal } = listeners;
+  document.addEventListener("clay:sync-conflicts-changed", onLedgerChanged, { signal });
+  document.addEventListener("clay:save-conflict", onSaveConflict, { signal });
+  document.addEventListener("clay:document-upgraded", onUpgraded, { signal });
+  document.addEventListener("clay:undo-kept", onUndoKept, { signal });
 }
 
 function disarm() {
-  clearTimeout(armTimer);
-  armTimer = null;
-  armed = null;
+  listeners?.abort();
+  listeners = null;
 }
 
-async function onKeep() {
-  if (busy) return;
-  const attempt = ++keepAttempt;
-  busy = "overwrite";
-  keepFailed = false;
-  disarm();
-  render();
-  let result;
-  try {
-    result = await window.clay?.save?.overwrite?.();
-  } catch {
-    result = { ok: false };
-  }
-  // A newer attempt, a new refusal or a landed save already settled this one.
-  if (attempt !== keepAttempt || busy !== "overwrite") return;
-  if (!result?.ok && isSaveConflicted()) {
-    // Left showing: the save still has not happened.
-    busy = null;
-    keepFailed = true;
-  }
-  schedule();
-}
-
-// Two presses. The first is a choice, not a confirmation, and this is the one
-// control here that throws away work nothing can bring back. The second only
-// counts if nothing changed in between: a new refusal, a new loss or new typing
-// each disarm it.
-function onRefusedAccept() {
-  if (!armed) {
-    armed = { refusalGeneration, ledgerRevision, dirtyGeneration: gateCaptureToken().gen };
-    armedAt = Date.now();
-    armLost = false;
-    clearTimeout(armTimer);
-    armTimer = setTimeout(() => { disarm(); schedule(); }, ARM_MS);
-    render();
-    return;
-  }
-  // The second half of a double click is not a second decision.
-  if (Date.now() - armedAt < DOUBLE_PRESS_MS) return;
-  const token = armed;
-  const current = () =>
-    armed === token &&
-    token.refusalGeneration === refusalGeneration &&
-    token.ledgerRevision === ledgerRevision &&
-    token.dirtyGeneration === gateCaptureToken().gen;
-  if (!reloadAfterDiscard({ isCurrent: current, reload: () => window.location.reload() })) {
-    disarm();
-    armLost = true;
-    render();
-  }
-}
-
-export function toast(text) {
-  toastText = text;
-  clearTimeout(toastTimer);
-  toastTimer = setTimeout(() => { toastText = null; schedule(); }, TOAST_MS);
-  render();
-}
-
-function onLedgerChanged() {
-  ledgerRevision++;
-  if (armed) disarm();
-  for (const id of [...blockedRows.keys()]) if (!ledger()?.get(id)) blockedRows.delete(id);
-  schedule();
+function onLedgerChanged(e) {
+  if (!ledger()?.size) return;
+  load(e);
 }
 
 function onSaveConflict(e) {
-  const d = e?.detail || {};
-  refused = { generation: ++refusalGeneration, changedBy: d.changedBy, afterTimeout: !!d.afterTimeout, etag: d.etag ?? null };
-  // The refusal answers the save a toast may still be announcing; it replaces the
-  // toast at once.
-  toastText = null;
-  clearTimeout(toastTimer);
-  disarm();
-  busy = null;
-  keepFailed = false;
-  keepAttempt++;
-  armLost = false;
-  schedule();
-}
-
-// An old save event cannot erase a newer refusal: only a tab that is no longer
-// holding one clears it. Losses are untouched; a save never acknowledges.
-function onSaveSettled(e) {
-  if (isSaveConflicted()) {
-    // save.js fires clay:save-saved just before it releases the hold, in the same
-    // task; look again once it has.
-    if (e.type === "clay:save-saved") queueMicrotask(() => { if (!isSaveConflicted()) onSaveSettled(e); });
-    return;
-  }
-  const keptMine = busy === "overwrite" && e.type === "clay:save-saved";
-  if (refused || busy) {
-    refused = null;
-    busy = null;
-    keepFailed = false;
-    armLost = false;
-    disarm();
-  }
-  if (keptMine) toast("Saved your version over theirs.");
-  else schedule();
-}
-
-// On a manual page, conflictResolvedBySync can release the hold without firing
-// clay:save-conflict-resolved. Checked a frame later, after the apply finished.
-function onSyncApplied() {
-  if (!refused) return;
-  checkRefusal = true;
-  schedule();
-}
-
-// conflictResolvedBySync released the hold on a manual page with unsaved work:
-// no save happened and no clay:save-conflict-resolved fired, but their version
-// is on this page now, so the refusal is over.
-function onConflictReleased() {
-  if (!refused || isSaveConflicted()) return;
-  refused = null;
-  busy = null;
-  keepFailed = false;
-  armLost = false;
-  disarm();
-  schedule();
-}
-
-function onKeydown(e) {
-  if (e.key !== "Escape") return;
-  if (armed) {
-    e.preventDefault();
-    disarm();
-    render();
-    return;
-  }
-  if (view !== "panel") return;
-  const a = document.activeElement;
-  if (a && a !== document.body && !root?.contains(a)) return;
-  e.preventDefault();
-  minimizePanel();
-}
-
-function onInput(e) {
-  if (!armed || root?.contains(e.target)) return;
-  disarm();
-  schedule();
-}
-
-// Focus that leaves the notice while a toast stands in for it is the person moving
-// on: the control the toast replaced does not take focus back afterwards.
-function onFocus(e) {
-  if (toastText && pendingFocus && !root?.contains(e.target)) pendingFocus = null;
-}
-
-function init() {
+  load(e);
+}
+
+// The document itself was upgraded somewhere else: the notice is drawn for this
+// too, because it is the one thing on the page that can offer a reload.
+function onUpgraded(e) {
+  load(e);
+}
+
+// A refused step this tab kept is offered the way a replaced edit is: the bar with
+// Review, and the panel behind it lists the copy. A keep the store refused stays in
+// memory, so the notice is not raised for it.
+function onUndoKept(e) {
+  if (e?.detail?.ok !== true) return;
+  load(e);
+}
+
+// A conflict this tab held before a reload lives in the recovery store, not in the
+// ledger. That store keeps one small count key for exactly this question: it is read
+// here, and the module behind it is fetched only when the count says something is
+// stored, so a boot with nothing stored downloads no recovery code. A kept undo step
+// keeps its own count the same way, and the notice it asks for reads both.
+const HINT_KEY = "conflicts";
+const UNDO_HINT_KEY = "undo";
+
+const hinted = (name) => storage.local.get(name)?.count > 0;
+
+function keptFromEarlier() {
+  if (hinted(UNDO_HINT_KEY)) load(null);
+  if (!hinted(HINT_KEY)) return;
+  import("../recovery/conflicts.js").then(
+    (module) => {
+      if (!loading && module.pendingConflicts() > 0) load(null);
+    },
+    () => {}
+  );
+}
+
+// A conflict still unresolved when the page leaves edit would go with the session:
+// saving is blocked until it is answered, and the answer needs the editor. A save the
+// host refused is one of those, and so is a loss the ledger is still holding for this
+// tab. A change the recovery store kept from an earlier session is a copy this page can
+// still hand back, not input it is holding, so it never stands in the way.
+function unresolved() {
+  const held = (ledger()?.list?.() ?? []).filter((record) => !record.claimedBy).map((record) => record.id);
+  if (held.length) return held;
+  return isSaveConflicted() ? ["save"] : [];
+}
+
+/**
+ * The lazy notice as a mode lease.
+ *
+ * The shell and the notice it fetches are editor-only: they exist to answer a conflict,
+ * and the answer needs the editing lane. `quiesce` refuses an exit over a conflict that
+ * is still unresolved and leaves the notice standing exactly as it is, which is what a
+ * refusal has to keep showing; `resume` has nothing to reopen. `initial: true` adopts the
+ * shell and the notice the boot already armed, and arms nothing again. `dispose` (after
+ * the barrier) takes back the shell's handlers and stops the notice, so a later frame in
+ * view draws nothing.
+ */
+export function conflictNoticeParticipant() {
+  return {
+    id: "clay:conflict-notice",
+    order: 960, // last: it reads the save lane's refusal and every peer's losses
+    prepare(context = {}) {
+      return {
+        enable() {
+          if (context.initial === true) return;
+          if (!notice && !loading) arm();
+        },
+        quiesce() {
+          const pending = unresolved();
+          if (!pending.length) return;
+          throw Object.assign(new Error("clay.conflict-notice: a conflict here is still unresolved"), {
+            code: "conflict",
+            pending,
+          });
+        },
+        resume() {},
+        dispose() {
+          disarm();
+          loading = false;
+          notice?.stop?.();
+          notice = null;
+        },
+      };
+    },
+  };
+}
+
+onDomReady(() => {
   if (!isEditMode) return;
-  document.addEventListener("clay:sync-conflicts-changed", onLedgerChanged);
-  // An apply beginning or ending changes only whether Revert may run.
-  document.addEventListener("clay:unsaved-state-changed", schedule);
-  document.addEventListener("clay:save-conflict", onSaveConflict);
-  document.addEventListener("clay:save-saved", onSaveSettled);
-  document.addEventListener("clay:save-conflict-resolved", onSaveSettled);
-  document.addEventListener("clay:sync-applied", onSyncApplied);
-  document.addEventListener("clay:save-conflict-released", onConflictReleased);
-  document.addEventListener("keydown", onKeydown);
-  document.addEventListener("input", onInput, true);
-  document.addEventListener("focus", onFocus, true);
-  if (ledger()?.size) schedule();
-}
-
-onDomReady(init);
+  if (ledger()?.size) load(null);
+  else {
+    // Armed first, always: a conflict can arrive while the hint is still being read.
+    arm();
+    keptFromEarlier();
+  }
+});
 
-export const _test = {
-  state: () => ({ view, listOpen, renderedIds: renderedIds.slice(), refused, armed, busy, ledgerRevision }),
-  render,
-};
+export { conflictNoticeParticipant as modeParticipant };