@teamscala/service-boot 0.23.416 → 0.23.418

package/src/fn-routers/public-assessment-router.ts

@@ -1,6 +1,6 @@
 /**
  * @system service-boot
- * @status handwritten @indivisible-unit
+ * @status handwritten
  * @edit edit directly
  *
  * Public ORPC procedure for submitting a public assessment (quiz) response.
@@ -11,32 +11,20 @@
  * recovering it here brings the quiz in line with the shared machinery (the GPT's
  * publicGptSession is the sibling pattern) instead of a per-page bespoke handler.
  *
- * Scoring (recovered from live data, 2026-06-13): each scale answer contributes
- * (scaleValue - 1) earned out of 4 max (1–5 scale → 0–4); choice answers
- * contribute the selected option's points out of the question's max option
- * points. A category's score is round(100 * earned / max) over that category's
- * questions; the overall total is the same over all questions. Unanswered
- * questions count toward the denominator (contribute 0) — matches the historical
- * rows (e.g. Σ(v-1)=78 over 36 questions → 78/144 = 54).
+ * Scoring lives in assessment-scoring.ts; the branded report email in
+ * assessment-report-email.ts — split when this file held them all at 591 lines.
  */
 
 import { os } from "@orpc/server";
 import * as v from "valibot";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
-import { sendResendEmail } from "./resend-client.ts";
-import { applyTemplateVars, lookupTemplate } from "@teamscala/email/templates/lookup";
-import { resolveEmailSender } from "@teamscala/email/identity/resolve-email-sender";
-import { decryptSecretConfig } from "@teamscala/encryption/crypto/secret-config";
-import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
-import { fetchOrgBrand } from "@teamscala/resolver-engine/data-resolvers/fetch-org-brand";
-import type { StageBand } from "@teamscala/assessment-block/report-data";
+import { recordEvent } from "@teamscala/event-log/record-event";
 import {
-	generateNarrative,
-	orderRoadmap,
 	readStageBands,
 	selectStageBand,
 } from "@teamscala/assessment-block/report-data";
-import { recordEvent } from "@teamscala/event-log/record-event";
+import { sendAuthorityReportEmail } from "./assessment-report-email.ts";
+import { scoreAnswers, toBandSlug, type StoredQuestion } from "./assessment-scoring.ts";
 
 interface Context {
 	prisma: any;
@@ -67,325 +55,6 @@ const submitSchema = v.object({
 	),
 });
 
-interface StoredQuestion {
-	id: string;
-	category?: string | null;
-	type?: string | null;
-	weight?: number | null;
-	options?: Array<{ value: string; points: number }> | null;
-}
-
-/** Scale answers are 1–5; earned = value-1, max = 4. */
-const SCALE_MAX = 4;
-
-/**
- * A stage band names itself; the event tag needs a stable slug. Derived from
- * the authored name rather than stored beside it, so the two cannot drift.
- */
-function toBandSlug(name: string): string {
-	return name
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, "-")
-		.replace(/^-+|-+$/g, "");
-}
-
-
-/**
- * Best-effort branded Authority Index Report email. Self-contained: loads its
- * own Resend secret, swallows every error. Sender identity + brand tokens
- * come from resolveEmailSender (per-org email_sender row). On Resend refusal
- * the call falls back to the platform sender and logs the reason.
- */
-async function sendAuthorityReportEmail(opts: {
-	to: string;
-	firstName: string;
-	totalScore: number;
-	bandLabel: string;
-	stageBand: StageBand | null;
-	reportTitle: string;
-	categoryScores: Record<string, number>;
-	ctaUrl?: string;
-	organisationId?: string | null;
-	prisma: any;
-	/**
-	 * Absolute origin (e.g. "https://quiz.scala.business") of the service that
-	 * received the submit — the origin that serves /api/assets. Mail clients
-	 * cannot resolve a relative src, so an org logo stored as a relative path
-	 * only renders when this is provided. Null → a relative logo stays absent
-	 * (previous behaviour) rather than emitting a broken src.
-	 */
-	publicBaseUrl?: string | null;
-}): Promise<void> {
-	const log = getAppLogger();
-	const rawSecret = await loadRegistryConfig(
-		"secret",
-		"resend-api-key",
-		v.looseObject({ token: v.optional(v.string()) }),
-	).catch(() => null);
-	const decrypted = rawSecret
-		? (decryptSecretConfig(rawSecret as never) as { token?: string })
-		: null;
-	if (!decrypted?.token) {
-		log.warn("[authority-report-email] Resend token unavailable — skipping");
-		return;
-	}
-
-	const brandRow =
-		opts.organisationId && opts.prisma
-			? await fetchOrgBrand(
-					opts.prisma as Parameters<typeof fetchOrgBrand>[0],
-					opts.organisationId,
-				).catch(() => null)
-			: null;
-	// Brand assets are stored as service-relative paths ("/api/assets/…") —
-	// the same origin that served the submit request serves them, so the email
-	// derives the absolute URL from that origin at resolve time instead of the
-	// profile row being mutated per consumer. Already-absolute logos pass through.
-	const absolutizeAssetUrl = (url: string | null): string | null => {
-		if (!url) return null;
-		if (/^https?:\/\//.test(url)) return url;
-		if (url.startsWith("/") && opts.publicBaseUrl) return `${opts.publicBaseUrl}${url}`;
-		return null;
-	};
-	const sender = await resolveEmailSender(opts.organisationId ?? null, {
-		brand: brandRow
-			? {
-					// The FRIENDLY name is the customer-facing one; company_name is the
-					// legal entity. Recipients were getting "GMG APAC: your Authority
-					// Index" and alt="GMG APAC" on the logo, for an org whose brand is
-					// Launcha. Same precedence the platform already uses in
-					// agreement-gate (friendly ?? legal), so an org that never set a
-					// friendly name is unchanged.
-					orgName: brandRow.companyFriendlyName || brandRow.companyName || "",
-					primaryColor: brandRow.primaryColor,
-					accentColor: brandRow.accentColor ?? null,
-					logoUrl: absolutizeAssetUrl(brandRow.logo.light),
-				}
-			: undefined,
-	});
-	const primary = sender.brand.primaryColor;
-	const muted = "#6b7280"; // structural neutral for body labels
-	const logoUrl = sender.brand.logoUrl;
-	const logoHtml =
-		logoUrl && /^https?:\/\//.test(logoUrl)
-			? `<p style="margin:0 0 20px"><img src="${logoUrl}" alt="${sender.brand.orgName || ""}" style="max-height:56px;display:block"></p>`
-			: "";
-
-	// Subject + body from the `authority-index-report` email_template row, not
-	// literals here (email-template-registry-type). Dynamic markup is rendered
-	// here and passed as merge vars — the row owns copy + layout; colours +
-	// logo come from the org brand tokens, NOT inline literals.
-	const pillarRows = (
-		Object.entries(opts.categoryScores) as Array<[string, number]>
-	)
-		.map(
-			([name, score]) =>
-				`<tr><td style="padding:6px 0;color:${muted}">${name}</td><td style="padding:6px 0;text-align:right;font-weight:600;color:${primary}">${score} / 100</td></tr>`,
-		)
-		.join("");
-	const pillarsText = (
-		Object.entries(opts.categoryScores) as Array<[string, number]>
-	)
-		.map(([name, score]) => `${name}: ${score} / 100`)
-		.join("\n");
-	// REPORT SECTIONS. Authored per stage on assessments.stage_bands and rendered
-	// here as markup, so the template row stays copy + layout. Every section is
-	// optional: a stage that has not authored one yields an empty string and the
-	// row simply renders nothing for it.
-	const b = opts.stageBand;
-	const sectionHtml = (heading: string, inner: string) =>
-		inner
-			? `<h3 style="margin:24px 0 8px;font-size:16px;font-weight:700;color:${primary}">${heading}</h3>${inner}`
-			: "";
-	const paraHtml = (text?: string) =>
-		text ? `<p style="margin:0 0 12px;color:${muted}">${text}</p>` : "";
-	const bulletsHtml = (items?: string[]) =>
-		Array.isArray(items) && items.length > 0
-			? `<ul style="margin:0 0 12px;padding-left:20px;color:${muted}">${items
-					.map((i) => `<li style="margin:0 0 4px">${i}</li>`)
-					.join("")}</ul>`
-			: "";
-	const actionsHtml =
-		Array.isArray(b?.priorityActions) && b.priorityActions.length > 0
-			? b.priorityActions
-					.map(
-						(a) =>
-							`<p style="margin:0 0 10px"><strong style="font-size:14px;color:${primary}">${a.title}</strong><br><span style="color:${muted}">${a.description ?? ""}</span></p>`,
-					)
-					.join("")
-			: "";
-	const roadmapHtml = orderRoadmap(b?.roadmap)
-		.map(
-			(phase) =>
-				`<p style="margin:0 0 10px"><strong style="font-size:14px;color:${primary}">${phase.focus ?? ""}</strong><br><span style="color:${muted}">${(phase.actions ?? []).join(" · ")}</span></p>`,
-		)
-		.join("");
-	const notes = b?.pillarNotes ?? {};
-	const pillarNotesHtml = Object.keys(notes).length
-		? Object.entries(notes)
-				.map(
-					([k, v]) =>
-						`<p style="margin:0 0 8px;color:${muted}"><strong style="font-size:14px;color:${primary};text-transform:capitalize">${k}</strong> — ${v}</p>`,
-				)
-				.join("")
-		: "";
-	const narrative = generateNarrative(opts.totalScore, b ?? null);
-
-	const tpl = applyTemplateVars(await lookupTemplate("authority-index-report"), {
-		firstName: opts.firstName || "there",
-		totalScore: String(opts.totalScore),
-		bandLabel: opts.bandLabel,
-		pillarRows,
-		pillarsText,
-		reportTitle: opts.reportTitle,
-		tagline: b?.tagline ?? "",
-		narrativeHtml: paraHtml(narrative),
-		pillarNotesHtml: sectionHtml("Where you stand", pillarNotesHtml),
-		priorityActionsHtml: sectionHtml("Your priority actions", actionsHtml),
-		roadmapHtml: sectionHtml("Your next 90 days", roadmapHtml),
-		strategicFocusHtml: sectionHtml("Strategic focus", paraHtml(b?.strategicFocus)),
-		opportunitiesHtml: sectionHtml("Opportunities", bulletsHtml(b?.opportunities)),
-		twelveMonthTargetHtml: sectionHtml("Twelve-month target", paraHtml(b?.twelveMonthTarget)),
-		narrativeText: narrative,
-		brandPrimaryColor: primary,
-		brandAccentColor: sender.brand.accentColor ?? primary,
-		brandLogoHtml: logoHtml,
-		orgName: sender.brand.orgName,
-		ctaHtml: opts.ctaUrl
-			? `<p style="margin:24px 0 0"><a href="${opts.ctaUrl}" style="display:inline-block;background:${primary};color:#ffffff;text-decoration:none;font-weight:600;padding:12px 22px;border-radius:8px">Book your Authority Growth Session</a></p>`
-			: "",
-		ctaText: opts.ctaUrl ? `\nBook your Authority Growth Session: ${opts.ctaUrl}` : "",
-	});
-
-	const sendOnce = async (fromHeader: string, replyToHeader: string | undefined) =>
-		sendResendEmail(decrypted.token, {
-			from: fromHeader,
-			to: opts.to,
-			subject: tpl.subject,
-			html: tpl.bodyHtml,
-			text: tpl.bodyText,
-			reply_to: replyToHeader,
-		});
-
-	let res = await sendOnce(sender.from, sender.replyTo);
-	let usedFrom = sender.from;
-	if (!res.success) {
-		// Resend refused the org sender (likely unverified domain). Fall back
-		// to the platform sender; never fail because a verification lookup
-		// failed — the resolver returns the row, the failure is at Resend.
-		const platformRow = await loadRegistryConfig(
-			"config",
-			"email-defaults",
-			v.looseObject({ default_sender: v.optional(v.string()) }),
-		).catch(() => null);
-		const fallbackFrom =
-			(platformRow?.default_sender as string | undefined)?.trim() ||
-			"scala <noreply@gateway.scala.business>";
-		log.warn(
-			`[authority-report-email] org sender ${sender.from} refused by Resend (${res.error ?? "unknown"}); falling back to platform ${fallbackFrom}`,
-		);
-		res = await sendOnce(fallbackFrom, undefined);
-		usedFrom = fallbackFrom;
-	}
-
-	if (res.success) {
-		log.info(
-			`[authority-report-email] sent to ${opts.to}${res.id ? ` (id ${res.id})` : ""} from=${usedFrom}${sender.isOrgIdentity ? "" : " (platform fallback)"}`,
-		);
-	} else {
-		log.error(
-			`[authority-report-email] failed to ${opts.to}: ${res.error ?? "unknown"}`,
-		);
-	}
-
-	// email-send-audited: best-effort audit row. Guarded so a stale prisma
-	// client (scala-quiz schema predates email_send_log) skips cleanly.
-	try {
-		const auditPrisma = opts.prisma as {
-			email_send_log?: { create: (args: unknown) => Promise<unknown> };
-		};
-		if (auditPrisma?.email_send_log) {
-			await auditPrisma.email_send_log.create({
-				data: {
-					to_address: opts.to,
-					template_slug: "authority-index-report",
-					status: res.success ? "sent" : "failed",
-					provider_message_id: res.id ?? null,
-					error: res.success ? null : (res.error ?? "unknown"),
-					from_address: usedFrom,
-				},
-			});
-		}
-	} catch (auditErr) {
-		log.warn(
-			`[authority-report-email] audit row write failed: ${auditErr instanceof Error ? auditErr.message : String(auditErr)}`,
-		);
-	}
-}
-
-function scoreAnswers(
-	questions: StoredQuestion[],
-	answers: Array<{
-		questionId: string;
-		scaleValue?: number;
-		choiceValue?: string;
-		choiceValues?: string[];
-	}>,
-): { totalScore: number; categoryScores: Record<string, number> } {
-	const answerByQ = new Map(answers.map((a) => [a.questionId, a]));
-	// Per-category and overall earned/max accumulators.
-	const cat = new Map<string, { earned: number; max: number }>();
-	let totalEarned = 0;
-	let totalMax = 0;
-
-	for (const q of questions) {
-		if (q.type === "text") continue; // text questions are qualitative — never scored
-		const category = q.category || "General";
-		const a = answerByQ.get(q.id);
-		let earned = 0;
-		let max = 0;
-
-		if (q.options && q.options.length > 0) {
-			// Choice question: max is the highest single option's points; earned is
-			// the selected option(s)' points (capped at max).
-			max = Math.max(0, ...q.options.map((o) => o.points || 0));
-			if (a?.choiceValue) {
-				earned = q.options.find((o) => o.value === a.choiceValue)?.points ?? 0;
-			} else if (a?.choiceValues?.length) {
-				earned = Math.min(
-					max,
-					a.choiceValues.reduce(
-						(s, val) =>
-							s + (q.options?.find((o) => o.value === val)?.points ?? 0),
-						0,
-					),
-				);
-			}
-		} else {
-			// Scale question (the common case): 1–5 → earned 0–4.
-			max = SCALE_MAX;
-			if (typeof a?.scaleValue === "number") {
-				earned = Math.max(0, Math.min(SCALE_MAX, a.scaleValue - 1));
-			}
-		}
-
-		if (max <= 0) continue; // text/unscored questions don't affect the score
-		const entry = cat.get(category) ?? { earned: 0, max: 0 };
-		entry.earned += earned;
-		entry.max += max;
-		cat.set(category, entry);
-		totalEarned += earned;
-		totalMax += max;
-	}
-
-	const categoryScores: Record<string, number> = {};
-	for (const [name, { earned, max }] of cat) {
-		categoryScores[name] = max > 0 ? Math.round((100 * earned) / max) : 0;
-	}
-	const totalScore = totalMax > 0 ? Math.round((100 * totalEarned) / totalMax) : 0;
-	return { totalScore, categoryScores };
-}
-
 export const publicAssessmentRouter = {
 	submit: pub.input(submitSchema).handler(async ({ input, context }) => {
 		const prisma = context.prisma;

package/src/register-registry-page-route/page-data-shared.ts

@@ -0,0 +1,124 @@
+/**
+ * @system ui-service-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * Shared Puck-page-data helpers for the resolved-graph → pageData conversion:
+ * the local PuckData structural type, JSON extraction with an honest null on
+ * malformed input, layout-default application, region root-prop picking, the
+ * RegionEntry shape, and the unresolved-region-slot warn. Plus the brand-token
+ * prologue shared by all three render branches.
+ *
+ * Split out of resolve-page-data.ts (547 lines) — byte-for-byte moves; only
+ * closure variables became explicit parameters.
+ */
+
+import { getAppLogger } from "@teamscala/logger/app-loggers";
+
+/**
+ * Local structural type for Puck page data. Avoids a type-only import of
+ * `@puckeditor/core`, which is NOT a runtime dependency — `deps-derived-from-source`
+ * excludes whole-statement type-only imports, so the bare specifier has no
+ * installed package to resolve against at publish typecheck time. The shape used
+ * here (root/content/zones) is all this module reads or constructs.
+ */
+export type PuckData = {
+	root: { props?: Record<string, unknown> };
+	content: unknown[];
+	zones?: Record<string, unknown>;
+};
+
+export const EMPTY_PUCK_DATA: PuckData = { root: { props: {} }, content: [] };
+
+// Returns null on malformed JSON (observed via warn log) instead of a silent
+// masking empty fallback — protective-layers-fail-explicitly. Callers default
+// to EMPTY_PUCK_DATA where an empty render is the intended degradation.
+export function extractPuckData(source: Record<string, unknown>): PuckData | null {
+	const raw = source.puck_data ?? source.puckData;
+	if (!raw) return EMPTY_PUCK_DATA;
+	if (typeof raw === "string") {
+		try {
+			return JSON.parse(raw) as PuckData;
+		} catch (err) {
+			getAppLogger().warn(
+				"[extractPuckData] malformed puck_data JSON — rendering empty",
+				{ err },
+			);
+			return null;
+		}
+	}
+	return raw as PuckData;
+}
+
+export function applyLayoutDefaults(
+	puckData: PuckData,
+	defaults: Record<string, string>,
+): void {
+	if (!defaults || Object.keys(defaults).length === 0) return;
+	const data = puckData as { root?: { props?: Record<string, unknown> } };
+	if (!data.root) data.root = { props: {} };
+	if (!data.root.props) data.root.props = {};
+	for (const [key, value] of Object.entries(defaults)) {
+		if (data.root.props[key] == null) data.root.props[key] = value;
+	}
+}
+
+export function pickRootProp<T>(regions: RegionEntry[], key: string): T | undefined {
+	for (const region of regions) {
+		const props = (
+			region.puckData as { root?: { props?: Record<string, unknown> } } | null
+		)?.root?.props;
+		const value = props?.[key];
+		if (value != null && value !== "") return value as T;
+	}
+	return undefined;
+}
+
+export interface RegionEntry {
+	slot: string;
+	puckData: PuckData;
+	pageId: string;
+	website?: { slug: string; name: string; organisation_id?: string | null };
+	metaTitle?: string | null;
+	metaDescription?: string | null;
+}
+
+// A region slot the operator DECLARED (resource_loader.region_slots) whose
+// source did not resolve used to vanish with no signal anywhere — the page
+// rendered minus a region while the page, source, attributes, template and
+// tree builder all looked innocent (measured 2026-08-18: a footer region
+// added to a report produced no footer and no diagnostic; the cause was the
+// boot-time config capture named in the message). One warn per slot per
+// process, throttled like the block-coverage guard in the caller, so the hot
+// path never spams it.
+const unresolvedRegionSlotsLogged = new Set<string>();
+
+export function warnUnresolvedRegionSlot(slot: string): void {
+	if (unresolvedRegionSlotsLogged.has(slot)) return;
+	unresolvedRegionSlotsLogged.add(slot);
+	getAppLogger().warn(
+		`[resolve-page-data] region slot "${slot}" is declared in the resource_loader config but no source resolved for it — the region is omitted from this render. A resource_loader edit reaches a booted service only after a restart.`,
+	);
+}
+
+/** The resolved brand tokens every branch reads (the old file's shared prologue). */
+export function readBrandTokens(resolved: Record<string, unknown>): {
+	brand: Record<string, unknown>;
+	primaryColor: string;
+	headingFont: string | null;
+	bodyFont: string | null;
+	logo: { light: string | null; dark: string | null; brand: string | null };
+	brandTheme: string | undefined;
+} {
+	const brand = (resolved.brand as Record<string, unknown>) ?? {};
+	const primaryColor = (brand.primaryColor as string) ?? "";
+	const headingFont = (brand.headingFont as string) ?? null;
+	const bodyFont = (brand.bodyFont as string) ?? null;
+	const logo = (brand.logo as {
+		light: string | null;
+		dark: string | null;
+		brand: string | null;
+	}) ?? { light: null, dark: null, brand: null };
+	const brandTheme = typeof brand.theme === "string" ? brand.theme : undefined;
+	return { brand, primaryColor, headingFont, bodyFont, logo, brandTheme };
+}

package/src/register-registry-page-route/public-shell-page-data.ts

@@ -0,0 +1,169 @@
+/**
+ * @system ui-service-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * Branch 2 of the resolved-graph → pageData conversion: the public shell
+ * (header/body/footer regions from header/footer sources).
+ *
+ * Split out of resolve-page-data.ts (547 lines) — byte-identical body; only
+ * the closure variables became explicit parameters.
+ */
+
+import { resolveThemeMode } from "../resolve-theme-mode.ts";
+import { composePageTitle } from "../compose-page-title.ts";
+import { resolveEntityTitle } from "./meta-title.ts";
+import {
+	applyLayoutDefaults,
+	EMPTY_PUCK_DATA,
+	extractPuckData,
+	pickRootProp,
+	readBrandTokens,
+	type PuckData,
+	type RegionEntry,
+} from "./page-data-shared.ts";
+
+export function publicShellPageData(
+	resolved: Record<string, unknown>,
+	meta: Record<string, unknown>,
+	themeOverride: "light" | "dark" | undefined,
+	orgPrefix: boolean | undefined,
+): Record<string, unknown> {
+	const { brand, primaryColor, headingFont, bodyFont, logo, brandTheme } =
+		readBrandTokens(resolved);
+	const headerSource = resolved.header as Record<string, unknown> | undefined;
+	const footerSource = resolved.footer as Record<string, unknown> | undefined;
+
+	const page = (resolved.page as Record<string, unknown>) ?? {};
+	const website =
+		(resolved.website_by_host as Record<string, unknown>) ??
+		(resolved.website as Record<string, unknown>) ??
+		{};
+	const layoutDefaults =
+		(website.layout_defaults as Record<string, string>) ??
+		(website.layout_settings as Record<string, string>) ??
+		{};
+	const layoutSettings = website.layout_settings as
+		| { theme?: unknown }
+		| null
+		| undefined;
+	const websiteTheme =
+		layoutSettings && typeof layoutSettings.theme === "string"
+			? layoutSettings.theme
+			: undefined;
+
+	const regions: RegionEntry[] = [];
+
+	if (headerSource) {
+		const headerPuck = extractPuckData(headerSource) ?? EMPTY_PUCK_DATA;
+		applyLayoutDefaults(headerPuck, layoutDefaults);
+		regions.push({
+			slot: "header",
+			puckData: headerPuck,
+			pageId: (headerSource.id as string) ?? "",
+		});
+	}
+
+	const bodyPuck = extractPuckData(page) ?? EMPTY_PUCK_DATA;
+	applyLayoutDefaults(bodyPuck, layoutDefaults);
+	regions.push({
+		slot: "body",
+		puckData: bodyPuck,
+		pageId: (page.id as string) ?? "",
+		metaTitle: (page.meta_title as string) ?? null,
+		metaDescription: (page.meta_description as string) ?? null,
+	});
+
+	if (footerSource) {
+		const footerPuck = extractPuckData(footerSource) ?? EMPTY_PUCK_DATA;
+		applyLayoutDefaults(footerPuck, layoutDefaults);
+		regions.push({
+			slot: "footer",
+			puckData: footerPuck,
+			pageId: (footerSource.id as string) ?? "",
+		});
+	}
+
+	const rootTheme = pickRootProp<string>(regions, "theme");
+	const { theme } = resolveThemeMode({
+		override: themeOverride,
+		candidates: [rootTheme, brandTheme, websiteTheme],
+	});
+
+	const overrideColor = pickRootProp<string>(regions, "primaryColor");
+	const overrideBg = pickRootProp<string>(regions, "backgroundColor");
+	const overrideHeading = pickRootProp<string>(regions, "headingFont");
+	const overrideBody = pickRootProp<string>(regions, "bodyFont");
+
+	const pageName = (page.name as string) || null;
+	const entityTitle = resolveEntityTitle(resolved);
+	const bodyMetaTitle = regions.find((r) => r.slot === "body")?.metaTitle;
+	const pageRootTitle = pickRootProp<string>(regions, "title");
+	const pageDescription =
+		regions.find((r) => r.slot === "body")?.metaDescription ??
+		pickRootProp<string>(regions, "description") ??
+		null;
+
+	return {
+		puckData: { root: { props: {} }, content: [] } as PuckData,
+		regions,
+		// Region-shell blocks (e.g. the header Navigation deriving the body's
+		// document sections) read the resolved entity graph from
+		// pageData.loaderData — the same surface Branch 1 exposes. Without it a
+		// header/footer block serverLoader gets ctx.loaderData=undefined and
+		// cannot see the body page, so a server-derived nav produced no items
+		// and the menu was client-only (vanished on stale tabs / narrow views).
+		loaderData: resolved,
+		website: {
+			slug: website.slug as string,
+			name: website.name as string,
+			organisation_id: website.organisation_id as string | null,
+			// header_settings carries the DB-driven header config (e.g.
+			// backdropBlur) the public shell applies — PublicTemplate reads
+			// pageData.website.header_settings.backdropBlur. Dropping it here
+			// silently kills the header blur even though the DB switch is set
+			// (the 2026-06-17 regression). Pass it through verbatim.
+			header_settings:
+				(website.header_settings as Record<string, unknown> | null) ?? null,
+		},
+		orgId:
+			(page.organisation_id as string) ??
+			null,
+		brand: {
+			primaryColor: overrideColor ?? primaryColor,
+			// Thread the org brand's dark surface (brand_background_color /
+			// brand_dark_color) when the page sets no explicit override — so
+			// dark-mode pages use the brand's real dark colour, not a
+			// primary-derived tint. Uses the org brand's real dark colour.
+			backgroundColor:
+				overrideBg ?? (brand.backgroundColor as string | null) ?? null,
+			lightSurface: (brand.lightSurface as string | null) ?? null,
+			darkSurface: (brand.darkSurface as string | null) ?? null,
+			accentColor: (brand.accentColor as string | null) ?? null,
+			secondaryColor: (brand.secondaryColor as string | null) ?? null,
+			mutedColor: (brand.mutedColor as string | null) ?? null,
+			headingFont: overrideHeading ?? headingFont,
+			bodyFont: overrideBody ?? bodyFont,
+			logo,
+			companyName: (brand.companyName as string) ?? null,
+			companyFriendlyName: (brand.companyFriendlyName as string) ?? null,
+			contactEmail: (brand.contactEmail as string) ?? null,
+			favicon: (brand.favicon as string) ?? null,
+		},
+		theme,
+		meta: {
+		title: composePageTitle(
+			{
+					pageMetaTitle: bodyMetaTitle,
+					templateTitle: (meta.title as string) || undefined,
+					websiteName: (website.name as string) || undefined,
+					organisationName: (brand.companyName as string) || undefined,
+					pageName: pageName ?? pageRootTitle,
+					entityTitle: entityTitle || undefined,
+				},
+				{ orgPrefix },
+			),
+			...(pageDescription ? { description: pageDescription } : {}),
+		},
+	};
+}