@panphora/clayjs 1.23.0 → 1.24.1

package/src/blockeditor/themes/light-4.css

@@ -0,0 +1,299 @@
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;450;500;600&family=JetBrains+Mono:wght@400;500&display=swap");
+
+/* Light 4: warm paper, compact Inter with small 14px section heads, amber selection and frosted faint chrome, from the Gemini Argon bake-off seat. */
+
+@import url("./content.css");
+
+:where(article[data-blockeditor], .blockeditor-shell) {
+  --chart-1: #8A6A2E;
+  --chart-2: #6d4e0b;
+  --chart-3: #6E6A62;
+  --chart-4: #2B2926;
+  --chart-5: #9B968C;
+  --chart-6: #3B3833;
+  --chart-text: #2B2926;
+  --blockeditor-bg: #FAF8F4;
+  --blockeditor-ink: #2B2926;
+  --blockeditor-ink-strong: #1E1D1A;
+  --blockeditor-ink-soft: #6E6A62;
+  --blockeditor-ink-faint: #9B968C;
+  --blockeditor-rule: rgba(31, 30, 27, 0.08);
+  --blockeditor-accent: #8A6A2E;
+  --blockeditor-link: #6d4e0b;
+  --blockeditor-caret: #2B2926;
+  --blockeditor-selection: rgba(196, 152, 74, 0.22);
+
+  --blockeditor-font: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  --blockeditor-font-display: var(--blockeditor-font);
+  --blockeditor-font-heading: var(--blockeditor-font);
+  --blockeditor-font-mono: "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
+  --blockeditor-font-size: 16px;
+  --blockeditor-line-height: 1.68;
+  --blockeditor-measure: 586px;
+  --blockeditor-pad-top: 84px;
+  --blockeditor-h1-size: 27px;
+  --blockeditor-h1-weight: 600;
+  --blockeditor-h1-tracking: -0.022em;
+  --blockeditor-h1-line: 1.24;
+  --blockeditor-h2-size: 14px;
+  --blockeditor-h2-weight: 600;
+  --blockeditor-h3-size: 14px;
+  --blockeditor-h3-weight: 500;
+  --blockeditor-block-gap: 0.32em;
+  --blockeditor-indent: 1.375em;
+
+  --blockeditor-marker: #9B968C;
+  --blockeditor-check-size: 16px;
+  --blockeditor-check-radius: 4px;
+  --blockeditor-check-border: rgba(31, 30, 27, 0.28);
+  --blockeditor-check-fill: #3B3833;
+  --blockeditor-check-ink: #FAF8F4;
+  --blockeditor-done-ink: #6E6A62;
+  --blockeditor-toggle-ink: #6E6A62;
+  --blockeditor-callout-bg: rgba(31, 30, 27, 0.026);
+  --blockeditor-callout-line: rgba(31, 30, 27, 0.07);
+  --blockeditor-code-bg: rgba(31, 30, 27, 0.055);
+  --blockeditor-code-ink: #35322D;
+
+  --blockeditor-chrome-ink-rest: rgba(31, 30, 27, 0.66);
+  --blockeditor-chrome-ink-moved: rgba(31, 30, 27, 0.80);
+  --blockeditor-chrome-bg-rest: rgba(250, 248, 244, 0.78);
+  --blockeditor-chrome-bg-moved: rgba(250, 248, 244, 0.92);
+  --blockeditor-chrome-line-rest: rgba(31, 30, 27, 0.065);
+  --blockeditor-chrome-line-moved: rgba(31, 30, 27, 0.13);
+  --blockeditor-chrome-shadow-rest: 0 1px 2px rgba(31, 30, 27, 0.025);
+  --blockeditor-chrome-shadow-moved: 0 2px 6px rgba(31, 30, 27, 0.05);
+  --blockeditor-chrome-radius: 8px;
+  --blockeditor-plus-size: 24px;
+  --blockeditor-fade: 180ms;
+
+  --blockeditor-pop-bg: #F6F3EC;
+  --blockeditor-pop-ink: #262421;
+  --blockeditor-pop-muted: #78736A;
+  --blockeditor-pop-line: rgba(31, 30, 27, 0.12);
+  --blockeditor-pop-shadow: 0 10px 28px rgba(31, 30, 27, 0.09), 0 2px 6px rgba(31, 30, 27, 0.05);
+  --blockeditor-pop-hover: rgba(31, 30, 27, 0.065);
+  --blockeditor-pop-radius: 10px;
+  --blockeditor-bar-bg: #F6F3EC;
+  --blockeditor-bar-ink: #262421;
+  --blockeditor-scrim: rgba(24, 23, 20, 0.14);
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+article[data-blockeditor] figure[data-type="chart"] { --chart-1: #8A6A2E; --chart-2: #6d4e0b; --chart-3: #6E6A62; --chart-4: #2B2926; --chart-5: #9B968C; --chart-6: #3B3833; --chart-text: #2B2926; max-width: 100%; }
+article[data-blockeditor] figure[data-type="chart"] > svg { display: block; width: 100%; height: auto; color: var(--chart-text); font: 12px Inter, sans-serif; }
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) {
+  letter-spacing: -0.006em;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) > p {
+  margin-block-end: 0.62em;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) > h2,
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) > h3 {
+  margin-block: 1.55em 0.4em;
+  line-height: 1.4;
+  letter-spacing: -0.008em;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) > h1:first-child {
+  margin-block-end: 0.67em;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) :not(pre) > code {
+  font-size: 0.86em;
+  padding: 1.5px 5px;
+  border-radius: 4px;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) .blockeditor-li[data-kind="check"][data-checked="true"] {
+  text-decoration-color: var(--blockeditor-ink-faint);
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) .blockeditor-li[data-kind="check"]::before {
+  border-width: 1.25px;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) .blockeditor-toggle {
+  padding-block: 7px;
+  padding-inline-end: 10px;
+  border: 1px solid rgba(31, 30, 27, 0.07);
+  border-radius: 7px;
+  background: rgba(31, 30, 27, 0.026);
+  font-size: 15px;
+  line-height: 1.45;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) .blockeditor-toggle-button::before {
+  content: "";
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background: var(--blockeditor-toggle-ink);
+  clip-path: polygon(30% 20%, 80% 50%, 30% 80%);
+  transform-origin: 50% 50%;
+  vertical-align: -0.05em;
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) .blockeditor-toggle[data-expanded="true"] > .blockeditor-toggle-button::before {
+  transform: rotate(90deg);
+}
+
+:is(article[data-blockeditor], .blockeditor-shell .blockeditor-editor) aside.blockeditor-callout {
+  border-radius: 7px;
+}
+
+.blockeditor-shell .blockeditor-dock {
+  gap: 2px;
+  padding: 3px 6px;
+}
+
+.blockeditor-shell .blockeditor-dock .blockeditor-tool {
+  height: 24px;
+  padding: 0 6px;
+  border-radius: 5px;
+  font-size: 12px;
+  font-weight: 450;
+  letter-spacing: -0.005em;
+}
+
+.blockeditor-shell .blockeditor-tool svg {
+  width: 14px;
+  height: 14px;
+}
+
+.blockeditor-shell .blockeditor-tool-sep {
+  width: 1px;
+  height: 13px;
+  margin: 0 2px;
+  background: rgba(31, 30, 27, 0.055);
+}
+
+.blockeditor-shell.is-moved .blockeditor-tool-sep {
+  background: rgba(31, 30, 27, 0.10);
+}
+
+.blockeditor-shell .blockeditor-plus {
+  border-radius: 6px;
+  background: rgba(31, 30, 27, 0.022);
+}
+
+.blockeditor-shell.is-moved .blockeditor-plus {
+  background: rgba(31, 30, 27, 0.048);
+}
+
+.blockeditor-shell .blockeditor-plus svg {
+  width: 13px;
+  height: 13px;
+}
+
+.blockeditor-shell .blockeditor-bubble {
+  gap: 2px;
+  padding: 4px 5px;
+  border-radius: 8px;
+}
+
+.blockeditor-shell .blockeditor-bubble .blockeditor-tool {
+  height: 26px;
+  min-width: 26px;
+  padding: 0 6px;
+  border-radius: 5px;
+  font-size: 12.5px;
+  font-weight: 500;
+}
+
+.blockeditor-shell .blockeditor-menu {
+  width: 264px;
+  padding: 6px;
+}
+
+.blockeditor-shell .blockeditor-menu-title {
+  padding: 4px 8px 5px;
+  font-size: 11px;
+  font-weight: 500;
+  letter-spacing: 0.03em;
+  text-transform: uppercase;
+}
+
+.blockeditor-shell .blockeditor-menu-item {
+  gap: 10px;
+  min-height: 33px;
+  padding: 4px 8px;
+  border-radius: 6px;
+  font-size: 13.5px;
+}
+
+.blockeditor-shell .blockeditor-menu-icon {
+  width: 22px;
+  height: 22px;
+  border-radius: 5px;
+  background: rgba(31, 30, 27, 0.045);
+  border: 1px solid rgba(31, 30, 27, 0.075);
+}
+
+.blockeditor-shell .blockeditor-menu-label {
+  font-weight: 450;
+  line-height: 1.25;
+}
+
+.blockeditor-shell .blockeditor-menu-hint {
+  font-family: var(--blockeditor-font-mono);
+  font-size: 11px;
+}
+
+@media (max-width: 560px) {
+  :where(article[data-blockeditor], .blockeditor-shell) {
+    --blockeditor-font-size: 15.5px;
+    --blockeditor-line-height: 1.62;
+    --blockeditor-h1-size: 23px;
+    --blockeditor-pad-top: 68px;
+  }
+
+  .blockeditor-shell .blockeditor-bubble {
+    padding: 0 16px;
+    border-radius: 0;
+    box-shadow: 0 -4px 16px rgba(31, 30, 27, 0.06);
+  }
+
+  .blockeditor-shell .blockeditor-bubble .blockeditor-tool {
+    height: 34px;
+    min-width: 36px;
+    font-size: 13px;
+  }
+
+  .blockeditor-shell .blockeditor-menu {
+    width: auto;
+    padding: 8px 12px 12px;
+    border-radius: 16px 16px 0 0;
+  }
+
+  .blockeditor-shell .blockeditor-menu::before {
+    content: "";
+    display: block;
+    width: 36px;
+    height: 4px;
+    margin: 2px auto 8px;
+    border-radius: 2px;
+    background: var(--blockeditor-pop-line);
+  }
+
+  .blockeditor-shell .blockeditor-menu-item {
+    min-height: 45px;
+    padding: 6px 10px;
+    font-size: 14.5px;
+  }
+
+  .blockeditor-shell .blockeditor-menu-icon {
+    width: 26px;
+    height: 26px;
+  }
+
+  .blockeditor-shell .blockeditor-plus {
+    width: 28px;
+    height: 28px;
+  }
+}

package/src/core/conflict-notice.js

@@ -1,4 +1,5 @@
 import onDomReady from "../lib/dom-ready.js";
+import { hostMeta } from "./host-meta.js";
 import { isEditMode } from "./is-edit-mode.js";
 import { isSaveConflicted } from "./save.js";
 import { storage } from "../lib/doc-storage.js";
@@ -104,6 +105,30 @@ function unresolved() {
   return isSaveConflicted() ? ["save"] : [];
 }
 
+let guard = null;
+let guardAsk = 0;
+
+function startDataGuard() {
+  const ask = ++guardAsk;
+  hostMeta().then((meta) => {
+    const href = meta.extensions.includes("data-guard-v1") ? meta.document?.dataGuard?.href : null;
+    if (ask !== guardAsk || typeof href !== "string" || !href) return null;
+    return import("../sync/data-guard-notice.js").then((module) => {
+      if (ask !== guardAsk) return;
+      guard = module;
+      module.start({ href });
+    });
+  }).catch((error) => {
+    console.error("clayjs: the data-loss notice could not start; it will try again on the next open", error);
+  });
+}
+
+function stopDataGuard() {
+  guardAsk++;
+  guard?.stop();
+  guard = null;
+}
+
 /**
  * The lazy notice as a mode lease.
  *
@@ -124,6 +149,7 @@ export function conflictNoticeParticipant() {
         enable() {
           if (context.initial === true) return;
           if (!notice && !loading) arm();
+          startDataGuard();
         },
         quiesce() {
           const pending = unresolved();
@@ -139,6 +165,7 @@ export function conflictNoticeParticipant() {
           loading = false;
           notice?.stop?.();
           notice = null;
+          stopDataGuard();
         },
       };
     },
@@ -153,6 +180,7 @@ onDomReady(() => {
     arm();
     keptFromEarlier();
   }
+  startDataGuard();
 });
 
 export { conflictNoticeParticipant as modeParticipant };

package/src/core/draft-mode.js

@@ -55,3 +55,9 @@ export function flushDraft() {
 }
 export function setDraftStoreFailed(value) { storeFailed = Boolean(value); }
 export function draftStoreFailed() { return storeFailed; }
+// True while an operation of this tab is neither stored nor in its journal slot.
+let unconfirmed = null;
+export function setDraftUnconfirmed(fn) { unconfirmed = fn; }
+export function draftUnconfirmed() {
+  try { return Boolean(unconfirmed?.()); } catch { return true; }
+}

package/src/core/host-meta.js

@@ -134,7 +134,7 @@ export async function hostSupports(name) {
 }
 
 /**
- * The page format this host enforces: 1 when it announced `page-format-v1`,
+ * The page format this host enforces: 1 when it announced `blockeditor-format-v1`,
  * otherwise 0.
  *
  * A host announces that extension only once its floor enforcement and tolerant
@@ -146,14 +146,14 @@ export async function hostSupports(name) {
  */
 export async function hostPageFormat() {
   const meta = await hostMeta();
-  return meta.extensions.includes("page-format-v1") ? 1 : 0;
+  return meta.extensions.includes("blockeditor-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
+ * Two things have to be true: the host announced `blockeditor-recovery-v1` by name, and its
+ * document block named the resource as `blockeditorState.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
@@ -163,8 +163,8 @@ export async function hostPageFormat() {
  */
 export async function hostPageStateHref() {
   const meta = await hostMeta();
-  if (!meta.extensions.includes("page-recovery-v1")) return null;
-  return meta.document?.pageState?.href || null;
+  if (!meta.extensions.includes("blockeditor-recovery-v1")) return null;
+  return meta.document?.blockeditorState?.href || null;
 }
 
 /**

package/src/core/is-edit-mode.js

@@ -54,10 +54,14 @@ const isViewOnlyDocument =
 const draftCandidate = typeof document !== "undefined" && draftEligible();
 const ownerCookie = Boolean(cookie.get("isAdminOfCurrentResource"));
 
+// A workspace shell's frame: the shell grants edit, the document picks how it opens. Unlike
+// ?editmode=true nobody at the keyboard asked, so viewonly and a stale host still refuse.
+const documentChooses = query.editmode === "document";
+
 const isDraftMode =
   draftCandidate &&
   query.editmode !== "false" &&
-  !(query.editmode === "true" && ownerCookie) &&
+  !((query.editmode === "true" || documentChooses) && ownerCookie) &&
   !isViewOnlyDocument &&
   !servedStaleToken() &&
   forcedEditMode == null &&
@@ -68,7 +72,9 @@ const opensInEdit =
   typeof document !== "undefined" && document.documentElement.getAttribute("opens-in") === "edit";
 
 // May this person edit here? The old rule, read as permission.
-const hostCanEdit = query.editmode
+const hostCanEdit = documentChooses
+  ? !isViewOnlyDocument && !servedStaleToken() && forcedEditMode !== false
+  : query.editmode
   ? query.editmode === "true" || (!isViewOnlyDocument && !servedStaleToken() && (forcedEditMode ?? (hasSaveToken() || ownerCookie)))
   : isViewOnlyDocument || servedStaleToken()
     ? false
@@ -112,7 +118,7 @@ export function learnedHostWritable() {
 // the person made leaves an internal receipt, and that one is kept.
 const startsEditing = receipt
   ? receipt.mode === "edit" || (opensInEdit && !receipt.internal)
-  : query.editmode
+  : query.editmode && !documentChooses
     ? query.editmode === "true"
     : forcedEditMode === true || opensInEdit;
 

package/src/core/mode-support.js

@@ -37,6 +37,9 @@ export const MODULE_SUPPORT = {
   "core/persist.js": "neutral",
   "attrs/add-from.js": "neutral",
   "core/etag.js": "neutral",
+  // Shared site values: one page-lifetime baseline, a header computed from the bytes of
+  // each save and a hook on an accepted save. All three act only when a save happens.
+  "core/site-edits.js": "neutral",
   // The modules that keep a session and hand the controller a lease.
   "core/save.js": "export",
   "core/conflict-notice.js": "export",

package/src/core/mode-switch.js

@@ -114,7 +114,7 @@ const syncLane = (mod) => (mod && (mod.liveSync ?? mod.default ?? mod)) || null;
  * it represents, the queue it is holding, and the calls that apply, give back and retire
  * them.
  *
- * The page-view reader answers first, because a Document's reader owns the article; a
+ * The blockeditor-view reader answers first, because a Document's reader owns the article; a
  * generic-sync document's saved lane answers next. A document with neither has no reader
  * and needs no handoff. A reader that represents no file throws `not-acquired`, which is
  * the reload: nothing has been prepared yet, so the page can still be replaced.
@@ -143,10 +143,10 @@ export async function prepareReader(handle, context = {}) {
 }
 
 /**
- * Start the reader a view holds, from the file the session left: the page-view reader
+ * Start the reader a view holds, from the file the session left: the blockeditor-view reader
  * paints that receipt at once and asks the host for nothing, and the saved lane starts
  * with it, so a second entry has a file without waiting for a frame. Every reader the page
- * ran before the entry starts again, so a page-view reader that follows generic sync's
+ * ran before the entry starts again, so a blockeditor-view reader that follows generic sync's
  * saved lane gets that lane back too. `accepted` null starts the reader as a view boot does.
  *
  * @param {object} handle - the loader's handle
@@ -163,7 +163,7 @@ export function startReader(handle, accepted = null) {
     const start = pageView.restart ?? pageView.start;
     start({ sync, represented: accepted });
     // Every reader the page ran before the entry comes back, not the first one found:
-    // with `plugins=page,sync` the page-view reader follows generic sync's saved lane,
+    // with `plugins=blockeditor,sync` the blockeditor-view reader follows generic sync's saved lane,
     // so that lane is restarted too and the article keeps following other tabs.
     if (!sync) return undefined;
   }

package/src/core/mode-transition.js

@@ -102,7 +102,9 @@ export async function runSaveBarrier({ generation = saveGeneration(), keepalive
         if (err?.state === "conflict") return refusal("conflict");
         if (err?.state === "blocked") return refusal("pending-input", { pending: pendingIds() });
         if (saveFateIsUnknown()) return refusal("save-unknown");
-        if (Date.now() >= deadline) return refusal("timeout");
+        // The flush's own timer is this deadline. Node can fire it a few milliseconds
+        // before the wall clock reaches `deadline`, so the timer's word counts.
+        if (err?.timedOut || Date.now() >= deadline) return refusal("timeout");
         return refusal("save-failed");
       }
 

package/src/core/page-format-wire.js

@@ -1,4 +1,4 @@
 // The page format this runtime writes, and the header every page write declares it
 // in. No imports, so the server bundle and any reader can carry it.
 export const PAGE_FORMAT = 1;
-export const PAGE_FORMAT_HEADER = "X-Clay-Page-Format";
+export const PAGE_FORMAT_HEADER = "X-Clay-Blockeditor-Format";

package/src/core/page-format.js

@@ -1,20 +1,20 @@
 // The document format floor as the save wire carries it: the canonical
-//   <meta name="clay-page-format" content="1">
-// marker (absence is floor 0, a floor only rises) and the `X-Clay-Page-Format`
+//   <meta name="clay-blockeditor-format" content="1">
+// marker (absence is floor 0, a floor only rises) and the `X-Clay-Blockeditor-Format`
 // capability header every page write declares. Core code because every save sends
 // the header; what content needs which floor lives in `page/format-level.js`.
 
 import { PAGE_FORMAT } from "./page-format-wire.js";
 export { PAGE_FORMAT, PAGE_FORMAT_HEADER } from "./page-format-wire.js";
-export const PAGE_FORMAT_META = "clay-page-format";
-export const PAGE_FORMAT_EXTENSION = "page-format-v1";
-export const PAGE_FORMAT_UPGRADE = "page-format-upgrade-required";
+export const PAGE_FORMAT_META = "clay-blockeditor-format";
+export const PAGE_FORMAT_EXTENSION = "blockeditor-format-v1";
+export const PAGE_FORMAT_UPGRADE = "blockeditor-format-upgrade-required";
 
 // Every helper here is a plain function with no top-level work, so a client that
 // imports one of them carries only that one.
 const level = (value) => (Number.isSafeInteger(value) && value > 0 ? value : 0);
 
-const metaTag = (html) => /<meta\b[^>]*\bname\s*=\s*["']?clay-page-format["']?[^>]*>/i.exec(html);
+const metaTag = (html) => /<meta\b[^>]*\bname\s*=\s*["']?clay-blockeditor-format["']?[^>]*>/i.exec(html);
 
 // A capability as a request declares it: a missing or unreadable header is no
 // capability at all, so it can never authorize a write.
@@ -25,7 +25,7 @@ export function formatCapability(value) {
 }
 
 // The floor a document carries. Absent or unreadable metadata is floor 0.
-export function pageFormatFloor(html) {
+export function blockeditorFormatFloor(html) {
   if (typeof html !== "string") return 0;
   const tag = metaTag(html);
   if (!tag) return 0;
@@ -40,7 +40,7 @@ export function withPageFormatFloor(html, floor) {
   const want = level(floor);
   if (typeof html !== "string" || !want) return html;
   const tag = metaTag(html);
-  if (tag && pageFormatFloor(tag[0]) === want) return html;
+  if (tag && blockeditorFormatFloor(tag[0]) === want) return html;
   const marker = `<meta name="${PAGE_FORMAT_META}" content="${want}">`;
   if (tag) return html.slice(0, tag.index) + marker + html.slice(tag.index + tag[0].length);
   const at = /<\/head\s*>/i.exec(html) || /<body\b/i.exec(html);

package/src/core/save-accepted.js

@@ -15,15 +15,14 @@ export function onSaveAccepted(callback) {
   saveAcceptedHooks.push(callback);
 }
 
-export function notifySaveAccepted(html, captureId, artifact = null) {
+export function notifySaveAccepted(html, captureId, artifact = null, siteData = null) {
   for (const hook of saveAcceptedHooks) {
     try {
-      // The artifact is the capture's own private model of these bytes, and it is
-      // offered only when it exists: a raw save and a capture without one keep the
-      // shape they had.
-      const accepted = artifact
-        ? { captureId: captureId ?? null, artifact }
-        : { captureId: captureId ?? null };
+      const accepted = {
+        captureId: captureId ?? null,
+        ...(artifact ? { artifact } : {}),
+        ...(siteData ? { siteData } : {}),
+      };
       hook(html, accepted);
     } catch (err) {
       console.error('clayjs: onSaveAccepted hook failed:', err);