diff --git a/apps/writer/package.json b/apps/writer/package.json
index 9e413aa9..a5968b4d 100644
--- a/apps/writer/package.json
+++ b/apps/writer/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "icons": "node scripts/write-pwa-icons.mjs",
     "build": "pnpm manifest && pnpm manifest:validate && vite build",
+    "build:lab": "VITE_MDBASE_ENV=lab pnpm build",
     "dev": "pnpm manifest && vite --host 127.0.0.1",
     "manifest": "node scripts/write-manifest.mjs",
     "manifest:validate": "mdbase-connect-dev validate-manifest public/.well-known/mdbase-app.json",
@@ -32,13 +33,15 @@
     "@lezer/highlight": "^1.2.3",
     "@lezer/markdown": "^1.4.3",
     "@mdbase-dev/connect": "0.1.0-beta.125",
-    "@mdbase-dev/ui": "0.1.0-beta.125",
+    "@mdbase-dev/connect-protocol": "file:vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz",
+    "@mdbase-dev/sdk": "file:../../vendor/mdbase-dev-sdk-dev-9a033b25.tgz",
+    "@mdbase-dev/ui": "file:../../vendor/mdbase-dev-ui-dev-9553ad66.tgz",
     "@mdbase-writer/core": "workspace:*",
     "@myriaddreamin/typst-ts-renderer": "0.7.0",
     "@myriaddreamin/typst-ts-web-compiler": "0.7.0",
     "@myriaddreamin/typst.ts": "0.7.0",
-    "pandoc-wasm": "1.1.0",
     "@phosphor-icons/react": "^2.1.10",
+    "pandoc-wasm": "1.1.0",
     "react": "^19.2.8",
     "react-dom": "^19.2.8"
   },
@@ -46,9 +49,11 @@
     "@callumalpass/mdbase": "0.3.0-rc.5",
     "@mdbase-dev/connect-dev": "0.1.0-beta.125",
     "@mdbase-dev/connect-testing": "0.1.0-beta.125",
+    "@testing-library/react": "16.3.2",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.1",
+    "jsdom": "29.1.1",
     "playwright": "1.61.1",
     "vite": "^8.3.1",
     "yaml": "^2.9.0"
diff --git a/apps/writer/public/404.html b/apps/writer/public/404.html
new file mode 100644
index 00000000..d28c4ecf
--- /dev/null
+++ b/apps/writer/public/404.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="robots" content="noindex">
+<title>Page not found · mdbase writer</title>
+<link rel="icon" href="/favicon.svg" type="image/svg+xml">
+<style>
+:root {
+  color-scheme: light dark;
+  --canvas: oklch(99.5% 0.002 255);
+  --ink: oklch(21% 0.018 255);
+  --muted: oklch(54% 0.01 255);
+  --line: oklch(92% 0.006 255);
+  --accent: oklch(47% 0.1 238);
+}
+@media (prefers-color-scheme: dark) {
+  :root {
+    --canvas: oklch(17.5% 0.012 255);
+    --ink: oklch(92% 0.008 255);
+    --muted: oklch(62% 0.011 255);
+    --line: oklch(29% 0.012 255);
+    --accent: oklch(73% 0.105 238);
+  }
+}
+html, body { height: 100%; margin: 0; }
+body {
+  display: grid;
+  place-items: center;
+  padding: 16px;
+  box-sizing: border-box;
+  background: var(--canvas);
+  color: var(--ink);
+  font: 14px/1.5 "Atkinson Hyperlegible", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+}
+main { max-width: 32rem; }
+.code { margin: 0 0 0.5rem; color: var(--muted); font: 12px/1.4 "Azeret Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; letter-spacing: 0.04em; }
+h1 { margin: 0 0 0.5rem; font-size: 20px; line-height: 1.25; }
+p { margin: 0 0 1rem; color: var(--muted); }
+a { color: var(--accent); text-underline-offset: 2px; }
+a:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+</style>
+</head>
+<body>
+<main>
+<p class="code">404</p>
+<h1>Page not found</h1>
+<p>There is nothing at this address.</p>
+<a href="/">Open mdbase writer</a>
+</main>
+</body>
+</html>
diff --git a/apps/writer/scripts/browser-export-review-test.mjs b/apps/writer/scripts/browser-export-review-test.mjs
new file mode 100644
index 00000000..2fa86d2b
--- /dev/null
+++ b/apps/writer/scripts/browser-export-review-test.mjs
@@ -0,0 +1,67 @@
+// Loopback-only, real Pandoc conversion and browser downloads; no LAB credentials.
+import assert from "node:assert/strict";
+import {mkdir} from "node:fs/promises";
+import {chromium} from "playwright";
+const base = process.argv[2] ?? "http://127.0.0.1:48332/";
+const origin = new URL(base).origin;
+assert.ok(["127.0.0.1", "localhost", "[::1]"].includes(new URL(base).hostname));
+await mkdir("out", {recursive: true});
+const browser = await chromium.launch({executablePath: process.env.CHROME});
+const context = await browser.newContext({viewport: {width: 1280, height: 900}});
+await context.route("**/*", route => new URL(route.request().url()).origin === origin ? route.continue() : route.abort());
+const page = await context.newPage();
+let downloads = 0;
+page.on("download", () => downloads++);
+try {
+  await page.goto(`${base}?demo`);
+  await page.locator(".manuscript-title").filter({hasText: "Patient Observation"}).click();
+  await page.locator(".cm-content[contenteditable=true]").click();
+  await page.keyboard.press("Control+a");
+  await page.keyboard.insertText("# Unresolved citation test\n\n[test] Word export with [@bugfix3missing, p. 3].\n");
+  await page.getByRole("button", {name: "Export formats", exact: true}).click();
+  await page.getByRole("menuitem", {name: /Word/}).click();
+  const review = page.getByRole("dialog", {name: "Review export problems", exact: true});
+  await review.waitFor({timeout: 120000});
+  assert.match(await review.innerText(), /bugfix3missing/);
+  assert.equal(downloads, 0);
+  await review.getByRole("button", {name: "Cancel and fix problems", exact: true}).click();
+  await review.waitFor({state: "hidden"});
+  assert.equal(downloads, 0);
+  console.log("PASS unresolved citation review and cancellation download nothing");
+
+  await page.getByRole("button", {name: "Export Word", exact: true}).click();
+  await review.waitFor();
+  // Listen BEFORE the click: the browser may emit download before click() resolves.
+  const [download] = await Promise.all([
+    page.waitForEvent("download", {timeout: 20000}),
+    review.getByRole("button", {name: "Export anyway", exact: true}).click(),
+  ]);
+  await download.saveAs("out/unresolved-citation.docx");
+  assert.equal(await download.failure(), null);
+  assert.match(download.suggestedFilename(), /\.docx$/);
+  await review.waitFor({state: "hidden"});
+  await page.waitForTimeout(800);
+  assert.match(await page.getByRole("alert").innerText(), /Exported Word with/);
+  assert.equal(downloads, 1);
+  console.log("PASS consent downloads DOCX and leaves its warning visible after native close");
+
+  await page.evaluate(() => {
+    const original = URL.createObjectURL.bind(URL);
+    URL.createObjectURL = blob => {
+      if (blob.type === "application/vnd.openxmlformats-officedocument.wordprocessingml.document") throw new Error("Controlled download refusal.");
+      return original(blob);
+    };
+  });
+  await page.getByRole("button", {name: "Export Word", exact: true}).click();
+  await review.waitFor();
+  await review.getByRole("button", {name: "Export anyway", exact: true}).click();
+  await review.waitFor({state: "hidden"});
+  await page.waitForTimeout(800);
+  assert.match(await page.getByRole("alert").innerText(), /The file could not be downloaded\. Controlled download refusal\./);
+  assert.equal(downloads, 1);
+  await page.getByRole("button", {name: "Retry export", exact: true}).waitFor();
+  console.log("PASS failed download leaves an actionable error after native close");
+} catch (error) {
+  await page.screenshot({path: "out/export-review-failure.png"});
+  throw error;
+} finally { await context.close(); await browser.close(); }
diff --git a/apps/writer/scripts/browser-find-panel-test.mjs b/apps/writer/scripts/browser-find-panel-test.mjs
new file mode 100644
index 00000000..c90748cb
--- /dev/null
+++ b/apps/writer/scripts/browser-find-panel-test.mjs
@@ -0,0 +1,57 @@
+// Isolated loopback demo and real CodeMirror/CSS; no LAB credentials.
+import assert from "node:assert/strict";
+import {mkdir} from "node:fs/promises";
+import {chromium} from "playwright";
+const base = process.argv[2] ?? "http://127.0.0.1:48332/";
+const origin = new URL(base).origin;
+assert.ok(["127.0.0.1", "localhost", "[::1]"].includes(new URL(base).hostname));
+await mkdir("out", {recursive: true});
+const browser = await chromium.launch({executablePath: process.env.CHROME});
+const context = await browser.newContext({viewport: {width: 1280, height: 900}});
+await context.route("**/*", route => new URL(route.request().url()).origin === origin ? route.continue() : route.abort());
+const page = await context.newPage();
+try {
+  await page.goto(`${base}?demo`);
+  await page.locator(".manuscript-title").filter({hasText: "Patient Observation"}).click();
+  for (const width of [1280, 390, 320]) {
+    await page.setViewportSize({width, height: width === 1280 ? 900 : 844});
+    if (width < 900) await page.getByRole("navigation", {name: "View", exact: true}).getByRole("button", {name: /Write/}).click();
+    const panel = page.locator(".cm-search");
+    if (!await panel.isVisible()) {
+      await page.locator(".cm-content[contenteditable=true]").click();
+      await page.keyboard.press("Control+f");
+    }
+    await panel.waitFor();
+    const geometry = await panel.locator("label").evaluateAll(labels => labels.map(label => {
+      const input = label.querySelector("input");
+      const text = [...label.childNodes].find(node => node.nodeType === Node.TEXT_NODE && node.textContent.trim());
+      const range = document.createRange();
+      range.selectNodeContents(text);
+      const box = input.getBoundingClientRect(), caption = range.getBoundingClientRect(), target = label.getBoundingClientRect();
+      return {text: label.innerText, width: box.width, gap: caption.left - box.right, center: Math.abs((caption.top + caption.bottom - box.top - box.bottom) / 2), targetHeight: target.height};
+    }));
+    assert.equal(geometry.length, 3);
+    for (const option of geometry) {
+      assert.ok(option.width <= 24, `${width}px stretched checkbox: ${JSON.stringify(option)}`);
+      assert.ok(option.gap >= 0 && option.gap <= 12, `${width}px separated label: ${JSON.stringify(option)}`);
+      assert.ok(option.center <= 6, `${width}px separate rows: ${JSON.stringify(option)}`);
+      if (width < 900) assert.ok(option.targetHeight >= 44, `${width}px small touch label: ${JSON.stringify(option)}`);
+    }
+    for (const name of ["match case", "regexp", "by word"]) {
+      const checkbox = panel.getByRole("checkbox", {name, exact: true});
+      const before = await checkbox.isChecked();
+      await panel.locator("label").filter({hasText: name}).click();
+      assert.equal(await checkbox.isChecked(), !before);
+      await checkbox.focus();
+      await page.keyboard.press("Space");
+      assert.equal(await checkbox.isChecked(), before);
+    }
+    const bounds = await panel.boundingBox();
+    assert.ok(bounds.x >= 0 && bounds.x + bounds.width <= width + 1);
+    await page.screenshot({path: `out/find-panel-${width}.png`});
+    console.log(`PASS ${width}px adjacent labels, label/keyboard toggles and panel fits`);
+  }
+} catch (error) {
+  await page.screenshot({path: "out/find-panel-failure.png"});
+  throw error;
+} finally { await context.close(); await browser.close(); }
diff --git a/apps/writer/scripts/browser-install-test.mjs b/apps/writer/scripts/browser-install-test.mjs
new file mode 100644
index 00000000..bfd456d9
--- /dev/null
+++ b/apps/writer/scripts/browser-install-test.mjs
@@ -0,0 +1,51 @@
+// Isolated loopback demo, real Writer CSS and install invitation; no LAB credentials.
+import assert from "node:assert/strict";
+import {chromium} from "playwright";
+const base = process.argv[2] ?? "http://127.0.0.1:48332/";
+const origin = new URL(base).origin;
+assert.ok(["127.0.0.1", "localhost", "[::1]"].includes(new URL(base).hostname));
+const browser = await chromium.launch({executablePath: process.env.CHROME});
+const context = await browser.newContext({viewport: {width: 390, height: 844}});
+await context.route("**/*", route => new URL(route.request().url()).origin === origin ? route.continue() : route.abort());
+const page = await context.newPage();
+try {
+  await page.goto(`${base}?demo`);
+  await page.locator(".manuscript-title").filter({hasText: "Patient Observation"}).click();
+  await page.locator(".pane-tabs").waitFor();
+  // A controlled browser invitation, never an actual installation.
+  await page.evaluate(() => {
+    const event = new Event("beforeinstallprompt", {cancelable: true});
+    Object.assign(event, {prompt: async () => {}, userChoice: Promise.resolve({outcome: "dismissed"})});
+    window.dispatchEvent(event);
+  });
+  await page.locator(".pwa-install").waitFor({timeout: 35000});
+  for (const [width, height] of [[390, 844], [320, 568], [844, 390]]) {
+    await page.setViewportSize({width, height});
+    for (const name of ["Sidebar", "Write", "Preview"]) {
+      await page.getByRole("navigation", {name: "View", exact: true}).getByRole("button", {name: new RegExp(`^${name}`)}).click();
+      const geometry = await page.evaluate(() => {
+        const banner = document.querySelector(".pwa-install");
+        const prompt = banner.getBoundingClientRect();
+        const nav = document.querySelector(".pane-tabs").getBoundingClientRect();
+        const withPrompt = document.documentElement.scrollWidth;
+        banner.hidden = true;
+        const withoutPrompt = document.documentElement.scrollWidth;
+        banner.hidden = false;
+        return {gap: nav.top - prompt.bottom, top: prompt.top, fits: prompt.left >= 0 && prompt.right <= innerWidth, withPrompt, withoutPrompt};
+      });
+      assert.ok(geometry.gap >= 8, `${width}px ${name}: ${JSON.stringify(geometry)}`);
+      assert.ok(geometry.top >= 0); assert.equal(geometry.fits, true);
+      // A zoomed document preview may itself be wider; the invitation must add no overflow.
+      assert.equal(geometry.withPrompt, geometry.withoutPrompt, `${width}px ${name}: ${JSON.stringify(geometry)}`);
+    }
+    console.log(`PASS install invitation leaves all three mode controls reachable at ${width}x${height}`);
+  }
+  await page.setViewportSize({width: 1280, height: 900});
+  assert.equal(await page.locator(".pwa-install").evaluate(e => getComputedStyle(e).bottom), "16px");
+  await page.setViewportSize({width: 390, height: 844});
+  await page.getByRole("button", {name: "Manuscripts", exact: true}).click();
+  assert.equal(await page.locator(".pwa-install").evaluate(e => getComputedStyle(e).bottom), "16px");
+  await page.getByRole("button", {name: "Not now", exact: true}).click();
+  assert.equal(await page.locator(".pwa-install").count(), 0);
+  console.log("PASS desktop/home positioning and dismissal");
+} catch (error) {await page.screenshot({path: "out/install-prompt-failure.png"}); throw error;} finally {await context.close(); await browser.close();}
diff --git a/apps/writer/scripts/browser-reliability-test.mjs b/apps/writer/scripts/browser-reliability-test.mjs
index 1cf6d0d3..a659b556 100644
--- a/apps/writer/scripts/browser-reliability-test.mjs
+++ b/apps/writer/scripts/browser-reliability-test.mjs
@@ -229,6 +229,49 @@ try {
     assert.equal(await body(page, main), before);
   });
 
+  for (const list of [false, true]) await scenario(`${list ? "list" : "paragraph"} Enter stays visible while typing and undo redo retain exact source`, async (page) => {
+    await open(page);
+    await page.evaluate((main) => window.writer.workspace.setBody(main, "# [test] typing\n\n"), main);
+    await page.locator(".cm-content").click(); await page.keyboard.press("ControlOrMeta+End");
+    for (const text of [list ? "- One" : "One", "Two", "Three"]) {
+      await page.keyboard.type(text); await page.keyboard.press("Enter");
+    }
+    if (list) await page.keyboard.press("Enter");
+    await page.keyboard.type("After"); await page.keyboard.press("Enter");
+    const expected = `# [test] typing\n\n${list ? "- One\n- Two\n- Three\n" : "One\nTwo\nThree"}\nAfter\n`;
+    assert.equal(await body(page, main), expected);
+    const lines = await page.locator(".cm-line").allTextContents();
+    assert.ok(lines.includes(list ? "- Three" : "Three"), "the third line must not merge with After");
+    assert.ok(lines.includes("After"), "the new line is visible, not an atomic hidden range");
+    await page.waitForTimeout(600); // Start a separate typing history group.
+    await page.keyboard.type("Undo marker.");
+    assert.equal(await body(page, main), `${expected}Undo marker.`, "typing after Enter keeps the newline");
+    await page.keyboard.press("ControlOrMeta+z"); assert.equal(await body(page, main), expected, "Undo restores the exact prior body");
+    // A real shifted letter reports key="Z". Playwright's lowercase +Shift+z
+    // reports key="z", which CodeMirror correctly handles as the Undo binding.
+    await page.keyboard.press("ControlOrMeta+Shift+Z"); assert.equal(await body(page, main), `${expected}Undo marker.`, "Redo restores the exact typed body");
+    assert.ok((await page.locator(".cm-line").allTextContents()).includes("Undo marker."));
+    if (!await page.evaluate(() => /Mac/.test(navigator.platform))) {
+      await page.keyboard.press("Control+z"); assert.equal(await body(page, main), expected);
+      await page.keyboard.press("Control+y"); assert.equal(await body(page, main), `${expected}Undo marker.`);
+    }
+    // Reload starts with the caret elsewhere. Moving it away must never make
+    // a stored Enter vanish from the displayed lines (the old folding bug).
+    await page.keyboard.press("ControlOrMeta+Home");
+    assert.ok((await page.locator(".cm-line").allTextContents()).includes("After"));
+    assert.ok((await page.locator(".cm-line").allTextContents()).includes(list ? "- Three" : "Three"));
+    assert.equal(await body(page, main), `${expected}Undo marker.`);
+  });
+
+  await scenario("explicit bullet after automatic continuation is not doubled", async (page) => {
+    await open(page);
+    await page.evaluate((path) => window.writer.workspace.setBody(path, "# [test] manual markers\n\n"), main);
+    await page.locator(".cm-content").click(); await page.keyboard.press("ControlOrMeta+End");
+    await page.keyboard.type("- Staghorn corals"); await page.keyboard.press("Enter");
+    await page.keyboard.type("- Brain corals");
+    assert.equal(await body(page, main), "# [test] manual markers\n\n- Staghorn corals\n- Brain corals");
+  });
+
   await scenario("chapter switching retains undo redo selection and scroll", async (page) => {
     await open(page); await painted(page);
     const chapter = "chapters/worms.md";
@@ -258,7 +301,7 @@ try {
     await page.locator(".cm-content").evaluate((el) => el.focus({ preventScroll: true }));
     await page.keyboard.press("ControlOrMeta+z");
     assert.equal(await body(page, chapter), before);
-    await page.keyboard.press("ControlOrMeta+Shift+z");
+    await page.keyboard.press("ControlOrMeta+Shift+Z");
     assert.match(await body(page, chapter), /Retained history marker/);
     await page.keyboard.type(" Cursor kept.");
     assert.equal((await body(page, chapter)).endsWith("Retained history marker. Cursor kept."), true);
diff --git a/apps/writer/scripts/browser-test.mjs b/apps/writer/scripts/browser-test.mjs
index a1fa0b4d..5d3ed0bd 100644
--- a/apps/writer/scripts/browser-test.mjs
+++ b/apps/writer/scripts/browser-test.mjs
@@ -116,7 +116,8 @@ async function typeAtEndOfParagraph(needle, text) {
 await step("home lists the demo manuscripts", async () => {
   await page.goto(`${base}?demo`);
   await page.getByRole("heading", { name: "Manuscripts" }).waitFor();
-  const titles = await page.locator(".manuscript-title").allTextContents();
+  // Recovery drafts share the title class, but are not registered manuscripts.
+  const titles = await page.locator(".manuscript-row[data-path] .manuscript-title").allTextContents();
   assert.deepEqual(titles, ["Patient Observation", "Small Agents, Large Effects: Darwin and the Science of Slow Change"]);
 });
 
@@ -226,8 +227,9 @@ await step("an embedded Reader annotation shows and typesets as its quotation, a
 await step("a toolbar over a selection formats it and finds a source for it", async () => {
   const before = await editorText();
   const bar = page.locator(".cm-selection-bar");
-  // Double-click "Charles" (hard-wrapped lines are joined), then take "Lyell" too.
-  const charles = await page.evaluate(() => {
+  // Scrolling the larger source-line view updates CodeMirror's viewport on a
+  // frame. Wait for its text nodes, then double-click Charles and take Lyell.
+  const charles = await page.waitForFunction(() => {
     const walker = document.createTreeWalker(document.querySelector(".cm-content"), NodeFilter.SHOW_TEXT);
     for (let node = walker.nextNode(); node; node = walker.nextNode()) {
       const at = node.textContent.indexOf("Charles Lyell, who");
@@ -240,8 +242,10 @@ await step("a toolbar over a selection formats it and finds a source for it", as
     }
     return null;
   });
-  assert.ok(charles, "found “Charles Lyell, who” in the editor");
-  await page.mouse.dblclick(charles.x, charles.y);
+  const position = await charles.jsonValue();
+  await charles.dispose();
+  assert.ok(position, "found “Charles Lyell, who” in the editor");
+  await page.mouse.dblclick(position.x, position.y);
   await page.keyboard.press("ControlOrMeta+Shift+ArrowRight");
   await bar.waitFor({ timeout: 5_000 });
   await bar.getByRole("button", { name: "Bold" }).click();
diff --git a/apps/writer/scripts/manifest.test.mjs b/apps/writer/scripts/manifest.test.mjs
index 7437ef64..cd5f9504 100644
--- a/apps/writer/scripts/manifest.test.mjs
+++ b/apps/writer/scripts/manifest.test.mjs
@@ -44,6 +44,13 @@ test("identity is optional: comments are unsigned without it", async () => {
   assert.deepEqual(manifest.requirements.people, { version: 1, optional: ["identity"] });
 });
 
+test("image insertion declares add OPTIONAL without widening startup file access", async () => {
+  const manifest = await buildWriterManifest();
+  assert.deepEqual(manifest.requirements.files, {
+    required: ["list", "read", "replace", "move"], optional: ["add"], scope: { kind: "collection" },
+  });
+});
+
 // Published identities must not change. Add a new version/digest instead of updating this pin.
 // Pack digests are SHA-256 over the canonical (sorted-key) JSON of the whole pack manifest,
 // `upgrade_from` included; the beta.4 and beta.5 pins were confirmed with the mdbase CLI's `packs assess`.
diff --git a/apps/writer/scripts/writer-manifest.mjs b/apps/writer/scripts/writer-manifest.mjs
index 14f71ce9..095710ff 100644
--- a/apps/writer/scripts/writer-manifest.mjs
+++ b/apps/writer/scripts/writer-manifest.mjs
@@ -98,7 +98,11 @@ export async function buildWriterManifest({ origin = "https://writer.mdbase.dev"
         contract_version: 2,
         required: ["collection.read", "records.create", "records.edit"],
       },
-      files: { required: ["list", "read"], scope: { kind: "collection" } },
+      // Add is requested only at image insertion through SDK incremental consent.
+      // Native upload stays disabled until that public capability is available.
+      // Next accounts approve each record capability together with its file
+      // actions, so editing records also declares replace and move.
+      files: { required: ["list", "read", "replace", "move"], optional: ["add"], scope: { kind: "collection" } },
       // The signed-in account, to sign comments with its person record. Optional:
       // without it, comments are unsigned.
       people: { version: 1, optional: ["identity"] },
diff --git a/apps/writer/src/App.tsx b/apps/writer/src/App.tsx
index 4c777da1..23b84dd8 100644
--- a/apps/writer/src/App.tsx
+++ b/apps/writer/src/App.tsx
@@ -1,230 +1,29 @@
-// Top level: pick the backend (Connect, or the development demo), then show
-// the manuscript list or an open manuscript. The open manuscript lives in the
-// URL (`?manuscript=path`) so reloads and links land in the same place.
-import { externalStore } from "@mdbase-dev/connect";
-import { Component, useEffect, useMemo, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
-
-import { ConnectBackend } from "./backend/connect.js";
-import type { WriterBackend } from "./backend/types.js";
-import { createWriterSession, type WriterSession } from "./connect/session.js";
-import { appUrls } from "./apps.js";
+import { lazy, Suspense, useEffect, useMemo, useState } from "react";
 import { AppSwitcher } from "@mdbase-dev/ui/app-switcher";
-import { FeedbackButton, useFeedback } from "@mdbase-dev/ui/feedback";
-import { useWriterFeedbackContext } from "./FeedbackRoot.js";
-import { ConnectGate } from "./ui/ConnectGate.js";
-import { CollectionPicker } from "./ui/CollectionPicker.js";
-import { Home } from "./ui/Home.js";
-import { localNamespace, recentManuscripts, recordOpened } from "./ui/recent.js";
-import { Dialog } from "@mdbase-dev/ui/dialog";
-import { zip } from "./export/zip.js";
+import { FeedbackButton } from "@mdbase-dev/ui/feedback";
 import { loadThemePreference, saveThemePreference, type ThemePreference } from "@mdbase-dev/ui/theme";
-import { ThemeChoice, TopbarSlot } from "./ui/topbar.js";
 import { ThemeSelect } from "@mdbase-dev/ui/theme-select";
-import { ConnectLayout, OpeningScreen } from "@mdbase-dev/ui/screens";
-import { WorkspaceView } from "./ui/WorkspaceView.js";
-import { ManuscriptWorkspace } from "./workspace/workspace.js";
-
-
-const params = new URL(location.href).searchParams;
-const demoRequested = (import.meta.env.DEV || import.meta.env.VITE_WRITER_DEMO === "1") && params.has("demo");
+import { OpeningScreen } from "@mdbase-dev/ui/screens";
+import { appUrls } from "./apps.js";
+import { ThemeChoice, TopbarSlot } from "./ui/topbar.js";
+import { SdkWriterRoot, type SdkWriterRootProps } from "./ui/SdkWriterRoot.js";
 
-function useManuscriptParam(mayLeave: () => Promise<boolean>): [string | null, (path: string | null, force?: boolean) => void] {
-  const [value, setValue] = useState(() => new URL(location.href).searchParams.get("manuscript"));
-  const guard = useRef(mayLeave);
-  guard.current = mayLeave;
-  const index = useRef(Number(history.state?.writerIndex ?? 0));
-  const restoring = useRef(false);
-  const navigating = useRef(false);
-  useEffect(() => {
-    history.replaceState({ ...history.state, writerIndex: index.current }, "");
-    const onPop = () => {
-      const nextIndex = Number(history.state?.writerIndex ?? 0);
-      if (restoring.current) { restoring.current = false; return; }
-      const nextPath = new URL(location.href).searchParams.get("manuscript");
-      void guard.current().then((allowed) => {
-        if (allowed) { index.current = nextIndex; setValue(nextPath); }
-        else {
-          const delta = index.current - nextIndex;
-          if (delta) { restoring.current = true; history.go(delta); }
-        }
-      });
-    };
-    window.addEventListener("popstate", onPop);
-    return () => window.removeEventListener("popstate", onPop);
-  }, []);
-  const set = (path: string | null, force = false) => {
-    if (navigating.current) return;
-    navigating.current = true;
-    void (force ? Promise.resolve(true) : guard.current()).then((allowed) => {
-      if (!allowed) return;
-      const url = new URL(location.href);
-      if (path) url.searchParams.set("manuscript", path);
-      else url.searchParams.delete("manuscript");
-      history.pushState({ ...history.state, writerIndex: ++index.current }, "", url);
-      setValue(path);
-    }).finally(() => { navigating.current = false; });
-  };
-  return [value, set];
+// Native mode never imports the legacy session/collection URL module.
+// Production keeps its existing default; switching/bootstrap belongs to owner GO.
+const LegacyApp = lazy(async () => ({ default: (await import("./LegacyApp.js")).LegacyApp }));
+export function App(props: Partial<SdkWriterRootProps> = {}) {
+  return props.sdk ? <NativeApp {...props} sdk={props.sdk} /> :
+    <Suspense fallback={<OpeningScreen app="writer" title="Opening mdbase writer" />}><LegacyApp /></Suspense>;
 }
-
-export function App() {
-  const { reportError } = useFeedback();
+function NativeApp(props: SdkWriterRootProps) {
   const [theme, setTheme] = useState<ThemePreference>(() => loadThemePreference());
   const [slot, setSlot] = useState<HTMLElement | null>(null);
   useEffect(() => saveThemePreference(theme), [theme]);
   const themeChoice = useMemo(() => ({ theme, setTheme }), [theme]);
-  return (
-    <ThemeChoice.Provider value={themeChoice}>
-      <TopbarSlot.Provider value={slot}>
-        <div className="app">
-          <header className="topbar">
-            <AppSwitcher current="writer" urls={appUrls} />
-            <div className="topbar-slot" ref={setSlot} />
-            <ThemeSelect className="topbar-theme" value={theme} onChange={setTheme} />
-            <FeedbackButton />
-          </header>
-          <ErrorBoundary onError={() => reportError({ code: "unknown_error" })}>{demoRequested ? <DemoRoot /> : <ConnectRoot />}</ErrorBoundary>
-        </div>
-      </TopbarSlot.Provider>
-    </ThemeChoice.Provider>
-  );
-}
-
-class ErrorBoundary extends Component<{ children: ReactNode; onError(): void }, { error: Error | null }> {
-  override state = { error: null as Error | null };
-  static getDerivedStateFromError(error: Error) {
-    return { error };
-  }
-  override componentDidCatch() { this.props.onError(); }
-  override render() {
-    if (!this.state.error) return this.props.children;
-    return (
-      <main className="gate">
-        <h1>Something went wrong</h1>
-        <FeedbackButton topic="problem" />
-        <p>{this.state.error.message}</p>
-        <p className="muted">Your saved text is in your collection. Unsent local drafts are backed up in this browser when storage is available. Download a copy before reloading.</p>
-        <button className="mdbase-button" type="button" onClick={() => {
-          const workspace = (window as unknown as { writer?: { workspace?: ManuscriptWorkspace } }).writer?.workspace;
-          if (workspace) downloadLocalDrafts(workspace);
-        }}>Download local drafts</button>
-        <button className="mdbase-button" type="button" onClick={() => location.reload()}>Reload</button>
-      </main>
-    );
-  }
-}
-
-// Instances with a lifetime (sessions, backends, workspaces) are created in
-// the effect that disposes them, so development double-mounting cannot leave
-// the UI holding a disposed one.
-function useOwned<T>(create: () => T | null, dispose: (value: T) => void, deps: readonly unknown[]): T | null {
-  const [value, setValue] = useState<T | null>(null);
-  useEffect(() => {
-    const created = create();
-    setValue(created);
-    return () => {
-      if (created) dispose(created);
-      setValue(null);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- callers pass the real dependencies
-  }, deps);
-  return value;
-}
-
-function ConnectRoot() {
-  const session = useOwned<WriterSession>(() => {
-    const s = createWriterSession();
-    void s.start({ timeoutMs: 30_000 });
-    return s;
-  }, (s) => s.destroy(), []);
-  if (!session) return null;
-  return <ConnectedRoot session={session} />;
-}
-
-function ConnectedRoot({ session }: { session: WriterSession }) {
-  const store = useMemo(() => externalStore(session), [session]);
-  const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot);
-  const connection = snapshot.status === "ready" ? session.connection() : null;
-  const owned = useOwned(
-    () => (connection ? { connection, backend: new ConnectBackend(connection, () => session.authorize("selected", { presentation: "popup" })) } : null),
-    (value) => value.backend.dispose(),
-    [connection],
-  );
-  const backend = owned?.connection === connection ? owned?.backend : null;
-  if (!backend || snapshot.status !== "ready") {
-    return <ConnectGate session={session} snapshot={snapshot} />;
-  }
-  return <Manuscripts key={snapshot.collectionId} backend={backend} collectionPicker={
-    <CollectionPicker name={backend.collectionName} collectionId={snapshot.collectionId} connections={snapshot.connections} session={session} />
-  } />;
-}
-
-function DemoRoot() {
-  const [backend, setBackend] = useState<WriterBackend | null>(null);
-  const [problem, setProblem] = useState<string | null>(null);
-  useEffect(() => {
-    let live = true;
-    let owned: WriterBackend | undefined;
-    void import("./backend/demo.js").then(async ({ createDemoBackend }) => {
-      // StrictMode may have disposed this effect while the module was loading.
-      if (!live) return;
-      const b = import.meta.env.DEV && params.get("demo") === "large"
-        ? await (await import("./backend/large-demo.js")).createLargeDemoBackend()
-        : await createDemoBackend();
-      if (live) { owned = b; setBackend(b); }
-      else b.dispose();
-    }).catch((error: unknown) => { if (live) setProblem(error instanceof Error ? error.message : String(error)); });
-    return () => {
-      live = false;
-      owned?.dispose();
-    };
-  }, []);
-  if (problem) return <ConnectLayout app="writer" title="The demo could not be loaded" error={problem}><button type="button" className="mdbase-button" onClick={() => location.reload()}>Retry loading</button></ConnectLayout>;
-  if (!backend) return <OpeningScreen app="writer" title="Opening the demo collection" />;
-  return <Manuscripts backend={backend} />;
-}
-
-function downloadLocalDrafts(workspace: ManuscriptWorkspace): void {
-  const bytes = zip(workspace.localDrafts());
-  const url = URL.createObjectURL(new Blob([bytes as BlobPart], { type: "application/zip" }));
-  const anchor = document.createElement("a");
-  anchor.href = url;
-  anchor.download = "writer-local-drafts.zip";
-  anchor.click();
-  setTimeout(() => URL.revokeObjectURL(url), 30_000);
-}
-
-function Manuscripts({ backend, collectionPicker }: { backend: WriterBackend; collectionPicker?: ReactNode }) {
-  const currentWorkspace = useRef<ManuscriptWorkspace | null>(null);
-  const [navigation, setNavigation] = useState<{ message: string; finish(allowed: boolean): void } | null>(null);
-  const [path, setPath] = useManuscriptParam(async () => {
-    const workspace = currentWorkspace.current;
-    if (!workspace || !workspace.hasUnsavedChanges()) return true;
-    const saved = await workspace.retrySave();
-    if (saved.ok) return true;
-    return new Promise<boolean>((finish) => setNavigation({ message: saved.message, finish }));
-  });
-  const workspace = useOwned(() => (path ? new ManuscriptWorkspace(backend, path) : null), (w) => void w.dispose(), [backend, path]);
-  useWriterFeedbackContext(path ? "manuscript" : "manuscripts", backend.collectionName);
-  currentWorkspace.current = workspace;
-  (window as unknown as { writer?: unknown }).writer = { backend, workspace };
-  // When this manuscript was last opened here (read before the opening is recorded, below).
-  const since = useMemo(() => (path ? recentManuscripts(localNamespace(backend)).find((e) => e.path === path)?.at : undefined), [backend, path]);
-  useEffect(() => {
-    if (path) recordOpened(localNamespace(backend), path);
-  }, [backend, path]);
-  if (!path) return <Home backend={backend} onOpen={setPath} collectionPicker={collectionPicker} />;
-  if (!workspace) return null;
-  return <>
-    <WorkspaceView key={workspace.main} workspace={workspace} since={since} onClose={(force) => setPath(null, force)} />
-    <Dialog open={Boolean(navigation)} onClose={() => { navigation?.finish(false); setNavigation(null); }} title="Some changes are not saved">
-      <p className="problem">{navigation?.message}</p>
-      <p>Download a local copy before leaving if saving cannot be completed.</p>
-      <div className="compare-actions">
-        <button type="button" className="mdbase-button" onClick={() => downloadLocalDrafts(workspace)}>Download local drafts</button>
-        <button type="button" className="mdbase-button is-primary" onClick={() => { navigation?.finish(false); setNavigation(null); }}>Keep writing</button>
-        <button type="button" className="mdbase-button" onClick={() => { navigation?.finish(true); setNavigation(null); }}>Leave without saving</button>
-      </div>
-    </Dialog>
-  </>;
+  return <ThemeChoice.Provider value={themeChoice}><TopbarSlot.Provider value={slot}>
+    <div className="app"><header className="topbar">
+      <AppSwitcher current="writer" urls={appUrls} /><div className="topbar-slot" ref={setSlot} />
+      <ThemeSelect className="topbar-theme" value={theme} onChange={setTheme} /><FeedbackButton />
+    </header><SdkWriterRoot {...props} /></div>
+  </TopbarSlot.Provider></ThemeChoice.Provider>;
 }
diff --git a/apps/writer/src/LegacyApp.tsx b/apps/writer/src/LegacyApp.tsx
new file mode 100644
index 00000000..0b370570
--- /dev/null
+++ b/apps/writer/src/LegacyApp.tsx
@@ -0,0 +1,141 @@
+// Top level: pick the backend (Connect, or the development demo), then show
+// the manuscript list or an open manuscript. The open manuscript lives in the
+// URL (`?manuscript=path`) so reloads and links land in the same place.
+import { externalStore } from "@mdbase-dev/connect";
+import { Component, useEffect, useMemo, useState, useSyncExternalStore, type ReactNode } from "react";
+
+import { ConnectBackend } from "./backend/connect.js";
+import type { WriterBackend } from "./backend/types.js";
+import { createWriterSession, type WriterSession } from "./connect/session.js";
+import { appUrls } from "./apps.js";
+import { AppSwitcher } from "@mdbase-dev/ui/app-switcher";
+import { FeedbackButton, useFeedback } from "@mdbase-dev/ui/feedback";
+import { Manuscripts } from "./ui/Manuscripts.js";
+import { downloadLocalDrafts } from "./ui/download-local-drafts.js";
+import { ConnectGate } from "./ui/ConnectGate.js";
+import { CollectionPicker } from "./ui/CollectionPicker.js";
+
+import { loadThemePreference, saveThemePreference, type ThemePreference } from "@mdbase-dev/ui/theme";
+import { ThemeChoice, TopbarSlot } from "./ui/topbar.js";
+import { ThemeSelect } from "@mdbase-dev/ui/theme-select";
+import { ConnectLayout, OpeningScreen } from "@mdbase-dev/ui/screens";
+
+import { ManuscriptWorkspace } from "./workspace/workspace.js";
+
+
+const params = new URL(location.href).searchParams;
+const demoRequested = (import.meta.env.DEV || import.meta.env.VITE_WRITER_DEMO === "1") && params.has("demo");
+
+export function LegacyApp() {
+  const { reportError } = useFeedback();
+  const [theme, setTheme] = useState<ThemePreference>(() => loadThemePreference());
+  const [slot, setSlot] = useState<HTMLElement | null>(null);
+  useEffect(() => saveThemePreference(theme), [theme]);
+  const themeChoice = useMemo(() => ({ theme, setTheme }), [theme]);
+  return (
+    <ThemeChoice.Provider value={themeChoice}>
+      <TopbarSlot.Provider value={slot}>
+        <div className="app">
+          <header className="topbar">
+            <AppSwitcher current="writer" urls={appUrls} />
+            <div className="topbar-slot" ref={setSlot} />
+            <ThemeSelect className="topbar-theme" value={theme} onChange={setTheme} />
+            <FeedbackButton />
+          </header>
+          <ErrorBoundary onError={() => reportError({ code: "unknown_error" })}>{demoRequested ? <DemoRoot /> : <ConnectRoot />}</ErrorBoundary>
+        </div>
+      </TopbarSlot.Provider>
+    </ThemeChoice.Provider>
+  );
+}
+
+class ErrorBoundary extends Component<{ children: ReactNode; onError(): void }, { error: Error | null }> {
+  override state = { error: null as Error | null };
+  static getDerivedStateFromError(error: Error) {
+    return { error };
+  }
+  override componentDidCatch() { this.props.onError(); }
+  override render() {
+    if (!this.state.error) return this.props.children;
+    return (
+      <main className="gate">
+        <h1>Something went wrong</h1>
+        <FeedbackButton topic="problem" />
+        <p>{this.state.error.message}</p>
+        <p className="muted">Your saved text is in your collection. Unsent local drafts are backed up in this browser when storage is available. Download a copy before reloading.</p>
+        <button className="mdbase-button" type="button" onClick={() => {
+          const workspace = (window as unknown as { writer?: { workspace?: ManuscriptWorkspace } }).writer?.workspace;
+          if (workspace) downloadLocalDrafts(workspace);
+        }}>Download local drafts</button>
+        <button className="mdbase-button" type="button" onClick={() => location.reload()}>Reload</button>
+      </main>
+    );
+  }
+}
+
+// Instances with a lifetime (sessions, backends, workspaces) are created in
+// the effect that disposes them, so development double-mounting cannot leave
+// the UI holding a disposed one.
+function useOwned<T>(create: () => T | null, dispose: (value: T) => void, deps: readonly unknown[]): T | null {
+  const [value, setValue] = useState<{keys: readonly unknown[]; resource: T | null} | null>(null);
+  useEffect(() => {
+    const created = create(); const keys = [...deps]; let active = true;
+    queueMicrotask(() => {if (active) setValue({keys, resource: created});});
+    return () => {active = false; if (created) dispose(created);};
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- callers pass the real dependencies
+  }, deps);
+  return value?.keys.length === deps.length && deps.every((dependency, index) => Object.is(dependency, value.keys[index])) ? value.resource : null;
+}
+
+function ConnectRoot() {
+  const session = useOwned<WriterSession>(() => {
+    const s = createWriterSession();
+    void s.start({ timeoutMs: 30_000 });
+    return s;
+  }, (s) => s.destroy(), []);
+  if (!session) return null;
+  return <ConnectedRoot session={session} />;
+}
+
+function ConnectedRoot({ session }: { session: WriterSession }) {
+  const store = useMemo(() => externalStore(session), [session]);
+  const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot);
+  const connection = snapshot.status === "ready" ? session.connection() : null;
+  const owned = useOwned(
+    () => (connection ? { connection, backend: new ConnectBackend(connection, () => session.authorize("selected", { presentation: "popup" })) } : null),
+    (value) => value.backend.dispose(),
+    [connection],
+  );
+  const backend = owned?.connection === connection ? owned?.backend : null;
+  if (!backend || snapshot.status !== "ready") {
+    return <ConnectGate session={session} snapshot={snapshot} />;
+  }
+  return <Manuscripts key={snapshot.collectionId} backend={backend} collectionPicker={
+    <CollectionPicker name={backend.collectionName} collectionId={snapshot.collectionId} connections={snapshot.connections} session={session} />
+  } />;
+}
+
+function DemoRoot() {
+  const [backend, setBackend] = useState<WriterBackend | null>(null);
+  const [problem, setProblem] = useState<string | null>(null);
+  useEffect(() => {
+    let live = true;
+    let owned: WriterBackend | undefined;
+    void import("./backend/demo.js").then(async ({ createDemoBackend }) => {
+      // StrictMode may have disposed this effect while the module was loading.
+      if (!live) return;
+      const b = import.meta.env.DEV && params.get("demo") === "large"
+        ? await (await import("./backend/large-demo.js")).createLargeDemoBackend()
+        : await createDemoBackend();
+      if (live) { owned = b; setBackend(b); }
+      else b.dispose();
+    }).catch((error: unknown) => { if (live) setProblem(error instanceof Error ? error.message : String(error)); });
+    return () => {
+      live = false;
+      owned?.dispose();
+    };
+  }, []);
+  if (problem) return <ConnectLayout app="writer" title="The demo could not be loaded" error={problem}><button type="button" className="mdbase-button" onClick={() => location.reload()}>Retry loading</button></ConnectLayout>;
+  if (!backend) return <OpeningScreen app="writer" title="Opening the demo collection" />;
+  return <Manuscripts backend={backend} />;
+}
diff --git a/apps/writer/src/backend/bodies.ts b/apps/writer/src/backend/bodies.ts
index eb360ac6..24d7a9fc 100644
--- a/apps/writer/src/backend/bodies.ts
+++ b/apps/writer/src/backend/bodies.ts
@@ -1,12 +1,13 @@
 // Lazy hydration on top of classified metadata. No discovery or watch ownership.
-import type { JsonObject, QueryRecord } from "@mdbase-dev/connect";
+import type { JsonObject } from "@mdbase-dev/connect";
 import { commentFromRecord, type CommentRecord } from "@mdbase-writer/core/comments";
 import { CollectionCache } from "./cache.js";
 import type { CollectionStore, StoreDelta } from "./collection.js";
 import { toContract } from "./comments.js";
 import { ok, sourceAnnotation, type Result, type SourceAnnotation } from "./types.js";
 
-type ReadSelected = (metadata: ReadonlyMap<string, { readonly type: string }>) => Promise<Result<QueryRecord<JsonObject>[]>>;
+export interface WriterBodyRow { readonly path: string; readonly types: readonly string[]; readonly frontmatter?: JsonObject; readonly contractFields?: JsonObject; readonly body?: string }
+type ReadSelected = (metadata: ReadonlyMap<string, { readonly type: string }>) => Promise<Result<WriterBodyRow[]>>;
 export class CollectionBodies {
   private readonly comments = new Map<string, CommentRecord>();
   private readonly sources = new Map<string, CollectionCache<SourceAnnotation[]>>();
@@ -28,7 +29,7 @@ export class CollectionBodies {
       if (!loaded.ok) return loaded;
       return ok(loaded.value.flatMap((row) => {
         const entry = selected.get(row.path);
-        const a = entry && sourceAnnotation(row.path, toContract(row.frontmatter ?? {}, entry.fields), row.body ?? "");
+        const a = entry && sourceAnnotation(row.path, row.contractFields ?? toContract(row.frontmatter ?? {}, entry.fields), row.body ?? "");
         return a ? [a] : [];
       }));
     });
@@ -43,7 +44,7 @@ export class CollectionBodies {
       const entry = wanted.get(row.path);
       // Reset or a path update during a read must not cache an old body.
       if (!entry || entry !== this.store().comments.get(row.path)) continue;
-      const fields = Object.keys(entry.fields).length ? toContract(row.frontmatter ?? {}, entry.fields) : row.frontmatter ?? {};
+      const fields = row.contractFields ?? (Object.keys(entry.fields).length ? toContract(row.frontmatter ?? {}, entry.fields) : row.frontmatter ?? {});
       const comment = commentFromRecord(row.path, fields, row.body ?? "");
       if (comment) this.comments.set(row.path, comment);
     }
diff --git a/apps/writer/src/backend/collection.ts b/apps/writer/src/backend/collection.ts
index 46d81215..a236a6fd 100644
--- a/apps/writer/src/backend/collection.ts
+++ b/apps/writer/src/backend/collection.ts
@@ -4,7 +4,7 @@ import { annotationSourceLink } from "@mdbase-writer/core/annotations";
 import { commentFromRecord, linkPath, type CommentRecord } from "@mdbase-writer/core/comments";
 import { PathIndex, pathIndex, resolveLinkTarget } from "@mdbase-writer/core/records";
 import { personKey, toContract } from "./comments.js";
-import { fail, libraryEntry, ok, type CollectionDelta, type CollectionIndex, type LibraryEntry, type ManuscriptSummary } from "./types.js";
+import { fail, libraryEntry, ok, type CollectionDelta, type CollectionIndex, type LibraryEntry, type ManuscriptSummary, type UnavailableType } from "./types.js";
 
 export const manuscriptContract = { id: "dev.mdbase.writer.manuscript", version: "1.0.0-beta.2" } as const;
 export const sourceContract = { id: "dev.mdbase.reader.source", version: "1.0.0-beta.1" } as const;
@@ -19,6 +19,7 @@ const domains = {
   person: { contract: { id: "mdbase.person", version: "2.0.0" }, starter: "person", note: false },
 } as const;
 export type Domain = keyof typeof domains;
+export function domainContract(domain: Domain) { return domains[domain].contract; }
 /** The demo's starter definitions, derived from the same domain table. */
 export function starterSchema(): CollectionSchema {
   return new CollectionSchema({
@@ -29,6 +30,22 @@ export function starterSchema(): CollectionSchema {
     })),
   });
 }
+/** Domain metadata, not a legacy connection or fabricated legacy catalog. */
+export interface WriterSchemaDescription {
+  readonly types: readonly { readonly name: string }[];
+  readonly contracts: readonly {
+    readonly id: string;
+    readonly implementations: readonly { readonly typeName: string; readonly fields: Readonly<Record<string, string>> }[];
+  }[];
+  readonly configuration?: JsonObject;
+  /** Types left out of `contracts` because their definition has an error. */
+  readonly unavailableTypes?: readonly (UnavailableType & { readonly domain: Domain })[];
+}
+const DOMAIN_NAMES: Record<Domain, string> = { manuscript: "Manuscripts", source: "Sources", annotation: "Annotations", comment: "Comments", person: "People" };
+/** Copy for a Writer type whose definition has an error: only that type is affected. */
+export function unavailableTypeMessage(name: string, domain: Domain): string {
+  return `Writer can't use the "${name}" type because its definition has an error. ${DOMAIN_NAMES[domain]} that use it are unavailable until the type is fixed; everything else still works.`;
+}
 export interface Binding { readonly name: string; readonly fields: Readonly<Record<string, string>>; readonly typeKey: string }
 interface RoleBinding extends Binding { readonly active: boolean }
 export interface CollectionRow {
@@ -36,6 +53,8 @@ export interface CollectionRow {
   readonly types: readonly string[];
   readonly frontmatter?: JsonObject;
   readonly effectiveFrontmatter?: JsonObject;
+  /** Logical fields projected by the public SDK/Core, not a local field map. */
+  readonly contractFields?: Partial<Record<Domain, JsonObject>>;
   /** Narrow query values are partial metadata, never a full record/frontmatter. */
   readonly values?: JsonObject;
   readonly file?: { readonly mtime?: string };
@@ -48,6 +67,7 @@ export interface StoreDelta extends CollectionDelta {
 }
 interface Classified {
   note: boolean;
+  untyped: boolean;
   effective: boolean;
   source?: LibraryEntry;
   manuscript?: ManuscriptSummary;
@@ -56,19 +76,19 @@ interface Classified {
   person?: string;
 }
 const equal = (a: unknown, b: unknown) => a === b || (a !== undefined && b !== undefined && JSON.stringify(a) === JSON.stringify(b));
-const fieldsOf = (fm: JsonObject, binding: Binding) => Object.keys(binding.fields).length ? toContract(fm, binding.fields) : fm;
+const fieldsOf = (fm: JsonObject, binding: Binding, projected?: JsonObject) => projected ?? (Object.keys(binding.fields).length ? toContract(fm, binding.fields) : fm);
 
 /** One binding table serves discovery, writes, sessions and incremental classification. */
 export class CollectionSchema {
   private readonly byType = new Map<string, Map<Domain, RoleBinding>>();
   private readonly roleCache = new Map<string, ReadonlyMap<Domain, RoleBinding>>();
-  constructor(readonly description: Pick<CollectionDescription, "types" | "contracts" | "configuration">) {
+  constructor(readonly description: WriterSchemaDescription | Pick<CollectionDescription, "types" | "contracts" | "configuration">, private readonly starterFallback = true) {
     for (const domain of Object.keys(domains) as Domain[]) {
       const rule = domains[domain];
       const implementations = description.contracts.find((c) => c.id === rule.contract.id)?.implementations ?? [];
       const bindings = implementations.map((i) => ({ name: i.typeName, fields: i.fields, typeKey: this.typeKey }));
       // Recognise starter records even when their type isn't installed/described yet.
-      if (!bindings.some((b) => b.name === rule.starter)) bindings.push({ name: rule.starter, fields: {}, typeKey: this.typeKey });
+      if (this.starterFallback && !bindings.some((b) => b.name === rule.starter)) bindings.push({ name: rule.starter, fields: {}, typeKey: this.typeKey });
       const loaded = this.bindings(domain, domain === "manuscript");
       const active = new Set(loaded.ok ? loaded.value.map((b) => b.name) : []);
       for (const binding of bindings) {
@@ -89,12 +109,27 @@ export class CollectionSchema {
     const contract = this.description.contracts.find((c) => c.id === rule.contract.id);
     const implementations = contract?.implementations ?? [];
     if (implementations.length) return ok(implementations.map((i) => ({ name: i.typeName, fields: i.fields, typeKey: this.typeKey })));
+    const unavailable = this.unavailableMessage(domain);
+    if (unavailable) return fail<Binding[]>(unavailable);
     if (required || (contract && domain === "annotation")) return fail<Binding[]>(`This collection has no type for ${domain}s. Set it up again from mdbase connect.`);
-    if (contract) return ok<Binding[]>([]);
+    if (contract || !this.starterFallback) return ok<Binding[]>([]);
     if (domain === "comment" || domain === "person") return ok<Binding[]>([]);
     const starter = this.description.types.some((t) => t.name === rule.starter);
     return ok(starter ? [{ name: rule.starter, fields: {}, typeKey: this.typeKey }] : []);
   }
+  get unavailableTypes(): readonly UnavailableType[] {
+    return ("unavailableTypes" in this.description ? this.description.unavailableTypes ?? [] : []).map(({ name, message }) => ({ name, message }));
+  }
+  /** Set only when every type for the domain is unavailable. */
+  unavailableMessage(domain: Domain): string | undefined {
+    const listed = "unavailableTypes" in this.description ? this.description.unavailableTypes ?? [] : [];
+    const contract = this.description.contracts.find((c) => c.id === domains[domain].contract.id);
+    if (contract?.implementations.length) return undefined;
+    return listed.find((t) => t.domain === domain)?.message;
+  }
+  isUnavailableType(type: string): boolean {
+    return "unavailableTypes" in this.description && !!this.description.unavailableTypes?.some((t) => t.name === type);
+  }
   roles(types: readonly string[]): ReadonlyMap<Domain, RoleBinding> {
     const key = types.join("\0"), cached = this.roleCache.get(key);
     if (cached) return cached;
@@ -129,7 +164,7 @@ export class CollectionSchema {
     return binding?.fields ?? {};
   }
   get setupStatus() {
-    const configured = (domain: Domain) => this.description.contracts.some((c) => c.id === domains[domain].contract.id) || this.description.types.some((t) => t.name === domains[domain].starter);
+    const configured = (domain: Domain) => this.description.contracts.some((c) => c.id === domains[domain].contract.id) || (this.starterFallback && this.description.types.some((t) => t.name === domains[domain].starter));
     const comments = this.bindings("comment");
     return { sources: configured("source"), annotations: configured("annotation"), comments: comments.ok && comments.value.length > 0 };
   }
@@ -153,7 +188,8 @@ export class CollectionStore {
   constructor(public schema: CollectionSchema) {}
 
   get index(): CollectionIndex {
-    return this.indexValue ??= { recordPaths: [...this.records.keys()], notePaths: [...this.records].filter(([, r]) => r.note).map(([p]) => p), filePaths: [...this.binaries] };
+    return this.indexValue ??= { recordPaths: [...this.records.keys()], notePaths: [...this.records].filter(([, r]) => r.note).map(([p]) => p),
+      untypedPaths: [...this.records].filter(([, r]) => r.untyped).map(([p]) => p), unavailableTypes: this.schema.unavailableTypes, filePaths: [...this.binaries] };
   }
   get library(): LibraryEntry[] { return this.libraryValue ??= [...this.sources.values()].sort((a, b) => a.path.localeCompare(b.path)); }
   get manuscripts(): ManuscriptSummary[] { return this.manuscriptValue ??= [...this.papers.values()].sort((a, b) => a.title.localeCompare(b.title) || a.path.localeCompare(b.path)); }
@@ -165,20 +201,21 @@ export class CollectionStore {
     const effective = row.effectiveFrontmatter ?? fm;
     // Independent discovery queries can finish in any order. Persisted index rows
     // must not overwrite defaults already learned from effective domain queries.
-    const retainEffective = discovery && row.effectiveFrontmatter === undefined && previous?.effective;
-    const next: Classified = { note: /\.md$/i.test(row.path), effective: row.effectiveFrontmatter !== undefined || !!retainEffective };
+    const retainEffective = discovery && row.effectiveFrontmatter === undefined && row.contractFields === undefined && previous?.effective;
+    // A record of an unusable Writer type is not someone's free writing.
+    const next: Classified = { note: /\.md$/i.test(row.path) && !row.types.some((type) => this.schema.isUnavailableType(type)), untyped: row.types.length === 0, effective: row.effectiveFrontmatter !== undefined || row.contractFields !== undefined || !!retainEffective };
     for (const [domain, binding] of this.schema.roles(row.types)) {
       if (!domains[domain].note) next.note = false;
       if (!binding.active) continue;
       switch (domain) {
         case "source": {
           const written = row.values?.["file_mtime"] ?? row.file?.mtime;
-          const source = retainEffective && previous.source ? previous.source : libraryEntry(row.path, fieldsOf(effective, binding), typeof written === "string" ? written : undefined);
+          const source = retainEffective && previous.source ? previous.source : libraryEntry(row.path, fieldsOf(effective, binding, row.contractFields?.source), typeof written === "string" ? written : undefined);
           if (source) next.source = equal(previous?.source, source) ? previous!.source! : source;
           break;
         }
         case "manuscript": {
-          const fields = fieldsOf(effective, binding);
+          const fields = fieldsOf(effective, binding, row.contractFields?.manuscript);
           const modified = row.values?.["file_mtime"] ?? row.file?.mtime;
           const manuscript = retainEffective && previous.manuscript ? previous.manuscript : {
             path: row.path, title: typeof fields["title"] === "string" ? fields["title"] : row.path,
@@ -190,12 +227,12 @@ export class CollectionStore {
           break;
         }
         case "annotation": {
-          const target = fm[binding.fields["source"] ?? "source"];
+          const target = fieldsOf(fm, binding, row.contractFields?.annotation)["source"];
           next.annotation = { path: row.path, type: binding.name, fields: binding.fields, source: typeof target === "string" ? annotationSourceLink(target) ?? "" : "" };
           break;
         }
         case "comment": {
-          const comment = commentFromRecord(row.path, fieldsOf(fm, binding), "");
+          const comment = commentFromRecord(row.path, fieldsOf(fm, binding, row.contractFields?.comment), "");
           if (comment) {
             const metadata = { type: binding.name, fields: binding.fields,
               comment: { document: comment.document, ...(comment.inReplyTo ? { inReplyTo: comment.inReplyTo } : {}) } };
@@ -204,7 +241,7 @@ export class CollectionStore {
           break;
         }
         case "person": {
-          const name = fieldsOf(effective, binding)["name"];
+          const name = fieldsOf(effective, binding, row.contractFields?.person)["name"];
           if (typeof name === "string") next.person = name;
           break;
         }
@@ -240,7 +277,7 @@ export class CollectionStore {
     for (const [path, row] of changes) {
       const old = this.records.get(path);
       const next = row && this.classify(row, old, discovery);
-      index ||= !!old !== !!next || old?.note !== next?.note;
+      index ||= !!old !== !!next || old?.note !== next?.note || old?.untyped !== next?.untyped;
       if (old?.source || next?.source) library ||= !equal(old?.source, next?.source);
       if (old?.manuscript || next?.manuscript) manuscripts ||= !equal(old?.manuscript, next?.manuscript);
       membership ||= !!old?.source !== !!next?.source;
diff --git a/apps/writer/src/backend/comments.ts b/apps/writer/src/backend/comments.ts
index 4a21c2aa..e4f3e7b7 100644
--- a/apps/writer/src/backend/comments.ts
+++ b/apps/writer/src/backend/comments.ts
@@ -12,6 +12,8 @@ export interface NewComment {
   readonly thread?: CommentRecord;
   /** A suggested edit: the text to put in place of the target's quote. */
   readonly replacement?: string;
+  /** A stable name for this one comment, reused by its retries so it lands once. */
+  readonly intent?: string;
 }
 
 export type CommentChange =
diff --git a/apps/writer/src/backend/native-schema.ts b/apps/writer/src/backend/native-schema.ts
new file mode 100644
index 00000000..3635eacc
--- /dev/null
+++ b/apps/writer/src/backend/native-schema.ts
@@ -0,0 +1,88 @@
+import { toPlain, type wire } from "@mdbase-dev/sdk";
+import type { JsonObject } from "@mdbase-dev/connect";
+import manifest from "../generated/mdbase-app.json";
+import { annotationContract, CollectionSchema, domainContract, unavailableTypeMessage, type Domain, type WriterSchemaDescription } from "./collection.js";
+import type { UnavailableType } from "./types.js";
+
+const DOMAINS: readonly Domain[] = ["manuscript", "source", "annotation", "comment", "person"];
+const domainOf = (id: string): Domain | undefined => DOMAINS.find(domain => domainContract(domain).id === id);
+/** The definition path an issue is attached to, when it names one. */
+function issuePath(details: unknown): string | null {
+  const path = details instanceof Map ? (details as Map<unknown, unknown>).get("path") : null;
+  return typeof path === "string" && path ? path : null;
+}
+
+export type NativeJson = null | boolean | number | string | NativeJson[] | { [key: string]: NativeJson };
+/** Application JSON display values only. Native witnesses stay in SDK RecordViews. */
+export function nativeJson(value: unknown): NativeJson {
+  if (value === null || typeof value === "string" || typeof value === "boolean") return value;
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (value instanceof Date) return value.toISOString();
+  if (Array.isArray(value)) return value.map(nativeJson);
+  if (typeof value === "object" && value !== null && (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) {
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, nativeJson(item)]));
+  }
+  throw new Error("Writer requires JSON-compatible native fields.");
+}
+export function nativeWriteFields(fields: JsonObject): { [key: string]: NativeJson } {
+  return Object.fromEntries(Object.entries(fields).map(([key, value]) => [key, nativeJson(value)]));
+}
+export function nativeObject(value: wire.Value): JsonObject {
+  const json = nativeJson(toPlain(value));
+  if (json === null || typeof json !== "object" || Array.isArray(json)) throw new Error("Writer requires a native field map.");
+  return json;
+}
+
+/** The wire reports contract digests as `sha256:<hex>` (as the manifest does).
+ * Compare in that canonical form so neither side's spelling can mismatch. */
+export function sameDigest(a: string | undefined, b: string | undefined): boolean {
+  const canonical = (digest: string) => digest.startsWith("sha256:") ? digest : `sha256:${digest}`;
+  return a !== undefined && b !== undefined && canonical(a) === canonical(b);
+}
+
+export function manifestContractDigest(id: string, version: string): string | undefined {
+  return manifest.requirements.contracts.find(contract => contract.id === id && contract.version === version)?.digest;
+}
+
+/** Read the original native catalog. Never invent legacy schema/type metadata or
+ * recognise a starter name without its actual native contract implementation.
+ * The SDK remains responsible for root readiness and configuration/provisioning.
+ */
+export function nativeWriterSchema(catalog: wire.DescribeResult): CollectionSchema {
+  // Aggregate readiness belongs to the SDK. An unrelated definition diagnostic
+  // must not hide usable Writer records; exact domain bindings remain checked.
+  const required = manifest.requirements.contracts;
+  for (const expected of required) {
+    const matching = catalog.contracts.filter(contract => contract.id === expected.id && contract.version === expected.version);
+    const actual = matching[0];
+    if (matching.length !== 1 || !actual || actual.contractType !== "record" || !sameDigest(actual.digest, expected.digest)) {
+      throw new Error("This collection does not have Writer's exact native contracts.");
+    }
+  }
+  const supported = new Map([...required.map(contract => [contract.id, contract.version] as const),
+    [annotationContract.id, annotationContract.version], ["mdbase.person", "2.0.0"]]);
+  // An error-level issue on one of Writer's own type definitions makes only
+  // that type unavailable. Issues elsewhere never hide Writer's records.
+  const broken = new Set(catalog.issues.filter(issue => issue.severity === "error").map(issue => issuePath(issue.details)).filter(path => path !== null));
+  const unavailableTypes: (UnavailableType & {domain: Domain})[] = [];
+  const contracts: WriterSchemaDescription["contracts"] = catalog.contracts
+    .filter(contract => supported.get(contract.id) === contract.version && contract.contractType === "record")
+    .map(contract => ({id: contract.id, implementations: contract.implementedBy.flatMap(name => {
+      const type = catalog.types.find(candidate => candidate.name === name);
+      const bindings = type?.implements.filter(binding => binding.contract === contract.id && binding.version === contract.version) ?? [];
+      const binding = bindings[0];
+      if (!type || bindings.length !== 1 || !binding) throw new Error("Writer's native contract binding is incomplete.");
+      if (broken.has(type.path)) {
+        const domain = domainOf(contract.id);
+        if (domain && !unavailableTypes.some(entry => entry.name === type.name)) unavailableTypes.push({name: type.name, domain, message: unavailableTypeMessage(type.name, domain)});
+        return [];
+      }
+      return [{typeName: type.name, fields: Object.fromEntries(binding.fields)}];
+    })}));
+  const schema = new CollectionSchema({types: catalog.types.map(type => ({name: type.name})), contracts,
+    // A collection without settings reports null: that is no settings, not an error.
+    configuration: {settings: catalog.settings === null ? {} : nativeObject(catalog.settings)}, unavailableTypes}, false);
+  const manuscripts = schema.bindings("manuscript", true);
+  if (!manuscripts.ok && !schema.unavailableMessage("manuscript")) throw new Error(manuscripts.message);
+  return schema;
+}
diff --git a/apps/writer/src/backend/native.test.ts b/apps/writer/src/backend/native.test.ts
new file mode 100644
index 00000000..158cf00b
--- /dev/null
+++ b/apps/writer/src/backend/native.test.ts
@@ -0,0 +1,383 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { connect, MdbaseError, MdbasePeopleClient, type ChangesWatch, type MdbaseApplicationConnection, type MdbaseClient, type wire } from "@mdbase-dev/sdk";
+import { MemoryReplica, type MemoryContract } from "@mdbase-dev/sdk/testing";
+import manifest from "../generated/mdbase-app.json";
+import { NativeWriterBackend } from "./native.js";
+import { nativeObject, nativeWriterSchema } from "./native-schema.js";
+
+// Native catalog/type metadata are explicit stand-ins. All record/file/session
+// operations use actual public SDK over MemoryReplica, not native acceptance.
+const clients: MdbaseClient[] = [];
+const backends: NativeWriterBackend[] = [];
+afterEach(() => {for (const backend of backends.splice(0)) backend.dispose(); for (const client of clients.splice(0)) client.close(); vi.restoreAllMocks();});
+function catalog(): wire.DescribeResult {
+  const definitions = manifest.requirements.contracts.map((contract, index) => ({contract, type: ["native-manuscript", "native-source", "native-comment"][index] ?? "unknown"}));
+  const mappings: Readonly<Record<string, Readonly<Record<string, string>>>> = {
+    "native-manuscript": {title: "/meta/heading", template: "layout", csl: "style"},
+    "native-source": {title: "heading", csl: "citation"},
+    "native-comment": {document: "document", motivation: "motivation", status: "/review/state", created_at: "created_at", created_by: "created_by", in_reply_to: "in_reply_to", target: "target", suggestion: "suggestion", resolved_at: "resolved_at", resolved_by: "resolved_by", modified_at: "/review/modified", deleted_at: "/review/deleted"},
+  };
+  return {specVersion: "0.3.0", settings: new Map([["explicit_type_keys", ["type"]]]), inclusion: {include: ["image"]}, issues: [],
+    contracts: definitions.map(({contract, type}) => ({...contract, path: `_contracts/${contract.id}.md`, contractType: "record", implementedBy: [type]})),
+    types: definitions.map(({contract, type}) => ({name: type, path: `_types/${type}.md`, implements: [{contract: contract.id, version: contract.version, fields: new Map(Object.entries(mappings[type] ?? {}))}]}))};
+}
+async function fixture(beforeBackend?: (client: MdbaseClient) => void) {
+  const description = catalog();
+  const contracts: MemoryContract[] = description.types.flatMap(type => (type.implements ?? []).map(implementation => {
+    const contract = description.contracts.find(candidate => candidate.id === implementation.contract && candidate.version === implementation.version);
+    if (!contract || !implementation.version) throw new Error("Missing exact fixture contract");
+    return {id: contract.id, version: implementation.version, type: type.name, contractDigest: contract.digest, fields: Object.fromEntries(implementation.fields ?? new Map())};
+  }));
+  const replica = new MemoryReplica({confirmDelayMs: 0, contracts});
+  const manuscript = replica.seed({path: "manuscripts/original.md", types: ["native-manuscript"], frontmatter: {type: "native-manuscript", meta: new Map([["heading", "Original"]]), layout: "article", style: "apa"}, body: "Original manuscript\n"});
+  replica.seed({path: "sources/paper.md", types: ["native-source"], frontmatter: {type: "native-source", heading: "Citation source", citation: new Map([["id", "paper"], ["type", "article-journal"], ["title", "Citation source"]])}, body: "Lazy source body\n"});
+  replica.seed({path: "notes/chapter.md", frontmatter: {custom: "keep"}, body: "# A chapter\n"});
+  const client = await connect({connector: replica.connector(), app: {name: "writer-native-test", version: "test"}, reconnect: false}); clients.push(client);
+  vi.spyOn(client, "describe").mockResolvedValue(description);
+  const metadata = vi.fn(async () => {throw new Error("Identity was not approved");});
+  const current = vi.fn(() => true);
+  const connection: MdbaseApplicationConnection = {id: client.collection, displayName: "Writing", scope: {account: "fixture-account", installation: "fixture-installation", collection: client.collection}, generation: "fixture-generation", records: client, files: client.files,
+    people: new MdbasePeopleClient(client, {collection: client.collection, request: metadata, isCurrent: current}), isCurrent: current};
+  const caller = new AbortController();
+  beforeBackend?.(client);
+  const backend = new NativeWriterBackend(connection, {collectionName: "Writing", signal: caller.signal}); backends.push(backend);
+  return {replica, client, description, metadata, current, caller, backend, manuscript};
+}
+
+// Public watch lifecycle stand-ins only; no private SDK fault hooks.
+function controlledWatch(initialState: ChangesWatch["state"] = "active", ready: Promise<void> = Promise.resolve()) {
+  let state = initialState;
+  const listeners = new Set<Parameters<ChangesWatch["subscribe"]>[0]>();
+  const stop = vi.fn(() => {state = "closed";});
+  const watch: ChangesWatch = Object.assign(stop, {ready, state, error: null,
+    subscribe: (listener: Parameters<ChangesWatch["subscribe"]>[0]) => {listeners.add(listener); return () => {listeners.delete(listener);};}});
+  Object.defineProperty(watch, "state", {get: () => state});
+  return {watch, stop, listeners, publish(next: ChangesWatch["state"]) {state = next; for (const listener of listeners) listener(next, null);}};
+}
+
+describe("native Writer domain backend", () => {
+  it("discovers mapped manuscripts/library/index without bodies or identity requests", async () => {
+    const h = await fixture(); const query = vi.spyOn(h.client, "query"); const get = vi.spyOn(h.client, "get");
+    const projected = await h.client.queryContract({id: "dev.mdbase.writer.manuscript", version: "1.0.0-beta.2"}, {pageSize: 128});
+    expect(projected.records[0]?.implementations[0]?.fields.get("title")).toBe("Original");
+    const manuscripts = await h.backend.listManuscripts();
+    expect(manuscripts).toEqual({ok: true, value: [{path: "manuscripts/original.md", title: "Original", template: "article", style: "apa"}]});
+    const library = await h.backend.library();
+    expect(library.ok && library.value[0]?.key).toBe("paper");
+    const index = await h.backend.index();
+    expect(index.ok && index.value.recordPaths).toContain("sources/paper.md");
+    expect(index.ok && index.value.notePaths).not.toContain("sources/paper.md");
+    expect(index.ok && index.value.notePaths).toContain("notes/chapter.md");
+    expect(query.mock.calls.every(call => !call[1]?.body && !call[1]?.document)).toBe(true);
+    expect(get).not.toHaveBeenCalled(); expect(h.metadata).not.toHaveBeenCalled();
+    expect("writeFile" in h.backend).toBe(false);
+  });
+  it("unrelated invalid definitions do not hide Writer records or untyped notes", async () => {
+    const h = await fixture();
+    h.description.issues.push({code: "type_invalid", severity: "error", message: "An unrelated custom type is invalid", details: new Map([["path", "_types/unrelated.md"]])});
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: true, value: [{path: "manuscripts/original.md"}]});
+    expect(await h.backend.index()).toMatchObject({ok: true, value: {notePaths: expect.arrayContaining(["notes/chapter.md"])}});
+    expect(await h.backend.readBody("notes/chapter.md")).toEqual({ok: true, value: "# A chapter\n"});
+    const first = h.description.contracts[0]; if (!first) throw new Error("Missing original contract");
+    first.digest = `sha256:${"f".repeat(64)}`;
+    expect(() => nativeWriterSchema(h.description)).toThrow("exact native contracts");
+  });
+  it("opens a catalog whose contract digests use the wire's sha256: form", async () => {
+    // UX-001: a fresh collection's describe reports `sha256:<hex>` digests,
+    // the same form as the manifest. Writer must not require bare hex.
+    const h = await fixture();
+    expect(h.description.contracts.every(contract => contract.digest.startsWith("sha256:"))).toBe(true);
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: true, value: [{path: "manuscripts/original.md"}]});
+    expect((await h.backend.index()).ok).toBe(true);
+    expect((await h.backend.library()).ok).toBe(true);
+  });
+  it("opens a collection whose catalog has no settings (null)", async () => {
+    // UX-001: a fresh collection without mdbase.yaml settings reports `settings: null`;
+    // Writer failed "Writer requires a native field map." and loaded nothing.
+    const h = await fixture();
+    (h.description as {settings: unknown}).settings = null;
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: true, value: [{path: "manuscripts/original.md"}]});
+    expect((await h.backend.index()).ok).toBe(true);
+  });
+  it("lists untyped records as untyped notes rather than dropping them", async () => {
+    const h = await fixture();
+    const index = await h.backend.index();
+    expect(index.ok && index.value.untypedPaths).toEqual(["notes/chapter.md"]);
+    expect(index.ok && index.value.notePaths).toContain("notes/chapter.md");
+  });
+  it("an error in one of Writer's own types makes only that type unavailable", async () => {
+    const h = await fixture();
+    h.description.issues.push({code: "type_invalid", severity: "error", message: "Bad comment type", details: new Map([["path", "_types/native-comment.md"]])});
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: true, value: [{path: "manuscripts/original.md"}]});
+    expect((await h.backend.library()).ok).toBe(true);
+    const index = await h.backend.index();
+    expect(index).toMatchObject({ok: true, value: {notePaths: expect.arrayContaining(["notes/chapter.md"]),
+      unavailableTypes: [{name: "native-comment", message: expect.stringContaining("Comments")}]}});
+    expect(await h.backend.comments()).toMatchObject({ok: false, message: expect.stringContaining("native-comment")});
+    expect(await h.backend.createComment({document: "manuscripts/original.md", text: "Hi"})).toMatchObject({ok: false, message: expect.stringContaining("native-comment")});
+  });
+  it("an error in the manuscript type leaves notes and sources usable", async () => {
+    const h = await fixture();
+    h.description.issues.push({code: "type_invalid", severity: "error", message: "Bad manuscript type", details: new Map([["path", "_types/native-manuscript.md"]])});
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: false, message: expect.stringContaining("native-manuscript")});
+    expect(await h.backend.library()).toMatchObject({ok: true, value: [{key: "paper"}]});
+    const index = await h.backend.index();
+    expect(index.ok && index.value.notePaths).not.toContain("manuscripts/original.md");
+    expect(index.ok && index.value.notePaths).toContain("notes/chapter.md");
+    expect(await h.backend.readBody("notes/chapter.md")).toEqual({ok: true, value: "# A chapter\n"});
+  });
+  it("one record with an invalid projection does not block the collection", async () => {
+    const h = await fixture();
+    const original = h.client.queryContract.bind(h.client);
+    vi.spyOn(h.client, "queryContract").mockImplementation(async (contract, options) => {
+      const result = await original(contract, options);
+      return {...result, records: result.records.map(record => ({...record, implementations: record.implementations.map(implementation => ({...implementation, issues: [{code: "field_invalid", severity: "error" as const, message: "bad"}]}))}))};
+    });
+    expect((await h.backend.index()).ok).toBe(true);
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: true, value: [{path: "manuscripts/original.md"}]});
+  });
+  it("recreates an ended watch in the background with backoff and never duplicates it", async () => {
+    const initial = controlledWatch(), second = controlledWatch("starting"), third = controlledWatch("starting");
+    const h = await fixture(client => {vi.spyOn(client, "watchChanges").mockReturnValueOnce(initial.watch).mockReturnValueOnce(second.watch).mockReturnValueOnce(third.watch);});
+    const watch = vi.mocked(h.client.watchChanges);
+    expect((await h.backend.index()).ok).toBe(true);
+    const notified = vi.fn(); h.backend.onExternalChange(notified);
+    vi.useFakeTimers({toFake: ["setTimeout", "clearTimeout"]});
+    try {
+      initial.publish("stale");
+      expect(notified).toHaveBeenCalledTimes(1);
+      await vi.advanceTimersByTimeAsync(499); expect(watch).toHaveBeenCalledTimes(1);
+      await vi.advanceTimersByTimeAsync(1); expect(watch).toHaveBeenCalledTimes(2);
+      expect(initial.stop).toHaveBeenCalledOnce(); expect(initial.listeners.size).toBe(0);
+      second.publish("active");
+      expect(notified).toHaveBeenCalledTimes(2); // Reconnected: reload what changed meanwhile.
+      second.publish("failed");
+      expect(notified).toHaveBeenCalledTimes(3);
+      await vi.advanceTimersByTimeAsync(500); expect(watch).toHaveBeenCalledTimes(3);
+      third.publish("failed"); // Never active: retry later, doubling the wait.
+      await vi.advanceTimersByTimeAsync(999); expect(watch).toHaveBeenCalledTimes(3);
+      // A read while a retry is pending recreates once and cancels the timer.
+      const read = h.backend.index(); await vi.advanceTimersByTimeAsync(0);
+      expect((await read).ok).toBe(true);
+      expect(watch).toHaveBeenCalledTimes(4); expect(third.stop).toHaveBeenCalledOnce();
+      await vi.advanceTimersByTimeAsync(60_000); expect(watch).toHaveBeenCalledTimes(4);
+      h.backend.dispose();
+      await vi.advanceTimersByTimeAsync(120_000); expect(watch).toHaveBeenCalledTimes(4);
+    } finally {vi.useRealTimers();}
+  });
+  it.each(["stale", "failed"] as const)("recreates its own %s watch on discovery and fences its retired callbacks", async state => {
+    const initial = controlledWatch();
+    const h = await fixture(client => {vi.spyOn(client, "watchChanges").mockReturnValueOnce(initial.watch);});
+    const watch = vi.mocked(h.client.watchChanges); const close = vi.spyOn(h.client, "close");
+    expect((await h.backend.index()).ok).toBe(true);
+    const notified = vi.fn(); h.backend.onExternalChange(notified);
+    initial.publish(state);
+    expect((await h.backend.index()).ok).toBe(true);
+    expect(watch).toHaveBeenCalledTimes(2); expect(initial.stop).toHaveBeenCalledOnce(); expect(initial.listeners.size).toBe(0);
+    const old = watch.mock.calls[0]?.[1]; if (!old) throw new Error("Missing original watch callback");
+    const calls = notified.mock.calls.length;
+    old({changes: [], cursor: "retired-watch", reset: true});
+    expect(notified).toHaveBeenCalledTimes(calls);
+    const current = watch.mock.results[1]?.value;
+    h.backend.dispose(); expect(current.state).toBe("closed"); expect(close).not.toHaveBeenCalled();
+  });
+  it("a replacement watch failure fails the pending read without an invalidation/retry loop", async () => {
+    const initial = controlledWatch(); let reject!: (error: Error) => void;
+    const replacement = controlledWatch("starting", new Promise<void>((_, failed) => {reject = failed;}));
+    const h = await fixture(client => {vi.spyOn(client, "watchChanges").mockReturnValueOnce(initial.watch).mockReturnValueOnce(replacement.watch);});
+    expect((await h.backend.index()).ok).toBe(true);
+    const notified = vi.fn(); h.backend.onExternalChange(notified);
+    initial.publish("failed");
+    const read = h.backend.index();
+    replacement.publish("failed"); reject(new Error("Replacement watch refused"));
+    expect(await read).toMatchObject({ok: false});
+    expect(notified).toHaveBeenCalledOnce(); expect(h.client.watchChanges).toHaveBeenCalledTimes(2);
+  });
+  it("refuses unsupported contract metadata without projecting raw fields locally", async () => {
+    const h = await fixture();
+    const query = vi.spyOn(h.client, "queryContract").mockRejectedValue(new MdbaseError({code: "upgrade_required", recovery: "upgrade", message: "Contract queries unsupported", reason: "contract_query_unsupported"}));
+    expect(await h.backend.listManuscripts()).toMatchObject({ok: false, message: expect.stringContaining("upgrade_required")});
+    expect(query).toHaveBeenCalledWith({id: "dev.mdbase.writer.manuscript", version: "1.0.0-beta.2"}, expect.objectContaining({pageSize: 128, signal: expect.any(AbortSignal)}));
+  });
+  it("discovers all records across actual SDK pages rather than truncating the native index", async () => {
+    const h = await fixture();
+    for (let index = 0; index < 501; index++) h.replica.seed({path: `notes/page-${index}.md`, body: `Note ${index}`});
+    for (let index = 0; index < 129; index++) h.replica.seed({path: `manuscripts/page-${index}.md`, types: ["native-manuscript"], frontmatter: {meta: new Map([["heading", `Book ${index}`]])}});
+    const query = vi.spyOn(h.client, "queryContract");
+    const result = await h.backend.index();
+    expect(result.ok && result.value.recordPaths).toHaveLength(633);
+    expect(result.ok && result.value.recordPaths).toContain("notes/page-500.md");
+    const manuscripts = await h.backend.listManuscripts();
+    expect(manuscripts.ok && manuscripts.value).toHaveLength(130);
+    expect(manuscripts.ok && manuscripts.value.some(book => book.path === "manuscripts/page-128.md" && book.title === "Book 128")).toBe(true);
+    expect(query.mock.calls.some(call => call[1]?.cursor !== undefined)).toBe(true);
+  });
+  it.each(["changed snapshot", "repeated cursor"]) ("refuses unsafe metadata pagination: %s", async failure => {
+    const h = await fixture(); const actual = await h.client.query({}, {effective: true});
+    vi.spyOn(h.client, "pages").mockImplementation(async function* () {
+      yield {...actual, records: [], complete: false, cursor: "original-cursor"};
+      yield {...actual, records: [], complete: false, ...(failure === "changed snapshot" ? {asOf: actual.asOf + 1, cursor: "next-cursor"} : {cursor: "original-cursor"})};
+      throw new Error("The repository must stop before requesting another unsafe page");
+    });
+    expect(await h.backend.index()).toMatchObject({ok: false, message: expect.stringContaining(failure === "changed snapshot" ? "snapshot changed" : "cursor repeated")});
+  });
+  it.each(["protected", "wrong identity"]) ("does not expose a lazy body from %s native readback", async failure => {
+    const h = await fixture(); await h.backend.index();
+    const get = h.client.get.bind(h.client);
+    vi.spyOn(h.client, "get").mockImplementation(async (...args) => {
+      const record = await get(...args);
+      return failure === "protected" ? {...record, state: {...record.state, unresolved: 1}} : {...record, id: crypto.randomUUID()};
+    });
+    expect((await h.backend.readBody("manuscripts/original.md")).ok).toBe(false);
+  });
+  it("refuses changed exact contract digest and never uses starter-name fallback", async () => {
+    const h = await fixture(); const first = h.description.contracts[0]; if (!first) throw new Error("Missing fixture contract");
+    first.digest = `sha256:${"f".repeat(64)}`;
+    expect((await h.backend.listManuscripts()).ok).toBe(false);
+    first.digest = manifest.requirements.contracts[0]?.digest ?? "";
+    const schema = nativeWriterSchema(h.description);
+    expect(schema.roles(["writer-manuscript"]).size).toBe(0);
+    expect(schema.roles(["native-manuscript"]).has("manuscript")).toBe(true);
+  });
+  it("opens the same native record session, saves/readbacks, and never closes a peer lease/client", async () => {
+    const h = await fixture(); const close = vi.spyOn(h.client, "close");
+    const peer = await h.client.records.open({path: "manuscripts/original.md"}, {autosave: false});
+    const opened = await h.backend.records.open("manuscripts/original.md", {autosave: false}); if (!opened.ok) throw new Error("Native lease missing");
+    expect(opened.value.session.getNativeSnapshot().record.id).toBe(h.manuscript.id);
+    opened.value.session.setBody("Changed through native lease\n");
+    expect((await opened.value.session.flush()).ok).toBe(true);
+    expect((await h.client.get(h.manuscript.id, {body: true})).body).toBe("Changed through native lease\n");
+    h.backend.dispose(); expect(close).not.toHaveBeenCalled();
+    peer.session.setBody("Peer still active\n"); expect((await peer.session.flush()).ok).toBe(true); peer.release();
+  });
+  it("refuses unsupported contract projection without using raw comment fields as a fallback", async () => {
+    const h = await fixture();
+    const row = h.replica.seed({path: "comments/unsupported.md", types: ["native-comment"], frontmatter: {type: "native-comment", document: "manuscripts/original.md", motivation: "commenting", status: "open", created_at: "2026-06-10T12:00:00Z"}, body: "Unconfirmed contract text\n"});
+    const read = vi.spyOn(h.client, "getContract").mockRejectedValue(new MdbaseError({code: "upgrade_required", recovery: "upgrade", message: "Contract records unsupported", reason: "contract_records_unsupported"}));
+    expect(await h.backend.comments()).toMatchObject({ok: false, message: expect.stringContaining("upgrade_required")});
+    expect(read).toHaveBeenCalledWith(row.id, {id: "mdbase.comment", version: "1.0.0", type: "native-comment"}, expect.any(AbortSignal));
+  });
+  it("creates a mapped manuscript and chapter only after confirmed current native readback", async () => {
+    const h = await fixture();
+    const created = await h.backend.createManuscript({title: "Launch", template: "article", style: "apa"});
+    expect(created).toEqual({ok: true, value: "manuscripts/launch.md"});
+    const actual = await h.client.get({path: "manuscripts/launch.md"}, {body: true});
+    expect(nativeObject(actual.frontmatter)["meta"]).toMatchObject({heading: "Launch"}); expect(actual.state.state).toBe("confirmed");
+    const chapter = await h.backend.createRecord("notes/chapter.md", "# New chapter\n");
+    expect(chapter).toEqual({ok: true, value: "notes/chapter-2.md"});
+  });
+  it("creates a manuscript when the confirmed receipt still carries the optimistic pending view", async () => {
+    // UX-001 (LAB): the confirmed receipt had no records, so write.records kept the
+    // submit-time pending view and Writer reported a failed create that had succeeded.
+    const h = await fixture(); const create = h.client.create.bind(h.client);
+    vi.spyOn(h.client, "create").mockImplementation(async (...args: Parameters<typeof create>) => {
+      const write = await create(...args);
+      const pending = write.records.map(record => ({...record, state: {state: "pending" as const, confirmedSeq: 0}}));
+      Object.defineProperty(write, "confirmed", {value: write.confirmed.then(receipt => { write.receipt = {...write.receipt, records: pending}; return receipt; })});
+      return write;
+    });
+    expect(await h.backend.createManuscript({title: "Pending view", template: "article", style: "apa"})).toEqual({ok: true, value: "manuscripts/pending-view.md"});
+  });
+  it("adopts a note with original UUID/body/custom metadata preserved by native CAS", async () => {
+    const h = await fixture();
+    const original = await h.client.get({path: "notes/chapter.md"}, {body: true, document: true});
+    const update = vi.spyOn(h.client, "update");
+    expect(await h.backend.adoptManuscript(original.path)).toEqual({ok: true, value: original.path});
+    const changed = await h.client.get(original.id, {body: true});
+    expect(changed.id).toBe(original.id); expect(changed.body).toBe(original.body);
+    expect(changed.frontmatter.get("custom")).toBe("keep"); expect(changed.types).toContain("native-manuscript");
+    expect(nativeObject(changed.frontmatter)["meta"]).toMatchObject({heading: "A chapter"});
+    expect(update).toHaveBeenCalledTimes(1);
+    expect(update.mock.calls[0]?.[1]).toMatchObject({contract: {id: "dev.mdbase.writer.manuscript", version: "1.0.0-beta.2", type: "native-manuscript"}, promote: true, patch: {title: "A chapter"}, ifRevision: original.revision});
+  });
+  it("reads native files by original file UUID/digest and keeps upload unavailable", async () => {
+    const h = await fixture(); const bytes = new Uint8Array([1, 2, 3]);
+    const original = await h.client.files.upload("figures/image.png", bytes); await original.confirmed;
+    const read = await h.backend.readFile("figures/image.png");
+    expect(read).toEqual({ok: true, value: bytes});
+    expect("writeFile" in h.backend).toBe(false);
+  });
+  it("creates/reads/resolves an unsigned native comment without inventing an account", async () => {
+    const h = await fixture();
+    const created = await h.backend.createComment({document: "manuscripts/original.md", text: "Review this sentence"});
+    if (!created.ok) throw new Error(created.message);
+    expect(created.value.createdBy).toBeUndefined();
+    const listed = await h.backend.comments(["manuscripts/original.md"]);
+    expect(listed.ok && listed.value.map(comment => comment.path)).toContain(created.value.path);
+    const changed = await h.backend.changeComment(created.value, {kind: "resolve"});
+    expect(changed.ok && changed.value.status).toBe("resolved");
+    if (!changed.ok) throw new Error(changed.message);
+    const update = vi.spyOn(h.client, "update");
+    const withdrawn = await h.backend.changeComment(changed.value, {kind: "withdraw"});
+    expect(withdrawn.ok).toBe(true);
+    expect(update).toHaveBeenCalledTimes(1);
+    expect(update.mock.calls[0]?.[1]).toMatchObject({body: "", contract: {id: "mdbase.comment", version: "1.0.0", type: "native-comment"}});
+    const raw = await h.client.get({path: changed.value.path}, {body: true});
+    expect(raw.body).toBe("");
+    expect(raw.frontmatter.get("review")).toBeInstanceOf(Map);
+    const review = nativeObject(raw.frontmatter)["review"];
+    expect(review).toMatchObject({state: "resolved", deleted: expect.any(String), modified: expect.any(String)});
+    expect(raw.frontmatter.has("deleted_at")).toBe(false);
+  });
+  it.each(["untyped", "sdk-mid", "mismatched-sdk-mid"])("recovers a %s lost create reply by the original SDK MID without creating a duplicate", async mode => {
+    const h = await fixture();
+    const original = h.client.create.bind(h.client);
+    const submitted: string[] = [];
+    vi.spyOn(h.client, "create").mockImplementationOnce(async (input, options) => {
+      if (!options?.mutationId) throw new Error("Missing original MID");
+      submitted.push(options.mutationId);
+      const write = await original(input, options); await write.confirmed;
+      if (mode === "untyped") throw new Error("Lost original reply");
+      throw new MdbaseError({code: "outcome_unknown", recovery: "resolve_outcome", message: "Lost original reply"},
+        {mutationId: mode === "sdk-mid" ? write.mutationId : crypto.randomUUID()});
+    });
+    const lost = await h.backend.createRecord("notes/unknown.md", "Original intent\n");
+    expect(lost.ok).toBe(false);
+    if (mode === "mismatched-sdk-mid") expect(lost).toMatchObject({message: "Writer lost the original mutation identity."});
+    const receipt = vi.spyOn(h.client, "awaitReceipt");
+    const recover = await h.backend.createRecord("notes/unknown.md", "Fresh retry must not submit\n");
+    expect(recover).toMatchObject({ok: false, message: expect.stringContaining("recovered the original operation")});
+    expect(receipt).toHaveBeenCalledWith(submitted[0], 5_000, expect.any(AbortSignal));
+    expect(h.client.create).toHaveBeenCalledOnce();
+    const queried = await h.client.query({}, {body: true});
+    const records = queried.records.filter(record => record.path === "notes/unknown.md");
+    expect(records).toHaveLength(1); expect(records[0]?.body).toBe("Original intent\n");
+  });
+  it("retries a lost create reply under the same intent into the one original record", async () => {
+    const h = await fixture();
+    const original = h.client.create.bind(h.client);
+    const submitted: string[] = [];
+    vi.spyOn(h.client, "create").mockImplementation(async (input, options) => {
+      if (options?.mutationId !== undefined) return original(input, options); // the SDK's own MID-bound step
+      const write = await original(input, options); submitted.push(write.mutationId);
+      if (submitted.length > 1) return write;
+      await write.confirmed; throw new Error("Lost original reply");
+    });
+    const intent = "new-manuscript-1";
+    expect((await h.backend.createManuscript({title: "Launch", template: "article", style: "apa", intent})).ok).toBe(false);
+    expect(await h.backend.createManuscript({title: "Launch", template: "article", style: "apa", intent})).toEqual({ok: true, value: "manuscripts/launch.md"});
+    expect(submitted).toHaveLength(2); expect(submitted[1]).toBe(submitted[0]);
+    const queried = await h.client.query({}, {});
+    expect(queried.records.filter(record => record.path.startsWith("manuscripts/launch"))).toHaveLength(1);
+  });
+  it("retries a lost comment reply under the same intent into the one original comment", async () => {
+    const h = await fixture();
+    const original = h.client.create.bind(h.client);
+    vi.spyOn(h.client, "create").mockImplementationOnce(async (input, options) => {
+      const write = await original(input, options); await write.confirmed; throw new Error("Lost original reply");
+    });
+    const input = {document: "manuscripts/original.md", text: "Once", intent: "new-comment-1"};
+    expect((await h.backend.createComment(input)).ok).toBe(false);
+    const created = await h.backend.createComment(input);
+    if (!created.ok) throw new Error(created.message);
+    const listed = await h.backend.comments(["manuscripts/original.md"]);
+    expect(listed.ok && listed.value.filter(comment => comment.text === "Once").map(comment => comment.path)).toEqual([created.value.path]);
+  });
+  it("fences late retired data and aborts only the repository watch/scope", async () => {
+    const h = await fixture(); const close = vi.spyOn(h.client, "close");
+    const pending = h.backend.listManuscripts(); h.current.mockReturnValue(false);
+    expect((await pending).ok).toBe(false);
+    h.caller.abort(); expect((await h.backend.readBody("manuscripts/original.md")).ok).toBe(false);
+    expect(close).not.toHaveBeenCalled(); expect(h.client.link).toBe("open");
+  });
+});
diff --git a/apps/writer/src/backend/native.ts b/apps/writer/src/backend/native.ts
new file mode 100644
index 00000000..3ba75cbb
--- /dev/null
+++ b/apps/writer/src/backend/native.ts
@@ -0,0 +1,530 @@
+// Writer's domain repository over one borrowed public SDK connection. No
+// legacy backend facade, SDK runtime/setup engine, copied client or app journal.
+import { isMdbaseError, type MdbaseApplicationConnection, type MdbaseClient, type ContractRecordView, type ContractSelector, type Write, type wire } from "@mdbase-dev/sdk";
+import type { JsonObject } from "@mdbase-dev/connect";
+import { commentFromRecord, type CommentRecord } from "@mdbase-writer/core/comments";
+import { CollectionBodies, type WriterBodyRow } from "./bodies.js";
+import { CollectionStore, annotationContract, commentContract, domainContract, manuscriptContract, type Binding, type CollectionRow, type CollectionSchema, type Domain } from "./collection.js";
+import { changeFields, commentPath, newCommentFields, NO_PEOPLE, peopleFromDirectory, type CommentChange, type NewComment, type People } from "./comments.js";
+import { manifestContractDigest, nativeObject, sameDigest, nativeWriteFields, nativeWriterSchema } from "./native-schema.js";
+import { NextWriterRecords } from "./next-records.js";
+import { fail, manuscriptBody, manuscriptSlug, numberedPath, ok, titleFromNote, type CollectionDelta, type CollectionIndex, type LibraryEntry, type ManuscriptSummary, type NewManuscript, type Result, type SourceAnnotation, type WriterBackend } from "./types.js";
+
+export interface NativeWriterOptions {
+  readonly collectionName: string;
+  readonly signal: AbortSignal;
+  readonly records?: NextWriterRecords;
+  /** Reuses the SDK's original authorize gesture, never an app popup engine. */
+  readonly authorize?: () => Promise<unknown>;
+}
+interface NativeMetadata {
+  readonly schema: CollectionSchema;
+  readonly store: CollectionStore;
+  readonly identities: ReadonlyMap<string, {readonly id: string; readonly revision: string}>;
+  readonly files: ReadonlyMap<string, wire.FileView>;
+  readonly generation: number;
+}
+const RECONNECT_MIN_MS = 500, RECONNECT_MAX_MS = 30_000;
+function unprotected(record: wire.RecordView): boolean {
+  return record.state.state === "confirmed" && !record.state.hold && !(record.state.unresolved ?? 0);
+}
+
+export class NativeWriterBackend implements WriterBackend {
+  readonly kind = "connect";
+  readonly collectionName: string;
+  readonly draftNamespace: string;
+  readonly records: NextWriterRecords;
+  // No writeFile: Writer's original declaration allows only files list/read.
+  // Upload remains unavailable unless a separately approved declaration changes.
+  private readonly client: MdbaseClient;
+  private readonly lifetime = new AbortController();
+  private readonly signal: AbortSignal;
+  private readonly ownedRecords: boolean;
+  private watch: ReturnType<MdbaseClient["watchChanges"]>;
+  private stopWatchState: () => void = () => {};
+  private watchEpoch = 0;
+  /** One pending background reconnect at most; its delay doubles to a cap. */
+  private reconnectTimer: ReturnType<typeof setTimeout> | undefined;
+  private reconnectDelay = RECONNECT_MIN_MS;
+  private readonly external = new Set<(paths: readonly string[]) => void>();
+  private readonly collection = new Set<(delta: CollectionDelta) => void>();
+  private readonly abort = () => this.dispose();
+  private disposed = false;
+  private generation = 0;
+  private cached: NativeMetadata | undefined;
+  private metadataJob: Promise<NativeMetadata> | undefined;
+  private peopleJob: Promise<People> | undefined;
+  private writing = false;
+  /** This session's write whose reply was lost, so a repeated click can't duplicate it.
+   * Writes from earlier sessions are the SDK write ledger's to keep and settle. */
+  private unresolvedMutation: string | undefined;
+  /** The SDK intent `unresolvedMutation` was submitted under, if any. */
+  private unresolvedIntent: string | undefined;
+  /** Each user creation action's first submit (record ID, path, SDK intent), so its
+   * retry re-sends the same create. A rejected attempt renews the SDK intent. */
+  private readonly creations = new Map<string, {attempt: number; id?: string; target?: string}>();
+
+  constructor(private readonly connection: MdbaseApplicationConnection, private readonly options: NativeWriterOptions) {
+    this.client = connection.records;
+    if (connection.id !== this.client.collection || connection.files !== this.client.files) throw new Error("Writer requires its original SDK collection and files client.");
+    this.collectionName = options.collectionName;
+    this.draftNamespace = this.client.collection;
+    this.signal = AbortSignal.any([options.signal, this.lifetime.signal]);
+    this.ownedRecords = !options.records;
+    this.records = options.records ?? new NextWriterRecords(this.client, this.signal, () => connection.isCurrent());
+    this.watch = this.startWatch();
+    this.signal.addEventListener("abort", this.abort, {once: true});
+    if (this.signal.aborted) this.dispose();
+  }
+  get setupStatus() {return this.cached?.schema.setupStatus;}
+  private startWatch(reconnecting = false, background = false): ReturnType<MdbaseClient["watchChanges"]> {
+    const epoch = ++this.watchEpoch;
+    // A failed replacement does not invalidate again (no recursive reload
+    // loop); it schedules one bounded, backed-off reconnect instead.
+    let notifyFailure = !reconnecting;
+    const current = () => !this.disposed && epoch === this.watchEpoch;
+    const watch = this.client.watchChanges(undefined, batch => {
+      if (current()) this.invalidate(batch.reset ? [] : batch.changes.map(change => change.path));
+    });
+    const ended = () => {
+      if (notifyFailure) this.invalidate([]);
+      notifyFailure = false;
+      this.scheduleReconnect();
+    };
+    this.stopWatchState = watch.subscribe(state => {
+      if (!current()) return;
+      if (state === "active") {
+        this.reconnectDelay = RECONNECT_MIN_MS; notifyFailure = true;
+        // Changes made while disconnected were never delivered: reload.
+        if (background) {background = false; this.invalidate([]);}
+      }
+      if (state === "stale" || state === "failed" || state === "closed") ended();
+    });
+    void watch.ready.catch(() => {if (current()) ended();});
+    return watch;
+  }
+  private ended(watch: ReturnType<MdbaseClient["watchChanges"]>): boolean {
+    return watch.state === "stale" || watch.state === "failed" || watch.state === "closed";
+  }
+  /** Replace our own ended handle: fence its callbacks, retire it, start one. */
+  private replaceWatch(background: boolean): void {
+    clearTimeout(this.reconnectTimer); this.reconnectTimer = undefined;
+    ++this.watchEpoch;
+    this.stopWatchState(); this.watch();
+    this.watch = this.startWatch(true, background);
+  }
+  private scheduleReconnect(): void {
+    if (this.disposed || this.reconnectTimer !== undefined) return;
+    const delay = this.reconnectDelay;
+    this.reconnectDelay = Math.min(delay * 2, RECONNECT_MAX_MS);
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = undefined;
+      if (this.disposed || !this.connection.isCurrent() || !this.ended(this.watch)) return;
+      this.replaceWatch(true);
+    }, delay);
+  }
+  private discoveryWatch(): ReturnType<MdbaseClient["watchChanges"]> {
+    if (this.ended(this.watch)) this.replaceWatch(false);
+    return this.watch;
+  }
+  private check(generation?: number): void {
+    this.signal.throwIfAborted();
+    if (this.disposed || !this.connection.isCurrent()) throw new Error("Writer's collection has changed.");
+    if (generation !== undefined && generation !== this.generation) throw new Error("Writer's collection discovery has changed. Retry the read.");
+  }
+  private async safely<T>(operation: () => Promise<T>): Promise<Result<T>> {
+    try {this.check(); const value = await operation(); this.check(); return ok(value);}
+    catch (error) {
+      return fail(this.signal.aborted || this.disposed ? "Writer's collection view has closed."
+        : isMdbaseError(error) ? `The native collection operation could not complete (${error.code}).`
+        : error instanceof Error && error.message.startsWith("Writer") ? error.message : "Writer could not read or confirm this collection operation.");
+    }
+  }
+  private async safelyResult<T>(operation: () => Promise<Result<T>>): Promise<Result<T>> {
+    const result = await this.safely(operation);
+    return result.ok ? result.value : result;
+  }
+  private invalidate(paths: readonly string[]): void {
+    if (this.disposed) return;
+    ++this.generation; this.cached = undefined; this.peopleJob = undefined;
+    for (const listener of this.external) listener(paths);
+    for (const listener of this.collection) listener({paths, reset: true});
+  }
+  private metadata(): Promise<NativeMetadata> {
+    this.check();
+    if (this.cached && this.watch.state === "active") return Promise.resolve(this.cached);
+    this.cached = undefined;
+    if (this.metadataJob) return this.metadataJob;
+    const job = this.loadMetadata(); this.metadataJob = job;
+    void job.then(() => {if (this.metadataJob === job) this.metadataJob = undefined;}, () => {if (this.metadataJob === job) this.metadataJob = undefined;});
+    return job;
+  }
+  private async loadMetadata(): Promise<NativeMetadata> {
+    const watch = this.discoveryWatch();
+    await watch.ready; this.check();
+    const generation = this.generation;
+    if (watch !== this.watch || watch.state !== "active") throw new Error("Writer's collection watch needs reconnection.");
+    const catalog = await this.client.describe(this.signal); this.check(generation);
+    const schema = nativeWriterSchema(catalog);
+    const store = new CollectionStore(schema);
+    const rows = new Map<string, CollectionRow>();
+    const identities = new Map<string, {id: string; revision: string}>();
+    const ids = new Set<string>();
+    const recordCursors = new Set<string>();
+    let asOf: number | undefined;
+    let complete = false;
+    for await (const page of this.client.pages({limit: 500}, {effective: true}, this.signal)) {
+      this.check(generation);
+      if (asOf !== undefined && asOf !== page.asOf) throw new Error("Writer's native query snapshot changed.");
+      asOf = page.asOf;
+      if (page.cursor) {
+        if (recordCursors.has(page.cursor)) throw new Error("Writer's native record cursor repeated.");
+        recordCursors.add(page.cursor);
+      }
+      for (const record of page.records) {
+        if (identities.has(record.path) || ids.has(record.id)) throw new Error("Writer's native query repeated a record identity.");
+        identities.set(record.path, {id: record.id, revision: record.revision}); ids.add(record.id);
+        rows.set(record.id, {path: record.path, types: record.types,
+          ...(record.mtime !== undefined ? {file: {mtime: new Date(record.mtime).toISOString()}} : {})});
+      }
+      complete = page.complete && !page.cursor;
+    }
+    if (!complete || asOf === undefined) throw new Error("Writer's native query did not return a complete snapshot.");
+    await this.projectMetadata(catalog, schema, rows, identities, asOf, generation);
+    store.upsert([...rows.values()], true);
+    const files = new Map<string, wire.FileView>();
+    const fileIds = new Set<string>();
+    const cursors = new Set<string>();
+    let cursor: string | undefined;
+    do {
+      const page = await this.connection.files.listPage({limit: 500, ...(cursor ? {cursor} : {}), signal: this.signal});
+      this.check(generation);
+      for (const file of page.files) {
+        if (files.has(file.path) || fileIds.has(file.id)) throw new Error("Writer's file listing repeated an identity.");
+        files.set(file.path, file); fileIds.add(file.id);
+      }
+      cursor = page.cursor;
+      if (cursor) {
+        if (cursors.has(cursor)) throw new Error("Writer's file cursor repeated.");
+        cursors.add(cursor);
+      } else if (!page.complete) throw new Error("Writer's file listing is incomplete.");
+    } while (cursor);
+    store.files([...files.keys()]);
+    this.check(generation);
+    if (watch !== this.watch || watch.state !== "active") throw new Error("Writer's collection watch needs reconnection.");
+    return this.cached = {schema, store, identities, files, generation};
+  }
+  private async projectMetadata(catalog: wire.DescribeResult, schema: CollectionSchema, rows: Map<string, CollectionRow>, identities: ReadonlyMap<string, {id: string; revision: string}>, asOf: number, generation: number): Promise<void> {
+    for (const domain of ["manuscript", "source", "annotation", "comment", "person"] as const) {
+      const selected = new Map([...rows].filter(([, row]) => schema.roles(row.types).get(domain)?.active));
+      if (!selected.size) continue;
+      const contract = domainContract(domain);
+      const declared = catalog.contracts.find(candidate => candidate.id === contract.id && candidate.version === contract.version);
+      if (!declared) throw new Error("Writer's metadata lost its exact contract.");
+      const seen = new Set<string>();
+      const cursors = new Set<string>();
+      let cursor: string | undefined;
+      do {
+        const result = await this.client.queryContract(contract, {pageSize: 128, ...(cursor ? {cursor} : {}), signal: this.signal}); this.check(generation);
+        if (!sameDigest(result.contractDigest, declared.digest) || result.page.asOf !== asOf) throw new Error("Writer's contract metadata snapshot or digest changed.");
+        const witnesses = new Map(result.page.records.map(record => [record.id, record]));
+        if (witnesses.size !== result.page.records.length) throw new Error("Writer's contract query repeated a record identity.");
+        for (const projected of result.records) {
+          const row = selected.get(projected.id);
+          const witness = witnesses.get(projected.id);
+          const identity = row && identities.get(row.path);
+          if (!row || !witness || !identity || witness.path !== row.path || witness.revision !== identity.revision || seen.has(projected.id)) throw new Error("Writer's contract metadata identity changed or repeated.");
+          const binding = schema.roles(row.types).get(domain);
+          const implementations = projected.implementations.filter(candidate => candidate.typeName === binding?.name);
+          const implementation = implementations[0];
+          if (implementations.length !== 1 || !implementation) throw new Error("Writer's contract metadata projection is ambiguous.");
+          seen.add(projected.id);
+          // One invalid record stays listed without its projected fields;
+          // it never blocks the rest of the collection.
+          if (implementation.issues.some(issue => issue.severity === "error")) continue;
+          rows.set(projected.id, {...row, contractFields: {...row.contractFields, [domain]: nativeObject(implementation.fields)}});
+        }
+        cursor = result.page.cursor;
+        if (cursor) {
+          if (cursors.has(cursor)) throw new Error("Writer's contract metadata cursor repeated.");
+          cursors.add(cursor);
+        } else if (!result.page.complete) throw new Error("Writer's contract metadata query is incomplete.");
+      } while (cursor);
+      if (seen.size !== selected.size) throw new Error("Writer's contract metadata omitted an original record.");
+    }
+  }
+  manuscriptBindings(): Promise<Result<readonly Binding[]>> {return this.safely(async () => this.bindingList((await this.metadata()).schema, "manuscript"));}
+  private bindingList(schema: CollectionSchema, domain: Domain): Binding[] {
+    const found = schema.bindings(domain, true);
+    if (!found.ok) throw new Error(found.message);
+    return found.value;
+  }
+  private async binding(domain: Domain): Promise<Binding> {
+    const first = this.bindingList((await this.metadata()).schema, domain)[0];
+    if (!first) throw new Error("Writer has no native type for this operation.");
+    return first;
+  }
+  listManuscripts(): Promise<Result<ManuscriptSummary[]>> {return this.safely(async () => this.available(await this.metadata(), "manuscript").store.manuscripts);}
+  /** Fails with plain copy when every Writer type for the domain is unusable. */
+  private available(metadata: NativeMetadata, domain: Domain): NativeMetadata {
+    const message = metadata.schema.unavailableMessage(domain);
+    if (message) throw new Error(message);
+    return metadata;
+  }
+  index(): Promise<Result<CollectionIndex>> {return this.safely(async () => (await this.metadata()).store.index);}
+  library(): Promise<Result<LibraryEntry[]>> {return this.safely(async () => (await this.metadata()).store.library);}
+  annotationPaths(): Promise<Result<readonly string[]>> {return this.safely(async () => [...(await this.metadata()).store.annotations.keys()]);}
+  annotationFields(path: string, types: readonly string[] = []): Readonly<Record<string, string>> {
+    return this.cached?.store.annotations.get(path)?.fields ?? this.cached?.schema.annotationFields(types) ?? {};
+  }
+  private bodies(metadata: NativeMetadata): CollectionBodies {
+    return new CollectionBodies(() => metadata.store, selected => this.safely(async () => {
+      const rows: WriterBodyRow[] = [];
+      for (const [path, entry] of selected) {
+        const identity = metadata.identities.get(path);
+        if (!identity) throw new Error("Writer lost the original record identity.");
+        const record = await this.client.get(identity.id, {body: true}, this.signal); this.check(metadata.generation);
+        if (record.id !== identity.id || record.path !== path || record.revision !== identity.revision || !record.types.includes(entry.type) || !unprotected(record)) throw new Error("Writer's selected record changed or is protected.");
+        const contract = metadata.store.comments.has(path) ? commentContract : annotationContract;
+        const projected = await this.contractRecord(record, {...contract, type: entry.type}); this.check(metadata.generation);
+        rows.push({path: record.path, types: record.types, contractFields: nativeObject(projected.fields), body: record.body ?? ""});
+      }
+      return rows;
+    }));
+  }
+  comments(scope?: readonly string[]): Promise<Result<CommentRecord[]>> {
+    return this.safelyResult(async () => {
+      const metadata = this.available(await this.metadata(), "comment");
+      const result = await this.bodies(metadata).commentsForScope(scope); this.check(metadata.generation);
+      return result;
+    });
+  }
+  annotationsForSource(path: string): Promise<Result<SourceAnnotation[]>> {
+    return this.safelyResult(async () => {
+      const metadata = await this.metadata();
+      const result = await this.bodies(metadata).annotationsForSource(path); this.check(metadata.generation);
+      return result;
+    });
+  }
+  readBody(path: string): Promise<Result<string>> {
+    return this.safely(async () => {
+      const metadata = await this.metadata(); const original = metadata.identities.get(path);
+      if (!original) throw new Error("Writer cannot find this record in its native index.");
+      const record = await this.client.get(original.id, {body: true}, this.signal); this.check(metadata.generation);
+      if (record.id !== original.id || record.path !== path || record.revision !== original.revision || !unprotected(record)) throw new Error("Writer's record changed or is protected.");
+      return record.body ?? "";
+    });
+  }
+  readFile(path: string): Promise<Result<Uint8Array>> {
+    return this.safely(async () => {
+      const metadata = await this.metadata(); const original = metadata.files.get(path);
+      if (!original) throw new Error("Writer cannot find this file in its native index.");
+      const seen = await this.connection.files.get(original.id, this.signal); this.check(metadata.generation);
+      if (seen.id !== original.id || seen.path !== path || seen.digest !== original.digest || seen.hold || seen.state === "pending_upload" || seen.confirmedSeq <= 0) throw new Error("Writer's file changed or is protected.");
+      const bytes = await this.connection.files.download(seen, {signal: this.signal}); this.check(metadata.generation);
+      const current = await this.connection.files.get(original.id, this.signal); this.check(metadata.generation);
+      if (current.id !== original.id || current.digest !== seen.digest || current.path !== path || current.hold || current.state === "pending_upload" || current.confirmedSeq <= 0 || bytes.byteLength !== current.size) throw new Error("Writer's downloaded file changed or is protected.");
+      return bytes;
+    });
+  }
+  people(options: {fresh?: boolean} = {}): Promise<People> {
+    if (!this.peopleJob || options.fresh) this.peopleJob = this.loadPeople();
+    return this.peopleJob;
+  }
+  private async loadPeople(): Promise<People> {
+    try {
+      this.check();
+      const directory = await this.connection.people.directory({members: "omit", signal: this.signal}); this.check();
+      return peopleFromDirectory(directory);
+    } catch (error) {
+      // Names only, never a substitute account/author or guessed identity.
+      try {const names = (await this.metadata()).store.people; this.check(); return {names, signing: {kind: "unavailable", reason: "Writer could not check the account's person record."}};}
+      catch {return {...NO_PEOPLE, signing: isMdbaseError(error) && error.code === "forbidden" ? {kind: "not-approved"} : {kind: "unavailable", reason: "Writer could not check the account's person record."}};}
+    }
+  }
+  reviewIdentityAccess(): Promise<Result<void>> {
+    return this.safely(async () => {if (!this.options.authorize) throw new Error("Writer cannot request identity access here."); await this.options.authorize(); this.check(); this.peopleJob = undefined;});
+  }
+  private async write<T>(operation: () => Promise<T>, intent?: string): Promise<Result<T>> {
+    if (this.writing) return fail("Writer is still confirming the original operation.");
+    this.writing = true;
+    try {
+      return await this.safely(async () => {
+        // A lost submit result never admits a fresh retry. Reconcile the same
+        // captured MID through SDK receipt/read APIs; this click does no write.
+        // A retry of the same creation re-sends its original intent, which lands once.
+        if (this.unresolvedMutation && (intent === undefined || this.sdkIntent(intent) !== this.unresolvedIntent)) {
+          const receipt = await this.client.awaitReceipt(this.unresolvedMutation, 5_000, this.signal); this.check();
+          if (receipt.mutation !== this.unresolvedMutation) throw new Error("Writer lost the original receipt identity.");
+          if (receipt.state === "rejected") {
+            this.unresolvedMutation = this.unresolvedIntent = undefined;
+            throw new Error("Writer's original operation was rejected. Review it before starting another.");
+          }
+          await this.recovered(this.unresolvedMutation, receipt);
+          this.unresolvedMutation = this.unresolvedIntent = undefined;
+          throw new Error("Writer recovered the original operation. Review it before starting another.");
+        }
+        return operation();
+      });
+    } finally {this.writing = false;}
+  }
+  private async recovered(mutationId: string, receipt: wire.Receipt): Promise<void> {
+    if (receipt.mutation !== mutationId || receipt.state !== "confirmed" || !receipt.records?.length) throw new Error("Writer must recover the original operation before starting another.");
+    for (const witnessed of receipt.records) {
+      const current = await this.client.get(witnessed.id, {document: true}, this.signal); this.check();
+      if (!unprotected(current) || current.id !== witnessed.id || current.path !== witnessed.path
+        || (witnessed.state.state === "confirmed" && current.revision !== witnessed.revision)) throw new Error("Writer's original operation is protected or changed.");
+    }
+  }
+  private async availablePath(path: string): Promise<string> {
+    for (let n = 1; n <= 20; n++) {
+      const target = numberedPath(path, n);
+      const found = await this.client.find({path: target}, undefined, this.signal); this.check();
+      if (!found) return target;
+    }
+    throw new Error("Writer could not find an unused path.");
+  }
+  private async nativeWrite(start: (ids: {mutationId: string} | {intent: string}) => Promise<Write>, intent?: string): Promise<Write> {
+    // With an intent the SDK derives the MID; a retry of it keeps the one already captured.
+    const ids = intent === undefined ? {mutationId: crypto.randomUUID()} : {intent};
+    const mutationId = "mutationId" in ids ? ids.mutationId : intent === this.unresolvedIntent ? this.unresolvedMutation : undefined;
+    this.unresolvedMutation = mutationId; this.unresolvedIntent = intent;
+    try {
+      const write = await start(ids);
+      if (mutationId !== undefined && write.mutationId !== mutationId) throw new Error("Writer lost the original mutation identity.");
+      this.unresolvedMutation = write.mutationId; this.check();
+      return write;
+    } catch (error) {
+      if (isMdbaseError(error) && error.mutationId) {
+        if (mutationId !== undefined && error.mutationId !== mutationId) throw new Error("Writer lost the original mutation identity.", {cause: error});
+        this.unresolvedMutation = error.mutationId;
+      }
+      // Retain the captured original even for an untyped lost transport reply.
+      // A receipt lookup, never a new submit, resolves the next user action.
+      throw error;
+    }
+  }
+  private async contractRecord(original: wire.RecordView, contract: ContractSelector): Promise<ContractRecordView> {
+    const projected = await this.client.getContract(original.id, contract, this.signal); this.check();
+    const expected = (await this.metadata()).schema.description.contracts.find(candidate => candidate.id === contract.id);
+    const digest = manifestContractDigest(contract.id, contract.version);
+    if (!expected || projected.id !== original.id || projected.path !== original.path || projected.revision !== original.revision
+      || projected.contract.id !== contract.id || projected.contract.version !== contract.version || projected.contract.type !== contract.type
+      || (digest !== undefined && !sameDigest(projected.contract.digest, digest))) throw new Error("Writer's contract record binding changed.");
+    const current = await this.client.get(original.id, {body: true, document: true}, this.signal); this.check();
+    if (!unprotected(current) || current.id !== original.id || current.path !== original.path || current.revision !== original.revision) throw new Error("Writer's contract record changed or is protected.");
+    return projected;
+  }
+  private async confirmed(write: Write, id: string, contract?: ContractSelector): Promise<wire.RecordView> {
+    await write.confirmed; this.check();
+    if (write.receipt.mutation !== write.mutationId || write.receipt.state !== "confirmed") throw new Error("Writer lost the original confirmed receipt.");
+    // A confirmed receipt may carry no records, so `write.records` can still be the
+    // optimistic (pending) view from submit. It proves identity and path; the
+    // confirmed read below proves protection and the current revision.
+    const witnessed = write.records.find(record => record.id === id);
+    if (!witnessed) throw new Error("Writer's original receipt did not name the record.");
+    const current = await this.client.get(id, {body: true, document: true}, this.signal); this.check();
+    if (!unprotected(current) || current.id !== id || current.path !== witnessed.path
+      || (witnessed.state.state === "confirmed" && current.revision !== witnessed.revision)) throw new Error("Writer's confirmed record changed or is protected.");
+    if (contract) await this.contractRecord(current, contract);
+    if (this.unresolvedMutation === write.mutationId) this.unresolvedMutation = this.unresolvedIntent = undefined;
+    return current;
+  }
+  private sdkIntent(intent: string): string {
+    const attempt = this.creations.get(intent)?.attempt ?? 0;
+    return attempt ? `${intent}/${attempt}` : intent;
+  }
+  private async create(path: string, body: string, frontmatter: JsonObject, contract?: ContractSelector, intent?: string): Promise<wire.RecordView> {
+    const creation = intent === undefined ? {attempt: 0} : this.creations.get(intent) ?? {attempt: 0};
+    const target = creation.target ?? await this.availablePath(path); this.check();
+    const id = creation.id ?? crypto.randomUUID();
+    if (intent !== undefined) this.creations.set(intent, {...creation, id, target});
+    const sdkIntent = intent === undefined ? undefined : this.sdkIntent(intent);
+    // Exactly one submit. A taken path/unknown outcome is not a fresh retry.
+    const fields = nativeWriteFields(frontmatter);
+    const write = await this.nativeWrite(ids => this.client.create({id, path: target, body, frontmatter: fields, ...(contract ? {contract} : {})}, {...ids, signal: this.signal, include: {body: true, document: true}}), sdkIntent);
+    this.check();
+    try {return await this.confirmed(write, id, contract);}
+    catch (error) {
+      // Nothing landed: the action's next retry is a fresh create under a renewed intent.
+      if (intent !== undefined && write.state === "rejected") {
+        this.creations.set(intent, {attempt: creation.attempt + 1});
+        if (this.unresolvedMutation === write.mutationId) this.unresolvedMutation = this.unresolvedIntent = undefined;
+      }
+      throw error;
+    }
+  }
+  createManuscript(input: NewManuscript): Promise<Result<string>> {
+    return this.write(async () => {
+      const binding = await this.binding("manuscript");
+      const library = input.starter ? (await this.metadata()).store.library : [];
+      const body = manuscriptBody(input.starter, library[0]?.key);
+      const frontmatter = {title: input.title, template: input.template, csl: input.style};
+      const created = await this.create(`manuscripts/${manuscriptSlug(input.title)}.md`, body, frontmatter, {...manuscriptContract, type: binding.name}, input.intent);
+      if (created.body !== body) throw new Error("Writer's manuscript readback differs from the original operation.");
+      return created.path;
+    }, input.intent);
+  }
+  createRecord(path: string, body: string, intent?: string): Promise<Result<string>> {
+    return this.write(async () => {const created = await this.create(path, body, {}, undefined, intent); if (created.body !== body) throw new Error("Writer's record readback differs from the original operation."); return created.path;}, intent);
+  }
+  adoptManuscript(path: string): Promise<Result<string>> {
+    return this.write(async () => {
+      const binding = await this.binding("manuscript");
+      const original = await this.client.get({path}, {body: true, document: true}, this.signal); this.check();
+      if (!unprotected(original) || original.document === undefined) throw new Error("Writer's note is protected or lacks its full source.");
+      const contract = {...manuscriptContract, type: binding.name};
+      const patch = {title: titleFromNote(path, original.body ?? "")};
+      const write = await this.nativeWrite(ids => this.client.update(original, {contract, promote: true, patch, ifRevision: original.revision}, {...ids, signal: this.signal, include: {body: true, document: true}}));
+      const current = await this.confirmed(write, original.id, {...manuscriptContract, type: binding.name});
+      if (current.body !== original.body || !current.types.includes(binding.name)) throw new Error("Writer's adopted note did not confirm the original content and type.");
+      return current.path;
+    });
+  }
+  createComment(input: NewComment): Promise<Result<CommentRecord>> {
+    return this.write(async () => {
+      const binding = await this.binding("comment"); const now = new Date();
+      const fields = newCommentFields(input, now, (await this.people()).me?.link); this.check();
+      const body = input.text.trim() ? `${input.text.trim()}\n` : "";
+      const contract = {...commentContract, type: binding.name};
+      const current = await this.create(commentPath(now), body, fields, contract, input.intent);
+      const projected = await this.contractRecord(current, contract);
+      const comment = commentFromRecord(current.path, nativeObject(projected.fields), current.body ?? "");
+      if (!comment || current.body !== body) throw new Error("Writer's comment could not be confirmed from its native readback.");
+      return comment;
+    }, input.intent);
+  }
+  changeComment(comment: CommentRecord, change: CommentChange): Promise<Result<CommentRecord>> {
+    return this.write(async () => {
+      const metadata = await this.metadata(); const identity = metadata.identities.get(comment.path);
+      if (!identity) throw new Error("Writer lost the original comment identity.");
+      const original = await this.client.get(identity.id, {body: true, document: true}, this.signal); this.check();
+      if (!unprotected(original) || original.document === undefined || original.path !== comment.path) throw new Error("Writer's original comment is protected or has moved.");
+      const binding = this.bindingList(metadata.schema, "comment").find(candidate => original.types.includes(candidate.name));
+      if (!binding) throw new Error("Writer's comment lost its native contract binding.");
+      const contract = {...commentContract, type: binding.name};
+      const projected = await this.contractRecord(original, contract);
+      const currentComment = commentFromRecord(original.path, nativeObject(projected.fields), original.body ?? "");
+      if (!currentComment || JSON.stringify(currentComment) !== JSON.stringify(comment)) throw new Error("Writer's comment changed before this operation.");
+      const {fields, body} = changeFields(currentComment, change, new Date(), (await this.people()).me?.link); this.check();
+      const patch = nativeWriteFields(fields);
+      const write = await this.nativeWrite(ids => this.client.update(original, {contract, patch, ...(body !== undefined ? {body} : {}), ifRevision: original.revision}, {...ids, signal: this.signal, include: {body: true, document: true}}));
+      const current = await this.confirmed(write, original.id, contract);
+      const nextView = await this.contractRecord(current, contract);
+      const next = commentFromRecord(current.path, nativeObject(nextView.fields), current.body ?? "");
+      if (!next) throw new Error("Writer's changed comment could not be confirmed from native readback.");
+      return next;
+    });
+  }
+  onExternalChange(listener: (paths: readonly string[]) => void): () => void {this.external.add(listener); return () => {this.external.delete(listener);};}
+  onCollectionChange(listener: (delta: CollectionDelta) => void): () => void {this.collection.add(listener); return () => {this.collection.delete(listener);};}
+  flushChanges(): Promise<Result<void>> {return this.safely(async () => {await this.metadata();});}
+  reconcile(): Promise<Result<void>> {this.invalidate([]); return this.flushChanges();}
+  dispose(): void {
+    if (this.disposed) return;
+    this.disposed = true; ++this.watchEpoch; clearTimeout(this.reconnectTimer); this.reconnectTimer = undefined;
+    this.signal.removeEventListener("abort", this.abort); this.stopWatchState(); this.watch();
+    this.lifetime.abort(); if (this.ownedRecords) this.records.dispose();
+    this.external.clear(); this.collection.clear(); this.cached = undefined;
+  }
+}
diff --git a/apps/writer/src/backend/next-records.test.ts b/apps/writer/src/backend/next-records.test.ts
new file mode 100644
index 00000000..d9623e80
--- /dev/null
+++ b/apps/writer/src/backend/next-records.test.ts
@@ -0,0 +1,163 @@
+import { connect, MdbaseError, type MdbaseClient } from "@mdbase-dev/sdk";
+import { MemoryReplica } from "@mdbase-dev/sdk/testing";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { NextWriterRecords, type NextWriterLease } from "./next-records.js";
+
+const clients: MdbaseClient[] = [];
+const leases: NextWriterLease[] = [];
+afterEach(() => {
+  for (const lease of leases.splice(0)) lease.release();
+  for (const client of clients.splice(0)) client.close();
+  vi.restoreAllMocks();
+});
+
+async function fixture(pending = false) {
+  const replica = new MemoryReplica({ confirmDelayMs: pending ? null : 0 });
+  const record = replica.seed({ path: "writing/draft.md", frontmatter: { title: "Draft", custom: "preserve" }, body: "Original body\n" });
+  const client = await connect({ connector: replica.connector(), app: { name: "writer-lease-test", version: "test" }, reconnect: false });
+  clients.push(client);
+  const owner = new AbortController();
+  // The public helper is frozen; a typed test-only forwarding port observes
+  // real SDK calls without modifying the native lease/session engine.
+  const nativeOpen = vi.fn(client.records.open.bind(client.records));
+  return { replica, record, client, owner, nativeOpen, records: new NextWriterRecords({ records: { open: nativeOpen } }, owner.signal) };
+}
+
+async function open(f: Awaited<ReturnType<typeof fixture>>): Promise<NextWriterLease> {
+  const result = await f.records.open(f.record.path, { autosave: false });
+  if (!result.ok) throw new Error(result.problem.message);
+  leases.push(result.value);
+  return result.value;
+}
+
+describe("NextWriterRecords SDK lease value translation (stand-in, not native/runtime)", () => {
+  it("opens an explicit native path and projects display JSON without replacing the native view", async () => {
+    const f = await fixture();
+    const nativeOpen = f.nativeOpen;
+    const lease = await open(f);
+    expect(nativeOpen).toHaveBeenCalledWith({ path: f.record.path }, { autosave: false, signal: f.owner.signal });
+    expect(lease.session.getSnapshot()).toMatchObject({ state: "saved", body: "Original body\n", dirty: false, frontmatter: { title: "Draft", custom: "preserve" } });
+    const native = lease.session.getNativeSnapshot();
+    expect(native.record.id).toBe(f.record.id);
+    expect(native.record.frontmatter).toBeInstanceOf(Map);
+    expect(native.record.document).toBeDefined();
+  });
+
+  it("delegates body/explicit frontmatter patch and confirmed saved state to SDK flush", async () => {
+    const f = await fixture();
+    const lease = await open(f);
+    const changed = vi.fn();
+    const stop = lease.session.subscribe(changed);
+    lease.session.setBody("Changed body\n");
+    lease.session.patchFrontmatter({ title: "Renamed", options: { style: "plain" } });
+    expect(lease.session.getSnapshot()).toMatchObject({ state: "unsaved", body: "Changed body\n", dirty: true, frontmatter: { title: "Renamed", custom: "preserve", options: { style: "plain" } } });
+    expect(await lease.session.flush({ timeoutMs: 1000 })).toEqual({ ok: true });
+    expect(lease.session.getSnapshot()).toMatchObject({ state: "saved", body: "Changed body\n", dirty: false });
+    expect(lease.session.getNativeSnapshot().lastReceipt?.state).toBe("confirmed");
+    expect((await f.client.get(f.record.id, { body: true })).body).toBe("Changed body\n");
+    expect(changed).toHaveBeenCalled();
+    stop();
+  });
+
+  it("keeps the SDK-owned shared session alive after one peer releases", async () => {
+    const f = await fixture();
+    const first = await open(f);
+    const second = await open(f);
+    first.session.setBody("Shared peer draft\n");
+    expect(second.session.getSnapshot().body).toBe("Shared peer draft\n");
+    first.release();
+    expect(await second.session.flush({ timeoutMs: 1000 })).toEqual({ ok: true });
+    expect((await f.client.get(f.record.id, { body: true })).body).toBe("Shared peer draft\n");
+  });
+
+  it("passes retained recovery identity to the native open helper without a factory shim", async () => {
+    const f = await fixture();
+    const nativeLease = await f.client.records.open({ path: f.record.path }, { autosave: false });
+    // Observe delegation only; a made-up recovery ref is not native proof.
+    const release = vi.fn(() => nativeLease.release());
+    const nativeOpen = f.nativeOpen.mockResolvedValue({ session: nativeLease.session, release });
+    const recovery = { mutationId: crypto.randomUUID(), recordId: f.record.id, baseRevision: nativeLease.session.getSnapshot().record.revision };
+    const result = await f.records.open(f.record.path, { autosave: false, recovery });
+    expect(nativeOpen).toHaveBeenCalledWith({ path: f.record.path }, { autosave: false, recovery, signal: f.owner.signal });
+    expect(result.ok).toBe(true);
+    if (result.ok) { result.value.release(); }
+    expect(release).toHaveBeenCalledTimes(1);
+  });
+
+  it("translates real SDK open errors without changing their code/message", async () => {
+    const f = await fixture();
+    const problem = { code: "not_found" as const, recovery: "fix_request" as const, message: "Missing native record" };
+    f.nativeOpen.mockRejectedValue(new MdbaseError(problem));
+    expect(await f.records.open("missing.md")).toEqual({ ok: false, problem });
+  });
+
+  it("does not invoke native open after the owner has aborted", async () => {
+    const f = await fixture();
+    f.owner.abort(new Error("Writer closed"));
+    const nativeOpen = f.nativeOpen;
+    expect(await f.records.open(f.record.path)).toEqual({ ok: false, problem: { code: "cancelled", message: "Writer closed" } });
+    expect(nativeOpen).not.toHaveBeenCalled();
+  });
+
+  it("releases a late-delivered lease after owner cancellation without closing the borrowed client", async () => {
+    const f = await fixture();
+    const nativeLease = await f.client.records.open({ path: f.record.path }, { autosave: false });
+    const release = vi.fn(() => nativeLease.release());
+    f.nativeOpen.mockImplementation(() => {
+      f.owner.abort(new Error("Writer closed"));
+      return Promise.resolve({ session: nativeLease.session, release });
+    });
+    const close = vi.spyOn(f.client, "close");
+    expect(await f.records.open(f.record.path)).toEqual({ ok: false, problem: { code: "cancelled", message: "Writer closed" } });
+    expect(release).toHaveBeenCalledTimes(1);
+    expect(close).not.toHaveBeenCalled();
+  });
+
+  it("fences a late successful flush result with the original owner signal", async () => {
+    const f = await fixture();
+    const nativeLease = await f.client.records.open({ path: f.record.path }, { autosave: false });
+    const nativeFlush = vi.fn(async () => {
+      f.owner.abort(new Error("Writer closed during delivery"));
+      return { ok: true as const, record: nativeLease.session.getSnapshot().record };
+    });
+    f.nativeOpen.mockResolvedValue({
+      session: { ...nativeLease.session, flush: nativeFlush },
+      release: () => nativeLease.release(),
+    });
+    const lease = await open(f);
+    expect(await lease.session.flush({ timeoutMs: 100 })).toEqual({ ok: false, problem: { code: "cancelled", message: "Writer closed during delivery" } });
+    expect(nativeFlush).toHaveBeenCalledWith({ timeoutMs: 100, signal: f.owner.signal });
+    expect(lease.session.getNativeSnapshot().record.id).toBe(f.record.id);
+  });
+
+  it("validates the entire explicit JSON patch before changing the SDK draft", async () => {
+    const f = await fixture();
+    const lease = await open(f);
+    for (const invalid of [NaN, Infinity, new Date(), 1n]) {
+      expect(() => lease.session.patchFrontmatter({ title: "Must not change", bad: invalid })).toThrow("plain JSON values");
+      expect(lease.session.getSnapshot()).toMatchObject({ state: "saved", dirty: false, frontmatter: { title: "Draft" } });
+    }
+    lease.session.patchFrontmatter({ custom: undefined });
+    expect(lease.session.getNativeSnapshot().frontmatter.has("custom")).toBe(false);
+    expect((await f.client.pendingWrites())).toEqual([]);
+  });
+
+  it("keeps an unconfirmed write saved on this device with its mutation, then settles it without resubmitting", async () => {
+    const f = await fixture(true);
+    const lease = await open(f);
+    const update = vi.spyOn(f.client, "update");
+    lease.session.setBody("Pending draft\n");
+    // The receipt wait runs out before the flush deadline: kept on device, not recovery.
+    expect(await lease.session.flush({ timeoutMs: 25 })).toEqual({ ok: true });
+    expect(lease.session.getNativeSnapshot()).toMatchObject({ state: "saved_on_device", recovery: null, body: "Pending draft\n" });
+    const pending = await f.client.pendingWrites();
+    expect(pending).toHaveLength(1);
+    const mid = pending[0]!.receipt.mutation;
+    expect(update).toHaveBeenCalledTimes(1);
+    f.replica.confirmAll();
+    await vi.waitFor(() => expect(lease.session.getNativeSnapshot()).toMatchObject({ state: "saved", recovery: null }));
+    expect(update).toHaveBeenCalledTimes(1);
+    expect(lease.session.getNativeSnapshot().lastReceipt?.mutation).toBe(mid);
+  });
+});
diff --git a/apps/writer/src/backend/next-records.ts b/apps/writer/src/backend/next-records.ts
new file mode 100644
index 00000000..f1c50eed
--- /dev/null
+++ b/apps/writer/src/backend/next-records.ts
@@ -0,0 +1,130 @@
+import { isMdbaseError, toPlain, type MdbaseClient, type PlainValue, type RecordOpenOptions as NativeOpenOptions, type RecordSessionSnapshot as NativeSnapshot, type wire } from "@mdbase-dev/sdk";
+import type { JsonObject } from "@mdbase-dev/connect";
+
+import type { RecordLease, RecordOpenOptions, RecordSession, RecordSessionSnapshot, SessionProblem, SessionRecord, WriterRecords } from "./types.js";
+
+export interface NextWriterSession extends RecordSession {
+  /** Genuine SDK recovery/MID/receipt/write evidence. Never reconstruct it from
+   * the app's display-only JSON snapshot or manufacture a replacement intent. */
+  getNativeSnapshot(): NativeSnapshot;
+}
+
+export interface NextWriterLease extends RecordLease {
+  readonly session: NextWriterSession;
+}
+
+export type NextWriterOpenOptions = RecordOpenOptions & Pick<NativeOpenOptions, "recovery">;
+
+/** Thin application value/Result translation over the public SDK lease. No
+ * app autosave, session factory, protocol, receipt/recovery or lease engine. */
+export class NextWriterRecords implements WriterRecords {
+  private readonly releases = new Set<() => void>();
+  private disposed = false;
+  private readonly stop = () => this.dispose();
+  constructor(private readonly client: Pick<MdbaseClient, "records">, private readonly signal: AbortSignal, private readonly isCurrent: () => boolean = () => true) {
+    signal.addEventListener("abort", this.stop, { once: true });
+  }
+
+  /** Release this UI's borrowed leases only; SDK owns sessions, recovery and client. */
+  dispose(): void {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.signal.removeEventListener("abort", this.stop);
+    for (const release of [...this.releases]) release();
+  }
+
+  async open(path: string, options: NextWriterOpenOptions = {}): Promise<
+    { readonly ok: true; readonly value: NextWriterLease } |
+    { readonly ok: false; readonly problem: { readonly code: string; readonly message?: string } }
+  > {
+    try {
+      this.signal.throwIfAborted();
+      if (this.disposed || !this.isCurrent()) return { ok: false, problem: { code: "cancelled" } };
+      const lease = await this.client.records.open({ path }, { ...options, signal: this.signal });
+      if (this.signal.aborted || this.disposed || !this.isCurrent()) {
+        lease.release();
+        this.signal.throwIfAborted();
+        return { ok: false, problem: { code: "cancelled" } };
+      }
+      const native = lease.session;
+      let released = false;
+      const release = () => {
+        if (released) return;
+        released = true;
+        this.releases.delete(release);
+        lease.release();
+      };
+      const check = () => {
+        this.signal.throwIfAborted();
+        if (released || this.disposed || !this.isCurrent()) throw new DOMException("Writer view has closed", "AbortError");
+      };
+      this.releases.add(release);
+      return { ok: true, value: {
+        release,
+        session: {
+          getNativeSnapshot: () => native.getSnapshot(),
+          getSnapshot: () => snapshot(native.getSnapshot()),
+          subscribe: listener => native.subscribe(listener),
+          setBody: body => { check(); native.setBody(body); },
+          patchFrontmatter: patch => { check(); native.patchFrontmatter(Object.fromEntries(Object.entries(patch).map(([key, value]) => [key, value === undefined ? undefined : plain(value)]))); },
+          resolve: choice => { check(); native.resolve(choice); },
+          flush: async flushOptions => {
+            try {
+              check();
+              const result = await native.flush({ ...flushOptions, signal: this.signal });
+              check();
+              return result.ok ? { ok: true } : { ok: false, problem: result.problem };
+            } catch (error) {
+              return { ok: false, problem: !this.signal.aborted && (released || this.disposed || !this.isCurrent()) ? { code: "cancelled" } : problem(error, this.signal) };
+            }
+          },
+        },
+      } };
+    } catch (error) {
+      return { ok: false, problem: problem(error, this.signal) };
+    }
+  }
+}
+
+function problem(error: unknown, signal: AbortSignal): SessionProblem {
+  return isMdbaseError(error) ? error.toProblem() : {
+    code: signal.aborted ? "cancelled" : "internal",
+    message: error instanceof Error ? error.message : "The native Writer record operation could not complete.",
+  };
+}
+
+// Copy the explicit JSON patch into the public SDK's mutable plain value type;
+// preserve scalar values rather than serializing/round-tripping through JSON.
+function plain(value: unknown): PlainValue {
+  if (value === null || typeof value === "string" || typeof value === "boolean") return value;
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (Array.isArray(value)) return value.map(plain);
+  if (typeof value === "object" && value !== null && (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) {
+    return new Map(Object.entries(value).map(([key, item]) => [key, plain(item)]));
+  }
+  throw new TypeError("Writer frontmatter patches require plain JSON values.");
+}
+
+function record(view: wire.RecordView): SessionRecord {
+  return {
+    path: view.path,
+    revision: view.revision,
+    types: view.types,
+    // Display/edit view only. Native session keeps the exact Map/tag values and
+    // genuine full record witness; writes only receive the explicit app patch.
+    frontmatter: toPlain(view.frontmatter) as JsonObject,
+    ...(view.body === undefined ? {} : { body: view.body }),
+  };
+}
+
+function snapshot(value: NativeSnapshot): RecordSessionSnapshot {
+  return {
+    state: value.state,
+    body: value.body,
+    frontmatter: toPlain(new Map(value.frontmatter)) as JsonObject,
+    record: record(value.record),
+    remote: value.remote ? record(value.remote) : null,
+    dirty: value.dirty,
+    problem: value.problem,
+  };
+}
diff --git a/apps/writer/src/backend/types.ts b/apps/writer/src/backend/types.ts
index e8382819..40fee039 100644
--- a/apps/writer/src/backend/types.ts
+++ b/apps/writer/src/backend/types.ts
@@ -1,6 +1,6 @@
 // What the writer needs from a collection. Two implementations: Connect (real
 // collections) and a demo on the SDK's in-memory record authority.
-import type { JsonObject, MdbaseRecords } from "@mdbase-dev/connect";
+import type { JsonObject } from "@mdbase-dev/connect";
 import type { CslItem, StyleId, TemplateName } from "@mdbase-writer/core";
 import type { SourceAnnotation } from "@mdbase-writer/core/annotations";
 import type { CommentRecord } from "@mdbase-writer/core/comments";
@@ -56,6 +56,15 @@ export interface CollectionIndex {
    * manuscript: not comments, people, or Reader's sources and annotations.
    */
   readonly notePaths: readonly string[];
+  /** Records with no type at all: shown as notes with a calm "No type" label. */
+  readonly untypedPaths?: readonly string[];
+  /** Writer's types that can't be used because their definition has an error. */
+  readonly unavailableTypes?: readonly UnavailableType[];
+}
+export interface UnavailableType {
+  readonly name: string;
+  /** Plain copy naming the type and what is unavailable; the rest still works. */
+  readonly message: string;
 }
 
 export interface CollectionDelta {
@@ -80,6 +89,62 @@ export interface NewManuscript {
   readonly style: StyleId;
   /** An optional worked example, without invented library sources. */
   readonly starter?: boolean;
+  /** A stable name for this one creation, reused by its retries so it lands once. */
+  readonly intent?: string;
+}
+
+// This is the workspace's application port, not a concrete SDK class. The
+// current Connect sessions satisfy it unchanged; the new SDK adapter must keep
+// receipt confirmation, drafts, conflict and exact-recovery behavior intact.
+export type RecordSessionState = "saved" | "saved_on_device" | "unsaved" | "saving" | "conflict" | "recovery" | "error" | "deleted";
+
+export interface SessionProblem {
+  readonly code: string;
+  readonly message?: string;
+}
+
+export interface SessionRecord {
+  readonly path: string;
+  readonly revision: string;
+  readonly types: readonly string[];
+  readonly frontmatter: JsonObject;
+  readonly body?: string;
+}
+
+export interface RecordSessionSnapshot {
+  readonly state: RecordSessionState;
+  readonly body: string;
+  readonly frontmatter: JsonObject;
+  readonly record: SessionRecord;
+  readonly remote: SessionRecord | null;
+  readonly dirty: boolean;
+  readonly problem: SessionProblem | null;
+}
+
+export type RecordResolution = { readonly keep: "mine" | "theirs" } | { readonly body: string };
+
+export interface RecordSession {
+  getSnapshot(): RecordSessionSnapshot;
+  subscribe(listener: () => void): () => void;
+  setBody(body: string): void;
+  patchFrontmatter(patch: JsonObject): void;
+  resolve(choice: RecordResolution): void;
+  /** Flush until acknowledged, or preserve the draft with an actionable problem. */
+  flush(options?: { timeoutMs?: number }): Promise<{ readonly ok: true } | { readonly ok: false; readonly problem: SessionProblem }>;
+}
+
+export interface RecordLease {
+  readonly session: RecordSession;
+  release(): void;
+}
+
+export interface RecordOpenOptions {
+  readonly autosave?: { readonly idleMs: number } | false;
+  readonly timeoutMs?: number;
+}
+
+export interface WriterRecords {
+  open(path: string, options?: RecordOpenOptions): Promise<{ readonly ok: true; readonly value: RecordLease } | { readonly ok: false; readonly problem: SessionProblem }>;
 }
 
 export interface WriterBackend {
@@ -89,13 +154,14 @@ export interface WriterBackend {
   /** Stable, non-secret collection identity for local draft isolation. */
   readonly draftNamespace?: string;
   manuscriptBindings?(): Promise<Result<readonly ManuscriptBinding[]>>;
-  readonly records: Pick<MdbaseRecords<JsonObject>, "open">;
+  readonly records: WriterRecords;
   listManuscripts(): Promise<Result<ManuscriptSummary[]>>;
   createManuscript(input: NewManuscript): Promise<Result<string>>;
   /** Marks an existing note as a manuscript (adds the manuscript type; keeps its other types). */
   adoptManuscript(path: string): Promise<Result<string>>;
-  /** Creates a plain Markdown record at `path`, or at `path` numbered when that is taken; resolves to its path. */
-  createRecord(path: string, body: string): Promise<Result<string>>;
+  /** Creates a plain Markdown record at `path`, or at `path` numbered when that is taken; resolves to its path.
+   * `intent` names this one creation; a retry with the same `intent` lands once. */
+  createRecord(path: string, body: string, intent?: string): Promise<Result<string>>;
   index(): Promise<Result<CollectionIndex>>;
   library(): Promise<Result<LibraryEntry[]>>;
   /** Annotation identity discovery, without reading any bodies. */
diff --git a/apps/writer/src/connect/connect-popup.test.ts b/apps/writer/src/connect/connect-popup.test.ts
new file mode 100644
index 00000000..a0b18e33
--- /dev/null
+++ b/apps/writer/src/connect/connect-popup.test.ts
@@ -0,0 +1,83 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { ConnectPopupBlocked, openConnectPopup } from "./connect-popup.js";
+import { createSignInPortalUi } from "./native-signin-ui.js";
+
+afterEach(() => vi.unstubAllGlobals());
+
+function handle() {
+  return { opener: {}, closed: false, location: { href: "" }, close: vi.fn() };
+}
+
+describe("UI-owned popup handles, not native authentication", () => {
+  it("uses a detached fallback tab if the popup throws", () => {
+    const tab = handle();
+    const open = vi
+      .fn()
+      .mockImplementationOnce(() => {
+        throw new Error("blocked");
+      })
+      .mockReturnValue(tab);
+    vi.stubGlobal("window", { open });
+    const portal = openConnectPopup();
+    expect(open).toHaveBeenLastCalledWith("", "_blank");
+    expect(tab.opener).toBeNull();
+    portal.navigate("https://mdbase.test/approve");
+    expect(tab.location.href).toBe("https://mdbase.test/approve");
+  });
+  it("reports an actually blocked popup and fallback", () => {
+    vi.stubGlobal("window", { open: () => null });
+    expect(openConnectPopup).toThrow(ConnectPopupBlocked);
+  });
+  it("closes idempotently and refuses late navigation of a disposed handle", () => {
+    const popup = handle();
+    vi.stubGlobal("window", { open: () => popup });
+    const portal = openConnectPopup();
+    portal.close();
+    portal.close();
+    expect(popup.close).toHaveBeenCalledOnce();
+    expect(() => portal.navigate("https://mdbase.test/late")).toThrow(
+      "Sign-in window closed.",
+    );
+  });
+  it("keeps the original handle after SDK handoff and reuses it for reopen", () => {
+    const popup = handle();
+    const open = vi.fn(() => popup);
+    vi.stubGlobal("window", { open });
+    const ui = createSignInPortalUi();
+    ui.reserve();
+    const original = ui.open();
+    ui.reserve();
+    expect(ui.open()).toBe(original);
+    expect(open).toHaveBeenCalledOnce();
+    ui.cancel();
+    ui.cancel();
+    expect(popup.close).toHaveBeenCalledOnce();
+  });
+  it("reopens a manually closed popup without sharing a retired owner's name", () => {
+    const first = handle();
+    const second = handle();
+    const open = vi.fn().mockReturnValueOnce(first).mockReturnValue(second);
+    vi.stubGlobal("window", { open });
+    const ui = createSignInPortalUi();
+    ui.reserve();
+    const original = ui.open();
+    first.closed = true;
+    ui.reserve();
+    expect(ui.open()).not.toBe(original);
+    createSignInPortalUi().reserve();
+    expect(open.mock.calls[0]?.[1]).toBe(open.mock.calls[1]?.[1]);
+    expect(open.mock.calls[2]?.[1]).not.toBe(open.mock.calls[0]?.[1]);
+  });
+  it("does not turn display cleanup failure into an approval error", () => {
+    const popup = handle();
+    popup.close.mockImplementation(() => {
+      throw new Error("display cleanup");
+    });
+    vi.stubGlobal("window", { open: () => popup });
+    const portal = openConnectPopup();
+    expect(() => portal.close()).not.toThrow();
+    portal.close();
+    expect(popup.close).toHaveBeenCalledOnce();
+  });
+});
diff --git a/apps/writer/src/connect/connect-popup.ts b/apps/writer/src/connect/connect-popup.ts
new file mode 100644
index 00000000..2fbe49e7
--- /dev/null
+++ b/apps/writer/src/connect/connect-popup.ts
@@ -0,0 +1,61 @@
+import type { AppWebSignInPortal } from "@mdbase-dev/sdk/app-host";
+
+export class ConnectPopupBlocked extends Error {
+  constructor() {
+    super("Your browser blocked the sign-in tab.");
+  }
+}
+
+export interface ConnectPopup extends AppWebSignInPortal {
+  readonly closed: boolean;
+}
+
+/** UI-only capability: callers pass only the SDK-validated Connect URI.
+ * Keep the production popup opener so its parent can close it across origins.
+ * The tab fallback detaches its opener before navigation. */
+export function openConnectPopup(
+  name = "mdbase-connect-authorization",
+): ConnectPopup {
+  let popup: Window | null = null;
+  try {
+    popup = window.open("", name, "popup,width=620,height=760");
+  } catch {
+    /* Try a tab. */
+  }
+  if (!popup) {
+    try {
+      popup = window.open("", "_blank");
+      // A literal noopener feature returns no usable blank handle. Detach
+      // immediately instead, before the SDK supplies the navigation URI.
+      if (popup) popup.opener = null;
+    } catch {
+      try {
+        popup?.close();
+      } catch {
+        /* Display cleanup only. */
+      }
+      popup = null;
+    }
+  }
+  if (!popup) throw new ConnectPopupBlocked();
+  const original = popup;
+  let closed = false;
+  return {
+    get closed() {
+      return closed || original.closed;
+    },
+    navigate(uri) {
+      if (closed || original.closed) throw new Error("Sign-in window closed.");
+      original.location.href = uri;
+    },
+    close() {
+      if (closed) return;
+      closed = true;
+      try {
+        original.close();
+      } catch {
+        /* Display cleanup does not undo approval. */
+      }
+    },
+  };
+}
diff --git a/apps/writer/src/connect/native-signin-ui.test.ts b/apps/writer/src/connect/native-signin-ui.test.ts
new file mode 100644
index 00000000..b850c00f
--- /dev/null
+++ b/apps/writer/src/connect/native-signin-ui.test.ts
@@ -0,0 +1,185 @@
+import { describe, expect, it, vi } from "vitest";
+import type { AppWebSignInSnapshot } from "@mdbase-dev/sdk/app-host";
+import {
+  openSignInPortal,
+  SignInTabBlocked,
+  signInCopy,
+  signInPresentation,
+  unavailableCollection,
+} from "./native-signin-ui";
+
+function snapshot(
+  patch: Partial<AppWebSignInSnapshot> = {},
+): AppWebSignInSnapshot {
+  return {
+    status: "signed_out",
+    signIn: null,
+    collections: [],
+    selectedCollectionId: null,
+    problem: null,
+    timing: null,
+    ...patch,
+  };
+}
+const paired: NonNullable<AppWebSignInSnapshot["signIn"]> = {
+  requestId: "request",
+  installationId: "installation",
+  deviceId: "device",
+  appId: "app",
+  kind: "app-runtime",
+  verificationUri: "https://mdbase.test/approve",
+  state: "paired",
+  accountId: "account",
+  accountEmail: "writer@example.test",
+  collectionIds: [],
+  createCollections: false,
+  requestedCreateCollections: false,
+};
+
+describe("native sign-in presentation, not an authentication engine", () => {
+  it("uses canonical signed-out wording", () => {
+    expect(signInPresentation(snapshot(), "TaskNotes Planner").message).toBe(
+      "Sign in with your mdbase account to sync TaskNotes Planner across your devices.",
+    );
+  });
+  it("renders SDK authorizing without introducing an app poller", () => {
+    const view = signInPresentation(
+      snapshot({ status: "authorizing" }),
+      "Planner",
+    );
+    expect(view.message).toBe("Waiting for approval in the mdbase tab…");
+    expect(view.waiting).toBe(true);
+  });
+  it("shows email only from a paired SDK view", () => {
+    expect(
+      signInPresentation(
+        snapshot({ status: "unselected", signIn: paired }),
+        "Planner",
+      ).message,
+    ).toBe("Signed in as writer@example.test");
+    expect(
+      signInPresentation(
+        snapshot({
+          status: "authorizing",
+          signIn: { ...paired, state: "account_selected" },
+        }),
+        "Planner",
+      ).identity,
+    ).toBeNull();
+  });
+  it("does not invent an email or use account IDs as labels", () => {
+    const view = signInPresentation(
+      snapshot({
+        status: "unselected",
+        signIn: { ...paired, accountEmail: null },
+      }),
+      "Planner",
+    );
+    expect(view.identity).toBeNull();
+    expect(view.message).toBe(signInCopy.unavailable);
+    expect(view.message).not.toContain(paired.accountId);
+  });
+  it("uses actual selected collection metadata for opening", () => {
+    const view = signInPresentation(
+      snapshot({
+        status: "opening",
+        signIn: paired,
+        selectedCollectionId: "selected",
+        collections: [
+          { collectionId: "selected", displayName: "Research", role: "owner" },
+        ],
+      }),
+      "Planner",
+    );
+    expect(view.message).toBe("Signed in. Opening Research…");
+  });
+  it("refuses to invent a collection name from an identifier", () => {
+    const view = signInPresentation(
+      snapshot({ status: "opening", selectedCollectionId: "private-id" }),
+      "Planner",
+    );
+    expect(view.message).not.toContain("private-id");
+  });
+  it("does not mistake a generic refusal for the user declining", () => {
+    expect(
+      signInPresentation(
+        snapshot({ status: "blocked", problem: "refused" }),
+        "Planner",
+      ).message,
+    ).toBe(signInCopy.interrupted);
+  });
+  it("does not imply saved/sync or reminders capability from authorization", () => {
+    const view = signInPresentation(
+      snapshot({ status: "unselected", signIn: paired }),
+      "Planner",
+    );
+    expect(JSON.stringify(view)).not.toMatch(
+      /saved on this device|reminders|Set up|Continue setup/,
+    );
+    expect(view.unavailable).toBe(true);
+  });
+  it("clears visible identity after SDK closure", () => {
+    const view = signInPresentation(
+      snapshot({ status: "closed", signIn: paired }),
+      "Planner",
+    );
+    expect(view.paired).toBe(false);
+    expect(view.identity).toBeNull();
+  });
+  it("has a distinct blocked-tab action without rendering raw errors", () => {
+    const view = signInPresentation(snapshot(), "Planner", "tab_blocked");
+    expect(view.message).toBe("Your browser blocked the sign-in tab.");
+    expect(view.action).toBe("Open sign-in");
+  });
+  it("opens the named production popup synchronously with its trusted opener", () => {
+    const opener = {};
+    const popup = {
+      opener,
+      closed: false,
+      location: { href: "" },
+      close: vi.fn(),
+    };
+    vi.stubGlobal("window", { open: vi.fn(() => popup) });
+    try {
+      const portal = openSignInPortal();
+      expect(window.open).toHaveBeenCalledWith(
+        "",
+        "mdbase-connect-authorization",
+        "popup,width=620,height=760",
+      );
+      expect(popup.opener).toBe(opener);
+      portal.navigate("https://mdbase.test/approve");
+      expect(popup.location.href).toBe("https://mdbase.test/approve");
+      portal.close();
+      expect(popup.close).toHaveBeenCalledOnce();
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+  it("distinguishes an actually blocked tab", () => {
+    vi.stubGlobal("window", { open: () => null });
+    try {
+      expect(openSignInPortal).toThrow(SignInTabBlocked);
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+  it("the unavailable collection callback never manufactures a connection", async () => {
+    // Only signal is observed; fake host/scope/collection data is not consumed.
+    await expect(
+      unavailableCollection({
+        signal: new AbortController().signal,
+      } as Parameters<typeof unavailableCollection>[0]),
+    ).rejects.toThrow(signInCopy.unavailable);
+  });
+  it("preserves original cancellation before the unavailable boundary", async () => {
+    const controller = new AbortController();
+    const reason = new Error("original cancelled");
+    controller.abort(reason);
+    await expect(
+      unavailableCollection({ signal: controller.signal } as Parameters<
+        typeof unavailableCollection
+      >[0]),
+    ).rejects.toBe(reason);
+  });
+});
diff --git a/apps/writer/src/connect/native-signin-ui.ts b/apps/writer/src/connect/native-signin-ui.ts
new file mode 100644
index 00000000..0d30a520
--- /dev/null
+++ b/apps/writer/src/connect/native-signin-ui.ts
@@ -0,0 +1,149 @@
+import { AppWebSignInSession } from "@mdbase-dev/sdk/app-host";
+import type {
+  AppWebSignInSessionOptions,
+  AppWebSignInSnapshot,
+} from "@mdbase-dev/sdk/app-host";
+import { openConnectPopup, type ConnectPopup } from "./connect-popup.js";
+export { ConnectPopupBlocked as SignInTabBlocked } from "./connect-popup.js";
+
+export type NativeSignInSession = Pick<
+  AppWebSignInSession<never>,
+  | "getSnapshot"
+  | "subscribe"
+  | "start"
+  | "authorize"
+  | "renewExpiredPairing"
+  | "forget"
+  | "close"
+  | "setForeground"
+>;
+
+export const signInCopy = Object.freeze({
+  signIn: "Sign in",
+  waiting: "Waiting for approval in the mdbase tab…",
+  reopen: "Open the mdbase tab again",
+  tabBlocked: "Your browser blocked the sign-in tab.",
+  openSignIn: "Open sign-in",
+  interrupted: "Sign-in was interrupted. Please try again.",
+  signOut: "Sign out",
+  unavailable: "Opening collections isn't available in this build yet.",
+});
+
+/** UI-only public portal capability. The SDK supplies the validated URI. */
+export const openSignInPortal = openConnectPopup;
+
+// Popup names are UI ownership identities, never native IDs or namespaces.
+let nextPortalKey = 0;
+
+/** Keep the owned handle after SDK handoff, including when it was closed by hand. */
+export function createSignInPortalUi() {
+  const name = `mdbase-writer-connect-${++nextPortalKey}`;
+  let active: ConnectPopup | null = null;
+  return {
+    reserve() {
+      if (!active || active.closed) active = openSignInPortal(name);
+    },
+    open() {
+      if (!active || active.closed) active = openSignInPortal(name);
+      return active;
+    },
+    cancel() {
+      const original = active;
+      active = null;
+      original?.close();
+    },
+  };
+}
+
+// React presentation identity only, never a native actor/record/mutation ID.
+let nextViewKey = 0;
+
+export interface NativeSignInBinding {
+  session: NativeSignInSession;
+  portal: ReturnType<typeof createSignInPortalUi>;
+  /** UI-only React identity. */
+  viewKey: number;
+}
+
+/** Only a public SDK constructor and UI portal; no collection/SQL factory. */
+export function createNativeSignIn(
+  options: Omit<
+    AppWebSignInSessionOptions<never>,
+    "openPortal" | "openCollection" | "autoSelect"
+  >,
+): NativeSignInBinding {
+  options.signal.throwIfAborted();
+  const portal = createSignInPortalUi();
+  const session = new AppWebSignInSession<never>({
+    ...options,
+    openPortal: portal.open,
+    openCollection: unavailableCollection,
+    autoSelect: "never",
+  });
+  return { session, portal, viewKey: ++nextViewKey };
+}
+
+/** Reserve in the user gesture BEFORE any asynchronous SDK renewal/start. */
+export async function authorizeNativeSignIn(
+  session: NativeSignInSession,
+  portal: ReturnType<typeof createSignInPortalUi>,
+) {
+  portal.reserve();
+  try {
+    if (session.getSnapshot().status === "not_started") await session.start();
+    if (session.getSnapshot().problem === "expired")
+      await session.renewExpiredPairing();
+    return await session.authorize();
+  } catch (error) {
+    portal.cancel();
+    throw error;
+  }
+}
+
+/** Explicit pre-factory boundary, not a pretend collection or setup result. */
+export const unavailableCollection: AppWebSignInSessionOptions<never>["openCollection"] =
+  async ({ signal }) => {
+    signal.throwIfAborted();
+    throw new Error(signInCopy.unavailable);
+  };
+
+export function signInPresentation(
+  snapshot: AppWebSignInSnapshot,
+  appName: string,
+  problem: "tab_blocked" | "interrupted" | null = null,
+) {
+  const paired =
+    snapshot.status !== "closed" && snapshot.signIn?.state === "paired";
+  const email = paired ? snapshot.signIn?.accountEmail : null;
+  const identity = email ? `Signed in as ${email}` : null;
+  const selected = snapshot.collections.find(
+    ({ collectionId }) => collectionId === snapshot.selectedCollectionId,
+  );
+  const waiting = snapshot.status === "authorizing" && problem === null;
+  const interrupted =
+    problem === "interrupted" || snapshot.status === "blocked";
+  const message =
+    problem === "tab_blocked"
+      ? signInCopy.tabBlocked
+      : interrupted
+        ? signInCopy.interrupted
+        : waiting
+          ? signInCopy.waiting
+          : snapshot.status === "opening" && selected
+            ? `Signed in. Opening ${selected.displayName}…`
+            : (identity ??
+              (paired
+                ? signInCopy.unavailable
+                : `Sign in with your mdbase account to sync ${appName} across your devices.`));
+  return {
+    message,
+    identity: identity === message ? null : identity,
+    waiting,
+    paired,
+    unavailable: paired && message !== signInCopy.unavailable,
+    error: problem !== null || snapshot.status === "blocked",
+    action:
+      problem === "tab_blocked" ? signInCopy.openSignIn : signInCopy.signIn,
+    disabled: ["starting", "opening", "closed"].includes(snapshot.status),
+  };
+}
diff --git a/apps/writer/src/connect/sdk-application.test.ts b/apps/writer/src/connect/sdk-application.test.ts
new file mode 100644
index 00000000..5e1ed78e
--- /dev/null
+++ b/apps/writer/src/connect/sdk-application.test.ts
@@ -0,0 +1,50 @@
+// @vitest-environment jsdom
+import { afterEach, expect, it, vi } from "vitest";
+import { createWriterMdbase, deliverWriterGrantReturn, isWriterGrantReturn, writerMdbaseForBuild } from "./sdk-application.js";
+import manifest from "../generated/mdbase-app.json";
+
+afterEach(() => {vi.restoreAllMocks(); vi.unstubAllGlobals();});
+
+it("defaults only LAB builds to the SDK entry while production keeps the legacy entry", () => {
+  expect(writerMdbaseForBuild("production")).toBeUndefined();
+  expect(writerMdbaseForBuild(undefined)).toBeUndefined();
+  const entry = writerMdbaseForBuild("lab");
+  expect(entry).toBeDefined();
+  // Node/jsdom need not host a native Worker to prove the selected entry.
+  expect(entry?.getSnapshot().readiness.assessment).toBeNull();
+  expect(entry?.connection("unopened")).toBeNull();
+});
+
+it("constructs the actual live public entry without registration, Worker or popup IO", async () => {
+  const worker = vi.fn(() => {throw new Error("No test Worker allocation");});
+  const channel = vi.fn(() => {throw new Error("No test channel allocation");});
+  vi.stubGlobal("Worker", worker); vi.stubGlobal("MessageChannel", channel);
+  const fetch = vi.spyOn(globalThis, "fetch");
+  const popup = vi.spyOn(window, "open");
+  const original = JSON.stringify(manifest);
+  // Explicit fixture UUID, not a claimed CP registration or runtime acceptance.
+  const entry = createWriterMdbase({registeredApplicationId: "00000000-0000-4000-8000-000000000001", environment: "lab"});
+  expect(entry.getSnapshot()).toMatchObject({status: "not_started", problem: null,
+    selection: {state: "none", requested: {collectionId: null, approved: false}, usable: null}});
+  expect(entry.connection("unopened")).toBeNull();
+  expect(JSON.stringify(manifest)).toBe(original);
+  expect(worker).not.toHaveBeenCalled(); expect(channel).not.toHaveBeenCalled();
+  expect(fetch).not.toHaveBeenCalled(); expect(popup).not.toHaveBeenCalled();
+  await entry.close();
+});
+
+it("recognises the Private collection consent return at the redirect URI, in the SDK entry only", async () => {
+  const home = manifest.redirect_uris[0]!;
+  expect(isWriterGrantReturn("lab", `${home}?state=s1&code=c1`)).toBe(true);
+  expect(isWriterGrantReturn("lab", `${home}?state=s1&error=access_denied`)).toBe(true);
+  expect(isWriterGrantReturn("lab", `${home}?collection=x`)).toBe(false);
+  expect(isWriterGrantReturn("lab", `${new URL("manuscripts", home).href}?state=s1&code=c1`)).toBe(false);
+  // The legacy entry's own OAuth callback shares the root: never intercepted there.
+  expect(isWriterGrantReturn("production", `${home}?state=s1&code=c1`)).toBe(false);
+
+  const posted: unknown[] = [];
+  class Channel { constructor(readonly name: string) {} postMessage(value: unknown) {posted.push([this.name, value]);} close() {} }
+  vi.stubGlobal("BroadcastChannel", Channel);
+  await deliverWriterGrantReturn(`${home}?state=s1&code=c1`);
+  expect(posted).toEqual([["mdbase.app-grant.v1", {type: "callback", url: `${home}?state=s1&code=c1`}]]);
+});
diff --git a/apps/writer/src/connect/sdk-application.ts b/apps/writer/src/connect/sdk-application.ts
new file mode 100644
index 00000000..d3d47956
--- /dev/null
+++ b/apps/writer/src/connect/sdk-application.ts
@@ -0,0 +1,35 @@
+import { createMdbase, type Mdbase, type MdbaseApplicationDeclaration } from "@mdbase-dev/sdk";
+import manifest from "../generated/mdbase-app.json";
+
+/** App declaration only. The logical manifest ID is not a registration receipt;
+ * SDK registration resolves the genuine native binding. An explicit registered
+ * ID, when supplied, must match that binding. No app runtime/storage callbacks. */
+export function createWriterMdbase(input: {
+  registeredApplicationId?: string;
+  environment: MdbaseApplicationDeclaration["environment"];
+}): Mdbase {
+  return createMdbase({ id: input.registeredApplicationId ?? manifest.id, name: manifest.name,
+    origin: new URL(manifest.homepage).origin, environment: input.environment, manifest },
+  {readiness: {typeIssues: "degrade"}});
+}
+
+/** LAB default only; production waits for its owner-provided trust asset. */
+export function writerMdbaseForBuild(environment: string | undefined): Mdbase | undefined {
+  return usesSdk(environment) ? createWriterMdbase({environment: "lab"}) : undefined;
+}
+const usesSdk = (environment: string | undefined): boolean => environment === "lab";
+
+/** The SDK's Private-collection consent popup lands back on the manifest's
+ * redirect URI (the app root) with `state` and `code` or `error`. Only the SDK
+ * entry uses that popup; the legacy entry's own callback is left alone. */
+export function isWriterGrantReturn(environment: string | undefined, href: string): boolean {
+  if (!usesSdk(environment)) return false;
+  const url = new URL(href);
+  const redirect = manifest.redirect_uris.map((uri) => new URL(uri)).find((uri) => uri.origin === url.origin) ?? new URL("/", url.origin);
+  return url.pathname === redirect.pathname && url.searchParams.has("state") && (url.searchParams.has("code") || url.searchParams.has("error"));
+}
+
+/** Hand the consent result to the waiting Writer tab; it closes this popup. */
+export async function deliverWriterGrantReturn(href: string): Promise<void> {
+  (await import("@mdbase-dev/sdk/app-grant")).deliverAppGrantCallback(href);
+}
diff --git a/apps/writer/src/editor/Editor.recovery.test.tsx b/apps/writer/src/editor/Editor.recovery.test.tsx
new file mode 100644
index 00000000..19489b85
--- /dev/null
+++ b/apps/writer/src/editor/Editor.recovery.test.tsx
@@ -0,0 +1,52 @@
+// @vitest-environment jsdom
+import { act, cleanup, render } from "@testing-library/react";
+import { EditorView } from "@codemirror/view";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { Editor, type EditorProps, type RetainedEditor } from "./Editor.js";
+import { DEFAULT_LAYOUT } from "../ui/layout.js";
+
+beforeEach(() => {
+  // Layout is exercised in the real-browser recovery regression. This test
+  // checks CodeMirror's editing facets without jsdom's absent text geometry.
+  vi.spyOn(window, "requestAnimationFrame").mockReturnValue(0);
+});
+afterEach(() => { cleanup(); vi.restoreAllMocks(); });
+
+it("advertises paused editing and becomes editable after recovery is reviewed", () => {
+  const props: EditorProps = {
+    states: new Map<string, RetainedEditor>(), path: "main.md", text: "Collection text",
+    readOnly: true, livePreview: false, diagnostics: [],
+    completion: { library: [], labels: [], recordPaths: [] },
+    insight: { library: new Map(), references: new Map(), labels: new Map() },
+    onChange: vi.fn(),
+  };
+  const rendered = render(<Editor {...props} />);
+  const editor = () => {
+    const element = rendered.container.querySelector<HTMLElement>(".cm-editor");
+    if (!element) throw new Error("Missing editor");
+    return EditorView.findFromDOM(element)!;
+  };
+  expect(editor().state.readOnly).toBe(true);
+  expect(editor().contentDOM.getAttribute("contenteditable")).toBe("false");
+  expect(editor().contentDOM.getAttribute("aria-readonly")).toBe("true");
+  rendered.rerender(<Editor {...props} readOnly={false} />);
+  expect(editor().state.readOnly).toBe(false);
+  expect(editor().contentDOM.getAttribute("contenteditable")).toBe("true");
+  expect(editor().state.doc.toString()).toBe("Collection text");
+});
+
+it("keeps every source line visible with workspace defaults, wherever the caret is", () => {
+  const text = "first\nsecond\n\nthird\nfourth";
+  const props: EditorProps = {
+    ...DEFAULT_LAYOUT, path: "lines.md", text, readOnly: false, diagnostics: [],
+    completion: { library: [], labels: [], recordPaths: [] },
+    insight: { library: new Map(), references: new Map(), labels: new Map() }, onChange: vi.fn(),
+  };
+  const rendered = render(<Editor {...props} />);
+  const view = EditorView.findFromDOM(rendered.container.querySelector<HTMLElement>(".cm-editor")!)!;
+  const lines = () => [...view.contentDOM.querySelectorAll(".cm-line")].map(el => el.textContent);
+  expect(lines()).toEqual(text.split("\n"));
+  act(() => view.dispatch({ selection: { anchor: text.length } }));
+  expect(lines()).toEqual(text.split("\n"));
+  expect(view.state.doc.toString()).toBe(text);
+});
diff --git a/apps/writer/src/editor/Editor.tsx b/apps/writer/src/editor/Editor.tsx
index cf27a4eb..f6e2d637 100644
--- a/apps/writer/src/editor/Editor.tsx
+++ b/apps/writer/src/editor/Editor.tsx
@@ -6,7 +6,7 @@ import { defaultKeymap, history, historyKeymap, indentWithTab } from "@codemirro
 import { bracketMatching, indentOnInput } from "@codemirror/language";
 import { lintGutter, setDiagnostics, type Diagnostic as CmDiagnostic } from "@codemirror/lint";
 import { highlightSelectionMatches, search, searchKeymap } from "@codemirror/search";
-import { Annotation, Compartment, EditorSelection, EditorState, StateEffect, Transaction } from "@codemirror/state";
+import { Annotation, EditorSelection, EditorState, StateEffect, Transaction } from "@codemirror/state";
 import { drawSelection, EditorView, highlightActiveLine, keymap, placeholder } from "@codemirror/view";
 import { memo, useEffect, useLayoutEffect, useRef } from "react";
 
@@ -17,7 +17,6 @@ import { writerCompletions, type CompletionData } from "./completions.js";
 import { fixesFor } from "./fixes.js";
 import { formattingKeymap, makeLink, toggleBold, toggleCode, toggleItalic, type InlineFormat } from "./formatting.js";
 import { collapseToEnd, selectionBar, type SelectionAction } from "./selection-bar.js";
-import { joinLines as joinLinesExtension } from "./join-lines.js";
 import { writerInsight, type EditorInsight, type FollowTarget } from "./insight.js";
 import { writerLanguage } from "./language.js";
 import { livePreview as livePreviewExtension, refreshLivePreview } from "./live-preview.js";
@@ -56,8 +55,6 @@ export interface EditorProps {
   path: string;
   text: string;
   readOnly: boolean;
-  /** Draws a paragraph's soft line breaks as spaces, so hard-wrapped text flows. */
-  joinLines?: boolean;
   /** Draws citations, figures, tables and marks as the manuscript reads, rather than as Markdown source. */
   livePreview?: boolean;
   /** Images pasted or dropped into the text, to store in the collection as figures. */
@@ -88,7 +85,7 @@ export interface EditorProps {
   onSelectionAction?(action: SelectionAction, selected: string): void;
 }
 
-export const Editor = memo(function Editor({ states, path, text, readOnly, joinLines = false, livePreview = true, onImageFiles, diagnostics, completion, inserts, insight, onChange, onReady, onCursor, onFollow, chapters, onFindSource, anchors, activeComment = null, onAnchor, anchorCard, onSelectionAction }: EditorProps) {
+export const Editor = memo(function Editor({ states, path, text, readOnly, livePreview = true, onImageFiles, diagnostics, completion, inserts, insight, onChange, onReady, onCursor, onFollow, chapters, onFindSource, anchors, activeComment = null, onAnchor, anchorCard, onSelectionAction }: EditorProps) {
   const host = useRef<HTMLDivElement>(null);
   const view = useRef<EditorView | null>(null);
   // Texts this editor reported, newest last. The session echoes them back
@@ -98,7 +95,6 @@ export const Editor = memo(function Editor({ states, path, text, readOnly, joinL
   // Only a real change to the problems is dispatched: redrawing lint marks
   // replaces the line's DOM, which would cancel a hover in progress.
   const shownDiagnostics = useRef("");
-  const joining = useRef(new Compartment());
   const preview = useRef<ReturnType<typeof livePreviewExtension> | null>(null);
   const latest = useRef({ onChange, completion, inserts, insight, onCursor, onFollow, chapters, onFindSource, onAnchor, anchorCard, onSelectionAction, onImageFiles });
   latest.current = { onChange, completion, inserts, insight, onCursor, onFollow, chapters, onFindSource, onAnchor, anchorCard, onSelectionAction, onImageFiles };
@@ -157,8 +153,8 @@ export const Editor = memo(function Editor({ states, path, text, readOnly, joinL
             latest.current.onSelectionAction?.(action, selected);
           }),
           EditorView.lineWrapping,
-          joining.current.of(joinLines ? joinLinesExtension() : []),
           EditorState.readOnly.of(readOnly),
+          EditorView.editable.of(!readOnly),
           placeholder("Write in Markdown. Cite with [@citekey]; type / to add a footnote, figure or table."),
           EditorView.contentAttributes.of({ "aria-label": `Markdown for ${path}`, spellcheck: "true", autocapitalize: "sentences" }),
           EditorView.updateListener.of((u) => {
@@ -282,10 +278,6 @@ export const Editor = memo(function Editor({ states, path, text, readOnly, joinL
     v.dispatch({ changes: { from, to: endA, insert: text.slice(from, endB) }, annotations: [remote.of(true), Transaction.addToHistory.of(false)] });
   }, [text]);
 
-  useEffect(() => {
-    view.current?.dispatch({ effects: joining.current.reconfigure(joinLines ? joinLinesExtension() : []) });
-  }, [joinLines]);
-
   useEffect(() => {
     if (view.current) preview.current?.set(view.current, livePreview);
   }, [livePreview]);
diff --git a/apps/writer/src/editor/join-lines.test.ts b/apps/writer/src/editor/join-lines.test.ts
deleted file mode 100644
index 7709814f..00000000
--- a/apps/writer/src/editor/join-lines.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { EditorState } from "@codemirror/state";
-import { describe, expect, it } from "vitest";
-
-import { joinSoftBreaks, softBreaks } from "./join-lines.js";
-import { writerLanguage } from "./language.js";
-
-/** The body with each soft break shown joined drawn as "⏎". */
-function joined(doc: string): string {
-  const state = EditorState.create({ doc, extensions: writerLanguage() });
-  let out = "";
-  let at = 0;
-  for (const { from, to } of softBreaks(state)) {
-    out += `${doc.slice(at, from)}⏎`;
-    at = to;
-  }
-  return out + doc.slice(at);
-}
-
-describe("joining hard-wrapped lines", () => {
-  it("joins a paragraph's lines, not paragraphs", () => {
-    expect(joined("One line\nand the next.\n\nA new paragraph\ngoes on.")).toBe("One line⏎and the next.\n\nA new paragraph⏎goes on.");
-  });
-
-  it("keeps hard breaks, headings, lists, code and chapter embeds on their own lines", () => {
-    expect(joined("Two spaces  \nkeep a break.\nA backslash\\\nkeeps one too.")).toBe("Two spaces  \nkeep a break.⏎A backslash\\\nkeeps one too.");
-    expect(joined("# Heading\nText\n\n- one\n- two\n\n```\na\nb\n```")).toBe("# Heading\nText\n\n- one\n- two\n\n```\na\nb\n```");
-    expect(joined("Before the chapter\n![[chapters/one]]")).toBe("Before the chapter\n![[chapters/one]]");
-  });
-
-  it("joins a list item's and a footnote's continuation lines past their indent", () => {
-    expect(joined("- an item\n  continued")).toBe("- an item⏎continued");
-    expect(joined("[^a]: A note\n    continued.")).toBe("[^a]: A note⏎continued.");
-  });
-
-  it("joins a field's soft breaks as spaces", () => {
-    expect(joinSoftBreaks("An abstract \n  wrapped\nby hand.\n\nSecond  \nline")).toBe("An abstract wrapped by hand.\n\nSecond  \nline");
-  });
-});
diff --git a/apps/writer/src/editor/join-lines.ts b/apps/writer/src/editor/join-lines.ts
deleted file mode 100644
index bdc6bb2d..00000000
--- a/apps/writer/src/editor/join-lines.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Hard-wrapped paragraphs shown as flowing text. A line break inside a
-// paragraph or footnote reads as a space in Markdown, so it is drawn as one
-// and the editor wraps the paragraph to its own width. The text keeps its
-// breaks; only how they are shown changes.
-import { syntaxTree } from "@codemirror/language";
-import { RangeSetBuilder, StateField, type EditorState, type Extension } from "@codemirror/state";
-import { Decoration, EditorView, type DecorationSet } from "@codemirror/view";
-
-import { EMBED_LINE } from "../workspace/chapters.js";
-
-// The break (and the next line's indent) is hidden, and the space is drawn
-// after the line's last character by CSS (.cm-soft-break::after). A widget
-// holding the space would be an atomic box the browser can wrap before,
-// starting the next visual line with a space.
-const hidden = Decoration.replace({});
-const spaceAfter = Decoration.mark({ class: "cm-soft-break" });
-
-/** A line ending in two spaces or a backslash is a hard break, kept as a break. */
-const HARD_BREAK = /(?: {2,}|\\)$/;
-
-/**
- * A field's text (the abstract) with its soft line breaks as spaces, as
- * joinLines() shows a body. Markdown reads them as spaces, so saving this form
- * after an edit changes nothing in the typeset text.
- */
-export function joinSoftBreaks(text: string): string {
-  const lines = text.split("\n");
-  let out = lines[0] ?? "";
-  for (let i = 1; i < lines.length; i++) {
-    const before = lines[i - 1] ?? "";
-    const line = lines[i] ?? "";
-    const soft = before.trim() && line.trim() && !HARD_BREAK.test(before);
-    out = soft ? `${out.trimEnd()} ${line.trimStart()}` : `${out}\n${line}`;
-  }
-  return out;
-}
-
-/** Where each soft line break in a paragraph or footnote runs to (the next line's text, past its indent). */
-export function softBreaks(state: EditorState): { from: number; to: number }[] {
-  const doc = state.doc;
-  const out: { from: number; to: number }[] = [];
-  syntaxTree(state).iterate({
-    enter(node) {
-      if (node.name !== "Paragraph" && node.name !== "FootnoteDefinition") return;
-      const last = doc.lineAt(node.to).number;
-      for (let n = doc.lineAt(node.from).number; n < last; n++) {
-        const line = doc.line(n);
-        const next = doc.line(n + 1);
-        if (!line.text.trim() || !next.text.trim() || HARD_BREAK.test(line.text)) continue;
-        // A chapter embed is shown as a card on its own line.
-        if (EMBED_LINE.test(line.text) || EMBED_LINE.test(next.text)) continue;
-        out.push({ from: line.to, to: next.from + (/^[ \t>]*/.exec(next.text)?.[0].length ?? 0) });
-      }
-      return false;
-    },
-  });
-  return out;
-}
-
-interface Joins {
-  readonly spaces: DecorationSet;
-  readonly breaks: DecorationSet;
-}
-
-function build(state: EditorState): Joins {
-  const spaces = new RangeSetBuilder<Decoration>();
-  const breaks = new RangeSetBuilder<Decoration>();
-  for (const { from, to } of softBreaks(state)) {
-    spaces.add(from - 1, from, spaceAfter);
-    breaks.add(from, to, hidden);
-  }
-  return { spaces: spaces.finish(), breaks: breaks.finish() };
-}
-
-/** Draws soft line breaks as spaces (see the file comment). */
-export function joinLines(): Extension {
-  const field = StateField.define<Joins>({
-    create: build,
-    update(value, tr) {
-      // The tree grows as the parser catches up, as well as on edits.
-      return tr.docChanged || syntaxTree(tr.state) !== syntaxTree(tr.startState) ? build(tr.state) : value;
-    },
-    // Replacing across line breaks has to come from state, not a view plugin.
-    provide: (f) => [
-      EditorView.decorations.from(f, (j) => j.spaces),
-      EditorView.decorations.from(f, (j) => j.breaks),
-      EditorView.atomicRanges.of((view) => view.state.field(f).breaks),
-    ],
-  });
-  return field;
-}
diff --git a/apps/writer/src/editor/language.test.ts b/apps/writer/src/editor/language.test.ts
new file mode 100644
index 00000000..1a4c5b2f
--- /dev/null
+++ b/apps/writer/src/editor/language.test.ts
@@ -0,0 +1,49 @@
+import { insertNewlineAndIndent, history, undo, redo } from "@codemirror/commands";
+import { syntaxTree } from "@codemirror/language";
+import { EditorState, type StateCommand, type Transaction } from "@codemirror/state";
+import { keymap } from "@codemirror/view";
+import { describe, expect, it } from "vitest";
+import { writerLanguage } from "./language.js";
+
+function editing(doc: string) {
+  let state = EditorState.create({ doc, selection: { anchor: doc.length }, extensions: [writerLanguage(), history()] });
+  const target = { get state() { return state; }, dispatch(tr: Transaction) { state = tr.state; } };
+  return {
+    get state() { return state; },
+    text() { return state.doc.toString(); },
+    enter() {
+      const bindings = state.facet(keymap).flat().filter(b => b.key === "Enter" && b.run);
+      if (!bindings.some(b => (b.run as StateCommand)(target))) insertNewlineAndIndent(target);
+    },
+    type(text: string) { for (const ch of text) target.dispatch(state.update(state.replaceSelection(ch), { userEvent: "input.type" })); },
+    undo() { return undo(target); }, redo() { return redo(target); },
+  };
+}
+
+describe("Markdown list editing", () => {
+  for (const start of ["- one", "- one\n- two", "1. one\n2. two"]) {
+    it(`exits ${JSON.stringify(start)} into a real paragraph`, () => {
+      const e = editing(start); e.enter(); e.enter(); e.type("after");
+      expect(e.text()).toBe(`${start}\n\nafter`);
+      expect(syntaxTree(e.state).topNode.lastChild?.name).toBe("Paragraph");
+    });
+  }
+  for (const [start, text, result] of [["- one", "- two", "- one\n- two"], ["- one", "* two", "- one\n* two"], ["1. one", "2. two", "1. one\n2. two"], ["- parent\n  - child", "- next", "- parent\n  - child\n  - next"]]) {
+    it(`does not double a manually typed marker after ${JSON.stringify(start)}`, () => {
+      const e = editing(start!); e.enter(); e.type(text!); expect(e.text()).toBe(result);
+    });
+  }
+  it("keeps automatic continuation when only item text is typed", () => {
+    const e = editing("- one"); e.enter(); e.type("two"); expect(e.text()).toBe("- one\n- two");
+  });
+  it("does not mistake a numeric item body for an explicit numbered marker", () => {
+    const e = editing("1. one"); e.enter(); e.type("2026 is a year"); expect(e.text()).toBe("1. one\n2. 2026 is a year");
+  });
+  it("preserves explicitly authored nested Markdown", () => {
+    const e = editing("- "); e.type("- nested"); expect(e.text()).toBe("- - nested");
+  });
+  it("keeps ordinary Enter as a literal newline and round-trips undo/redo", () => {
+    const e = editing("plain"); e.enter(); e.type("next"); const body=e.text(); expect(body).toBe("plain\nnext");
+    expect(e.undo()).toBe(true); expect(e.redo()).toBe(true); expect(e.text()).toBe(body);
+  });
+});
diff --git a/apps/writer/src/editor/language.ts b/apps/writer/src/editor/language.ts
index b04a39d9..9392577d 100644
--- a/apps/writer/src/editor/language.ts
+++ b/apps/writer/src/editor/language.ts
@@ -1,7 +1,9 @@
 // CodeMirror language for the writer's Markdown dialect: the same lezer
 // extensions the translator parses with, plus highlighting for them.
-import { markdown, markdownLanguage } from "@codemirror/lang-markdown";
+import { deleteMarkupBackward, insertNewlineContinueMarkupCommand, markdown, markdownLanguage } from "@codemirror/lang-markdown";
 import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
+import { Annotation, EditorState, Prec, StateField, type StateCommand } from "@codemirror/state";
+import { keymap } from "@codemirror/view";
 import { styleTags, tags as t, Tag } from "@lezer/highlight";
 import type { MarkdownConfig } from "@lezer/markdown";
 import { writerMarkdown } from "@mdbase-writer/core/markdown";
@@ -47,6 +49,66 @@ const style = HighlightStyle.define([
   { tag: writerTags.embed, color: "var(--connected)", fontFamily: "var(--mono)", fontSize: "0.9em" },
 ]);
 
+// Provenance for a fresh machine-inserted list marker. It lasts only while the
+// next input could be an explicit marker; manually authored nested lists are
+// never normalized. No body text or provenance is stored outside this editor.
+interface AutoMarker { readonly from: number; readonly to: number; readonly text: string }
+const generatedMarkup = Annotation.define<boolean>();
+const autoMarker = StateField.define<AutoMarker | null>({
+  create: () => null,
+  update(value, tr) {
+    if (tr.annotation(generatedMarkup)) {
+      const { main, ranges } = tr.state.selection;
+      const line = tr.state.doc.lineAt(main.head);
+      const match = /^([ \t]*)(?:[-*+]|\d+[.)])[ \t]+$/.exec(line.text);
+      return ranges.length === 1 && main.empty && main.head === line.to && match
+        ? { from: line.from + match[1]!.length, to: line.to, text: line.text.slice(match[1]!.length) }
+        : null;
+    }
+    if (!value || (tr.selection && !tr.docChanged)) return null;
+    if (!tr.docChanged) return value;
+    if (!tr.isUserEvent("input")) return null;
+    const from = tr.changes.mapPos(value.from, 1), to = tr.changes.mapPos(value.to, -1);
+    if (tr.newDoc.sliceString(from, to) !== value.text) return null;
+    const tail = tr.newDoc.sliceString(to, tr.newDoc.lineAt(to).to);
+    return /^(?:[-*+]?|\d+[.)]?)$/.test(tail) ? { ...value, from, to } : null;
+  },
+});
+const normalizeExplicitMarker = EditorState.transactionFilter.of(tr => {
+  const marker = tr.startState.field(autoMarker);
+  if (!marker || !tr.docChanged || !tr.isUserEvent("input")) return tr;
+  if (tr.startState.doc.sliceString(marker.from, marker.to) !== marker.text) throw new Error("Auto-list marker provenance disagrees with the document");
+  const from = tr.changes.mapPos(marker.from, 1), to = tr.changes.mapPos(marker.to, -1);
+  if (tr.newDoc.sliceString(from, to) !== marker.text) return tr; // The user edited the generated marker itself.
+  const tail = tr.newDoc.sliceString(to, tr.newDoc.lineAt(to).to);
+  if (!/^(?:[-*+]|\d+[.)])[ \t]/.test(tail)) return tr;
+  // Remove only the generated marker. Keep every character explicitly typed,
+  // including the list's indentation and the user's chosen marker style.
+  return [tr, { changes: { from, to }, sequential: true }];
+});
+const continueMarkup = insertNewlineContinueMarkupCommand({ nonTightLists: false });
+const continueList: StateCommand = ({ state, dispatch }) => {
+  if (state.readOnly) return false;
+  const { main, ranges } = state.selection;
+  const line = state.doc.lineAt(main.head);
+  const emptyTopItem = ranges.length === 1 && main.empty && main.head === line.to && /^(?:[-*+]|\d+[.)])[ \t]*$/.test(line.text);
+  return continueMarkup({ state, dispatch(tr) {
+    if (!emptyTopItem) {
+      dispatch(state.update(tr, { annotations: generatedMarkup.of(true) }));
+      return;
+    }
+    const at = tr.newSelection.main.head;
+    if (tr.newDoc.lineAt(at).text !== "") throw new Error("Empty top-level list item did not exit its markup");
+    // Removing '- ' alone leaves a lazy continuation of the previous item.
+    // A blank separator is necessary for the following text to be a paragraph.
+    dispatch(state.update(tr, { changes: { from: at, insert: "\n" }, selection: { anchor: at + 1 }, annotations: generatedMarkup.of(true), sequential: true }));
+  } });
+};
+
 export function writerLanguage() {
-  return [markdown({ base: markdownLanguage, extensions: [writerMarkdown, highlightNodes], addKeymap: true }), syntaxHighlighting(style)];
+  return [
+    markdown({ base: markdownLanguage, extensions: [writerMarkdown, highlightNodes], addKeymap: false }),
+    syntaxHighlighting(style), autoMarker, normalizeExplicitMarker,
+    Prec.high(keymap.of([{ key: "Enter", run: continueList }, { key: "Backspace", run: deleteMarkupBackward }])),
+  ];
 }
diff --git a/apps/writer/src/export/warnings.test.ts b/apps/writer/src/export/warnings.test.ts
index 87b0628a..4e00e470 100644
--- a/apps/writer/src/export/warnings.test.ts
+++ b/apps/writer/src/export/warnings.test.ts
@@ -1,5 +1,16 @@
 import { expect, it } from "vitest";
 import { pandocWarnings } from "./warnings.js";
+
+it("explains Word's missing-image fallback without hiding other warnings", () => {
+  const warning = "Could not fetch resource figures/example.png: replacing image with description";
+  const guidance = "The image “figures/example.png” could not be loaded for Word. Its description will be included instead.";
+  expect(pandocWarnings([
+    warning,
+    { verbosity: "WARNING", pretty: warning },
+    { verbosity: "WARNING", pretty: "Unknown citation key" },
+    { verbosity: "WARNING" },
+  ])).toEqual([guidance, guidance, "Unknown citation key", "Word export reported a problem."]);
+});
 it("does not interrupt a clean export with informational resource messages", () => {
   expect(pandocWarnings([{ type: "LoadedResource", verbosity: "INFO", pretty: "Loaded style.csl" }, { verbosity: "DEBUG" }, { verbosity: "WARNING", pretty: "Image missing" }, "Citation missing"])).toEqual(["Image missing", "Citation missing"]);
 });
diff --git a/apps/writer/src/export/warnings.ts b/apps/writer/src/export/warnings.ts
index 91f86cc7..a3576a96 100644
--- a/apps/writer/src/export/warnings.ts
+++ b/apps/writer/src/export/warnings.ts
@@ -1,10 +1,17 @@
 // Pandoc returns informational resource-load messages alongside real warnings.
 export function pandocWarnings(messages: readonly unknown[]): string[] {
   return messages.flatMap((message) => {
-    if (typeof message === "string") return [message];
+    if (typeof message === "string") return [exportWarningMessage(message)];
     if (!message || typeof message !== "object") return [];
     const value = message as { verbosity?: string; pretty?: string; message?: string; type?: string };
     if (value.verbosity === "INFO" || value.verbosity === "DEBUG") return [];
-    return [value.pretty ?? value.message ?? value.type ?? "Pandoc reported an export problem."];
+    return [exportWarningMessage(value.pretty ?? value.message ?? value.type ?? "Word export reported a problem.")];
   });
 }
+
+function exportWarningMessage(message: string): string {
+  const missingImage = /^Could not fetch resource (.+): replacing image with description\.?$/.exec(message);
+  return missingImage
+    ? `The image “${missingImage[1]}” could not be loaded for Word. Its description will be included instead.`
+    : message;
+}
diff --git a/apps/writer/src/main.tsx b/apps/writer/src/main.tsx
index dad45358..2d3f7001 100644
--- a/apps/writer/src/main.tsx
+++ b/apps/writer/src/main.tsx
@@ -14,6 +14,7 @@ import { createRoot } from "react-dom/client";
 
 import { App } from "./App.js";
 import { FeedbackRoot } from "./FeedbackRoot.js";
+import { deliverWriterGrantReturn, isWriterGrantReturn, writerMdbaseForBuild } from "./connect/sdk-application.js";
 
 import { setupPwaInstall } from "./pwa-install.js";
 import "./pwa-install.css";
@@ -21,10 +22,17 @@ import "./pwa-install.css";
 const stopPwaInstall = setupPwaInstall("mdbase writer");
 if (import.meta.hot) import.meta.hot.dispose(stopPwaInstall);
 
+// The Private collection consent popup returns here: hand its result to the
+// waiting Writer tab and close, without starting a second SDK owner.
+const grantReturn = isWriterGrantReturn(import.meta.env.VITE_MDBASE_ENV, location.href);
+if (grantReturn) void deliverWriterGrantReturn(location.href).catch(() => {});
+// One declaration-only singleton outside React/StrictMode. SDK owns its runtime.
+const sdk = grantReturn ? undefined : writerMdbaseForBuild(import.meta.env.VITE_MDBASE_ENV);
 const root = document.getElementById("root");
 if (!root) throw new Error("Missing #root");
 createRoot(root).render(
   <StrictMode>
-    <FeedbackRoot><App /></FeedbackRoot>
+    {grantReturn ? <p className="grant-return">You can close this window.</p>
+      : <FeedbackRoot><App {...(sdk ? {sdk} : {})} /></FeedbackRoot>}
   </StrictMode>,
 );
diff --git a/apps/writer/src/native-popup-lifetime.test.ts b/apps/writer/src/native-popup-lifetime.test.ts
new file mode 100644
index 00000000..7c16c720
--- /dev/null
+++ b/apps/writer/src/native-popup-lifetime.test.ts
@@ -0,0 +1,6 @@
+import {readFileSync} from "node:fs";
+import {expect,it} from "vitest";
+it("Native callback leaves SAME popup lifetime to original SDK finish and custody ACK",()=>{
+  const source=readFileSync(new URL("./main.tsx",import.meta.url),"utf8");
+  expect(source).not.toMatch(/finally\(\(\)\s*=>\s*window\.close\(\)\)/);
+});
diff --git a/apps/writer/src/pwa-install.css b/apps/writer/src/pwa-install.css
index 1aa5142e..d4257e4a 100644
--- a/apps/writer/src/pwa-install.css
+++ b/apps/writer/src/pwa-install.css
@@ -14,6 +14,12 @@
   box-shadow: 0 4px 24px #0002;
   font: 14px/1.5 system-ui, sans-serif;
 }
+/* The optional invitation must not cover the phone's primary navigation. */
+@media (max-width: 900px) {
+  body:has(.workspace .pane-tabs) .pwa-install {
+    bottom: calc(var(--pane-tab-height, 54px) + 1px + env(safe-area-inset-bottom) + 16px);
+  }
+}
 .pwa-install p { margin: 0 0 10px; font: inherit; color: inherit; }
 .pwa-install button {
   display: inline-block;
diff --git a/apps/writer/src/styles.css b/apps/writer/src/styles.css
index 895cb2d9..0662713f 100644
--- a/apps/writer/src/styles.css
+++ b/apps/writer/src/styles.css
@@ -21,6 +21,7 @@
   --ease: cubic-bezier(0.16, 1, 0.3, 1);
   --scrollbar-thumb-current: var(--scrollbar-thumb-rest);
   --scrollbar-size: 2px;
+  --pane-tab-height: 54px;
   font-family: var(--sans);
   font-size: 14px;
   line-height: 1.5;
@@ -77,6 +78,7 @@ label { display: grid; gap: 0.2rem; font-size: 13px; color: var(--ink-soft); }
 label > .mdbase-select { width: 100%; }
 
 .app { display: grid; grid-template-rows: auto 1fr; height: 100%; }
+.grant-return { margin: 2rem auto; max-width: 32rem; padding: 0 1rem; text-align: center; color: var(--color-text-soft, inherit); }
 .topbar { display: flex; align-items: center; gap: 0.75rem; height: 48px; padding: 0 0.75rem 0 1rem; border-bottom: 1px solid var(--line); min-width: 0; }
 .topbar-slot { flex: 1; min-width: 0; display: flex; align-items: center; }
 /* The theme choice sits quietly in the bar but keeps its chevron, so it reads as a control. */
@@ -177,6 +179,11 @@ kbd { font-family: var(--mono); font-size: 11.5px; padding: 1px 5px; border: 1px
 .home-drafts li { display: flex; align-items: center; justify-content: space-between; gap: 1rem; }
 .home-draft-text { display: grid; gap: 0.05rem; min-width: 0; }
 .home-drafts p { margin: 0; }
+/* Untyped records and unusable types: calm, informational, never alerts. */
+.home-untyped { display: grid; gap: 0.5rem; margin-top: 1.25rem; }
+.home-untyped h2 { margin: 0; }
+.home-unavailable { display: grid; gap: 0.25rem; margin-top: 1rem; }
+.home-unavailable p { margin: 0; }
 .home { width: 100%; max-width: 50rem; margin: 0 auto; padding: 2rem 16px; display: grid; gap: 2rem; align-content: start; overflow: auto; }
 .home-header { display: flex; align-items: flex-end; justify-content: space-between; gap: 1rem; flex-wrap: wrap; }
 .home-header p { margin: 0; }
@@ -554,9 +561,12 @@ blockquote.thread-quote::after { content: "”"; }
 
 .editor { min-height: 0; overflow: hidden; }
 .editor .cm-editor { height: 100%; font-size: 15px; background: var(--canvas); color: var(--ink); }
+/* Search options are inline choices, not the full-width fields used in forms. */
+.editor .cm-search label { display: inline-flex; align-items: center; gap: 0.35rem; min-height: 28px; vertical-align: middle; white-space: nowrap; }
+.editor .cm-search input[type="checkbox"] { width: auto; flex: none; margin: 0; }
+@media (max-width: 900px) { .editor .cm-search label { min-height: 44px; } }
 .editor .cm-scroller { font-family: "Atkinson Hyperlegible", sans-serif; line-height: 1.65; }
 .editor .cm-content { max-width: 72ch; margin: 0 auto; padding: 1.5rem 1.25rem 40vh; caret-color: var(--ink); }
-.editor .cm-soft-break::after { content: " "; }
 .editor .cm-activeLine { background: transparent; }
 .editor .cm-focused { outline: none; }
 .editor .cm-gutters { background: var(--canvas); border: 0; }
@@ -688,7 +698,7 @@ fieldset.settings { margin: 0; padding: 0; border: 0; min-width: 0; }
   .bar .mdbase-button { padding: 0 0.55rem; min-height: 32px; }
   .workspace { grid-template-columns: minmax(0, 1fr); grid-template-rows: minmax(0, 1fr) auto; grid-template-areas: "main" "tabs"; }
   .pane-tabs { grid-area: tabs; display: flex; border-top: 1px solid var(--line); background: var(--canvas); padding-bottom: env(safe-area-inset-bottom); }
-  .pane-tabs button { flex: 1; display: grid; justify-items: center; gap: 2px; height: 54px; padding: 6px 0 4px; border: 0; background: none; font: inherit; font-size: 11.5px; color: var(--muted); }
+  .pane-tabs button { flex: 1; display: grid; justify-items: center; gap: 2px; height: var(--pane-tab-height); padding: 6px 0 4px; border: 0; background: none; font: inherit; font-size: 11.5px; color: var(--muted); }
   .pane-tabs button .icon { width: 20px; height: 20px; }
   .pane-tabs button[aria-pressed="true"] { color: var(--ink); font-weight: 700; }
   .pane-tabs button[aria-pressed="true"] .icon { color: var(--app-writer); }
diff --git a/apps/writer/src/ui/CompareDialog.test.tsx b/apps/writer/src/ui/CompareDialog.test.tsx
new file mode 100644
index 00000000..abe4eff7
--- /dev/null
+++ b/apps/writer/src/ui/CompareDialog.test.tsx
@@ -0,0 +1,37 @@
+// @vitest-environment jsdom
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { changedPassage, CompareDialog, type Comparison } from "./CompareDialog.js";
+
+vi.mock("@mdbase-dev/ui/dialog", () => ({
+  Dialog: ({ open, children }: { open: boolean; children: React.ReactNode }) => open ? <section role="dialog">{children}</section> : null,
+}));
+afterEach(() => { cleanup(); vi.restoreAllMocks(); });
+
+it("highlights a late change and scrolls both text panes to it, not the page", () => {
+  const prefix = Array.from({ length: 100 }, (_, index) => `Unchanged line ${index}`).join("\n");
+  const mine = `${prefix}\nLocal draft addition\nUnchanged suffix`;
+  const theirs = `${prefix}\nSaved collection line\nUnchanged suffix`;
+  expect(changedPassage(mine, theirs)).toEqual({ prefix, mine: "Local draft addition", theirs: "Saved collection line", suffix: "Unchanged suffix" });
+  vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(function(this: HTMLElement) {
+    return { top: this.tagName === "MARK" ? 1000 : 100 } as DOMRect;
+  });
+  const rendered = render(<CompareDialog comparison={{ path: "main.md", kind: "draft", mine, theirs, mineFields: {}, theirFields: {} }} onClose={vi.fn()} onResolve={vi.fn()} onDownload={vi.fn()} />);
+  expect([...rendered.container.querySelectorAll("mark")].map(mark => mark.textContent)).toEqual(["Local draft addition", "Saved collection line"]);
+  expect([...rendered.container.querySelectorAll(".compare-text")].map(text => text.scrollTop)).toEqual([868, 868]);
+  expect(window.scrollY).toBe(0);
+  expect(screen.getByRole("button", { name: "Restore local draft" })).toBeTruthy();
+});
+
+it("keeps an edited merge across unrelated renders and resets it for a new local version", () => {
+  const comparison: Comparison = { path: "main.md", kind: "conflict", mine: "Local text", theirs: "Collection text", mineFields: {}, theirFields: {} };
+  const callbacks = { onClose: vi.fn(), onResolve: vi.fn(), onDownload: vi.fn() };
+  const rendered = render(<CompareDialog comparison={comparison} {...callbacks} />);
+  const field = () => screen.getByRole<HTMLTextAreaElement>("textbox", { name: /Merged Markdown/ });
+  expect(field().value).toBe("Local text");
+  fireEvent.change(field(), { target: { value: "Reviewed merged text" } });
+  rendered.rerender(<CompareDialog comparison={{ ...comparison, theirFields: { template: "article" } }} {...callbacks} />);
+  expect(field().value).toBe("Reviewed merged text");
+  rendered.rerender(<CompareDialog comparison={{ ...comparison, mine: "New local version" }} {...callbacks} />);
+  expect(field().value).toBe("New local version");
+});
diff --git a/apps/writer/src/ui/CompareDialog.tsx b/apps/writer/src/ui/CompareDialog.tsx
index 1c35d3a4..83a3319f 100644
--- a/apps/writer/src/ui/CompareDialog.tsx
+++ b/apps/writer/src/ui/CompareDialog.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Dialog } from "@mdbase-dev/ui/dialog";
 import type { JsonObject } from "@mdbase-dev/connect";
 
@@ -16,6 +16,14 @@ export function changedPassage(mine: string, theirs: string): { prefix: string;
   };
 }
 
+/** Reveal the first changed passage without scrolling the dialog or page. */
+export function revealDifferences(columns: HTMLElement): void {
+  for (const text of columns.querySelectorAll<HTMLElement>(".compare-text")) {
+    const mark = text.querySelector("mark");
+    text.scrollTop = mark ? Math.max(0, text.scrollTop + mark.getBoundingClientRect().top - text.getBoundingClientRect().top - 32) : 0;
+  }
+}
+
 export interface Comparison {
   readonly path: string;
   readonly kind: "conflict" | "draft";
@@ -32,8 +40,12 @@ export function CompareDialog({ comparison, canRestore = true, onClose, onResolv
   onResolve(choice: "mine" | "theirs" | { body: string }): void;
   onDownload(): void;
 }) {
-  const [merged, setMerged] = useState("");
-  useEffect(() => setMerged(comparison?.mine ?? ""), [comparison?.path, comparison?.mine]);
+  const [merge, setMerge] = useState({ path: comparison?.path, mine: comparison?.mine, text: comparison?.mine ?? "" });
+  const changed = merge.path !== comparison?.path || merge.mine !== comparison?.mine;
+  if (changed) setMerge({ path: comparison?.path, mine: comparison?.mine, text: comparison?.mine ?? "" });
+  const merged = changed ? comparison?.mine ?? "" : merge.text;
+  const columns = useRef<HTMLDivElement>(null);
+  useEffect(() => { if (columns.current) revealDifferences(columns.current); }, [comparison?.path, comparison?.mine, comparison?.theirs]);
   const diff = comparison ? changedPassage(comparison.mine, comparison.theirs) : null;
   const metadataChanged = comparison && JSON.stringify(comparison.mineFields) !== JSON.stringify(comparison.theirFields);
   return (
@@ -41,7 +53,7 @@ export function CompareDialog({ comparison, canRestore = true, onClose, onResolv
       {comparison && diff && <>
         <p><code>{comparison.path}</code></p>
         <p className="muted">Nothing is replaced until you choose. Highlighted passages differ between the versions.</p>
-        <div className="compare-columns">
+        <div className="compare-columns" ref={columns}>
           {([['Your local text', diff.mine], ['Collection version', diff.theirs]] as const).map(([label, change]) => <section key={label}>
             <h3>{label}</h3>
             <pre className="compare-text">{diff.prefix && `${diff.prefix}\n`}{comparison.mine !== comparison.theirs && <mark>{change || "(passage removed)"}</mark>}{diff.suffix && `\n${diff.suffix}`}</pre>
@@ -51,7 +63,7 @@ export function CompareDialog({ comparison, canRestore = true, onClose, onResolv
           <pre>{JSON.stringify(comparison.mineFields, null, 2)}</pre><pre>{JSON.stringify(comparison.theirFields, null, 2)}</pre>
         </div></details>}
         {comparison.kind === "conflict" && <label className="merge-field">Merged Markdown
-          <textarea className="mdbase-field" rows={12} value={merged} onChange={(event) => setMerged(event.target.value)} />
+          <textarea className="mdbase-field" rows={12} value={merged} onChange={(event) => setMerge({ ...merge, text: event.target.value })} />
           <span className="muted small">The merged text keeps your local setting changes on top of the collection version.</span>
         </label>}
         {!canRestore && <p>This record was deleted. Download the local draft to preserve it; it cannot be restored into a deleted record.</p>}
diff --git a/apps/writer/src/ui/ConnectGate.tsx b/apps/writer/src/ui/ConnectGate.tsx
index 1023b934..b55f707b 100644
--- a/apps/writer/src/ui/ConnectGate.tsx
+++ b/apps/writer/src/ui/ConnectGate.tsx
@@ -6,6 +6,8 @@ import { useEffect, useRef, useState, type ReactNode } from "react";
 import { FeedbackButton, useFeedback } from "@mdbase-dev/ui/feedback";
 
 import type { WriterSession } from "../connect/session.js";
+import { NativeSignIn } from "./NativeSignIn.js";
+import type { NativeSignInBinding } from "../connect/native-signin-ui.js";
 
 const isLocalBuild = location.protocol === "http:" && ["localhost", "127.0.0.1", "[::1]"].includes(location.hostname);
 
@@ -23,7 +25,14 @@ function Centered({ title, children }: { title: string; children: ReactNode }) {
   return <ConnectLayout app="writer" title={title}>{children}<FeedbackButton /></ConnectLayout>;
 }
 
-export function ConnectGate({ session, snapshot }: { session: WriterSession; snapshot: MdbaseApplicationSessionSnapshot }) {
+export function ConnectGate(props:
+  | { nativeSignIn: { binding: NativeSignInBinding; onSignedOut(): void } }
+  | { session: WriterSession; snapshot: MdbaseApplicationSessionSnapshot }
+) {
+  return "nativeSignIn" in props ? <NativeSignIn {...props.nativeSignIn} /> : <LegacyConnectGate session={props.session} snapshot={props.snapshot} />;
+}
+
+function LegacyConnectGate({ session, snapshot }: { session: WriterSession; snapshot: MdbaseApplicationSessionSnapshot }) {
   const { reportError } = useFeedback();
   const reportedInitialFailure = useRef(false);
   useEffect(() => {
diff --git a/apps/writer/src/ui/ExportReview.test.tsx b/apps/writer/src/ui/ExportReview.test.tsx
new file mode 100644
index 00000000..bb803e9c
--- /dev/null
+++ b/apps/writer/src/ui/ExportReview.test.tsx
@@ -0,0 +1,78 @@
+// @vitest-environment jsdom
+import { useState } from "react";
+import { act, cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterAll, afterEach, beforeAll, beforeEach, expect, it, vi } from "vitest";
+import { ExportReview, type PendingExport } from "./ExportReview.js";
+
+const originalShow = Object.getOwnPropertyDescriptor(HTMLDialogElement.prototype, "showModal");
+const originalClose = Object.getOwnPropertyDescriptor(HTMLDialogElement.prototype, "close");
+beforeAll(() => {
+  Object.defineProperties(HTMLDialogElement.prototype, {
+    showModal: { configurable: true, value(this: HTMLDialogElement) { this.open = true; } },
+    close: { configurable: true, value(this: HTMLDialogElement) {
+      if (!this.open) return;
+      this.open = false;
+      // Native close is queued after the render which sets open=false.
+      setTimeout(() => this.dispatchEvent(new Event("close")), 0);
+    } },
+  });
+});
+afterAll(() => {
+  for (const [name, descriptor] of [["showModal", originalShow], ["close", originalClose]] as const) {
+    if (descriptor) Object.defineProperty(HTMLDialogElement.prototype, name, descriptor);
+    else Reflect.deleteProperty(HTMLDialogElement.prototype, name);
+  }
+});
+beforeEach(() => vi.useFakeTimers());
+afterEach(() => { cleanup(); vi.runOnlyPendingTimers(); vi.useRealTimers(); });
+
+const pending: PendingExport = {
+  bytes: new Uint8Array([80, 75]), type: "application/octet-stream", name: "test.docx",
+  problems: ["No source in the library has the citekey missing."],
+};
+function Harness({ download, cancel }: { download: (file: PendingExport) => void; cancel: () => void }) {
+  const [file, setFile] = useState<PendingExport | null>(pending);
+  const [notice, setNotice] = useState<string | null>(null);
+  return <>
+    <ExportReview pending={file} onCancel={() => { cancel(); setFile(null); setNotice(null); }} onExport={(chosen) => {
+      setFile(null);
+      download(chosen);
+      setNotice("Exported Word with a problem.");
+    }} onError={(error) => setNotice(`The file could not be downloaded. ${String(error)}`)} />
+    {notice && <div role="status">{notice}</div>}
+  </>;
+}
+
+it("downloads only after consent and retains the result after the dialog's native close", () => {
+  const download = vi.fn(), cancel = vi.fn();
+  render(<Harness download={download} cancel={cancel} />);
+  expect(download).not.toHaveBeenCalled();
+  fireEvent.click(screen.getByRole("button", { name: "Export anyway" }));
+  act(() => vi.runOnlyPendingTimers());
+  expect(download).toHaveBeenCalledExactlyOnceWith(pending);
+  expect(cancel).not.toHaveBeenCalled();
+  expect(screen.getByRole("status").textContent).toBe("Exported Word with a problem.");
+});
+
+it("reports a failed download and retains the error after native close", () => {
+  const cancel = vi.fn();
+  render(<Harness download={() => { throw new Error("Browser storage unavailable."); }} cancel={cancel} />);
+  fireEvent.click(screen.getByRole("button", { name: "Export anyway" }));
+  act(() => vi.runOnlyPendingTimers());
+  expect(cancel).not.toHaveBeenCalled();
+  expect(screen.getByRole("status").textContent).toContain("The file could not be downloaded.");
+  expect(screen.getByRole("status").textContent).toContain("Browser storage unavailable.");
+});
+
+it.each(["cancel", "escape", "backdrop", "close"])("keeps %s as a cancellation without a download", (action) => {
+  const download = vi.fn(), cancel = vi.fn();
+  render(<Harness download={download} cancel={cancel} />);
+  if (action === "cancel") fireEvent.click(screen.getByRole("button", { name: "Cancel and fix problems" }));
+  else if (action === "escape") fireEvent(screen.getByRole("dialog"), new Event("cancel", { cancelable: true }));
+  else if (action === "backdrop") fireEvent.mouseDown(screen.getByRole("dialog"));
+  else fireEvent.click(screen.getByRole("button", { name: "Close" }));
+  act(() => vi.runOnlyPendingTimers());
+  expect(cancel).toHaveBeenCalledTimes(1);
+  expect(download).not.toHaveBeenCalled();
+  expect(screen.queryByRole("status")).toBeNull();
+});
diff --git a/apps/writer/src/ui/ExportReview.tsx b/apps/writer/src/ui/ExportReview.tsx
new file mode 100644
index 00000000..3310039f
--- /dev/null
+++ b/apps/writer/src/ui/ExportReview.tsx
@@ -0,0 +1,31 @@
+import { Dialog } from "@mdbase-dev/ui/dialog";
+
+export interface PendingExport {
+  bytes: Uint8Array;
+  type: string;
+  name: string;
+  problems: readonly string[];
+}
+
+/** A programmatic close after confirmation must not cancel its outcome notice. */
+export function ExportReview({ pending, onCancel, onExport, onError }: {
+  pending: PendingExport | null;
+  onCancel(): void;
+  onExport(pending: PendingExport): void;
+  onError(error: unknown): void;
+}) {
+  return (
+    <Dialog open={Boolean(pending)} onClose={() => { if (pending) onCancel(); }} title="Review export problems">
+      <p>No file has been downloaded yet. Missing images or chapters can leave this export incomplete. Review these problems before sharing or submitting it.</p>
+      <ul className="export-problems">{pending?.problems.map((problem, index) => <li key={index}>{problem}</li>)}</ul>
+      <div className="compare-actions">
+        <button type="button" className="mdbase-button is-primary" onClick={onCancel}>Cancel and fix problems</button>
+        <button type="button" className="mdbase-button" onClick={() => {
+          if (!pending) return;
+          try { onExport(pending); }
+          catch (error) { onError(error); }
+        }}>Export anyway</button>
+      </div>
+    </Dialog>
+  );
+}
diff --git a/apps/writer/src/ui/Home.test.tsx b/apps/writer/src/ui/Home.test.tsx
new file mode 100644
index 00000000..f3d89011
--- /dev/null
+++ b/apps/writer/src/ui/Home.test.tsx
@@ -0,0 +1,49 @@
+// @vitest-environment jsdom
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, beforeAll, expect, it, vi } from "vitest";
+import { fail, ok, type CollectionIndex, type ManuscriptSummary, type Result, type WriterBackend } from "../backend/types.js";
+import { Home } from "./Home.js";
+
+beforeAll(() => {
+  HTMLDialogElement.prototype.showModal ??= function (this: HTMLDialogElement) { this.open = true; };
+  HTMLDialogElement.prototype.close ??= function (this: HTMLDialogElement) { this.open = false; };
+  class Observer implements IntersectionObserver {
+    observe() {} disconnect() {} unobserve() {} takeRecords(): IntersectionObserverEntry[] {return [];}
+    readonly root = null; readonly rootMargin = ""; readonly thresholds: readonly number[] = [];
+  }
+  globalThis.IntersectionObserver ??= Observer;
+});
+afterEach(cleanup);
+
+const message = 'Writer can\'t use the "native-comment" type because its definition has an error. Comments that use it are unavailable until the type is fixed; everything else still works.';
+function backend(index: CollectionIndex, manuscripts: Result<ManuscriptSummary[]> = ok([])): WriterBackend {
+  // Explicit UI metadata stand-in, never native operation/authority evidence.
+  const unsupported = async () => fail<never>("This Home fixture cannot mutate records.");
+  return {
+    kind: "connect", collectionName: "Writing", draftNamespace: "home-test",
+    records: {open: async () => {throw new Error("This Home fixture cannot open record leases.");}},
+    listManuscripts: async () => manuscripts, library: async () => ok([]), index: async () => ok(index),
+    createManuscript: unsupported, adoptManuscript: unsupported, createRecord: unsupported,
+    annotationPaths: unsupported, annotationsForSource: unsupported, readFile: unsupported,
+    comments: unsupported, createComment: unsupported, changeComment: unsupported,
+    people: async () => ({names: new Map()}),
+    readBody: async () => ok(""), onExternalChange: () => () => {}, dispose: () => {},
+  };
+}
+
+it("lists untyped records with a calm No type label and opens them", async () => {
+  const onOpen = vi.fn();
+  render(<Home backend={backend({recordPaths: ["notes/loose.md", "notes/typed.md"], filePaths: [], notePaths: ["notes/loose.md", "notes/typed.md"], untypedPaths: ["notes/loose.md"]})} onOpen={onOpen} />);
+  const row = await screen.findByRole("button", {name: /loose/});
+  expect(row.textContent).toContain("No type");
+  expect(screen.queryByRole("button", {name: /typed/})).toBeNull();
+  fireEvent.click(row);
+  expect(onOpen).toHaveBeenCalledWith("notes/loose.md");
+});
+
+it("names an unavailable type plainly, once, without blocking the rest", async () => {
+  render(<Home backend={backend({recordPaths: [], filePaths: [], notePaths: [], unavailableTypes: [{name: "native-comment", message}]}, fail(message))} onOpen={vi.fn()} />);
+  expect(await screen.findByText(message)).toBeTruthy();
+  expect(screen.getAllByText(message)).toHaveLength(1);
+  expect(screen.queryByRole("button", {name: "Retry loading"})).toBeNull();
+});
diff --git a/apps/writer/src/ui/Home.tsx b/apps/writer/src/ui/Home.tsx
index d4854e64..6dfc66f4 100644
--- a/apps/writer/src/ui/Home.tsx
+++ b/apps/writer/src/ui/Home.tsx
@@ -6,7 +6,7 @@ import { signalMdbaseMark } from "@mdbase-dev/ui/mark-activity";
 import { Select } from "@mdbase-dev/ui/select";
 import { useEffect, useId, useMemo, useRef, useState, type ReactNode } from "react";
 
-import { bodySummary, fail, type ManuscriptSummary, type Result, type WriterBackend } from "../backend/types.js";
+import { bodySummary, fail, type ManuscriptSummary, type Result, type UnavailableType, type WriterBackend } from "../backend/types.js";
 import { errorMessage, limitConcurrency, mapConcurrent } from "../async.js";
 import { readerSourceHref } from "../apps.js";
 import { Dialog } from "@mdbase-dev/ui/dialog";
@@ -22,6 +22,8 @@ import { ChevronRight, PenIcon } from "./icons.js";
 const SEARCH_FROM = 6;
 /** Notes listed at once in the note picker. */
 const NOTES_SHOWN = 8;
+/** Notes without a type listed before "Show all". */
+const UNTYPED_SHOWN = 20;
 const TEMPLATE_OPTIONS = TEMPLATES.map((t) => ({ value: t, label: templateName(t) }));
 const STYLE_OPTIONS = STYLES.map((s) => ({ value: s.id, label: s.title }));
 
@@ -31,30 +33,30 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
   const [backgroundProblem, setBackgroundProblem] = useState<string | null>(null);
   const [notes, setNotes] = useState<string[]>([]);
   const [recordPaths, setRecordPaths] = useState<readonly string[] | null>(null);
+  const [untyped, setUntyped] = useState<readonly string[]>([]);
+  const [unavailable, setUnavailable] = useState<readonly UnavailableType[]>([]);
+  const [allUntyped, setAllUntyped] = useState(false);
   const [summaries, setSummaries] = useState<ReadonlyMap<string, Pick<ManuscriptSummary, "words" | "embeds" | "chapters">>>(new Map());
   const [visiblePaths, setVisiblePaths] = useState<ReadonlySet<string>>(new Set());
   const [reload, setReload] = useState(0);
   const bodyCache = useRef(new Map<string, Promise<Result<string>>>());
   const rows = useRef<HTMLUListElement>(null);
-  const limitReads = useMemo(() => limitConcurrency(4), [backend]);
+  const [limitReads] = useState(() => limitConcurrency(4));
   const [sources, setSources] = useState<number | null>(null);
   const [dialog, setDialog] = useState(false);
   const [filter, setFilter] = useState("");
   const [limit, setLimit] = useState(50);
   const namespace = localNamespace(backend);
   // What this browser remembers: the manuscripts opened last, and drafts not yet saved.
-  const [recent, setRecent] = useState(() => recentManuscripts(namespace));
-  const [drafts, setDrafts] = useState(() => new DraftStore(namespace).list());
-  useEffect(() => {
-    setRecent(recentManuscripts(namespace));
-    setDrafts(new DraftStore(namespace).list());
-  }, [namespace, reload]);
+  const remembered = useMemo(() => ({revision: reload, recent: recentManuscripts(namespace),
+    drafts: new DraftStore(namespace).list()}), [namespace, reload]);
+  const {recent, drafts} = remembered;
 
   useEffect(() => {
     let live = true;
-    setProblem(null);
-    setBackgroundProblem(null);
-    const pending = backend.flushChanges?.() ?? Promise.resolve();
+    const pending = (backend.flushChanges?.() ?? Promise.resolve()).then(() => {
+      if (live) {setProblem(null); setBackgroundProblem(null);}
+    });
     void pending.then(() => backend.listManuscripts()).then((r) => {
       if (!live) return;
       if (r.ok) setManuscripts(r.value);
@@ -69,12 +71,14 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
       if (!live) return;
       if (!r.ok) { setBackgroundProblem(`Index could not be loaded: ${r.message}`); return; }
       setNotes([...r.value.notePaths].sort());
+      setUntyped([...r.value.untypedPaths ?? []].sort());
+      setUnavailable(r.value.unavailableTypes ?? []);
       setRecordPaths(r.value.recordPaths);
     }).catch((error: unknown) => { if (live) setBackgroundProblem(errorMessage(error)); });
     return () => {
       live = false;
     };
-  }, [backend, reload]);
+  }, [backend, remembered.revision]);
 
   useEffect(() => {
     let timer: ReturnType<typeof setTimeout> | undefined;
@@ -96,6 +100,9 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
   }, [backend]);
 
   const recordIndex = useMemo(() => pathIndex(recordPaths ?? []), [recordPaths]);
+  const byPath = useMemo(() => new Map((manuscripts ?? []).map((m) => [m.path, m])), [manuscripts]);
+  const continuing = useMemo(() => recent.map((r) => byPath.get(r.path)).find((m): m is ManuscriptSummary => Boolean(m)), [recent, byPath]);
+  const countPaths = useMemo(() => continuing ? new Set([...visiblePaths, continuing.path]) : visiblePaths, [visiblePaths, continuing]);
 
   // Bodies are only read for visible rows, at most four concurrent manuscript traversals.
   useEffect(() => {
@@ -108,7 +115,7 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
       return cached;
     };
     const candidates = recordIndex;
-    void mapConcurrent(manuscripts.filter((m) => visiblePaths.has(m.path)), 4, async (m) => {
+    void mapConcurrent(manuscripts.filter((m) => countPaths.has(m.path)), 4, async (m) => {
       if (!live) return;
       const body = await read(m.path);
       if (!body.ok || !live) return;
@@ -117,12 +124,16 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
       if (live) setSummaries((known) => new Map(known).set(m.path, { ...summary, words }));
     }).catch(() => { /* Counts are optional; failed body reads never hide a title. */ });
     return () => { live = false; };
-  }, [backend, manuscripts, recordPaths, recordIndex, visiblePaths, limitReads, reload]);
+  }, [backend, manuscripts, recordPaths, recordIndex, countPaths, limitReads, remembered.revision]);
 
   const candidates = useMemo(() => {
     const manuscriptPaths = new Set(manuscripts?.map((m) => m.path));
     return notes.filter((p) => !manuscriptPaths.has(p));
   }, [notes, manuscripts]);
+  const untypedShown = useMemo(() => {
+    const manuscriptPaths = new Set(manuscripts?.map((m) => m.path));
+    return untyped.filter((p) => !manuscriptPaths.has(p));
+  }, [untyped, manuscripts]);
   const shown = useMemo(() => {
     const words = filter.toLowerCase().split(/\s+/).filter(Boolean);
     const sorted = byRecentlyEdited(manuscripts ?? []);
@@ -136,16 +147,11 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
     rows.current?.querySelectorAll("[data-path]").forEach((row) => observer.observe(row));
     return () => observer.disconnect();
   }, [shown, limit]);
-  const byPath = useMemo(() => new Map((manuscripts ?? []).map((m) => [m.path, m])), [manuscripts]);
-  const continuing = useMemo(() => recent.map((r) => byPath.get(r.path)).find((m): m is ManuscriptSummary => Boolean(m)), [recent, byPath]);
   // A chapter's draft belongs to the manuscript that embeds it; a stray one is still listed.
   const draftRows = useMemo(() => drafts.map((d) => {
     const manuscript = byPath.get(d.path) ?? (manuscripts ?? []).find((m) => (summaries.get(m.path)?.chapters ?? m.chapters ?? []).some((c) => c === d.path || `${c}.md` === d.path || d.path.endsWith(`/${c}.md`)));
     return { ...d, manuscript, title: byPath.get(d.path)?.title ?? noteName(d.path) };
   }), [drafts, byPath, manuscripts, summaries]);
-  useEffect(() => {
-    if (continuing) setVisiblePaths((previous) => previous.has(continuing.path) ? previous : new Set([...previous, continuing.path]));
-  }, [continuing]);
   const newButton = (
     <button type="button" className="mdbase-button is-primary" onClick={() => setDialog(true)}>
       <PlusIcon />
@@ -255,7 +261,22 @@ export function Home({ backend, onOpen, collectionPicker }: { backend: WriterBac
         )}
         {shown.length > limit && <button type="button" className="sidebar-more" onClick={() => setLimit((n) => n + 50)}>Show 50 more manuscripts · {shown.length}</button>}
         {manuscripts && manuscripts.length > 0 && !shown.length && <p className="muted">No manuscript matches “{filter}”.</p>}
-        {problem && !dialog && <div role="alert"><p className="problem">{problem}</p><button type="button" className="mdbase-button" onClick={() => { bodyCache.current.clear(); setReload((value) => value + 1); }}>Retry loading</button></div>}
+        {unavailable.length > 0 && <div className="home-unavailable" role="status">
+          {unavailable.map((t) => <p key={t.name} className="muted">{t.message}</p>)}
+        </div>}
+        {untypedShown.length > 0 && <section className="home-untyped" aria-label="Notes without a type">
+          <h2>Notes without a type</h2>
+          <ul className="manuscripts">
+            {(allUntyped ? untypedShown : untypedShown.slice(0, UNTYPED_SHOWN)).map((path) => <li key={path}>
+              <button type="button" className="manuscript-row" onClick={() => onOpen(path)} title={path}>
+                <span className="manuscript-title">{noteName(path)}</span>
+                <span className="manuscript-meta">No type · {path}</span>
+              </button>
+            </li>)}
+          </ul>
+          {!allUntyped && untypedShown.length > UNTYPED_SHOWN && <button type="button" className="sidebar-more" onClick={() => setAllUntyped(true)}>Show all {untypedShown.length} notes without a type</button>}
+        </section>}
+        {problem && !dialog && !unavailable.some((t) => t.message === problem) && <div role="alert"><p className="problem">{problem}</p><button type="button" className="mdbase-button" onClick={() => { bodyCache.current.clear(); setReload((value) => value + 1); }}>Retry loading</button></div>}
       </section>
 
       <NewManuscriptDialog backend={backend} open={dialog} onClose={() => setDialog(false)} onOpen={onOpen} candidates={candidates} />
@@ -282,6 +303,8 @@ function NewManuscriptDialog({ backend, open, onClose, onOpen, candidates }: {
   const [untitled, setUntitled] = useState(false);
   const [adoptOpen, setAdoptOpen] = useState(false);
   const titleField = useRef<HTMLInputElement>(null);
+  // One name per new manuscript: a retry re-sends it, so the manuscript lands once.
+  const intent = useRef(crypto.randomUUID());
 
   useEffect(() => {
     if (open) titleField.current?.focus();
@@ -298,8 +321,11 @@ function NewManuscriptDialog({ backend, open, onClose, onOpen, candidates }: {
     setCreating(true);
     setProblem(null);
     try {
-      const created = await backend.createManuscript({ title: title.trim(), template, style, starter });
-      if (created.ok) onOpen(created.value);
+      const created = await backend.createManuscript({ title: title.trim(), template, style, starter, intent: intent.current });
+      if (created.ok) {
+        intent.current = crypto.randomUUID();
+        onOpen(created.value);
+      }
       else {
         setProblem(created.message);
         signalMdbaseMark("error");
@@ -465,7 +491,11 @@ function ContinueCard({ manuscript, words, goal, onGoal, onOpen }: { manuscript:
   const [editing, setEditing] = useState(false);
   const [draft, setDraft] = useState(goal ? String(goal) : "");
   const goalId = useId();
-  useEffect(() => { setDraft(goal ? String(goal) : ""); }, [goal]);
+  const [previousGoal, setPreviousGoal] = useState(goal);
+  if (previousGoal !== goal) {
+    setPreviousGoal(goal);
+    setDraft(goal ? String(goal) : "");
+  }
   const progress = goal && words !== undefined ? Math.min(1, words / goal) : null;
   const submit = (e: React.FormEvent) => {
     e.preventDefault();
diff --git a/apps/writer/src/ui/Manuscripts.tsx b/apps/writer/src/ui/Manuscripts.tsx
new file mode 100644
index 00000000..642a1afd
--- /dev/null
+++ b/apps/writer/src/ui/Manuscripts.tsx
@@ -0,0 +1,88 @@
+// Existing manuscript navigation/workspace shared by legacy, sample and SDK
+// backends. This reads only the app's manuscript route; SDK owns collection URL.
+import { useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from "react";
+import { Dialog } from "@mdbase-dev/ui/dialog";
+import type { WriterBackend } from "../backend/types.js";
+import { useWriterFeedbackContext } from "../FeedbackRoot.js";
+import { downloadLocalDrafts } from "./download-local-drafts.js";
+import { ManuscriptWorkspace } from "../workspace/workspace.js";
+import { Home } from "./Home.js";
+import { WorkspaceView } from "./WorkspaceView.js";
+import { localNamespace, recentManuscripts, recordOpened } from "./recent.js";
+
+function useManuscriptParam(mayLeave: () => Promise<boolean>): [string | null, (path: string | null, force?: boolean) => void] {
+  const [value, setValue] = useState(() => new URL(location.href).searchParams.get("manuscript"));
+  const guard = useRef(mayLeave);
+  useLayoutEffect(() => {guard.current = mayLeave;}, [mayLeave]);
+  const index = useRef(Number(history.state?.writerIndex ?? 0));
+  const restoring = useRef(false); const navigating = useRef(false);
+  const caller = useRef<AbortController | null>(null);
+  useEffect(() => {
+    const scope = new AbortController(); caller.current = scope;
+    history.replaceState({...history.state, writerIndex: index.current}, "");
+    const onPop = () => {
+      const nextIndex = Number(history.state?.writerIndex ?? 0);
+      if (restoring.current) {restoring.current = false; return;}
+      const nextPath = new URL(location.href).searchParams.get("manuscript");
+      void guard.current().then(allowed => {
+        if (scope.signal.aborted) return;
+        if (allowed) {index.current = nextIndex; setValue(nextPath);}
+        else {const delta = index.current - nextIndex; if (delta) {restoring.current = true; history.go(delta);}}
+      });
+    };
+    window.addEventListener("popstate", onPop);
+    return () => {scope.abort(); window.removeEventListener("popstate", onPop);};
+  }, []);
+  const set = (path: string | null, force = false) => {
+    const scope = caller.current;
+    if (!scope || scope.signal.aborted || navigating.current) return;
+    navigating.current = true;
+    void (force ? Promise.resolve(true) : guard.current()).then(allowed => {
+      if (!allowed || scope.signal.aborted) return;
+      const url = new URL(location.href);
+      if (path) url.searchParams.set("manuscript", path); else url.searchParams.delete("manuscript");
+      history.pushState({...history.state, writerIndex: ++index.current}, "", url); setValue(path);
+    }).finally(() => {navigating.current = false;});
+  };
+  return [value, set];
+}
+export function Manuscripts({backend, collectionPicker}: {backend: WriterBackend; collectionPicker?: ReactNode}) {
+  const currentWorkspace = useRef<ManuscriptWorkspace | null>(null);
+  const [navigation, setNavigation] = useState<{message: string; finish(allowed: boolean): void} | null>(null);
+  const [path, setPath] = useManuscriptParam(async () => {
+    const workspace = currentWorkspace.current;
+    if (!workspace || !workspace.hasUnsavedChanges()) return true;
+    const saved = await workspace.retrySave(); if (saved.ok) return true;
+    return new Promise<boolean>(finish => setNavigation({message: saved.message, finish}));
+  });
+  const [view, setView] = useState<{backend: WriterBackend; workspace: ManuscriptWorkspace | null} | null>(null);
+  useEffect(() => {
+    const owned = path ? new ManuscriptWorkspace(backend, path) : null;
+    let active = true;
+    queueMicrotask(() => {if (active) setView({backend, workspace: owned});});
+    return () => {active = false; if (owned) void owned.dispose();};
+  }, [backend, path]);
+  const current = view?.backend === backend && view.workspace?.main === path ? view.workspace : null;
+  useWriterFeedbackContext(path ? "manuscript" : "manuscripts", backend.collectionName);
+  useLayoutEffect(() => {currentWorkspace.current = current;}, [current]);
+  useEffect(() => {
+    const target = window as unknown as {writer?: unknown};
+    const owner = {backend, workspace: current}; target.writer = owner;
+    return () => {if (target.writer === owner) delete target.writer;};
+  }, [backend, current]);
+  const since = useMemo(() => path ? recentManuscripts(localNamespace(backend)).find(entry => entry.path === path)?.at : undefined, [backend, path]);
+  useEffect(() => {if (path) recordOpened(localNamespace(backend), path);}, [backend, path]);
+  if (!path) return <Home backend={backend} onOpen={setPath} collectionPicker={collectionPicker} />;
+  if (!current) return null;
+  return <>
+    <WorkspaceView key={current.main} workspace={current} since={since} onClose={force => setPath(null, force)} />
+    <Dialog open={Boolean(navigation)} onClose={() => {navigation?.finish(false); setNavigation(null);}} title="Some changes are not saved">
+      <p className="problem">{navigation?.message}</p><p>Download a local copy before leaving if saving cannot be completed.</p>
+      <div className="compare-actions">
+        <button type="button" className="mdbase-button" onClick={() => downloadLocalDrafts(current)}>Download local drafts</button>
+        <button type="button" className="mdbase-button is-primary" onClick={() => {navigation?.finish(false); setNavigation(null);}}>Keep writing</button>
+        <button type="button" className="mdbase-button" onClick={() => {navigation?.finish(true); setNavigation(null);}}>Leave without saving</button>
+      </div>
+    </Dialog>
+  </>;
+}
diff --git a/apps/writer/src/ui/NativeSignIn.tsx b/apps/writer/src/ui/NativeSignIn.tsx
new file mode 100644
index 00000000..87fdefc8
--- /dev/null
+++ b/apps/writer/src/ui/NativeSignIn.tsx
@@ -0,0 +1,164 @@
+import { useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { ConnectLayout } from "@mdbase-dev/ui/screens";
+import {
+  SignInTabBlocked,
+  authorizeNativeSignIn,
+  signInCopy,
+  signInPresentation,
+  type createNativeSignIn,
+} from "../connect/native-signin-ui.js";
+
+interface NativeSignInProps {
+  /** Actual SDK instance plus its UI tab reservation; caller owns the lifetime. */
+  binding: ReturnType<typeof createNativeSignIn>;
+  /** Close succeeded. Owner may show signed-out UI; original stores stay. */
+  onSignedOut(): void;
+}
+
+/** Presentation/actions only: no polling, custody, grants or session engine. */
+export function NativeSignIn(props: NativeSignInProps) {
+  return <NativeSignInView key={props.binding.viewKey} {...props} />;
+}
+
+function NativeSignInView({ binding, onSignedOut }: NativeSignInProps) {
+  const { session, portal } = binding;
+  const snapshot = useSyncExternalStore(
+    (listener) => session.subscribe(listener),
+    () => session.getSnapshot(),
+    () => session.getSnapshot(),
+  );
+  const [problem, setProblem] = useState<"tab_blocked" | "interrupted" | null>(
+    null,
+  );
+  const [working, setWorking] = useState(false);
+  const busy = useRef(false);
+  const mounted = useRef(false);
+
+  useEffect(() => {
+    mounted.current = true;
+    const foreground = () => {
+      if (session.getSnapshot().status === "closed") return;
+      try {
+        session.setForeground(document.visibilityState === "visible");
+      } catch {
+        if (mounted.current) setProblem("interrupted");
+      }
+    };
+    document.addEventListener("visibilitychange", foreground);
+    // External SDK synchronization, not a React-state reset. A fenced owner
+    // will publish closure or refuse the next explicit action.
+    if (session.getSnapshot().status !== "closed") {
+      try {
+        session.setForeground(document.visibilityState === "visible");
+      } catch {
+        /* Retired owner; do not publish late state. */
+      }
+    }
+    return () => {
+      mounted.current = false;
+      document.removeEventListener("visibilitychange", foreground);
+      portal.cancel();
+      // Borrowed SDK session: its actual owner handles unmount/HMR shutdown.
+    };
+  }, [session, portal]);
+
+  useEffect(() => {
+    // An already paired account may still be authorizing additional consent.
+    if (
+      [
+        "unselected",
+        "opening",
+        "setup_required",
+        "ready",
+        "blocked",
+        "closed",
+      ].includes(snapshot.status)
+    ) {
+      portal.cancel();
+    }
+  }, [portal, snapshot.status]);
+
+  const act = async (action: () => Promise<unknown>) => {
+    if (busy.current) return;
+    busy.current = true;
+    setWorking(true);
+    setProblem(null);
+    try {
+      await action();
+    } catch (reason) {
+      if (mounted.current) {
+        setProblem(
+          reason instanceof SignInTabBlocked ? "tab_blocked" : "interrupted",
+        );
+      }
+    } finally {
+      if (mounted.current) {
+        busy.current = false;
+        setWorking(false);
+      }
+    }
+  };
+  const view = signInPresentation(snapshot, "mdbase writer", problem);
+  const signOut = async () => {
+    await session.close();
+    portal.cancel();
+    if (mounted.current) onSignedOut();
+  };
+  const authorize = () => authorizeNativeSignIn(session, portal);
+
+  return (
+    <ConnectLayout app="writer" title="Write from your collection">
+      <section aria-label="Sign-in status">
+        {view.identity ? <p>{view.identity}</p> : null}
+        <p role={view.error ? "alert" : "status"} aria-live="polite">
+          {view.message}
+        </p>
+        {view.unavailable ? <p>{signInCopy.unavailable}</p> : null}
+        <div className="connection-actions">
+          {view.waiting ? (
+            <button
+              className="mdbase-button"
+              type="button"
+              disabled={working}
+              onClick={() => void act(authorize)}
+            >
+              {signInCopy.reopen}
+            </button>
+          ) : !view.paired || view.error ? (
+            <button
+              className="mdbase-connect-action"
+              type="button"
+              disabled={working || view.disabled}
+              onClick={() => void act(authorize)}
+            >
+              {view.action}
+            </button>
+          ) : null}
+          {view.paired ? (
+            <button
+              className="mdbase-button"
+              type="button"
+              disabled={working}
+              onClick={() => void act(signOut)}
+            >
+              {signInCopy.signOut}
+            </button>
+          ) : null}
+          {snapshot.selectedCollectionId ? (
+            <button
+              className="mdbase-button"
+              type="button"
+              disabled={working}
+              onClick={() => {
+                const collectionId = snapshot.selectedCollectionId;
+                if (collectionId) void act(() => session.forget(collectionId));
+              }}
+            >
+              Forget collection
+            </button>
+          ) : null}
+        </div>
+      </section>
+    </ConnectLayout>
+  );
+}
diff --git a/apps/writer/src/ui/NativeWriterView.tsx b/apps/writer/src/ui/NativeWriterView.tsx
new file mode 100644
index 00000000..faeadef6
--- /dev/null
+++ b/apps/writer/src/ui/NativeWriterView.tsx
@@ -0,0 +1,27 @@
+import { useEffect, useState } from "react";
+import { ConnectLayout } from "@mdbase-dev/ui/screens";
+import { NativeWriterBackend } from "../backend/native.js";
+import { Manuscripts } from "./Manuscripts.js";
+import type { WriterNativeScope } from "./SdkWriterRoot.js";
+
+/** Existing Writer UI behind the domain interface, not a legacy client facade. */
+export function NativeWriterView({scope}: {scope: WriterNativeScope}) {
+  const [view, setView] = useState<{scope: WriterNativeScope; backend: NativeWriterBackend} | null>(null);
+  const [failed, setFailed] = useState(false);
+  useEffect(() => {
+    let active = true;
+    let backend: NativeWriterBackend | undefined;
+    try {
+      backend = new NativeWriterBackend(scope.connection, {
+        collectionName: scope.connection.displayName, signal: scope.signal, records: scope.records,
+        authorize: () => scope.mdbase.application.reauthorize({signal: scope.signal}),
+      });
+      const owned = backend;
+      queueMicrotask(() => {if (active) setView({scope, backend: owned});});
+    } catch {queueMicrotask(() => {if (active) setFailed(true);});}
+    return () => {active = false; backend?.dispose();};
+  }, [scope]);
+  if (failed) return <ConnectLayout app="writer" title="Writer could not open this collection"><p role="alert">This collection view could not be opened. Choose another collection from the bar above, or reload to retry.</p></ConnectLayout>;
+  if (!view || view.scope !== scope) return <ConnectLayout app="writer" title="Opening Writer"><p role="status">Opening Writer…</p></ConnectLayout>;
+  return <Manuscripts backend={view.backend} />;
+}
diff --git a/apps/writer/src/ui/OutlinePanel.tsx b/apps/writer/src/ui/OutlinePanel.tsx
index db7e64f0..227c2e96 100644
--- a/apps/writer/src/ui/OutlinePanel.tsx
+++ b/apps/writer/src/ui/OutlinePanel.tsx
@@ -48,7 +48,7 @@ export function OutlinePanel({
   onJump(path: string, offset: number): void;
   /** Moves the chapter embed at index `from` to index `to`. */
   onMove(from: number, to: number): void;
-  onAdd(title: string): Promise<Result<string>>;
+  onAdd(title: string, intent: string): Promise<Result<string>>;
 }) {
   const [dragging, setDragging] = useState<number | null>(null);
   const [drop, setDrop] = useState<{ index: number; after: boolean } | null>(null);
@@ -309,12 +309,14 @@ const RecordHeadings = memo(function RecordHeadings({ view, path, cursor, onJump
   );
 });
 
-function AddChapter({ onAdd, onAdded }: { onAdd(title: string): Promise<Result<string>>; onAdded(path: string): void }) {
+function AddChapter({ onAdd, onAdded }: { onAdd(title: string, intent: string): Promise<Result<string>>; onAdded(path: string): void }) {
   const [editing, setEditing] = useState(false);
   const [title, setTitle] = useState("");
   const [busy, setBusy] = useState(false);
   const [problem, setProblem] = useState<string | null>(null);
   const opener = useRef<HTMLButtonElement>(null);
+  // One name per new chapter: a retry re-sends it, so the chapter lands once.
+  const intent = useRef(crypto.randomUUID());
 
   if (!editing) {
     return (
@@ -336,9 +338,10 @@ function AddChapter({ onAdd, onAdded }: { onAdd(title: string): Promise<Result<s
         e.preventDefault();
         if (!title.trim() || busy) return;
         setBusy(true);
-        const added = await onAdd(title);
+        const added = await onAdd(title, intent.current);
         setBusy(false);
         if (!added.ok) return setProblem(added.message);
+        intent.current = crypto.randomUUID();
         close();
         onAdded(added.value);
       }}
diff --git a/apps/writer/src/ui/SdkWriterRoot.test.tsx b/apps/writer/src/ui/SdkWriterRoot.test.tsx
new file mode 100644
index 00000000..625f3035
--- /dev/null
+++ b/apps/writer/src/ui/SdkWriterRoot.test.tsx
@@ -0,0 +1,91 @@
+// @vitest-environment jsdom
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { StrictMode, useEffect } from "react";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import type { wire } from "@mdbase-dev/sdk";
+import { createTestApp, type TestApp, type TestAppOptions } from "@mdbase-dev/sdk/testing";
+import manifest from "../generated/mdbase-app.json";
+import { App } from "../App.js";
+import { SdkWriterRoot, type WriterNativeScope } from "./SdkWriterRoot.js";
+
+vi.mock("@mdbase-dev/ui/feedback", () => ({ FeedbackButton: () => null }));
+
+const apps: TestApp[] = [];
+async function fixture(options: TestAppOptions) {
+  const app = await createTestApp({declaration: {id: "writer.fixture", name: "Writer fixture", origin: "https://writer.mdbase.dev", environment: "lab", manifest}, ...options});
+  apps.push(app);
+  const count = (action: string) => app.controls.observedActions().filter(call => call.action === action).length;
+  return {...app, count};
+}
+function readyFixture() {
+  const contracts = manifest.requirements.contracts.map((contract, index) => ({id: contract.id, version: contract.version, contractDigest: contract.digest, type: ["manuscript", "source", "comment"][index] ?? "unknown", fields: {title: "title", template: "template", csl: "csl"}}));
+  return fixture({collections: [
+    {name: "Writing", contracts, records: [{path: "writing/main.md", frontmatter: {title: "Original manuscript"}, body: "Original manuscript", types: ["manuscript"]}]},
+    {name: "Archive", role: "editor"},
+  ]});
+}
+const dialogClose = Object.getOwnPropertyDescriptor(HTMLDialogElement.prototype, "close");
+const dialogShowModal = Object.getOwnPropertyDescriptor(HTMLDialogElement.prototype, "showModal");
+beforeEach(() => {
+  // jsdom omits these browser APIs.
+  Object.defineProperty(HTMLDialogElement.prototype, "close", {configurable: true, value(this: HTMLDialogElement) {this.removeAttribute("open");}});
+  Object.defineProperty(HTMLDialogElement.prototype, "showModal", {configurable: true, value(this: HTMLDialogElement) {this.setAttribute("open", "");}});
+  class Observer implements IntersectionObserver {
+    readonly root = null; readonly rootMargin = "0px"; readonly thresholds = [0];
+    observe() {} unobserve() {} disconnect() {} takeRecords(): IntersectionObserverEntry[] {return [];}
+  }
+  vi.stubGlobal("IntersectionObserver", Observer);
+});
+afterEach(() => {
+  cleanup(); for (const app of apps.splice(0)) void app.close(); vi.restoreAllMocks(); vi.unstubAllGlobals();
+  if (dialogClose) Object.defineProperty(HTMLDialogElement.prototype, "close", dialogClose); else Reflect.deleteProperty(HTMLDialogElement.prototype, "close");
+  if (dialogShowModal) Object.defineProperty(HTMLDialogElement.prototype, "showModal", dialogShowModal); else Reflect.deleteProperty(HTMLDialogElement.prototype, "showModal");
+});
+function Capture({scope, publish}: {scope: WriterNativeScope; publish(scope: WriterNativeScope): void}) {
+  useEffect(() => {publish(scope);}, [scope, publish]);
+  return <p role="status">Native test consumer</p>;
+}
+
+it("hands Writer the gate's ready connection and retires that scope when the collection closes", async () => {
+  const h = await readyFixture(); const close = vi.spyOn(h.client(), "close");
+  const scopes: WriterNativeScope[] = []; const publish = (scope: WriterNativeScope) => scopes.push(scope);
+  render(<StrictMode><SdkWriterRoot sdk={h.mdbase} renderNative={scope => <Capture scope={scope} publish={publish} />} /></StrictMode>);
+  await screen.findByText("Native test consumer");
+  // The consumer publishes its scope from an effect, which can run after its text is on screen.
+  const scope = await waitFor(() => { const latest = scopes.at(-1); if (!latest) throw new Error("Missing native scope"); return latest; });
+  expect(scope.connection.records).toBe(h.client());
+  await act(async () => h.set("choosing"));
+  expect(screen.queryByText("Native test consumer")).toBeNull();
+  expect(scope.signal.aborted).toBe(true);
+  expect(await scope.records.open("writing/main.md")).toMatchObject({ok: false, problem: {code: "cancelled"}});
+  expect(close).not.toHaveBeenCalled();
+});
+
+it("opens the manuscript list with the shared collection switcher in the top bar", async () => {
+  const h = await readyFixture();
+  const names = ["manuscript", "source", "comment"];
+  const catalog: wire.DescribeResult = {specVersion: "0.3.0", settings: new Map(), issues: [], inclusion: {include: ["image"]},
+    contracts: manifest.requirements.contracts.map((contract, index) => ({...contract, path: `_contracts/${contract.id}.md`, digest: contract.digest.replace(/^sha256:/, ""), contractType: "record", implementedBy: [names[index] ?? "unknown"]})),
+    types: manifest.requirements.contracts.map((contract, index) => ({name: names[index] ?? "unknown", path: `_types/${names[index]}.md`, implements: [{contract: contract.id, version: contract.version, fields: new Map([["title", "title"], ["template", "template"], ["csl", "csl"]])}]}))};
+  vi.spyOn(h.client(), "describe").mockResolvedValue(catalog);
+  const {container} = render(<App sdk={h.mdbase} />);
+  await screen.findByText("Original manuscript");
+  const trigger = await screen.findByRole("button", {name: "Switch collection, current: Writing"});
+  expect(container.querySelector(".topbar-slot")?.contains(trigger)).toBe(true);
+  fireEvent.click(trigger);
+  // The popover's open state is a browser feature jsdom lacks, so find the row directly.
+  const archive = [...document.querySelectorAll<HTMLElement>("[role=radio]")].find(row => row.textContent.includes("Archive"));
+  if (!archive) throw new Error("No Archive row in the switcher");
+  fireEvent.click(archive);
+  await waitFor(() => expect(h.count("select")).toBe(1));
+});
+
+it("signs out with signOut and never closes the shared entry", async () => {
+  const h = await fixture({collections: [{name: "Drafts"}], phase: "choosing"});
+  render(<SdkWriterRoot sdk={h.mdbase} renderNative={() => <p>Never ready</p>} />);
+  expect(await screen.findByText("Drafts")).toBeTruthy();
+  fireEvent.click(screen.getByRole("button", {name: "Sign out"}));
+  await waitFor(() => expect(h.count("signOut")).toBe(1));
+  expect(h.count("close")).toBe(0);
+  expect(screen.queryByText("Never ready")).toBeNull();
+});
diff --git a/apps/writer/src/ui/SdkWriterRoot.tsx b/apps/writer/src/ui/SdkWriterRoot.tsx
new file mode 100644
index 00000000..0d03b13f
--- /dev/null
+++ b/apps/writer/src/ui/SdkWriterRoot.tsx
@@ -0,0 +1,52 @@
+import { useEffect, useState, type ReactNode } from "react";
+import type { Mdbase, MdbaseApplicationConnection, MdbaseClient } from "@mdbase-dev/sdk";
+import { ConnectLayout } from "@mdbase-dev/ui/screens";
+import { NextWriterRecords } from "../backend/next-records.js";
+import { ConnectionNoticeContext, useConnectionNotice } from "./connection-notice.js";
+import { NativeWriterView } from "./NativeWriterView.js";
+import { WriterCollectionGate, WriterCollectionSwitcher } from "./writer-collections.js";
+
+export type WriterSdk = Mdbase;
+export interface WriterNativeScope {
+  readonly mdbase: Mdbase;
+  readonly connection: MdbaseApplicationConnection;
+  readonly records: NextWriterRecords;
+  readonly signal: AbortSignal;
+}
+export interface SdkWriterRootProps {
+  sdk: WriterSdk;
+  /** Real native domain UI only. Never supply a fake legacy backend/client. */
+  renderNative?(scope: WriterNativeScope): ReactNode;
+}
+
+/** Writer over the SDK's mdbase entry. The shared collection gate starts it and
+ * owns sign-in, choosing, approval, setup and problems; Writer opens only the connection the
+ * gate hands over in phase `ready`, and never closes the entry. */
+export function SdkWriterRoot({ sdk, renderNative }: SdkWriterRootProps) {
+  const notice = useConnectionNotice(sdk);
+  return <ConnectionNoticeContext.Provider value={notice}>
+    <WriterCollectionGate mdbase={sdk}>
+      {connection => <>
+        <WriterCollectionSwitcher mdbase={sdk} />
+        <NativeScopeView key={`${connection.id}:${connection.generation}`} mdbase={sdk} connection={connection} renderNative={renderNative} />
+      </>}
+    </WriterCollectionGate>
+  </ConnectionNoticeContext.Provider>;
+}
+
+function NativeScopeView({ mdbase, connection, renderNative }: { mdbase: Mdbase; connection: MdbaseApplicationConnection; renderNative?: SdkWriterRootProps["renderNative"] }) {
+  const [view, setView] = useState<{ client: MdbaseClient; scope: WriterNativeScope } | null>(null);
+  // The parent keys by SDK collection ID and generation. A later snapshot may hand
+  // back a new facade for the same scope; it must not retire these leases.
+  const [original] = useState(connection);
+  const client = original.records;
+  useEffect(() => {
+    const lifetime = new AbortController();
+    const records = new NextWriterRecords(client, lifetime.signal, () => original.isCurrent());
+    let active = true;
+    queueMicrotask(() => { if (active) setView({ client, scope: { mdbase, connection: original, records, signal: lifetime.signal } }); });
+    return () => { active = false; lifetime.abort(); records.dispose(); };
+  }, [mdbase, client, original]);
+  if (!view || view.client !== client) return <ConnectLayout app="writer" title="Opening your collection"><p role="status">Opening Writer…</p></ConnectLayout>;
+  return renderNative ? renderNative(view.scope) : <NativeWriterView scope={view.scope} />;
+}
diff --git a/apps/writer/src/ui/Settings.tsx b/apps/writer/src/ui/Settings.tsx
index fe6926cb..783f3580 100644
--- a/apps/writer/src/ui/Settings.tsx
+++ b/apps/writer/src/ui/Settings.tsx
@@ -12,7 +12,6 @@ import { useEffect, useId, useLayoutEffect, useRef, useState, type ReactNode } f
 
 import type { WriterDiagnostic } from "../compile/protocol.js";
 import type { ManuscriptWorkspace, RecordView } from "../workspace/workspace.js";
-import { joinSoftBreaks } from "../editor/join-lines.js";
 import { ChevronUp, CloseIcon, MinusIcon, PlusIcon } from "./icons.js";
 import { templateName } from "./names.js";
 
@@ -44,9 +43,7 @@ export function Settings({
   open,
   onClose,
   focus,
-  joinLines = false,
   livePreview = true,
-  onJoinLines,
   onLivePreview,
 }: {
   workspace: ManuscriptWorkspace;
@@ -56,10 +53,7 @@ export function Settings({
   open: boolean;
   onClose(): void;
   focus: SettingsFocus | null;
-  /** Shows the abstract's soft line breaks as spaces, as the editor does. */
-  joinLines?: boolean;
   livePreview?: boolean;
-  onJoinLines?(): void;
   onLivePreview?(): void;
 }) {
   const titleId = useId();
@@ -137,7 +131,7 @@ export function Settings({
         </div>
         <TextField label="Date" hint="as it should appear" value={str("date")} onCommit={(v) => patch({ date: v || null })} {...props("date")} />
         <div className="span-2">
-          <TextField label="Abstract" multiline={7} grow value={joinLines ? joinSoftBreaks(str("abstract")) : str("abstract")} onCommit={(v) => patch({ abstract: v || null })} {...props("abstract")} />
+          <TextField label="Abstract" multiline={7} grow value={str("abstract")} onCommit={(v) => patch({ abstract: v || null })} {...props("abstract")} />
         </div>
         <SelectField
           label="Citation style"
@@ -170,22 +164,14 @@ export function Settings({
         />
       </fieldset>
       <p className="muted small dialog-note">Changes are saved to the manuscript’s frontmatter as you type, and the preview follows them.</p>
-      {(onJoinLines || onLivePreview) && (
+      {onLivePreview && (
         <section className="editor-prefs" aria-labelledby={`${titleId}-editor`}>
           <h2 id={`${titleId}-editor`}>Editor</h2>
-          {onLivePreview && (
-            <label className="pref-row" title="Citations show who they cite, figures and tables are drawn, and marks are hidden until the cursor reaches their line. The text is not changed.">
-              <input type="checkbox" checked={livePreview} onChange={onLivePreview} />
-              <span>Read as the manuscript<span className="muted small">Off shows the Markdown as written</span></span>
-            </label>
-          )}
-          {onJoinLines && (
-            <label className="pref-row" title="A line break inside a paragraph reads as a space; show it as one, so hard-wrapped text flows to the editor's width. The text is not changed.">
-              <input type="checkbox" checked={joinLines} onChange={onJoinLines} />
-              <span>Join hard-wrapped lines<span className="muted small">Paragraphs flow to the editor’s width</span></span>
-            </label>
-          )}
-          <p className="muted small dialog-note">These apply in this browser, to every manuscript.</p>
+          <label className="pref-row" title="Citations show who they cite, figures and tables are drawn, and marks are hidden until the cursor reaches their line. The text is not changed.">
+            <input type="checkbox" checked={livePreview} onChange={onLivePreview} />
+            <span>Read as the manuscript<span className="muted small">Off shows the Markdown as written</span></span>
+          </label>
+          <p className="muted small dialog-note">This applies in this browser, to every manuscript.</p>
         </section>
       )}
     </aside>
diff --git a/apps/writer/src/ui/WorkspaceView.tsx b/apps/writer/src/ui/WorkspaceView.tsx
index a234ad15..029f0e4b 100644
--- a/apps/writer/src/ui/WorkspaceView.tsx
+++ b/apps/writer/src/ui/WorkspaceView.tsx
@@ -1,20 +1,20 @@
 // An open manuscript: the top bar's title, status and actions; a sidebar with
 // the outline and sources; the editor and the typeset preview side by side
 // (either can be hidden, and the split between them dragged).
+import { CollectionSaveWarning } from "@mdbase-dev/ui/collections";
 import { annotationSourcePath, blockQuotation, sourceAnnotation } from "@mdbase-writer/core/annotations";
 import { resolveLinkTarget } from "@mdbase-writer/core/records";
 import { themePreferences, type ThemePreference } from "@mdbase-dev/ui/theme";
-import { memo, useCallback, useContext, useDeferredValue, useEffect, useId, useMemo, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
+import { memo, useCallback, useContext, useDeferredValue, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
 
 import type { BlockPosition, SourceMark, WriterDiagnostic } from "../compile/protocol.js";
 import type { ChapterCards } from "../editor/chapter-cards.js";
-import type { CommentAnchor } from "../editor/comments.js";
 import { Editor, type EditorHandle, type RetainedEditor } from "../editor/Editor.js";
 import { equationSnippet, figureSnippet, tableSnippet } from "../editor/snippets.js";
 import type { InsertCommand } from "../editor/slash.js";
 import type { SelectionAction } from "../editor/selection-bar.js";
 import { authorYear } from "../editor/library-search.js";
-import { ALT_LABEL, MOD_LABEL, referenceAtOffset, referenceOffsets, type EditorInsight, type FollowTarget, type LabelTarget } from "../editor/insight.js";
+import { ALT_LABEL, MOD_LABEL, referenceAtOffset, referenceOffsets, type EditorInsight, type FollowTarget } from "../editor/insight.js";
 import { Preview, type PreviewView } from "../preview/Preview.js";
 import { wordCount } from "../words.js";
 import { discoveredDiagnostics, sourceKeys, type ManuscriptWorkspace } from "../workspace/workspace.js";
@@ -45,6 +45,7 @@ import { readerSourceHref } from "../apps.js";
 import { errorMessage } from "../async.js";
 import { zip } from "../export/zip.js";
 import { CompareDialog, type Comparison } from "./CompareDialog.js";
+import { ExportReview, type PendingExport } from "./ExportReview.js";
 import { clampSidebar, clampSplit, DEFAULT_LAYOUT, gridFor, loadLayout, nextZoom, saveLayout, SIDEBAR_MAX, SIDEBAR_MIN, type Layout, type SidebarTab, type View } from "./layout.js";
 import { styleName, templateName } from "./names.js";
 import { anchorsFor, threadIsNew, ThreadPlacement, when, type PlacedThread } from "./comments.js";
@@ -56,13 +57,14 @@ import type { CitationSite } from "./SourcesPanel.js";
 import { ManuscriptSearch, type SearchRequest } from "./ManuscriptSearch.js";
 import { OutlinePanel } from "./OutlinePanel.js";
 import { ProblemsStrip } from "./ProblemsStrip.js";
-import { CommandPalette } from "@mdbase-dev/ui/command-palette";
+import { CommandPalette, type Command } from "@mdbase-dev/ui/command-palette";
 import { moveMenuFocus, useMenuPopover } from "@mdbase-dev/ui/popover";
 import { ConnectLayout } from "@mdbase-dev/ui/screens";
 import { signalMdbaseMark, useMdbaseMarkBusy } from "@mdbase-dev/ui/mark-activity";
 import { SaveNotice } from "@mdbase-dev/ui/save-notice";
 import { FeedbackButton, useFeedback } from "@mdbase-dev/ui/feedback";
-import { plural, recordTitle, STATE_LABEL, STATE_SHORT_LABEL, STATE_TONE } from "./records.js";
+import { plural, recordTitle, STATE_TONE, workspaceSaveNotice } from "./records.js";
+import { ConnectionNoticeContext, connectionNoticeLabels } from "./connection-notice.js";
 import { Settings, type SettingsFocus } from "./Settings.js";
 import { ManuscriptStats } from "./stats.js";
 import { SourcesPanel, type SourcesRequest } from "./SourcesPanel.js";
@@ -101,6 +103,14 @@ const NO_DIAGNOSTICS: readonly WriterDiagnostic[] = [];
 const SETTLE_MS = 1500;
 const NO_POSITIONS: readonly BlockPosition[] = [];
 const NO_MARKS: readonly SourceMark[] = [];
+const INSERTION_SPECS: readonly Omit<InsertCommand, "run">[] = [
+  { id: "citation", label: "Citation", syntax: "[@citekey, p. 12]", keywords: "cite source reference" },
+  { id: "footnote", label: "Footnote", syntax: "[^1] … with its text at the end", keywords: "note" },
+  { id: "crossref", label: "Cross-reference", syntax: "@sec-intro, @fig-plan", keywords: "refer section figure table label" },
+  { id: "figure", label: "Figure from an image…", syntax: "![Caption](figures/plan.png){#fig-plan}", keywords: "image picture photo upload" },
+  { id: "table", label: "Table", syntax: "| … | … | with : Caption {#tbl-x}", keywords: "grid columns rows" },
+  { id: "equation", label: "Equation", syntax: "$$ … $$ {#eq-x}", keywords: "math formula display" },
+];
 
 const THEME_NAME: Record<ThemePreference, string> = { system: "System", light: "Light", dark: "Dark" };
 
@@ -133,15 +143,17 @@ const isTextEntry = (target: EventTarget | null) =>
 /** True once `flag` has held for `delay` ms, so a quick flicker of work never shows. */
 function useSustained(flag: boolean, delay: number): boolean {
   const [held, setHeld] = useState(false);
+  const [observed, setObserved] = useState(flag);
+  if (observed !== flag) {
+    setObserved(flag);
+    setHeld(false);
+  }
   useEffect(() => {
-    if (!flag) {
-      setHeld(false);
-      return;
-    }
+    if (!flag) return;
     const t = setTimeout(() => setHeld(true), delay);
     return () => clearTimeout(t);
   }, [flag, delay]);
-  return flag && held;
+  return flag && observed && held;
 }
 
 export function WorkspaceView({ workspace, since, onClose }: { workspace: ManuscriptWorkspace; /** When this manuscript was last opened here, so what others wrote since can be marked. */ since?: string | undefined; onClose(force?: boolean): void }) {
@@ -183,11 +195,11 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   const [pendingComment, setPendingComment] = useState<PendingComment | null>(null);
   const [activeComment, setActiveComment] = useState<string | null>(null);
   const editor = useRef<EditorHandle | null>(null);
-  const editorStates = useRef(new Map<string, RetainedEditor>());
+  const [editorStates] = useState(() => new Map<string, RetainedEditor>());
   const [comparisonPath, setComparisonPath] = useState<string | null>(null);
   const [leaveProblem, setLeaveProblem] = useState<string | null>(null);
   const [savingBeforeLeave, setSavingBeforeLeave] = useState(false);
-  const [pendingExport, setPendingExport] = useState<{ bytes: Uint8Array; type: string; name: string; problems: readonly string[] } | null>(null);
+  const [pendingExport, setPendingExport] = useState<PendingExport | null>(null);
   const exportJob = useRef<AbortController | null>(null);
   const lastExport = useRef<ExportFormat>(exportFormat);
   useEffect(() => () => exportJob.current?.abort(), []);
@@ -198,7 +210,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   const grid = useRef<HTMLDivElement>(null);
   // Where the cursor is now (the cursor state above trails it slightly), and
   // whether typing has paused, for holding back problems on the line being typed.
-  const liveCursor = useRef<{ record: string; offset: number } | null>(null);
+  const [liveCursor, setLiveCursor] = useState<{ record: string; offset: number } | null>(null);
   const [typing, setTyping] = useState(false);
   const typingTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
 
@@ -209,7 +221,6 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
       return next;
     });
   }, []);
-  const toggleJoinLines = useCallback(() => setLayout((l) => ({ ...l, joinLines: !l.joinLines })), [setLayout]);
   const toggleLivePreview = useCallback(() => setLayout((l) => ({ ...l, livePreview: !l.livePreview })), [setLayout]);
   const setSidebarTab = useCallback((tab: SidebarTab) => {
     rememberedTabs.set(workspace.main, tab);
@@ -219,14 +230,16 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   const setLowerTab = useCallback((lowerTab: SidebarTab | null) => setLayout((l) => ({ ...l, lowerTab: lowerTab === l.tab ? null : lowerTab })), [setLayout]);
   const toggleLower = useCallback(() => setLayout((l) => ({ ...l, lowerTab: l.lowerTab ? null : l.tab === "comments" ? "outline" : "comments" })), [setLayout]);
 
-  const order = useMemo(() => workspace.readingOrder(), [workspace, snap.records, snap.recordPaths, snap.annotationPaths]);
+  const order = workspace.readingOrder();
+  const citationNavRef = useRef({ order, snap, cursor, active });
+  useLayoutEffect(() => { citationNavRef.current = { order, snap, cursor, active }; }, [order, snap, cursor, active]);
   const activeView = snap.records.get(active);
-  const dependencyDiagnostics = useMemo(() => workspace.dependencyDiagnostics(), [workspace, snap.assetProblems, snap.recordProblems, snap.records]);
-  const allDiagnostics = useMemo(() => [...discoveredDiagnostics(snap.result?.diagnostics ?? NO_DIAGNOSTICS, snap), ...dependencyDiagnostics], [snap.result?.diagnostics, snap.indexLoad, snap.libraryLoad, snap.annotationsLoad, dependencyDiagnostics]);
+  const dependencyDiagnostics = workspace.dependencyDiagnostics();
+  const allDiagnostics = useMemo(() => [...discoveredDiagnostics(snap.result?.diagnostics ?? NO_DIAGNOSTICS, snap), ...dependencyDiagnostics], [snap, dependencyDiagnostics]);
   // A citation or label half typed is not a problem yet: problems on the line
   // being typed wait until typing pauses or the cursor leaves the line.
   const diagnostics = useMemo(() => {
-    const at = liveCursor.current;
+    const at = liveCursor;
     const body = at && typing ? snap.records.get(at.record)?.snapshot.body : undefined;
     if (!at || body === undefined) return allDiagnostics;
     const from = body.lastIndexOf("\n", at.offset - 1) + 1;
@@ -234,8 +247,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
     const to = end < 0 ? body.length : end;
     const shown = allDiagnostics.filter((d) => d.field || d.record !== at.record || d.from < from || d.from > to);
     return shown.length === allDiagnostics.length ? allDiagnostics : shown;
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- the live cursor is a ref; the trailing cursor says when it moved
-  }, [allDiagnostics, typing, snap.records, cursor]);
+  }, [allDiagnostics, typing, snap.records, liveCursor]);
   // Problems on the line being typed, held back until typing pauses.
   const heldProblems = allDiagnostics.length - diagnostics.length;
   const byRecord = useMemo(() => {
@@ -248,7 +260,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
 
   // Counts and lookups over every record's text trail typing slightly (deferred).
   const records = useDeferredValue(snap.records);
-  const statsCache = useMemo(() => new ManuscriptStats(), [workspace]);
+  const [statsCache] = useState(() => new ManuscriptStats());
   const stats = useMemo(() => statsCache.derive(order, records, snap.library), [statsCache, records, snap.library, order]);
   const completion = useMemo(
     () => ({ library: snap.library, labels: snap.result?.labels ?? [], recordPaths: snap.recordPaths, cited: stats.cited }),
@@ -266,20 +278,20 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   );
 
   // Threads on the manuscript's records, placed in their (slightly deferred) text.
-  const threadPlacement = useMemo(() => new ThreadPlacement(), [workspace]);
+  const [threadPlacement] = useState(() => new ThreadPlacement());
   const placed = useMemo(
     () => threadPlacement.place(snap.comments, order, (path) => records.get(path)?.snapshot.body, snap.recordIndex),
     [threadPlacement, snap.comments, records, snap.recordIndex, order],
   );
   // Threads are placed again after every edit, but the editor's anchors follow
   // edits themselves: it is only given new ones when they change.
-  const shownAnchors = useRef<{ key: string; anchors: CommentAnchor[] } | null>(null);
-  const anchors = useMemo(() => {
-    const next = anchorsFor(placed, active);
-    const key = JSON.stringify([active, next]);
-    if (shownAnchors.current?.key !== key) shownAnchors.current = { key, anchors: next };
-    return shownAnchors.current.anchors;
-  }, [placed, active]);
+  const nextAnchors = anchorsFor(placed, active);
+  const anchorKey = JSON.stringify([active, nextAnchors]);
+  const [shownAnchors, setShownAnchors] = useState({ key: anchorKey, anchors: nextAnchors });
+  if (shownAnchors.key !== anchorKey) {
+    setShownAnchors({ key: anchorKey, anchors: nextAnchors });
+  }
+  const anchors = shownAnchors.key === anchorKey ? shownAnchors.anchors : nextAnchors;
 
   const showComments = useCallback(() => {
     setLayout((l) => (l.sidebar && (l.tab === "comments" || l.lowerTab === "comments") ? l : { ...l, sidebar: true, tab: "comments", lowerTab: l.lowerTab === "comments" ? l.tab : l.lowerTab }));
@@ -317,17 +329,13 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
     return map;
   }, [placed]);
   const openThreads = useMemo(() => placed.filter((p) => p.thread.root.status === "open"), [placed]);
-  const selectThread = useCallback((p: PlacedThread) => {
-    setActiveComment(p.thread.root.path);
-    if (p.at && p.at !== "whole") jump(p.record, p.at.from);
-    else if (p.record !== active) jump(p.record, 0);
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- jump is declared below
-  }, [active]);
 
   const manuscriptTitle = recordTitle(snap.records.get(workspace.main), workspace.main);
   const states = [...snap.records.values()].map((r) => r.snapshot.state);
   if (snap.pendingSettings) states.push("unsaved");
   const overall = states.find((s) => STATE_TONE[s] === "attention") ?? states.find((s) => STATE_TONE[s] !== "saved") ?? "saved";
+  const saveNotice = workspaceSaveNotice(overall, snap.recoveredDrafts.size > 0);
+  const connection = useContext(ConnectionNoticeContext);
 
   useEffect(() => {
     document.title = `${manuscriptTitle} · mdbase writer`;
@@ -340,7 +348,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
 
   // The preview follows the cursor's block (after the cursor rests briefly).
   const onCursor = useCallback((offset: number) => {
-    liveCursor.current = { record: active, offset };
+    setLiveCursor({ record: active, offset });
     clearTimeout(cursorTimer.current);
     cursorTimer.current = setTimeout(() => setCursor({ record: active, offset }), 120);
   }, [active]);
@@ -368,6 +376,11 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
       setActive(record);
     }
   }, [active, setLayout]);
+  const selectThread = useCallback((p: PlacedThread) => {
+    setActiveComment(p.thread.root.path);
+    if (p.at && p.at !== "whole") jump(p.record, p.at.from);
+    else if (p.record !== active) jump(p.record, 0);
+  }, [active, jump]);
 
   // Stable handlers, so the editor and preview only render when what they show changes.
   const onEditorChange = useCallback((text: string) => {
@@ -433,7 +446,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
 
   // The next or previous open comment, in reading order from the cursor (F7 / Shift-F7).
   const stepComment = useCallback((direction: 1 | -1) => {
-    const { order, cursor, active } = citationNav.current;
+    const { order, cursor, active } = citationNavRef.current;
     const located = openThreads.filter((p) => p.at && p.at !== "whole");
     if (!located.length) return;
     const here = cursor ?? { record: active, offset: -1 };
@@ -448,7 +461,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
 
   // Where a source is cited, named by section, for the Sources panel.
   const sitesFor = useCallback((key: string): readonly CitationSite[] => {
-    const { order, snap } = citationNav.current;
+    const { order, snap } = citationNavRef.current;
     const out: CitationSite[] = [];
     const seen = new Set<string>();
     for (const record of order) {
@@ -466,10 +479,8 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   }, []);
 
   // The next or previous citation of a source, in reading order from the cursor.
-  const citationNav = useRef({ order, snap, cursor, active });
-  citationNav.current = { order, snap, cursor, active };
   const stepCitation = useCallback((key: string, direction: 1 | -1) => {
-    const { order, snap, cursor, active } = citationNav.current;
+    const { order, snap, cursor, active } = citationNavRef.current;
     const uses = order.flatMap((record) => referenceOffsets(snap.records.get(record)?.snapshot.body ?? "", key).map((offset) => ({ record, offset })));
     if (!uses.length) return;
     const here = cursor ?? { record: active, offset: -1 };
@@ -529,7 +540,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   const figureInput = useRef<HTMLInputElement>(null);
   const labelSet = useMemo(() => new Set(snap.result?.labels ?? []), [snap.result?.labels]);
   const labels = useRef(labelSet);
-  labels.current = labelSet;
+  useLayoutEffect(() => { labels.current = labelSet; }, [labelSet]);
   /** Stores each image in the collection and writes a figure for it at the cursor. */
   const addFigures = useCallback(async (files: readonly File[]) => {
     for (const file of files) {
@@ -542,7 +553,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
     }
   }, [workspace]);
   const insertFigure = useCallback(() => {
-    if (!workspace.canStoreFiles) { setNotice({ tone: "problem", text: "This collection does not accept files from Writer. Add the image to the collection, then write ![Caption](path){#fig-name}." }); return; }
+    if (!workspace.canStoreFiles) { setNotice({ tone: "problem", text: "Image upload is coming soon. Existing image links still work." }); return; }
     figureInput.current?.click();
   }, [workspace]);
   const insertTable = useCallback(() => { setPane("write"); editor.current?.insertBlock(tableSnippet(labelSet)); }, [labelSet]);
@@ -550,19 +561,25 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
   const insertReference = useCallback(() => { setPane("write"); editor.current?.insert("@", { complete: true }); }, []);
   const insertFootnote = useCallback(() => { setPane("write"); editor.current?.insertFootnote(); }, []);
   /** What can be inserted, offered by "/" in the editor, the Insert menu and the command palette alike. */
-  const inserts = useMemo<readonly InsertCommand[]>(() => [
-    { id: "citation", label: "Citation", syntax: "[@citekey, p. 12]", keywords: "cite source reference", run: () => showSources() },
-    { id: "footnote", label: "Footnote", syntax: "[^1] … with its text at the end", keywords: "note", run: insertFootnote },
-    { id: "crossref", label: "Cross-reference", syntax: "@sec-intro, @fig-plan", keywords: "refer section figure table label", run: insertReference },
-    { id: "figure", label: "Figure from an image…", syntax: "![Caption](figures/plan.png){#fig-plan}", keywords: "image picture photo upload", run: insertFigure },
-    { id: "table", label: "Table", syntax: "| … | … | with : Caption {#tbl-x}", keywords: "grid columns rows", run: insertTable },
-    { id: "equation", label: "Equation", syntax: "$$ … $$ {#eq-x}", keywords: "math formula display", run: insertEquation },
-  ], [showSources, insertFootnote, insertReference, insertFigure, insertTable, insertEquation]);
+  const canStoreFiles = workspace.canStoreFiles;
+  const insertionSpecs = useMemo(() => INSERTION_SPECS.filter((spec) => spec.id !== "figure" || canStoreFiles), [canStoreFiles]);
+  const runInsertion = useCallback((id: string) => {
+    switch (id) {
+      case "citation": showSources(); break;
+      case "footnote": insertFootnote(); break;
+      case "crossref": insertReference(); break;
+      case "figure": insertFigure(); break;
+      case "table": insertTable(); break;
+      case "equation": insertEquation(); break;
+    }
+  }, [showSources, insertFootnote, insertReference, insertFigure, insertTable, insertEquation]);
+  const inserts = useMemo<readonly InsertCommand[]>(() => insertionSpecs.map((spec) => ({ ...spec, run: () => runInsertion(spec.id) })), [insertionSpecs, runInsertion]);
+  const paletteInserts: Command[] = insertionSpecs.map((spec) => ({ id: `insert-${spec.id}`, group: "Insert", label: spec.label, detail: spec.syntax, keywords: spec.keywords, run: () => runInsertion(spec.id) }));
   const [insertOpen, setInsertOpen] = useState(false);
   const replyToThread = useCallback(async (thread: Parameters<typeof workspace.reply>[0], text: string) => signalResult(await workspace.reply(thread, text)), [workspace]);
-  const changeComment = useCallback(async (comment: Parameters<typeof workspace.changeComment>[0], change: Parameters<typeof workspace.changeComment>[1]) => signalResult(await workspace.changeComment(comment, change)), [workspace]);
+  const changeComment = async (comment: Parameters<typeof workspace.changeComment>[0], change: Parameters<typeof workspace.changeComment>[1]) => signalResult(await workspace.changeComment(comment, change));
   const acceptSuggestion = useCallback(async (p: PlacedThread) => signalFailure(await workspace.acceptSuggestion(p.record, p.thread.root)), [workspace]);
-  const commentDrafts = useRef<CommentDrafts>(new Map());
+  const [commentDrafts] = useState<CommentDrafts>(() => new Map());
   const sidebarPanel = useRef<HTMLDivElement>(null);
   const sidebarScroll = useRef(new Map<SidebarTab, number>());
   useEffect(() => {
@@ -688,7 +705,8 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
 
   // Keyboard shortcuts (listed in the shortcuts dialog).
   const shortcuts = useRef<(e: KeyboardEvent) => void>(() => {});
-  shortcuts.current = (e: KeyboardEvent) => {
+  useLayoutEffect(() => {
+    shortcuts.current = (e: KeyboardEvent) => {
     if (e.target instanceof Element && e.target.closest("dialog[open]")) return;
     if (document.querySelector("dialog[open]") && e.key !== "F8") return;
     const mod = isMod(e);
@@ -699,7 +717,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
     else if (mod && e.shiftKey && e.code === "KeyE") showSources();
     else if (mod && e.shiftKey && e.code === "KeyM") showComments();
     else if (e.key === "F7" && !mod) stepComment(e.shiftKey ? -1 : 1);
-    else if (mod && !e.shiftKey && e.key === ",") (settingsOpen ? closeSettings() : setSettingsOpen(true));
+    else if (mod && !e.shiftKey && e.key === ",") { if (settingsOpen) closeSettings(); else setSettingsOpen(true); }
     else if (mod && e.altKey && e.code === "KeyM") startComment("comment");
     else if (mod && e.altKey && e.code === "KeyS") startComment("suggest");
     else if (mod && e.altKey && e.code === "KeyF") insertFootnote();
@@ -714,7 +732,8 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
       e.preventDefault();
       e.stopPropagation();
     }
-  };
+    };
+  });
   useEffect(() => {
     const listener = (e: KeyboardEvent) => shortcuts.current(e);
     window.addEventListener("keydown", listener, true);
@@ -772,7 +791,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
               }}
               onJump={jump}
               onMove={(from, to) => workspace.moveChapter(from, to)}
-              onAdd={async (title) => signalFailure(await workspace.addChapter(title))}
+              onAdd={async (title, intent) => signalFailure(await workspace.addChapter(title, intent))}
               onRename={(path, title) => signalFailure(workspace.renameChapter(path, title))}
               commentOffsets={commentOffsets}
             />
@@ -783,7 +802,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
           loading={snap.commentsLoad.phase === "loading" || snap.indexLoad.phase === "loading"}
           onRetry={() => void workspace.loadComments()}
           placed={placed}
-          drafts={commentDrafts.current}
+          drafts={commentDrafts}
           grouped={order.length > 1}
           people={snap.people}
           problem={snap.commentsProblem}
@@ -839,8 +858,11 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
           </button>
           <span className="bar-divider" aria-hidden="true" />
           <span className="bar-title" title={manuscriptTitle}>{manuscriptTitle}</span>
-          <SaveNotice tone={STATE_TONE[overall]} label={STATE_LABEL[overall]} className="is-long" />
-          {STATE_SHORT_LABEL[overall] && <SaveNotice tone="attention" label={STATE_SHORT_LABEL[overall]} className="is-short" />}
+          {connection && saveNotice.tone !== "attention"
+            ? <SaveNotice tone="pending" label={connectionNoticeLabels[connection]} className="is-long" />
+            : <SaveNotice tone={saveNotice.tone} label={saveNotice.label} className="is-long" />}
+          <CollectionSaveWarning />
+          {saveNotice.shortLabel && <SaveNotice tone="attention" label={saveNotice.shortLabel} className="is-short" />}
           <span className="bar-words" title={`In ${plural(order.length, "record")}; citations, code and math are not counted`}>
             {plural(stats.words, "word")}
           </span>
@@ -964,7 +986,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
         })}
         {snap.draftProblem && <div className="banner" role="alert"><span>{snap.draftProblem}</span><button type="button" className="mdbase-button" onClick={downloadDrafts}>Download local drafts</button></div>}
         {snap.recoveredDrafts.size > 0 && <div className="banner" role="alert">
-          <span>{snap.recoveredDrafts.size} recovered local draft(s) need review before writing in those records.</span>
+          <span>Review {plural(snap.recoveredDrafts.size, "recovered local draft")}. Editing is paused in {snap.recoveredDrafts.size === 1 ? "that record" : "those records"} until you restore the local draft or use the collection version.</span>
           {[...snap.recoveredDrafts.keys()].map((path) => <button key={path} type="button" className="mdbase-button" onClick={() => setComparisonPath(path)}>Review {recordTitle(snap.records.get(path), path)}</button>)}
         </div>}
         {activeView?.snapshot.state === "conflict" && (
@@ -985,13 +1007,12 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
         {activeView ? (
           <Editor
             key={active}
-            states={editorStates.current}
+            states={editorStates}
             path={active}
             text={activeView.snapshot.body}
             readOnly={activeView.snapshot.state === "deleted" || snap.recoveredDrafts.has(active)}
-            joinLines={layout.joinLines}
             livePreview={layout.livePreview}
-            onImageFiles={(files) => void addFigures(files)}
+            {...(workspace.canStoreFiles ? { onImageFiles: (files: readonly File[]) => void addFigures(files) } : {})}
             diagnostics={byRecord.get(active) ?? NO_DIAGNOSTICS}
             completion={completion}
             inserts={inserts}
@@ -1133,9 +1154,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
         open={settingsOpen}
         onClose={closeSettings}
         focus={settingsFocus}
-        joinLines={layout.joinLines}
         livePreview={layout.livePreview}
-        onJoinLines={toggleJoinLines}
         onLivePreview={toggleLivePreview}
       />
       <Shortcuts open={shortcutsOpen} onClose={closeShortcuts} />
@@ -1153,7 +1172,7 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
           { id: "italic", group: "Format", label: "Italic", shortcut: "mod+i", run: () => editor.current?.format("italic") },
           { id: "code", group: "Format", label: "Inline code", run: () => editor.current?.format("code") },
           { id: "link", group: "Format", label: "Link", shortcut: "mod+shift+k", run: () => editor.current?.format("link") },
-          ...inserts.map((c) => ({ id: `insert-${c.id}`, group: "Insert", label: c.label, detail: c.syntax, keywords: c.keywords, run: c.run })),
+          ...paletteInserts,
           { id: "comment", group: "Comments", label: "Comment on the selection", shortcut: "mod+alt+m", run: () => startComment("comment") },
           { id: "suggest", group: "Comments", label: "Suggest an edit to the selection", shortcut: "mod+alt+s", keywords: "track changes", run: () => startComment("suggest") },
           { id: "comments", group: "Comments", label: "Show comments", shortcut: "mod+shift+m", run: showComments },
@@ -1163,7 +1182,6 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
           { id: "next-problem", group: "Manuscript", label: "Next problem", shortcut: "F8", run: () => stepProblem(1) },
           { id: "manuscripts", group: "Manuscript", label: "All manuscripts", keywords: "back home close", run: () => void requestClose() },
           { id: "sidebar", group: "View", label: layout.sidebar ? "Hide the sidebar" : "Show the sidebar", shortcut: "mod+\\", run: () => setLayout((l) => ({ ...l, sidebar: !l.sidebar })) },
-          { id: "join-lines", group: "View", label: layout.joinLines ? "Show line breaks as written" : "Join hard-wrapped lines", keywords: "wrap reflow soft line breaks", run: toggleJoinLines },
           { id: "live-preview", group: "View", label: layout.livePreview ? "Show Markdown as written" : "Read as the manuscript", keywords: "source markup raw live preview chips", run: toggleLivePreview },
           { id: "problems", group: "Manuscript", label: problemsOpen ? "Hide problems" : "Show problems", keywords: "errors warnings list", run: () => setProblemsOpen(!problemsOpen) },
           ...VIEW_ORDER.filter((view) => view !== layout.view).map((view) => ({ id: `view-${view}`, group: "View", label: VIEW_NAME[view], run: () => setLayout((l) => ({ ...l, view })) })),
@@ -1178,7 +1196,10 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
       />
       <CompareDialog comparison={comparison} canRestore={compared?.state !== "deleted"} onClose={() => setComparisonPath(null)} onDownload={downloadDrafts} onResolve={(choice) => {
         if (!comparisonPath) return;
-        if (recovered) choice === "theirs" ? workspace.discardDraft(comparisonPath) : workspace.restoreDraft(comparisonPath);
+        if (recovered) {
+          if (choice === "theirs") workspace.discardDraft(comparisonPath);
+          else workspace.restoreDraft(comparisonPath);
+        }
         else workspace.resolveConflict(comparisonPath, choice);
         setComparisonPath(null);
       }} />
@@ -1192,18 +1213,16 @@ export function WorkspaceView({ workspace, since, onClose }: { workspace: Manusc
           <button type="button" className="mdbase-button" onClick={() => { cancelExport(); onClose(true); }}>Leave without saving</button>
         </div>
       </Dialog>
-      <Dialog open={Boolean(pendingExport)} onClose={cancelExport} title="Review export problems">
-        <p>No file has been downloaded yet. This export may be incomplete or differ from the PDF preview.</p>
-        <ul className="export-problems">{pendingExport?.problems.map((problem, index) => <li key={index}>{problem}</li>)}</ul>
-        <div className="compare-actions">
-          <button type="button" className="mdbase-button is-primary" onClick={cancelExport}>Cancel and fix problems</button>
-          <button type="button" className="mdbase-button" onClick={() => {
-            const pending = pendingExport;
-            setPendingExport(null);
-            if (pending) { download(pending.bytes, pending.type, pending.name); exported(EXPORT_NAME[lastExport.current], pending.problems); signalMdbaseMark("saved"); }
-          }}>Export anyway</button>
-        </div>
-      </Dialog>
+      <ExportReview pending={pendingExport} onCancel={cancelExport} onExport={(pending) => {
+        setPendingExport(null);
+        download(pending.bytes, pending.type, pending.name);
+        exported(EXPORT_NAME[lastExport.current], pending.problems);
+        signalMdbaseMark("saved");
+      }} onError={(error) => {
+        reportError({ code: "unknown_error" });
+        setNotice({ tone: "problem", text: `The file could not be downloaded. ${errorMessage(error)}` });
+        signalMdbaseMark("error");
+      }} />
       {notice && (
         <div className={`toast tone-${notice.tone}${notice.tone === "ok" ? " mdbase-settle" : ""}`} role={notice.tone === "problem" ? "alert" : "status"}>
           {notice.tone === "busy" ? <span className="spinner" aria-hidden="true" /> : notice.tone === "ok" ? <CheckIcon /> : <AlertIcon />}
diff --git a/apps/writer/src/ui/connection-notice.test.ts b/apps/writer/src/ui/connection-notice.test.ts
new file mode 100644
index 00000000..7839c7cd
--- /dev/null
+++ b/apps/writer/src/ui/connection-notice.test.ts
@@ -0,0 +1,32 @@
+import { expect, it } from "vitest";
+import { connectionNotice } from "./connection-notice.js";
+
+const ready = { phase: { kind: "ready" } } as const;
+const sync = (health: string | null, live: boolean | null = true) =>
+  ({ kind: "synced", health, live }) as never;
+
+it("never reads as connected while offline, reconnecting or holding changes", () => {
+  expect(connectionNotice({ ...ready, sync: sync(null) } as never)).toBeNull();
+  expect(connectionNotice({ ...ready, sync: sync(null) } as never, false)).toBe(
+    "offline",
+  );
+  expect(connectionNotice({ ...ready, sync: sync("offline") } as never)).toBe(
+    "offline",
+  );
+  expect(
+    connectionNotice({ ...ready, sync: sync("unreachable") } as never),
+  ).toBe("reconnecting");
+  expect(connectionNotice({ ...ready, sync: sync(null, false) } as never)).toBe(
+    "reconnecting",
+  );
+  expect(
+    connectionNotice({
+      ...ready,
+      sync: sync("offline"),
+      writes: { saveState: "saved_on_device" },
+    } as never),
+  ).toBe("saved_on_device");
+  expect(
+    connectionNotice({ phase: { kind: "opening" }, live: false } as never),
+  ).toBeNull();
+});
diff --git a/apps/writer/src/ui/connection-notice.ts b/apps/writer/src/ui/connection-notice.ts
new file mode 100644
index 00000000..0bf8cfc4
--- /dev/null
+++ b/apps/writer/src/ui/connection-notice.ts
@@ -0,0 +1,82 @@
+import { createContext, useCallback, useSyncExternalStore } from "react";
+import type { MdbaseSnapshot } from "@mdbase-dev/sdk";
+
+/**
+ * What the open collection's connection needs to say, from the SDK's own
+ * status: nothing while it is connected and live.
+ * - saved_on_device: changes are kept on this device until they can sync;
+ * - offline: this device has no network;
+ * - reconnecting: the sync service cannot be reached, or other devices'
+ *   changes have stopped arriving live.
+ */
+export type ConnectionNotice = "offline" | "reconnecting" | "saved_on_device";
+
+export const connectionNoticeLabels: Record<ConnectionNotice, string> = {
+  offline: "Offline",
+  reconnecting: "Reconnecting",
+  saved_on_device: "Saved on this device; waiting for sync",
+};
+
+type Observed = Partial<
+  Pick<MdbaseSnapshot, "phase" | "sync" | "writes" | "transport" | "live">
+>;
+
+export function connectionNotice(
+  snapshot: Observed | null | undefined,
+  online = true,
+): ConnectionNotice | null {
+  if (!snapshot || (snapshot.phase && snapshot.phase.kind !== "ready"))
+    return null;
+  if (snapshot.writes?.saveState === "saved_on_device")
+    return "saved_on_device";
+  const health = snapshot.sync?.health ?? snapshot.transport?.kind ?? null;
+  if (!online || health === "offline") return "offline";
+  if (
+    health === "unreachable" ||
+    health === "server_busy" ||
+    health === "rate_limited" ||
+    snapshot.sync?.kind === "offline" ||
+    (snapshot.sync?.live ?? snapshot.live) === false
+  )
+    return "reconnecting";
+  return null;
+}
+
+const noSource = {
+  getSnapshot: () => null,
+  subscribe: () => () => undefined,
+};
+
+/** The connection notice for an SDK entry, following its snapshots and the
+ * browser's online state. */
+export function useConnectionNotice(
+  source:
+    | {
+        getSnapshot(): Observed;
+        subscribe(listener: () => void): () => void;
+      }
+    | null
+    | undefined,
+): ConnectionNotice | null {
+  const entry = source ?? noSource;
+  const subscribe = useCallback(
+    (listener: () => void) => {
+      const stop = entry.subscribe(listener);
+      window.addEventListener("online", listener);
+      window.addEventListener("offline", listener);
+      return () => {
+        stop();
+        window.removeEventListener("online", listener);
+        window.removeEventListener("offline", listener);
+      };
+    },
+    [entry],
+  );
+  const read = () =>
+    connectionNotice(entry.getSnapshot(), globalThis.navigator?.onLine ?? true);
+  return useSyncExternalStore(subscribe, read, read);
+}
+
+export const ConnectionNoticeContext = createContext<ConnectionNotice | null>(
+  null,
+);
diff --git a/apps/writer/src/ui/download-local-drafts.ts b/apps/writer/src/ui/download-local-drafts.ts
new file mode 100644
index 00000000..72d1e2a3
--- /dev/null
+++ b/apps/writer/src/ui/download-local-drafts.ts
@@ -0,0 +1,9 @@
+import { zip } from "../export/zip.js";
+import type { ManuscriptWorkspace } from "../workspace/workspace.js";
+
+export function downloadLocalDrafts(workspace: ManuscriptWorkspace): void {
+  const bytes = zip(workspace.localDrafts());
+  const url = URL.createObjectURL(new Blob([Uint8Array.from(bytes).buffer], {type: "application/zip"}));
+  const anchor = document.createElement("a"); anchor.href = url; anchor.download = "writer-local-drafts.zip"; anchor.click();
+  setTimeout(() => URL.revokeObjectURL(url), 30_000);
+}
diff --git a/apps/writer/src/ui/layout.test.ts b/apps/writer/src/ui/layout.test.ts
index a1259d49..c611fde5 100644
--- a/apps/writer/src/ui/layout.test.ts
+++ b/apps/writer/src/ui/layout.test.ts
@@ -1,6 +1,18 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
-import { clampSidebar, DEFAULT_LAYOUT, gridFor } from "./layout.js";
+import { clampSidebar, DEFAULT_LAYOUT, gridFor, loadLayout, saveLayout } from "./layout.js";
+
+it.each([true, false])("ignores obsolete join-lines preference %s and preserves other layout settings", (joinLines) => {
+  const storage = { getItem: () => JSON.stringify({ ...DEFAULT_LAYOUT, sidebarWidth: 310, joinLines }), setItem: vi.fn() };
+  vi.stubGlobal("localStorage", storage);
+  try {
+    const layout = loadLayout();
+    expect(layout).toEqual({ ...DEFAULT_LAYOUT, sidebarWidth: 310 });
+    expect(layout).not.toHaveProperty("joinLines");
+    saveLayout(layout);
+    expect(storage.setItem).toHaveBeenCalledWith("mdbase-writer:layout", JSON.stringify(layout));
+  } finally { vi.unstubAllGlobals(); }
+});
 
 describe("gridFor", () => {
   it("gives the sidebar its width, within bounds", () => {
diff --git a/apps/writer/src/ui/layout.ts b/apps/writer/src/ui/layout.ts
index 24ec6217..49c278e5 100644
--- a/apps/writer/src/ui/layout.ts
+++ b/apps/writer/src/ui/layout.ts
@@ -14,14 +14,12 @@ export interface Layout {
   /** The editor's share of the width it splits with the preview. */
   readonly split: number;
   readonly zoom: number | "fit";
-  /** Hard-wrapped paragraphs flow in the editor (their soft line breaks drawn as spaces). */
-  readonly joinLines: boolean;
   /** The editor reads like the manuscript (citations, figures and tables drawn) rather than as Markdown source. */
   readonly livePreview: boolean;
 }
 
 const KEY = "mdbase-writer:layout";
-export const DEFAULT_LAYOUT: Layout = { sidebar: true, tab: "outline", lowerTab: null, sidebarWidth: 272, view: "both", split: 0.5, zoom: "fit", joinLines: true, livePreview: true };
+export const DEFAULT_LAYOUT: Layout = { sidebar: true, tab: "outline", lowerTab: null, sidebarWidth: 272, view: "both", split: 0.5, zoom: "fit", livePreview: true };
 export const ZOOM_STEPS = [0.5, 0.67, 0.75, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2] as const;
 
 export const SIDEBAR_MIN = 200;
@@ -39,7 +37,6 @@ export function loadLayout(): Layout {
       sidebarWidth: typeof raw.sidebarWidth === "number" ? clampSidebar(raw.sidebarWidth) : DEFAULT_LAYOUT.sidebarWidth,
       view: raw.view === "write" || raw.view === "preview" || raw.view === "both" ? raw.view : DEFAULT_LAYOUT.view,
       split: typeof raw.split === "number" ? clampSplit(raw.split) : DEFAULT_LAYOUT.split,
-      joinLines: typeof raw.joinLines === "boolean" ? raw.joinLines : DEFAULT_LAYOUT.joinLines,
       livePreview: typeof raw.livePreview === "boolean" ? raw.livePreview : DEFAULT_LAYOUT.livePreview,
       zoom: raw.zoom === "fit" || (typeof raw.zoom === "number" && raw.zoom >= 0.25 && raw.zoom <= 4) ? raw.zoom : DEFAULT_LAYOUT.zoom,
     };
diff --git a/apps/writer/src/ui/records.test.ts b/apps/writer/src/ui/records.test.ts
new file mode 100644
index 00000000..ac2575e0
--- /dev/null
+++ b/apps/writer/src/ui/records.test.ts
@@ -0,0 +1,11 @@
+import { expect, it } from "vitest";
+import { workspaceSaveNotice } from "./records.js";
+
+it("does not label an unreviewed recovered draft as Saved", () => {
+  expect(workspaceSaveNotice("saved", true)).toEqual({ tone: "attention", label: "Review local drafts", shortLabel: "Review drafts" });
+  expect(workspaceSaveNotice("saved_on_device", true).tone).toBe("attention");
+});
+it("returns to the real save state when recovery has been reviewed", () => {
+  expect(workspaceSaveNotice("saved", false)).toEqual({ tone: "saved", label: "Saved", shortLabel: undefined });
+  expect(workspaceSaveNotice("conflict", false)).toEqual({ tone: "attention", label: "Changed elsewhere", shortLabel: "Conflict" });
+});
diff --git a/apps/writer/src/ui/records.ts b/apps/writer/src/ui/records.ts
index cb72884a..f1671f4e 100644
--- a/apps/writer/src/ui/records.ts
+++ b/apps/writer/src/ui/records.ts
@@ -5,6 +5,7 @@ import type { RecordView, SessionSnapshot } from "../workspace/workspace.js";
 
 export const STATE_LABEL: Record<SessionSnapshot["state"], string> = {
   saved: "Saved",
+  saved_on_device: "Saved on this device; waiting for sync",
   unsaved: "Unsaved",
   saving: "Saving…",
   conflict: "Changed elsewhere",
@@ -19,9 +20,16 @@ export const STATE_SHORT_LABEL: Partial<Record<SessionSnapshot["state"], string>
   deleted: "Deleted",
 };
 export const STATE_TONE: Record<SessionSnapshot["state"], SaveTone> = {
-  saved: "saved", unsaved: "pending", saving: "saving", conflict: "attention", recovery: "saving", error: "attention", deleted: "attention",
+  saved: "saved", saved_on_device: "pending", unsaved: "pending", saving: "saving", conflict: "attention", recovery: "saving", error: "attention", deleted: "attention",
 };
 
+/** A recovered checkpoint is not an acknowledged save until it is reviewed. */
+export function workspaceSaveNotice(state: SessionSnapshot["state"], hasRecoveredDrafts: boolean): { tone: SaveTone; label: string; shortLabel: string | undefined } {
+  return hasRecoveredDrafts
+    ? { tone: "attention", label: "Review local drafts", shortLabel: "Review drafts" }
+    : { tone: STATE_TONE[state], label: STATE_LABEL[state], shortLabel: STATE_SHORT_LABEL[state] };
+}
+
 export function recordTitle(view: RecordView | undefined, path: string): string {
   const fm = view?.snapshot.frontmatter;
   if (typeof fm?.["title"] === "string") return fm["title"];
diff --git a/apps/writer/src/ui/writer-collections.css b/apps/writer/src/ui/writer-collections.css
new file mode 100644
index 00000000..1db7af07
--- /dev/null
+++ b/apps/writer/src/ui/writer-collections.css
@@ -0,0 +1,25 @@
+/* Shared collection screens (@mdbase-dev/ui/collections) on Writer's tokens. */
+:root {
+  --mdbase-collections-accent: var(--accent);
+  --mdbase-collections-surface: var(--surface);
+  --mdbase-collections-canvas: var(--canvas);
+  --mdbase-collections-text: var(--ink);
+  --mdbase-collections-text-soft: var(--muted);
+  --mdbase-collections-border: var(--line);
+  --mdbase-collections-danger: var(--danger);
+  --mdbase-collections-font: var(--sans);
+}
+
+/* In the bar the switcher sits after the app menu, set apart by a hairline. */
+.topbar-slot .writer-collection-switcher {
+  min-width: 0;
+  padding-left: 0.6rem;
+  border-left: 1px solid var(--line);
+  --mdbase-collections-control-height: 32px;
+}
+.app:has(.workspace) .writer-collection-switcher,
+.app:has(.workspace) .writer-connection-notice { display: none; }
+
+@media (max-width: 640px) {
+  .topbar-slot .writer-collection-switcher { padding-left: 0; border-left: 0; }
+}
diff --git a/apps/writer/src/ui/writer-collections.tsx b/apps/writer/src/ui/writer-collections.tsx
new file mode 100644
index 00000000..38d21a0b
--- /dev/null
+++ b/apps/writer/src/ui/writer-collections.tsx
@@ -0,0 +1,28 @@
+import { useContext, type ReactNode } from "react";
+import { MdbaseAppMark } from "@mdbase-dev/ui/brand";
+import { CollectionGate, CollectionSwitcher, type CollectionAppIdentity } from "@mdbase-dev/ui/collections";
+import type { Mdbase, MdbaseApplicationConnection } from "@mdbase-dev/sdk";
+import manifest from "../generated/mdbase-app.json";
+import { SaveNotice } from "@mdbase-dev/ui/save-notice";
+import { ConnectionNoticeContext, connectionNoticeLabels } from "./connection-notice.js";
+import { InTopbar } from "./topbar.js";
+import "@mdbase-dev/ui/collections.css";
+import "./writer-collections.css";
+
+/** Writer's identity in the shared collection screens. */
+const writerApp: CollectionAppIdentity = {name: manifest.name, mark: <MdbaseAppMark app="writer" />};
+
+/** The shared gate: sign-in, choosing, approval, setup and problems. */
+export function WriterCollectionGate({mdbase, children}: {mdbase: Mdbase; children(connection: MdbaseApplicationConnection): ReactNode}) {
+  return <CollectionGate mdbase={mdbase} app={writerApp}>{children}</CollectionGate>;
+}
+
+/** The shared switcher in the top bar. It is hidden while a manuscript is open,
+ * where the bar belongs to the manuscript and leaving goes through its own save guard. */
+export function WriterCollectionSwitcher({mdbase}: {mdbase: Mdbase}) {
+  const notice = useContext(ConnectionNoticeContext);
+  return <InTopbar>
+    <CollectionSwitcher mdbase={mdbase} app={writerApp} variant="full" className="writer-collection-switcher" />
+    {notice && <SaveNotice tone="pending" label={connectionNoticeLabels[notice]} className="writer-connection-notice" />}
+  </InTopbar>;
+}
diff --git a/apps/writer/src/workspace/native-workspace.test.ts b/apps/writer/src/workspace/native-workspace.test.ts
new file mode 100644
index 00000000..d7a87707
--- /dev/null
+++ b/apps/writer/src/workspace/native-workspace.test.ts
@@ -0,0 +1,57 @@
+import { afterEach, expect, it, vi } from "vitest";
+import { connect, MdbasePeopleClient, type MdbaseClient, type wire } from "@mdbase-dev/sdk";
+import { MemoryReplica } from "@mdbase-dev/sdk/testing";
+import manifest from "../generated/mdbase-app.json";
+import { NativeWriterBackend } from "../backend/native.js";
+import { ManuscriptWorkspace } from "./workspace.js";
+
+// Only compilation, catalog classification and the unapproved identity endpoint
+// are stand-ins. The workspace/domain boundary and native SDK records are real.
+vi.mock("../compile/client.js", () => ({CompileClient: class {
+  ready = Promise.resolve(0); send = vi.fn();
+  onResult = () => () => {}; onFailure = () => () => {};
+  terminate() {}
+}}));
+vi.mock("../async.js", async importOriginal => {
+  const original = await importOriginal<typeof import("../async.js")>();
+  return {...original, fetchChecked: vi.fn(async () => new Response(""))};
+});
+let workspace: ManuscriptWorkspace | undefined;
+let backend: NativeWriterBackend | undefined;
+let client: MdbaseClient | undefined;
+afterEach(async () => {await workspace?.dispose(); backend?.dispose(); client?.close(); vi.unstubAllGlobals(); vi.restoreAllMocks();});
+
+it("runs existing manuscript/chapter editing and mapped settings on one borrowed native SDK client", async () => {
+  const storage = new Map<string, string>();
+  vi.stubGlobal("localStorage", {getItem: (key: string) => storage.get(key) ?? null, setItem: (key: string, value: string) => storage.set(key, value), removeItem: (key: string) => storage.delete(key)});
+  const replica = new MemoryReplica({confirmDelayMs: 0, contracts: manifest.requirements.contracts.map((contract, index) => ({id: contract.id, version: contract.version, contractDigest: contract.digest, type: `fixture-${["manuscript", "source", "comment"][index]}`, fields: {title: "heading", template: "layout", csl: "style"}}))});
+  const main = replica.seed({path: "manuscripts/main.md", types: ["fixture-manuscript"], frontmatter: {type: "fixture-manuscript", heading: "Native title", unrelated: "preserved"}, body: "# Main\n\n![[chapters/first]]\n"});
+  const chapter = replica.seed({path: "chapters/first.md", body: "Native chapter\n"});
+  const native = await connect({connector: replica.connector(), app: {name: "native-workspace-test", version: "test"}, reconnect: false}); client = native;
+  const description: wire.DescribeResult = {specVersion: "0.3.0", settings: new Map([["explicit_type_keys", ["type"]]]), inclusion: {include: ["image"]}, issues: [],
+    contracts: manifest.requirements.contracts.map((contract, index) => ({...contract, digest: contract.digest.replace(/^sha256:/, ""), path: `_contracts/${contract.id}.md`, contractType: "record", implementedBy: [`fixture-${["manuscript", "source", "comment"][index]}`]})),
+    types: manifest.requirements.contracts.map((contract, index) => ({name: `fixture-${["manuscript", "source", "comment"][index]}`, path: `_types/type-${index}.md`, implements: [{contract: contract.id, version: contract.version, fields: new Map([["title", "heading"], ["template", "layout"], ["csl", "style"]])}]}))};
+  vi.spyOn(native, "describe").mockResolvedValue(description);
+  const isCurrent = () => true;
+  backend = new NativeWriterBackend({id: native.collection, displayName: "Writing", scope: {account: "fixture-account", installation: "fixture-installation", collection: native.collection}, generation: "fixture-generation", records: native, files: native.files, isCurrent,
+    people: new MdbasePeopleClient(native, {collection: native.collection, isCurrent, request: async () => {throw new Error("Identity unapproved");}})}, {collectionName: "Writing", signal: new AbortController().signal});
+  const peer = await native.records.open(chapter, {autosave: {idleMs: 1_000}, timeoutMs: 15_000});
+  const close = vi.spyOn(native, "close");
+  workspace = new ManuscriptWorkspace(backend, main.path);
+  await vi.waitFor(() => expect(workspace?.getSnapshot().phase).toBe("ready"));
+  await vi.waitFor(() => {
+    const snapshot = workspace?.getSnapshot();
+    expect({indexLoad: snapshot?.indexLoad, paths: snapshot?.recordPaths, opened: [...(snapshot?.records.keys() ?? [])], problems: [...(snapshot?.recordProblems ?? [])], mainBody: snapshot?.records.get(main.path)?.snapshot.body}).toMatchObject({indexLoad: {phase: "ready"}, paths: expect.arrayContaining([chapter.path]), mainBody: "# Main\n\n![[chapters/first]]\n", problems: [], opened: expect.arrayContaining([chapter.path])});
+  });
+  expect(workspace.getSnapshot().records.get(main.path)?.snapshot.frontmatter["title"]).toBe("Native title");
+  workspace.setBody(chapter.path, "Edited native chapter\n");
+  workspace.patchFrontmatter(main.path, {title: "Mapped native title"});
+  expect((await workspace.retrySave()).ok).toBe(true);
+  const saved = await native.get(main.id, {body: true});
+  expect(saved.id).toBe(main.id); expect(saved.frontmatter.get("heading")).toBe("Mapped native title");
+  expect(saved.frontmatter.get("unrelated")).toBe("preserved"); expect(saved.frontmatter.has("title")).toBe(false);
+  expect((await native.get(chapter.id, {body: true})).body).toBe("Edited native chapter\n");
+  await workspace.dispose(); backend.dispose(); expect(close).not.toHaveBeenCalled();
+  peer.session.setBody("Peer remains active\n"); await peer.session.flush();
+  expect((await native.get(chapter.id, {body: true})).body).toBe("Peer remains active\n"); peer.release();
+});
diff --git a/apps/writer/src/workspace/workspace.test.ts b/apps/writer/src/workspace/workspace.test.ts
index 06ce2971..d9be9b2f 100644
--- a/apps/writer/src/workspace/workspace.test.ts
+++ b/apps/writer/src/workspace/workspace.test.ts
@@ -67,6 +67,17 @@ function fixture() {
 const ready = async (workspace: ManuscriptWorkspace) => vi.waitFor(() => expect(workspace.getSnapshot().phase).toBe("ready"));
 
 describe("workspace reliability", () => {
+  it("retries a failed comment under the same intent", async () => {
+    const { backend, open } = fixture();
+    const createComment = vi.fn<WriterBackend["createComment"]>(async () => fail("Reply lost"));
+    backend.createComment = createComment;
+    const workspace = open();
+    await workspace.addComment({ record: "main.md" }, "Hi");
+    await workspace.addComment({ record: "main.md" }, "Hi");
+    const [first, retry] = createComment.mock.calls.map(([input]) => input.intent);
+    expect(retry).toEqual(expect.any(String));
+    expect(retry).toBe(first);
+  });
   it("sends only worker deltas and no unchanged collection data for unrelated edits", async () => {
     const { backend, open } = fixture();
     const known = { key: "known", path: "sources/known.md", title: "Known", item: { id: "known", type: "book", title: "Known" } };
@@ -94,12 +105,57 @@ describe("workspace reliability", () => {
     expect(send).toHaveBeenCalledWith({ type: "collection-delta", recordUpsert: [], recordRemove: [added.path], fileUpsert: [], fileRemove: [] });
   });
 
+  it("keeps ready discovery visible across save echoes, atomically replaces it, and reports real refresh failures", async () => {
+    const { backend, open } = fixture();
+    let changed!: (delta: CollectionDelta) => void;
+    backend.onCollectionChange = (listener) => { changed = listener; return () => {}; };
+    const workspace = open();
+    expect(workspace.getSnapshot()).toMatchObject({ indexLoad: { phase: "loading" }, libraryLoad: { phase: "loading" }, annotationsLoad: { phase: "loading" } });
+    await ready(workspace);
+    await vi.waitFor(() => expect(workspace.getSnapshot()).toMatchObject({ indexLoad: { phase: "ready" }, libraryLoad: { phase: "ready" }, annotationsLoad: { phase: "ready" } }));
+    const previous = workspace.getSnapshot();
+    const states: string[][] = [];
+    workspace.subscribe(() => { const snapshot = workspace.getSnapshot(); states.push([snapshot.indexLoad.phase, snapshot.libraryLoad.phase, snapshot.annotationsLoad.phase]); });
+    let finishIndex!: (value: Awaited<ReturnType<WriterBackend["index"]>>) => void;
+    let finishLibrary!: (value: Awaited<ReturnType<WriterBackend["library"]>>) => void;
+    let finishAnnotations!: (value: Awaited<ReturnType<WriterBackend["annotationPaths"]>>) => void;
+    backend.index = () => new Promise(resolve => { finishIndex = resolve; });
+    backend.library = () => new Promise(resolve => { finishLibrary = resolve; });
+    backend.annotationPaths = () => new Promise(resolve => { finishAnnotations = resolve; });
+    changed({ paths: ["main.md"], reset: true });
+    expect(states.every(phases => !phases.includes("loading"))).toBe(true);
+    expect(workspace.getSnapshot().recordIndex).toBe(previous.recordIndex);
+    expect(workspace.getSnapshot().library).toBe(previous.library);
+    expect(workspace.getSnapshot().annotationPaths).toBe(previous.annotationPaths);
+    finishIndex(ok({ recordPaths: ["main.md"], filePaths: [], notePaths: [] }));
+    const source = { key: "new", path: "sources/new.md", title: "New", item: { id: "new", type: "book", title: "New" } };
+    finishLibrary(ok([source]));
+    finishAnnotations(ok(["annotations/new.md"]));
+    await vi.waitFor(() => expect(workspace.getSnapshot()).toMatchObject({ recordPaths: ["main.md"], library: [source] }));
+    expect(workspace.getSnapshot().annotationPaths).toEqual(new Set(["annotations/new.md"]));
+    expect(states.every(phases => !phases.includes("loading"))).toBe(true);
+    const latest = workspace.getSnapshot();
+    backend.index = async () => fail("Discovery unavailable");
+    backend.library = async () => ok([source]);
+    backend.annotationPaths = async () => ok(["annotations/new.md"]);
+    changed({ paths: [], reset: true });
+    await vi.waitFor(() => expect(workspace.getSnapshot().indexLoad).toEqual({ phase: "failed", problem: "Discovery unavailable" }));
+    expect(workspace.getSnapshot().recordIndex).toBe(latest.recordIndex);
+    expect(states.every(phases => !phases.includes("loading"))).toBe(true);
+    backend.index = async () => ok({ recordPaths: ["main.md"], filePaths: [], notePaths: [] });
+    changed({ paths: [], reset: true });
+    await vi.waitFor(() => expect(workspace.getSnapshot().indexLoad.phase).toBe("ready"));
+    expect(states.every(phases => !phases.includes("loading"))).toBe(true);
+    const differentIdentity = fixture().open();
+    expect(differentIdentity.getSnapshot()).toMatchObject({ indexLoad: { phase: "loading" }, libraryLoad: { phase: "loading" }, annotationsLoad: { phase: "loading" } });
+  });
+
   it("expands comment scope when a late nested chapter opens", async () => {
     const { backend, authority, open } = fixture();
     const index = backend.index;
     backend.index = async () => { const result = await index(); return result.ok ? ok({ ...result.value, recordPaths: [...result.value.recordPaths, "chapters/late.md"] }) : result; };
     authority.seed("chapters/late.md", { body: "New chapter" });
-    const comments = vi.fn(async (_scope?: readonly string[]) => ok([]));
+    const comments = vi.fn<WriterBackend["comments"]>(async () => ok([]));
     backend.comments = comments;
     const workspace = open(); await ready(workspace);
     await vi.waitFor(() => expect(workspace.getSnapshot().records.has("chapters/two.md")).toBe(true));
@@ -338,6 +394,16 @@ describe("workspace reliability", () => {
     expect(workspace.dependencyDiagnostics()).toEqual([]);
     expect((await workspace.exportBundle()).problems).toEqual([]);
   });
+  it("reports the same actionable missing-image problem once in PDF, Word and bundles", async () => {
+    const { authority, open } = fixture();
+    authority.editElsewhere("main.md", { body: "# Introduction\n\n![Figure](gone.png){#fig-gone}\n\nRefer to @fig-gone.\n" });
+    const workspace = open();
+    await ready(workspace);
+    const problem = "main.md: Image “gone.png” is missing. Add it to the collection or correct its path.";
+    expect((await workspace.exportPdf()).problems).toEqual([problem]);
+    expect((await workspace.exportDocx()).problems).toEqual([problem]);
+    expect((await workspace.exportBundle()).problems).toEqual([problem]);
+  });
   it("warns that a custom PDF template does not carry over to Word", async () => {
     const { backend, open } = fixture();
     const index = backend.index;
diff --git a/apps/writer/src/workspace/workspace.ts b/apps/writer/src/workspace/workspace.ts
index 997fef35..9dbdb1e3 100644
--- a/apps/writer/src/workspace/workspace.ts
+++ b/apps/writer/src/workspace/workspace.ts
@@ -5,7 +5,7 @@
 // (autosave, conflict detection, exact recovery — all from the SDK). Every
 // content change is forwarded to the worker, which assembles and typesets
 // the whole manuscript and reports which embedded records it still needs.
-import type { JsonObject, MdbaseRecordLease, MdbaseRecordSessionSnapshot, RecordDocument } from "@mdbase-dev/connect";
+import type { JsonObject } from "@mdbase-dev/connect";
 import { ManuscriptAssembler, translateRecord, type WriterRecord, type AssemblyInput } from "@mdbase-writer/core";
 import { applySuggestion, bodyHash, linkPath, targetFor, type CommentRecord, type CommentThread } from "@mdbase-writer/core/comments";
 import { BUNDLE_README, materialize } from "@mdbase-writer/core/materialize";
@@ -13,8 +13,8 @@ import { isAnnotation } from "@mdbase-writer/core/annotations";
 import { IMAGE_EXTENSION, PathIndex, pathIndex, resolveLinkTarget } from "@mdbase-writer/core/records";
 import { LOCALES, STYLES } from "@mdbase-writer/core/styles";
 
-import { NO_PEOPLE, type CommentChange, type People } from "../backend/comments.js";
-import { fail, manuscriptSlug, manuscriptFrontmatter, ok, type ManuscriptBinding, type LibraryEntry, type CollectionDelta, type Result, type WriterBackend } from "../backend/types.js";
+import { NO_PEOPLE, type CommentChange, type NewComment, type People } from "../backend/comments.js";
+import { fail, manuscriptSlug, manuscriptFrontmatter, ok, type ManuscriptBinding, type LibraryEntry, type CollectionDelta, type RecordLease, type RecordSessionSnapshot, type Result, type WriterBackend } from "../backend/types.js";
 import { toLocal } from "../backend/comments.js";
 import { errorMessage, fetchChecked, mapConcurrent } from "../async.js";
 import { DraftStore, draftPatch, type LocalDraft } from "./drafts.js";
@@ -51,7 +51,7 @@ export function sourceKeys(library: readonly LibraryEntry[]): ReadonlyMap<string
   return keys;
 }
 
-export type SessionSnapshot = MdbaseRecordSessionSnapshot<RecordDocument<JsonObject>>;
+export type SessionSnapshot = RecordSessionSnapshot;
 
 export interface RecordView {
   readonly path: string;
@@ -125,9 +125,11 @@ export class ManuscriptWorkspace {
   private readonly assetJobs = new Map<string, Promise<void>>();
   private readonly assetAttempts = new Map<string, number>();
   private readonly retryTimers = new Set<ReturnType<typeof setTimeout>>();
-  private readonly leases = new Map<string, { lease: MdbaseRecordLease<JsonObject>; unsubscribe: () => void }>();
+  private readonly leases = new Map<string, { lease: RecordLease; unsubscribe: () => void }>();
   private readonly opening = new Map<string, Promise<boolean>>();
   private readonly sent = new Map<string, string>();
+  /** One intent per unconfirmed comment (by its content): a retry after a lost reply re-sends it, so it lands once. */
+  private readonly commentIntents = new Map<string, string>();
   private readonly translations = new Map<string, { body: string; translated: ReturnType<typeof translateRecord> }>();
   private lastOrder: readonly string[] = [];
   private readonly requestedAssets = new Set<string>();
@@ -144,6 +146,9 @@ export class ManuscriptWorkspace {
   private workerAnnotationPaths: ReadonlySet<string> = new Set();
   private workerSourceKeys: ReadonlyMap<string, string> = new Map();
   private commentsScope = "";
+  // Bound to this original workspace/collection. Refreshes retain the last
+  // complete snapshot; a new workspace starts with no ready discovery.
+  private readonly readyMetadata = new Set<MetadataDomain>();
   private metadataJobs: Partial<Record<MetadataDomain, Promise<void>>> = {};
   private metadataGeneration = 0;
   private commentsGeneration = 0;
@@ -204,6 +209,9 @@ export class ManuscriptWorkspace {
 
   private update(patch: Partial<WorkspaceSnapshot>): void {
     if (this.disposed) return;
+    for (const domain of ["indexLoad", "libraryLoad", "annotationsLoad"] as const) {
+      if (patch[domain]?.phase === "ready") this.readyMetadata.add(domain);
+    }
     if (patch.recordPaths) patch = { ...patch, recordIndex: pathIndex(patch.recordPaths) };
     if (patch.filePaths) patch = { ...patch, fileIndex: pathIndex(patch.filePaths) };
     this.current = { ...this.current, ...patch };
@@ -254,7 +262,9 @@ export class ManuscriptWorkspace {
     };
     for (const domain of Object.keys(jobs) as MetadataDomain[]) {
       if (!fresh && this.metadataJobs[domain]) continue;
-      this.update({ [domain]: LOADING });
+      if (!this.readyMetadata.has(domain)) this.update({ [domain]: LOADING });
+      // Keep ready data (or a genuine refresh failure) until the new complete
+      // result replaces data and readiness together. Export still waits on jobs.
       // A superseded load must not overwrite a newer snapshot.
       const job = jobs[domain]();
       this.metadataJobs[domain] = job;
@@ -676,7 +686,7 @@ export class ManuscriptWorkspace {
     }
     const annotations = new Set(paths.filter((path) => this.current.annotationPaths.has(path)));
     if (annotations.size) {
-      this.update({ annotationVersion: this.current.annotationVersion + 1, annotationsLoad: LOADING });
+      this.update({ annotationVersion: this.current.annotationVersion + 1, ...(!this.readyMetadata.has("annotationsLoad") ? { annotationsLoad: LOADING } : {}) });
       this.metadataJobs.annotationsLoad = this.loadAnnotationPaths(this.metadataGeneration);
     }
     // An image, style or template the document uses changed: send its new bytes.
@@ -733,12 +743,12 @@ export class ManuscriptWorkspace {
    * Creates a record for a new chapter beside the existing chapters (or in
    * chapters/) and embeds it after the last one. Resolves to its path.
    */
-  async addChapter(title: string): Promise<Result<string>> {
+  async addChapter(title: string, intent?: string): Promise<Result<string>> {
     const name = title.trim();
     if (!name) return fail("A chapter needs a title.");
     const first = this.chapterPaths().find((p): p is string => Boolean(p));
     const folder = first?.includes("/") ? first.slice(0, first.lastIndexOf("/")) : "chapters";
-    const created = await this.backend.createRecord(`${folder}/${manuscriptSlug(name)}.md`, `# ${name}\n\n`);
+    const created = await this.backend.createRecord(`${folder}/${manuscriptSlug(name)}.md`, `# ${name}\n\n`, intent);
     if (!created.ok) return created;
     const path = created.value;
     // The index learns the new record (no need to list the collection again), so the embed resolves.
@@ -864,15 +874,24 @@ export class ManuscriptWorkspace {
   /** A new thread on a passage (a suggestion when `replacement` is given), or on the whole record. */
   async addComment(draft: CommentDraft | { record: string }, text: string, replacement?: string): Promise<Result<CommentRecord>> {
     const target = "body" in draft ? targetFor(draft.body, draft.from, draft.to, await bodyHash(draft.body)) : undefined;
-    const created = await this.backend.createComment({ document: draft.record, text, ...(target ? { target } : {}), ...(replacement !== undefined ? { replacement } : {}) });
+    const key = JSON.stringify([draft.record, "body" in draft ? [draft.from, draft.to] : null, text, replacement ?? null]);
+    const created = await this.createComment(key, { document: draft.record, text, ...(target ? { target } : {}), ...(replacement !== undefined ? { replacement } : {}) });
     if (created.ok) this.update({ comments: [...this.current.comments, created.value] });
     return created;
   }
 
+  private async createComment(key: string, input: NewComment): Promise<Result<CommentRecord>> {
+    let intent = this.commentIntents.get(key);
+    if (!intent) this.commentIntents.set(key, intent = crypto.randomUUID());
+    const created = await this.backend.createComment({ ...input, intent });
+    if (created.ok) this.commentIntents.delete(key);
+    return created;
+  }
+
   async reply(thread: CommentThread, text: string): Promise<Result<CommentRecord>> {
     // A reply repeats its thread's document.
     const document = resolveLinkTarget(linkPath(thread.root.document), thread.root.path, this.current.recordIndex) ?? linkPath(thread.root.document);
-    const created = await this.backend.createComment({ document, text, thread: thread.root });
+    const created = await this.createComment(JSON.stringify([thread.root.path, text]), { document, text, thread: thread.root });
     if (created.ok) this.update({ comments: [...this.current.comments, created.value] });
     return created;
   }
diff --git a/apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz b/apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz
new file mode 100644
index 00000000..04dddacd
Binary files /dev/null and b/apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz differ
diff --git a/apps/writer/vite.config.ts b/apps/writer/vite.config.ts
index 5f380d94..901abd31 100644
--- a/apps/writer/vite.config.ts
+++ b/apps/writer/vite.config.ts
@@ -2,6 +2,7 @@ import { readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
+import { offlineShellPlugin } from "@mdbase-dev/sdk/offline-shell/build";
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 
@@ -11,7 +12,7 @@ const pandocWasm = resolve(dirname(fileURLToPath(import.meta.url)), "node_module
 const pandocVersion = (JSON.parse(readFileSync(resolve(pandocWasm, "package.json"), "utf8")) as { version: string }).version;
 
 export default defineConfig({
-  plugins: [react()],
+  plugins: [react(), offlineShellPlugin()],
   worker: { format: "es" },
   define: { __PANDOC_WASM_VERSION__: JSON.stringify(pandocVersion) },
   optimizeDeps: {
diff --git a/apps/writer/vitest.config.ts b/apps/writer/vitest.config.ts
index e32791ac..31f808bc 100644
--- a/apps/writer/vitest.config.ts
+++ b/apps/writer/vitest.config.ts
@@ -1,3 +1,3 @@
 import { defineConfig } from "vitest/config";
 
-export default defineConfig({ resolve: { dedupe: ["react", "react-dom"] }, test: { include: ["src/**/*.test.ts"] } });
+export default defineConfig({ resolve: { dedupe: ["react", "react-dom"] }, test: { include: ["src/**/*.test.{ts,tsx}"] } });
diff --git a/docs/deployment-reports/2026-10-15-lab-9a033b25.md b/docs/deployment-reports/2026-10-15-lab-9a033b25.md
new file mode 100644
index 00000000..2a6c1dc2
--- /dev/null
+++ b/docs/deployment-reports/2026-10-15-lab-9a033b25.md
@@ -0,0 +1,8 @@
+# Writer LAB Private acceptance
+
+- Source: `32b3eee`; normal SDK `9a033b252860ec8624da0abb5ffdecbac56332d2`; qualified LAB Native from the same source.
+- Guarded LAB deployment: `b0a83301`, exit 0. Loaded main and all observed local JS matched the exact build.
+- Remote typecheck/tests passed: 290 Writer + 16 Node + 65 Core; existing skips unchanged.
+- **PASS:** exact fresh Private choice, one original approval and one setup apply, Ready, new manuscript without examples, first body confirmed saved, edited body confirmed saved, exactly one edited physical Markdown file, exact body after reload. Owned page closed.
+- Initial harness required a responsive-hidden Saved notice to be visible. Public workspace state/body and the physical file independently reconciled that first save without rewriting it. The subsequent edit and reload passed.
+- No setup retry, grant replacement, manifest widening, unsigned administration or Hosted fallback. Independent empty-profile read and crash durability are not claimed.
diff --git a/docs/new-sdk.md b/docs/new-sdk.md
new file mode 100644
index 00000000..abaee4a9
--- /dev/null
+++ b/docs/new-sdk.md
@@ -0,0 +1,183 @@
+# New SDK migration
+
+## Current declared Private setup SDK intake — 2026-10-15
+
+SDK `9a033b252860ec8624da0abb5ffdecbac56332d2` replaces the prior
+`72f8ea6c` intake. Original archive SHA256:
+`90ef67523dfa11cb36efe0d996475f1a1c82ac71074e4cd4e95c6fbe02c18be9`.
+Native mediates the exact signed setup and publishes multi-pack lock changes
+atomically with the original CAS. The SDK retains only the protected original
+MID when capture is uncertain and gives classified setup conflicts actionable
+copy. No manifest, scope, grant custody or Hosted fallback is introduced.
+The packaged runtime remains actual source `a4331ad466a0d16e87ab3bedeb0963a1e0d1867e`,
+SHA256 `3c803e83f81a05855f6e30ca79036d6b19383048a6b11ba5c9a0b5ebf3a1bbe2`.
+The ordinary Sign in / Add chooser owns one popup and the original Native
+preparation, callback and custody ACK. The callback page delivers only; the
+original SDK closes after completion. No app-side alternate protocol, scope,
+key transfer or grant-store migration is introduced. Application declaration and
+storage identities remain unchanged. Tests and LAB builds do not prove Native
+admission, READ/edit/reload or production release qualification.
+
+## Prior intake notes (superseded SDK pin)
+
+
+## Public application boundary
+
+LAB builds (`VITE_MDBASE_ENV=lab`, or `pnpm build:lab` from `apps/writer`) create
+one declaration-only public SDK singleton outside React and pass it to `App`.
+Production builds keep the existing Connect/demo entry until the production
+trust asset and cutover are approved. SDK mode lazily isolates the legacy entry
+and does not create a legacy session, parse collection URLs or reserve an
+app-owned popup.
+
+`createWriterMdbase` in `apps/writer/src/connect/sdk-application.ts` supplies
+Writer's unchanged manifest and explicit environment to the SDK's `createMdbase`
+front door, with `readiness: {typeIssues: "degrade"}`. The logical manifest ID is
+a declaration, not a native registration receipt; the SDK resolves the genuine
+native ID. An optional explicit registered ID must match that SDK binding. SDK
+startup, authorization, collection selection, configuration, foreground state and
+physical shutdown stay SDK-owned.
+
+The collection screens come from `@mdbase-dev/ui/collections`, vendored as
+`vendor/mdbase-dev-ui-dev-9553ad66.tgz` (pin: `vendor/mdbase-ui-dev.json`). Its
+optional `@mdbase-dev/sdk` peer resolves to Writer's own SDK dependency.
+`SdkWriterRoot` calls `start()` and renders the shared `CollectionGate`, which
+owns sign-in, choosing, approval, setup review, problems and sign-out (always
+`signOut()`, never `close()`). Writer opens its domain UI only for the
+connection the gate hands over in phase `ready`, keyed by collection ID and
+generation; leaving that phase retires the scope's leases. The shared
+`CollectionSwitcher` sits in the top bar on the manuscript list and is hidden
+inside a manuscript, where leaving goes through the manuscript's own save guard.
+The `--mdbase-collections-*` properties map onto Writer's tokens in
+`apps/writer/src/ui/writer-collections.css`.
+
+## Native domain repository
+
+`NativeWriterBackend` implements the existing `WriterBackend` interface directly
+through the public connection's actual records, files and people clients. Both
+backends use the same `Manuscripts`, `Home` and `WorkspaceView` UI. The existing
+manuscript-only route and unsaved-navigation guard are shared; the SDK still owns
+collection URL handling. Theme, feedback, recent manuscripts, drafts, compilation
+and export continue through the existing application components.
+
+Discovery checks Writer's exact declared native contracts and actual type field
+mappings. Domain metadata comes from `queryContract` projections, not an
+application-side field-map projector. Complete bounded pages preserve the original
+record identities and snapshot; changed digests, revisions, repeated cursors and
+omitted records fail rather than falling back to raw fields. A record whose
+projection has an error stays listed without projected fields; it never blocks
+the collection. Unrelated definition diagnostics do not block usable Writer
+records, and an error on one of Writer's own type definitions makes only that type
+unavailable, with plain copy on Home. Exact required contracts still must pass.
+Untyped Markdown notes remain in the complete index and are listed on Home with a
+"No type" label.
+Starter type names are not recognised as native implementations.
+Bodies are loaded lazily using their original UUID/revision; protected or changed
+records are not treated as confirmed current content. Files are read by original
+file UUID/digest with current readback checks. **Image upload is unavailable in
+SDK mode:** Writer requires files list/read and declares files add optional. Its
+native backend does not enable uploads; the upload command and image paste/drop
+handler are hidden until incremental consent is integrated and validated.
+No adapter silently widens that permission or substitutes caller MIME metadata
+for native extension-based media classification.
+
+Manuscript and comment creation/edits use public contract selectors; generic
+chapters remain generic. Note adoption uses one `promote:true` contract update
+with its mapped title and original revision. Comment withdrawal changes the body
+and mapped fields in one update, preserving nested sibling fields. Success requires the original confirmed receipt and
+current unheld, unresolved-free native readback. A lost submit reply retains its
+original SDK MID; typed `error.mutationId` must match that same operation. Another
+click reconciles the original operation and does not submit a new record. The SDK owns durable capture, journals and receipt recovery;
+its write ledger keeps and settles writes from earlier sessions, so Writer keeps no ledger of its own.
+People access uses the existing SDK directory with members omitted. Failed
+identity access may leave comments unsigned, never signed by a guessed account.
+
+`NextWriterRecords` delegates leases, autosave, drafts, conflict handling and
+original recovery to the existing generic `client.records.open` session. For
+launch, shared workspace settings/body edits stay on that original generic session
+and its atomic flush. Contract APIs handle metadata reads and discrete repository
+writes. A contract-scoped lease is a post-launch improvement, not an application
+session/recovery engine to implement. Writer translates display values and explicit
+patches only. Scope retirement fences edits/flush completion and releases
+its owned or late-delivered leases; it never closes the borrowed client or a peer's
+lease. Repository disposal stops only its watches, its reconnect timer and owned
+scope. When Writer's own change watch goes stale, fails or closes, Writer recreates it
+through the public SDK. A discovery read does this at once; otherwise one background
+reconnect waits 0.5 s, doubling to 30 s, and the wait resets once a watch is
+active. Retired callbacks are fenced and there is never more than one watch or timer.
+A reconnected watch reloads the collection, and it never closes the borrowed client.
+
+## Development package and evidence
+
+The normal original development archive from source
+`3f417b6d941a42444f17568d7489071d23fcb141`, original cut
+`sdk-dev-3f417b6d`, is pinned in `vendor/mdbase-next-sdk.json` (4346749 bytes,
+SHA256 `0c5f04c6adad67d747055ebe12963403e374aefde0999861d759f35e4e118ba6`).
+The SDK bundles the original beta129 `c280cd194ffd` protocol archive; Writer's
+ordinary direct `d765e675c3da` legacy protocol dependency is unchanged. This
+archive has no vendor warnings; the earlier unused-protocol exception is not
+carried forward.
+Both SHA256 and SHA512 were checked independently, followed by ordinary and frozen
+installation. There are no aliases, package rewrites, private SDK imports or
+installed-module swaps. Earlier SDK/native archives remain preserved. This cut
+includes atomic contract body updates/promotion and public explicit-digest
+`MemoryContract` fixtures, public error/status helpers and portable/native-origin
+sign-in APIs in one pin; no application loader workaround is supplied. The `41c`
+cut adds SDK-owned per-type readiness degradation, safe user-facing error copy
+and action labels, log-service CORS support and a thin-client entry. Writer opts
+into `{readiness: {typeIssues: "degrade"}}`; unavailable Writer types stay
+unavailable while usable types remain accessible. Packaged CORS code does not
+prove a deployed extension origin or authenticated acceptance.
+
+Root tests now use `createApplicationFixture` from `@mdbase-dev/sdk/testing` and
+its public structural entry, not hidden hooks on a production constructor.
+Catalog/type and lifecycle/readiness metadata stand-ins are explicit; record,
+lease, file, receipt and readback tests run through the real public SDK over
+`MemoryReplica`.
+
+The current cut adds SDK-owned lazy Worker startup, pairing only from a sign-in
+gesture, native-return opening and refused/expired sign-in recovery. Sign in stays
+enabled while authorizing and invokes SDK `approve()`; SDK refusal copy is unchanged.
+Image insertion declares `files:add` optional, but native uploads remain disabled
+until public incremental consent is integrated and validated. No startup add permission
+or app-side consent/renewal engine is introduced.
+
+This is **DEV/LAB development intake, not release qualification**. The original `4c`
+packet carries the 3,555,291-byte native runtime matching the committed
+`9f90af73e1591cafe9c35bdd42f18ae49d5a91a0186e78695e841fecabcd833a` pin,
+including the public setup-assessment ABI and owner-binding fixes,
+including the resources export and promotion support, registration-refusal
+guidance, Private-collection availability reasons and collection deletion APIs. Its
+`native.available=true` describes packaged integrity, not native launch,
+registration, custody or live authentication acceptance. The earlier source-only
+`2e2ae687` cut remains a separate immutable packet; it was not overwritten.
+Passing `MemoryReplica` tests does not establish runtime acceptance. Production
+remains legacy; this port has not been deployed or merged into Writer main.
+
+## Readiness and setup review
+
+`next/new-sdk` combines the public-entry line with settled readiness actions and
+SDK setup review. Missing or failed readiness offers **Check again** through
+`assess()`; a retired connection offers the SDK chooser. SDK `describeError`
+provides safe headings, copy and recovery actions, including validated update
+links for incompatible versions. Active checks remain loading. No native
+workspace is allocated before aggregate readiness and the original connection
+are current.
+
+Setup reads the SDK plan before showing its summary, changes, conflicts and
+refusal. Confirm applies that original object; an empty plan uses `configure()`.
+Unknown outcomes re-assess through the SDK rather than claim no changes or
+submit a fresh mutation automatically. Scope retirement fences the review.
+
+Live migration, update and suspension status uses `summarizeStatus` over the
+original client without replacing a still-current editable workspace, its local
+edits or record leases. Teardown removes only owned listeners/adapters, never the
+borrowed client.
+
+## Historical low-level sign-in UI
+
+`createNativeSignIn`/`NativeSignIn` remain optional legacy adapter preparation.
+They are not the public-entry SDK-mode bootstrap or a template for new app popup,
+storage or runtime code. New SDK mode delegates authorization to the public
+application in the original user gesture. Original artifacts and earlier evidence
+are retained; the unsafe SDK807 archive must not be reused.
diff --git a/docs/offline-shell.md b/docs/offline-shell.md
new file mode 100644
index 00000000..5afa9c35
--- /dev/null
+++ b/docs/offline-shell.md
@@ -0,0 +1,11 @@
+# Offline app shell
+
+The production build uses `@mdbase-dev/sdk/offline-shell/build` to precache the
+public app shell, scripts, lazy chunks, fonts and packaged WASM as one release.
+A previously opened app can reload its shell without connectivity. This does
+not grant collection access or make uncached files and remote services available
+offline; collection recovery and sync remain the SDK's responsibility.
+
+Updates do not reload open tabs. An incomplete deployment does not replace the
+last successfully cached release. Shell caching never stores authentication or
+collection API responses.
diff --git a/docs/releases/unreleased.md b/docs/releases/unreleased.md
new file mode 100644
index 00000000..956e0510
--- /dev/null
+++ b/docs/releases/unreleased.md
@@ -0,0 +1,16 @@
+# Unreleased
+
+- Keep collection, source and annotation discovery steady after a save instead of briefly flashing loading banners. Initial loading and genuine refresh failures remain visible.
+
+- Keep Find options beside their checkboxes, with larger clickable labels on phones.
+
+- Keep the export result visible after “Export anyway” closes the review dialog, and report download failures instead of leaving them silent.
+
+- Keep the optional install prompt above the phone's Sidebar, Write and Preview controls.
+- Keep every typed line break visible in the editor, including after reload or moving the cursor. Remove the hard-wrap display-folding preference; PDF and preview keep ordinary Markdown semantics.
+- End an empty list item with a blank separator so following text is outside the list. Avoid duplicate bullets when an explicit marker follows automatic continuation, without changing manually authored nested lists.
+
+- Clearly pause editing while a recovered local draft awaits review, instead of allowing typing that is ignored or reporting “Saved”. The comparison opens at the highlighted changed passage, even in long records.
+
+- Keep figure captions and cross-references labelled as figures when an image is missing, instead of switching them to listings.
+- Use the same actionable missing-image guidance for PDF, Word and bundle exports without repeating it. Explain in plain language when Word includes an image's description instead of the image.
diff --git a/packages/core/src/assemble.ts b/packages/core/src/assemble.ts
index bc91f85e..fb4041b3 100644
--- a/packages/core/src/assemble.ts
+++ b/packages/core/src/assemble.ts
@@ -11,7 +11,7 @@ import { embeddedQuotation, isAnnotation } from "./annotations.js";
 import type { CiteItem } from "./cite-items.js";
 import { Citeproc, type Bibliography, type CitationRequest, type CiteprocMode, type CslItem } from "./citeproc.js";
 import { typstLabel, typstString } from "./escape.js";
-import { IMAGE_EXTENSION, resolveLinkTarget, type WriterRecord } from "./records.js";
+import { IMAGE_EXTENSION, missingImageMessage, resolveLinkTarget, type WriterRecord } from "./records.js";
 import { HEADER, PLACEHOLDER, translateInline, translateRecord, type Diagnostic, type TranslatedRecord } from "./translate.js";
 
 import { manuscriptMeta, typstLanguage, type ManuscriptMeta, type MetaField } from "./meta.js";
@@ -310,7 +310,7 @@ export class ManuscriptAssembler {
           to: ref.to,
           severity: "error",
           ...(remote ? {} : { metadata: "index" as const }),
-          message: remote ? `Images must be files in the collection (${ref.target}).` : `No file in the collection matches the image ${ref.target}.`,
+          message: remote ? `Images must be files in the collection (${ref.target}).` : missingImageMessage(ref.target),
         });
         return `missing-image(${typstString(ref.target)})`;
       }
diff --git a/packages/core/src/materialize.ts b/packages/core/src/materialize.ts
index 589e403c..29b871c1 100644
--- a/packages/core/src/materialize.ts
+++ b/packages/core/src/materialize.ts
@@ -11,7 +11,7 @@ import { resolveCrossReferences } from "./crossref.js";
 import { manuscriptMeta } from "./meta.js";
 import type { CslItem } from "./citeproc.js";
 import { CITEKEY, markdownParser } from "./markdown.js";
-import { IMAGE_EXTENSION, resolveLinkTarget, type WriterRecord } from "./records.js";
+import { IMAGE_EXTENSION, missingImageMessage, resolveLinkTarget, type WriterRecord } from "./records.js";
 
 export interface MaterializeInput {
   readonly main: string;
@@ -80,7 +80,7 @@ export function materialize(input: MaterializeInput): MaterializedManuscript {
           if (IMAGE_EXTENSION.test(target)) {
             const file = resolveLinkTarget(target, path, input.filePaths, "");
             edits.push({ from: node.from, to: node.to, text: file ? `![](${mediaPath(file)})${m?.[3] ?? ""}` : raw });
-            if (!file) problems.push(`No file matches the image ${target} in ${path}.`);
+            if (!file) problems.push(`${path}: ${missingImageMessage(target)}`);
           } else {
             const resolved = resolveLinkTarget(target, path, input.recordPaths);
             if (!resolved || resolved === path || stack.includes(resolved)) {
@@ -105,7 +105,7 @@ export function materialize(input: MaterializeInput): MaterializedManuscript {
           if (/^[a-z]+:\/\//i.test(target)) return;
           const file = resolveLinkTarget(target, path, input.filePaths, "");
           if (file) edits.push({ from: url.from, to: url.to, text: mediaPath(file) });
-          else problems.push(`No file matches the image ${target} in ${path}.`);
+          else problems.push(`${path}: ${missingImageMessage(target)}`);
           return;
         }
         case "Wikilink": {
diff --git a/packages/core/src/records.ts b/packages/core/src/records.ts
index 1e17b8c4..cf4f7463 100644
--- a/packages/core/src/records.ts
+++ b/packages/core/src/records.ts
@@ -26,6 +26,11 @@ export function splitFrontmatter(text: string): { body: string; frontmatter: Fro
 
 export const IMAGE_EXTENSION = /\.(png|jpe?g|gif|svg|webp)$/i;
 
+/** Shared missing-image guidance for the preview and every export format. */
+export function missingImageMessage(target: string): string {
+  return `Image “${target}” is missing. Add it to the collection or correct its path.`;
+}
+
 export function dirname(path: string): string {
   const i = path.lastIndexOf("/");
   return i < 0 ? "" : path.slice(0, i);
diff --git a/packages/core/src/translate.ts b/packages/core/src/translate.ts
index 7d6f08d4..5fdb90af 100644
--- a/packages/core/src/translate.ts
+++ b/packages/core/src/translate.ts
@@ -382,11 +382,11 @@ class BodyTranslator {
     const image = this.image(path, false, img.from, img.to, attrs.kv["width"]);
     const numbering = attrs.id ? "" : ", numbering: none";
     if (altTo > altFrom) {
-      out.write(`\n#figure(${image}, caption: [`);
+      out.write(`\n#figure(kind: image, ${image}, caption: [`);
       this.inline(img, altFrom, altTo, true);
       out.write(`]${numbering})`);
     } else {
-      out.write(`\n#figure(${image}${numbering})`);
+      out.write(`\n#figure(kind: image, ${image}${numbering})`);
     }
     this.label(attrs.id);
     out.write("\n");
@@ -404,7 +404,7 @@ class BodyTranslator {
       // Obsidian's ![[img.png|300]] sets a width in pixels.
       const width = attrs.kv["width"] ?? (/^\d+$/.test(m?.[2] ?? "") ? `${m?.[2]}pt` : undefined);
       const image = this.image(target, true, node.from, node.to, width);
-      out.write(`\n#figure(${image}${attrs.id ? "" : ", numbering: none"})`);
+      out.write(`\n#figure(kind: image, ${image}${attrs.id ? "" : ", numbering: none"})`);
       this.label(attrs.id);
       out.write("\n");
       return;
diff --git a/packages/core/test/assemble.test.ts b/packages/core/test/assemble.test.ts
index 976d642e..bd2539cb 100644
--- a/packages/core/test/assemble.test.ts
+++ b/packages/core/test/assemble.test.ts
@@ -53,7 +53,7 @@ describe("ManuscriptAssembler", () => {
     expect(a.diagnostics.map((d) => d.message)).toEqual([
       "No source in the library has the citekey nosuch2020.",
       "Nothing is labelled fig-missing.",
-      "No file in the collection matches the image gone.png.",
+      "Image “gone.png” is missing. Add it to the collection or correct its path.",
     ]);
     const src = a.sources.get("/doc.typ") ?? "";
     expect(src).toContain('#missing("nosuch2020");');
diff --git a/packages/core/test/translate.test.ts b/packages/core/test/translate.test.ts
index 93fc05f6..78162703 100644
--- a/packages/core/test/translate.test.ts
+++ b/packages/core/test/translate.test.ts
@@ -52,6 +52,17 @@ describe("translateRecord", () => {
     expect(tr.rawBlocks).toHaveLength(1);
   });
 
+  it.each([
+    "![Caption](missing.png){#fig-missing}",
+    "![](missing.png){#fig-missing}",
+    "![[missing.png]]{#fig-missing}",
+  ])("keeps image figures typed as images even when their body is a missing-image fallback: %s", (body) => {
+    const translated = translateRecord(body);
+    expect(translated.typst).toContain("#figure(kind: image, ");
+    expect(translated.images).toEqual([expect.objectContaining({ target: "missing.png" })]);
+    expect(translated.labels).toEqual(["fig-missing"]);
+  });
+
   it("records the raw Typst block span exactly", () => {
     const block = tr.rawBlocks[0];
     expect(block && tr.typst.slice(block.typstFrom, block.typstTo)).toBe(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de75deeb..3b778aba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,7 +16,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^4.1.10
-        version: 4.1.11(@types/node@22.20.4)(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1))
+        version: 4.1.11(@types/node@22.20.4)(jsdom@29.1.1(@noble/hashes@2.4.0))(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1))
 
   apps/writer:
     dependencies:
@@ -53,9 +53,15 @@ importers:
       '@mdbase-dev/connect':
         specifier: 0.1.0-beta.125
         version: 0.1.0-beta.125
+      '@mdbase-dev/connect-protocol':
+        specifier: file:vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz
+        version: file:apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz
+      '@mdbase-dev/sdk':
+        specifier: file:../../vendor/mdbase-dev-sdk-dev-9a033b25.tgz
+        version: file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz
       '@mdbase-dev/ui':
-        specifier: 0.1.0-beta.125
-        version: 0.1.0-beta.125(@codemirror/view@6.43.13)(react@19.3.0)
+        specifier: file:../../vendor/mdbase-dev-ui-dev-9553ad66.tgz
+        version: file:vendor/mdbase-dev-ui-dev-9553ad66.tgz(@codemirror/view@6.43.13)(@mdbase-dev/sdk@file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@mdbase-writer/core':
         specifier: workspace:*
         version: link:../../packages/core
@@ -90,6 +96,9 @@ importers:
       '@mdbase-dev/connect-testing':
         specifier: 0.1.0-beta.125
         version: 0.1.0-beta.125
+      '@testing-library/react':
+        specifier: 16.3.2
+        version: 16.3.2(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@types/react':
         specifier: ^19.2.14
         version: 19.3.0
@@ -99,6 +108,9 @@ importers:
       '@vitejs/plugin-react':
         specifier: ^5.1.1
         version: 5.2.0(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1))
+      jsdom:
+        specifier: 29.1.1
+        version: 29.1.1(@noble/hashes@2.4.0)
       playwright:
         specifier: 1.61.1
         version: 1.61.1
@@ -126,6 +138,21 @@ importers:
 
 packages:
 
+  '@asamuzakjp/css-color@5.1.11':
+    resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    resolution: {integrity: sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/generational-cache@1.0.1':
+    resolution: {integrity: sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+
   '@babel/code-frame@7.29.7':
     resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
     engines: {node: '>=6.9.0'}
@@ -197,6 +224,10 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/runtime@7.29.10':
+    resolution: {integrity: sha512-NpugTzbKgGrNe45Ui32cN8vCFFMxVtP/9rtfwv0nP5FRDAjvYBxJcLVpYA9mr1jxP6cnIT7x9LUzuDTbWYYNRA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.29.7':
     resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
     engines: {node: '>=6.9.0'}
@@ -212,6 +243,10 @@ packages:
   '@bjorn3/browser_wasi_shim@0.4.2':
     resolution: {integrity: sha512-/iHkCVUG3VbcbmEHn5iIUpIrh7a7WPiwZ3sHy4HZKZzBdSadwdddYDZAII2zBvQYV0Lfi8naZngPCN7WPHI/hA==}
 
+  '@bramus/specificity@2.4.3':
+    resolution: {integrity: sha512-0GEz8qJWokkUVYQYRukmkSHIFNoBH8QTreeHrAFbvz1XFYc3Y+puhMs8PQ5x8GNugiC2l5jvDBXKLbBIByeSBw==}
+    hasBin: true
+
   '@bufbuild/cel-spec@0.6.1':
     resolution: {integrity: sha512-m0Ac9qA669yxxC0Hy45qGsUZemjImVfxPl6r9jLbkJviEvv3R9hSYyH2ItGRbDguekX6eId0cb62ulNBK97ezg==}
     peerDependencies:
@@ -265,8 +300,53 @@ packages:
   '@codemirror/view@6.43.13':
     resolution: {integrity: sha512-sihaFrUzAsYBQsL9J2t69y8nfMQGwcYmggAZsk+kjPbjYZMyuf2hU8tUNTZ+P+isb6XRr8JE22TZlJxBoVdH1A==}
 
-  '@fontsource/atkinson-hyperlegible@5.3.0':
-    resolution: {integrity: sha512-Sp8Ve8+rQmENY2Lv02VH7sLpntzTTvnncnJMTbRE7DX6TLxGraN4ykZfzaUWIoCFmaomwkvNiqmlPkrKBuDoSA==}
+  '@csstools/color-helpers@6.1.2':
+    resolution: {integrity: sha512-grhRy3OKmniaAEKXMjua5z/EODX0MSqBGjunw8+j/3HQjOnahs2AGhvEOIYVUWcU6ScApbhLhVrQTX8XqrMrow==}
+    engines: {node: '>=20.19.0'}
+
+  '@csstools/css-calc@3.4.3':
+    resolution: {integrity: sha512-iex20d8CHVkyvg6B7UKV7uHnI2Bqo9g+EFfT9E0y+GvTvhZ/DwONJ+9aKb1dlqm0ZiGsL5RXjp0fCoJYnkeDjA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.2
+      '@csstools/css-tokenizer': ^4.0.2
+
+  '@csstools/css-color-parser@4.2.6':
+    resolution: {integrity: sha512-iiPQ3iRWwnJkeEn6RIu6SJPr7hYrLz6XZ9s/QZl+2/LI5KQVjpl2fdmDSZKuD4xP6GMmMPgHFFXg6k1Wkz0Trg==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.2
+      '@csstools/css-tokenizer': ^4.0.2
+
+  '@csstools/css-parser-algorithms@4.0.2':
+    resolution: {integrity: sha512-40cSKyMvK+tq4qz6Awrlye2WGuOKt3FwPgtGg6KTfbHOWNw+Rk1rzbAtZnZ6IBhsY491HLRnDXwoyBAijmmILA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^4.0.2
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.15':
+    resolution: {integrity: sha512-J0u7HkVl2nzSlhsiTOp4AmwcUQ3D+mGEEKfBy/7To5/y7F2OHwyLrXfrhR0SMgr4p5Lo+eaMVSeai24zUcBIxA==}
+    peerDependencies:
+      css-tree: ^3.2.1
+    peerDependenciesMeta:
+      css-tree:
+        optional: true
+
+  '@csstools/css-tokenizer@4.0.2':
+    resolution: {integrity: sha512-OoKoR0f76dCY666JlcbhmVTs2drYj1GUXZTYTcbUgJjh9Nv41aFfZ21bPQTERm5+L5cBDo466NltB2lplS5GBw==}
+    engines: {node: '>=20.19.0'}
+
+  '@exodus/bytes@1.16.0':
+    resolution: {integrity: sha512-IcpW84uEn3N7ETtNZMlxKhfl6Pec8rUNGOTBtWbK1FKhJxIFAptZyVrvVRVBimAJxJCgc3PxepxkdWWG4DVzfA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      '@noble/hashes': ^1.8.0 || ^2.0.0
+    peerDependenciesMeta:
+      '@noble/hashes':
+        optional: true
+
+  '@fontsource-variable/atkinson-hyperlegible-next@5.3.0':
+    resolution: {integrity: sha512-UnLzNUy1RWoLDfydAatP4NaRm99X/WbQEph7q/PymJnCFIOOwKOx3pBmp5ys8trO0dM+CKGuJgeZP9fAR4mQpA==}
 
   '@fontsource/azeret-mono@5.3.0':
     resolution: {integrity: sha512-Ag/+gN67fUry7i1yLlTnk16Rr1nnTQI2YefA/G7tYcCSr/+TC/ayMrE8Km7O0OKRgI/B5Mfel46Gq9IGY50Uaw==}
@@ -318,20 +398,38 @@ packages:
   '@mdbase-dev/connect-protocol@0.1.0-beta.125':
     resolution: {integrity: sha512-q6aEZ1+dVAXvoN84FgDLMhqCnCdlsXhp0K5M+Wcp2x2ICUIoE/lA+eDg4AJqDqdWZ3Nq2mkiczvat6HG2y8EeQ==}
 
+  '@mdbase-dev/connect-protocol@file:apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz':
+    resolution: {integrity: sha512-PFG1qmAzmcyJjmZLmGz4eoOOZRDgvTvDZATf6IGBccNHRc1eGZtMm7ZUA7gNAxuO5KerrN6mDIB9qQnpojyOAg==, tarball: file:apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz}
+    version: 0.1.0-beta.129
+
   '@mdbase-dev/connect-testing@0.1.0-beta.125':
     resolution: {integrity: sha512-o9tJZNPRsClsbP6n7OqzDZ0Ijm3xrlXmVmZ1LniK4e6Yed2asYU+7QYJuIbCp7iXFyfuwdiFj9Z+qMG00Rxvlg==}
 
   '@mdbase-dev/connect@0.1.0-beta.125':
     resolution: {integrity: sha512-vEH4NQfu3dBQgMw0YQxG7LDtOOLxDyxET4DQhrWuHqtgr9qoch/H0QLzel9tFSqkyH+QWxuvW3Bet6ae1+qVyQ==}
 
-  '@mdbase-dev/ui@0.1.0-beta.125':
-    resolution: {integrity: sha512-K2UAAzwW4yuPJxx65LofVDQXKLgs4lOgrAB61YMuiNwV/jOc1yuNhGugy7Fx++VwxBx5bZyG+Pk7tMQlOat+tg==}
+  '@mdbase-dev/sdk@file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz':
+    resolution: {integrity: sha512-Th4bgqvvgDPQQ7hkEwyo6ZG2SFQ7L7J6qdeaoTVjsOTyop2vmEmuUpMZ/EkUPZA0Fo0oq6wbOcsRk+en5vQEOQ==, tarball: file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz}
+    version: 0.0.0
+    engines: {node: '>=20'}
+    bundledDependencies:
+      - '@mdbase-dev/connect-protocol'
+
+  '@mdbase-dev/ui@file:vendor/mdbase-dev-ui-dev-9553ad66.tgz':
+    resolution: {integrity: sha512-PqMWvJ2ZbNaLxWTum2m7vmcCbOGdM5qldnphPwqyGBo/mcpvjfk5tHkil/vXLc+LuG7HEyZOLh+tZyUXtMv7QQ==, tarball: file:vendor/mdbase-dev-ui-dev-9553ad66.tgz}
+    version: 0.1.0-beta.129
     peerDependencies:
       '@codemirror/view': ^6.0.0
+      '@mdbase-dev/sdk': '*'
       react: ^19.2.0
+      react-dom: ^19.2.0
     peerDependenciesMeta:
       '@codemirror/view':
         optional: true
+      '@mdbase-dev/sdk':
+        optional: true
+      react-dom:
+        optional: true
 
   '@myriaddreamin/typst-ts-renderer@0.7.0':
     resolution: {integrity: sha512-3sXIGxZn9MufPrPn6251DeuLf2FIEILYNzY5lX0XOJmaIYqgvQ3qpfqkCjgQD+splBvt5R1N3BuuNFrZKsHhMw==}
@@ -350,6 +448,18 @@ packages:
       '@myriaddreamin/typst-ts-web-compiler':
         optional: true
 
+  '@noble/ciphers@2.4.0':
+    resolution: {integrity: sha512-AnjFn0Jv92laAkvMrghlFZq4qQCIN/4DxFV/eooqtC2YTjB7kBeLMS2T9KJX4Dn+ZVXLOwK0lSgqDtx9gvxtiw==}
+    engines: {node: '>= 20.19.0'}
+
+  '@noble/curves@2.4.0':
+    resolution: {integrity: sha512-P4/62zrgfH33CneE3Dn4WhJVA22YUU0eR51wKIan4NVRvwsA0YnPTwWGpNbpuacSujmSFLvyzpyuR30+fbq2Ew==}
+    engines: {node: '>= 20.19.0'}
+
+  '@noble/hashes@2.4.0':
+    resolution: {integrity: sha512-X5XaVWZIBCT7HHZGm5I7ZQXDwLG+bGXuSrMQAW+7Zvl87h1kmc1ZB1VSRJcpUfoUrGQp4Fkoxm5kZ+Ms+aW+eA==}
+    engines: {node: '>= 20.19.0'}
+
   '@oxc-project/types@0.151.0':
     resolution: {integrity: sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==}
 
@@ -465,6 +575,28 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
+  '@testing-library/dom@10.4.2':
+    resolution: {integrity: sha512-yzr2S9HyAIdhz2/6qHgbs665Q7PKVcDF05vsOlHPxG1mo36gKVesdYVeDLnXgfjJ03CrKRk08knc6+E/9m8v2Q==}
+    engines: {node: '>=18'}
+
+  '@testing-library/react@16.3.2':
+    resolution: {integrity: sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@testing-library/dom': ^10.0.0
+      '@types/react': ^18.0.0 || ^19.0.0
+      '@types/react-dom': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@types/aria-query@5.0.4':
+    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
+
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
@@ -543,12 +675,23 @@ packages:
   ajv@8.20.0:
     resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
 
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
   argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
 
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
   assertion-error@2.0.1:
     resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
     engines: {node: '>=12'}
@@ -558,6 +701,9 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  bidi-js@1.1.0:
+    resolution: {integrity: sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==}
+
   browserslist@4.29.1:
     resolution: {integrity: sha512-AUdjuRyCNGUYtqpqfTmWyM4fXay8yIQhmLnvYe/THMGfT9B/34X7xQd3ifKxwyNPPpowVBjLb+64BN9Rn1mizw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -579,9 +725,17 @@ packages:
   crelt@1.0.7:
     resolution: {integrity: sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==}
 
+  css-tree@3.2.1:
+    resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
+  data-urls@7.0.0:
+    resolution: {integrity: sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
@@ -591,13 +745,27 @@ packages:
       supports-color:
         optional: true
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
   detect-libc@2.1.2:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
+  dom-accessibility-api@0.5.16:
+    resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
+
   electron-to-chromium@1.5.439:
     resolution: {integrity: sha512-qu6QIPXhsb+CRcAiTMNjR4A1y/7tCYKkKjr5CZXRVih6qkDf79peZ2BpEU3qoDBNCRrcy3Mra3X9nG5oruuA7Q==}
 
+  entities@8.1.0:
+    resolution: {integrity: sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==}
+    engines: {node: '>=20.19.0'}
+
   es-module-lexer@2.3.2:
     resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==}
 
@@ -654,6 +822,10 @@ packages:
     resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
     engines: {node: '>=6.0'}
 
+  html-encoding-sniffer@6.0.0:
+    resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   idb@7.1.1:
     resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==}
 
@@ -661,6 +833,9 @@ packages:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
     engines: {node: '>=0.10.0'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
@@ -672,6 +847,15 @@ packages:
     resolution: {integrity: sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==}
     hasBin: true
 
+  jsdom@29.1.1:
+    resolution: {integrity: sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -763,12 +947,23 @@ packages:
     resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
     engines: {node: '>= 12.0.0'}
 
+  lru-cache@11.5.3:
+    resolution: {integrity: sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
+  lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
+  mdn-data@2.27.1:
+    resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
+
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -788,6 +983,9 @@ packages:
   pandoc-wasm@1.1.0:
     resolution: {integrity: sha512-IoWBsC/cbSZe71rcRtxXUxG+Auf8aGDHKYOQZA6OdwmUL2xdpQaqrSGhPa+6zfLdSar7cnyAmTWt6KU9n5kBjQ==}
 
+  parse5@8.0.1:
+    resolution: {integrity: sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==}
+
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
@@ -812,11 +1010,22 @@ packages:
     resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==}
     engines: {node: ^10 || ^12 || >=14}
 
+  pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
   react-dom@19.3.0:
     resolution: {integrity: sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==}
     peerDependencies:
       react: ^19.3.0
 
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
   react-refresh@0.18.0:
     resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
@@ -834,6 +1043,10 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
   scheduler@0.28.0:
     resolution: {integrity: sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==}
 
@@ -876,6 +1089,9 @@ packages:
   style-mod@4.1.4:
     resolution: {integrity: sha512-XXWIQt633/EpAFx8aZDOTjBzrCaGmhvEQlQo6MVPfa2OzO2cWo+4hV9h+6UkHYlXGfy+ODXKUdP7Pthmcu5ATw==}
 
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
@@ -891,6 +1107,21 @@ packages:
     resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==}
     engines: {node: '>=14.0.0'}
 
+  tldts-core@7.4.18:
+    resolution: {integrity: sha512-KI2PKvCmvQI/xD6ypPqkU0i7oxNXR/O58RLRaHR4svsgVUQ2JE/XC8BtMbG6PSehD27I8sZJRcC1ASnCy6lp3g==}
+
+  tldts@7.4.18:
+    resolution: {integrity: sha512-somxA8xKAUzlAxl0TX/jMSYIbRNFIVGnI96pVGJPeMc5BsHmfVXn6mOJT6U++ELnl04eGfzpfcEuZe8WiASkXg==}
+    hasBin: true
+
+  tough-cookie@6.0.2:
+    resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==}
+    engines: {node: '>=16'}
+
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
+
   typescript@5.9.3:
     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
     engines: {node: '>=14.17'}
@@ -903,6 +1134,10 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici@7.30.0:
+    resolution: {integrity: sha512-dkrQXeHSaoamnItlYbmzG0wFYrM0ZwDxCIg0A7aKjTyyhh9svRzCNFEzV+Vm05/yehjCzjDZ31KXfGEjYSztDQ==}
+    engines: {node: '>=20.18.1'}
+
   update-browserslist-db@1.3.3:
     resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==}
     hasBin: true
@@ -996,11 +1231,34 @@ packages:
   w3c-keyname@2.2.8:
     resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
 
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
+  webidl-conversions@8.0.1:
+    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
+    engines: {node: '>=20'}
+
+  whatwg-mimetype@5.0.0:
+    resolution: {integrity: sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==}
+    engines: {node: '>=20'}
+
+  whatwg-url@16.0.1:
+    resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
     hasBin: true
 
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
@@ -1011,6 +1269,26 @@ packages:
 
 snapshots:
 
+  '@asamuzakjp/css-color@5.1.11':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@csstools/css-calc': 3.4.3(@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2))(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-color-parser': 4.2.6(@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2))(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-parser-algorithms': 4.0.2(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-tokenizer': 4.0.2
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@asamuzakjp/nwsapi': 2.3.9
+      bidi-js: 1.1.0
+      css-tree: 3.2.1
+      is-potential-custom-element-name: 1.0.1
+
+  '@asamuzakjp/generational-cache@1.0.1': {}
+
+  '@asamuzakjp/nwsapi@2.3.9': {}
+
   '@babel/code-frame@7.29.7':
     dependencies:
       '@babel/helper-validator-identifier': 7.29.7
@@ -1100,6 +1378,8 @@ snapshots:
       '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.29.7
 
+  '@babel/runtime@7.29.10': {}
+
   '@babel/template@7.29.7':
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -1125,6 +1405,10 @@ snapshots:
 
   '@bjorn3/browser_wasi_shim@0.4.2': {}
 
+  '@bramus/specificity@2.4.3':
+    dependencies:
+      css-tree: 3.2.1
+
   '@bufbuild/cel-spec@0.6.1(@bufbuild/protobuf@2.15.0)':
     dependencies:
       '@bufbuild/protobuf': 2.15.0
@@ -1239,7 +1523,35 @@ snapshots:
       style-mod: 4.1.4
       w3c-keyname: 2.2.8
 
-  '@fontsource/atkinson-hyperlegible@5.3.0': {}
+  '@csstools/color-helpers@6.1.2': {}
+
+  '@csstools/css-calc@3.4.3(@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2))(@csstools/css-tokenizer@4.0.2)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 4.0.2(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-tokenizer': 4.0.2
+
+  '@csstools/css-color-parser@4.2.6(@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2))(@csstools/css-tokenizer@4.0.2)':
+    dependencies:
+      '@csstools/color-helpers': 6.1.2
+      '@csstools/css-calc': 3.4.3(@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2))(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-parser-algorithms': 4.0.2(@csstools/css-tokenizer@4.0.2)
+      '@csstools/css-tokenizer': 4.0.2
+
+  '@csstools/css-parser-algorithms@4.0.2(@csstools/css-tokenizer@4.0.2)':
+    dependencies:
+      '@csstools/css-tokenizer': 4.0.2
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.15(css-tree@3.2.1)':
+    optionalDependencies:
+      css-tree: 3.2.1
+
+  '@csstools/css-tokenizer@4.0.2': {}
+
+  '@exodus/bytes@1.16.0(@noble/hashes@2.4.0)':
+    optionalDependencies:
+      '@noble/hashes': 2.4.0
+
+  '@fontsource-variable/atkinson-hyperlegible-next@5.3.0': {}
 
   '@fontsource/azeret-mono@5.3.0': {}
 
@@ -1310,6 +1622,13 @@ snapshots:
       ajv-formats: 3.0.1(ajv@8.20.0)
       yaml: 2.9.1
 
+  '@mdbase-dev/connect-protocol@file:apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz':
+    dependencies:
+      '@noble/hashes': 2.4.0
+      ajv: 8.20.0
+      ajv-formats: 3.0.1(ajv@8.20.0)
+      yaml: 2.9.1
+
   '@mdbase-dev/connect-testing@0.1.0-beta.125':
     dependencies:
       '@mdbase-dev/connect': 0.1.0-beta.125
@@ -1319,13 +1638,21 @@ snapshots:
     dependencies:
       '@mdbase-dev/connect-protocol': 0.1.0-beta.125
 
-  '@mdbase-dev/ui@0.1.0-beta.125(@codemirror/view@6.43.13)(react@19.3.0)':
+  '@mdbase-dev/sdk@file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz':
+    dependencies:
+      '@noble/ciphers': 2.4.0
+      '@noble/curves': 2.4.0
+      '@noble/hashes': 2.4.0
+
+  '@mdbase-dev/ui@file:vendor/mdbase-dev-ui-dev-9553ad66.tgz(@codemirror/view@6.43.13)(@mdbase-dev/sdk@file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
     dependencies:
-      '@fontsource/atkinson-hyperlegible': 5.3.0
+      '@fontsource-variable/atkinson-hyperlegible-next': 5.3.0
       '@fontsource/azeret-mono': 5.3.0
       react: 19.3.0
     optionalDependencies:
       '@codemirror/view': 6.43.13
+      '@mdbase-dev/sdk': file:vendor/mdbase-dev-sdk-dev-9a033b25.tgz
+      react-dom: 19.3.0(react@19.3.0)
 
   '@myriaddreamin/typst-ts-renderer@0.7.0': {}
 
@@ -1338,6 +1665,14 @@ snapshots:
       '@myriaddreamin/typst-ts-renderer': 0.7.0
       '@myriaddreamin/typst-ts-web-compiler': 0.7.0
 
+  '@noble/ciphers@2.4.0': {}
+
+  '@noble/curves@2.4.0':
+    dependencies:
+      '@noble/hashes': 2.4.0
+
+  '@noble/hashes@2.4.0': {}
+
   '@oxc-project/types@0.151.0': {}
 
   '@phosphor-icons/react@2.1.10(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
@@ -1396,6 +1731,29 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
+  '@testing-library/dom@10.4.2':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/runtime': 7.29.10
+      '@types/aria-query': 5.0.4
+      aria-query: 5.3.0
+      dom-accessibility-api: 0.5.16
+      lz-string: 1.5.0
+      picocolors: 1.1.1
+      pretty-format: 27.5.1
+
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
+    dependencies:
+      '@babel/runtime': 7.29.10
+      '@testing-library/dom': 10.4.2
+      react: 19.3.0
+      react-dom: 19.3.0(react@19.3.0)
+    optionalDependencies:
+      '@types/react': 19.3.0
+      '@types/react-dom': 19.3.0(@types/react@19.3.0)
+
+  '@types/aria-query@5.0.4': {}
+
   '@types/babel__core@7.20.5':
     dependencies:
       '@babel/parser': 7.29.9
@@ -1502,16 +1860,28 @@ snapshots:
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
+  ansi-regex@5.0.1: {}
+
+  ansi-styles@5.2.0: {}
+
   argparse@1.0.10:
     dependencies:
       sprintf-js: 1.0.3
 
   argparse@2.0.1: {}
 
+  aria-query@5.3.0:
+    dependencies:
+      dequal: 2.0.3
+
   assertion-error@2.0.1: {}
 
   baseline-browser-mapping@2.11.26: {}
 
+  bidi-js@1.1.0:
+    dependencies:
+      require-from-string: 2.0.2
+
   browserslist@4.29.1:
     dependencies:
       baseline-browser-mapping: 2.11.26
@@ -1530,16 +1900,36 @@ snapshots:
 
   crelt@1.0.7: {}
 
+  css-tree@3.2.1:
+    dependencies:
+      mdn-data: 2.27.1
+      source-map-js: 1.2.1
+
   csstype@3.2.3: {}
 
+  data-urls@7.0.0(@noble/hashes@2.4.0):
+    dependencies:
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1(@noble/hashes@2.4.0)
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   debug@4.4.3:
     dependencies:
       ms: 2.1.3
 
+  decimal.js@10.6.0: {}
+
+  dequal@2.0.3: {}
+
   detect-libc@2.1.2: {}
 
+  dom-accessibility-api@0.5.16: {}
+
   electron-to-chromium@1.5.439: {}
 
+  entities@8.1.0: {}
+
   es-module-lexer@2.3.2: {}
 
   escalade@3.2.0: {}
@@ -1579,10 +1969,18 @@ snapshots:
       section-matter: 1.0.0
       strip-bom-string: 1.0.0
 
+  html-encoding-sniffer@6.0.0(@noble/hashes@2.4.0):
+    dependencies:
+      '@exodus/bytes': 1.16.0(@noble/hashes@2.4.0)
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   idb@7.1.1: {}
 
   is-extendable@0.1.1: {}
 
+  is-potential-custom-element-name@1.0.1: {}
+
   js-tokens@4.0.0: {}
 
   js-yaml@3.15.2:
@@ -1594,6 +1992,32 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsdom@29.1.1(@noble/hashes@2.4.0):
+    dependencies:
+      '@asamuzakjp/css-color': 5.1.11
+      '@asamuzakjp/dom-selector': 7.1.1
+      '@bramus/specificity': 2.4.3
+      '@csstools/css-syntax-patches-for-csstree': 1.1.15(css-tree@3.2.1)
+      '@exodus/bytes': 1.16.0(@noble/hashes@2.4.0)
+      css-tree: 3.2.1
+      data-urls: 7.0.0(@noble/hashes@2.4.0)
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 6.0.0(@noble/hashes@2.4.0)
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.5.3
+      parse5: 8.0.1
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 6.0.2
+      undici: 7.30.0
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 8.0.1
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1(@noble/hashes@2.4.0)
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   jsesc@3.1.0: {}
 
   json-schema-traverse@1.0.0: {}
@@ -1651,14 +2075,20 @@ snapshots:
       lightningcss-win32-arm64-msvc: 1.33.0
       lightningcss-win32-x64-msvc: 1.33.0
 
+  lru-cache@11.5.3: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
 
+  lz-string@1.5.0: {}
+
   magic-string@0.30.21:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.6.0
 
+  mdn-data@2.27.1: {}
+
   ms@2.1.3: {}
 
   nanoid@3.3.19: {}
@@ -1671,6 +2101,10 @@ snapshots:
     dependencies:
       '@bjorn3/browser_wasi_shim': 0.4.2
 
+  parse5@8.0.1:
+    dependencies:
+      entities: 8.1.0
+
   pathe@2.0.3: {}
 
   picocolors@1.1.1: {}
@@ -1691,11 +2125,21 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  pretty-format@27.5.1:
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+
+  punycode@2.3.1: {}
+
   react-dom@19.3.0(react@19.3.0):
     dependencies:
       react: 19.3.0
       scheduler: 0.28.0
 
+  react-is@17.0.2: {}
+
   react-refresh@0.18.0: {}
 
   react@19.3.0: {}
@@ -1723,6 +2167,10 @@ snapshots:
       '@rolldown/binding-win32-arm64-msvc': 1.2.11
       '@rolldown/binding-win32-x64-msvc': 1.2.11
 
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
   scheduler@0.28.0: {}
 
   section-matter@1.0.0:
@@ -1750,6 +2198,8 @@ snapshots:
 
   style-mod@4.1.4: {}
 
+  symbol-tree@3.2.4: {}
+
   tinybench@2.9.0: {}
 
   tinyexec@1.3.1: {}
@@ -1761,12 +2211,28 @@ snapshots:
 
   tinyrainbow@3.1.1: {}
 
+  tldts-core@7.4.18: {}
+
+  tldts@7.4.18:
+    dependencies:
+      tldts-core: 7.4.18
+
+  tough-cookie@6.0.2:
+    dependencies:
+      tldts: 7.4.18
+
+  tr46@6.0.0:
+    dependencies:
+      punycode: 2.3.1
+
   typescript@5.9.3: {}
 
   ulid@2.4.0: {}
 
   undici-types@6.21.0: {}
 
+  undici@7.30.0: {}
+
   update-browserslist-db@1.3.3(browserslist@4.29.1):
     dependencies:
       browserslist: 4.29.1
@@ -1785,7 +2251,7 @@ snapshots:
       fsevents: 2.3.3
       yaml: 2.9.1
 
-  vitest@4.1.11(@types/node@22.20.4)(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1)):
+  vitest@4.1.11(@types/node@22.20.4)(jsdom@29.1.1(@noble/hashes@2.4.0))(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1)):
     dependencies:
       '@vitest/expect': 4.1.11
       '@vitest/mocker': 4.1.11(vite@8.3.1(@types/node@22.20.4)(yaml@2.9.1))
@@ -1809,16 +2275,37 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 22.20.4
+      jsdom: 29.1.1(@noble/hashes@2.4.0)
     transitivePeerDependencies:
       - msw
 
   w3c-keyname@2.2.8: {}
 
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
+  webidl-conversions@8.0.1: {}
+
+  whatwg-mimetype@5.0.0: {}
+
+  whatwg-url@16.0.1(@noble/hashes@2.4.0):
+    dependencies:
+      '@exodus/bytes': 1.16.0(@noble/hashes@2.4.0)
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
       stackback: 0.0.2
 
+  xml-name-validator@5.0.0: {}
+
+  xmlchars@2.2.0: {}
+
   yallist@3.1.1: {}
 
   yaml@2.9.1: {}
diff --git a/vendor/mdbase-dev-sdk-0.0.0-b9965703.tgz b/vendor/mdbase-dev-sdk-0.0.0-b9965703.tgz
new file mode 100644
index 00000000..f80136e2
Binary files /dev/null and b/vendor/mdbase-dev-sdk-0.0.0-b9965703.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-013c7e56.tgz b/vendor/mdbase-dev-sdk-dev-013c7e56.tgz
new file mode 100644
index 00000000..19c9d43e
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-013c7e56.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-0aeaada6.tgz b/vendor/mdbase-dev-sdk-dev-0aeaada6.tgz
new file mode 100644
index 00000000..357a9855
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-0aeaada6.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-0f5724ef.tgz b/vendor/mdbase-dev-sdk-dev-0f5724ef.tgz
new file mode 100644
index 00000000..966cc494
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-0f5724ef.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-0f9a3614.tgz b/vendor/mdbase-dev-sdk-dev-0f9a3614.tgz
new file mode 100644
index 00000000..967fd5ff
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-0f9a3614.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-106d36ff.tgz b/vendor/mdbase-dev-sdk-dev-106d36ff.tgz
new file mode 100644
index 00000000..dd897e28
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-106d36ff.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-12c28ef1.tgz b/vendor/mdbase-dev-sdk-dev-12c28ef1.tgz
new file mode 100644
index 00000000..2f9e5992
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-12c28ef1.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-1629d11e.tgz b/vendor/mdbase-dev-sdk-dev-1629d11e.tgz
new file mode 100644
index 00000000..8625271f
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-1629d11e.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-1dddb04c.tgz b/vendor/mdbase-dev-sdk-dev-1dddb04c.tgz
new file mode 100644
index 00000000..b79eb2ce
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-1dddb04c.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-1f7b4f7a.tgz b/vendor/mdbase-dev-sdk-dev-1f7b4f7a.tgz
new file mode 100644
index 00000000..1ffc11be
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-1f7b4f7a.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-20c347ad.tgz b/vendor/mdbase-dev-sdk-dev-20c347ad.tgz
new file mode 100644
index 00000000..31f374b4
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-20c347ad.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-23a10ee4.tgz b/vendor/mdbase-dev-sdk-dev-23a10ee4.tgz
new file mode 100644
index 00000000..8d7845c5
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-23a10ee4.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-3491a619.tgz b/vendor/mdbase-dev-sdk-dev-3491a619.tgz
new file mode 100644
index 00000000..43b0ff6d
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-3491a619.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-39ba2b8a.tgz b/vendor/mdbase-dev-sdk-dev-39ba2b8a.tgz
new file mode 100644
index 00000000..6ab8bda8
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-39ba2b8a.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-3f417b6d.tgz b/vendor/mdbase-dev-sdk-dev-3f417b6d.tgz
new file mode 100644
index 00000000..0aa6f0f0
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-3f417b6d.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-41c26ca7.tgz b/vendor/mdbase-dev-sdk-dev-41c26ca7.tgz
new file mode 100644
index 00000000..a98028b7
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-41c26ca7.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-47225957.tgz b/vendor/mdbase-dev-sdk-dev-47225957.tgz
new file mode 100644
index 00000000..59256519
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-47225957.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-4728a54c.tgz b/vendor/mdbase-dev-sdk-dev-4728a54c.tgz
new file mode 100644
index 00000000..35bb2d88
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-4728a54c.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-48b9f094.tgz b/vendor/mdbase-dev-sdk-dev-48b9f094.tgz
new file mode 100644
index 00000000..ea28b233
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-48b9f094.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-4c10b9a5.tgz b/vendor/mdbase-dev-sdk-dev-4c10b9a5.tgz
new file mode 100644
index 00000000..1d03ae9b
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-4c10b9a5.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-4c484d3c.tgz b/vendor/mdbase-dev-sdk-dev-4c484d3c.tgz
new file mode 100644
index 00000000..13624a73
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-4c484d3c.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-53643b29.tgz b/vendor/mdbase-dev-sdk-dev-53643b29.tgz
new file mode 100644
index 00000000..98e067f8
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-53643b29.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-5710ab13.tgz b/vendor/mdbase-dev-sdk-dev-5710ab13.tgz
new file mode 100644
index 00000000..1f03646a
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-5710ab13.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-5c7b9592.tgz b/vendor/mdbase-dev-sdk-dev-5c7b9592.tgz
new file mode 100644
index 00000000..a28f59e3
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-5c7b9592.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-5f2c3d5d.tgz b/vendor/mdbase-dev-sdk-dev-5f2c3d5d.tgz
new file mode 100644
index 00000000..a4d5c04e
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-5f2c3d5d.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-608bb0d5.tgz b/vendor/mdbase-dev-sdk-dev-608bb0d5.tgz
new file mode 100644
index 00000000..fe3ccba6
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-608bb0d5.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-6a576a5f.tgz b/vendor/mdbase-dev-sdk-dev-6a576a5f.tgz
new file mode 100644
index 00000000..9ff95073
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-6a576a5f.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-6f14ebe1.tgz b/vendor/mdbase-dev-sdk-dev-6f14ebe1.tgz
new file mode 100644
index 00000000..d9aed32f
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-6f14ebe1.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-6f2b1e51.tgz b/vendor/mdbase-dev-sdk-dev-6f2b1e51.tgz
new file mode 100644
index 00000000..56c50771
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-6f2b1e51.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-72f8ea6c.tgz b/vendor/mdbase-dev-sdk-dev-72f8ea6c.tgz
new file mode 100644
index 00000000..7d4bf63c
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-72f8ea6c.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-8a557ad6.tgz b/vendor/mdbase-dev-sdk-dev-8a557ad6.tgz
new file mode 100644
index 00000000..88836373
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-8a557ad6.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-8b18a6c7.tgz b/vendor/mdbase-dev-sdk-dev-8b18a6c7.tgz
new file mode 100644
index 00000000..b962f781
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-8b18a6c7.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-8bc12525.tgz b/vendor/mdbase-dev-sdk-dev-8bc12525.tgz
new file mode 100644
index 00000000..4fcf283b
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-8bc12525.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-9a033b25.tgz b/vendor/mdbase-dev-sdk-dev-9a033b25.tgz
new file mode 100644
index 00000000..733c0374
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-9a033b25.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-a8fdbdce.tgz b/vendor/mdbase-dev-sdk-dev-a8fdbdce.tgz
new file mode 100644
index 00000000..cc7b9738
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-a8fdbdce.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-a965bd26.tgz b/vendor/mdbase-dev-sdk-dev-a965bd26.tgz
new file mode 100644
index 00000000..791b073f
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-a965bd26.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-abc08f3e.tgz b/vendor/mdbase-dev-sdk-dev-abc08f3e.tgz
new file mode 100644
index 00000000..cf41dac2
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-abc08f3e.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-ac3bff98.tgz b/vendor/mdbase-dev-sdk-dev-ac3bff98.tgz
new file mode 100644
index 00000000..7396ddb3
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-ac3bff98.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-ad69a506.tgz b/vendor/mdbase-dev-sdk-dev-ad69a506.tgz
new file mode 100644
index 00000000..46e881e6
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-ad69a506.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-af29edc9.tgz b/vendor/mdbase-dev-sdk-dev-af29edc9.tgz
new file mode 100644
index 00000000..a4cf5929
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-af29edc9.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-b1c47a32.tgz b/vendor/mdbase-dev-sdk-dev-b1c47a32.tgz
new file mode 100644
index 00000000..0440e1bd
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-b1c47a32.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-bef3fe45.tgz b/vendor/mdbase-dev-sdk-dev-bef3fe45.tgz
new file mode 100644
index 00000000..9be0c219
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-bef3fe45.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-ca8f0682.tgz b/vendor/mdbase-dev-sdk-dev-ca8f0682.tgz
new file mode 100644
index 00000000..e52ddf50
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-ca8f0682.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-cf294bdb.tgz b/vendor/mdbase-dev-sdk-dev-cf294bdb.tgz
new file mode 100644
index 00000000..825e955e
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-cf294bdb.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-d230034f.tgz b/vendor/mdbase-dev-sdk-dev-d230034f.tgz
new file mode 100644
index 00000000..7912263c
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-d230034f.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-d53d7d76.tgz b/vendor/mdbase-dev-sdk-dev-d53d7d76.tgz
new file mode 100644
index 00000000..12ee34d1
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-d53d7d76.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-e00c1ff8.tgz b/vendor/mdbase-dev-sdk-dev-e00c1ff8.tgz
new file mode 100644
index 00000000..d4ef93b8
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-e00c1ff8.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-e4450c26.tgz b/vendor/mdbase-dev-sdk-dev-e4450c26.tgz
new file mode 100644
index 00000000..c47979b3
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-e4450c26.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-f1aa67e3.tgz b/vendor/mdbase-dev-sdk-dev-f1aa67e3.tgz
new file mode 100644
index 00000000..895da223
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-f1aa67e3.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-fb3308a8.tgz b/vendor/mdbase-dev-sdk-dev-fb3308a8.tgz
new file mode 100644
index 00000000..aad7a912
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-fb3308a8.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-fb9691b0.tgz b/vendor/mdbase-dev-sdk-dev-fb9691b0.tgz
new file mode 100644
index 00000000..dacb2b1e
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-fb9691b0.tgz differ
diff --git a/vendor/mdbase-dev-sdk-dev-fd0c4a67.tgz b/vendor/mdbase-dev-sdk-dev-fd0c4a67.tgz
new file mode 100644
index 00000000..ff885a31
Binary files /dev/null and b/vendor/mdbase-dev-sdk-dev-fd0c4a67.tgz differ
diff --git a/vendor/mdbase-dev-ui-dev-9553ad66.tgz b/vendor/mdbase-dev-ui-dev-9553ad66.tgz
new file mode 100644
index 00000000..e34254e2
Binary files /dev/null and b/vendor/mdbase-dev-ui-dev-9553ad66.tgz differ
diff --git a/vendor/mdbase-next-sdk.json b/vendor/mdbase-next-sdk.json
new file mode 100644
index 00000000..1f92acfd
--- /dev/null
+++ b/vendor/mdbase-next-sdk.json
@@ -0,0 +1,55 @@
+{
+  "package": "@mdbase-dev/sdk",
+  "version": "0.0.0",
+  "artifact": "mdbase-dev-sdk-dev-9a033b25.tgz",
+  "cutIdentity": "sdk-dev-9a033b25",
+  "sourceCommit": "9a033b252860ec8624da0abb5ffdecbac56332d2",
+  "sha256": "90ef67523dfa11cb36efe0d996475f1a1c82ac71074e4cd4e95c6fbe02c18be9",
+  "integrity": "sha512-Th4bgqvvgDPQQ7hkEwyo6ZG2SFQ7L7J6qdeaoTVjsOTyop2vmEmuUpMZ/EkUPZA0Fo0oq6wbOcsRk+en5vQEOQ==",
+  "bytes": 4420118,
+  "qualification": "dev intake, not release-qualified",
+  "bundledOriginalDependencies": [
+    {
+      "name": "@mdbase-dev/connect-protocol",
+      "file": "vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-c280cd194ffd.tgz",
+      "bytes": 107322,
+      "sha256": "cd1e15236ab7e25c511a4ba13af6a9df23f4b41715161479bba97b0445e1c138",
+      "sri": "sha512-c0iOOWEcNJRstdyUJ6aqJ3puVR5C9jXW4MBHmQnHI2c4vgOeKi5VWfiuueWx3ArvtwB3nPuAaXHhll/OKH/+Yw=="
+    }
+  ],
+  "vendorWarnings": [],
+  "includesPublicEntryAndFixture": true,
+  "includesLiveSingletonAndSelection": true,
+  "includesViteNativeAssetEmissionFix": true,
+  "includesPublicContractRecords": true,
+  "includesAtomicContractBodyAndPromotion": true,
+  "includesExplicitMemoryContractDigests": true,
+  "coldNpmEmptyRootCacheProducerCheckPassed": true,
+  "nativeContractOperationsQualified": false,
+  "protocol": {
+    "artifact": "apps/writer/vendor/mdbase-dev-connect-protocol-0.1.0-beta.129-d765e675c3da.tgz",
+    "sourceCommit": "d765e675c3da29fe1693deab53c4c2a922bb86f1",
+    "sha256": "2769616d8ba1a9cbb3dd689fa1ca0b1e2b42e5442634635f2cd4a87f5ec9020f",
+    "integrity": "sha512-PFG1qmAzmcyJjmZLmGz4eoOOZRDgvTvDZATf6IGBccNHRc1eGZtMm7ZUA7gNAxuO5KerrN6mDIB9qQnpojyOAg=="
+  },
+  "includesSessionFix808": true,
+  "includesRecordLeases809": true,
+  "includesMemoryDocumentCreate811": true,
+  "includesReadHelpers814": true,
+  "includesEnvironment816": true,
+  "includesSharedNativeFactory819": true,
+  "includesProviderReceipt827": true,
+  "includesProblemDetail832": true,
+  "includesCallerSignalRootFix837": true,
+  "sourceOnly": false,
+  "native": {
+    "available": true,
+    "sourceCommit": "a4331ad466a0d16e87ab3bedeb0963a1e0d1867e",
+    "bytes": 3655948,
+    "sha256": "3c803e83f81a05855f6e30ca79036d6b19383048a6b11ba5c9a0b5ebf3a1bbe2",
+    "resourcesExportPresent": true
+  },
+  "nativeFilesProducerQualified": false,
+  "peopleProducerCompatibilityQualified": false,
+  "perAppRuntimeTrustOriginAndOperationsQualified": false
+}
diff --git a/vendor/mdbase-ui-dev.json b/vendor/mdbase-ui-dev.json
new file mode 100644
index 00000000..9124bd70
--- /dev/null
+++ b/vendor/mdbase-ui-dev.json
@@ -0,0 +1,14 @@
+{
+  "package": "@mdbase-dev/ui",
+  "version": "0.1.0-beta.129",
+  "artifact": "mdbase-dev-ui-dev-9553ad66.tgz",
+  "cutIdentity": "ui-dev-9553ad66",
+  "sourceCommit": "9553ad660d0c05e035f3ca53b67cd799d3ece1d5",
+  "mergedAs": null,
+  "label": "dev intake, not release-qualified",
+  "sha256": "5e388db28365cf6a966017851ece1c32223ea8b55bc6015d2f1b4113d86a3206",
+  "integrity": "sha512-PqMWvJ2ZbNaLxWTum2m7vmcCbOGdM5qldnphPwqyGBo/mcpvjfk5tHkil/vXLc+LuG7HEyZOLh+tZyUXtMv7QQ==",
+  "bytes": 85693,
+  "releaseQualified": false,
+  "repository": "mdbase-dev/mdbase-connect"
+}