@riverbankcms/sdk 0.139.0 → 0.140.0

package/dist/server/rendering/server.mjs

@@ -33,10 +33,12 @@ const unsafeAsMediaAssetId = (id) => id;
 const unsafeAsStorageBucketName = (value) => value;
 const unsafeAsStoragePath = (value) => value;
 const unsafeAsUserId = (id) => id;
+const unsafeAsContentVersionId = (id) => id;
 const parseSiteId = (value) => parseUuidBrand(value, unsafeAsSiteId);
 const parseApiKeyId = (value) => parseUuidBrand(value, unsafeAsApiKeyId);
 const parseEventOfferingId = (value) => parseUuidBrand(value, unsafeAsEventOfferingId);
 const parseUserId = (value) => parseUuidBrand(value, unsafeAsUserId);
+const parseContentVersionId = (value) => parseUuidBrand(value, unsafeAsContentVersionId);
 const parseEventSeriesId = (value) => parseUuidBrand(value, unsafeAsEventSeriesId);
 //#endregion
 //#region ../core/src/assert-never.ts
@@ -313,7 +315,7 @@ function parseEventPageSurfaceDestinationMode(value) {
 	return value === "cms-managed" || value === "system-managed" ? value : void 0;
 }
 function parseEventPageSurfaceSubject(value) {
-	if (!isRecord$20(value)) return err({ kind: "notObject" });
+	if (!isRecord$21(value)) return err({ kind: "notObject" });
 	switch (value.kind) {
 		case "eventSeries": {
 			const eventSeriesId = parseEventSeriesId(value.eventSeriesId);
@@ -368,7 +370,7 @@ function parseEventSeriesIdList(values) {
 	}
 	return ok$1(parsed);
 }
-function isRecord$20(value) {
+function isRecord$21(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -625,16 +627,47 @@ function parsePositiveInteger(value) {
 function parseNewsletterListId(value) {
 	return parseTrimmedMatchingString(value, UUID_PATTERN);
 }
+function parseMailchimpAccountId(value) {
+	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
+}
 function parseMailchimpAudienceId(value) {
 	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
 }
 function parseMailchimpInterestId(value) {
 	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
 }
+function parseBrevoAccountId(value) {
+	return parseTrimmedMatchingString(value, OPAQUE_ID_PATTERN);
+}
 function parseBrevoListId(value) {
 	return parsePositiveInteger(value);
 }
 //#endregion
+//#region ../core/src/mailing-list-setup.ts
+function isRecord$20(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+const DEFAULT_MAILING_LIST_SUCCESS_MESSAGE = "Thanks — you're on the list.";
+function parseMailingListProviderScope(value) {
+	if (!isRecord$20(value)) return err("invalid_mailing_list_provider_scope");
+	if (value.provider === "native") return ok$1({ provider: "native" });
+	if (value.provider === "brevo") {
+		const accountId = parseBrevoAccountId(value.accountId);
+		return accountId !== null ? ok$1({
+			provider: "brevo",
+			accountId
+		}) : err("invalid_mailing_list_provider_scope");
+	}
+	if (value.provider === "mailchimp") {
+		const accountId = parseMailchimpAccountId(value.accountId);
+		return accountId !== null ? ok$1({
+			provider: "mailchimp",
+			accountId
+		}) : err("invalid_mailing_list_provider_scope");
+	}
+	return err("invalid_mailing_list_provider_scope");
+}
+//#endregion
 //#region ../core/src/mailing-list-setup-parser.ts
 function parseMailingListGlobalForm(value) {
 	if (!isRecord$19(value)) return formError("shape");
@@ -643,12 +676,15 @@ function parseMailingListGlobalForm(value) {
 	if (typeof value.includeOptionalPhone !== "boolean") return formError("includeOptionalPhone");
 	const buttonLabel = parseRequiredString(value.buttonLabel);
 	if (buttonLabel === null) return formError("buttonLabel");
+	const successMessage = parseRequiredString(value.successMessage);
+	if (successMessage === null) return formError("successMessage");
 	const privacyNote = parseOptionalString(value.privacyNote);
 	if (privacyNote === void 0) return formError("privacyNote");
 	return ok$1({
 		fields,
 		includeOptionalPhone: value.includeOptionalPhone,
 		buttonLabel,
+		successMessage,
 		privacyNote
 	});
 }
@@ -978,11 +1014,17 @@ function parseMailingListSignedSourceToken(value) {
 	const parsed = typeof value === "string" ? value.trim() : "";
 	return /^[A-Za-z0-9._~-]{16,1000}$/u.test(parsed) ? parsed : null;
 }
-function buildMailingListSignupBlockSourceRef(blockId) {
-	const parsed = parseMailingListBlockId(blockId);
-	return parsed !== null ? {
+function parseMailingListContentVersionId(value) {
+	const parsed = parseContentVersionId(value);
+	return parsed.ok ? parsed.value : null;
+}
+function buildMailingListSignupBlockSourceRef(blockId, contentVersionId) {
+	const parsedBlockId = parseMailingListBlockId(blockId);
+	const parsedContentVersionId = parseMailingListContentVersionId(contentVersionId);
+	return parsedBlockId !== null && parsedContentVersionId !== null ? {
 		tag: "block_ref",
-		blockId: parsed
+		blockId: parsedBlockId,
+		contentVersionId: parsedContentVersionId
 	} : null;
 }
 //#endregion
@@ -5286,6 +5328,509 @@ function parseThemeColorToken(value) {
 }
 const themeColorTokenSchema = z.string().min(1).refine((value) => Boolean(isThemeColorToken(value)), "Expected a known Theme V2 color token");
 //#endregion
+//#region ../theme-core/src/surfaces/foregroundRoles.ts
+const SURFACE_FOREGROUND_ROLES = [
+	"text",
+	"heading",
+	"link",
+	"supporting"
+];
+//#endregion
+//#region ../theme-core/src/surfaces/foregroundContract.ts
+const SURFACE_FOREGROUND_CSS_VARS = {
+	text: "--rb-surface-text-color",
+	heading: "--rb-surface-heading-color",
+	link: "--rb-surface-link-color",
+	supporting: "--rb-surface-supporting-color"
+};
+const DEFAULT_SURFACE_TEXT_COLOR = "rgb(var(--tb-text, 17 24 39))";
+const DEFAULT_ROLE_FALLBACKS = {
+	text: DEFAULT_SURFACE_TEXT_COLOR,
+	heading: DEFAULT_SURFACE_TEXT_COLOR,
+	link: "rgb(var(--tb-primary, var(--tb-text, 17 24 39)))",
+	supporting: "rgb(var(--tb-mutedText, 100 116 139))"
+};
+function requireSurfaceColorValue(role, value) {
+	const normalized = value.trim();
+	if (normalized.length === 0) throw new RangeError(`Surface foreground ${role} must be a non-empty CSS color.`);
+	return normalized;
+}
+function completeSurfaceForegrounds(input) {
+	const text = requireSurfaceColorValue("text", input.text);
+	return {
+		text,
+		heading: input.heading === void 0 ? text : requireSurfaceColorValue("heading", input.heading),
+		link: input.link === void 0 ? text : requireSurfaceColorValue("link", input.link),
+		supporting: input.supporting === void 0 ? text : requireSurfaceColorValue("supporting", input.supporting)
+	};
+}
+function surfaceForegroundValue(role, outsideProviderFallback = DEFAULT_ROLE_FALLBACKS[role]) {
+	const roleVariable = SURFACE_FOREGROUND_CSS_VARS[role];
+	const fallback = requireSurfaceColorValue("fallback", outsideProviderFallback);
+	if (role === "text") return `var(${roleVariable}, ${fallback})`;
+	return `var(${roleVariable}, var(${SURFACE_FOREGROUND_CSS_VARS.text}, ${fallback}))`;
+}
+function surfaceForegroundValueWithOpacity(role, opacityPercent) {
+	if (!Number.isFinite(opacityPercent) || opacityPercent < 0 || opacityPercent > 100) throw new RangeError("Surface foreground opacity must be between 0 and 100.");
+	return `color-mix(in srgb, ${surfaceForegroundValue(role)} ${opacityPercent}%, transparent)`;
+}
+function surfaceForegroundStyle(input) {
+	const foregrounds = completeSurfaceForegrounds(input);
+	return {
+		color: foregrounds.text,
+		[SURFACE_FOREGROUND_CSS_VARS.text]: foregrounds.text,
+		[SURFACE_FOREGROUND_CSS_VARS.heading]: foregrounds.heading,
+		[SURFACE_FOREGROUND_CSS_VARS.link]: foregrounds.link,
+		[SURFACE_FOREGROUND_CSS_VARS.supporting]: foregrounds.supporting
+	};
+}
+function surfaceForegroundDeclarations(input) {
+	const foregrounds = completeSurfaceForegrounds(input);
+	return [`color: ${foregrounds.text}`, ...SURFACE_FOREGROUND_ROLES.map((role) => `${SURFACE_FOREGROUND_CSS_VARS[role]}: ${foregrounds[role]}`)];
+}
+//#endregion
+//#region ../theme-core/src/palette/colors.ts
+const HEX_COLOR_REGEX = /^#[0-9a-f]{6}$/;
+const NORMALIZABLE_HEX_REGEX = /^#(?:[0-9a-f]{3}|[0-9a-f]{6})$/i;
+const THEME_PALETTE_COLOR_ORDER = [
+	"primary",
+	"secondary",
+	"accent",
+	"success",
+	"warning",
+	"destructive",
+	"background",
+	"surface",
+	"surfaceAlt",
+	"muted",
+	"text",
+	"primaryForeground",
+	"border"
+];
+const hexColorSchema = z.string().regex(HEX_COLOR_REGEX, "Hex must be #RRGGBB (lowercase)").transform((value) => value);
+const paletteModeSchema = z.enum(["light", "dark"]);
+const PALETTE_VALUE_KEY_PREFIX = "palette-value:v1|";
+z.string().regex(/^[0-9a-f]{64}$/, "Palette hash must be a lowercase SHA-256 value").transform((value) => value);
+const paletteColorsSchema = z.object({
+	primary: hexColorSchema,
+	primaryForeground: hexColorSchema,
+	secondary: hexColorSchema,
+	accent: hexColorSchema,
+	success: hexColorSchema,
+	warning: hexColorSchema,
+	destructive: hexColorSchema,
+	background: hexColorSchema,
+	surface: hexColorSchema,
+	surfaceAlt: hexColorSchema,
+	muted: hexColorSchema,
+	text: hexColorSchema,
+	border: hexColorSchema
+}).strict().transform((value) => value);
+function normalizePaletteHex(value) {
+	if (!NORMALIZABLE_HEX_REGEX.test(value)) return null;
+	const normalized = value.toLowerCase();
+	if (normalized.length === 7) return normalized;
+	const triplet = normalized.slice(1);
+	const red = triplet.charAt(0);
+	const green = triplet.charAt(1);
+	const blue = triplet.charAt(2);
+	return `#${red}${red}${green}${green}${blue}${blue}`;
+}
+function paletteColorsFromEntries(entries) {
+	const values = {};
+	for (const entry of entries) {
+		const parsedRole = paletteTokenNameSchema.safeParse(entry.name);
+		if (!parsedRole.success) return {
+			ok: false,
+			error: {
+				kind: "unknown-role",
+				role: entry.name
+			}
+		};
+		const role = parsedRole.data;
+		if (values[role] !== void 0) return {
+			ok: false,
+			error: {
+				kind: "duplicate-role",
+				role
+			}
+		};
+		const hex = normalizePaletteHex(entry.hex);
+		if (!hex) return {
+			ok: false,
+			error: {
+				kind: "invalid-color",
+				role,
+				value: entry.hex
+			}
+		};
+		values[role] = hex;
+	}
+	const missing = PALETTE_TOKEN_NAMES.filter((role) => values[role] === void 0);
+	if (missing.length > 0) return {
+		ok: false,
+		error: {
+			kind: "missing-roles",
+			roles: missing
+		}
+	};
+	return {
+		ok: true,
+		colors: paletteColorsSchema.parse(values)
+	};
+}
+function requirePaletteColorsFromEntries(entries) {
+	const result = paletteColorsFromEntries(entries);
+	if (result.ok) return result.colors;
+	throw new Error(`Invalid complete palette: ${result.error.kind}`);
+}
+function paletteColorEntries(colors) {
+	return THEME_PALETTE_COLOR_ORDER.map((name) => ({
+		name,
+		hex: colors[name]
+	}));
+}
+function paletteColorFingerprint(colors) {
+	return PALETTE_TOKEN_NAMES.map((name) => `${name}:${colors[name]}`).join("|");
+}
+function canonicalPaletteHashInput(colors, mode) {
+	return `${mode}|${paletteColorFingerprint(colors)}`;
+}
+/**
+* Stable curated-catalogue identity. Do not reorder roles: the order comes
+* from PALETTE_TOKEN_NAMES through canonicalPaletteHashInput.
+*/
+function paletteValueKey(colors, mode) {
+	return `${PALETTE_VALUE_KEY_PREFIX}${canonicalPaletteHashInput(colors, mode)}`;
+}
+/** Parses only the exact v1 canonical form emitted by paletteValueKey. */
+function parsePaletteValueKey(value) {
+	if (typeof value !== "string" || !value.startsWith(PALETTE_VALUE_KEY_PREFIX)) return null;
+	const [rawMode, ...rawRoles] = value.slice(17).split("|");
+	const mode = paletteModeSchema.safeParse(rawMode);
+	if (!mode.success || rawRoles.length !== PALETTE_TOKEN_NAMES.length) return null;
+	const colors = paletteColorsFromEntries(rawRoles.map((roleValue) => {
+		const separator = roleValue.indexOf(":");
+		return separator === -1 ? {
+			name: "",
+			hex: ""
+		} : {
+			name: roleValue.slice(0, separator),
+			hex: roleValue.slice(separator + 1)
+		};
+	}));
+	if (!colors.ok || paletteValueKey(colors.colors, mode.data) !== value) return null;
+	return value;
+}
+const paletteValueKeySchema = z.string().transform((value, ctx) => {
+	const parsed = parsePaletteValueKey(value);
+	if (parsed) return parsed;
+	ctx.addIssue({
+		code: "custom",
+		message: "Invalid canonical palette value key"
+	});
+	return z.NEVER;
+});
+//#endregion
+//#region ../theme-core/src/palette/utils/opaqueSurfaceColor.ts
+/** Resolve an opaque colour, compositing alpha against an explicit underlay. */
+function resolveOpaqueSurfaceHex(reference, palette, underlayReference) {
+	const opaque = resolveConcreteColorHex(reference, palette);
+	if (opaque) return opaque;
+	if (!underlayReference) return null;
+	const underlayHex = resolveConcreteColorHex(underlayReference, palette);
+	if (!underlayHex) return null;
+	const parts = parseColorTokenParts(reference);
+	if (parts.kind === "token" && parts.opacityPercent !== null) {
+		const foregroundHex = normalizePaletteHex(palette[parts.token] ?? "");
+		return foregroundHex ? compositeHex(foregroundHex, underlayHex, parts.opacityPercent / 100) : null;
+	}
+	const rgba = parseRgba(parts.kind === "raw" ? parts.value : reference);
+	return rgba ? compositeHex(rgbToHex(rgba.r, rgba.g, rgba.b), underlayHex, rgba.alpha) : null;
+}
+/** Resolve a colour reference only when it is already fully opaque. */
+function resolveConcreteColorHex(reference, palette) {
+	const literalHex = normalizePaletteHex(reference);
+	if (literalHex) return literalHex;
+	const parts = parseColorTokenParts(reference);
+	if (parts.kind === "token") {
+		if (parts.opacityPercent !== null) return null;
+		return normalizePaletteHex(palette[parts.token] ?? "");
+	}
+	const literal = parts.kind === "raw" ? parts.value : reference;
+	if (literal.toLowerCase() === "black") return "#000000";
+	if (literal.toLowerCase() === "white") return "#ffffff";
+	return normalizePaletteHex(literal);
+}
+function compositeHex(foregroundHex, underlayHex, alpha) {
+	const foreground = hexToRgb(foregroundHex);
+	const underlay = hexToRgb(underlayHex);
+	const channel = (foregroundValue, underlayValue) => Math.round(foregroundValue * alpha + underlayValue * (1 - alpha));
+	return rgbToHex(channel(foreground.r, underlay.r), channel(foreground.g, underlay.g), channel(foreground.b, underlay.b));
+}
+function parseRgba(value) {
+	const match = value.trim().match(/^rgba?\(\s*([\d.]+)(?:\s*,\s*|\s+)([\d.]+)(?:\s*,\s*|\s+)([\d.]+)(?:\s*(?:,|\/)\s*([\d.]+%?))?\s*\)$/i);
+	if (!match) return null;
+	const [, rSource, gSource, bSource] = match;
+	if (!rSource || !gSource || !bSource) return null;
+	const r = Number(rSource);
+	const g = Number(gSource);
+	const b = Number(bSource);
+	const alpha = parseAlpha(match[4]);
+	if (alpha === null || !isRgbChannel(r) || !isRgbChannel(g) || !isRgbChannel(b)) return null;
+	return {
+		r,
+		g,
+		b,
+		alpha
+	};
+}
+function parseAlpha(source) {
+	if (!source) return 1;
+	const value = source.endsWith("%") ? Number(source.slice(0, -1)) / 100 : Number(source);
+	return Number.isFinite(value) && value >= 0 && value <= 1 ? value : null;
+}
+function isRgbChannel(value) {
+	return Number.isFinite(value) && value >= 0 && value <= 255;
+}
+//#endregion
+//#region ../theme-core/src/surfaces/resolveSurfaceForeground.ts
+const FALLBACK_TEXT_TOKENS = [
+	"text",
+	"primaryForeground",
+	"secondaryForeground",
+	"accentForeground",
+	"neutral-950",
+	"neutral-50"
+];
+const CANONICAL_EQUIVALENT_TOKEN_ORDER = [
+	"text",
+	"primaryForeground",
+	"secondaryForeground",
+	"accentForeground",
+	"onPrimary",
+	"onSecondary",
+	"onAccent",
+	"onSurface",
+	"neutral-950",
+	"neutral-50"
+];
+/**
+* Resolve the complete foreground contract for an effective page/section or
+* site-chrome background.
+*
+* Deterministic colour backgrounds are validated at ordinary-text WCAG AA.
+* Existing image/video/gradient treatments are trusted only when they already
+* carry a usable foreground token; this function deliberately does not claim
+* pixel-level contrast proof for media.
+*/
+function resolveSurfaceForeground(background, palette, candidates = {}, options = {}) {
+	const authored = foregroundCandidates(background, candidates);
+	if (background === null) return resolveDeterministicForeground("background", {
+		...authored,
+		text: authored.text ?? "text"
+	}, palette);
+	if (background.type === "color") {
+		const backgroundReference = normalizedReference(background.color);
+		if (!backgroundReference || backgroundReference === "transparent") return { kind: "unknown" };
+		return resolveDeterministicForeground(backgroundReference, authored, palette, options.compositeBase);
+	}
+	return resolveTrustedTreatmentForeground(authored, palette);
+}
+function foregroundCandidates(background, overrides) {
+	return {
+		text: overrides.text ?? background?.textColor ?? null,
+		heading: overrides.heading ?? background?.headingColor ?? null,
+		link: overrides.link ?? background?.linkColor ?? null,
+		supporting: overrides.supporting ?? background?.supportingColor ?? null
+	};
+}
+function resolveDeterministicForeground(backgroundReference, candidates, palette, compositeBase) {
+	const backgroundHex = resolveOpaqueSurfaceHex(backgroundReference, palette, compositeBase);
+	if (!backgroundHex) return resolveTrustedTreatmentForeground(candidates, palette);
+	const backgroundToken = paletteToken(backgroundReference);
+	const derivedOnToken = backgroundToken ? onColorTokenName(backgroundToken) : null;
+	const text = firstSafeToken([
+		candidates.text,
+		derivedOnToken,
+		...FALLBACK_TEXT_TOKENS
+	], backgroundHex, palette, derivedOnToken ? [derivedOnToken] : []);
+	if (!text) return { kind: "unknown" };
+	return {
+		kind: "known",
+		roles: {
+			text,
+			heading: safeTokenOr(candidates.heading, text, backgroundHex, palette),
+			link: safeTokenOr(candidates.link, text, backgroundHex, palette),
+			supporting: safeTokenOr(candidates.supporting, text, backgroundHex, palette)
+		}
+	};
+}
+function resolveTrustedTreatmentForeground(candidates, palette) {
+	const text = canonicalToken(candidates.text, palette);
+	if (!text) return { kind: "unknown" };
+	return {
+		kind: "known",
+		roles: {
+			text,
+			heading: canonicalToken(candidates.heading, palette) ?? text,
+			link: canonicalToken(candidates.link, palette) ?? text,
+			supporting: canonicalToken(candidates.supporting, palette) ?? text
+		}
+	};
+}
+function safeTokenOr(candidate, fallback, backgroundHex, palette) {
+	return firstSafeToken([candidate], backgroundHex, palette) ?? fallback;
+}
+function firstSafeToken(candidates, backgroundHex, palette, preferredEquivalentTokens = []) {
+	const seen = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) {
+		const token = canonicalToken(candidate, palette, preferredEquivalentTokens);
+		if (!token || seen.has(token)) continue;
+		seen.add(token);
+		const foregroundHex = resolveConcreteColorHex(token, palette);
+		if (foregroundHex && contrastRatio(backgroundHex, foregroundHex) >= 4.5) return token;
+	}
+	return null;
+}
+function canonicalToken(reference, palette, preferredEquivalentTokens = []) {
+	const normalized = normalizedReference(reference);
+	if (!normalized || normalized === "transparent") return null;
+	const direct = parseThemeColorToken(normalized);
+	if (direct && resolveConcreteColorHex(direct, palette)) return direct;
+	const referenceHex = resolveConcreteColorHex(normalized, palette);
+	if (!referenceHex) return null;
+	const equivalent = [
+		...preferredEquivalentTokens,
+		...CANONICAL_EQUIVALENT_TOKEN_ORDER,
+		...Object.keys(palette).sort()
+	].find((token) => {
+		const parsed = parseThemeColorToken(token);
+		return parsed !== null && resolveConcreteColorHex(parsed, palette)?.toLowerCase() === referenceHex.toLowerCase();
+	});
+	return equivalent ? parseThemeColorToken(equivalent) : null;
+}
+function paletteToken(reference) {
+	const parts = parseColorTokenParts(reference);
+	return parts.kind === "token" && parts.opacityPercent === null ? parts.token : null;
+}
+function normalizedReference(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim();
+	return normalized.length > 0 ? normalized : null;
+}
+//#endregion
+//#region ../theme-core/src/utils/colorStyles.ts
+const COLOR_VAR_PREFIX = "--tb-";
+function parseToken(source) {
+	const parts = parseColorTokenParts(source);
+	if (parts.kind === "raw") return {
+		token: source,
+		raw: parts.value
+	};
+	if (parts.kind === "invalid") return { token: source };
+	return {
+		token: parts.token,
+		opacityPercent: parts.opacityPercent === null ? void 0 : parts.opacityPercent
+	};
+}
+const SURFACE_TEXT_ROLE_BY_TOKEN = {
+	text: "text",
+	heading: "heading",
+	mutedText: "supporting"
+};
+function surfaceRoleForTextToken(token) {
+	return Object.prototype.hasOwnProperty.call(SURFACE_TEXT_ROLE_BY_TOKEN, token) ? SURFACE_TEXT_ROLE_BY_TOKEN[token] : null;
+}
+/**
+* Converts a theme color token to a CSS rgb value.
+* This is the primary function for applying theme colors to CSS properties.
+*
+* @param token - Theme color token (semantic, with opacity, or raw)
+* @returns CSS color value (rgb with optional alpha, or raw CSS value)
+*
+* @example
+* rgbColorValue('primary') // => 'rgb(var(--tb-primary))'
+* rgbColorValue('surface/95') // => 'rgb(var(--tb-surface) / 0.95)'
+* rgbColorValue('raw:transparent') // => 'transparent'
+*/
+function rgbColorValue(token) {
+	const { token: baseToken, opacityPercent, raw } = parseToken(token);
+	if (raw) return raw;
+	const cssVar = `${COLOR_VAR_PREFIX}${baseToken}`;
+	if (opacityPercent === void 0) return `rgb(var(${cssVar}))`;
+	return `rgb(var(${cssVar}) / ${opacityPercent / 100})`;
+}
+/**
+* Converts a theme color token to a CSS variable reference.
+* Note: This returns the base variable without rgb() wrapper, ignoring opacity.
+*
+* @param token - Theme color token
+* @returns CSS variable reference
+*
+* @example
+* cssVarValue('primary') // => 'var(--tb-primary)'
+* cssVarValue('surface/95') // => 'var(--tb-surface)' (opacity ignored)
+*/
+function cssVarValue(token) {
+	const { token: baseToken } = parseToken(token);
+	return `var(${COLOR_VAR_PREFIX}${baseToken})`;
+}
+/**
+* Creates a backgroundColor style object from a theme token.
+*
+* @param token - Theme color token
+* @returns CSSProperties with backgroundColor
+*/
+function backgroundColorStyle(token) {
+	return { backgroundColor: rgbColorValue(token) };
+}
+/**
+* Creates a text color style object from a theme token.
+*
+* @param token - Theme color token
+* @returns CSSProperties with color
+*/
+function textColorStyle(token) {
+	const parsed = parseToken(token);
+	const surfaceRole = parsed.raw ? null : surfaceRoleForTextToken(parsed.token);
+	if (surfaceRole) return { color: parsed.opacityPercent === void 0 ? surfaceForegroundValue(surfaceRole) : surfaceForegroundValueWithOpacity(surfaceRole, parsed.opacityPercent) };
+	return { color: rgbColorValue(token) };
+}
+/**
+* Creates a border color style object from a theme token.
+*
+* @param token - Theme color token
+* @returns CSSProperties with borderColor
+*/
+function borderColorStyle(token) {
+	return { borderColor: rgbColorValue(token) };
+}
+/**
+* Merges multiple CSSProperties objects into a single object.
+* Later styles override earlier ones. Undefined values are filtered out.
+* Returns undefined if the merged result is empty.
+*
+* @param styles - Variable number of CSSProperties objects (can be undefined)
+* @returns Merged CSSProperties object, or undefined if empty
+*
+* @example
+* mergeStyles(
+*   backgroundColorStyle('surface'),
+*   textColorStyle('text'),
+*   borderColorStyle('border')
+* )
+* // => { backgroundColor: '...', color: '...', borderColor: '...' }
+*/
+function mergeStyles(...styles) {
+	const merged = {};
+	for (const style of styles) {
+		if (!style) continue;
+		Object.assign(merged, style);
+	}
+	return Object.keys(merged).length ? merged : void 0;
+}
+//#endregion
 //#region ../theme-core/src/tokens/resolver.ts
 /**
 * Resolves theme tokens to CSS variables
@@ -5312,7 +5857,7 @@ var TokenResolver = class {
 	*/
 	getColor(token) {
 		if (!this.tokenExists(token)) console.warn(`[TokenResolver] Color token "${token}" not found in theme palette. Button may render incorrectly.`);
-		return `rgb(var(--tb-${token}))`;
+		return rgbColorValue(token);
 	}
 	/**
 	* Adjust a color token's shade by a given amount
@@ -6018,398 +6563,6 @@ function resolveCardRole(theme, cardSystem, role) {
 	}
 }
 //#endregion
-//#region ../theme-core/src/surfaces/foregroundRoles.ts
-const SURFACE_FOREGROUND_ROLES = [
-	"text",
-	"heading",
-	"link",
-	"supporting"
-];
-//#endregion
-//#region ../theme-core/src/surfaces/foregroundContract.ts
-const SURFACE_FOREGROUND_CSS_VARS = {
-	text: "--rb-surface-text-color",
-	heading: "--rb-surface-heading-color",
-	link: "--rb-surface-link-color",
-	supporting: "--rb-surface-supporting-color"
-};
-const DEFAULT_SURFACE_TEXT_COLOR = "rgb(var(--tb-text, 17 24 39))";
-const DEFAULT_ROLE_FALLBACKS = {
-	text: DEFAULT_SURFACE_TEXT_COLOR,
-	heading: DEFAULT_SURFACE_TEXT_COLOR,
-	link: "rgb(var(--tb-primary, var(--tb-text, 17 24 39)))",
-	supporting: "rgb(var(--tb-mutedText, 100 116 139))"
-};
-function requireSurfaceColorValue(role, value) {
-	const normalized = value.trim();
-	if (normalized.length === 0) throw new RangeError(`Surface foreground ${role} must be a non-empty CSS color.`);
-	return normalized;
-}
-function completeSurfaceForegrounds(input) {
-	const text = requireSurfaceColorValue("text", input.text);
-	return {
-		text,
-		heading: input.heading === void 0 ? text : requireSurfaceColorValue("heading", input.heading),
-		link: input.link === void 0 ? text : requireSurfaceColorValue("link", input.link),
-		supporting: input.supporting === void 0 ? text : requireSurfaceColorValue("supporting", input.supporting)
-	};
-}
-function surfaceForegroundValue(role, outsideProviderFallback = DEFAULT_ROLE_FALLBACKS[role]) {
-	const roleVariable = SURFACE_FOREGROUND_CSS_VARS[role];
-	const fallback = requireSurfaceColorValue("fallback", outsideProviderFallback);
-	if (role === "text") return `var(${roleVariable}, ${fallback})`;
-	return `var(${roleVariable}, var(${SURFACE_FOREGROUND_CSS_VARS.text}, ${fallback}))`;
-}
-function surfaceForegroundValueWithOpacity(role, opacityPercent) {
-	if (!Number.isFinite(opacityPercent) || opacityPercent < 0 || opacityPercent > 100) throw new RangeError("Surface foreground opacity must be between 0 and 100.");
-	return `color-mix(in srgb, ${surfaceForegroundValue(role)} ${opacityPercent}%, transparent)`;
-}
-function surfaceForegroundStyle(input) {
-	const foregrounds = completeSurfaceForegrounds(input);
-	return {
-		color: foregrounds.text,
-		[SURFACE_FOREGROUND_CSS_VARS.text]: foregrounds.text,
-		[SURFACE_FOREGROUND_CSS_VARS.heading]: foregrounds.heading,
-		[SURFACE_FOREGROUND_CSS_VARS.link]: foregrounds.link,
-		[SURFACE_FOREGROUND_CSS_VARS.supporting]: foregrounds.supporting
-	};
-}
-function surfaceForegroundDeclarations(input) {
-	const foregrounds = completeSurfaceForegrounds(input);
-	return [`color: ${foregrounds.text}`, ...SURFACE_FOREGROUND_ROLES.map((role) => `${SURFACE_FOREGROUND_CSS_VARS[role]}: ${foregrounds[role]}`)];
-}
-//#endregion
-//#region ../theme-core/src/palette/colors.ts
-const HEX_COLOR_REGEX = /^#[0-9a-f]{6}$/;
-const NORMALIZABLE_HEX_REGEX = /^#(?:[0-9a-f]{3}|[0-9a-f]{6})$/i;
-const THEME_PALETTE_COLOR_ORDER = [
-	"primary",
-	"secondary",
-	"accent",
-	"success",
-	"warning",
-	"destructive",
-	"background",
-	"surface",
-	"surfaceAlt",
-	"muted",
-	"text",
-	"primaryForeground",
-	"border"
-];
-const hexColorSchema = z.string().regex(HEX_COLOR_REGEX, "Hex must be #RRGGBB (lowercase)").transform((value) => value);
-const paletteModeSchema = z.enum(["light", "dark"]);
-const PALETTE_VALUE_KEY_PREFIX = "palette-value:v1|";
-z.string().regex(/^[0-9a-f]{64}$/, "Palette hash must be a lowercase SHA-256 value").transform((value) => value);
-const paletteColorsSchema = z.object({
-	primary: hexColorSchema,
-	primaryForeground: hexColorSchema,
-	secondary: hexColorSchema,
-	accent: hexColorSchema,
-	success: hexColorSchema,
-	warning: hexColorSchema,
-	destructive: hexColorSchema,
-	background: hexColorSchema,
-	surface: hexColorSchema,
-	surfaceAlt: hexColorSchema,
-	muted: hexColorSchema,
-	text: hexColorSchema,
-	border: hexColorSchema
-}).strict().transform((value) => value);
-function normalizePaletteHex(value) {
-	if (!NORMALIZABLE_HEX_REGEX.test(value)) return null;
-	const normalized = value.toLowerCase();
-	if (normalized.length === 7) return normalized;
-	const triplet = normalized.slice(1);
-	const red = triplet.charAt(0);
-	const green = triplet.charAt(1);
-	const blue = triplet.charAt(2);
-	return `#${red}${red}${green}${green}${blue}${blue}`;
-}
-function paletteColorsFromEntries(entries) {
-	const values = {};
-	for (const entry of entries) {
-		const parsedRole = paletteTokenNameSchema.safeParse(entry.name);
-		if (!parsedRole.success) return {
-			ok: false,
-			error: {
-				kind: "unknown-role",
-				role: entry.name
-			}
-		};
-		const role = parsedRole.data;
-		if (values[role] !== void 0) return {
-			ok: false,
-			error: {
-				kind: "duplicate-role",
-				role
-			}
-		};
-		const hex = normalizePaletteHex(entry.hex);
-		if (!hex) return {
-			ok: false,
-			error: {
-				kind: "invalid-color",
-				role,
-				value: entry.hex
-			}
-		};
-		values[role] = hex;
-	}
-	const missing = PALETTE_TOKEN_NAMES.filter((role) => values[role] === void 0);
-	if (missing.length > 0) return {
-		ok: false,
-		error: {
-			kind: "missing-roles",
-			roles: missing
-		}
-	};
-	return {
-		ok: true,
-		colors: paletteColorsSchema.parse(values)
-	};
-}
-function requirePaletteColorsFromEntries(entries) {
-	const result = paletteColorsFromEntries(entries);
-	if (result.ok) return result.colors;
-	throw new Error(`Invalid complete palette: ${result.error.kind}`);
-}
-function paletteColorEntries(colors) {
-	return THEME_PALETTE_COLOR_ORDER.map((name) => ({
-		name,
-		hex: colors[name]
-	}));
-}
-function paletteColorFingerprint(colors) {
-	return PALETTE_TOKEN_NAMES.map((name) => `${name}:${colors[name]}`).join("|");
-}
-function canonicalPaletteHashInput(colors, mode) {
-	return `${mode}|${paletteColorFingerprint(colors)}`;
-}
-/**
-* Stable curated-catalogue identity. Do not reorder roles: the order comes
-* from PALETTE_TOKEN_NAMES through canonicalPaletteHashInput.
-*/
-function paletteValueKey(colors, mode) {
-	return `${PALETTE_VALUE_KEY_PREFIX}${canonicalPaletteHashInput(colors, mode)}`;
-}
-/** Parses only the exact v1 canonical form emitted by paletteValueKey. */
-function parsePaletteValueKey(value) {
-	if (typeof value !== "string" || !value.startsWith(PALETTE_VALUE_KEY_PREFIX)) return null;
-	const [rawMode, ...rawRoles] = value.slice(17).split("|");
-	const mode = paletteModeSchema.safeParse(rawMode);
-	if (!mode.success || rawRoles.length !== PALETTE_TOKEN_NAMES.length) return null;
-	const colors = paletteColorsFromEntries(rawRoles.map((roleValue) => {
-		const separator = roleValue.indexOf(":");
-		return separator === -1 ? {
-			name: "",
-			hex: ""
-		} : {
-			name: roleValue.slice(0, separator),
-			hex: roleValue.slice(separator + 1)
-		};
-	}));
-	if (!colors.ok || paletteValueKey(colors.colors, mode.data) !== value) return null;
-	return value;
-}
-const paletteValueKeySchema = z.string().transform((value, ctx) => {
-	const parsed = parsePaletteValueKey(value);
-	if (parsed) return parsed;
-	ctx.addIssue({
-		code: "custom",
-		message: "Invalid canonical palette value key"
-	});
-	return z.NEVER;
-});
-//#endregion
-//#region ../theme-core/src/palette/utils/opaqueSurfaceColor.ts
-/** Resolve an opaque colour, compositing alpha against an explicit underlay. */
-function resolveOpaqueSurfaceHex(reference, palette, underlayReference) {
-	const opaque = resolveConcreteColorHex(reference, palette);
-	if (opaque) return opaque;
-	if (!underlayReference) return null;
-	const underlayHex = resolveConcreteColorHex(underlayReference, palette);
-	if (!underlayHex) return null;
-	const parts = parseColorTokenParts(reference);
-	if (parts.kind === "token" && parts.opacityPercent !== null) {
-		const foregroundHex = normalizePaletteHex(palette[parts.token] ?? "");
-		return foregroundHex ? compositeHex(foregroundHex, underlayHex, parts.opacityPercent / 100) : null;
-	}
-	const rgba = parseRgba(parts.kind === "raw" ? parts.value : reference);
-	return rgba ? compositeHex(rgbToHex(rgba.r, rgba.g, rgba.b), underlayHex, rgba.alpha) : null;
-}
-/** Resolve a colour reference only when it is already fully opaque. */
-function resolveConcreteColorHex(reference, palette) {
-	const literalHex = normalizePaletteHex(reference);
-	if (literalHex) return literalHex;
-	const parts = parseColorTokenParts(reference);
-	if (parts.kind === "token") {
-		if (parts.opacityPercent !== null) return null;
-		return normalizePaletteHex(palette[parts.token] ?? "");
-	}
-	const literal = parts.kind === "raw" ? parts.value : reference;
-	if (literal.toLowerCase() === "black") return "#000000";
-	if (literal.toLowerCase() === "white") return "#ffffff";
-	return normalizePaletteHex(literal);
-}
-function compositeHex(foregroundHex, underlayHex, alpha) {
-	const foreground = hexToRgb(foregroundHex);
-	const underlay = hexToRgb(underlayHex);
-	const channel = (foregroundValue, underlayValue) => Math.round(foregroundValue * alpha + underlayValue * (1 - alpha));
-	return rgbToHex(channel(foreground.r, underlay.r), channel(foreground.g, underlay.g), channel(foreground.b, underlay.b));
-}
-function parseRgba(value) {
-	const match = value.trim().match(/^rgba?\(\s*([\d.]+)(?:\s*,\s*|\s+)([\d.]+)(?:\s*,\s*|\s+)([\d.]+)(?:\s*(?:,|\/)\s*([\d.]+%?))?\s*\)$/i);
-	if (!match) return null;
-	const [, rSource, gSource, bSource] = match;
-	if (!rSource || !gSource || !bSource) return null;
-	const r = Number(rSource);
-	const g = Number(gSource);
-	const b = Number(bSource);
-	const alpha = parseAlpha(match[4]);
-	if (alpha === null || !isRgbChannel(r) || !isRgbChannel(g) || !isRgbChannel(b)) return null;
-	return {
-		r,
-		g,
-		b,
-		alpha
-	};
-}
-function parseAlpha(source) {
-	if (!source) return 1;
-	const value = source.endsWith("%") ? Number(source.slice(0, -1)) / 100 : Number(source);
-	return Number.isFinite(value) && value >= 0 && value <= 1 ? value : null;
-}
-function isRgbChannel(value) {
-	return Number.isFinite(value) && value >= 0 && value <= 255;
-}
-//#endregion
-//#region ../theme-core/src/surfaces/resolveSurfaceForeground.ts
-const FALLBACK_TEXT_TOKENS = [
-	"text",
-	"primaryForeground",
-	"secondaryForeground",
-	"accentForeground",
-	"neutral-950",
-	"neutral-50"
-];
-const CANONICAL_EQUIVALENT_TOKEN_ORDER = [
-	"text",
-	"primaryForeground",
-	"secondaryForeground",
-	"accentForeground",
-	"onPrimary",
-	"onSecondary",
-	"onAccent",
-	"onSurface",
-	"neutral-950",
-	"neutral-50"
-];
-/**
-* Resolve the complete foreground contract for an effective page/section or
-* site-chrome background.
-*
-* Deterministic colour backgrounds are validated at ordinary-text WCAG AA.
-* Existing image/video/gradient treatments are trusted only when they already
-* carry a usable foreground token; this function deliberately does not claim
-* pixel-level contrast proof for media.
-*/
-function resolveSurfaceForeground(background, palette, candidates = {}, options = {}) {
-	const authored = foregroundCandidates(background, candidates);
-	if (background === null) return resolveDeterministicForeground("background", {
-		...authored,
-		text: authored.text ?? "text"
-	}, palette);
-	if (background.type === "color") {
-		const backgroundReference = normalizedReference(background.color);
-		if (!backgroundReference || backgroundReference === "transparent") return { kind: "unknown" };
-		return resolveDeterministicForeground(backgroundReference, authored, palette, options.compositeBase);
-	}
-	return resolveTrustedTreatmentForeground(authored, palette);
-}
-function foregroundCandidates(background, overrides) {
-	return {
-		text: overrides.text ?? background?.textColor ?? null,
-		heading: overrides.heading ?? background?.headingColor ?? null,
-		link: overrides.link ?? background?.linkColor ?? null,
-		supporting: overrides.supporting ?? background?.supportingColor ?? null
-	};
-}
-function resolveDeterministicForeground(backgroundReference, candidates, palette, compositeBase) {
-	const backgroundHex = resolveOpaqueSurfaceHex(backgroundReference, palette, compositeBase);
-	if (!backgroundHex) return resolveTrustedTreatmentForeground(candidates, palette);
-	const backgroundToken = paletteToken(backgroundReference);
-	const derivedOnToken = backgroundToken ? onColorTokenName(backgroundToken) : null;
-	const text = firstSafeToken([
-		candidates.text,
-		derivedOnToken,
-		...FALLBACK_TEXT_TOKENS
-	], backgroundHex, palette, derivedOnToken ? [derivedOnToken] : []);
-	if (!text) return { kind: "unknown" };
-	return {
-		kind: "known",
-		roles: {
-			text,
-			heading: safeTokenOr(candidates.heading, text, backgroundHex, palette),
-			link: safeTokenOr(candidates.link, text, backgroundHex, palette),
-			supporting: safeTokenOr(candidates.supporting, text, backgroundHex, palette)
-		}
-	};
-}
-function resolveTrustedTreatmentForeground(candidates, palette) {
-	const text = canonicalToken(candidates.text, palette);
-	if (!text) return { kind: "unknown" };
-	return {
-		kind: "known",
-		roles: {
-			text,
-			heading: canonicalToken(candidates.heading, palette) ?? text,
-			link: canonicalToken(candidates.link, palette) ?? text,
-			supporting: canonicalToken(candidates.supporting, palette) ?? text
-		}
-	};
-}
-function safeTokenOr(candidate, fallback, backgroundHex, palette) {
-	return firstSafeToken([candidate], backgroundHex, palette) ?? fallback;
-}
-function firstSafeToken(candidates, backgroundHex, palette, preferredEquivalentTokens = []) {
-	const seen = /* @__PURE__ */ new Set();
-	for (const candidate of candidates) {
-		const token = canonicalToken(candidate, palette, preferredEquivalentTokens);
-		if (!token || seen.has(token)) continue;
-		seen.add(token);
-		const foregroundHex = resolveConcreteColorHex(token, palette);
-		if (foregroundHex && contrastRatio(backgroundHex, foregroundHex) >= 4.5) return token;
-	}
-	return null;
-}
-function canonicalToken(reference, palette, preferredEquivalentTokens = []) {
-	const normalized = normalizedReference(reference);
-	if (!normalized || normalized === "transparent") return null;
-	const direct = parseThemeColorToken(normalized);
-	if (direct && resolveConcreteColorHex(direct, palette)) return direct;
-	const referenceHex = resolveConcreteColorHex(normalized, palette);
-	if (!referenceHex) return null;
-	const equivalent = [
-		...preferredEquivalentTokens,
-		...CANONICAL_EQUIVALENT_TOKEN_ORDER,
-		...Object.keys(palette).sort()
-	].find((token) => {
-		const parsed = parseThemeColorToken(token);
-		return parsed !== null && resolveConcreteColorHex(parsed, palette)?.toLowerCase() === referenceHex.toLowerCase();
-	});
-	return equivalent ? parseThemeColorToken(equivalent) : null;
-}
-function paletteToken(reference) {
-	const parts = parseColorTokenParts(reference);
-	return parts.kind === "token" && parts.opacityPercent === null ? parts.token : null;
-}
-function normalizedReference(value) {
-	if (typeof value !== "string") return null;
-	const normalized = value.trim();
-	return normalized.length > 0 ? normalized : null;
-}
-//#endregion
 //#region ../theme-core/src/cards/generateCardCss.ts
 const PER_CORNER_RADIUS_MAP = {
 	square: "0",
@@ -11378,8 +11531,14 @@ const headerInteractionPillPaletteValues = [
 	"accent"
 ];
 /**
-* "No pill": the nav link keeps whatever hover treatment its recipe compiled,
-* and the palette step writes nothing at all (#1318 Phase 4c decision 2).
+* "No pill": a colour change on hover rather than a filled background.
+*
+* The palette step writes nothing (#1318 Phase 4c decision 2), but on a
+* foreground-adaptive style that is not the end of the story: the hover colour
+* is derived from the resolved opening foreground at render time, paired with
+* the resting colour, so `quiet` resolves to a definite colour rather than to
+* whatever brand token the recipe happened to name. See
+* `applyOpeningForeground`.
 *
 * It exists because "a colour change on hover, no filled background" was not
 * expressible in the vocabulary, and it is what
@@ -14588,117 +14747,6 @@ function affordanceIconMaskUrl(iconId) {
 	return `data:image/svg+xml,${`<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'>${paths.map((d) => `<path d='${d}'/>`).join("")}</svg>`.replace(/"/g, "'").replace(/#/g, "%23").replace(/</g, "%3C").replace(/>/g, "%3E").replace(/\s+/g, " ")}`;
 }
 //#endregion
-//#region ../theme-core/src/utils/colorStyles.ts
-const COLOR_VAR_PREFIX = "--tb-";
-function parseToken(source) {
-	const parts = parseColorTokenParts(source);
-	if (parts.kind === "raw") return {
-		token: source,
-		raw: parts.value
-	};
-	if (parts.kind === "invalid") return { token: source };
-	return {
-		token: parts.token,
-		opacityPercent: parts.opacityPercent === null ? void 0 : parts.opacityPercent
-	};
-}
-const SURFACE_TEXT_ROLE_BY_TOKEN = {
-	text: "text",
-	heading: "heading",
-	mutedText: "supporting"
-};
-function surfaceRoleForTextToken(token) {
-	return Object.prototype.hasOwnProperty.call(SURFACE_TEXT_ROLE_BY_TOKEN, token) ? SURFACE_TEXT_ROLE_BY_TOKEN[token] : null;
-}
-/**
-* Converts a theme color token to a CSS rgb value.
-* This is the primary function for applying theme colors to CSS properties.
-*
-* @param token - Theme color token (semantic, with opacity, or raw)
-* @returns CSS color value (rgb with optional alpha, or raw CSS value)
-*
-* @example
-* rgbColorValue('primary') // => 'rgb(var(--tb-primary))'
-* rgbColorValue('surface/95') // => 'rgb(var(--tb-surface) / 0.95)'
-* rgbColorValue('raw:transparent') // => 'transparent'
-*/
-function rgbColorValue(token) {
-	const { token: baseToken, opacityPercent, raw } = parseToken(token);
-	if (raw) return raw;
-	const cssVar = `${COLOR_VAR_PREFIX}${baseToken}`;
-	if (opacityPercent === void 0) return `rgb(var(${cssVar}))`;
-	return `rgb(var(${cssVar}) / ${opacityPercent / 100})`;
-}
-/**
-* Converts a theme color token to a CSS variable reference.
-* Note: This returns the base variable without rgb() wrapper, ignoring opacity.
-*
-* @param token - Theme color token
-* @returns CSS variable reference
-*
-* @example
-* cssVarValue('primary') // => 'var(--tb-primary)'
-* cssVarValue('surface/95') // => 'var(--tb-surface)' (opacity ignored)
-*/
-function cssVarValue(token) {
-	const { token: baseToken } = parseToken(token);
-	return `var(${COLOR_VAR_PREFIX}${baseToken})`;
-}
-/**
-* Creates a backgroundColor style object from a theme token.
-*
-* @param token - Theme color token
-* @returns CSSProperties with backgroundColor
-*/
-function backgroundColorStyle(token) {
-	return { backgroundColor: rgbColorValue(token) };
-}
-/**
-* Creates a text color style object from a theme token.
-*
-* @param token - Theme color token
-* @returns CSSProperties with color
-*/
-function textColorStyle(token) {
-	const parsed = parseToken(token);
-	const surfaceRole = parsed.raw ? null : surfaceRoleForTextToken(parsed.token);
-	if (surfaceRole) return { color: parsed.opacityPercent === void 0 ? surfaceForegroundValue(surfaceRole) : surfaceForegroundValueWithOpacity(surfaceRole, parsed.opacityPercent) };
-	return { color: rgbColorValue(token) };
-}
-/**
-* Creates a border color style object from a theme token.
-*
-* @param token - Theme color token
-* @returns CSSProperties with borderColor
-*/
-function borderColorStyle(token) {
-	return { borderColor: rgbColorValue(token) };
-}
-/**
-* Merges multiple CSSProperties objects into a single object.
-* Later styles override earlier ones. Undefined values are filtered out.
-* Returns undefined if the merged result is empty.
-*
-* @param styles - Variable number of CSSProperties objects (can be undefined)
-* @returns Merged CSSProperties object, or undefined if empty
-*
-* @example
-* mergeStyles(
-*   backgroundColorStyle('surface'),
-*   textColorStyle('text'),
-*   borderColorStyle('border')
-* )
-* // => { backgroundColor: '...', color: '...', borderColor: '...' }
-*/
-function mergeStyles(...styles) {
-	const merged = {};
-	for (const style of styles) {
-		if (!style) continue;
-		Object.assign(merged, style);
-	}
-	return Object.keys(merged).length ? merged : void 0;
-}
-//#endregion
 //#region ../theme-core/src/utils/tokenOrColor.ts
 /**
 * Runtime color-reference fields intentionally accept any string, including
@@ -26896,6 +26944,28 @@ const bookingRequirementConsentFieldSchema = z.object({
 const bookingConsentCarrierSchema = z.union([blockBookingConsentSchema, bookingRequirementConsentFieldSchema]);
 //#endregion
 //#region ../blocks/src/system/blocks/events/shared/schemas.ts
+const publicEventLoaderQuerySchemaShape = {
+	limit: z.string().optional(),
+	from: z.string().optional(),
+	to: z.string().optional(),
+	afterStartsAt: z.string().optional(),
+	afterId: z.string().optional(),
+	categoryIds: z.string().optional(),
+	venueId: z.string().optional(),
+	staffMemberId: z.string().optional(),
+	eventSurface: z.string().optional(),
+	eventPresets: z.string().optional(),
+	scheduleScope: z.string().optional(),
+	seriesId: z.string().optional(),
+	seriesIds: z.string().optional(),
+	runSeriesId: z.string().optional(),
+	seriesSlug: z.string().optional(),
+	includeOccurrenceId: z.string().optional(),
+	readIntent: z.string().optional(),
+	detailLevel: z.string().optional(),
+	readProfile: z.string().optional()
+};
+z.object(publicEventLoaderQuerySchemaShape);
 const eventPresetSchema = z.enum([
 	"event",
 	"class",
@@ -30337,7 +30407,7 @@ const publicPricingSchema = z.object({
 	singlePriceAmount: z.number().nullable(),
 	slidingMinAmount: z.number().nullable(),
 	slidingMaxAmount: z.number().nullable(),
-	options: z.array(publicPricingOptionSchema)
+	options: z.array(publicPricingOptionSchema).readonly()
 });
 const publicAppointmentServiceSchema = z.object({
 	id: z.string().min(1),
@@ -36971,6 +37041,44 @@ function toWholeSeriesRegistrationEvents(events) {
 	return groupPublicEventsByRun(events).map(toWholeSeriesRegistrationEvent).filter((event) => event !== null);
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/eventSourceRecovery.ts
+const { limit: _rawLimit, eventSurface: _rawEventSurface, scheduleScope: _rawScheduleScope, detailLevel: _rawDetailLevel, ...stringEventQueryShape } = publicEventLoaderQuerySchemaShape;
+const eventRecoveryRequestSchema = z.object({
+	...stringEventQueryShape,
+	limit: z.coerce.number().int().positive().optional(),
+	eventSurface: z.enum(eventSurfaceScopeValues).optional(),
+	scheduleScope: z.enum(eventScheduleScopeValues).optional(),
+	detailLevel: z.enum(["full", "listing"]).optional(),
+	stage: z.enum(["preview", "published"]).optional()
+});
+function resolveEventRegistrationEventSource(input) {
+	if (input.wholeSeriesRunEvents != null) return {
+		kind: "loaded",
+		events: input.wholeSeriesRunEvents
+	};
+	if (input.events != null) return {
+		kind: "loaded",
+		events: input.events
+	};
+	return {
+		kind: "unresolved",
+		request: parseEventLoaderRecoveryRequest(input.failures?.wholeSeriesRunEvents ?? input.failures?.events)
+	};
+}
+const eventLoaderFailureSchema = z.object({
+	endpoint: z.literal("listPublicEvents"),
+	params: eventRecoveryRequestSchema.extend({ siteId: z.string().optional() })
+});
+function parseEventLoaderRecoveryRequest(value) {
+	const parsed = eventLoaderFailureSchema.safeParse(value);
+	if (!parsed.success) return null;
+	const { siteId: _siteId, stage, ...params } = parsed.data.params;
+	return {
+		...params,
+		stage: stage ?? "published"
+	};
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration.interactive.ts
 const EVENT_REGISTRATION_GENERIC_SHELL_STEP_LABELS = [
 	"Date",
@@ -36988,8 +37096,6 @@ const eventRegistrationPublicEventSchema = z.preprocess(normalizeEventRegistrati
 const eventRegistrationHydrationSchemaShape = {
 	occurrenceContext: occurrenceContextSchema.optional(),
 	subject: eventRegistrationPageSurfaceSubjectSchema.nullable().optional(),
-	events: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
-	wholeSeriesRunEvents: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
 	maxTickets: z.string().optional(),
 	showVenue: z.boolean().optional(),
 	showCapacity: z.boolean().optional(),
@@ -37001,12 +37107,22 @@ const eventRegistrationHydrationSchemaShape = {
 	sitePasses: publicPassProductCollectionSchema.nullable().optional(),
 	siteMemberships: publicMembershipProductCollectionSchema.nullable().optional()
 };
+const eventRegistrationEventSourceSchema = z.discriminatedUnion("kind", [z.object({
+	kind: z.literal("loaded"),
+	events: z.array(eventRegistrationPublicEventSchema)
+}), z.object({
+	kind: z.literal("unresolved"),
+	request: eventRecoveryRequestSchema.nullable()
+})]);
 const eventRegistrationSourceSchema = z.object({
 	siteId: z.string().optional(),
 	apiBaseUrl: z.string().optional(),
 	portalToken: z.string().nullable().optional(),
 	previewToken: z.string().nullable().optional(),
 	...eventRegistrationHydrationSchemaShape,
+	events: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
+	wholeSeriesRunEvents: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
+	eventLoaderFailures: z.record(z.string(), z.unknown()).nullable().optional(),
 	className: z.string().nullable().optional(),
 	buttonText: z.string().nullable().optional(),
 	maxTickets: z.string().nullable().optional(),
@@ -37027,7 +37143,10 @@ const eventRegistrationDisplaySchema = z.discriminatedUnion("state", [z.object({
 	titleText: z.string(),
 	bodyText: z.string()
 })]);
-const eventRegistrationHydrationSchema = z.object(eventRegistrationHydrationSchemaShape);
+const eventRegistrationHydrationSchema = z.object({
+	...eventRegistrationHydrationSchemaShape,
+	eventSource: eventRegistrationEventSourceSchema
+});
 const eventRegistrationRenderSchema = z.object({
 	display: eventRegistrationDisplaySchema,
 	hydration: eventRegistrationHydrationSchema
@@ -37086,16 +37205,12 @@ function buildEventRegistrationShellStepLabels(source, scopedSourceEvents) {
 function toScopedEventRegistrationEvents(scopedSourceEvents) {
 	return [...toRegistrationEvents(scopedSourceEvents), ...toWholeSeriesRegistrationEvents(scopedSourceEvents)];
 }
-function scopeEventRegistrationSourceEvents(source) {
-	return resolveEventRegistrationScopedEvents(source.wholeSeriesRunEvents ?? source.events ?? [], {
+function scopeEventRegistrationSourceEvents(source, eventSource) {
+	return resolveEventRegistrationScopedEvents(eventSource.kind === "loaded" ? eventSource.events : [], {
 		occurrenceContext: source.occurrenceContext,
 		subject: source.subject
 	});
 }
-function resolveLoadedEventRegistrationSourceEvents(source, scopedSourceEvents) {
-	if (source.events == null && source.wholeSeriesRunEvents == null) return null;
-	return [...scopedSourceEvents];
-}
 /**
 * The one run this surface is registering for, when the scoped events describe
 * exactly one. More than one run means the visitor still has to choose.
@@ -37135,14 +37250,21 @@ const eventRegistrationBlockRuntime = defineClientOwnedBlockRuntime({
 		render: createZodCodec(eventRegistrationRenderSchema)
 	},
 	buildRender: (source) => {
-		const scopedSourceEvents = scopeEventRegistrationSourceEvents(source);
-		const events = resolveLoadedEventRegistrationSourceEvents(source, scopedSourceEvents);
+		const eventSource = resolveEventRegistrationEventSource({
+			events: source.events,
+			wholeSeriesRunEvents: source.wholeSeriesRunEvents,
+			failures: source.eventLoaderFailures
+		});
+		const scopedSourceEvents = scopeEventRegistrationSourceEvents(source, eventSource);
 		return {
 			display: buildEventRegistrationDisplayFromScopedEvents(source, scopedSourceEvents),
 			hydration: {
 				occurrenceContext: source.occurrenceContext ?? null,
 				subject: source.subject ?? null,
-				events,
+				eventSource: eventSource.kind === "loaded" ? {
+					...eventSource,
+					events: [...scopedSourceEvents]
+				} : eventSource,
 				maxTickets: source.maxTickets ?? void 0,
 				showVenue: source.showVenue,
 				showCapacity: source.showCapacity,
@@ -37332,6 +37454,7 @@ const eventRegistrationBlockDefinition = {
 					} },
 					events: { $bind: { from: "data.events" } },
 					wholeSeriesRunEvents: { $bind: { from: "data.wholeSeriesRunEvents" } },
+					loaderFailures: { $bind: { from: "$root.loaderFailures" } },
 					sitePasses: { $bind: { from: "data.sitePasses" } },
 					siteMemberships: { $bind: { from: "data.siteMemberships" } },
 					stage: { $bind: {
@@ -39314,6 +39437,15 @@ const newsletterFieldSchema = z.object({
 	placeholder: z.string().optional()
 });
 const mailingListSignupBlockIdSchema = z.string().trim().min(1).transform(parseRequiredMailingListSignupBlockId);
+const mailingListContentVersionIdSchema = z.string().transform((value, ctx) => {
+	const parsed = parseMailingListContentVersionId(value);
+	if (parsed) return parsed;
+	ctx.addIssue({
+		code: z.ZodIssueCode.custom,
+		message: "Invalid mailing-list content version ID"
+	});
+	return z.NEVER;
+});
 const signedMailingListSourceTokenSchema = z.string().trim().min(1).transform(parseRequiredMailingListSignedSourceToken);
 const newsletterSourceCommonSchema = z.object({
 	siteId: z.string().optional(),
@@ -39327,7 +39459,8 @@ const newsletterSourceCommonSchema = z.object({
 const newsletterSourceSchema = z.discriminatedUnion("source", [
 	newsletterSourceCommonSchema.extend({
 		source: z.literal("block"),
-		blockId: z.string().nullable().optional()
+		blockId: z.string().nullable().optional(),
+		contentVersionId: z.string().nullable().optional()
 	}),
 	newsletterSourceCommonSchema.extend({
 		source: z.literal("signed-footer"),
@@ -39343,6 +39476,7 @@ const newsletterDisplaySchema = z.object({
 	availability: z.enum(["ready", "unavailable"]),
 	className: z.string().nullable(),
 	buttonLabel: z.string(),
+	successMessage: z.string(),
 	buttonVariant: newsletterButtonVariantSchema,
 	privacyNote: z.string().nullable(),
 	fields: z.array(newsletterFieldSchema),
@@ -39357,7 +39491,8 @@ const newsletterHydrationSchema = z.object({
 			tag: z.literal("block-source"),
 			sourceRef: z.object({
 				tag: z.literal("block_ref"),
-				blockId: mailingListSignupBlockIdSchema
+				blockId: mailingListSignupBlockIdSchema,
+				contentVersionId: mailingListContentVersionIdSchema
 			}).nullable()
 		}),
 		z.object({
@@ -39396,6 +39531,7 @@ function buildNewsletterDisplay(source) {
 		fields: { preset: "emailOnly" },
 		includeOptionalPhone: false,
 		buttonLabel: "Subscribe",
+		successMessage: DEFAULT_MAILING_LIST_SUCCESS_MESSAGE,
 		privacyNote: null
 	};
 	const targeting = source.targeting ?? { mode: "default" };
@@ -39405,6 +39541,7 @@ function buildNewsletterDisplay(source) {
 		availability: runtimeTargetingIsAvailable(context, targeting, choices) ? "ready" : "unavailable",
 		className: source.className ?? null,
 		buttonLabel: form.buttonLabel,
+		successMessage: form.successMessage,
 		buttonVariant: source.buttonVariant ?? "primary",
 		privacyNote: form.privacyNote,
 		fields: getGlobalFormFields(form),
@@ -39435,7 +39572,7 @@ const newsletterFormBlockRuntime = defineProgressiveBlockRuntime({
 function projectNewsletterFormHydrationTarget(source) {
 	switch (source.source) {
 		case "block": {
-			const sourceRef = buildMailingListSignupBlockSourceRef(source.blockId);
+			const sourceRef = buildMailingListSignupBlockSourceRef(source.blockId, source.contentVersionId);
 			if (sourceRef?.tag === "block_ref") return {
 				tag: "block-source",
 				sourceRef
@@ -41860,9 +41997,10 @@ function cx(...classes) {
 * Server-safe placeholder for event registration.
 * Provides a static container for island hydration without importing client hooks.
 */
-function EventRegistrationSSR({ blockId, subject, children, ...sourceProps }) {
+function EventRegistrationSSR({ blockId, subject, loaderFailures, children, ...sourceProps }) {
 	const islandProps = buildEventRegistrationInteractiveIslandProps({
 		...sourceProps,
+		eventLoaderFailures: blockId ? loaderFailures?.[blockId] : void 0,
 		subject: normalizeEventRegistrationPageSurfaceSubject(subject)
 	});
 	const display = islandProps.render.display;
@@ -42195,7 +42333,7 @@ function NewsletterFormSSR(props) {
 		className: clsx("newsletter-form-ssr", className),
 		children: /* @__PURE__ */ jsx("p", {
 			role: "status",
-			children: "Mailing-list signup is not available right now."
+			children: "We can’t accept signups right now. Please try again later."
 		})
 	});
 	const renderField = (field) => {
@@ -42241,14 +42379,18 @@ function NewsletterFormSSR(props) {
 					children: [
 						fields.map(renderField),
 						islandProps.render.hydration.choicePresentation === "visitor_choice" ? /* @__PURE__ */ jsxs("fieldset", {
-							className: "newsletter-topics",
-							children: [/* @__PURE__ */ jsx("legend", { children: "What would you like to hear about?" }), display.choices.map((choice) => /* @__PURE__ */ jsxs("label", {
-								className: "newsletter-topic-choice",
+							className: "fb-fieldset newsletter-topics",
+							children: [/* @__PURE__ */ jsx("legend", {
+								className: "form-label",
+								children: "What would you like to hear about?"
+							}), display.choices.map((choice) => /* @__PURE__ */ jsxs("label", {
+								className: "fb-inline form-label newsletter-topic-choice",
 								children: [/* @__PURE__ */ jsx("input", {
 									type: "checkbox",
 									name: "mailingListChoice",
-									value: choice.id
-								}), choice.label]
+									value: choice.id,
+									className: "form-checkbox"
+								}), /* @__PURE__ */ jsx("span", { children: choice.label })]
 							}, choice.id))]
 						}) : null,
 						/* @__PURE__ */ jsx("div", {
@@ -43237,6 +43379,18 @@ function resolveChildren(nodes, context) {
 function isReactNode(value) {
 	return value !== null && value !== void 0;
 }
+function resolveNodeMetadata(nodeType, context) {
+	return {
+		pathBase: context.pathBase,
+		blockId: context.blockId,
+		blockKind: context.blockKind,
+		blockContent: context.blockContent,
+		fragmentRegistry: context.fragmentRegistry,
+		previewAuthoring: context.previewAuthoring,
+		...nodeType.toLowerCase() === "newsletter-form" ? { contentVersionId: context.contentVersionId } : {},
+		...nodeType === "media" && context.imageResolveContext ? { imageResolveContext: context.imageResolveContext } : {}
+	};
+}
 /**
 * Resolves a node definition into a React element.
 * Handles conditionals ($when), scopes ($scopes), repeaters ($repeat), bindings ($bind), and children.
@@ -43272,13 +43426,7 @@ function resolveNode(node, context, indexFallback) {
 	const elementProps = {
 		...props,
 		key: node.key ?? indexFallback,
-		pathBase: context.pathBase,
-		blockId: context.blockId,
-		blockKind: context.blockKind,
-		blockContent: context.blockContent,
-		...node.type === "media" && context.imageResolveContext ? { imageResolveContext: context.imageResolveContext } : {},
-		fragmentRegistry: context.fragmentRegistry,
-		previewAuthoring: context.previewAuthoring
+		...resolveNodeMetadata(node.type, context)
 	};
 	const element = React.createElement(component, elementProps, ...children);
 	if (headingDecorationPlan.kind === "skip") return element;
@@ -47288,7 +47436,7 @@ function pageBlockPosition(index, blockCount) {
 //#endregion
 //#region ../blocks/src/pageRendererContracts.ts
 function buildPageRendererRootRuntime(dataContext) {
-	const { siteId = null, pageId = null, pathname = null, bookingTimeZone, previewStage = "published", apiBaseUrl = null, portalToken = null, bookingOfferingPresets = [], mailingList = { tag: "not_configured" }, eventRegistrationOverlayEnabled = false } = dataContext ?? {};
+	const { siteId = null, pageId = null, pathname = null, bookingTimeZone, previewStage = "published", apiBaseUrl = null, portalToken = null, bookingOfferingPresets = [], mailingList = { tag: "not_configured" }, eventRegistrationOverlayEnabled = false, loaderFailures = {} } = dataContext ?? {};
 	return {
 		siteId,
 		pageId,
@@ -47299,7 +47447,8 @@ function buildPageRendererRootRuntime(dataContext) {
 		portalToken,
 		bookingOfferingPresets,
 		mailingList,
-		eventRegistrationOverlayEnabled
+		eventRegistrationOverlayEnabled,
+		loaderFailures
 	};
 }
 //#endregion
@@ -56543,7 +56692,7 @@ function collectNestedPreviewFieldConstraintEntries(field, path) {
 }
 function makeDefaultBlockComponent(args) {
 	const { manifest } = args;
-	return function DefaultBlockComponent({ content, data, registry, theme, themeConfig, transforms, viewModelOverrides, pathBase, blockId, blockKind, blockBindings, editableRouteMetadataFieldIds, fragmentRegistry, imageResolveContext, previewAuthoring }) {
+	return function DefaultBlockComponent({ content, data, registry, theme, themeConfig, transforms, viewModelOverrides, pathBase, blockId, contentVersionId, blockKind, blockBindings, editableRouteMetadataFieldIds, fragmentRegistry, imageResolveContext, previewAuthoring }) {
 		const perf = beginBlockRenderMeasurement();
 		if (!theme) throw new Error("Block rendering requires theme tokens; none were provided to makeDefaultBlockComponent");
 		if (!registry) throw new Error("Block rendering requires a component registry; none was provided");
@@ -56563,6 +56712,7 @@ function makeDefaultBlockComponent(args) {
 			theme: withButtonSystem(theme, themeConfig),
 			pathBase,
 			blockId,
+			contentVersionId,
 			blockKind,
 			blockContent: mergedContent,
 			blockBindings,
@@ -57271,6 +57421,7 @@ function buildBlockOverrideProps(input) {
 		...blockSubjectProps(dataContext),
 		imageResolveContext: input.imageResolveContext,
 		blockId: block.id ?? null,
+		contentVersionId: block.contentVersionId ?? null,
 		blockKind: block.kind
 	};
 }
@@ -57371,6 +57522,7 @@ function toPresentationPage(page) {
 				id: block.id,
 				kind: block.kind,
 				purpose: block.purpose,
+				...block.contentVersionId ? { contentVersionId: block.contentVersionId } : {},
 				...block.bindings ? { bindings: block.bindings } : {}
 			};
 			return block.admission.kind === "renderable" ? {
@@ -67643,7 +67795,9 @@ const containerResponsiveThemeCss = `/*
   text-align: left;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-login__subtitle {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-login__subtitle {
   color: var(--cp-muted);
   font-size: 0.9375rem;
   text-align: left;
@@ -67670,7 +67824,9 @@ const containerResponsiveThemeCss = `/*
   text-align: left;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-login__reset-link {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-login__reset-link {
   appearance: none;
   background: none;
   border: 0;
@@ -67684,11 +67840,15 @@ const containerResponsiveThemeCss = `/*
   text-underline-offset: 0.15em;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-login__reset-link:hover {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-login__reset-link:hover {
   color: var(--cp-text);
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-login__reset-link:focus-visible {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-login__reset-link:focus-visible {
   outline: 2px solid currentColor;
   outline-offset: 3px;
 }
@@ -67733,7 +67893,9 @@ const containerResponsiveThemeCss = `/*
   border-bottom: none;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-header__welcome {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-header__welcome {
   font-size: 1.125rem;
   font-weight: 500;
 }
@@ -67749,8 +67911,14 @@ const containerResponsiveThemeCss = `/*
 }
 
 @keyframes cp-fade-in {
-  from { opacity: 0; transform: translateY(4px); }
-  to { opacity: 1; transform: translateY(0); }
+  from {
+    opacity: 0;
+    transform: translateY(4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 /* Empty state */
@@ -67839,6 +68007,77 @@ const containerResponsiveThemeCss = `/*
   margin-top: 1rem;
 }
 
+/* Event waitlists */
+:where(.theme-scope) :where([data-block="customer-portal"]) .cp-waitlist-list {
+  display: grid;
+  gap: 1rem;
+}
+
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-waitlists
+  > .cp-alert {
+  margin-bottom: 1rem;
+}
+
+:where(.theme-scope) :where([data-block="customer-portal"]) .cp-waitlist-card {
+  transition:
+    border-color 180ms ease,
+    box-shadow 180ms ease;
+}
+
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-waitlist-card--focused {
+  border-color: var(--cp-primary);
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--cp-primary) 22%, transparent);
+}
+
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-waitlist-card__summary,
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-waitlist-card__position {
+  font-weight: 600;
+}
+
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-waitlist-card
+  .cp-card-body
+  p {
+  margin: 0.4rem 0;
+}
+
+@container rb-site (max-width: 640px) {
+@scope ([data-rb-responsive-mode="container"]) to (:scope [data-rb-responsive-mode]) {
+:where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-waitlist-card
+    .cp-card-header {
+    flex-direction: column-reverse;
+  }
+
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-waitlist-card
+    .cp-card-actions {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-waitlist-card
+    .cp-card-actions
+    > * {
+    justify-content: center;
+    text-align: center;
+  }
+}
+}
+
 /* Badge */
 :where(.theme-scope) :where([data-block="customer-portal"]) .cp-badge {
   display: inline-flex;
@@ -67975,11 +68214,18 @@ const containerResponsiveThemeCss = `/*
   background: rgba(var(--tb-border), 0.2);
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-table tbody tr:last-child td {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-table
+  tbody
+  tr:last-child
+  td {
   border-bottom: none;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) :is(.cp-row--past, .cp-row--muted) {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  :is(.cp-row--past, .cp-row--muted) {
   opacity: 0.65;
 }
 
@@ -67992,7 +68238,9 @@ const containerResponsiveThemeCss = `/*
   line-height: 1.2;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-title__badges {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-title__badges {
   margin-left: auto;
   display: flex;
   flex-wrap: wrap;
@@ -68000,7 +68248,9 @@ const containerResponsiveThemeCss = `/*
   gap: 0.375rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-title__text {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-title__text {
   min-width: 0;
 }
 
@@ -68020,12 +68270,16 @@ const containerResponsiveThemeCss = `/*
   line-height: 1.35;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-note--success {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-note--success {
   border-left-color: rgb(var(--tb-success));
   color: rgb(var(--tb-success));
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-note--error {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-note--error {
   border-left-color: rgb(var(--tb-destructive));
   color: rgb(var(--tb-destructive));
 }
@@ -68044,16 +68298,23 @@ const containerResponsiveThemeCss = `/*
   white-space: nowrap;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-col-actions .btn-sm {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-col-actions
+  .btn-sm {
   white-space: nowrap;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-title__link {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-title__link {
   color: inherit;
   text-decoration: none;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-title__link:hover {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-row-title__link:hover {
   text-decoration: underline;
   text-decoration-thickness: 2px;
   text-underline-offset: 2px;
@@ -68075,7 +68336,9 @@ const containerResponsiveThemeCss = `/*
 }
 
 /* Profile actions */
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-profile__actions {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-profile__actions {
   display: flex;
   gap: 0.75rem;
   margin-top: 1rem;
@@ -68142,28 +68405,39 @@ const containerResponsiveThemeCss = `/*
   gap: 0.375rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-guest-edit-row__index {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-guest-edit-row__index {
   font-size: 0.75rem;
   font-weight: 500;
   color: var(--cp-muted);
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-guest-edit-row__fields {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-guest-edit-row__fields {
   display: flex;
   gap: 0.5rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-guest-edit-row__fields input {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-guest-edit-row__fields
+  input {
   flex: 1;
   min-width: 0;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-guest-edit-row__error {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-guest-edit-row__error {
   font-size: 0.75rem;
   color: var(--cp-error);
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-guests__actions {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-guests__actions {
   display: flex;
   gap: 0.5rem;
   margin-top: 0.5rem;
@@ -68177,13 +68451,18 @@ const containerResponsiveThemeCss = `/*
 }
 
 /* In the actions modal, tiles sit on a surface modal, so use "background" for contrast. */
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-actions-list :where(.rb-tile) {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-actions-list
+  :where(.rb-tile) {
   --rb-event-tile-bg: rgb(var(--tb-background));
   --rb-event-tile-border: rgb(var(--tb-border));
 }
 
 /* Actions trigger: icon-only kebab button */
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-actions-trigger.btn-sm {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-actions-trigger.btn-sm {
   padding: 0.35rem !important;
   line-height: 1 !important;
   min-width: 32px;
@@ -68207,17 +68486,24 @@ const containerResponsiveThemeCss = `/*
   gap: 0.25rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-action-tile__title {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-action-tile__title {
   font-weight: 600;
   font-size: 0.9375rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-action-tile__desc {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-action-tile__desc {
   font-size: 0.875rem;
   line-height: 1.35;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-action-tile--danger .cp-action-tile__title {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-action-tile--danger
+  .cp-action-tile__title {
   color: rgb(var(--tb-destructive));
 }
 
@@ -68239,7 +68525,9 @@ const containerResponsiveThemeCss = `/*
   text-decoration: underline;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-btn--link:hover {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-btn--link:hover {
   color: var(--cp-primary-hover);
 }
 
@@ -68278,34 +68566,48 @@ const containerResponsiveThemeCss = `/*
   margin-top: 0.75rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-cancel-confirm__title {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-cancel-confirm__title {
   font-weight: 600;
   margin-bottom: 0.5rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-cancel-confirm__message {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-cancel-confirm__message {
   margin-bottom: 0.25rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-cancel-confirm__warning {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-cancel-confirm__warning {
   margin-bottom: 0.75rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-cancel-confirm__actions {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-cancel-confirm__actions {
   display: flex;
   gap: 0.75rem;
 }
 
 /* Membership actions */
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-membership-actions {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-membership-actions {
   margin-top: 0.75rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-section-actions {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-section-actions {
   margin-top: 1rem;
 }
 
-:where(.theme-scope) :where([data-block="customer-portal"]) .cp-card-subtitle--spaced {
+:where(.theme-scope)
+  :where([data-block="customer-portal"])
+  .cp-card-subtitle--spaced {
   margin-top: 0.75rem;
 }
 
@@ -68329,9 +68631,18 @@ const containerResponsiveThemeCss = `/*
     display: none;
   }
 
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-table :is(th, td).cp-col-guests,
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-table :is(th, td).cp-col-tickets,
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-table :is(th, td).cp-col-actions {
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-table
+    :is(th, td).cp-col-guests,
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-table
+    :is(th, td).cp-col-tickets,
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-table
+    :is(th, td).cp-col-actions {
     display: none;
   }
 
@@ -68340,24 +68651,34 @@ const containerResponsiveThemeCss = `/*
   }
 
   /* Make the cell a positioning context for the kebab */
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-row > td:first-child {
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-row
+    > td:first-child {
     position: relative;
     padding-right: 2.5rem;
   }
 
   /* Position kebab in top-right of the cell */
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-mobile-actions {
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-row-mobile-actions {
     position: absolute;
     top: 0.5rem;
     right: 0.5rem;
     margin-top: 0;
   }
 
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-row-mobile-actions .btn-sm {
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-row-mobile-actions
+    .btn-sm {
     width: auto;
   }
 
-  :where(.theme-scope) :where([data-block="customer-portal"]) .cp-profile__edit {
+  :where(.theme-scope)
+    :where([data-block="customer-portal"])
+    .cp-profile__edit {
     align-self: stretch;
   }
 }
@@ -68805,6 +69126,30 @@ const containerResponsiveThemeCss = `/*
   gap: 0.25rem;
 }
 
+/* Topic choices (visitor picks what to hear about). Same treatment as the
+   form block's .fb-fieldset / .fb-inline, defined here because the newsletter
+   form also renders inside contact-newsletter and the site footer. */
+:where(.theme-scope) .newsletter-topics {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-width: 0;
+}
+
+:where(.theme-scope) .newsletter-topics > legend {
+  padding: 0;
+  margin-bottom: 0.25rem;
+}
+
+:where(.theme-scope) .newsletter-topic-choice {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
 /* Required indicator */
 :where(.theme-scope) .newsletter-required {
   color: rgb(var(--tb-primary));
@@ -68854,6 +69199,10 @@ const containerResponsiveThemeCss = `/*
   flex-shrink: 0;
 }
 
+:where(.theme-scope) .newsletter-inline .newsletter-topics {
+  flex-basis: 100%;
+}
+
 /* Mobile fallback for inline variant */
 @container rb-site (max-width: 640px) {
 @scope ([data-rb-responsive-mode="container"]) to (:scope [data-rb-responsive-mode]) {
@@ -71312,7 +71661,7 @@ function PageContent(props) {
 			previewToken,
 			resolvedData,
 			bookingOfferingPresets: bookingOfferingPresets ?? [],
-			mailingList,
+			mailingList: mailingList ?? dataContext?.mailingList,
 			bookingTimeZone: resolveSdkBookingTimeZone(bookingTimeZone),
 			routes: routeMap,
 			pagesByIdentifier,
@@ -72067,8 +72416,12 @@ function shouldSkipResolvedLoader(input) {
 * ```
 */
 async function prefetchBlockData$1(page, context, options) {
+	return (await prefetchBlockDataWithFailures(page, context, options)).resolvedData;
+}
+async function prefetchBlockDataWithFailures(page, context, options) {
 	const { apiClient, isValidEndpoint, onError, getCustomBlockLoaders, getBlockDefinition: getBlockDefinition$1 = getBlockDefinition, resolveParamsBindings: resolveParamsBindings$1 = resolveParamsBindings } = options;
 	const results = {};
+	const loaderFailures = {};
 	const tasks = [];
 	for (const block of page.blocks) {
 		const blockId = block.id;
@@ -72116,6 +72469,11 @@ async function prefetchBlockData$1(page, context, options) {
 					const blockResults = results[blockId] ?? (results[blockId] = {});
 					blockResults[key] = data;
 				} catch (error) {
+					const blockFailures = loaderFailures[blockId] ?? (loaderFailures[blockId] = {});
+					blockFailures[key] = {
+						endpoint,
+						params
+					};
 					if (onError) onError(error, {
 						block: block.kind,
 						loader: key
@@ -72125,7 +72483,10 @@ async function prefetchBlockData$1(page, context, options) {
 		}
 	}
 	if (tasks.length > 0) await Promise.all(tasks);
-	return results;
+	return {
+		resolvedData: results,
+		loaderFailures
+	};
 }
 //#endregion
 //#region ../blocks/src/system/data/loaderEndpoints.ts
@@ -72233,9 +72594,11 @@ function convertPageResponseBlock(block) {
 	if (typeof block.id !== "string" && block.id !== null) throw new Error(`Invalid block id in page: expected string or null, got ${typeof block.id}`);
 	if (typeof block.kind !== "string") throw new Error(`Invalid block kind in page: expected string, got ${typeof block.kind}`);
 	if (typeof block.purpose !== "string") throw new Error(`Invalid block purpose in page: expected string, got ${typeof block.purpose}`);
+	if (block.contentVersionId !== void 0 && block.contentVersionId !== null && typeof block.contentVersionId !== "string") throw new Error(`Invalid content version id in page: expected string or null, got ${typeof block.contentVersionId}`);
 	const admission = readInvalidBlockAdmission(block.admission);
 	return {
 		id: block.id,
+		...block.contentVersionId !== void 0 ? { contentVersionId: block.contentVersionId } : {},
 		kind: block.kind,
 		purpose: block.purpose,
 		content: sanitizeSdkRuntimeBlockContent(block.kind, readContentRecord(block.content) ?? {}),
@@ -72266,6 +72629,7 @@ function buildRenderablePageOutline(input) {
 function admitSdkRuntimePageBlock(block, customBlocks) {
 	const base = {
 		id: block.id,
+		...block.contentVersionId !== void 0 ? { contentVersionId: block.contentVersionId } : {},
 		kind: block.kind,
 		purpose: block.purpose,
 		...block.bindings ? { bindings: block.bindings } : {}
@@ -73944,6 +74308,14 @@ const PUBLIC_BOOKING_AVAILABILITY_ENDPOINT_DEFINITIONS = defineEndpointDefinitio
 		auth: "public",
 		responseKind: "json"
 	},
+	getPublicBookingServiceBySlug: {
+		path: "/public/bookings/services/by-slug/{slug}",
+		method: "GET",
+		revalidate: publicReadFreshnessSeconds("getPublicBookingService"),
+		tags: [TAG_TEMPLATES.publicBookingServices],
+		auth: "public",
+		responseKind: "json"
+	},
 	getPublicBookingResourcesReference: {
 		path: "/public/bookings/resources/reference",
 		method: "GET",
@@ -74496,16 +74868,110 @@ const PUBLIC_READ_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 		responseKind: "json"
 	}
 });
+//#endregion
+//#region ../api/src/publicOnboardingAttemptEndpointDefinitions.ts
+/**
+* The anonymous onboarding attempt, addressed by its opaque resume token.
+*
+* Every route here is reached before there is an account, so none of them can
+* be scoped to a site or a user: the token is the whole credential. They are
+* kept together so that stays obvious.
+*/
+const PUBLIC_ONBOARDING_ATTEMPT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	createPublicOnboardingAttempt: {
+		path: "/public/onboarding/attempts",
+		method: "POST",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	createPublicOnboardingLogoUploadUrl: {
+		path: "/public/onboarding/attempts/{attemptToken}/logo-upload-url",
+		method: "POST",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	uploadPublicOnboardingLogo: {
+		path: "/public/onboarding/attempts/{attemptToken}/logo",
+		method: "POST",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	getPublicOnboardingAttempt: {
+		path: "/public/onboarding/attempts/{attemptToken}",
+		method: "GET",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	getPublicOnboardingAttemptProgress: {
+		path: "/public/onboarding/attempts/{attemptToken}/status",
+		method: "GET",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	updatePublicOnboardingAttempt: {
+		path: "/public/onboarding/attempts/{attemptToken}",
+		method: "PATCH",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	runPublicOnboardingAttempt: {
+		path: "/public/onboarding/attempts/{attemptToken}/run",
+		method: "POST",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	},
+	resendPublicOnboardingAttemptConfirmation: {
+		path: "/public/onboarding/attempts/{attemptToken}/resend-confirmation",
+		method: "POST",
+		auth: "public",
+		errors: [],
+		responseKind: "json"
+	}
+});
+//#endregion
+//#region ../api/src/billingEndpointDefinitions.ts
+const BILLING_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	adminChangePlan: {
+		path: "/admin/billing/plan",
+		method: "POST",
+		tags: ["admin", "billing"],
+		auth: "admin",
+		responseKind: "json"
+	},
+	changePlan: {
+		path: "/billing/plan/change",
+		method: "POST",
+		tags: ["billing"],
+		auth: "user",
+		responseKind: "json"
+	},
+	createBillingPortalSession: {
+		path: "/billing/portal/session",
+		method: "POST",
+		tags: ["billing"],
+		auth: "user",
+		responseKind: "json"
+	}
+});
 ({
 	...ACCOUNT_ENDPOINT_DEFINITIONS,
+	...PUBLIC_ONBOARDING_ATTEMPT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_EVENT_ENDPOINT_DEFINITIONS,
 	...GIFTING_ENDPOINT_DEFINITIONS,
-	...PUBLIC_READ_ENDPOINT_DEFINITIONS
+	...PUBLIC_READ_ENDPOINT_DEFINITIONS,
+	...BILLING_ENDPOINT_DEFINITIONS
 }), TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, { ...SITE_API_KEY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.site, TAG_TEMPLATES.siteBookingSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteBookingSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, {
 	...NEWSLETTER_ENDPOINT_DEFINITIONS,
 	...APPOINTMENT_ENDPOINT_DEFINITIONS,
 	...EVENT_SERIES_REGISTRATION_ENDPOINT_DEFINITIONS
-}, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.workflowRunById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.routeById, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, { ...PUBLIC_BOOKING_AVAILABILITY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEventFilters, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicShop, TAG_TEMPLATES.publicCheckout, TAG_TEMPLATES.siteRoutableContent, { ...PUBLIC_EVENT_CHECKOUT_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicEvents, { ...EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS }, { ...SDK_MEDIA_ENDPOINT_DEFINITIONS }, { ...SDK_ENDPOINT_DEFINITIONS }, { ...SDK_ENTRY_READ_ENDPOINTS };
+}, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.workflowRunById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.routeById, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicBookingServices, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, { ...PUBLIC_BOOKING_AVAILABILITY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEventFilters, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicShop, TAG_TEMPLATES.publicCheckout, TAG_TEMPLATES.siteRoutableContent, { ...PUBLIC_EVENT_CHECKOUT_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicEvents, { ...EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS }, { ...SDK_MEDIA_ENDPOINT_DEFINITIONS }, { ...SDK_ENDPOINT_DEFINITIONS }, { ...SDK_ENTRY_READ_ENDPOINTS };
 z.object({ refreshToken: z.string().min(1).max(4096) }).strict();
 z.object({
 	accessToken: z.string().min(1).max(4096),
@@ -74933,7 +75399,17 @@ const riverbankSiteConfigInputSchema = z.object({
 z.object({
 	config: riverbankSiteConfigInputSchema,
 	forceContentTypes: z.boolean().optional(),
-	mode: z.enum(["apply", "preview"]).optional()
+	mode: z.enum(["apply", "preview"]).optional(),
+	expectedMailingListProviderScope: z.unknown().transform((value, ctx) => {
+		if (value === void 0) return void 0;
+		const parsed = parseMailingListProviderScope(value);
+		if (parsed.ok) return parsed.value;
+		ctx.addIssue({
+			code: "custom",
+			message: "Invalid mailing-list provider scope"
+		});
+		return z.NEVER;
+	}).optional()
 }).strict();
 //#endregion
 //#region ../api/src/sdkThemeWire.ts