@kernhq/module-quire 0.13.1 → 0.15.0

package/dist/server/services/macros.js

@@ -0,0 +1,488 @@
+import { PAGE_MACRO_MAX_DEPTH, PAGE_MACRO_MAX_ROWS, } from '@kernhq/ui/editor/page-doc';
+import { and, asc, desc, eq, inArray, isNull, sql } from 'drizzle-orm';
+import { pageDocFromBase64, pageDocFromState } from '../document.js';
+import { macroKey, macrosIn, renderPageDoc, textFromPageDoc, } from '../render.js';
+import { pages, pageVersions } from '../schema.js';
+import { documentNameOf } from './pages.js';
+/**
+ * How much one macro may ask for.
+ *
+ * The document decides how much work a request does, so these are enforced here as well as in the
+ * editor: a `depth` of 900 in a page somebody pasted in is a recursive query somebody pasted in.
+ * The editor's own clamps are the same constants, out of `page-doc.ts` — the one file in
+ * `@kernhq/ui` that imports nothing and is safe to load in a backend process.
+ */
+const MAX_DEPTH = PAGE_MACRO_MAX_DEPTH;
+const MAX_ROWS = PAGE_MACRO_MAX_ROWS;
+/**
+ * How many rows a "recently updated" macro reads before filtering.
+ *
+ * It has to over-fetch, because the filter runs after the sort: the newest twenty-five pages in a
+ * space are not the newest twenty-five *this reader may see*. Four times the ceiling is the
+ * compromise — a reader denied three quarters of a space still fills the list, and the query stays
+ * one bounded index scan rather than a walk of the whole space. A reader denied more than that gets
+ * a short list, which is honest: the alternative is paging until the list is full, which is a
+ * query whose cost is set by how much somebody is not allowed to see.
+ */
+const RECENT_CANDIDATES = MAX_ROWS * 4;
+/** How long an excerpt drawn beside a title may be, before it stops being a hint and becomes prose. */
+const EXCERPT_CHARS = 200;
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * A page id out of a document, or null.
+ *
+ * The same narrowing `macroPageId` applies in the editor, restated for the same reason the status
+ * tones are: this file must not load the extension. A value that is not a uuid reaches a
+ * `= $1::uuid` and turns a macro nobody can see into a 500 on the page that holds it.
+ */
+const pageIdAttr = (value) => typeof value === 'string' && UUID_RE.test(value) ? value.toLowerCase() : null;
+/** A whole number inside a range, or the fallback — never the string that was in the document. */
+function countAttr(value, min, max, fallback) {
+    const n = typeof value === 'number' ? value : Number.parseInt(String(value ?? ''), 10);
+    if (!Number.isFinite(n) || !Number.isInteger(n) || n < min || n > max)
+        return fallback;
+    return n;
+}
+const flagAttr = (value) => value === true || value === 'true';
+const CHILDREN_SORTS = ['position', 'title', 'updated'];
+const sortAttr = (value) => CHILDREN_SORTS.includes(String(value)) ? value : 'position';
+const RECENT_SCOPES = ['space', 'subtree'];
+const scopeAttr = (value) => RECENT_SCOPES.includes(String(value)) ? value : 'space';
+/** Trim flattened prose to something that sits under a title without becoming the page. */
+function excerptOf(text) {
+    const clean = text.replace(/\s+/g, ' ').trim();
+    if (!clean)
+        return null;
+    if (clean.length <= EXCERPT_CHARS)
+        return clean;
+    // Cut at a space so the hint does not end mid-word; fall back to a hard cut for a long token.
+    const cut = clean.slice(0, EXCERPT_CHARS);
+    const space = cut.lastIndexOf(' ');
+    return `${(space > EXCERPT_CHARS / 2 ? cut.slice(0, space) : cut).trimEnd()}…`;
+}
+/**
+ * The first `excerpt` node in a document, flattened to text.
+ *
+ * One page, one excerpt: a second is ignored, because "the excerpt" would otherwise mean whichever
+ * one the walk happened to reach first, and that is a page whose macro changes meaning when
+ * somebody edits a paragraph far away from it. Depth-bounded for the reason `templates.ts` gives —
+ * `doc` is whatever was written to a JSONB column, and an adversarially nested document walked
+ * recursively is a stack overflow, which in Node is a process rather than an exception.
+ */
+function markedExcerpt(doc, depth = 0) {
+    if (!doc || depth > MAX_DEPTH * 4)
+        return null;
+    for (const node of (doc.content ?? [])) {
+        if (node.type === 'excerpt') {
+            const text = textFromPageDoc({ type: 'doc', content: node.content ?? [] });
+            const clean = text.replace(/\s+/g, ' ').trim();
+            if (clean)
+                return clean;
+        }
+        const nested = markedExcerpt({ type: 'doc', content: node.content ?? [] }, depth + 1);
+        if (nested)
+            return nested;
+    }
+    return null;
+}
+export function quireMacros(kernel, access) {
+    /**
+     * A page's prose, as a document — the live one first.
+     *
+     * Same order as `templates.ts`'s: what the person looking at the page can see, then the newest
+     * stored version for a page the collab service has forgotten or never held. An include that drew
+     * last week's published copy while the source page says something else is the kind of wrong that
+     * takes a day to notice.
+     */
+    async function docOfPage(tx, workspaceId, pageId) {
+        const live = await kernel
+            .call('collab.document.state', {
+            name: documentNameOf({ workspaceId, id: pageId }),
+        })
+            .catch(() => null);
+        const fromLive = pageDocFromBase64(live?.state ?? null);
+        if (fromLive)
+            return fromLive;
+        const [version] = await tx
+            .select({ state: pageVersions.state })
+            .from(pageVersions)
+            .where(and(eq(pageVersions.workspaceId, workspaceId), eq(pageVersions.pageId, pageId)))
+            .orderBy(desc(pageVersions.createdAt))
+            .limit(1);
+        return version ? pageDocFromState(version.state) : null;
+    }
+    const selection = {
+        id: pages.id,
+        parentId: pages.parentId,
+        spaceId: pages.spaceId,
+        title: pages.title,
+        icon: pages.icon,
+        text: pages.text,
+        updatedAt: pages.updatedAt,
+    };
+    /**
+     * The pages a macro may consider at all, before anybody is asked about them.
+     *
+     * Trashed, archived, non-`page` and database rows are excluded here rather than in each macro,
+     * because every one of them wants the same answer and the one that forgot would be the leak.
+     * A database row is a page, which is exactly why it has to be named: a children macro on a page
+     * that happens to hold a database would otherwise draw four thousand rows as a table of contents.
+     */
+    const drawable = (workspaceId) => and(eq(pages.workspaceId, workspaceId), eq(pages.kind, 'page'), isNull(pages.databaseId), isNull(pages.deletedAt), isNull(pages.archivedAt));
+    /**
+     * May this audience be shown this page?
+     *
+     * The one question this file exists to ask, and the only place either audience is interpreted.
+     * A publication is a set membership — no principal exists to ask, and the walk that built the set
+     * already applied every rule about what public means. A reader is a page-scoped permission check
+     * whose parent chain carries every ancestor, so a restriction set on a section applies to
+     * everything under it without having been copied down.
+     */
+    async function visible(workspaceId, audience, page) {
+        if (audience.kind === 'publication')
+            return audience.pageIds.has(page.id);
+        return access.canPage(audience.principal, 'quire.page.view', workspaceId, {
+            pageId: page.id,
+            spaceId: page.spaceId,
+            ancestorIds: page.ancestorIds,
+        });
+    }
+    /** A visible page as the renderer wants it. Nothing here is reached for a page that failed the gate. */
+    function refOf(page, ctx, opts) {
+        return {
+            id: page.id,
+            title: page.title,
+            icon: page.icon,
+            href: ctx.pageHref?.(page.id) ?? null,
+            updated: opts.updated ? formatDate(page.updatedAt, ctx.locale) : null,
+            excerpt: opts.excerpt ? excerptOf(page.text) : null,
+        };
+    }
+    /**
+     * A date the reader can read, formatted here because the renderer does no date arithmetic.
+     *
+     * Through `Intl`, so a Persian workspace gets Persian digits and an Arabic one an Arabic calendar
+     * without this file knowing anything about either — the same bargain `templates.ts` makes for a
+     * template's `{{date}}`.
+     */
+    function formatDate(value, locale) {
+        if (!(value instanceof Date) || Number.isNaN(value.getTime()))
+            return null;
+        try {
+            return new Intl.DateTimeFormat(locale || 'en', { dateStyle: 'medium' }).format(value);
+        }
+        catch {
+            return new Intl.DateTimeFormat('en', { dateStyle: 'medium' }).format(value);
+        }
+    }
+    /** The chain above one page, so its children can be asked about without a query per level. */
+    async function scopeChain(tx, workspaceId, pageId) {
+        const scope = await access.scopeOf(tx, workspaceId, pageId).catch(() => null);
+        return scope ? scope.ancestorIds : [];
+    }
+    /**
+     * The visible pages under one page, level by level, pruning as it goes.
+     *
+     * Breadth-first and one query per level rather than one recursive query, because the permission
+     * question is asked *between* levels: a page that fails the gate is never expanded, so its
+     * children are not read from the database at all. That is what makes this a prune rather than a
+     * filter, and it is also why the loop is bounded by `depth` — the number of queries is the depth
+     * the macro asked for, which is at most `MAX_DEPTH`.
+     */
+    async function childrenTree(tx, workspaceId, audience, ctx, root, depth, sort, showExcerpt) {
+        const order = sort === 'title' ? asc(pages.title) : sort === 'updated' ? desc(pages.updatedAt) : asc(pages.position);
+        const top = [];
+        // The frontier carries each surviving page's own ancestor chain, which its children inherit.
+        let frontier = [
+            {
+                ref: { id: root.id, title: '', icon: null, href: null, updated: null, excerpt: null },
+                id: root.id,
+                ancestorIds: root.ancestorIds,
+            },
+        ];
+        let drawn = 0;
+        for (let level = 0; level < depth && frontier.length > 0 && drawn < MAX_ROWS; level++) {
+            const parentIds = frontier.map((entry) => entry.id);
+            const rows = await tx
+                .select(selection)
+                .from(pages)
+                .where(and(drawable(workspaceId), inArray(pages.parentId, parentIds)))
+                .orderBy(order)
+                .limit(MAX_ROWS * 4);
+            const next = [];
+            for (const entry of frontier) {
+                for (const row of rows) {
+                    if (row.parentId !== entry.id)
+                        continue;
+                    if (drawn >= MAX_ROWS)
+                        break;
+                    const scoped = { ...row, ancestorIds: [entry.id, ...entry.ancestorIds] };
+                    if (!(await visible(workspaceId, audience, scoped)))
+                        continue;
+                    const ref = refOf(row, ctx, { excerpt: showExcerpt, updated: false });
+                    drawn++;
+                    if (level === 0)
+                        top.push(ref);
+                    else {
+                        entry.ref.children ??= [];
+                        entry.ref.children.push(ref);
+                    }
+                    next.push({ ref, id: row.id, ancestorIds: scoped.ancestorIds });
+                }
+            }
+            frontier = next;
+        }
+        return top;
+    }
+    /** The most recently changed pages an audience may see, in a space or under one page. */
+    async function recentlyUpdated(tx, workspaceId, audience, ctx, home, scope, limit) {
+        /*
+         * A subtree is resolved with one recursive query rather than level by level, because unlike the
+         * children macro this list is ordered by time across the whole subtree — there is no level to
+         * stop at. The prune is then applied to the result: a page whose ancestor chain contains
+         * something the audience cannot see is dropped along with anything under it, which the chain
+         * carried on each row makes a check rather than a second walk.
+         */
+        let rows;
+        let chains = new Map();
+        if (scope === 'subtree') {
+            const res = await tx.execute(sql `
+        with recursive tree as (
+          select p.id, p.parent_id, p.space_id, p.title, p.icon, p.text, p.updated_at,
+                 array[]::uuid[] as path, 0 as depth
+            from mod_quire.pages p
+           where p.workspace_id = ${workspaceId}::uuid
+             and p.parent_id = ${home.id}::uuid
+             and p.kind = 'page' and p.database_id is null
+             and p.deleted_at is null and p.archived_at is null
+          union all
+          select c.id, c.parent_id, c.space_id, c.title, c.icon, c.text, c.updated_at,
+                 tree.path || tree.id, tree.depth + 1
+            from mod_quire.pages c
+            join tree on c.parent_id = tree.id
+           where c.workspace_id = ${workspaceId}::uuid
+             and c.kind = 'page' and c.database_id is null
+             and c.deleted_at is null and c.archived_at is null
+             and tree.depth < ${MAX_DEPTH}
+        ) cycle id set looped using cyclepath
+        select id, parent_id, space_id, title, icon, text, updated_at, path
+          from tree
+         order by updated_at desc
+         limit ${RECENT_CANDIDATES}
+      `);
+            rows = res.rows.map((row) => ({
+                id: row.id,
+                parentId: row.parent_id,
+                spaceId: row.space_id,
+                title: row.title,
+                icon: row.icon,
+                text: row.text,
+                updatedAt: row.updated_at instanceof Date ? row.updated_at : new Date(row.updated_at),
+            }));
+            chains = new Map(res.rows.map((row) => [row.id, [...(row.path ?? [])].reverse().concat(home.id, home.ancestorIds)]));
+        }
+        else {
+            rows = await tx
+                .select(selection)
+                .from(pages)
+                .where(and(drawable(workspaceId), eq(pages.spaceId, home.spaceId)))
+                .orderBy(desc(pages.updatedAt))
+                .limit(RECENT_CANDIDATES);
+        }
+        const out = [];
+        for (const row of rows) {
+            if (out.length >= limit)
+                break;
+            /*
+             * A space-scoped list has no walk to carry a chain, so each surviving row is asked about with
+             * its own ancestors. `scopeOf` is one recursive query per row, which is why the candidate set
+             * is bounded — and why the subtree branch, which already knows every chain, does not pay it.
+             */
+            const ancestorIds = chains.get(row.id) ?? (await scopeChain(tx, workspaceId, row.id));
+            if (!(await visible(workspaceId, audience, { ...row, ancestorIds })))
+                continue;
+            out.push(refOf(row, ctx, { excerpt: false, updated: true }));
+        }
+        return out;
+    }
+    /**
+     * Who has written on this page.
+     *
+     * **A reader only.** Every other public response in this module is scrubbed of anything
+     * identifying a person — see the note at the top of `publications.ts` — and a page's authors are
+     * the customer's staff rather than the page's content. Somebody who wants a byline on a published
+     * page writes one. That decision is made by having no publication branch at all rather than by
+     * returning an empty list from one, so a later edit cannot turn it back on by accident.
+     */
+    async function contributors(tx, workspaceId, audience, home, limit) {
+        if (audience.kind !== 'reader')
+            return null;
+        if (!(await visible(workspaceId, audience, home)))
+            return null;
+        const [row] = await tx
+            .select({ createdBy: pages.createdBy, updatedBy: pages.updatedBy })
+            .from(pages)
+            .where(and(eq(pages.workspaceId, workspaceId), eq(pages.id, home.id)))
+            .limit(1);
+        // Newest first, so a long-lived page credits whoever has been working on it lately.
+        const versions = await tx
+            .select({ authorId: pageVersions.authorId })
+            .from(pageVersions)
+            .where(and(eq(pageVersions.workspaceId, workspaceId), eq(pageVersions.pageId, home.id)))
+            .orderBy(desc(pageVersions.createdAt))
+            .limit(RECENT_CANDIDATES);
+        const ordered = [];
+        const seen = new Set();
+        for (const id of [row?.updatedBy, ...versions.map((v) => v.authorId), row?.createdBy]) {
+            if (!id || seen.has(id))
+                continue;
+            seen.add(id);
+            ordered.push(id);
+            if (ordered.length >= limit)
+                break;
+        }
+        if (ordered.length === 0)
+            return null;
+        /*
+         * Names from core, which is the only thing that has them. A lookup that fails draws no
+         * contributors rather than a list of ids: an id is not a name, and printing one on somebody's
+         * page is both useless and a string a reader can try somewhere else.
+         */
+        const people = await kernel
+            .call('core.users.list', { ids: ordered })
+            .catch(() => null);
+        if (!people)
+            return null;
+        const byId = new Map(people.map((person) => [person.id, person.name]));
+        const named = ordered
+            .map((id) => byId.get(id))
+            .filter((name) => typeof name === 'string' && name.trim().length > 0)
+            .map((name) => ({ name }));
+        return named.length > 0 ? { kind: 'people', people: named } : null;
+    }
+    /** The page a macro points at, with its chain, or null when it is not drawable at all. */
+    async function targetPage(tx, workspaceId, pageId) {
+        const [row] = await tx
+            .select(selection)
+            .from(pages)
+            .where(and(drawable(workspaceId), eq(pages.id, pageId)))
+            .limit(1);
+        if (!row)
+            return null;
+        return { ...row, ancestorIds: await scopeChain(tx, workspaceId, row.id) };
+    }
+    return {
+        /**
+         * Answer every reading macro in a document, for one audience, in one pass.
+         *
+         * Returns the synchronous lookup `renderPageDoc` takes. A macro this could not answer — a page
+         * that was deleted, a page the audience may not see, a lookup that failed — is simply absent
+         * from the map, and an absent answer is the empty frame. There is no path through this function
+         * that returns a page the audience failed the gate on, and no way to express one: `visible` is
+         * the only thing that builds a `MacroPageRef`'s input, and every caller of `refOf` has just
+         * awaited it.
+         */
+        async resolve(tx, workspaceId, doc, audience, ctx) {
+            const nodes = macrosIn(doc);
+            if (nodes.length === 0)
+                return () => null;
+            /*
+             * The page the document is on, which four of the five macros need — as the default target,
+             * as the space a recent list is drawn from, and as the page a byline is about. Without one
+             * (a preview, an import) only a macro carrying an explicit page id can resolve, and the rest
+             * draw empty frames.
+             */
+            const home = ctx.pageId ? await targetPage(tx, workspaceId, ctx.pageId) : null;
+            const answers = new Map();
+            for (const node of nodes) {
+                const content = await resolveOne(tx, workspaceId, audience, ctx, home, node);
+                if (content)
+                    answers.set(macroKey(node), content);
+            }
+            return (node) => answers.get(macroKey(node)) ?? null;
+        },
+    };
+    async function resolveOne(tx, workspaceId, audience, ctx, home, node) {
+        const attrs = node.attrs ?? {};
+        /*
+         * `pageId` null means "the page this macro is on" — what almost every use of a children macro
+         * wants, and what keeps it working after the page is copied into a template or duplicated.
+         */
+        const named = pageIdAttr(attrs.pageId);
+        switch (node.type) {
+            case 'pageChildren': {
+                const root = named ? await targetPage(tx, workspaceId, named) : home;
+                if (!root)
+                    return null;
+                /*
+                 * The root of a children list is asked about too. Pointing a macro at a page the reader may
+                 * not see must not list that page's children — the parent is the permission boundary its
+                 * children inherit, so skipping this check would make the macro a way around it.
+                 */
+                if (!(await visible(workspaceId, audience, root)))
+                    return null;
+                const pages_ = await childrenTree(tx, workspaceId, audience, ctx, root, countAttr(attrs.depth, 1, MAX_DEPTH, 1), sortAttr(attrs.sort), flagAttr(attrs.showExcerpt));
+                return { kind: 'pages', pages: pages_ };
+            }
+            case 'recentlyUpdated': {
+                const anchor = named ? await targetPage(tx, workspaceId, named) : home;
+                if (!anchor)
+                    return null;
+                if (!(await visible(workspaceId, audience, anchor)))
+                    return null;
+                const rows = await recentlyUpdated(tx, workspaceId, audience, ctx, anchor, scopeAttr(attrs.scope), countAttr(attrs.limit, 1, MAX_ROWS, 10));
+                return { kind: 'pages', pages: rows };
+            }
+            case 'excerptInclude': {
+                const target = named ? await targetPage(tx, workspaceId, named) : null;
+                if (!target)
+                    return null;
+                if (!(await visible(workspaceId, audience, target)))
+                    return null;
+                /*
+                 * The marked excerpt where the source page has one, its opening prose where it does not —
+                 * plain text either way. Lifting markup out of one document into another is how a half-open
+                 * tag becomes the reader's problem on a page they did not write.
+                 */
+                const marked = markedExcerpt(await docOfPage(tx, workspaceId, target.id));
+                const text = marked ?? excerptOf(target.text);
+                if (!text)
+                    return null;
+                const ref = refOf(target, ctx, { excerpt: false, updated: false });
+                return { kind: 'page', page: { ...ref, excerpt: text }, html: '' };
+            }
+            case 'includePage': {
+                const target = named ? await targetPage(tx, workspaceId, named) : null;
+                if (!target)
+                    return null;
+                if (!(await visible(workspaceId, audience, target)))
+                    return null;
+                const doc = await docOfPage(tx, workspaceId, target.id);
+                if (!doc)
+                    return null;
+                /*
+                 * **The included page is rendered with no resolver of its own**, so its macros draw empty
+                 * frames. Two reasons, and the first is sufficient: a page that includes a page that
+                 * includes the first is a cycle, and a cycle here is a request that never returns. The
+                 * second is that a macro one level down would be resolved against an audience that reached
+                 * it through two pages' permissions, which is a question nobody asked and this file would
+                 * have to invent an answer to. One level of transclusion, stated rather than discovered.
+                 *
+                 * The HTML this produces is the only string the renderer emits unescaped, and this is the
+                 * only place that produces it — by calling the same `renderPageDoc` that escapes everything
+                 * else. See the note on `MacroContent`.
+                 */
+                const html = renderPageDoc(doc, { pageHref: ctx.pageHref });
+                return { kind: 'page', page: refOf(target, ctx, { excerpt: false, updated: false }), html };
+            }
+            case 'contributors': {
+                if (!home)
+                    return null;
+                return contributors(tx, workspaceId, audience, home, countAttr(attrs.limit, 1, MAX_ROWS, 10));
+            }
+            default:
+                return null;
+        }
+    }
+}
+//# sourceMappingURL=macros.js.map

package/dist/server/services/macros.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"macros.js","sourceRoot":"","sources":["../../../src/server/services/macros.ts"],"names":[],"mappings":"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"}

package/dist/server/services/publications.d.ts

@@ -3,6 +3,7 @@ import { type Kernel, type Tx } from '@kernhq/kernel';
 import type { Publication } from '../../contract/index.js';
 import { publications } from '../schema.js';
 import type { QuireAccess } from './access.js';
+import type { QuireMacros } from './macros.js';
 /**
  * A public URL names its workspace by slug or by id; every query needs the id.
  *
@@ -74,7 +75,7 @@ export declare function publicHtml(html: string, basePath: string, resolve: {
 }): string;
 /** A plain-text window around the first match, for a search result. */
 export declare function snippetAround(text: string, query: string): string;
-export declare function quirePublications(kernel: Kernel, access: QuireAccess, versions: QuireVersions): {
+export declare function quirePublications(kernel: Kernel, access: QuireAccess, versions: QuireVersions, macroServices: QuireMacros): {
     /**
      * The anonymous path's transaction: the workspace set, and nothing writable.
      *

package/dist/server/services/publications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publications.d.ts","sourceRoot":"","sources":["../../../src/server/services/publications.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publications.d.ts","sourceRoot":"","sources":["../../../src/server/services/publications.ts"],"names":[],"mappings":"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"}

package/dist/server/services/publications.js

@@ -32,7 +32,8 @@ import { promisify } from 'node:util';
 import { KernError } from '@kernhq/kernel';
 import { and, desc, eq, inArray, sql } from 'drizzle-orm';
 import { PUBLIC_ASSET_SEGMENT } from '../../contract/index.js';
-import { escapeHtml } from '../render.js';
+import { pageDocFromState } from '../document.js';
+import { escapeHtml, hasReadingMacro } from '../render.js';
 import { pages, pageVersions, publications } from '../schema.js';
 /** A workspace segment is either its uuid or its slug; anything else is not an address. */
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -303,7 +304,12 @@ export function snippetAround(text, query) {
 }
 /** `%`, `_` and `\` mean something to `ILIKE`, so a reader searching for `50%` gets `50%`. */
 const escapeLike = (value) => value.replace(/[\\%_]/g, (c) => `\\${c}`);
-export function quirePublications(kernel, access, versions) {
+export function quirePublications(kernel, access, versions, 
+/*
+ * Only ever asked to resolve for a `publication` audience — there is no principal on this path and
+ * nothing here can construct one. See the note in `html`.
+ */
+macroServices) {
     /**
      * The associated data an unlock token is sealed with.
      *
@@ -619,7 +625,7 @@ export function quirePublications(kernel, access, versions) {
         /** The pinned version's stored HTML, scrubbed for the internet. */
         async html(tx, workspaceId, node, nodes, basePath) {
             const [row] = await tx
-                .select({ html: pageVersions.html })
+                .select({ html: pageVersions.html, state: pageVersions.state })
                 .from(pageVersions)
                 .where(and(eq(pageVersions.workspaceId, workspaceId), eq(pageVersions.id, node.version_id)))
                 .limit(1);
@@ -634,7 +640,40 @@ export function quirePublications(kernel, access, versions) {
             if (!row || row.html === null)
                 throw new KernError('NOT_FOUND', 'There is no published page at this address');
             const pathById = new Map(nodes.map((n) => [n.id, n.path]));
-            return publicHtml(row.html, basePath, {
+            /*
+             * A macro that reads other pages is resolved **here, per read** — never at publish time.
+             *
+             * The stored HTML draws those five as empty frames on purpose. Resolving them into
+             * `page_versions.html` would freeze a list of titles into a row that is then served for ever:
+             * unpublish a page, exclude it from the site, move it out of the publication, and the stored
+             * copy of its parent keeps naming it. `publicHtml` below would strip the dead *link* and leave
+             * the *title*, which is the leak stated at the top of `macros.ts` — a private page's title on
+             * a public site.
+             *
+             * So the version is re-rendered against this publication's own reachable set, which is exactly
+             * `nodes`: the walk has already applied every rule about what public means, and this file does
+             * not get a second opinion about it. Only for a page that has such a macro — `hasReadingMacro`
+             * is a string search over HTML we already have, so an ordinary page still costs one row read.
+             */
+            let html = row.html;
+            if (hasReadingMacro(html)) {
+                const macros = await macroServices.resolve(tx, workspaceId, pageDocFromState(row.state), { kind: 'publication', pageIds: new Set(nodes.map((n) => n.id)) }, {
+                    pageId: node.id,
+                    /*
+                     * An in-app address, deliberately, even though this render is for the internet.
+                     *
+                     * `publicHtml` below turns every `/quire/<space>/<id>` into this site's own path, or
+                     * drops the href when the id is not public — one pass, over every internal link on the
+                     * page. Handing a macro the *public* path here instead would produce the one href that
+                     * pass does not recognise, so it would go out without `basePath` in front of it. The
+                     * space segment is not read by that pattern and there is nothing here to fill it with,
+                     * so it is a placeholder; the id is what carries the meaning.
+                     */
+                    pageHref: (id) => (pathById.has(id) ? `/quire/-/${id}` : null),
+                });
+                html = await versions.html(tx, workspaceId, row.state, { pictures: 'referenced', macros });
+            }
+            return publicHtml(html, basePath, {
                 pagePath: (id) => pathById.get(id) ?? null,
                 // Minted per read rather than stored, so the envelope can be re-keyed and so nothing
                 // durable in the database is a capability. `basePath` already ends in a slash.