@panphora/clayjs 1.16.0 → 1.17.0

package/dist/page/themes/light-1.css

@@ -95,6 +95,11 @@
   article[data-page] {
     --page-link: #164583;
     --page-font-mono: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+    --page-color-gray: #5B5953; --page-color-brown: #8A5A1E; --page-color-orange: #B4531A; --page-color-yellow: #7A6210; --page-color-green: #3E6A28;
+    --page-color-blue: #1F5A8A; --page-color-purple: #5E4596; --page-color-pink: #A23E6E; --page-color-red: #9E3B2F;
+    --page-mark-bg-gray: rgba(35, 34, 31, 0.12); --page-mark-bg-brown: rgba(138, 90, 30, 0.20); --page-mark-bg-orange: rgba(180, 83, 26, 0.20);
+    --page-mark-bg-yellow: rgba(122, 98, 16, 0.22); --page-mark-bg-green: rgba(62, 106, 40, 0.20); --page-mark-bg-blue: rgba(31, 90, 138, 0.18);
+    --page-mark-bg-purple: rgba(94, 69, 150, 0.18); --page-mark-bg-pink: rgba(162, 62, 110, 0.18); --page-mark-bg-red: rgba(158, 59, 47, 0.18);
     min-height: 100vh;
     box-sizing: border-box;
     padding: var(--page-pad-top) 16px 30vh;
@@ -135,7 +140,26 @@
   article[data-page] th, article[data-page] td { min-width: 120px; padding: 6px 10px; border-inline-end: 1px solid var(--page-rule); border-block-end: 1px solid var(--page-rule); text-align: start; white-space: pre-wrap; }
   article[data-page] th { background: var(--page-code-bg); color: var(--page-ink-soft); font-weight: 600; }
   article[data-page] th[data-kind="number"], article[data-page] td[data-kind="number"] { text-align: end; }
-  article[data-page] blockquote { color: var(--page-ink-soft); border-inline-start: 1px solid var(--page-rule); padding-inline-start: var(--page-indent); }
+  article[data-page] blockquote { color: var(--page-ink-soft); padding-inline-start: var(--page-indent); }
+  article[data-page] span[data-color="gray"] { color: var(--page-color-gray); }
+  article[data-page] span[data-color="brown"] { color: var(--page-color-brown); }
+  article[data-page] span[data-color="orange"] { color: var(--page-color-orange); }
+  article[data-page] span[data-color="yellow"] { color: var(--page-color-yellow); }
+  article[data-page] span[data-color="green"] { color: var(--page-color-green); }
+  article[data-page] span[data-color="blue"] { color: var(--page-color-blue); }
+  article[data-page] span[data-color="purple"] { color: var(--page-color-purple); }
+  article[data-page] span[data-color="pink"] { color: var(--page-color-pink); }
+  article[data-page] span[data-color="red"] { color: var(--page-color-red); }
+  article[data-page] mark[data-color="gray"] { background: var(--page-mark-bg-gray); }
+  article[data-page] mark[data-color="brown"] { background: var(--page-mark-bg-brown); }
+  article[data-page] mark[data-color="orange"] { background: var(--page-mark-bg-orange); }
+  article[data-page] mark[data-color="yellow"] { background: var(--page-mark-bg-yellow); }
+  article[data-page] mark[data-color="green"] { background: var(--page-mark-bg-green); }
+  article[data-page] mark[data-color="blue"] { background: var(--page-mark-bg-blue); }
+  article[data-page] mark[data-color="purple"] { background: var(--page-mark-bg-purple); }
+  article[data-page] mark[data-color="pink"] { background: var(--page-mark-bg-pink); }
+  article[data-page] mark[data-color="red"] { background: var(--page-mark-bg-red); }
+  article[data-page] mark { color: inherit; }
 }
 
 

package/dist/server/core.cjs

@@ -53849,6 +53849,12 @@ var schema = new Qr.Schema({
         "data-checked": n.attrs.checked ? "true" : "false"
       }), 0]
     },
+    quote: {
+      group: "block",
+      content: "inline*",
+      attrs: block,
+      toDOM: (n) => ["blockquote", ref(n), 0]
+    },
     callout: {
       group: "block",
       content: "inline*",
@@ -53977,6 +53983,33 @@ var schema = new Qr.Schema({
       attrs: { href: {} },
       inclusive: false,
       toDOM: (m2) => ["a", { href: safeHref(m2.attrs.href) }, 0]
+    },
+    // A person mention is ordinary text with this mark over it: the name is the label
+    // and `id` is the people registry's reference. It links nowhere and notifies nobody.
+    mention: {
+      attrs: { id: {} },
+      inclusive: false,
+      excludes: "mention date link",
+      toDOM: (m2) => ["span", { "data-page-mention": m2.attrs.id }, 0]
+    },
+    // A date mention is the calendar date as ordinary ISO text with this mark over it:
+    // `date` is YYYY-MM-DD, and no time, zone, reminder or relative word is stored.
+    date: {
+      attrs: { date: {} },
+      inclusive: false,
+      excludes: "mention date link",
+      toDOM: (m2) => ["time", { datetime: m2.attrs.date, "data-page-date": "" }, 0]
+    },
+    // The floor-1 formats (format-native.js): written as named descriptors,
+    // drawn as the elements the saved article keeps for them.
+    underline: { toDOM: () => ["u", 0] },
+    text_color: {
+      attrs: { color: {} },
+      toDOM: (m2) => ["span", { "data-color": m2.attrs.color }, 0]
+    },
+    highlight: {
+      attrs: { color: {} },
+      toDOM: (m2) => ["mark", { "data-color": m2.attrs.color }, 0]
     }
   }
 });
@@ -54125,23 +54158,44 @@ function entriesOfYjs(fields) {
   return normalizeEntries(entries);
 }
 
+// src/page/format-native.js
+var NATIVE_NAMES = /* @__PURE__ */ new Set(["underline", "text_color", "highlight"]);
+var PALETTE = ["gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red"];
+var COLORS = new Set(PALETTE);
+function nativeAttrs(name, attrs) {
+  const plain4 = attrs !== null && typeof attrs === "object" && !Array.isArray(attrs);
+  if (name === "underline") return plain4 && Object.keys(attrs).length === 0 ? {} : null;
+  if (name === "text_color" || name === "highlight") {
+    const keys = plain4 ? Object.keys(attrs) : [];
+    return keys.length === 1 && keys[0] === "color" && COLORS.has(attrs.color) ? { color: attrs.color } : null;
+  }
+  return null;
+}
+
 // src/page/inline.js
 var CODES = { strong: "b", em: "i", strike: "s", code: "c", link: "a" };
+var NATIVE = /* @__PURE__ */ new Set(["underline", "text_color", "highlight"]);
 var NAMES = Object.fromEntries(Object.entries(CODES).map(([name, code]) => [code, name]));
 function markKey(marks) {
   let key = "";
+  const named = [];
   for (const mark of marks) {
     if (isOpaque(mark)) {
       key += keyOf(mark.attrs.entries);
       continue;
     }
     const code = CODES[mark.type.name];
-    if (!code) throw new TypeError(`page: the mark ${mark.type.name} has no key code`);
+    if (!code) {
+      const native = nativeAttrs(mark.type.name, mark.attrs);
+      if (!native && NATIVE.has(mark.type.name)) throw new TypeError(`page: the mark ${mark.type.name} has no key code`);
+      named.push({ name: mark.type.name, attrs: native ?? mark.attrs });
+      continue;
+    }
     key += code;
     const names = Object.keys(mark.type.attrs);
     if (names.length) key += JSON.stringify(names.map((name) => mark.attrs[name]));
   }
-  return key;
+  return named.length ? key + keyOf(named) : key;
 }
 var parsed = /* @__PURE__ */ new WeakMap();
 function marksOf(schema2, key) {
@@ -54153,15 +54207,23 @@ function marksOf(schema2, key) {
   marks = [];
   const opaque = [];
   for (const desc of descriptors(key)) {
-    const name = desc.code === void 0 ? null : NAMES[desc.code];
+    if (desc.code === void 0) {
+      const native = nativeAttrs(desc.name, desc.attrs);
+      const type = schema2.marks[desc.name];
+      if (native) marks = type.create(native).addToSet(marks);
+      else if (type && !NATIVE.has(desc.name) && Object.keys(desc.attrs ?? {}).every((field) => Object.hasOwn(type.attrs, field))) marks = type.create(desc.attrs).addToSet(marks);
+      else opaque.push(desc);
+      continue;
+    }
+    const name = NAMES[desc.code];
     if (!name) {
       opaque.push(desc);
       continue;
     }
-    const type = schema2.marks[name];
-    if (!type) throw new TypeError(`page: unknown mark code ${desc.code} in ${key}`);
-    const attrs = desc.attrs ? Object.fromEntries(Object.keys(type.attrs).map((field, j3) => [field, desc.attrs[j3]])) : null;
-    marks = type.create(attrs).addToSet(marks);
+    const coded = schema2.marks[name];
+    if (!coded) throw new TypeError(`page: unknown mark code ${desc.code} in ${key}`);
+    const attrs = desc.attrs ? Object.fromEntries(Object.keys(coded.attrs).map((field, j3) => [field, desc.attrs[j3]])) : null;
+    marks = coded.create(attrs).addToSet(marks);
   }
   if (opaque.length) marks = opaqueMark(entriesOf(opaque)).addToSet(marks);
   cache.set(key, marks);
@@ -54404,6 +54466,9 @@ var KNOWN = new Set(CODES2);
 var OPAQUE = "data-clay-page-opaque";
 var VALUE = "data-clay-page-value";
 var MARKS = "data-clay-page-marks";
+var MENTION = "data-page-mention";
+var DATE = "data-page-date";
+var DAY = /^\d{4}-\d{2}-\d{2}$/;
 var ENVELOPE = "1";
 var STRUCTURAL = /* @__PURE__ */ new Set(["id", "t", "parent", "c", "m"]);
 var knownType = (t) => Object.hasOwn(DEFAULTS, t);
@@ -54412,6 +54477,7 @@ var DEFAULTS = {
   heading: { parent: null, level: 2 },
   list_item: { parent: null, kind: "bullet", indent: 0, checked: false, owner: null, due: null },
   callout: { parent: null },
+  quote: { parent: null },
   code_block: { parent: null, lang: "" },
   toggle: { parent: null, open: false },
   divider: { parent: null },
@@ -54423,7 +54489,7 @@ var DEFAULTS = {
   tool: { parent: null, artifact: null, rev: null, state: {} },
   preserved: { parent: null, html: "" }
 };
-var TEXT = /* @__PURE__ */ new Set(["paragraph", "heading", "list_item", "callout", "code_block", "toggle"]);
+var TEXT = /* @__PURE__ */ new Set(["paragraph", "heading", "list_item", "callout", "quote", "code_block", "toggle"]);
 var same = (a, b2) => canon(a) === canon(b2);
 function orderedIds(map2) {
   return Object.keys(map2).sort((x3, y2) => {
@@ -54497,20 +54563,26 @@ function runsOf2(units) {
   return out;
 }
 function marksOfKey(key) {
-  const marks = {};
-  if (!key || key[0] === "@") return { marks, entries: [] };
+  const marks = {}, native = [];
+  if (!key || key[0] === "@") return { marks, native: [], entries: [] };
   const opaque = [];
   for (const desc of descriptors(key)) {
-    if (desc.name === void 0 && KNOWN.has(desc.code)) marks[desc.code] = desc.attrs ?? true;
+    if (desc.name === void 0) {
+      if (KNOWN.has(desc.code)) marks[desc.code] = desc.attrs ?? true;
+      else opaque.push(desc);
+      continue;
+    }
+    const attrs = nativeAttrs(desc.name, desc.attrs);
+    if (attrs) native.push({ name: desc.name, attrs });
     else opaque.push(desc);
   }
-  return { marks, entries: opaque.length ? entriesOf(opaque) : [] };
+  return { marks, native, entries: opaque.length ? entriesOf(opaque) : [] };
 }
 var unitKey = (key, text4, i) => {
   if (!key) return "";
   if (key[0] === "@") return key === BREAK2 && text4[i] === ATOM2 ? key : "";
-  const { marks, entries } = marksOfKey(key);
-  return keyOfMarks(safeMarks(marks), entries);
+  const { marks, native, entries } = marksOfKey(key);
+  return keyOfMarks(safeMarks(marks), native.length ? [...entries, ...entriesOf(native)] : entries);
 };
 var SCRIPT_URL = /^(javascript|vbscript|data):/i;
 var safeMarks = (marks) => {
@@ -54715,6 +54787,7 @@ var revOf = (model) => hash64(canon(model));
 var escText = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\r/g, "&#13;");
 var escAttr = (s) => escText(String(s)).replace(/"/g, "&quot;");
 var attr2 = (name, value) => value === null || value === void 0 ? "" : ` ${name}="${escAttr(value)}"`;
+var NATIVE_TAGS = { underline: "u", text_color: "span", highlight: "mark" };
 function renderInline(c, m2, marksEnvelopes = true) {
   const units = unitsOf2(m2, c.length) || [];
   let html3 = "";
@@ -54732,14 +54805,20 @@ function renderInline(c, m2, marksEnvelopes = true) {
     }
     let j3 = i + 1;
     while (j3 < c.length && (units[j3] || "") === key && !(c[j3] === ATOM2 && key[0] === "@")) j3++;
-    const { marks, entries } = marksOfKey(key);
+    const { marks, native, entries } = marksOfKey(key);
     const want = NEST.filter((code) => marks[code]).map((code) => ({ code, sig: code + JSON.stringify(marks[code]), tag: code === "a" ? "a" : TAGS[code], href: code === "a" ? marks.a[0] : null }));
-    if (entries.length && marksEnvelopes) want.push({ sig: `marks${canon(entries)}`, tag: "span", entries });
+    for (const n of native) want.push({ sig: `native${n.name}${canon(n.attrs)}`, tag: NATIVE_TAGS[n.name], color: n.attrs.color ?? null });
+    const mention = entries.find((entry) => entry.name === "mention");
+    const date = entries.find((entry) => entry.name === "date");
+    const day = date && DAY.test(String(date.attrs.date)) ? String(date.attrs.date) : null;
+    if (entries.length && marksEnvelopes) want.push({ sig: `marks${canon(entries)}`, tag: day ? "time" : "span", entries, mention: mention?.attrs.id, day });
     let keep = 0;
     while (keep < open.length && keep < want.length && open[keep].sig === want[keep].sig) keep++;
     closeTo(keep);
     for (const w3 of want.slice(keep)) {
-      html3 += w3.entries ? `<span${marksEnvelope(w3.entries)}>` : w3.tag === "a" ? `<a${attr2("href", w3.href)}>` : `<${w3.tag}>`;
+      if (w3.entries) html3 += w3.day ? `<time${attr2("datetime", w3.day)}${attr2(DATE, "")}${marksEnvelope(w3.entries)}>` : `<span${marksEnvelope(w3.entries)}${attr2(MENTION, w3.mention)}>`;
+      else if (w3.tag === "a") html3 += `<a${attr2("href", w3.href)}>`;
+      else html3 += w3.color ? `<${w3.tag}${attr2("data-color", w3.color)}>` : `<${w3.tag}>`;
       open.push(w3);
     }
     html3 += escText(c.slice(i, j3));
@@ -54765,6 +54844,8 @@ function renderLeaf(item, clean, tables) {
     }
     case "callout":
       return `<aside${at2} class="page-callout">${inlineOf(item)}</aside>`;
+    case "quote":
+      return `<blockquote${at2}>${inlineOf(item)}</blockquote>`;
     case "code_block":
       return `<pre${at2}${attr2("data-lang", item.lang || null)}><code>${escText(item.c ?? "")}</code></pre>`;
     case "divider":
@@ -54894,6 +54975,13 @@ function renderBlocks(blocks, opts) {
 }
 var DROP_TAGS = /* @__PURE__ */ new Set(["SCRIPT", "STYLE", "TEMPLATE", "NOSCRIPT"]);
 var INLINE_TAGS = /* @__PURE__ */ new Set(["A", "ABBR", "B", "BDI", "BDO", "BR", "CITE", "CODE", "DATA", "DEL", "DFN", "EM", "FONT", "I", "INS", "KBD", "LABEL", "MARK", "Q", "S", "SAMP", "SMALL", "SPAN", "STRIKE", "STRONG", "SUB", "SUP", "TIME", "U", "VAR", "WBR"]);
+function nativeOfEl(tag, el3) {
+  if (tag === "u") return { name: "underline", attrs: {} };
+  if (tag !== "mark" && tag !== "span") return null;
+  if (tag === "span" && !el3.hasAttribute("data-color")) return null;
+  const name = tag === "mark" ? "highlight" : "text_color";
+  return { name, attrs: { color: el3.getAttribute("data-color") } };
+}
 function inlineOfEl(el3, skip = () => false) {
   let c = "";
   const units = [];
@@ -54919,7 +55007,7 @@ function inlineOfEl(el3, skip = () => false) {
         continue;
       }
       const next2 = { ...marks };
-      if (tag === "span" && child.hasAttribute(MARKS)) {
+      if ((tag === "span" || tag === "time") && child.hasAttribute(MARKS)) {
         walk2(child, next2, normalizeEntries([...entries, ...entriesOfEnvelope(child.getAttribute(MARKS))]));
         continue;
       }
@@ -54928,7 +55016,8 @@ function inlineOfEl(el3, skip = () => false) {
       else if (tag === "s" || tag === "del" || tag === "strike") next2.s = true;
       else if (tag === "code") next2.c = true;
       else if (tag === "a" && child.hasAttribute("href")) next2.a = [child.getAttribute("href")];
-      walk2(child, next2, entries);
+      const named = nativeOfEl(tag, child);
+      walk2(child, next2, named ? [...entries, named] : entries);
     }
   };
   walk2(el3, {}, []);
@@ -55004,6 +55093,7 @@ function parseArticle(article) {
     if (tag === "P" && !onlyImage) return push(el3, "paragraph", parent2, { ...omitDefaults("paragraph", P3), ...tf2(el3) });
     if (/^H[1-6]$/.test(tag)) return push(el3, "heading", parent2, { ...omitDefaults("heading", { ...P3, level: +tag[1] }), ...tf2(el3) });
     if (tag === "ASIDE") return push(el3, "callout", parent2, { ...omitDefaults("callout", P3), ...tf2(el3) });
+    if (tag === "BLOCKQUOTE") return push(el3, "quote", parent2, { ...omitDefaults("quote", P3), ...tf2(el3) });
     if (tag === "PRE") {
       const code = el3.querySelector(":scope > code");
       return push(el3, "code_block", parent2, { ...omitDefaults("code_block", { ...P3, lang: el3.getAttribute("data-lang") || "" }), c: (code || el3).textContent });
@@ -59100,7 +59190,7 @@ function marksFromAttributes(a, blockType) {
   const marks = [];
   let unknown = null;
   for (const [n, v3] of best) {
-    if (schema.marks[n]) marks.push(schema.marks[n].create(v3 === true ? null : v3));
+    if (schema.marks[n] && (!NATIVE_NAMES.has(n) || nativeAttrs(n, v3))) marks.push(schema.marks[n].create(v3 === true ? null : v3));
     else (unknown ??= {})[n] = v3;
   }
   if (unknown) {
@@ -71394,7 +71484,7 @@ function merge32(base, local, remote, options = {}) {
 }
 
 // src/page/merge.js
-var TEXT2 = /* @__PURE__ */ new Set(["paragraph", "heading", "list_item", "callout", "code_block", "toggle"]);
+var TEXT2 = /* @__PURE__ */ new Set(["paragraph", "heading", "list_item", "callout", "quote", "code_block", "toggle"]);
 var same2 = (a, b2) => canon(a) === canon(b2);
 function inlineOf2(item, doc) {
   const article = doc.createElement("article");
@@ -72757,11 +72847,12 @@ __export(checkpoint_exports, {
 
 // src/page/document-title.js
 var UNTITLED = "Untitled";
-function documentTitle(items, { custom = false, currentTitle = "" } = {}) {
+function documentTitle(items, { custom = false, currentTitle = "", keepWithoutHeading = false } = {}) {
   if (custom) return currentTitle;
   const first2 = items.find(
     (item) => item.t === "heading" && (item.level ?? 2) === 1 && item.parent == null
   );
+  if (!first2 && keepWithoutHeading && !["", UNTITLED].includes(String(currentTitle).trim())) return currentTitle;
   return String(first2?.c ?? "").replace(/[\s\uFFFC]+/gu, " ").trim() || UNTITLED;
 }
 
@@ -72973,7 +73064,7 @@ function renderCheckpoint(currentHtml, capture, { createDocument, recovery = fal
   edits.push({ start: articleLoc.startTag.startOffset, end: articleLoc.startTag.endOffset, text: articleStart.slice(0, -1) + rev + ">" });
   edits.push({ start: articleLoc.startTag.endOffset, end: articleLoc.endTag.startOffset, text: rendered.html });
   if (!customTitleOf(placement.titleModes)) {
-    const edit = titleEdit(placement, documentTitle(rendered.model));
+    const edit = titleEdit(placement, documentTitle(rendered.model, { currentTitle: titleTextOf(placement.title), keepWithoutHeading: true }));
     if (edit) edits.push(edit);
   }
   return { kind: "ok", html: replace(currentHtml, edits), revision: rendered.rev };
@@ -72986,7 +73077,7 @@ function isCheckpointCurrent(currentHtml, capture) {
   const rendered = renderBlocks(decoded.blocks);
   const articleLoc = placement.article.sourceCodeLocation;
   if (attr3(placement.article, "data-rev") !== rendered.rev || currentHtml.slice(articleLoc.startTag.endOffset, articleLoc.endTag.startOffset) !== rendered.html) return false;
-  if (!customTitleOf(placement.titleModes) && titleTextOf(placement.title) !== documentTitle(rendered.model)) return false;
+  if (!customTitleOf(placement.titleModes) && titleTextOf(placement.title) !== documentTitle(rendered.model, { currentTitle: titleTextOf(placement.title), keepWithoutHeading: true })) return false;
   return capture.stores.every((store) => {
     const node = placement.tags.get(store.name);
     const loc = node.sourceCodeLocation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panphora/clayjs",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "type": "module",
   "description": "clayjs: malleable documents. Save lifecycle for self-saving HTML.",
   "license": "MIT-0",

package/src/core/boot-phase.js

@@ -3,4 +3,5 @@
 // engine's first pass has painted the page, then releases it (loader.js,
 // mountDerivedEngine). Every other page, and any test that imports save.js
 // directly, never sets the hold.
-export const bootPhase = { holdSettle: false };
+// servedHash: the fragment the page was served with, read at this module's evaluation.
+export const bootPhase = { holdSettle: false, servedHash: typeof window === "undefined" ? "" : window.location.hash };

package/src/core/conflict-download.js

@@ -1,5 +1,8 @@
 import { serializeRecoveryClone, captureRecoveryPage } from "./snapshot.js";
 import { rowOf } from "./conflict-presentation.js";
+import { documentName, downloadHtml } from "./download.js";
+
+export { documentName, downloadHtml };
 
 // Download my copy: one file, openable in a browser as the page this tab had, with
 // the replaced edits listed in a JSON block for anyone (or any tool) putting them
@@ -12,14 +15,6 @@ function stamp(d = new Date()) {
   return `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}`;
 }
 
-export function documentName(pathname = location.pathname) {
-  const last = pathname.split("/").filter(Boolean).pop();
-  if (!last) return pathname.endsWith("/") || pathname === "" ? "index" : "page";
-  let name = last;
-  try { name = decodeURIComponent(last); } catch {}
-  return name.replace(/\.(html?|htmlclay)$/i, "") || "page";
-}
-
 function embed(html, data) {
   const json = JSON.stringify(data).replace(/</g, "\\u003c");
   const block = `<script type="application/json" id="clay-lost-edits" clay="no-save">${json}</script>`;
@@ -67,27 +62,6 @@ export function buildRecovery(records, { refused = false } = {}) {
   };
 }
 
-export function downloadHtml({ html, name }) {
-  let url = null;
-  try {
-    url = URL.createObjectURL(new Blob([html], { type: "text/html" }));
-    const a = document.createElement("a");
-    a.setAttribute("clay", "no-save no-watch no-snapshot");
-    a.href = url;
-    a.download = name;
-    a.style.setProperty("display", "none", "important");
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    // Revoked late: Safari cancels a download whose URL goes away too soon.
-    setTimeout(() => URL.revokeObjectURL(url), 40000);
-    return true;
-  } catch (err) {
-    console.error("clayjs: could not build the download", err);
-    if (url) URL.revokeObjectURL(url);
-    return false;
-  }
-}
 
 // The review panel's own copy: the page a reload kept, when there is one, with every
 // stored row it drew listed beside it as JSON. The rows are already plain, so nothing

package/src/core/download.js

@@ -0,0 +1,32 @@
+// Saving a page as a file the browser downloads. Kept apart from the conflict copy
+// builders so an editor that only offers "download this page" loads none of them.
+
+export function documentName(pathname = location.pathname) {
+  const last = pathname.split("/").filter(Boolean).pop();
+  if (!last) return pathname.endsWith("/") || pathname === "" ? "index" : "page";
+  let name = last;
+  try { name = decodeURIComponent(last); } catch {}
+  return name.replace(/\.(html?|htmlclay)$/i, "") || "page";
+}
+
+export function downloadHtml({ html, name }) {
+  let url = null;
+  try {
+    url = URL.createObjectURL(new Blob([html], { type: "text/html" }));
+    const a = document.createElement("a");
+    a.setAttribute("clay", "no-save no-watch no-snapshot");
+    a.href = url;
+    a.download = name;
+    a.style.setProperty("display", "none", "important");
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+    // Revoked late: Safari cancels a download whose URL goes away too soon.
+    setTimeout(() => URL.revokeObjectURL(url), 40000);
+    return true;
+  } catch (err) {
+    console.error("clayjs: could not build the download", err);
+    if (url) URL.revokeObjectURL(url);
+    return false;
+  }
+}

package/src/core/host-meta.js

@@ -149,6 +149,24 @@ export async function hostPageFormat() {
   return meta.extensions.includes("page-format-v1") ? 1 : 0;
 }
 
+/**
+ * Where this host serves the page state of one accepted version, or null.
+ *
+ * Two things have to be true: the host announced `page-recovery-v1` by name, and its
+ * document block named the resource as `pageState.href`. A host that has the resource
+ * but has not announced the extension is still launching it, and a client that inferred
+ * either one from the other would retire journaled work against a pair nobody promised.
+ * Absent, empty or not a string is null, which means no conditional read and no proof
+ * from one: the records stay.
+ *
+ * @returns {Promise<?string>}
+ */
+export async function hostPageStateHref() {
+  const meta = await hostMeta();
+  if (!meta.extensions.includes("page-recovery-v1")) return null;
+  return meta.document?.pageState?.href || null;
+}
+
 /**
  * Whether this host keeps a version history a person can go back to.
  *

package/src/core/save-core.js

@@ -881,11 +881,15 @@ async function sendSave(content, { captureId = null, conversionHeader = null, at
 // One private implementation behind every entry point, so the hooks see the same
 // thing whether the bytes came from a bound capture or a raw caller. `captureId`
 // is null for a raw save: it belongs to no capture and can confirm none.
-function runSave(html, captureId, callback, conversion, capture = null) {
+//
+// `pageFormatFloor` is internal: one save may carry a floor this tab has not
+// noted yet, which is how the format gate's activation writes the marker. It
+// raises these bytes only, never what the tab knows the document at.
+function runSave(html, captureId, callback, conversion, capture = null, pageFormatFloor = 0) {
   // A capture taken before the floor rose cannot drop the marker by omitting it:
   // the bytes that go out carry the floor this tab last saw. At floor 0 this is
   // the string itself, unchanged.
-  html = withPageFormatFloor(html, knownPageFormatFloor());
+  html = withPageFormatFloor(html, Math.max(knownPageFormatFloor(), pageFormatFloor));
   return new Promise((resolve) => {
     const attempts = [];
     // Read once, before the first request: the artifact belongs to the capture that
@@ -994,8 +998,8 @@ export function saveHtml(html, callback = () => {}) {
  * @param {Object} [options.conversion] - {source:'file', base} or {source:'room', base, epoch}
  * @returns {Promise<Object>}
  */
-export function saveCapturedHtml(html, captureId, callback = () => {}, { conversion, capture = null } = {}) {
-  return runSave(html, captureId, callback, conversion, capture);
+export function saveCapturedHtml(html, captureId, callback = () => {}, { conversion, capture = null, pageFormatFloor } = {}) {
+  return runSave(html, captureId, callback, conversion, capture, pageFormatFloor);
 }
 
 /**

package/src/core/save.js

@@ -1083,8 +1083,8 @@ function savePagePermitted(permit, callback = () => {}) {
  * @param {Function} callback - Optional callback for custom handling
  * @returns {Promise<{msg: string, msgType: string}>}
  */
-export function savePageForce(callback = () => {}, { quietConflict = false } = {}) {
-  if (capabilityPending) return capabilityKnown.then(() => savePageForce(callback, { quietConflict }));
+export function savePageForce(callback = () => {}, { quietConflict = false, pageFormatFloor = 0 } = {}) {
+  if (capabilityPending) return capabilityKnown.then(() => savePageForce(callback, { quietConflict, pageFormatFloor }));
   return new Promise((resolve) => {
     if (!isEditMode && !window.clay?.testMode) {
       const skipped = skipped_('Not in edit mode');
@@ -1110,7 +1110,7 @@ export function savePageForce(callback = () => {}, { quietConflict = false } = {
     }
 
     const prepare = window.clay?.source?.ensureForSave?.();
-    if (prepare) return prepare.then(() => resolve(savePageForce(callback, { quietConflict })));
+    if (prepare) return prepare.then(() => resolve(savePageForce(callback, { quietConflict, pageFormatFloor })));
 
     const wasOffline = !navigator.onLine;
     if (wasOffline) {
@@ -1148,7 +1148,7 @@ export function savePageForce(callback = () => {}, { quietConflict = false } = {
       }
       resolve(result);
       drainPendingSave();
-    }, { capture });
+    }, { capture, pageFormatFloor });
   });
 }
 

package/src/core/snapshot.js

@@ -105,6 +105,37 @@ export function attachCaptureArtifact(artifact) {
   if (activeCapture && artifact) activeCapture.artifact = artifact;
 }
 
+// The page state of one save capture: the exact value its page tag carried when its
+// bytes were serialized, copied so the edits that follow the capture can never reach it.
+// Keyed by the capture id every accepted event carries, and dropped when the capture
+// settles, so an accepted save reads the state it was captured from rather than the
+// store's value at the moment the host answered.
+let capturePageStateReader = null;
+const capturePageStates = new Map();
+
+/**
+ * Register the reader that finds a page state in a final save clone.
+ *
+ * A page's own code registers it (page/save-projection.js), so a document without a
+ * page pays one null check per capture and nothing else. Read from the clone rather
+ * than from a store because that tag is what the file receives, after every transform
+ * and every authored save handler has run.
+ */
+export function setCapturePageState(reader) {
+  capturePageStateReader = reader;
+}
+
+/**
+ * The page state pinned to one capture, or null.
+ *
+ * @param {?number} captureId
+ * @returns {?Object}
+ */
+export function capturePageState(captureId) {
+  if (captureId === null || captureId === undefined) return null;
+  return capturePageStates.get(captureId) ?? null;
+}
+
 /** The artifact this capture's renderer attached, or null. */
 export function captureArtifact(result) {
   return result ? captureArtifacts.get(result) || null : null;
@@ -112,7 +143,9 @@ export function captureArtifact(result) {
 
 /** Forget a capture's artifact: it was skipped, refused, or has now settled. */
 export function releaseCaptureArtifact(result) {
-  if (result) captureArtifacts.delete(result);
+  if (!result) return;
+  captureArtifacts.delete(result);
+  capturePageStates.delete(result.captureId);
 }
 
 /**
@@ -263,6 +296,11 @@ function serializeClone(clone) {
  * cost somebody a save.
  */
 function serializeSaveClone(clone, context = null) {
+  if (context && capturePageStateReader) {
+    let state = null;
+    try { state = capturePageStateReader(clone); } catch (_) {}
+    if (state) capturePageStates.set(context.captureId, state);
+  }
   const today = serializeClone(clone);
   if (!saveRenderer) return today;
   const previous = activeCapture;

package/src/lib/autosave-scheduler.js

@@ -16,10 +16,9 @@ export const MAX_COOLDOWN_MS = 30000;
 
 // Adaptive spacing: make the gap after a save at least COST_MULTIPLIER times that
 // save's synchronous cost, so a three-second save earns twelve seconds of quiet
-// rather than spending the quiet window doing the next capture. Off for now, and
-// the multiplier is zero while it is off, which makes the cooldown term exactly
-// MIN_GAP_MS and keeps today's 1,500 / 10,000 ms cadence.
-export const ADAPTIVE_SPACING = false;
+// rather than spending the quiet window doing the next capture. On now that local
+// recovery keeps every keystroke the longer gap could leave unsent.
+export const ADAPTIVE_SPACING = true;
 export const COST_MULTIPLIER = ADAPTIVE_SPACING ? 4 : 0;
 
 // "No such time yet": before the first activity or the first completed save the