smoodly 0.0.45 → 0.0.47

package/dist/image/next-config.js

@@ -11,17 +11,22 @@ export function isPrivateHost(hostname) {
     const [a, b] = [Number(m[1]), Number(m[2])];
     return a === 127 || a === 10 || (a === 192 && b === 168) || (a === 172 && b >= 16 && b <= 31);
 }
-export function smoodlyImages(url = process.env.SMOODLY_URL) {
-    if (!url) {
-        console.warn("smoodly: SMOODLY_URL is not set — next/image will refuse Supabase media URLs until it is.");
-        return { remotePatterns: [] };
-    }
+/** The Supabase host's public media path as a remote pattern. Defined here, not in remote-pattern.ts: this
+ *  entry loads in plain Node and imports nothing; remote-pattern.ts re-exports it for the Astro side. */
+export function mediaRemotePattern(url) {
     const u = new URL(url);
-    const pattern = {
+    return {
         protocol: u.protocol === "http:" ? "http" : "https",
         hostname: u.hostname,
         ...(u.port ? { port: u.port } : {}),
         pathname: "/storage/v1/object/public/media/**",
     };
-    return { remotePatterns: [pattern], ...(isPrivateHost(u.hostname) ? { dangerouslyAllowLocalIP: true } : {}) };
+}
+export function smoodlyImages(url = process.env.SMOODLY_URL) {
+    if (!url) {
+        console.warn("smoodly: SMOODLY_URL is not set — next/image will refuse Supabase media URLs until it is.");
+        return { remotePatterns: [] };
+    }
+    const pattern = mediaRemotePattern(url);
+    return { remotePatterns: [pattern], ...(isPrivateHost(new URL(url).hostname) ? { dangerouslyAllowLocalIP: true } : {}) };
 }

package/dist/image/remote-pattern.d.ts

@@ -0,0 +1 @@
+export { mediaRemotePattern, type RemotePattern } from "./next-config.ts";

package/dist/image/remote-pattern.js

@@ -0,0 +1,5 @@
+// The Supabase host's public media path as a remote pattern (spec 2026-09-08 media §9): what next/image
+// (next-config.ts) and Astro's image service (astro/index.ts) are both told they may resize from.
+// The function lives in next-config.ts, which must import nothing (it loads in plain Node from
+// next.config.ts); this module is the import path the Astro side uses.
+export { mediaRemotePattern } from "./next-config.js";

package/dist/index.d.ts

@@ -1,18 +1,17 @@
-import { section, element } from "./pairing.tsx";
 import { collection } from "./collections.ts";
 import { toolset } from "./toolset.ts";
-import { Section } from "./section-wrapper.tsx";
-import { page } from "./render.tsx";
-import { entryPage } from "./entry-page.tsx";
 import { globalItem } from "./global.ts";
 import { marks } from "./marks.ts";
-export { Zone, renderPage, EMPTY_PAGE_CONTEXT } from "./render.tsx";
-export type { PageTree, TreeNode, ZoneContent, PairedPage, Registry, PageContext, PageContextLink, PageContextAlternate, PageLink, PageViewProps } from "./render.tsx";
-export { RichText, defaultRichTextImage } from "./richtext-render.tsx";
-export type { RichTextProps, RichTextElement, RichTextImageProps } from "./richtext-render.tsx";
+export { createSupabaseStores, siteOptions } from "./bind.ts";
+export { schemaOf } from "./registration.ts";
+export type { SchemaOr } from "./registration.ts";
+export { EMPTY_PAGE_CONTEXT } from "./page-context.ts";
+export type { PageTree, TreeNode, ZoneContent, EditorWrap, PageContext, PageContextLink, PageContextAlternate, PageLink } from "./page-context.ts";
 export type { PageSchema } from "./page.ts";
 export { fixedSlug } from "./page.ts";
-export type { EntryPageSchema, PairedEntryPage, EntryPageProps } from "./entry-page.tsx";
+/** The one rule for a link an editor typed: http(s), mailto, tel and site-relative targets pass; anything else is null, so a view renders no href (spec 2026-09-07 list field §5). React neutralises javascript: URLs; Astro does not, so an .astro view uses this. */
+export { safeHref } from "./richtext-href.ts";
+export type { EntryPageSchema, EntryPageProps, EntryFields } from "./view-props.ts";
 export { f, normalizeOptions, optionsOf, optionValues } from "./fields.ts";
 export { when, evaluate, isHidden, assertConditions, splitConditionPath } from "./conditions.ts";
 export { DEFAULT_STYLE_VALUES, STYLE_KEYS, SPACING_NONE, resolveStyleValues, styleDescriptors, inlineStyles } from "./styles.ts";
@@ -53,6 +52,9 @@ export { SupabaseEntryStore } from "./supabase-entry-store.ts";
 export { SupabasePathIndex } from "./supabase-path-index.ts";
 export type { EntryStore, EntryRecord, EntryLocale, EntryVersion, EntryScan, EntryUsage, ListOptions, CreateEntryOptions, AddEntryLocaleOptions, EntryStoreOptions, Where, WhereValue, SnapshotQuery, SnapshotRow, } from "./entry-store.ts";
 export { entryErrors, compareEntries, DEFAULT_ENTRY_LOCALES, localizedKeys, splitFields, entryLocaleRow, entryFieldsIn, entryRefEdges, entryTitleIn, matchesWhere, } from "./entry-store.ts";
+export { MemoryPublishedStore } from "./published.ts";
+export { SupabasePublishedStore } from "./supabase-published-store.ts";
+export type { PublishedStore, PublishedPageRow, PublishedEntryRow, PublishedRoute, PublishedTreeRow, PublishedQuery, PublishedKey } from "./published.ts";
 export { affectedTargets, pageTag, entryTag, globalTag, pagesTreeTag, collectionTag } from "./revalidate.ts";
 export type { AffectedTargets } from "./revalidate.ts";
 export { resolveTree, resolveFields, resolveMedia } from "./resolve.ts";
@@ -71,18 +73,19 @@ export { node } from "./content/node.ts";
 export type { CollectionSeo } from "./seo.ts";
 export type { EntryRef, EntryItem, PageItem, GlobalItem, VisualGlobalItem, Seo } from "./read-shapes.ts";
 export type { RefTo } from "./fields.ts";
-export type { Props, PairedComponent } from "./pairing.tsx";
+export type { Props } from "./view-props.ts";
 export type { CollectionSchema, EntryOrder } from "./collections.ts";
 export { DEFAULT_TOOLSET, type Toolset, type ToolsetMark, type ToolsetNode } from "./toolset.ts";
 export { collectionOrder, collectionDepth, DEFAULT_ORDER } from "./collections.ts";
 export type { ZonePolicy } from "./zones.ts";
 export { GLOBAL_NODE_TYPE, SETTINGS_KEY, STYLES_KEY, CSS_KEY, globalLink } from "./global.ts";
-export { SMD_KEY } from "./section-wrapper.tsx";
-export type { SmdInternal } from "./section-wrapper.tsx";
+export { SMD_KEY } from "./smd-key.ts";
+export type { SmdInternal } from "./smd-key.ts";
 export { CSS_MAX, cssProblem, safeCss, scopedCss } from "./css.ts";
 export { globalEntryId } from "./global-id.ts";
 export { DEFAULT_SPACE_ID } from "./sql-space.ts";
 export type { GlobalSchema, GlobalLink } from "./global.ts";
+/** The registration namespace: schemas and their parts. The React pairing (`smoodly.section`, `<smoodly.Section>`) is smoodly/react's. */
 export declare const smoodly: {
     schema: {
         page: typeof import("./page.ts").pageSchema;
@@ -117,14 +120,9 @@ export declare const smoodly: {
             contexts: ("richtext" | "column")[];
         }): import("./schema.ts").ElementSchema<F, S>;
     };
-    section: typeof section;
-    element: typeof element;
-    page: typeof page;
-    entryPage: typeof entryPage;
     collection: typeof collection;
     toolset: typeof toolset;
     global: typeof globalItem;
-    Section: typeof Section;
     marks: typeof marks;
 };
 export { NODE_ATTR, ZONE_ATTR, EMPTY_ATTR, BLANK_ATTR, FIELD_ATTR, ITEM_ATTR, EDITOR_ATTR, resolveMarkPath } from "./marks.ts";

package/dist/index.js

@@ -1,15 +1,14 @@
 import { schema } from "./schema.js";
-import { section, element } from "./pairing.js";
 import { collection } from "./collections.js";
 import { toolset } from "./toolset.js";
-import { Section } from "./section-wrapper.js";
-import { page } from "./render.js";
-import { entryPage } from "./entry-page.js";
 import { globalItem } from "./global.js";
 import { marks } from "./marks.js";
-export { Zone, renderPage, EMPTY_PAGE_CONTEXT } from "./render.js";
-export { RichText, defaultRichTextImage } from "./richtext-render.js";
+export { createSupabaseStores, siteOptions } from "./bind.js";
+export { schemaOf } from "./registration.js";
+export { EMPTY_PAGE_CONTEXT } from "./page-context.js";
 export { fixedSlug } from "./page.js";
+/** The one rule for a link an editor typed: http(s), mailto, tel and site-relative targets pass; anything else is null, so a view renders no href (spec 2026-09-07 list field §5). React neutralises javascript: URLs; Astro does not, so an .astro view uses this. */
+export { safeHref } from "./richtext-href.js";
 export { f, normalizeOptions, optionsOf, optionValues } from "./fields.js";
 export { when, evaluate, isHidden, assertConditions, splitConditionPath } from "./conditions.js";
 export { DEFAULT_STYLE_VALUES, STYLE_KEYS, SPACING_NONE, resolveStyleValues, styleDescriptors, inlineStyles } from "./styles.js";
@@ -39,6 +38,8 @@ export { MemoryEntryStore } from "./entry-store.js";
 export { SupabaseEntryStore } from "./supabase-entry-store.js";
 export { SupabasePathIndex } from "./supabase-path-index.js";
 export { entryErrors, compareEntries, DEFAULT_ENTRY_LOCALES, localizedKeys, splitFields, entryLocaleRow, entryFieldsIn, entryRefEdges, entryTitleIn, matchesWhere, } from "./entry-store.js";
+export { MemoryPublishedStore } from "./published.js";
+export { SupabasePublishedStore } from "./supabase-published-store.js";
 export { affectedTargets, pageTag, entryTag, globalTag, pagesTreeTag, collectionTag } from "./revalidate.js";
 export { resolveTree, resolveFields, resolveMedia } from "./resolve.js";
 export { SEGMENT_RE, isSegment, assertSegment, slugify, joinPath, splitPath, segmentFor, isHomeNode, pagePathIn, chainOf, assertDepth, pagePath, pagePathRows, entryPathRows, collectionSegment, buildPageTree, perLocaleSegments, assertSupportedLocale, unsupportedLocale, pageAlternates, entryAlternates, } from "./paths.js";
@@ -50,22 +51,12 @@ export { node } from "./content/node.js";
 export { DEFAULT_TOOLSET } from "./toolset.js";
 export { collectionOrder, collectionDepth, DEFAULT_ORDER } from "./collections.js";
 export { GLOBAL_NODE_TYPE, SETTINGS_KEY, STYLES_KEY, CSS_KEY, globalLink } from "./global.js";
-export { SMD_KEY } from "./section-wrapper.js";
+export { SMD_KEY } from "./smd-key.js";
 export { CSS_MAX, cssProblem, safeCss, scopedCss } from "./css.js";
 export { globalEntryId } from "./global-id.js";
 export { DEFAULT_SPACE_ID } from "./sql-space.js";
-export const smoodly = {
-    schema,
-    section,
-    element,
-    page,
-    entryPage,
-    collection,
-    toolset,
-    global: globalItem,
-    Section,
-    marks,
-};
+/** The registration namespace: schemas and their parts. The React pairing (`smoodly.section`, `<smoodly.Section>`) is smoodly/react's. */
+export const smoodly = { schema, collection, toolset, global: globalItem, marks };
 export { NODE_ATTR, ZONE_ATTR, EMPTY_ATTR, BLANK_ATTR, FIELD_ATTR, ITEM_ATTR, EDITOR_ATTR, resolveMarkPath } from "./marks.js";
 export { resolveSmoodlyEnv, smoodlyEnv, presenceConfig, siteUrl } from "./env.js";
 export { clientOptions, createSmoodlyClient } from "./client.js";

package/dist/marks.d.ts

@@ -7,6 +7,13 @@ export declare const EMPTY_ATTR = "data-smd-empty";
 /** A section that renders no text and no media, stamped by the bridge in
  *  editor mode so the canvas can give it a height to see and select. */
 export declare const BLANK_ATTR = "data-smd-blank";
+/** The one rule the canvas needs from the page itself; the server renders it in editor mode, in a <style>
+ *  the canvas diagnosis looks for, so it lives here and a server imports nothing of the bridge. The
+ *  editor sizes the frame to the reported height, so the document's own viewport must never scroll
+ *  (2026-09-26): a fractional content height (4595.3px in a 4595px frame) left it scrollable by a hair,
+ *  and a trackpad scroll over the canvas showed the frame's overlay scrollbar. Hidden overflow drops no
+ *  layout, and the live site never carries this. */
+export declare const BRIDGE_CSS = "html{overflow:hidden}[data-smd-node][data-smd-blank]{min-height:7rem}";
 /** The element that renders a field's value verbatim. */
 export declare const FIELD_ATTR = "data-smd-field";
 /** A list item's or object field's root: scopes the field names inside it. */

package/dist/marks.js

@@ -6,6 +6,13 @@ export const EMPTY_ATTR = "data-smd-empty";
 /** A section that renders no text and no media, stamped by the bridge in
  *  editor mode so the canvas can give it a height to see and select. */
 export const BLANK_ATTR = "data-smd-blank";
+/** The one rule the canvas needs from the page itself; the server renders it in editor mode, in a <style>
+ *  the canvas diagnosis looks for, so it lives here and a server imports nothing of the bridge. The
+ *  editor sizes the frame to the reported height, so the document's own viewport must never scroll
+ *  (2026-09-26): a fractional content height (4595.3px in a 4595px frame) left it scrollable by a hair,
+ *  and a trackpad scroll over the canvas showed the frame's overlay scrollbar. Hidden overflow drops no
+ *  layout, and the live site never carries this. */
+export const BRIDGE_CSS = `html{overflow:hidden}[${NODE_ATTR}][${BLANK_ATTR}]{min-height:7rem}`;
 /** The element that renders a field's value verbatim. */
 export const FIELD_ATTR = "data-smd-field";
 /** A list item's or object field's root: scopes the field names inside it. */

package/dist/next/admin-route.d.ts

@@ -0,0 +1,7 @@
+import { type AdminHandlerDeps } from "../admin/handler.ts";
+export type AdminRouteDeps = Omit<AdminHandlerDeps, "effects">;
+/** `deps` is read per request: the app's glue reads the environment there, so `next build` needs no keys. */
+export declare function createAdminRoute(deps: () => AdminRouteDeps): {
+    GET: (request: Request) => Promise<Response>;
+    POST: (request: Request) => Promise<Response>;
+};

package/dist/next/admin-route.js

@@ -0,0 +1,28 @@
+// packages/smoodly/src/next/admin-route.ts
+// The admin in a Next app (spec 2026-10-02 astro cloud fit §4): one route handler file exports GET and
+// POST from here, and that is the whole mount — the page, the package's files and the operations
+// endpoint (admin/handler.ts). This file adds only what is Next's: the cache and draft mode.
+import { revalidateTag } from "next/cache";
+import { draftMode } from "next/headers";
+import { connection } from "next/server";
+import { createAdminHandler } from "../admin/handler.js";
+const effects = {
+    // `{ expire: 0 }`, not a profile: a profile is stale-while-revalidate, so the first request after a
+    // publish would still get the cached page (or the cached 404). updateTag is for server actions only.
+    revalidate: (tag) => revalidateTag(tag, { expire: 0 }),
+    draft: {
+        enable: async () => (await draftMode()).enable(),
+        disable: async () => (await draftMode()).disable(),
+    },
+};
+/** `deps` is read per request: the app's glue reads the environment there, so `next build` needs no keys. */
+export function createAdminRoute(deps) {
+    const handle = createAdminHandler(() => ({ ...deps(), effects }));
+    // A request first: the handler catches every error to answer with a named one, and Next's own
+    // "this route is dynamic" signal must not be among them.
+    const route = async (request) => {
+        await connection();
+        return handle(request);
+    };
+    return { GET: route, POST: route };
+}

package/dist/next/bridge.d.ts

@@ -0,0 +1 @@
+export declare function EditorBridge(): null;

package/dist/next/bridge.js

@@ -0,0 +1,26 @@
+"use client";
+// The plain bridge in a Next app (spec 2026-10-02 astro cloud fit §5): started once inside the canvas
+// frame with the router's refresh, so a save re-renders the route in place — no reload, the inline
+// editing session and the scroll position survive. Loaded lazily through the canvas stub in editor
+// mode only (canvas-slot.tsx); a live page never downloads it.
+import { useEffect, useRef } from "react";
+import { useRouter } from "next/navigation";
+import { startBridge } from "../bridge/bridge.js";
+export function EditorBridge() {
+    const router = useRouter();
+    const bridge = useRef(null);
+    useEffect(() => {
+        const started = startBridge({ refresh: () => router.refresh() });
+        bridge.current = started;
+        return () => { started.stop(); bridge.current = null; };
+    }, [router]);
+    // Every later commit of this component — each refresh re-renders the route — tells the editor the new
+    // markup is in the DOM. The mount's own report is startBridge's.
+    const mounted = useRef(false);
+    useEffect(() => {
+        if (mounted.current)
+            bridge.current?.rendered();
+        mounted.current = true;
+    });
+    return null;
+}

package/dist/next/canvas-boundary.d.ts

@@ -11,6 +11,6 @@ type State = {
 export declare class CanvasBoundary extends Component<Props, State> {
     state: State;
     static getDerivedStateFromError(error: unknown): State;
-    render(): string | number | bigint | boolean | Iterable<ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | import("react").JSX.Element | null | undefined;
+    render(): string | number | bigint | boolean | import("react").JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined;
 }
 export {};

package/dist/next/canvas-slot.d.ts

@@ -5,3 +5,4 @@ export declare const CanvasNetSlot: import("react").ComponentType<{
     title: string;
     children?: ReactNode;
 }>;
+export declare const PreviewPillSlot: import("react").ComponentType<{}>;

package/dist/next/canvas-slot.js

@@ -2,8 +2,9 @@
 // The one Smoodly client module a live page carries (spec 2026-09-29
 // pre-install fixes §1). Next ships every client module a route's server
 // graph imports, rendered or not; this stub is that module, and the bridge
-// and the canvas net load from it lazily — only when the renderer is in
-// editor mode, so a live page downloads neither.
+// and the canvas net load from it lazily in editor mode, and the preview
+// pill's definition in draft mode, so a live page downloads none of them.
 import dynamic from "next/dynamic";
-export const CanvasBridgeSlot = dynamic(() => import("../admin/next/bridge.js").then((m) => m.EditorBridge));
+export const CanvasBridgeSlot = dynamic(() => import("./bridge.js").then((m) => m.EditorBridge));
 export const CanvasNetSlot = dynamic(() => import("./canvas-boundary.js").then((m) => m.CanvasBoundary));
+export const PreviewPillSlot = dynamic(() => import("./preview-pill-define.js").then((m) => m.PreviewPillDefine));

package/dist/next/index.d.ts

@@ -5,3 +5,5 @@ export { createSmoodlyQueries } from "./queries.ts";
 export type { SmoodlyQueries, QueryOptions, EntriesQuery, TypedEntryItem, GlobalValue } from "./queries.ts";
 export { previewRoute } from "./preview-route.ts";
 export { previewPill } from "./preview-pill.tsx";
+export { createAdminRoute } from "./admin-route.ts";
+export type { AdminRouteDeps } from "./admin-route.ts";

package/dist/next/index.js

@@ -3,3 +3,4 @@ export { metadataFrom, metadataFromSeo } from "./meta.js";
 export { createSmoodlyQueries } from "./queries.js";
 export { previewRoute } from "./preview-route.js";
 export { previewPill } from "./preview-pill.js";
+export { createAdminRoute } from "./admin-route.js";

package/dist/next/page-renderer.d.ts

@@ -13,7 +13,7 @@ type SectionEntry = ComponentType<any> & {
         fields: Record<string, Descriptor>;
     };
 };
-/** A page shape or an entry page — anything in `config.registry.pages`. */
+/** A page type's or an entry page's component — the `pages` of defineViews. */
 export type PageRegistration = ((props: any) => ReactElement) & {
     schema: {
         kind: string;
@@ -26,6 +26,10 @@ export type PageRendererOptions = {
     sections: SectionEntry[];
     /** Registered Elements: what the custom section's default richtext renderer needs when no RichText is bound (spec 2026-09-14 §6). */
     elements?: SectionEntry[];
+    /** The project's bound RichText for the custom section's columns; replaces `config.custom.RichText` (plan 2026-10-02 registration split). */
+    RichText?: ComponentType<{
+        doc: unknown;
+    }>;
     pages: ReadonlyArray<PageRegistration>;
     /** Locale-relative CMS path → site URL. Default: the path itself. With
      *  next-intl: `(path, locale) => getPathname({ locale, href: path })`. */

package/dist/next/page-renderer.js

@@ -1,25 +1,26 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // The site-route seam (spec 2026-09-05 §5): the two route files call
-// renderSmoodlyPath; everything else — request gating, draft mode, the
-// cache keyed by (locale, path, target) and tagged by id, 404s, the editor
-// bridge (through the lazy canvas stub) — lives here, over the
-// framework-free site layer. Bound once by the app, exactly like
-// createAdminOpHandler.
+// renderSmoodlyPath; everything else — request gating, draft mode, 404s,
+// the editor bridge (through the lazy canvas stub) — lives here, over the
+// framework-free site layer. The reads are the read layer's units, keyed
+// by (locale, path, target) and tagged by id (../reads.ts), run by Next's
+// adapter (./reads.ts). Bound once by the app, exactly like createAdminRoute.
 import { Suspense } from "react";
-import { unstable_cache } from "next/cache";
 import { draftMode } from "next/headers";
 import { notFound, permanentRedirect, unstable_rethrow } from "next/navigation";
 import { connection } from "next/server";
+import { BRIDGE_CSS } from "../marks.js";
 import { CanvasBridgeSlot, CanvasNetSlot } from "./canvas-slot.js";
 import { DRAFT_META_NAME } from "../admin/editor/canvas-diagnosis.js";
 import { fixedPathFor } from "../localize.js";
 import { decodeSegment, joinPath } from "../paths.js";
 import { renderPage } from "../render.js";
-import { entryTag, pageTag, globalTag } from "../revalidate.js";
+import { globalUnit, hitUnit } from "../reads.js";
 import { toEntryItem } from "../read-shapes.js";
 import { pageContextOf } from "../site.js";
 import { metadataFromSeo } from "./meta.js";
 import { previewPill } from "./preview-pill.js";
+import { nextReads } from "./reads.js";
 /** Logged once per renderer when Next's cacheComponents is on (spec 2026-09-27 cache components §2). */
 export const CACHE_COMPONENTS_WARNING = "smoodly: Next's cacheComponents is on, and Smoodly does not support it — a missing page answers 200 with noindex instead of 404, and a redirect answers 200 instead of 308. Turn cacheComponents off in next.config.ts; the Next.js guide's \"Cache Components\" section says why (https://smoodly.io/docs/frameworks/nextjs).";
 /** The canvas net (spec 2026-09-27 section guard §5): Server Components hand a section that failed to the
@@ -31,18 +32,11 @@ export function createPageRenderer(options) {
     const href = options.href ?? ((path) => path);
     const shapes = new Map(options.pages.filter((p) => p.schema.kind === "page").map((p) => [p.schema.name, p]));
     const entryPages = new Map(options.pages.filter((p) => p.schema.kind === "entryPage" && p.schema.collection).map((p) => [p.schema.collection, p]));
-    /** The hit for a located target (locate is uncached: the id it returns
-     *  IS the cache tag): load — cached per (locale, path) outside draft mode. */
-    async function load(target, locale, path, draft, version) {
-        if (draft)
-            return site.load(target, locale, path, { draft: true, ...(version !== undefined ? { version } : {}) });
-        // Keyed by what the unit holds, not only where: an address that changes
-        // owner — a deploy handing it to a code record, which fires no tag —
-        // can never serve the previous occupant (spec 2026-09-29 pre-install fixes §5).
-        return unstable_cache(() => site.load(target, locale, path), ["smoodly-site", site.cacheKey, locale, path, target.kind, target.id], {
-            tags: [target.kind === "page" ? pageTag(target.id) : entryTag(target.id)],
-        })();
-    }
+    /** Next's miss is locate, then one lookup: `unstable_cache` takes its tags before the read, so the id must be
+     *  known first (spec 2026-10-07 delivery model, decision 6; Astro tags after the read, ../astro/shell.ts).
+     *  The hit for a located target (locate is uncached: the id it returns IS the cache tag): the read
+     *  layer's unit, run by Next's adapter — the draft inside draft mode, one cached unit outside it. */
+    const load = (target, locale, path, version) => nextReads.run(hitUnit(site, target, locale, path, version));
     /** A redirect row (spec 2026-09-26 redirects §7): the node's CURRENT path in this locale, through href, the query kept; no path there is a 404. */
     async function redirectTo(target, locale, params) {
         const current = (await site.targetPaths(target))[locale];
@@ -67,7 +61,7 @@ export function createPageRenderer(options) {
                 notFound();
             }
             const page = pageContextOf(hit, href);
-            return renderPage(Page, hit.tree, { sections: options.sections, elements: options.elements, styles: site.styles, custom: site.custom }, { editor, page, rethrow: unstable_rethrow, editorWrap: canvasWrap });
+            return renderPage(Page, hit.tree, { sections: options.sections, elements: options.elements, styles: site.styles, custom: { ...site.custom, RichText: (options.RichText ?? site.custom.RichText) } }, { editor, page, rethrow: unstable_rethrow, editorWrap: canvasWrap });
         }
         const View = entryPages.get(hit.collection);
         if (!View) {
@@ -119,24 +113,23 @@ export function createPageRenderer(options) {
         if (target?.redirect)
             await redirectTo(target, locale, params);
         // A code-owned address with no record yet is served from code (spec 2026-09-30 tester findings §2).
-        const hit = target ? await load(target, locale, path, draft, version) : site.codePage(locale, path);
+        const hit = target ? await load(target, locale, path, version) : site.codePage(locale, path);
         if (!hit || !accept(hit))
             notFound();
         // The draft marker tells the page editor's canvas diagnosis that Smoodly
         // rendered this response (spec 2026-09-27 shadowed-page detector §3);
         // React hoists the meta into the head. Never outside draft mode.
-        return (_jsxs(_Fragment, { children: [draft ? _jsx("meta", { name: DRAFT_META_NAME }) : null, editor ? _jsx(CanvasBridgeSlot, {}) : null, draft && !editor && !version ? previewPill({ route: options.previewRoute }) : null, render(hit, editor, locale)] }));
+        return (_jsxs(_Fragment, { children: [draft ? _jsx("meta", { name: DRAFT_META_NAME }) : null, editor ? _jsx("style", { "data-smoodly-bridge": "", children: BRIDGE_CSS }) : null, editor ? _jsx(CanvasBridgeSlot, {}) : null, draft && !editor && !version ? previewPill({ route: options.previewRoute }) : null, render(hit, editor, locale)] }));
     }
     async function metadata(pathFor, opts, accept) {
         // generateMetadata runs alongside the page render, so it gates too.
         await connection();
         const locale = opts?.locale ?? site.locales.default;
         const path = pathFor(locale);
-        const { isEnabled: draft } = await draftMode();
         const target = await site.locate(locale, path);
         if (target?.redirect)
             return {};
-        const hit = target ? await load(target, locale, path, draft) : site.codePage(locale, path);
+        const hit = target ? await load(target, locale, path) : site.codePage(locale, path);
         if (!hit || !accept(hit))
             return {};
         // A page type without seo: true still gets its page title as <title>; seo: true adds the panel's values on top.
@@ -156,17 +149,10 @@ export function createPageRenderer(options) {
      *  error surfaces as a rejected promise like every other failure. */
     const fixedPath = (Page) => (locale) => fixedPathFor(Page.schema, locale, site.locales, site.homePageSlug);
     const literal = (segments) => () => joinPath(segments.map(decodeSegment));
-    /** A global item for a layout: cached per (item, locale) under the
-     *  global tag outside draft mode, the live draft inside it. */
+    /** A global item for a layout, by schema: the unit `q.getGlobal` runs for the same item and locale. */
     async function getSmoodlyGlobal(item, opts) {
         await connection();
-        const locale = opts?.locale ?? site.locales.default;
-        const { isEnabled: draft } = await draftMode();
-        if (draft)
-            return site.getGlobal(item, { locale, draft: true });
-        return unstable_cache(() => site.getGlobal(item, { locale }), ["smoodly-global", site.cacheKey, item.name, locale], {
-            tags: [globalTag(item.name)],
-        })();
+        return nextReads.run(globalUnit(site, item, opts?.locale ?? site.locales.default));
     }
     return {
         getSmoodlyGlobal,

package/dist/next/preview-pill-define.d.ts

@@ -0,0 +1 @@
+export declare function PreviewPillDefine(): null;

package/dist/next/preview-pill-define.js

@@ -0,0 +1,10 @@
+"use client";
+// Defines the preview pill's element in a Next app (plan 2026-10-03 plain bridge). Loaded lazily through
+// the canvas stub, in draft mode only: after a full load and after a client navigation alike, which an
+// inline script could not do (React never runs a script it inserts on the client).
+import { useEffect } from "react";
+import { definePreviewPill } from "../bridge/preview-pill.js";
+export function PreviewPillDefine() {
+    useEffect(() => { definePreviewPill(); }, []);
+    return null;
+}

package/dist/next/preview-pill.d.ts

@@ -1,7 +1,4 @@
 import { type ReactElement } from "react";
-/** The pill's whole client side. `closed` lives in the closure, so a hidden
- *  pill stays hidden across client navigations and returns on a reload. */
-export declare const PREVIEW_PILL_SCRIPT: string;
 /** The pill for a route that does not go through the renderer: render it
  *  when `(await draftMode()).isEnabled`, never in the editor's canvas. */
 export declare function previewPill(opts?: {

package/dist/next/preview-pill.js

@@ -1,56 +1,13 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-// The preview pill (spec 2026-09-29 pre-install fixes §2): while draft mode
-// is on, outside the editor's canvas, a floating pill says the page shows
-// unpublished changes and offers Exit preview. It is an inline script
-// defining a custom element with its styles in a Shadow DOM — no React,
-// no client module, never in the site's bundles (the live-page rule, §1).
-// The renderer emits it only in draft mode, so a live page's HTML is
-// unchanged. A strict Content-Security-Policy blocks the inline script;
-// the Next.js guide says so. The script is a constant: the route rides on
-// the element, so nothing is interpolated into code.
+// The preview pill in a Next app (spec 2026-09-29 pre-install fixes §2; plan 2026-10-03 plain bridge):
+// the element, which carries the preview route, and the slot that defines it (bridge/preview-pill.ts)
+// from a lazy chunk. The renderer emits both only in draft mode, outside the editor's canvas, so a live
+// page's HTML is unchanged and it loads nothing for the pill.
 import { createElement } from "react";
-const CSS = ":host{all:initial}:host([hidden]){display:none}" +
-    ".pill{position:fixed;bottom:16px;z-index:2147483647;display:flex;align-items:center;gap:8px;padding:6px 6px 6px 14px;" +
-    "border-radius:999px;background:#151727;color:#fff;font:500 13px/1.2 system-ui,-apple-system,sans-serif;" +
-    "box-shadow:0 4px 16px rgba(0,0,0,.25);cursor:grab;user-select:none;touch-action:none}" +
-    ".pill[data-pos=left]{left:16px}.pill[data-pos=center]{left:50%;transform:translateX(-50%)}.pill[data-pos=right]{right:16px}" +
-    ".pill.dragging{cursor:grabbing}" +
-    "a{color:#151727;background:#fff;border-radius:999px;padding:5px 10px;text-decoration:none;font-weight:600}" +
-    "button{all:unset;cursor:pointer;width:24px;height:24px;border-radius:999px;display:grid;place-items:center;color:#fff;opacity:.7}" +
-    "button:hover,button:focus-visible{opacity:1;outline:2px solid #fff}";
-const HTML = '<div class="pill" role="region" aria-label="Smoodly preview">' +
-    "<span>Preview \\u00b7 unpublished changes</span>" +
-    '<a href="#">Exit preview</a>' +
-    '<button type="button" aria-label="Hide until reload">\\u00d7</button>' +
-    "</div>";
-/** The pill's whole client side. `closed` lives in the closure, so a hidden
- *  pill stays hidden across client navigations and returns on a reload. */
-export const PREVIEW_PILL_SCRIPT = "(function(){" +
-    'if(customElements.get("smoodly-preview-pill"))return;' +
-    'var KEY="smoodly-pill-position",closed=false;' +
-    'function load(){try{var v=localStorage.getItem(KEY);return v==="left"||v==="right"?v:"center"}catch(e){return"center"}}' +
-    "function save(v){try{localStorage.setItem(KEY,v)}catch(e){}}" +
-    "class Pill extends HTMLElement{connectedCallback(){" +
-    "if(closed){this.hidden=true;return}" +
-    "if(this.shadowRoot)return;" +
-    'var root=this.attachShadow({mode:"open"}),self=this;' +
-    `root.innerHTML="<style>${CSS}</style>${HTML.replace(/"/g, '\\"')}";` +
-    'var pill=root.querySelector(".pill"),link=root.querySelector("a"),close=root.querySelector("button");' +
-    'pill.setAttribute("data-pos",load());' +
-    'link.addEventListener("click",function(e){e.preventDefault();var route=self.getAttribute("data-route")||"/api/preview";' +
-    'location.href=route+(route.indexOf("?")<0?"?":"&")+"disable&path="+encodeURIComponent(location.pathname+location.search)});' +
-    'close.addEventListener("click",function(){closed=true;self.hidden=true});' +
-    "var start=null;" +
-    'pill.addEventListener("pointerdown",function(e){if(e.target.closest("a,button"))return;start=e.clientX;pill.setPointerCapture(e.pointerId);pill.classList.add("dragging")});' +
-    'pill.addEventListener("pointermove",function(e){if(start!==null)pill.style.translate=(e.clientX-start)+"px 0"});' +
-    'pill.addEventListener("pointerup",function(e){if(start===null)return;start=null;pill.classList.remove("dragging");pill.style.translate="";' +
-    'var x=e.clientX/innerWidth,pos=x<1/3?"left":x>2/3?"right":"center";pill.setAttribute("data-pos",pos);save(pos)});' +
-    'pill.addEventListener("pointercancel",function(){if(start===null)return;start=null;pill.classList.remove("dragging");pill.style.translate=""});' +
-    "}}" +
-    'customElements.define("smoodly-preview-pill",Pill);' +
-    "})();";
+import { PILL_TAG } from "../bridge/preview-pill.js";
+import { PreviewPillSlot } from "./canvas-slot.js";
 /** The pill for a route that does not go through the renderer: render it
  *  when `(await draftMode()).isEnabled`, never in the editor's canvas. */
 export function previewPill(opts) {
-    return (_jsxs(_Fragment, { children: [_jsx("script", { dangerouslySetInnerHTML: { __html: PREVIEW_PILL_SCRIPT } }), createElement("smoodly-preview-pill", { "data-route": opts?.route ?? "/api/preview" })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(PreviewPillSlot, {}), createElement(PILL_TAG, { "data-route": opts?.route ?? "/api/preview" })] }));
 }

package/dist/next/queries.d.ts

@@ -1,35 +1,10 @@
 import type { CollectionSchema } from "../collections.ts";
 import type { GlobalSchema } from "../global.ts";
-import { type EntryItem, type PageItem } from "../read-shapes.ts";
-import type { Materialize } from "../schema.ts";
-import type { EntryQuery, PageTreeItem, SmoodlySite } from "../site.ts";
-export type QueryOptions = {
-    locale?: string;
-};
-export type EntriesQuery = Omit<EntryQuery, "locale" | "draft" | "ids"> & QueryOptions;
-type ByName<T, N> = Extract<T, {
-    name: N;
-}>;
-/** Fields typed from the schema, references materialized as `EntryRef`s; a widened `CollectionSchema[]` array (names are `string`) falls back to the untyped record instead of `never`. */
-type EntryFields<C extends readonly CollectionSchema<any, string>[], N> = string extends C[number]["name"] ? Record<string, unknown> : {
-    [K in keyof NonNullable<ByName<C[number], N>["__entry"]>]: Materialize<NonNullable<ByName<C[number], N>["__entry"]>[K]>;
-};
-/** A read item whose `fields` are the collection's typed values. */
-export type TypedEntryItem<C extends readonly CollectionSchema<any, string>[], N> = EntryItem<EntryFields<C, N>>;
-export type GlobalValue<S extends readonly GlobalSchema<any, string>[], N> = string extends S[number]["name"] ? Record<string, unknown> : NonNullable<ByName<S[number], N>["__value"]>;
-export type SmoodlyQueries<C extends readonly CollectionSchema<any, string>[], S extends readonly GlobalSchema<any, string>[]> = {
-    /** The published page tree in a locale, every item with its page fields. */
-    getPageTree(options?: QueryOptions): Promise<PageTreeItem[]>;
-    /** A page by locale-relative path ("/company/about-us") or id. */
-    getPage(pathOrId: string, options?: QueryOptions): Promise<PageItem | null>;
-    /** Published entries of a collection: `where` (shared fields), `order`, `limit`, `parent` run in the store. */
-    getEntries<N extends C[number]["name"]>(collection: N, options?: EntriesQuery): Promise<TypedEntryItem<C, N>[]>;
-    getEntry<N extends C[number]["name"]>(collection: N, idOrPath: string, options?: QueryOptions): Promise<TypedEntryItem<C, N> | null>;
-    getGlobal<N extends S[number]["name"]>(item: N, options?: QueryOptions): Promise<GlobalValue<S, N> | null>;
-};
+import { type SmoodlyQueries } from "../reads.ts";
+import type { SmoodlySite } from "../site.ts";
+export type { SmoodlyQueries, QueryOptions, EntriesQuery, TypedEntryItem, GlobalValue } from "../reads.ts";
 export declare function createSmoodlyQueries<const C extends readonly CollectionSchema<any, string>[], const S extends readonly GlobalSchema<any, string>[] = []>(options: {
     site: SmoodlySite;
     collections: C;
     globals?: S;
 }): SmoodlyQueries<C, S>;
-export {};