@heycys/gallery 0.2.1 → 0.2.3

package/THIRD-PARTY-NOTICES.md

@@ -1,6 +1,6 @@
 # Third-party notices
 
-@heycys/gallery 0.2.1 carries the following code and data of others, bundled into dist/ and web/, built into kit/, or as files in vendor/ and browser/.
+@heycys/gallery 0.2.3 carries the following code and data of others, bundled into dist/ and web/, built into kit/, or as files in vendor/ and browser/.
 
 ## @asamuzakjp/css-color 5.1.11
 

package/browser/editor/page/annotate/index.mjs

@@ -1,3 +1,4 @@
+import { documentKey, workspaceAddress } from "../../../shared/workspace-address.mjs";
 import { CARD, RAIL, cardTops, markerLeft, markerTop, newAnnotationId, sameWords, squash, stackItems, tidy } from "../../../shared/annotations.mjs";
 import { t } from "../../../shared/i18n/index.mjs";
 import { SHARES_HEIGHT, standsAsPicture } from "../../components/registry.mjs";
@@ -106,7 +107,7 @@ const NOTICE_ROOM = 70;
 const IN_ROW = [...SHARES_HEIGHT].map((kind) => `[data-ge-unit-kind="${kind}"] > *`).join();
 
 export function createAnnotate({ slug, token, isEditing, picked, unpick = () => {}, wholePage = () => [], crossTexts, idFor, changed = () => {}, removed = () => {}, say }) {
-  const stashKey = `gallery-edit:${slug}:notes`; // what could not be saved (offline), sent by the next page that reads them
+  const stashKey = `gallery-edit:${documentKey(slug)}:notes`; // what could not be saved (offline), sent by the next page that reads them
   let reading = null; // the first read from the server, under way or done (taken back when it failed)
   let counted = false; // that read is in and what it brought found: the page can say how many it has
   let items = new Map(); // id -> { id, created, updated, text, anchor } in page order, as the server last said, with the page's own changes
@@ -189,7 +190,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     chain = run.catch(() => {});
     return run;
   };
-  const fetchAll = () => fetch(`${ROUTE}?slug=${encodeURIComponent(slug)}`, { headers: { "X-Gallery-Token": token }, cache: "no-store" })
+  const fetchAll = () => fetch(workspaceAddress(`${ROUTE}?slug=${encodeURIComponent(slug)}`), { headers: { "X-Gallery-Token": token }, cache: "no-store" })
     .then((response) => response.json()).catch(() => ({ ok: false, reason: "offline" }));
   const wire = (item) => ({ id: item.id, created: item.created, updated: item.updated, text: item.text, anchor: item.anchor });
 

package/browser/editor/page/board/index.mjs

@@ -1,3 +1,4 @@
+import { workspaceAddress } from "../../../shared/workspace-address.mjs";
 import { GAP, GRID, cellAt, fitHeight, gridFor, moved, pushDown, sizeFor, spanOf } from "../../../shared/board-places.mjs";
 import { cellsOf } from "../../../shared/card-size.mjs";
 import { language, t } from "../../../shared/i18n/index.mjs";
@@ -793,7 +794,7 @@ export function startBoard({ map, reload, hosted = false }) {
     menu.close();
     let listed = [];
     try {
-      listed = (await (await fetch(`/__gallery/pages/${slug}/library?language=${language}`)).json()).blocks ?? [];
+      listed = (await (await fetch(workspaceAddress(`/__gallery/pages/${slug}/library?language=${language}`))).json()).blocks ?? [];
     } catch {
       say(t("连不上本地服务"), "error");
       return false;

package/browser/editor/page/board/settings.mjs

@@ -1,3 +1,4 @@
+import { workspaceAddress } from "../../../shared/workspace-address.mjs";
 import { Z } from "../../../shared/layers.mjs";
 import { language, t } from "../../../shared/i18n/index.mjs";
 import { createMenu } from "../menu.mjs";
@@ -59,7 +60,7 @@ export const formOpen = () => shown !== null;
 /** The workspace's documents, by title: [{ slug, title }] (none where the outline cannot be read). */
 async function documents() {
   try {
-    const answer = await (await fetch("/__gallery/workspace/outline")).json();
+    const answer = await (await fetch(workspaceAddress("/__gallery/workspace/outline"))).json();
     return Object.values(answer.reports ?? {}).filter((report) => !report.instructions && report.kind !== "link").map(({ slug, title }) => ({ slug, title: title || slug }))
       .sort((a, b) => a.title.localeCompare(b.title, "zh-CN"));
   } catch {

package/browser/editor/page/core.mjs

@@ -1,3 +1,4 @@
+import { localPath } from "../../shared/workspace-address.mjs";
 import { escapeAttribute, escapeText, escapeTyped, unescapeText } from "../../shared/escape.mjs";
 import { formatRange, isInkClass, isUnderlineClass, markValue } from "./marks.mjs";
 import { ZWSP, inlineItems, spaceAround } from "../../shared/inline-spacing.mjs";
@@ -294,13 +295,13 @@ export function newMention(doc, { href, title, icon = null, drawn = null }, asse
 export function mentionOf(chip) {
   const img = chip.querySelector(`img.${MENTION_ICON}`);
   const src = img?.getAttribute("data-ge-src") ?? img?.getAttribute("src") ?? "";
-  const served = /^\/__gallery\/edit\/asset\/([^/]+)\/(assets\/[^/?#]+)$/.exec(src);
+  const served = /^\/__gallery\/edit\/asset\/([^/]+)\/(assets\/[^/?#]+)$/.exec(localPath(src));
   return {
     href: chip.getAttribute("href") ?? "",
     title: chip.textContent.replace(/\s+/g, " ").trim(),
     icon: served ? served[2] : /^assets\/[^/]+$/.test(src) ? src : null,
     slug: served ? decodeURIComponent(served[1]) : null,
-    drawn: src.startsWith("/__gallery/edit/icon?") ? src : null,
+    drawn: localPath(src).startsWith("/__gallery/edit/icon?") ? src : null,
   };
 }
 

package/browser/editor/page/custom-page.mjs

@@ -1,3 +1,4 @@
+import { localPath } from "../../shared/workspace-address.mjs";
 import { startBoard } from "./board/index.mjs";
 import { relayTo } from "./notices.mjs";
 import { connectWorkbench } from "./session.mjs";
@@ -21,7 +22,7 @@ import { connectWorkbench } from "./session.mjs";
 // document or another page, or a block's context.workspace.open: doc-open-request) and key. Opened on its own (not in a frame of the workbench), it has no
 // session: its board edits all the same, and the live script reloads it.
 
-const slug = decodeURIComponent(location.pathname.split("/")[2] ?? "");
+const slug = decodeURIComponent(localPath(location.pathname).split("/")[2] ?? "");
 const IDLE = { editing: false, pending: false, saving: false, offline: false, conflicts: 0, unfit: 0, changed: false };
 // Nothing stands over a custom page as a modal.
 const NO_MODALS = { open: () => [], listen() {}, closeTop: () => false };
@@ -94,8 +95,8 @@ if (session) {
       window.open(url.href, "_blank", "noopener");
       return;
     }
-    const custom = /^\/pages\/([a-z0-9-]+)\/?$/.exec(url.pathname)?.[1];
-    const page = /^\/generated\/([a-z0-9-]+)\.html$/.exec(url.pathname)?.[1] ?? /^\/([a-z0-9-]+)\/(?:doc|report)\.html$/.exec(url.pathname)?.[1];
+    const custom = /^\/pages\/([a-z0-9-]+)\/?$/.exec(localPath(url.pathname))?.[1];
+    const page = /^\/generated\/([a-z0-9-]+)\.html$/.exec(localPath(url.pathname))?.[1] ?? /^\/([a-z0-9-]+)\/(?:doc|report)\.html$/.exec(localPath(url.pathname))?.[1];
     if (custom) {
       event.preventDefault();
       session.open({ hash: `@${custom}` });

package/browser/editor/page/editor.mjs

@@ -1,7 +1,9 @@
+import { documentKey, workspaceStoragePrefix } from "../../shared/workspace-address.mjs";
+import { workspaceAddress } from "../../shared/workspace-address.mjs";
 // First: what the browser keeps under the names before 2026-10-28 carried to the new ones (the
 // editor's gallery-edit:… keys, src/shared/renamed-storage.mjs), before any module below reads them.
 import "../../shared/renamed-storage.mjs";
-import { OUTER, can, captureLayout, editableAhead, firstHost, isHost, limitText, markFrames, markKinds, matchesSource, newHost, newMention, ownHTML, plainText, prepareBlock, splitBlock, textEnd, tidyEmptied, unitElement, withLeads } from "./core.mjs";
+import { OUTER, can, captureLayout, editableAhead, firstByAttribute, firstHost, isHost, limitText, markFrames, markKinds, matchesSource, newHost, newMention, ownHTML, plainText, prepareBlock, splitBlock, textEnd, tidyEmptied, unitElement, withLeads } from "./core.mjs";
 import { createBlocks } from "./blocks.mjs";
 import { hiddenByFold, reveal } from "./folded.mjs";
 import { createFlags } from "./flags.mjs";
@@ -61,7 +63,7 @@ import { decoded, fullAddress, isFileLink } from "../../shared/page-address.mjs"
 import { goBackTo, placeIn, unmoved } from "../../shared/reading-place.mjs";
 import { heldList, holdPages } from "./links/pages.mjs";
 import { hideBlocks } from "./offered.mjs";
-import { local, storageOf } from "./storage.mjs";
+import { storageOf } from "./storage.mjs";
 import { createTodoWrites } from "./todo-writes.mjs";
 import { language, t } from "../../shared/i18n/index.mjs";
 
@@ -131,7 +133,9 @@ let conflicts = null; // what the file refused, for the reader to decide (confli
 let unsaveable = { blank: 0, unplaced: 0 }; // blocks the page cannot save as they are
 let notice = null; // { text, time }: what a commit just said, to say again if the page reloads by itself
 
-const session = storageOf(() => sessionStorage);
+const storageScope = { prefix: workspaceStoragePrefix() };
+const local = storageOf(() => localStorage, storageScope);
+const session = storageOf(() => sessionStorage, storageScope);
 
 // This tab, kept over reloads (sessionStorage). Each tab keeps what waits to be saved (the crash
 // buffer, autosave.mjs) under its own id, so two tabs of a report never overwrite each other's; the
@@ -140,7 +144,7 @@ const session = storageOf(() => sessionStorage);
 const newTab = () => Math.random().toString(36).slice(2, 10);
 let TAB = session.get(keys.tab) ?? newTab();
 session.set(keys.tab, TAB);
-const channel = (() => { try { return new BroadcastChannel(`gallery-edit:${MAP.slug}`); } catch { return null; } })();
+const channel = (() => { try { return new BroadcastChannel(`gallery-edit:${documentKey(MAP.slug)}`); } catch { return null; } })();
 channel?.addEventListener("message", (event) => {
   if (event.data?.type === "who") channel.postMessage({ type: "here", tab: TAB });
 });
@@ -397,10 +401,12 @@ function enter() {
   if (editing) return;
   // Two passes: every block made editable (or not) as the page was served, then every block rebuilt
   // (core.mjs editableAhead: a contenteditable set after blocks were rebuilt lays the page out again).
+  // Resolve the initial hosts in one scan; a query for each block repeatedly walks a long page.
+  const marked = firstByAttribute(document, "data-ge-block");
   const nodes = new Map();
   for (const block of MAP.blocks) {
     if (HOSTS[block.kind]?.closed) continue;
-    const node = document.querySelector(`[data-ge-block="${block.id}"]`);
+    const node = marked.get(String(block.id));
     if (!node) continue;
     if (HOSTS[block.kind]?.tex) node.setAttribute("contenteditable", "true"); // a display formula (components/math/)
     else if (!matchesSource(node, block.inner)) {
@@ -1411,7 +1417,7 @@ async function goTo({ slug = null, block = null, hash = null }, href) {
     if (block) jumpTo(block);
   } else if (SOLO) window.open(href, "_blank", "noopener");
   else if (window.parent !== window) workbench?.open(hash === null ? { target: slug, block } : { hash });
-  else if (hash === null || (await leadsToPage(hash))) COMMANDS["prepare-close"]().then(() => location.assign(hash === null ? `/generated/${slug}.html${block ? `#${encodeURIComponent(block)}` : ""}` : href));
+  else if (hash === null || (await leadsToPage(hash))) COMMANDS["prepare-close"]().then(() => location.assign(hash === null ? workspaceAddress( `/generated/${slug}.html${block ? `#${encodeURIComponent(block)}` : ""}` ) : href));
 }
 
 function connectParts() {
@@ -1500,7 +1506,7 @@ function connect() {
     event.preventDefault();
     if (page) {
       if (window.parent !== window && !SOLO) workbench?.open({ hash: `@${page}` });
-      else COMMANDS["prepare-close"]().then(() => location.assign(`/pages/${page}`));
+      else COMMANDS["prepare-close"]().then(() => location.assign(workspaceAddress(`/pages/${page}`)));
     } else goTo({ slug, block }, `/generated/${slug}.html${block ? `#${encodeURIComponent(block)}` : ""}`);
   });
   relayTo(workbench ? workbench.notice : null, workbench ? workbench.noticeRoom : null); // the workbench shows the page's notices, above the page's bottom panels

package/browser/editor/page/emoji-picker/support.mjs

@@ -1,3 +1,4 @@
+import { workspaceAddress } from "../../../shared/workspace-address.mjs";
 import { Z } from "../../../shared/layers.mjs";
 import { escapeMarkup } from "../../../shared/escape.mjs";
 import { icon } from "./icons.mjs";
@@ -198,7 +199,7 @@ export function connectPicker({ slug, token, notify }) {
   server = { slug, token };
   say = notify;
   setEmojiLibraryStorage({
-    loadEmojiLibrary: () => fetch(`/__gallery/edit/emoji-library`).then((response) => response.json()).then((answer) => answer.list ?? []).catch(() => []),
-    addEmoji: async ({ name, url }) => (await post("emoji-library", { name, url })).entry,
+    loadEmojiLibrary: () => fetch(workspaceAddress(`/__gallery/edit/emoji-library`)).then((response) => response.json()).then((answer) => (answer.list ?? []).map(entry => ({ ...entry, url: workspaceAddress(entry.url) }))).catch(() => []),
+    addEmoji: async ({ name, url }) => { const entry = (await post("emoji-library", { name, url })).entry; return { ...entry, url: workspaceAddress(entry.url) }; },
   });
 }

package/browser/editor/page/links/index.mjs

@@ -752,17 +752,6 @@ function opens(event) {
 // workspace's page of one folder name, opened as any web address. A tab
 // of its own opens with the click, the list read after, for only what the click itself opens does the
 // browser leave behind the page.
-async function followElsewhere(address, tab) {
-  const opened = tab ? window.open("", "_blank") : null;
-  const list = await readPages(use.own());
-  const page = list && placeIn(list, address);
-  const here = page && fullAddress(location.origin, page, list.links);
-  if (opened) {
-    opened.opener = null;
-    opened.location.replace(here ?? address);
-  } else if (page) use.go(page, here);
-  else openTab(address);
-}
 
 // Go where `href`, a link of this page that is no anchor, leads, read as its file reads it, so that
 // doc.html beside it is this document: a document's address there, with `tab` in a tab of its own, a
@@ -771,7 +760,7 @@ async function followElsewhere(address, tab) {
 function follow(href, tab) {
   const address = fromFile(href, use.slug, location.origin);
   if (!address) return;
-  if (elsewhere(address, location.origin)) return void followElsewhere(address, tab);
+  if (elsewhere(address, location.origin)) return void openTab(address);
   const place = placeOf(address);
   const file = referencedFile(href);
   if (place && !tab) use.go(place, address);

package/browser/editor/page/links/pages.mjs

@@ -1,3 +1,4 @@
+import { workspaceAddress } from "../../../shared/workspace-address.mjs";
 import { iconUrl } from "../../../shared/emoji/icon-value.mjs";
 import { escapeAttribute } from "../../../shared/escape.mjs";
 import { addressOn, decoded, hashAddress } from "../../../shared/page-address.mjs";
@@ -41,7 +42,7 @@ let shown = () => null; // this page, as readPages takes it
  * null when the list cannot be read (`webs`: the links of the sidebar's web links, which are no pages). `own`: this page, { slug, title } as it shows it.
  */
 export async function readPages(own = null) {
-  const listed = await fetch(OUTLINE).then((answer) => answer.json()).catch(() => null);
+  const listed = await fetch(workspaceAddress(OUTLINE)).then((answer) => answer.json()).catch(() => null);
   if (!listed?.reports) return null;
   const titleOf = (slug) => (slug === own?.slug && own.title ? own.title : listed.reports[slug]?.title);
   const pages = [];
@@ -80,7 +81,7 @@ export function heldList() {
 
 /** Whether document `slug` is in the workspace's trash (not when the trash cannot be read). */
 export async function trashed(slug) {
-  const listed = await fetch(TRASH).then((answer) => answer.json()).catch(() => null);
+  const listed = await fetch(workspaceAddress(TRASH)).then((answer) => answer.json()).catch(() => null);
   return inTrash(listed?.entries ?? [], slug);
 }
 

package/browser/editor/page/outline/folds.mjs

@@ -3,6 +3,7 @@
 // heading's block id, a tab's area and tab), the reports folded last kept and the oldest let go. The
 // headings folded on the page (fold/) are kept the same way under a key of their own (`key`).
 
+import { documentKey } from "../../../shared/workspace-address.mjs";
 import { KEYS } from "../../../shared/renamed-storage.mjs";
 
 export const FOLDS_KEY = KEYS.outlineFolds;
@@ -18,6 +19,7 @@ function read(storage, key) {
 
 /** The keys folded in report `slug` (`storage`: { get, set }, page/storage.mjs), kept under `key`. */
 export function foldsOf(storage, slug, key = FOLDS_KEY) {
+  slug = documentKey(slug);
   const keys = read(storage, key).folds[slug];
   return new Set(Array.isArray(keys) ? keys.filter((key) => typeof key === "string") : []);
 }
@@ -27,6 +29,7 @@ export function foldsOf(storage, slug, key = FOLDS_KEY) {
  * folded last; none folded forgets the report. At most KEEP reports, the oldest going first.
  */
 export function keepFolds(storage, slug, folded, present = null, key = FOLDS_KEY) {
+  slug = documentKey(slug);
   const value = read(storage, key);
   const keys = [...folded].filter((each) => !present || present.has(each));
   delete value.folds[slug]; // put back last: the report folded last

package/browser/editor/page/post.mjs

@@ -1,3 +1,4 @@
+import { workspaceAddress } from "../../shared/workspace-address.mjs";
 import { t, told } from "../../shared/i18n/index.mjs";
 // The page's one way to talk to the preview server: a POST of JSON with the report's token
 // (postJson: the request, a network error rejecting as fetch does; postAnswer: its answer read, a
@@ -5,7 +6,7 @@ import { t, told } from "../../shared/i18n/index.mjs";
 // says (failure) and how an upload carries a file (blobBase64).
 
 /** POST `body` as JSON to `route` with `token` (the map's); resolves with the Response. */
-export const postJson = (route, token, body, { keepalive = false } = {}) => fetch(route, {
+export const postJson = (route, token, body, { keepalive = false } = {}) => fetch(workspaceAddress(route), {
   method: "POST",
   headers: { "Content-Type": "application/json", "X-Gallery-Token": token },
   body: JSON.stringify(body),

package/browser/editor/page/present-links.mjs

@@ -1,8 +1,9 @@
+import { workspaceAddress } from "../../shared/workspace-address.mjs";
 import { t } from "../../shared/i18n/index.mjs";
 import { addressOn, elsewhere, fromFile, isPageAddress, mayBePage, pageAddress, workbenchHash } from "../../shared/page-address.mjs";
 import { inTrash, linkedPages, pageLinks } from "../../shared/page-links.mjs";
 import { entryOfKey } from "../../shared/extension-sidebar.mjs";
-import { SHELL, tell } from "./present-shell.mjs";
+import { tell } from "./present-shell.mjs";
 
 // The links of a page shown in 演示视图 (?present: src/server/routes.mjs), which has no editor and whose
 // frame the presentation holds (src/workbench/app/features/present/). A link to a document or a block
@@ -21,11 +22,11 @@ import { SHELL, tell } from "./present-shell.mjs";
 
 const own = pageAddress(location.href)?.slug ?? null;
 const openTab = (address) => window.open(address, "_blank", "noopener");
-const read = (route) => fetch(`/__gallery/workspace/${route}`).then((answer) => answer.json()).catch(() => null);
+const read = (route) => fetch(workspaceAddress(`/__gallery/workspace/${route}`)).then((answer) => answer.json()).catch(() => null);
 
 function go({ slug, block }) {
   const fragment = block ? `#${encodeURIComponent(block)}` : "";
-  if (slug !== own) location.assign(`/generated/${slug}.html?present${SHELL ? `&shell=${encodeURIComponent(SHELL)}` : ""}${fragment}`); // a draft's presentation keeps the workbench around it (present-shell.mjs)
+  if (slug !== own) location.assign(workspaceAddress(`/generated/${slug}.html?present${fragment}`)); // a draft's presentation keeps the workbench around it (present-shell.mjs)
   else if (block) dispatchEvent(new CustomEvent("doc-jump-request", { detail: { hash: fragment } })); // the kit's jump, a step of the history as a link #<block id> is
 }
 

package/browser/editor/page/present-shell.mjs

@@ -1,63 +1,8 @@
 import { pageAddress } from "../../shared/page-address.mjs";
-import { KEEPS_KEYS, stepSection } from "../../shared/present-step.mjs";
-import { PROTOCOL, PROTOCOLS, VERSION } from "../../shared/session.mjs";
+import { PROTOCOL, VERSION } from "../../shared/session.mjs";
 
-// What a page shown in 演示视图 (?present: src/server/routes.mjs, no editor) says to the presentation around it and
-// hears from it. The presentation of a document of this workspace is a frame of the same origin, which it reaches into (its
-// scroll, its keys, its theme); that of a draft of another workspace (docs/workbench.md "Drafts of other workspaces") is a frame
-// of that workspace's server, named by the page's address (?shell=<the workbench's origin>) as the editor's page names it
-// (session.mjs): this page then asks its own server whether that is a Gallery server of this computer (GET
-// /__gallery/workspace/shell) and talks to it alone once it is, holding what it says until then; one that is not hears nothing.
-// It tells where the page is scrolled (`present-view`: { x, y }, with `ready` once the page can be spoken to) and the keys pressed
-// in it that are the presentation's (`present-key`: { key, ctrlKey, metaKey, altKey, kept (a control holds the key), prevented }),
-// and does what it is asked: `theme` (the workbench's, light or dark), `go-section` (上一节 / 下一节) and `scroll` ({ left, top }: the wheel). Every message is the session
-// protocol's envelope (src/shared/session.mjs).
-
-/** The origin of a workbench of another origin showing this page (?shell=<origin>), or null: this one's. */
-export const SHELL = (() => {
-  const named = new URLSearchParams(location.search).get("shell");
-  return named && named !== location.origin ? named : null;
-})();
-
-const vouched = (origin) => fetch(`/__gallery/workspace/shell?origin=${encodeURIComponent(origin)}`, { cache: "no-store" })
-  .then((answer) => answer.json()).then((answer) => answer?.shell === true, () => false);
-
-let parentOrigin = SHELL ? null : location.origin;
-let held = SHELL ? [] : null;
-
-/** Tell the presentation around the page (`window.parent`) something; held until its origin is vouched for, dropped when it is not. */
+// Presentations and their documents share one origin; links may notify their parent.
 export function tell(type, fields = {}) {
   if (window.parent === window) return;
-  if (held) return void held.push([type, fields]);
-  if (!parentOrigin) return;
-  window.parent.postMessage({ protocol: PROTOCOL, v: VERSION, type, slug: pageAddress(location.href)?.slug ?? "", ...fields }, parentOrigin);
-}
-
-function bridge() {
-  let frame = 0;
-  const view = (ready = false) => tell("present-view", { x: scrollX, y: scrollY, ...(ready ? { ready: true } : {}) });
-  addEventListener("scroll", () => { frame ||= requestAnimationFrame(() => { frame = 0; view(); }); }, { passive: true });
-  addEventListener("keydown", (event) => {
-    if (event.isComposing) return;
-    tell("present-key", { key: event.key, ctrlKey: event.ctrlKey, metaKey: event.metaKey, altKey: event.altKey, kept: Boolean(event.target?.closest?.(KEEPS_KEYS)), prevented: event.defaultPrevented });
-  });
-  addEventListener("message", (event) => {
-    const message = event.data;
-    if (event.source !== window.parent || event.origin !== parentOrigin || !PROTOCOLS.includes(message?.protocol) || message.v !== VERSION || message.type !== "command") return;
-    if (message.name === "theme") dispatchEvent(new CustomEvent("doc-theme-request", { detail: { theme: message.theme === "dark" ? "dark" : "light" } })); // the kit's ui.js
-    else if (message.name === "go-section") stepSection(window, message.direction > 0 ? 1 : -1);
-    else if (message.name === "scroll") scrollBy({ left: Number(message.left) || 0, top: Number(message.top) || 0 }); // the wheel over the presentation's ink
-  });
-  view(true);
-}
-
-if (SHELL && window.parent !== window) {
-  vouched(SHELL).then((ok) => {
-    const waiting = held;
-    held = null;
-    if (!ok) return;
-    parentOrigin = SHELL;
-    for (const [type, fields] of waiting) tell(type, fields);
-    bridge();
-  });
+  window.parent.postMessage({ protocol: PROTOCOL, v: VERSION, type, slug: pageAddress(location.href)?.slug ?? "", ...fields }, location.origin);
 }

package/browser/editor/page/session.mjs

@@ -5,15 +5,7 @@ import { lookOf, lookOfElement } from "../../shared/document-look.mjs";
 // tells the workbench its state, never the report's content. Nothing happens when the page is not
 // embedded. The protocol is src/shared/session.mjs; how a workbench uses it, docs/workbench.md.
 //
-// A workbench of another workspace shows a draft of this one from its own origin (docs/workbench.md
-// "Drafts of other workspaces"), naming that origin in the frame's address (?shell=<origin>): the page
-// then asks its own server whether that is a Gallery server of this computer (GET
-// /__gallery/workspace/shell: on the registry, running, its token and process as it announces them),
-// and talks to it alone once it is, holding what it says until then; one that is not hears nothing and
-// is heard by nothing, so that no other page of this computer drives a document by framing it. Going,
-// such a page says `bye` (the workbench of another origin cannot see it go).
-//
-// A message counts only from the parent window, of this origin (or the shell's, vouched for) and protocol. A command names the
+// A message counts only from the parent window, of this exact origin and protocol. A command names the
 // report it is meant for: one for another report (the iframe went to another page meanwhile) is
 // refused. Every command gets exactly one reply, once it is done. Besides the editor's commands the
 // session itself answers five: `theme` (show the report light or dark, or as the reader chose, without
@@ -27,16 +19,6 @@ import { lookOf, lookOfElement } from "../../shared/document-look.mjs";
 
 /** A page opened in a frame on its own (?solo), not as the workbench's report: no session, its own notices. */
 export const SOLO = new URLSearchParams(location.search).has("solo");
-/** The origin of a workbench of another workspace showing this page (?shell=<origin>), or null: this one's. */
-const SHELL = (() => {
-  const named = new URLSearchParams(location.search).get("shell");
-  return named && named !== location.origin ? named : null;
-})();
-
-// Whether this page's server vouches for the workbench at `origin` (GET /__gallery/workspace/shell).
-const vouched = (origin) => fetch(`/__gallery/workspace/shell?origin=${encodeURIComponent(origin)}`, { cache: "no-store" })
-  .then((answer) => answer.json()).then((answer) => answer?.shell === true, () => false);
-
 /**
  * slug: the report's; snapshot(): { title, state } (state: STATE_FLAGS of src/shared/session.mjs);
  * commands: name -> async (message) => result ({ ok, … }); modals: what stands open over the page
@@ -56,27 +38,11 @@ const vouched = (origin) => fetch(`/__gallery/workspace/shell?origin=${encodeURI
 export function connectWorkbench({ slug, snapshot, commands, modals }) {
   if (window.parent === window || SOLO) return null;
   centreCards(modals);
-  // The workbench's origin: this one's, or the shell's once this page's server vouched for it (null till
-  // then: what the page says is held, and is dropped when it does not).
-  let parentOrigin = SHELL ? null : location.origin;
-  let held = SHELL ? [] : null;
-  if (SHELL) {
-    vouched(SHELL).then((ok) => {
-      const waiting = held;
-      held = null;
-      if (!ok) return;
-      parentOrigin = SHELL;
-      for (const [type, fields, protocols] of waiting) send(type, fields, protocols);
-      // A workbench of another origin sees no pagehide of this page: it is told.
-      addEventListener("pagehide", () => send("bye", {}), { once: true });
-    });
-  }
+  const parentOrigin = location.origin;
   // The id the workbench speaks (src/shared/session.mjs, OLD_PROTOCOL): null until its first command,
   // and meanwhile every message goes under both, so that a workbench of either version hears it.
   let spoken = null;
   const send = (type, fields, protocols = spoken ? [spoken] : [PROTOCOL, OLD_PROTOCOL]) => {
-    if (held) return void held.push([type, fields, protocols]);
-    if (!parentOrigin) return;
     for (const protocol of protocols) window.parent.postMessage({ protocol, v: VERSION, type, slug, ...fields }, parentOrigin);
   };
   let last = null;
@@ -141,7 +107,7 @@ export function connectWorkbench({ slug, snapshot, commands, modals }) {
 
   addEventListener("message", async (event) => {
     const message = event.data;
-    if (event.source !== window.parent || !parentOrigin || event.origin !== parentOrigin) return;
+    if (event.source !== window.parent || event.origin !== parentOrigin) return;
     if (!PROTOCOLS.includes(message?.protocol) || message.v !== VERSION || message.type !== "command") return;
     spoken = message.protocol;
     const run = Object.hasOwn(all, message.name) ? all[message.name] : null;

package/browser/editor/page/storage.mjs

@@ -4,11 +4,11 @@
 // and the page works without (a list used lately is then kept for the page's life only).
 
 /** A storage area (`area()`: localStorage or sessionStorage) whose calls never throw. */
-export const storageOf = (area) => ({
-  get(key) { try { return area().getItem(key); } catch { return null; } },
-  set(key, value) { try { area().setItem(key, value); return true; } catch { return false; } },
-  remove(key) { try { area().removeItem(key); } catch {} },
-  keys() { try { return Object.keys(area()); } catch { return []; } },
+export const storageOf = (area, { prefix = "" } = {}) => ({
+  get(key) { try { return area().getItem(prefix + key); } catch { return null; } },
+  set(key, value) { try { area().setItem(prefix + key, value); return true; } catch { return false; } },
+  remove(key) { try { area().removeItem(prefix + key); } catch {} },
+  keys() { try { return Object.keys(area()).filter(key => key.startsWith(prefix)).map(key => key.slice(prefix.length)); } catch { return []; } },
 });
 
 /** localStorage, safe. */

package/browser/shared/component-catalog.mjs

@@ -11,7 +11,7 @@ import { attr, walk } from "./html-tree.mjs";
 import { HOST, NET, netHostsOf } from "./net-policy.mjs";
 import { inLanguage, refusal, said, saying, told } from "./i18n/index.mjs";
 import { DEFAULT_PACK, OWN_SCOPE, PACK_FILE, PACK_ID, readPackManifest } from "./pack-manifest.mjs";
-import { DEVICE_NAMES, PACKAGE_MANIFEST, WORKSPACE_MARK, findWorkspace, layoutOf, markerOf, packageFolders } from "./workspace.mjs";
+import { DEVICE_NAMES, PACKAGE_MANIFEST, WORKSPACE_MARK, defaultWorkspace, layoutOf, markerOf, packageFolders } from "./workspace.mjs";
 
 // 组件包, custom blocks (自定义块) as the UI and the Agent's documents call them: what the workspace's
 // component packages say of themselves to Gallery, read from
@@ -466,7 +466,7 @@ function readPackage(id, folder) {
   }
 }
 
-const workspaceRoot = () => findWorkspace().root;
+const workspaceRoot = () => defaultWorkspace();
 
 // A file edited by hand holds what it holds: of its lists, what can be an id is read, once each, and
 // the rest is passed over, one that names nothing there doing nothing. An id may be of a package that

package/browser/shared/drafts.mjs

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { descendantsIn, outlineAndFile, parentIn, placeIn, readOutline, sharedOutline, withOutlineLock, writeOutline, writtenAs } from "./outline.mjs";
+import { descendantsIn, outlineAndFile, parentIn, placeIn, readOutline, withOutlineLock, writeOutline, writtenAs } from "./outline.mjs";
 import { DOCS, GROUP_LIMITS, isForeign, isTop, newGroupId, topIn, topOf } from "./outline-shape.mjs";
 import { findPreviewServer } from "./preview-server.mjs";
 import { idsOf, shownIcon } from "./workspace-columns.mjs";
@@ -10,18 +10,11 @@ import { nameStops, workspaceLabels, workspaceName } from "./workspace-name.mjs"
 import { isWorkspace, readRegistry, workspaceId, workspaceKey } from "./workspace-registry.mjs";
 import { defaultWorkspace, documentFiles, isSlugName, listDocumentSlugs, readLink } from "./workspace.mjs";
 
-// The drafts of other workspaces in a workspace's sidebar (notes/plans/workspaces-links-plan-2026-11-08.md
-// §2.2, §2.5, §7.2; docs/workbench.md "Drafts of other workspaces"): an entry of the outline written
-// "~<ws id>/<slug>" (./outline-shape.mjs), the workspace's id its path's hash on the machine's registry
-// (./workspace-registry.mjs), the draft its document <root>/<slug>/doc.html there. Only where the sidebar
-// shows it is this workspace's to keep: the draft's folder never moves, and its own workspace's tree is
-// never written (its server shows it as it was). Every registered workspace has a column of its own
-// (./workspace-columns.mjs, ./outline.mjs), "whole" (all its documents) unless the user picked a document
-// of it in 添加其他 Gallery 项目… (POST draft-add) while it had none shown: then it is `picked`, holding that
-// document and those under it alone, and what an Agent makes or opens there later (gallery new, gallery
-// open in another workspace than the default one: joinDefaultTree). The column the user removed is
-// `hidden`; an Agent's gallery new or open there, or the user's pick, shows it again. A draft the user took
-// out of a whole column (从文档树移除) is in its `left`, not filled in again until it is put back here.
+// Registered document folders share the default home's sidebar and outline. A foreign entry is
+// ~<workspace-id>/<slug>; its files, history, trash and exports remain in that folder.
+// Every registered folder contributes its documents. Ordering and hierarchy have one global owner.
+// addDraft/addWorkspace register or reveal a folder through the existing outline operations;
+// joinDefaultTree places documents created by CLI commands in that same tree.
 // A draft whose workspace is not on the registry, two registered folders sharing its id (six hex digits
 // of a hash: a clash is refused, never guessed), or whose folder is gone stays in the tree, shown grey
 // (找不到底稿) until the user removes it. Reads other workspaces' files only; writes this one's outline.
@@ -193,7 +186,7 @@ const shownColumn = ({ hidden, ...column }) => column;
  * (documents: a web link of that workspace is none, nor a draft of a third its tree shows, the drafts under
  * one going under the draft above it), those the tree does not hold yet. Its workspace's column is shown
  * again when the user had removed it (hidden). How, `pick` says:
- * - false (an Agent's gallery new or open there: joinDefaultTree, POST draft-join): one the outline holds
+ * - false (an Agent's gallery new or open there: joinDefaultTree, POST draft-add): one the outline holds
  *   (the file, or a whole column as it is read) stays where it is; else (a picked column) under its own
  *   parent's entry when the tree holds that, else last in its workspace's column;
  * - true (the user's pick in 添加其他 Gallery 项目…, `after`: the column whose menu it came from): one shown
@@ -228,9 +221,13 @@ export async function addDraft(treeRoot, draftRoot, slug, { changed = () => {},
       return { parent, column: top === null || top === "" ? DOCS : top.slice(1), under: parent !== null && !isTop(parent) ? parent : null };
     };
     const columnOf = (key) => outline.groups.find((each) => topOf(each.id) === topIn(outline.children, key)) ?? null;
-    if (sharedOutline(treeRoot) && holds(entry)) {
+    if (holds(entry)) {
+      if (pick && fresh) {
+        const column = columnOf(entry);
+        if (column) moveAfter(outline, column.id, after);
+      }
       if (!writtenAs(outline, stored)) { await writeOutline(treeRoot, outline); changed(); }
-      const existing = pick || storedHolds;
+      const existing = !fresh && (pick || storedHolds);
       return { entry, existing, added: existing ? [] : [entry], shown: false, ...where() };
     }
     let shown = false;
@@ -356,23 +353,9 @@ export async function projectChoices(treeRoot, { ids = registeredIds(), stops =
 }
 
 
-/** The environment variable that keeps gallery new and gallery open from putting their draft in the default workspace's sidebar (the tests set it). */
-export const NO_DEFAULT_TREE = "GALLERY_NO_DEFAULT_TREE";
-const set = (value) => !["", "0", undefined].includes(value);
-
-/**
- * gallery new and gallery open in a workspace other than the default one (src/shared/workspace.mjs
- * defaultWorkspace): draft `slug` of workspace `root` put in the default workspace's sidebar (addDraft,
- * with the drafts under it), through the default workspace's server when one runs (POST
- * /__gallery/workspace/draft-join: in its queue, its workbench told at once), else here under the
- * outline's lock. Null where it is not done: NO_DEFAULT_TREE set, `root` the default workspace, no
- * default workspace there yet (nothing is made for it), or `root` not on the registry under its id (a
- * workspace in the system's temporary folder, or a clash of ids: an entry would name none). Else
- * addDraft's answer with `home` (the default workspace) and `names`: { column: the name of the column
- * it is in, under: the title of the draft it is under, or null }; or { failed: why } (nothing written).
- */
+/** Put a project document in home's shared outline through the single service's draft-add
+ * command when running, otherwise through the same outline lock offline. */
 export async function joinDefaultTree(root, slug, { env = process.env } = {}) {
-  if (set(env[NO_DEFAULT_TREE])) return null;
   const home = defaultWorkspace({ env });
   if (workspaceKey(home) === workspaceKey(root) || !isWorkspace(home)) return null;
   const ids = registeredIds();
@@ -380,8 +363,17 @@ export async function joinDefaultTree(root, slug, { env = process.env } = {}) {
   if (!found.root || workspaceKey(found.root) !== workspaceKey(root)) return null;
   let done = null;
   try {
-    const server = await findPreviewServer({ reportsDirectory: home });
-    if (server) done = await joinThrough(server, root, slug);
+    const server = await findPreviewServer();
+    if (server) {
+      const origin = `http://127.0.0.1:${server.port}`;
+      const response = await fetch(`${origin}/__gallery/workspace/draft-add`, {
+        method: "POST", headers: { "Content-Type": "application/json", Origin: origin, "X-Gallery-Token": server.token },
+        body: JSON.stringify({ path: path.join(root, slug) }), signal: AbortSignal.timeout(30000),
+      });
+      const answer = await response.json();
+      if (!answer.ok) throw new Error(answer.message ?? "Could not register the document");
+      done = answer;
+    }
     done ??= await addDraft(home, root, slug);
   } catch (error) {
     return { failed: error.message, home };
@@ -389,23 +381,6 @@ export async function joinDefaultTree(root, slug, { env = process.env } = {}) {
   return { ...done, home, names: await placeNames(home, done, ids) };
 }
 
-// POST draft-join to the default workspace's server; null when no server of it takes it (gone, or an older Gallery's).
-async function joinThrough(server, root, slug) {
-  const host = `127.0.0.1:${server.port}`;
-  try {
-    const response = await fetch(`http://${host}/__gallery/workspace/draft-join`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json", Origin: `http://${host}`, "X-Gallery-Token": server.token },
-      body: JSON.stringify({ root, slug }),
-      signal: AbortSignal.timeout(30000),
-    });
-    const answer = await response.json().catch(() => null);
-    return answer?.ok === true && typeof answer.entry === "string" ? answer : null;
-  } catch {
-    return null;
-  }
-}
-
 // The names a line says of where a draft went: its column's (the user's title, else its workspace's
 // name, else 默认文档, the default workspace's own column, or 链接) and the title of the draft or document it is under.
 async function placeNames(home, { column, under }, ids) {