camox 0.75.0 → 0.76.1

package/dist/features/provider/AuthenticatedCamoxProvider.js

@@ -7,18 +7,18 @@ import { useApplyTheme, useThemeActions } from "../studio/useTheme.js";
 import { usePreviewPagesActions, useShowCanvasAction } from "../preview/CamoxPreview.js";
 import { useProjectRoom } from "../../lib/use-project-room.js";
 import { useLeaveDraft } from "../studio/viewSwitch.js";
+import { DraftNotices } from "../studio/components/DraftNotices.js";
 import { useNavbarActions } from "../studio/components/Navbar.js";
-import { draftNoticeMessage } from "../studio/draftNotice.js";
 import { CommandPalette, useCommandPaletteActions } from "./components/CommandPalette.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Toaster, toast } from "@camox/ui/toaster";
+import { Toaster } from "@camox/ui/toaster";
 import studioCssUrl from "virtual:camox-studio-css";
 
 //#region src/features/provider/AuthenticatedCamoxProvider.tsx
 function AuthenticatedCamoxProvider(t0) {
-	const $ = c(20);
+	const $ = c(24);
 	const { children } = t0;
 	useAdminShortcuts();
 	useCommandPaletteActions();
@@ -37,85 +37,97 @@ function AuthenticatedCamoxProvider(t0) {
 	const { data: project } = useReadQuery(t1);
 	const draftScope = useDraftScope();
 	const studioCache = useStudioCache();
+	const [revisions] = React.useState(createRevisions);
+	const leaveDraft = useLeaveDraft();
 	let t2;
+	if ($[2] !== authClient || $[3] !== draftScope || $[4] !== leaveDraft) {
+		t2 = (left, by) => {
+			if (left.draftId !== draftScope.current()) return;
+			if (by === signedInUserId(authClient)) return leaveDraft(left);
+			draftScope.leave(left, { notice: true });
+		};
+		$[2] = authClient;
+		$[3] = draftScope;
+		$[4] = leaveDraft;
+		$[5] = t2;
+	} else t2 = $[5];
+	const onDraftLeft = t2;
 	let t3;
-	if ($[2] !== draftScope) {
-		t2 = () => draftScope.onNotice(_temp);
-		t3 = [draftScope];
-		$[2] = draftScope;
-		$[3] = t2;
-		$[4] = t3;
+	let t4;
+	if ($[6] !== onDraftLeft) {
+		t3 = (ended) => onDraftLeft(ended, ended.endedBy.id);
+		t4 = (archived) => onDraftLeft(archived, archived.archivedBy.id);
+		$[6] = onDraftLeft;
+		$[7] = t3;
+		$[8] = t4;
 	} else {
-		t2 = $[3];
-		t3 = $[4];
+		t3 = $[7];
+		t4 = $[8];
 	}
-	React.useEffect(t2, t3);
-	const [revisions] = React.useState(createRevisions);
-	const leaveDraft = useLeaveDraft();
-	let t4;
-	if ($[5] !== authClient || $[6] !== draftScope || $[7] !== leaveDraft || $[8] !== revisions) {
-		let t5;
-		if ($[10] !== revisions) {
-			t5 = (revision) => revisions.announce(revision);
-			$[10] = revisions;
-			$[11] = t5;
-		} else t5 = $[11];
-		t4 = {
-			onDraftEnded(ended) {
-				if (ended.draftId !== draftScope.current()) return;
-				if (ended.endedBy.id === signedInUserId(authClient)) return leaveDraft(ended);
-				draftScope.leave(ended, { notice: true });
-			},
+	let t5;
+	if ($[9] !== revisions) {
+		t5 = (revision) => revisions.announce(revision);
+		$[9] = revisions;
+		$[10] = t5;
+	} else t5 = $[10];
+	let t6;
+	if ($[11] !== t3 || $[12] !== t4 || $[13] !== t5) {
+		t6 = {
+			onDraftEnded: t3,
+			onDraftArchived: t4,
 			onRevision: t5
 		};
-		$[5] = authClient;
-		$[6] = draftScope;
-		$[7] = leaveDraft;
-		$[8] = revisions;
-		$[9] = t4;
-	} else t4 = $[9];
-	useProjectRoom(apiUrl, project?.id, studioCache, t4);
+		$[11] = t3;
+		$[12] = t4;
+		$[13] = t5;
+		$[14] = t6;
+	} else t6 = $[14];
+	useProjectRoom(apiUrl, project?.id, studioCache, t6);
 	const { resolvedTheme } = useApplyTheme();
-	let t5;
-	if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = /* @__PURE__ */ jsx("link", {
+	let t7;
+	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = /* @__PURE__ */ jsx("link", {
 			rel: "stylesheet",
 			href: studioCssUrl,
 			"data-camox-studio": true
 		});
-		$[12] = t5;
-	} else t5 = $[12];
-	let t6;
-	if ($[13] !== resolvedTheme) {
-		t6 = /* @__PURE__ */ jsx(Toaster, { theme: resolvedTheme });
-		$[13] = resolvedTheme;
-		$[14] = t6;
-	} else t6 = $[14];
-	let t7;
-	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
-		t7 = /* @__PURE__ */ jsx(CommandPalette, {});
 		$[15] = t7;
 	} else t7 = $[15];
 	let t8;
-	if ($[16] !== children || $[17] !== revisions || $[18] !== t6) {
-		t8 = /* @__PURE__ */ jsxs(RevisionsContext, {
+	if ($[16] !== resolvedTheme) {
+		t8 = /* @__PURE__ */ jsx(Toaster, { theme: resolvedTheme });
+		$[16] = resolvedTheme;
+		$[17] = t8;
+	} else t8 = $[17];
+	let t10;
+	let t9;
+	if ($[18] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(CommandPalette, {});
+		t10 = /* @__PURE__ */ jsx(DraftNotices, {});
+		$[18] = t10;
+		$[19] = t9;
+	} else {
+		t10 = $[18];
+		t9 = $[19];
+	}
+	let t11;
+	if ($[20] !== children || $[21] !== revisions || $[22] !== t8) {
+		t11 = /* @__PURE__ */ jsxs(RevisionsContext, {
 			value: revisions,
 			children: [
-				t5,
+				t7,
 				children,
-				t6,
-				t7
+				t8,
+				t9,
+				t10
 			]
 		});
-		$[16] = children;
-		$[17] = revisions;
-		$[18] = t6;
-		$[19] = t8;
-	} else t8 = $[19];
-	return t8;
-}
-function _temp(notice) {
-	toast(draftNoticeMessage(notice));
+		$[20] = children;
+		$[21] = revisions;
+		$[22] = t8;
+		$[23] = t11;
+	} else t11 = $[23];
+	return t11;
 }
 
 //#endregion

package/dist/features/renderer/RendererApp.js

@@ -3,14 +3,14 @@ import { ViewLocaleContext } from "../../lib/view-locale-context.js";
 import { NavigationProvider } from "../navigation/navigation.js";
 import { reads, useRead } from "../../lib/studio-reads.js";
 import { ArtifactStudioContext, ArtifactsRunContext } from "../../core/hooks/useArtifactHost.js";
-import { EditableSurfaceContext } from "../../core/hooks/useIsEditable.js";
-import { CanvasWorkspaceContext } from "../canvas/canvasZoom.js";
-import { PreviewEditingOwnerContext } from "../preview/previewSelection.js";
-import { StudioNoticeContext } from "../preview/studioNotice.js";
-import { ContentEditsContext } from "../../core/editing/contentEdits.js";
-import { restyle } from "../preview/components/previewStyles.js";
 import { PreviewDocumentContext } from "../runtime/PreviewDocumentContext.js";
+import { restyle } from "../preview/components/previewStyles.js";
 import { FrameContext } from "../preview/components/Frame.js";
+import { PreviewEditingOwnerContext } from "../preview/previewSelection.js";
+import { ContentEditsContext } from "../../core/editing/contentEdits.js";
+import { EditableSurfaceContext } from "../../core/editing/useFieldSlot.js";
+import { CanvasWorkspaceContext } from "../canvas/canvasZoom.js";
+import { StudioNoticeContext } from "../preview/studioNotice.js";
 import { DerivedPageContent } from "../page/DerivedPageContent.js";
 import { EditablePageContent } from "../preview/EditablePageContent.js";
 import { c } from "react/compiler-runtime";

package/dist/features/renderer/RendererFrames.js

@@ -5,10 +5,10 @@ import { runtimePath } from "../runtime/navigationTarget.js";
 import { useViewPreparer } from "../../lib/view-switch.js";
 import { useStudioCache } from "../../lib/studio-reads.js";
 import { ArtifactStudioContext, ArtifactsRunContext } from "../../core/hooks/useArtifactHost.js";
-import { EditableSurfaceContext } from "../../core/hooks/useIsEditable.js";
+import { PreviewEditingOwnerContext } from "../preview/previewSelection.js";
+import { EditableSurfaceContext } from "../../core/editing/useFieldSlot.js";
 import { RevisionsContext } from "../../lib/revisions.js";
 import { CanvasWorkspaceContext } from "../canvas/canvasZoom.js";
-import { PreviewEditingOwnerContext } from "../preview/previewSelection.js";
 import { showNotice } from "../preview/studioNotice.js";
 import { RENDERER_DOCUMENT_PATH, STUDIO_HANDLE_KEY } from "./protocol.js";
 import { createRendererHost } from "./rendererHost.js";

package/dist/features/renderer/rendererHost.js

@@ -1,7 +1,7 @@
 import { canvasStore } from "../canvas/canvasStore.js";
 import { previewStore } from "../preview/previewStore.js";
-import { SDK_VERSION, deferredInbox } from "./protocol.js";
 import { createContentEditor } from "../../core/editing/contentEdits.js";
+import { SDK_VERSION, deferredInbox } from "./protocol.js";
 import { LIVE_KEY_SCOPE, scopeOfKey } from "@camox/api-contract/query-keys";
 
 //#region src/features/renderer/rendererHost.ts

package/dist/features/routes/pageRuntime.d.ts

@@ -1,10 +1,11 @@
-import { LocaleView } from "../../lib/locale-path.js";
+import "../../lib/locale-path.js";
 import "../../core/layoutContext.js";
 import "../../core/structuredData.js";
 import "../../core/createLayout.js";
 import "../../core/createApp.js";
+import "../runtime/reader.js";
 import "../../lib/studio-reads.js";
-import { EndedDraft } from "@camox/api-contract/drafts";
+import { ArchivedDraft, EndedDraft } from "@camox/api-contract/drafts";
 import { QueryClient } from "@tanstack/react-query";
 import { Router } from "@camox/api-contract/router";
 import { RouterClient } from "@orpc/server";
@@ -22,8 +23,8 @@ export type PageStructure = {
   recordStructuredData?: PageWithBlocks["recordStructuredData"];
 };
 /**
- * Why a member can't see the draft a URL names: it doesn't exist, it isn't open to them, or it
- * was published or deleted (ADR 0011).
+ * Why a member can't see the draft a URL names: it doesn't exist, it isn't open to them, it
+ * was published or deleted (ADR 0011), or it's archived (ADR 0046).
  */
 export type DraftNotice = {
   reason: "missing";
@@ -31,7 +32,9 @@ export type DraftNotice = {
   reason: "forbidden";
 } | ({
   reason: "ended";
-} & EndedDraft);
+} & EndedDraft) | ({
+  reason: "archived";
+} & ArchivedDraft);
 /** Which draft a render read: the URL's, or Live when there was none or it couldn't be read. */
 export interface DraftRead {
   /** The draft the render read. Absent for Live. */
@@ -44,13 +47,6 @@ export interface DraftRead {
     notice: DraftNotice | null;
   };
 }
-export declare function createServerApiClient(apiUrl: string, options?: {
-  authCookieHeader?: string;
-  /** A look token, which reads the draft it was signed for without a session (ADR 0032). */
-  lookToken?: string;
-  draftId?: string;
-  locale?: LocaleView;
-}): RouterClient<Router>;
 export type PageHead = {
   meta?: Array<Record<string, string>>;
   links?: Array<Record<string, string>>;

package/dist/features/routes/pageRuntime.js

@@ -6,7 +6,7 @@ import { PAGE_IMAGE_SIZE, pageImageUrl } from "../og/pageImage.js";
 import { curatedLayoutContext } from "../../core/layoutContext.js";
 import { isArticle } from "../../core/structuredData.js";
 import { publishingDraft } from "../runtime/publishingDraft.js";
-import { DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, LOOK_TOKEN_HEADER, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
+import { DRAFT_ARCHIVED_ERROR_CODE, DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, LOOK_TOKEN_HEADER, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 
@@ -36,10 +36,16 @@ function parseMarkdownPath(pathname) {
 	if (pathname === "/index.md") return "/";
 	return pathname.slice(0, -3) || null;
 }
-function createServerApiClient(apiUrl, options) {
-	const headers = localeHeaders(options?.locale);
-	if (options?.lookToken) headers[LOOK_TOKEN_HEADER] = options.lookToken;
-	if (options?.draftId && (options.authCookieHeader || options.lookToken)) headers[DRAFT_HEADER] = options.draftId;
+/**
+* The API's client for one kind of read: with a credential, in a draft or Live, in a locale. Only
+* a credential can read a draft, so a draft is only ever named with one; a Live read names the
+* draft this Worker publishes, if any.
+*/
+function createServerApiClient(apiUrl, { credential, draftId, locale } = {}) {
+	const headers = localeHeaders(locale);
+	const session = credential && "session" in credential ? credential.session : void 0;
+	if (credential && "lookToken" in credential) headers[LOOK_TOKEN_HEADER] = credential.lookToken;
+	if (draftId && credential) headers[DRAFT_HEADER] = draftId;
 	else {
 		const publishing = publishingDraft();
 		if (publishing) headers[PUBLISHING_DRAFT_HEADER] = publishing;
@@ -48,7 +54,7 @@ function createServerApiClient(apiUrl, options) {
 		url: `${apiUrl}/rpc`,
 		headers,
 		fetch: (request, init) => {
-			if (options?.authCookieHeader && request instanceof Request) request.headers.set("Better-Auth-Cookie", options.authCookieHeader);
+			if (session && request instanceof Request) request.headers.set("Better-Auth-Cookie", session);
 			return fetch(request, init);
 		}
 	}));
@@ -84,46 +90,24 @@ function draftRefusalNotice(error, draftId) {
 		reason: "ended",
 		...data
 	};
+	if (code === DRAFT_ARCHIVED_ERROR_CODE && data) return {
+		reason: "archived",
+		...data
+	};
 	if (isNotFoundError(error) && data?.draftId === draftId) return { reason: "missing" };
 	if (code === "FORBIDDEN" || status === 403) return { reason: "forbidden" };
 	if (code === "UNAUTHORIZED" || status === 401) return null;
 }
-/**
-* Reads with the draft a URL names, or Live (ADR 0011). Only a member's request names the draft;
-* anyone else reads Live. When the API refuses the draft, the same response reads Live instead.
-*/
-async function readDraftOrLive(draftId, member, read) {
-	if (!draftId) return { value: await read(void 0) };
-	if (!member) return {
-		value: await read(void 0),
-		refusedDraft: { notice: null }
-	};
-	try {
-		return {
-			value: await read(draftId),
-			draftId
-		};
-	} catch (error) {
-		const notice = draftRefusalNotice(error, draftId);
-		if (notice === void 0) throw error;
-		return {
-			value: await read(void 0),
-			refusedDraft: { notice }
-		};
-	}
-}
 /** The URL a render shows: without the draft param when the draft couldn't be read. */
 function renderedHref(url, read) {
 	return read.refusedDraft ? withoutDraft(url) : url;
 }
-async function loadCamoxPage({ apiUrl, authCookieHeader, lookToken, draftId, locale, pathname, projectUuid, queryClient }) {
+async function loadCamoxPage({ reader, draftId, locale, pathname, projectUuid, queryClient }) {
 	const studioCache = createServerStudioCache(queryClient, {
-		apiUrl,
-		authCookieHeader,
-		lookToken,
+		reader,
 		locale
 	});
-	const inDraft = { in: draftId && (authCookieHeader || lookToken) ? draftId : null };
+	const inDraft = { in: draftId ?? null };
 	const fallback = locale && linkFallbackLocale(locale);
 	const [page] = await Promise.all([
 		studioCache.ensure(reads.pageStructure({
@@ -139,16 +123,14 @@ async function loadCamoxPage({ apiUrl, authCookieHeader, lookToken, draftId, loc
 	return page;
 }
 /**
-* The studio's reads for one server request, read with its session. Each operation names the
-* draft it acts in, once the request settled which one it reads.
+* The studio's reads for one server request, read as its reader. Each operation names the draft
+* it acts in, once the request settled which one it reads.
 */
-function createServerStudioCache(queryClient, { apiUrl, authCookieHeader, lookToken, locale }) {
+function createServerStudioCache(queryClient, { reader, locale }) {
 	return createStudioCache({
 		queryClient,
 		scope: createDraftScope({ queryClient }),
-		api: (draft, inLocale) => createServerApiClient(apiUrl, {
-			authCookieHeader,
-			lookToken,
+		api: (draft, inLocale) => reader.api({
 			draftId: draft ?? void 0,
 			locale: inLocale
 		}),
@@ -156,45 +138,6 @@ function createServerStudioCache(queryClient, { apiUrl, authCookieHeader, lookTo
 	});
 }
 /**
-* The locales of the scope a request reads: the URL's draft's for a session naming one, else
-* Live's. A draft the API refuses reads Live's, as the request's other reads then do. Live's read
-* keeps the session: a member's studio routes the locales Live doesn't serve yet, which visitors
-* never see (ADR 0043), and a render with a session is private.
-*/
-async function readScopeLocales({ apiUrl, authCookieHeader, draftId, projectUuid }) {
-	const list = (session, readDraftId) => createServerApiClient(apiUrl, {
-		authCookieHeader: session,
-		draftId: readDraftId
-	}).locales.list({ projectUuid });
-	const { value } = await readDraftOrLive(draftId, !!authCookieHeader, async (readDraftId) => {
-		if (readDraftId || !authCookieHeader) return list(authCookieHeader, readDraftId);
-		try {
-			return await list(authCookieHeader, void 0);
-		} catch (error) {
-			if (!isAuthSessionError(error)) throw error;
-			return list(void 0, void 0);
-		}
-	});
-	return value;
-}
-/**
-* The project, when the auth cookie is a valid session of one of its members. A successful
-* protected project lookup validates both session and project access: cookie presence alone
-* is not proof of authentication. An invalid session asks for the cookie to be cleared.
-*/
-async function resolveMemberProject({ apiUrl, authCookieHeader, projectUuid }) {
-	if (!authCookieHeader) return { clearAuthCookie: false };
-	try {
-		return {
-			project: await createServerApiClient(apiUrl, { authCookieHeader }).projects.getByUuid({ projectUuid }),
-			clearAuthCookie: false
-		};
-	} catch (error) {
-		if (!isAuthSessionError(error)) throw error;
-		return { clearAuthCookie: true };
-	}
-}
-/**
 * The project's favicon, which falls back to the default favicon when none was uploaded.
 * Pass `withDefault: false` to get a 404 instead, to learn whether there is one.
 */
@@ -213,36 +156,13 @@ function buildCamoxPageLoaderData(apiUrl, page, origin) {
 		faviconUrl: buildFaviconUrl(apiUrl, page.project)
 	};
 }
-async function loadCamoxPageForRequest({ apiUrl, authCookieHeader, draftId, locale, origin, pathname, projectUuid, queryClient }) {
-	const member = await resolveMemberProject({
-		apiUrl,
-		authCookieHeader,
-		projectUuid
-	});
-	if (member.clearAuthCookie) console.warn("[camox] Ignoring stale camox_auth_cookie.");
-	const { value: page, ...read } = await readDraftOrLive(draftId, !!member.project, (readDraftId) => loadCamoxPage({
-		apiUrl,
-		authCookieHeader: member.project ? authCookieHeader : void 0,
-		draftId: readDraftId,
-		locale,
-		pathname,
-		projectUuid,
-		queryClient
-	}));
-	return {
-		...read,
-		data: buildCamoxPageLoaderData(apiUrl, page, origin),
-		project: member.project,
-		shouldClearAuthCookie: member.clearAuthCookie
-	};
-}
 /**
 * Reads the Markdown Representation of the page at a runtime path, with its locale's prefix, in
 * one API read: the API finds the locale the prefix names, the page there, its Markdown and what
 * its front matter is built from. Markdown is a public output, so it reads Live whoever asks.
 */
-function readPageMarkdown({ apiUrl, path, projectUuid }) {
-	return createServerApiClient(apiUrl).pages.getMarkdown({
+function readPageMarkdown({ reader, path, projectUuid }) {
+	return reader.api().pages.getMarkdown({
 		path,
 		projectUuid
 	});
@@ -362,4 +282,4 @@ function buildCamoxPageHead(camoxApp, loaderData, locale) {
 }
 
 //#endregion
-export { buildCamoxPageHead, buildCamoxPageLoaderData, buildDefaultFaviconUrl, buildFaviconUrl, buildPageHead, buildPageMeta, createServerApiClient, createServerStudioCache, curatedMarkdownResponse, curatedPageMetaInput, declarePage, getMarkdownPath, isAuthSessionError, isNotFoundError, loadCamoxPage, loadCamoxPageForRequest, parseMarkdownPath, parseQuality, prefersMarkdown, readDraftOrLive, readPageMarkdown, readScopeLocales, renderedHref, resolveMemberProject, withFrontMatter };
+export { buildCamoxPageHead, buildCamoxPageLoaderData, buildDefaultFaviconUrl, buildFaviconUrl, buildPageHead, buildPageMeta, createServerApiClient, createServerStudioCache, curatedMarkdownResponse, curatedPageMetaInput, declarePage, draftRefusalNotice, getMarkdownPath, isAuthSessionError, isNotFoundError, loadCamoxPage, parseMarkdownPath, parseQuality, prefersMarkdown, readPageMarkdown, renderedHref, withFrontMatter };

package/dist/features/runtime/pageApp.js

@@ -2,8 +2,8 @@ import { DraftScopeContext } from "../../lib/draft-scope.js";
 import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
 import { ArtifactCaptureContext } from "../../core/hooks/useArtifactHost.js";
 import { useSignInShortcut } from "../provider/signInShortcut.js";
-import { PreviewActivation } from "../preview/components/PreviewActivation.js";
 import { PreviewDocumentContext } from "./PreviewDocumentContext.js";
+import { PreviewActivation } from "../preview/components/PreviewActivation.js";
 import { Frame } from "../preview/components/Frame.js";
 import { PreviewSignInPage } from "../provider/PreviewSignInPage.js";
 import { CoreCamoxProvider } from "../provider/CoreCamoxProvider.js";

package/dist/features/runtime/pageRead.js

@@ -0,0 +1,105 @@
+import { createRequestContext } from "../../core/requestContext.js";
+import { asCollectionItem } from "../../core/recordItem.js";
+import { matchDerivedLayout } from "../../core/derivedRoutes.js";
+import { layoutPageContext } from "../../core/layoutContext.js";
+import { isNotFoundError } from "../routes/pageRuntime.js";
+
+//#region src/features/runtime/pageRead.ts
+/**
+* What a path shows, in the Locale the path's prefix named: a Singleton Layout's page first, then
+* the curated page at the path, then a Derived Layout's page. Each output reads the curated page
+* and the layout's blocks as it needs them; Page Read decides which it shows and assembles a
+* Layout Page. A Layout Page's loader runs in the Draft its blocks are read in: alongside them
+* when the reader knows the Draft, after them when their read settles it.
+*/
+async function readPage({ app, path, pathname, reader, curated, layout }) {
+	const match = app && matchDerivedLayout(app.getLayouts(), path);
+	const layoutPage = () => readLayoutPage({
+		app,
+		match,
+		pathname,
+		reader,
+		readBlocks: layout
+	});
+	if (!mayShowCuratedPage(app, path)) return layoutPage();
+	try {
+		const { value: page, ...read } = await curated();
+		if (page !== null) return {
+			kind: "curated",
+			page,
+			...read
+		};
+	} catch (error) {
+		if (!isNotFoundError(error)) throw error;
+	}
+	return match ? layoutPage() : { kind: "none" };
+}
+/**
+* Whether a path may show a curated page, so reading one there may be worth starting early: not
+* a Singleton Layout's route.
+*/
+function mayShowCuratedPage(app, path) {
+	return (app && matchDerivedLayout(app.getLayouts(), path))?.layout._internal.kind !== "singleton";
+}
+async function readLayoutPage({ app, match, pathname, reader, readBlocks }) {
+	const layout = match.layout._internal;
+	const blocksInScope = () => reader.inScope((draftId) => readBlocks(draftId, layout.id));
+	const load = (draftId) => loadLayoutResult(app, match, createRequestContext({ records: reader.records(draftId) }), reader.locale);
+	let result;
+	let read;
+	try {
+		if (reader.draft) [result, read] = await Promise.all([load(reader.draft.id), blocksInScope()]);
+		else {
+			read = await blocksInScope();
+			result = await load(read.draftId);
+		}
+	} catch (error) {
+		if (isNotFoundError(error)) return {
+			kind: "none",
+			layout: match.layout
+		};
+		throw error;
+	}
+	const { value: blocks, ...draftRead } = read;
+	return {
+		kind: "layout",
+		layout: match.layout,
+		params: match.params,
+		blocks,
+		result,
+		...layoutPageContext(app, layout, {
+			path: pathname,
+			locale: reader.locale.tag,
+			projectName: blocks.projectName,
+			params: match.params,
+			result
+		}),
+		...draftRead
+	};
+}
+const RECORD_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/** An envelope names its record; it doesn't authorize anything, the API does. */
+function isValidCollectionItem(app, result) {
+	const data = result.data;
+	return typeof result.collectionId === "string" && !!app.getCollectionById(result.collectionId) && typeof data?.id === "string" && RECORD_ID.test(data.id) && typeof data.content === "object" && data.content !== null;
+}
+/**
+* Runs a Layout Page's loader in the page's locale. The envelope survives SSR, navigation and
+* hydration, and its data renders as returned: Camox never translates it.
+*/
+async function loadLayoutResult(app, match, context, locale) {
+	const { loader, id } = match.layout._internal;
+	if (!loader) return void 0;
+	const result = await loader({
+		params: match.params,
+		context,
+		locale: locale.tag
+	});
+	const serializedResult = result === void 0 ? void 0 : JSON.parse(JSON.stringify(result));
+	const record = asCollectionItem(serializedResult);
+	if (!(record ? isValidCollectionItem(app, record) : serializedResult?.kind === "data" && Object.hasOwn(serializedResult, "data"))) throw new Error(`Layout "${id}" loader must return { kind: "data", data } with JSON-serializable data, or a collection-item envelope naming a registered collection and a record id`);
+	return serializedResult;
+}
+
+//#endregion
+export { mayShowCuratedPage, readPage };

package/dist/features/runtime/reader.d.ts

@@ -0,0 +1,25 @@
+import { LocaleView } from "../../lib/locale-path.js";
+import "../routes/pageRuntime.js";
+import { Router } from "@camox/api-contract/router";
+import { RouterClient } from "@orpc/server";
+//#region src/features/runtime/reader.d.ts
+/** The API's procedures, as the content port answers them. */
+export type ContentClient = RouterClient<Router>;
+/** What proves a read may see more than Live: a Member's session, or a look token (ADR 0032). */
+export type Credential = {
+  session: string;
+} | {
+  lookToken: string;
+};
+/** Which reads a client makes: with which credential, in which Draft (Live without), in which Locale. */
+export interface ContentAccess {
+  credential?: Credential;
+  draftId?: string;
+  locale?: LocaleView;
+}
+/**
+ * The content port: the API's reads, as one credential sees them, in Live or a Draft, in a
+ * Locale. Production reads the API (`apiContent`); tests read an in-memory one.
+ */
+export type Content = (access: ContentAccess) => ContentClient;
+//#endregion