@inkandswitch/patchwork 0.3.3 → 0.5.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @inkandswitch/patchwork
 
+## 0.5.0
+
+### Minor Changes
+
+- 98be594: Collapse `siteName`, `title`, and `setup({name})` into a single `title`.
+
+  A site's name was three options across two files: `siteName` and `title` in the vite config, `name` at `setup`. They fed the same handful of strings and could disagree with each other.
+
+  `title` is now the only one. It names the html `<title>`, `apple-mobile-web-app-title`, and the manifest's `name`/`short_name` as before, and is also emitted as the `__SITE_TITLE__` define, which supplies the brand word the router appends to the document title as `"<doc> | <title>"`. It defaults to `"Patchwork"`.
+
+  - `siteName` and the `__SITE_NAME__` define are removed. If you used `siteName` only for display, rename it to `title`; if you relied on it to namespace storage, see `storagePrefix`.
+  - `setup({name})` is now `setup({title})`, and is only needed to override the build-time value.
+
+- 98be594: Namespace IndexedDB and peer ids with a new build-time `storagePrefix` option.
+
+  The tab and the shared automerge worker are separate bundles that must open the same databases. Both now read the name from one place, `@inkandswitch/patchwork-bootloader/storage`, resolved from the `__STORAGE_PREFIX__` define the vite plugin emits unconditionally.
+
+  Previously each side resolved `__SITE_NAME__` itself with a different fallback — `"patchwork.inkandswitch.com"` in the worker, `"patchwork"` in the tab — so a site that never set `siteName` had its tab and worker on two different keyhive databases, and one that passed `setup({name})` split them the same way, since a runtime option never reaches the worker.
+
+  - `storagePrefix` defaults to `"patchwork"` and is settable only in the build config. Sites sharing an origin must use distinct prefixes. It is deliberately not derived from any display name: changing it points a site at empty storage, so a rebrand must not be able to change it by accident.
+  - Sites that relied on `siteName` to namespace their storage must now set `storagePrefix` explicitly to that same value to keep their existing databases.
+  - `createRepo` in `@inkandswitch/patchwork` no longer takes a site name argument.
+
+### Patch Changes
+
+- Updated dependencies [98be594]
+  - @inkandswitch/patchwork-bootloader@0.6.0
+
+## 0.4.0
+
+### Minor Changes
+
+- 776b9bb: Boot no longer waits on datatypes it doesn't own. `resolveAccountHandle` writes
+  the account doc directly instead of blocking on `loadWhenReady("account")`, and
+  `createDefaultAccount` builds the root folder, module-settings and anonymous
+  contact subdocs itself rather than waiting for the `folder`,
+  `patchwork:module-settings` and `contact` datatypes. A package bundle that never
+  registers those no longer hangs setup until its timeout.
+
+  `AccountDoc.frameToolId` is now optional. `createDefaultAccount` still writes
+  `"threepane"`, and the router falls back to the first registered `frame-tool`
+  when an account has none.
+
+### Patch Changes
+
+- Updated dependencies [776b9bb]
+  - @inkandswitch/patchwork-plugins@1.2.0
+
 ## 0.3.3
 
 ### Patch Changes

package/dist/client.d.ts

@@ -12,7 +12,8 @@ import "@inkandswitch/patchwork-elements";
 import "@inkandswitch/patchwork-providers";
 
 declare global {
-  const __SITE_NAME__: string;
+  const __SITE_TITLE__: string;
+  const __STORAGE_PREFIX__: string;
 
   interface ImportMetaEnv {
     /**

package/dist/createAccount.d.ts

@@ -1,2 +1,2 @@
-import { type AccountCreator, type AccountDoc } from "@inkandswitch/patchwork-plugins";
+import type { AccountCreator, AccountDoc } from "@inkandswitch/patchwork-plugins";
 export declare const createDefaultAccount: AccountCreator<AccountDoc>;

package/dist/createAccount.js

@@ -1,18 +1,28 @@
-import { createDocOfDatatype2, getRegistry, } from "@inkandswitch/patchwork-plugins";
+async function createSubdoc(repo, type, init) {
+    const handle = await repo.create2();
+    handle.change((doc) => {
+        doc["@patchwork"] = { type };
+        init(doc);
+    });
+    return handle;
+}
 export const createDefaultAccount = async (accountHandle, repo) => {
-    const fields = [
-        ["rootFolderUrl", "folder"],
-        ["moduleSettingsUrl", "patchwork:module-settings"],
-        ["contactUrl", "contact"],
-    ];
-    const registry = getRegistry("patchwork:datatype");
-    const subdocs = await Promise.all(fields.map(async ([field, datatypeId]) => {
-        const datatype = await registry.loadWhenReady(datatypeId);
-        const handle = await createDocOfDatatype2(datatype, repo);
-        return [field, handle.url];
-    }));
+    const [rootFolder, moduleSettings, contact] = await Promise.all([
+        createSubdoc(repo, "folder", (doc) => {
+            doc.title = "New Folder";
+            doc.docs = [];
+        }),
+        createSubdoc(repo, "patchwork:module-settings", (doc) => {
+            doc.modules = [];
+        }),
+        createSubdoc(repo, "contact", (doc) => {
+            doc.type = "anonymous";
+        }),
+    ]);
     accountHandle.change((doc) => {
-        for (const [field, url] of subdocs)
-            doc[field] = url;
+        doc.frameToolId = "threepane";
+        doc.rootFolderUrl = rootFolder.url;
+        doc.moduleSettingsUrl = moduleSettings.url;
+        doc.contactUrl = contact.url;
     });
 };

package/dist/index.js

@@ -53,8 +53,8 @@ export function setup(options = {}) {
 }
 export default setup;
 async function doSetup(options) {
-    const siteName = options.name ??
-        (typeof __SITE_NAME__ !== "undefined" ? __SITE_NAME__ : "patchwork");
+    const siteTitle = options.title ??
+        (typeof __SITE_TITLE__ !== "undefined" ? __SITE_TITLE__ : "Patchwork");
     const moduleSources = resolveDefaultModules(options);
     const routing = options.routing ?? "hash";
     log("booting", options);
@@ -85,7 +85,7 @@ async function doSetup(options) {
             }
         });
         let workerAdapter = new MessageChannelNetworkAdapter(workerPort);
-        ({ repo, hive, signerIdentity } = await createRepo(siteName, workerAdapter));
+        ({ repo, hive, signerIdentity } = await createRepo(workerAdapter));
         // The worker was recreated with cold state: wire the repo onto the fresh
         // port and drop the adapter stranded on the dead one.
         const bootHive = hive;
@@ -154,7 +154,7 @@ async function doSetup(options) {
             rootElement,
             repo,
             accountDocHandle,
-            siteName,
+            siteTitle,
         });
     }
     installReveal(rootElement, router, toolsLoaded);

package/dist/repo.d.ts

@@ -3,7 +3,7 @@ import { type AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import setupServiceWorker from "@inkandswitch/patchwork-bootloader";
 import type { SignerIdentity } from "./types.js";
 export declare function initWasm(): Promise<void>;
-export declare function createRepo(siteName: string, workerAdapter: MessageChannelNetworkAdapter): Promise<{
+export declare function createRepo(workerAdapter: MessageChannelNetworkAdapter): Promise<{
     repo: Repo;
     hive?: AutomergeRepoKeyhive;
     signerIdentity?: SignerIdentity;

package/dist/repo.js

@@ -5,6 +5,7 @@ import { initKeyhiveWasm, initializeAutomergeRepoKeyhiveWithRepo, } from "@autom
 // @ts-ignore — initSync is a wasm-bindgen runtime helper not in the .d.ts
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
 import { MemorySigner } from "@automerge/automerge-subduction/slim";
+import { keyhiveStorageName, storagePrefix, } from "@inkandswitch/patchwork-bootloader/storage";
 import debug from "debug";
 const log = debug("patchwork:setup:repo");
 const syncServer = typeof __SYNC_SERVER__ !== "undefined"
@@ -27,14 +28,14 @@ export function initWasm() {
     }
     return wasmReady;
 }
-export async function createRepo(siteName, workerAdapter) {
+export async function createRepo(workerAdapter) {
     if (syncServer.keyhive) {
         log("setting up keyhive");
         initKeyhiveWasm();
         const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
             createRepo: (repoConfig) => new Repo(repoConfig),
-            storage: new IndexedDBWorkerStorageAdapter(`${siteName}-keyhive`),
-            peerIdSuffix: siteName + Math.random().toString(36).slice(2),
+            storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
+            peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
             networkAdapter: workerAdapter,
             automaticArchiveIngestion: true,
             cachingMode: "periodic",
@@ -61,7 +62,7 @@ export async function createRepo(siteName, workerAdapter) {
             return peerId.includes("automerge-worker");
         },
         enableRemoteHeadsGossiping: true,
-        peerId: `${siteName}-tab-${crypto.randomUUID()}`,
+        peerId: `${storagePrefix}-tab-${crypto.randomUUID()}`,
     });
     const signerIdentity = {
         peerId: signer.peerId().toString(),

package/dist/router.d.ts

@@ -9,10 +9,10 @@ export interface RouterParams {
     rootElement: HTMLElement;
     repo: Repo;
     accountDocHandle: DocHandle<AccountDoc>;
-    siteName: string;
+    siteTitle: string;
 }
 export interface Router {
     /** Apply `location.hash` to the view. */
     route(): Promise<void>;
 }
-export declare function createRouter({ rootElement, repo, accountDocHandle, siteName, }: RouterParams): Router;
+export declare function createRouter({ rootElement, repo, accountDocHandle, siteTitle, }: RouterParams): Router;

package/dist/router.js

@@ -1,4 +1,4 @@
-import { isValidAutomergeUrl, isValidDocumentId, stringifyAutomergeUrl, } from "@automerge/vanillajs/slim";
+import { isValidAutomergeUrl, isValidDocumentId, parseAutomergeUrl, stringifyAutomergeUrl, } from "@automerge/vanillajs/slim";
 import { openDocument } from "@inkandswitch/patchwork-elements";
 import { getRegistry, } from "@inkandswitch/patchwork-plugins";
 // Legacy big-patchwork hash shape: `<slug>--<documentId>[?…]`. The slug can
@@ -6,12 +6,12 @@ import { getRegistry, } from "@inkandswitch/patchwork-plugins";
 // anchor on the `--` before the base58 document id rather than a strict slug
 // charset.
 const BIG_PATCHWORK_HASH_REGEX = /^(?<title>[^=&?/#]*)--(?<docId>[1-9A-HJ-NP-Za-km-z]+)/;
-// The `doc=` value is an automerge URL, kept literal rather than
+// The `doc=` and `draft=` values are automerge URLs, kept literal rather than
 // percent-encoded so links stay readable.
-const RAW_HASH_KEYS = new Set(["doc"]);
+const RAW_HASH_KEYS = new Set(["doc", "draft"]);
 // A stable order means re-serializing the same logical params is
 // byte-identical, avoiding spurious `hashchange` round-trips.
-const HASH_KEY_ORDER = ["doc", "tool", "type", "title", "frame"];
+const HASH_KEY_ORDER = ["doc", "tool", "type", "title", "frame", "draft"];
 function serializeHashParams(params) {
     const keys = [...HASH_KEY_ORDER, ...params.keys()];
     const parts = [];
@@ -42,14 +42,24 @@ export function docParamToUrl(docParam) {
         return undefined;
     return stringifyAutomergeUrl({ documentId: documentId });
 }
-export function createRouter({ rootElement, repo, accountDocHandle, siteName, }) {
+function registeredFrameToolId() {
+    return getRegistry("patchwork:tool")
+        .filter((tool) => !!tool.tags?.includes("frame-tool") && !tool.unlisted)
+        .at(0)?.id;
+}
+export function createRouter({ rootElement, repo, accountDocHandle, siteTitle, }) {
     const route = async () => {
         // The first call seeds the root view's tool/doc so it can mount; later
         // calls reconcile the mounted view with the hash.
         if (!rootElement.hasAttribute("tool-id")) {
             const params = new URLSearchParams(location.hash.slice(1));
             const frame = params.get("frame");
-            rootElement.setAttribute("tool-id", frame ?? accountDocHandle.doc().frameToolId);
+            const toolId = frame ?? accountDocHandle.doc().frameToolId ?? registeredFrameToolId();
+            if (!toolId) {
+                console.error("patchwork: no frame tool registered, nothing to mount");
+                return;
+            }
+            rootElement.setAttribute("tool-id", toolId);
             rootElement.setAttribute("doc-url", (frame && docParamToUrl(params.get("doc"))) || accountDocHandle.url);
             return;
         }
@@ -97,6 +107,14 @@ export function createRouter({ rootElement, repo, accountDocHandle, siteName, })
         // `doc` is the full automerge URL, so heads live inside it and the separate
         // `heads=` param is gone.
         params.delete("heads");
+        // `draft` is doc-scoped (owned by the drafts plugin, opaque here):
+        // navigating to a different document invalidates the selection, while
+        // same-doc navigation (tool switches, heads changes) keeps it.
+        const prevDoc = docParamToUrl(params.get("doc"));
+        if (prevDoc &&
+            parseAutomergeUrl(prevDoc).documentId !== parseAutomergeUrl(url).documentId) {
+            params.delete("draft");
+        }
         params.set("doc", url);
         for (const [key, value] of [
             ["tool", toolId],
@@ -120,7 +138,7 @@ export function createRouter({ rootElement, repo, accountDocHandle, siteName, })
                 return;
             const docTitle = datatype.module.getTitle(doc);
             if (docTitle)
-                document.title = `${docTitle} | ${siteName}`;
+                document.title = `${docTitle} | ${siteTitle}`;
         }
         catch (e) {
             console.error("Failed to update document title", e);

package/dist/site-kit/html.d.ts

@@ -1,4 +1,4 @@
-import type { PatchworkSiteOptions } from "./options.js";
+import { type PatchworkSiteOptions } from "./options.js";
 export declare function escapeHtml(value: string): string;
 /** Builds the generated index.html as a plain string — no bundler involved. */
 export declare function buildHtml(options: PatchworkSiteOptions): string;

package/dist/site-kit/html.js

@@ -1,3 +1,4 @@
+import { DEFAULT_TITLE } from "./options.js";
 import { resolveSyncServers, PRELOAD_WASM_ASSETS } from "./sync-servers.js";
 import { ICON_SPECS } from "./icons.js";
 const HTML_ESCAPES = {
@@ -12,7 +13,7 @@ export function escapeHtml(value) {
 }
 /** Builds the generated index.html as a plain string — no bundler involved. */
 export function buildHtml(options) {
-    const title = options.title ?? options.siteName ?? "Patchwork";
+    const title = options.title ?? DEFAULT_TITLE;
     const lang = (options.html && options.html.lang) || "en";
     const entry = options.entry ?? "/src/main.ts";
     const syncServers = resolveSyncServers(options);

package/dist/site-kit/manifest.d.ts

@@ -1,3 +1,3 @@
-import type { PatchworkSiteOptions } from "./options.js";
+import { type PatchworkSiteOptions } from "./options.js";
 /** Builds the generated manifest.webmanifest object — no bundler involved. */
 export declare function buildManifest(options: PatchworkSiteOptions): Record<string, unknown>;

package/dist/site-kit/manifest.js

@@ -1,7 +1,8 @@
+import { DEFAULT_TITLE } from "./options.js";
 import { ICON_SPECS } from "./icons.js";
 /** Builds the generated manifest.webmanifest object — no bundler involved. */
 export function buildManifest(options) {
-    const title = options.title ?? options.siteName ?? "Patchwork";
+    const title = options.title ?? DEFAULT_TITLE;
     const icons = !options.icons
         ? []
         : ICON_SPECS.filter((spec) => spec.fileName === "apple-touch-icon.png" || spec.manifestPurpose).map((spec) => ({

package/dist/site-kit/options.d.ts

@@ -37,10 +37,23 @@ export type PatchworkSyncServersOptions = {
     /** wss:// URL for the legacy automerge-repo sync-server channel (connected on demand via connectClassicSync). Default: wss://sync3.automerge.org. Pass false to skip its preconnect hint. */
     classic?: string | false;
 } & PatchworkPrimarySyncServerOptions;
+export declare const DEFAULT_TITLE = "Patchwork";
 export interface PatchworkSiteOptions {
-    /** -> __SITE_NAME__ define */
-    siteName?: string;
-    /** <title>, apple-mobile-web-app-title, manifest name */
+    /**
+     * Namespace for this site's IndexedDB databases and peer ids
+     * (-> __STORAGE_PREFIX__ define). Defaults to `"patchwork"`. Sites sharing
+     * an origin MUST use distinct prefixes.
+     *
+     * The tab and the shared automerge worker are separate bundles that have to
+     * open the same databases, so this is settable only here, where both of them
+     * receive it. Changing it on an existing site points it at empty storage.
+     */
+    storagePrefix?: string;
+    /**
+     * This site's name: `<title>`, apple-mobile-web-app-title, manifest name,
+     * and — via the __SITE_TITLE__ define — the brand word the router appends to
+     * the document title as `"<doc> | <title>"`. Defaults to `"Patchwork"`.
+     */
     title?: string;
     /** manifest short_name (defaults to title) */
     shortName?: string;

package/dist/site-kit/options.js

@@ -1 +1 @@
-export {};
+export const DEFAULT_TITLE = "Patchwork";

package/dist/types.d.ts

@@ -47,13 +47,14 @@ export interface PatchworkOptions {
     accountKey?: string;
     createAccount?: AccountCreator;
     /**
-     * Brand word for this site: appended to the document title as
-     * `"<doc> | <name>"` when a document is open (the separator is provided
-     * for you), and used to namespace this site's storage and peer ids.
+     * This site's name, appended to the document title as `"<doc> | <title>"`
+     * when a document is open (the separator is provided for you).
      *
-     * Defaults to the build-time `__SITE_NAME__` define, then `"patchwork"`.
+     * Defaults to the build-time `__SITE_TITLE__` define — the vite plugin's
+     * `title` option, which also names the html `<title>` and the manifest —
+     * then `"Patchwork"`.
      */
-    name?: string;
+    title?: string;
     /** DOM id of the `<patchwork-view>` hosting the root tool. Defaults to "root". */
     rootElementId?: string;
     /**

package/dist/vite/config-plugin.d.ts

@@ -2,7 +2,8 @@ import type { Plugin } from "vite";
 import wasm from "vite-plugin-wasm";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /**
- * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
+ * Owns envPrefix, define (__SITE_TITLE__/__STORAGE_PREFIX__/sync-server
+ * configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off

package/dist/vite/config-plugin.js

@@ -1,8 +1,11 @@
 import wasm from "vite-plugin-wasm";
+import { DEFAULT_STORAGE_PREFIX } from "@inkandswitch/patchwork-bootloader/storage";
+import { DEFAULT_TITLE } from "../site-kit/options.js";
 import { DEFAULT_SYNC_SERVERS, resolvePrimarySyncServer, } from "../site-kit/sync-servers.js";
 const CORS_HEADERS = { "Access-Control-Allow-Origin": "*" };
 /**
- * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
+ * Owns envPrefix, define (__SITE_TITLE__/__STORAGE_PREFIX__/sync-server
+ * configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off
@@ -16,13 +19,14 @@ export function configPlugin(options = {}) {
             const classicSyncServer = options.syncServers && typeof options.syncServers.classic === "string"
                 ? options.syncServers.classic
                 : DEFAULT_SYNC_SERVERS.classic;
+            // __STORAGE_PREFIX__ is defined unconditionally: the tab and the shared
+            // automerge worker resolve it separately, and only a define reaches both.
             const define = {
                 __SYNC_SERVER__: JSON.stringify(primarySyncServer),
                 __CLASSIC_SYNC_SERVER__: JSON.stringify(classicSyncServer),
+                __SITE_TITLE__: JSON.stringify(options.title ?? DEFAULT_TITLE),
+                __STORAGE_PREFIX__: JSON.stringify(options.storagePrefix ?? DEFAULT_STORAGE_PREFIX),
             };
-            if (options.siteName) {
-                define.__SITE_NAME__ = JSON.stringify(options.siteName);
-            }
             return {
                 envPrefix: ["VITE_", "PATCHWORK_"],
                 define,

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/patchwork"
   },
-  "version": "0.3.3",
+  "version": "0.5.0",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -42,10 +42,10 @@
     "debug": "^4.4.3",
     "sharp": "^0.35.3",
     "vite-plugin-wasm": "^3.6.0",
-    "@inkandswitch/patchwork-bootloader": "^0.5.4",
     "@inkandswitch/patchwork-elements": "^6.0.0",
+    "@inkandswitch/patchwork-plugins": "^1.2.0",
+    "@inkandswitch/patchwork-bootloader": "^0.6.0",
     "@inkandswitch/patchwork-filesystem": "^0.2.5",
-    "@inkandswitch/patchwork-plugins": "^1.1.0",
     "@inkandswitch/patchwork-providers": "^0.5.0"
   },
   "devDependencies": {

package/src/client.d.ts

@@ -12,7 +12,8 @@ import "@inkandswitch/patchwork-elements";
 import "@inkandswitch/patchwork-providers";
 
 declare global {
-  const __SITE_NAME__: string;
+  const __SITE_TITLE__: string;
+  const __STORAGE_PREFIX__: string;
 
   interface ImportMetaEnv {
     /**

package/src/createAccount.ts

@@ -1,31 +1,48 @@
-import {
-  type AccountCreator,
-  type AccountDoc,
-  type DatatypeDescription,
-  createDocOfDatatype2,
-  getRegistry,
+import type { Repo } from "@automerge/automerge-repo/slim";
+import type {
+  AccountCreator,
+  AccountDoc,
 } from "@inkandswitch/patchwork-plugins";
+import type { HasPatchworkMetadata } from "@inkandswitch/patchwork-filesystem";
+
+async function createSubdoc<D>(
+  repo: Repo,
+  type: string,
+  init: (doc: D) => void
+) {
+  const handle = await repo.create2<D & HasPatchworkMetadata>();
+  handle.change((doc: D & HasPatchworkMetadata) => {
+    doc["@patchwork"] = { type };
+    init(doc);
+  });
+  return handle;
+}
 
 export const createDefaultAccount: AccountCreator<AccountDoc> = async (
   accountHandle,
   repo
 ) => {
-  const fields = [
-    ["rootFolderUrl", "folder"],
-    ["moduleSettingsUrl", "patchwork:module-settings"],
-    ["contactUrl", "contact"],
-  ] as const;
-  const registry = getRegistry<DatatypeDescription>("patchwork:datatype");
-
-  const subdocs = await Promise.all(
-    fields.map(async ([field, datatypeId]) => {
-      const datatype = await registry.loadWhenReady(datatypeId);
-      const handle = await createDocOfDatatype2(datatype, repo);
-      return [field, handle.url] as const;
-    })
-  );
+  const [rootFolder, moduleSettings, contact] = await Promise.all([
+    createSubdoc<{ title: string; docs: unknown[] }>(repo, "folder", (doc) => {
+      doc.title = "New Folder";
+      doc.docs = [];
+    }),
+    createSubdoc<{ modules: string[] }>(
+      repo,
+      "patchwork:module-settings",
+      (doc) => {
+        doc.modules = [];
+      }
+    ),
+    createSubdoc<{ type: string }>(repo, "contact", (doc) => {
+      doc.type = "anonymous";
+    }),
+  ]);
 
   accountHandle.change((doc) => {
-    for (const [field, url] of subdocs) doc[field] = url;
+    doc.frameToolId = "threepane";
+    doc.rootFolderUrl = rootFolder.url;
+    doc.moduleSettingsUrl = moduleSettings.url;
+    doc.contactUrl = contact.url;
   });
 };

package/src/index.ts

@@ -64,7 +64,7 @@ import { createDefaultAccount } from "./createAccount.js";
 
 const log = debug("patchwork:setup");
 
-declare const __SITE_NAME__: string;
+declare const __SITE_TITLE__: string;
 
 declare global {
   interface Window {
@@ -114,9 +114,9 @@ export function setup(options: PatchworkOptions = {}): Promise<Patchwork> {
 export default setup;
 
 async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
-  const siteName =
-    options.name ??
-    (typeof __SITE_NAME__ !== "undefined" ? __SITE_NAME__ : "patchwork");
+  const siteTitle =
+    options.title ??
+    (typeof __SITE_TITLE__ !== "undefined" ? __SITE_TITLE__ : "Patchwork");
   const moduleSources = resolveDefaultModules(options);
   const routing = options.routing ?? "hash";
 
@@ -151,10 +151,7 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
     });
 
     let workerAdapter = new MessageChannelNetworkAdapter(workerPort);
-    ({ repo, hive, signerIdentity } = await createRepo(
-      siteName,
-      workerAdapter
-    ));
+    ({ repo, hive, signerIdentity } = await createRepo(workerAdapter));
 
     // The worker was recreated with cold state: wire the repo onto the fresh
     // port and drop the adapter stranded on the dead one.
@@ -246,7 +243,7 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
       rootElement,
       repo,
       accountDocHandle,
-      siteName,
+      siteTitle,
     });
   }
 

package/src/repo.ts

@@ -17,6 +17,10 @@ import {
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
 import { MemorySigner } from "@automerge/automerge-subduction/slim";
 import setupServiceWorker from "@inkandswitch/patchwork-bootloader";
+import {
+  keyhiveStorageName,
+  storagePrefix,
+} from "@inkandswitch/patchwork-bootloader/storage";
 import type { SignerIdentity } from "./types.js";
 import debug from "debug";
 
@@ -50,7 +54,6 @@ export function initWasm(): Promise<void> {
 }
 
 export async function createRepo(
-  siteName: string,
   workerAdapter: MessageChannelNetworkAdapter
 ): Promise<{
   repo: Repo;
@@ -62,8 +65,8 @@ export async function createRepo(
     initKeyhiveWasm();
     const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
       createRepo: (repoConfig) => new Repo(repoConfig),
-      storage: new IndexedDBWorkerStorageAdapter(`${siteName}-keyhive`),
-      peerIdSuffix: siteName + Math.random().toString(36).slice(2),
+      storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
+      peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
       networkAdapter: workerAdapter,
       automaticArchiveIngestion: true,
       cachingMode: "periodic",
@@ -91,7 +94,8 @@ export async function createRepo(
       return peerId.includes("automerge-worker");
     },
     enableRemoteHeadsGossiping: true,
-    peerId: `${siteName}-tab-${crypto.randomUUID()}` as AutomergeRepo.PeerId,
+    peerId:
+      `${storagePrefix}-tab-${crypto.randomUUID()}` as AutomergeRepo.PeerId,
   });
   const signerIdentity = {
     peerId: signer.peerId().toString(),

package/src/router.ts

@@ -1,6 +1,7 @@
 import {
   isValidAutomergeUrl,
   isValidDocumentId,
+  parseAutomergeUrl,
   stringifyAutomergeUrl,
   type AutomergeUrl,
   type DocHandle,
@@ -12,6 +13,7 @@ import {
   type AccountDoc,
   type DatatypeDescription,
   type DatatypeImplementation,
+  type ToolDescription,
   getRegistry,
 } from "@inkandswitch/patchwork-plugins";
 
@@ -22,12 +24,12 @@ import {
 const BIG_PATCHWORK_HASH_REGEX =
   /^(?<title>[^=&?/#]*)--(?<docId>[1-9A-HJ-NP-Za-km-z]+)/;
 
-// The `doc=` value is an automerge URL, kept literal rather than
+// The `doc=` and `draft=` values are automerge URLs, kept literal rather than
 // percent-encoded so links stay readable.
-const RAW_HASH_KEYS = new Set(["doc"]);
+const RAW_HASH_KEYS = new Set(["doc", "draft"]);
 // A stable order means re-serializing the same logical params is
 // byte-identical, avoiding spurious `hashchange` round-trips.
-const HASH_KEY_ORDER = ["doc", "tool", "type", "title", "frame"];
+const HASH_KEY_ORDER = ["doc", "tool", "type", "title", "frame", "draft"];
 
 function serializeHashParams(params: URLSearchParams): string {
   const keys = [...HASH_KEY_ORDER, ...params.keys()];
@@ -63,7 +65,7 @@ export interface RouterParams {
   rootElement: HTMLElement;
   repo: Repo;
   accountDocHandle: DocHandle<AccountDoc>;
-  siteName: string;
+  siteTitle: string;
 }
 
 export interface Router {
@@ -71,11 +73,17 @@ export interface Router {
   route(): Promise<void>;
 }
 
+function registeredFrameToolId(): string | undefined {
+  return getRegistry<ToolDescription>("patchwork:tool")
+    .filter((tool) => !!tool.tags?.includes("frame-tool") && !tool.unlisted)
+    .at(0)?.id;
+}
+
 export function createRouter({
   rootElement,
   repo,
   accountDocHandle,
-  siteName,
+  siteTitle,
 }: RouterParams): Router {
   const route = async () => {
     // The first call seeds the root view's tool/doc so it can mount; later
@@ -83,10 +91,13 @@ export function createRouter({
     if (!rootElement.hasAttribute("tool-id")) {
       const params = new URLSearchParams(location.hash.slice(1));
       const frame = params.get("frame");
-      rootElement.setAttribute(
-        "tool-id",
-        frame ?? accountDocHandle.doc().frameToolId
-      );
+      const toolId =
+        frame ?? accountDocHandle.doc().frameToolId ?? registeredFrameToolId();
+      if (!toolId) {
+        console.error("patchwork: no frame tool registered, nothing to mount");
+        return;
+      }
+      rootElement.setAttribute("tool-id", toolId);
       rootElement.setAttribute(
         "doc-url",
         (frame && docParamToUrl(params.get("doc"))) || accountDocHandle.url
@@ -156,6 +167,16 @@ export function createRouter({
     // `doc` is the full automerge URL, so heads live inside it and the separate
     // `heads=` param is gone.
     params.delete("heads");
+    // `draft` is doc-scoped (owned by the drafts plugin, opaque here):
+    // navigating to a different document invalidates the selection, while
+    // same-doc navigation (tool switches, heads changes) keeps it.
+    const prevDoc = docParamToUrl(params.get("doc"));
+    if (
+      prevDoc &&
+      parseAutomergeUrl(prevDoc).documentId !== parseAutomergeUrl(url).documentId
+    ) {
+      params.delete("draft");
+    }
     params.set("doc", url);
     for (const [key, value] of [
       ["tool", toolId],
@@ -182,7 +203,7 @@ export function createRouter({
       const docTitle = (datatype.module as DatatypeImplementation).getTitle(
         doc
       );
-      if (docTitle) document.title = `${docTitle} | ${siteName}`;
+      if (docTitle) document.title = `${docTitle} | ${siteTitle}`;
     } catch (e) {
       console.error("Failed to update document title", e);
     }

package/src/site-kit/html.ts

@@ -1,4 +1,4 @@
-import type { PatchworkSiteOptions } from "./options.js";
+import { DEFAULT_TITLE, type PatchworkSiteOptions } from "./options.js";
 import { resolveSyncServers, PRELOAD_WASM_ASSETS } from "./sync-servers.js";
 import { ICON_SPECS } from "./icons.js";
 
@@ -16,7 +16,7 @@ export function escapeHtml(value: string): string {
 
 /** Builds the generated index.html as a plain string — no bundler involved. */
 export function buildHtml(options: PatchworkSiteOptions): string {
-  const title = options.title ?? options.siteName ?? "Patchwork";
+  const title = options.title ?? DEFAULT_TITLE;
   const lang = (options.html && options.html.lang) || "en";
   const entry = options.entry ?? "/src/main.ts";
   const syncServers = resolveSyncServers(options);

package/src/site-kit/manifest.ts

@@ -1,11 +1,11 @@
-import type { PatchworkSiteOptions } from "./options.js";
+import { DEFAULT_TITLE, type PatchworkSiteOptions } from "./options.js";
 import { ICON_SPECS } from "./icons.js";
 
 /** Builds the generated manifest.webmanifest object — no bundler involved. */
 export function buildManifest(
   options: PatchworkSiteOptions
 ): Record<string, unknown> {
-  const title = options.title ?? options.siteName ?? "Patchwork";
+  const title = options.title ?? DEFAULT_TITLE;
   const icons = !options.icons
     ? []
     : ICON_SPECS.filter(

package/src/site-kit/options.ts

@@ -42,10 +42,24 @@ export type PatchworkSyncServersOptions = {
   classic?: string | false;
 } & PatchworkPrimarySyncServerOptions;
 
+export const DEFAULT_TITLE = "Patchwork";
+
 export interface PatchworkSiteOptions {
-  /** -> __SITE_NAME__ define */
-  siteName?: string;
-  /** <title>, apple-mobile-web-app-title, manifest name */
+  /**
+   * Namespace for this site's IndexedDB databases and peer ids
+   * (-> __STORAGE_PREFIX__ define). Defaults to `"patchwork"`. Sites sharing
+   * an origin MUST use distinct prefixes.
+   *
+   * The tab and the shared automerge worker are separate bundles that have to
+   * open the same databases, so this is settable only here, where both of them
+   * receive it. Changing it on an existing site points it at empty storage.
+   */
+  storagePrefix?: string;
+  /**
+   * This site's name: `<title>`, apple-mobile-web-app-title, manifest name,
+   * and — via the __SITE_TITLE__ define — the brand word the router appends to
+   * the document title as `"<doc> | <title>"`. Defaults to `"Patchwork"`.
+   */
   title?: string;
   /** manifest short_name (defaults to title) */
   shortName?: string;

package/src/types.ts

@@ -65,13 +65,14 @@ export interface PatchworkOptions {
   createAccount?: AccountCreator;
 
   /**
-   * Brand word for this site: appended to the document title as
-   * `"<doc> | <name>"` when a document is open (the separator is provided
-   * for you), and used to namespace this site's storage and peer ids.
+   * This site's name, appended to the document title as `"<doc> | <title>"`
+   * when a document is open (the separator is provided for you).
    *
-   * Defaults to the build-time `__SITE_NAME__` define, then `"patchwork"`.
+   * Defaults to the build-time `__SITE_TITLE__` define — the vite plugin's
+   * `title` option, which also names the html `<title>` and the manifest —
+   * then `"Patchwork"`.
    */
-  name?: string;
+  title?: string;
 
   /** DOM id of the `<patchwork-view>` hosting the root tool. Defaults to "root". */
   rootElementId?: string;

package/src/vite/config-plugin.ts

@@ -1,5 +1,7 @@
 import type { Plugin } from "vite";
 import wasm from "vite-plugin-wasm";
+import { DEFAULT_STORAGE_PREFIX } from "@inkandswitch/patchwork-bootloader/storage";
+import { DEFAULT_TITLE } from "../site-kit/options.js";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 import {
   DEFAULT_SYNC_SERVERS,
@@ -9,7 +11,8 @@ import {
 const CORS_HEADERS = { "Access-Control-Allow-Origin": "*" };
 
 /**
- * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
+ * Owns envPrefix, define (__SITE_TITLE__/__STORAGE_PREFIX__/sync-server
+ * configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off
@@ -26,13 +29,16 @@ export function configPlugin(
         options.syncServers && typeof options.syncServers.classic === "string"
           ? options.syncServers.classic
           : DEFAULT_SYNC_SERVERS.classic;
+      // __STORAGE_PREFIX__ is defined unconditionally: the tab and the shared
+      // automerge worker resolve it separately, and only a define reaches both.
       const define: Record<string, string> = {
         __SYNC_SERVER__: JSON.stringify(primarySyncServer),
         __CLASSIC_SYNC_SERVER__: JSON.stringify(classicSyncServer),
+        __SITE_TITLE__: JSON.stringify(options.title ?? DEFAULT_TITLE),
+        __STORAGE_PREFIX__: JSON.stringify(
+          options.storagePrefix ?? DEFAULT_STORAGE_PREFIX
+        ),
       };
-      if (options.siteName) {
-        define.__SITE_NAME__ = JSON.stringify(options.siteName);
-      }
 
       return {
         envPrefix: ["VITE_", "PATCHWORK_"],