@riverbankcms/sdk 0.111.0 → 0.119.0

package/dist/client/rendering.mjs

@@ -168,7 +168,7 @@ var init_shop_shared = __esmMin((() => {
 	});
 	publicMembershipProductCollectionSchema = z$1.object({ memberships: z$1.array(publicMembershipProductSchema) });
 }));
-var init_types$17 = __esmMin((() => {}));
+var init_types$16 = __esmMin((() => {}));
 //#endregion
 //#region ../core/src/result.ts
 function ok$3(value) {
@@ -382,7 +382,7 @@ var init_event_pricing = __esmMin((() => {
 //#endregion
 //#region ../core/src/event-page-surface-subject.ts
 function parseEventPageSurfaceSubject(value) {
-	if (!isRecord$37(value)) return err$3({ kind: "notObject" });
+	if (!isRecord$40(value)) return err$3({ kind: "notObject" });
 	switch (value.kind) {
 		case "eventSeries": {
 			const eventSeriesId = parseEventSeriesId(value.eventSeriesId);
@@ -425,7 +425,7 @@ function parseEventPageSurfaceSubject(value) {
 		});
 	}
 }
-function isRecord$37(value) {
+function isRecord$40(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_event_page_surface_subject = __esmMin((() => {
@@ -839,8 +839,40 @@ var init_public_url_validation = __esmMin((() => {}));
 var init_public_profile = __esmMin((() => {
 	init_public_url_validation();
 	init_result();
+}));
+//#endregion
+//#region ../core/src/rich-text.ts
+function isRecord$38(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function hasOnlyKeys(value, allowed) {
+	return Object.keys(value).every((key) => allowed.has(key));
+}
+function isDenseArrayOf(value, predicate) {
+	for (let index = 0; index < value.length; index += 1) if (!(index in value) || !predicate(value[index])) return false;
+	return true;
+}
+function isTipTapMark(value) {
+	return isRecord$38(value) && hasOnlyKeys(value, markKeys) && typeof value.type === "string" && value.type.length > 0 && (value.attrs === void 0 || isRecord$38(value.attrs));
+}
+function isTipTapNode(value) {
+	if (!isRecord$38(value) || !hasOnlyKeys(value, nodeKeys) || typeof value.type !== "string" || value.type.length === 0 || value.type === "doc" || value.attrs !== void 0 && !isRecord$38(value.attrs) || value.marks !== void 0 && (!Array.isArray(value.marks) || !isDenseArrayOf(value.marks, isTipTapMark)) || value.content !== void 0 && (!Array.isArray(value.content) || !isDenseArrayOf(value.content, isTipTapNode))) return false;
+	if (value.type === "text") return typeof value.text === "string" && value.text.length > 0 && value.content === void 0;
+	return value.text === void 0;
+}
+var nodeKeys, markKeys;
+var init_rich_text = __esmMin((() => {
+	nodeKeys = /* @__PURE__ */ new Set([
+		"type",
+		"content",
+		"text",
+		"attrs",
+		"marks"
+	]);
+	markKeys = /* @__PURE__ */ new Set(["type", "attrs"]);
 })), sectionKinds;
 var init_footer_composition = __esmMin((() => {
+	init_rich_text();
 	init_result();
 	sectionKinds = [
 		"brand",
@@ -953,6 +985,7 @@ var init_src$3 = __esmMin((() => {
 	init_participant_identity();
 	init_public_url_validation();
 	init_public_profile();
+	init_rich_text();
 	init_footer_composition();
 	init_number_input();
 	init_field_errors();
@@ -1096,11 +1129,11 @@ var init_storagePathDomain = __esmMin((() => {}));
 var init_fileAssetLegacyProjection = __esmMin((() => {}));
 //#endregion
 //#region ../media-core/src/typeGuards.ts
-function isRecord$33(value) {
+function isRecord$35(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function asRecord$3(value) {
-	return isRecord$33(value) ? value : void 0;
+	return isRecord$35(value) ? value : void 0;
 }
 var init_typeGuards$1 = __esmMin((() => {}));
 function isFileJsonObject(value) {
@@ -1110,7 +1143,7 @@ function isFileJsonValue(value) {
 	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
 	if (typeof value === "number") return Number.isFinite(value);
 	if (Array.isArray(value)) return value.every(isFileJsonValue);
-	return isRecord$33(value) && isFileJsonObject(value);
+	return isRecord$35(value) && isFileJsonObject(value);
 }
 var init_filePersistence = __esmMin((() => {
 	init_src$3();
@@ -1475,7 +1508,7 @@ function isCmsMediaObjectType(value) {
 	return typeof value === "string" && CMS_MEDIA_OBJECT_TYPES.includes(value);
 }
 function isCmsMediaObject(value) {
-	if (!isRecord$33(value)) return false;
+	if (!isRecord$35(value)) return false;
 	const type = value.type;
 	if (!isCmsMediaObjectType(type)) return false;
 	if ("attrs" in value) return false;
@@ -1486,13 +1519,25 @@ function collectMediaObjects(value, out, location = "") {
 		value.forEach((item, index) => collectMediaObjects(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$33(value)) return;
+	if (!isRecord$35(value)) return;
 	if (isCmsMediaObject(value)) out.push({
 		obj: value,
 		location
 	});
 	for (const [key, child] of Object.entries(value)) collectMediaObjects(child, out, location ? `${location}.${key}` : key);
 }
+/**
+* Strip environment-specific keys from a CMS media object.
+* @mutates Mutates the passed object in-place.
+*/
+function deleteEnvSpecificKeys(obj) {
+	delete obj.assetId;
+	delete obj.storageBucket;
+	delete obj.storagePath;
+	delete obj.src;
+	delete obj.mimeType;
+	if (looksLikeUuid(obj.id)) delete obj.id;
+}
 var CMS_MEDIA_OBJECT_TYPES;
 var init_mediaRefNormalizer = __esmMin((() => {
 	init_typeGuards$1();
@@ -1520,8 +1565,8 @@ function walkAndCollectImageAttrs(value, out, location = "") {
 		value.forEach((item, index) => walkAndCollectImageAttrs(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$33(value)) return;
-	if (value.type === "image" && isRecord$33(value.attrs)) out.push({
+	if (!isRecord$35(value)) return;
+	if (value.type === "image" && isRecord$35(value.attrs)) out.push({
 		attrs: value.attrs,
 		location: location ? `${location}.attrs` : "attrs"
 	});
@@ -1580,25 +1625,239 @@ function mediaIdentifierOrFallback(current, fallback) {
 }
 var init_renderableMediaAsset = __esmMin((() => {}));
 //#endregion
-//#region ../media-core/src/legacyMediaValue.ts
-function legacyStringMediaTypeForField(field) {
-	if (field.type === "file") return field.fileKinds?.[0] ?? "document";
-	return field.mediaKinds?.[0] ?? "image";
+//#region ../media-core/src/contentMediaAudit.ts
+function isRecord$34(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function normalizeLegacyStringMediaValueForField(value, field) {
-	if (typeof value !== "string") return value;
-	const src = value.trim();
-	if (!src) return value;
-	return {
-		type: legacyStringMediaTypeForField(field),
-		src
-	};
+function summarizeContentMediaValue(value) {
+	if (typeof value === "string") {
+		const trimmed = value.trim();
+		if (!trimmed) return "blank string";
+		return trimmed.length <= 160 ? trimmed : `${trimmed.slice(0, 157)}...`;
+	}
+	if (value === null) return "null";
+	if (Array.isArray(value)) return `array(${value.length})`;
+	if (isRecord$34(value)) return `object(${Object.keys(value).sort().join(",")})`;
+	return typeof value;
 }
-var init_legacyMediaValue = __esmMin((() => {}));
+function auditMediaValue(context, path, allowedMediaTypes, value) {
+	const expectedMediaType = allowedMediaTypes[0];
+	if (value === void 0 || value === null) return [];
+	if (typeof value === "string") {
+		if (!value.trim()) return [{
+			tag: "blank-string",
+			context,
+			path,
+			valueSummary: summarizeContentMediaValue(value),
+			expectedMediaType
+		}];
+		return [{
+			tag: "legacy-string",
+			context,
+			path,
+			valueSummary: summarizeContentMediaValue(value),
+			originalValue: value,
+			expectedMediaType,
+			allowedMediaTypes
+		}];
+	}
+	const hasValidIdentifier = isRecord$34(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0;
+	const hasValidExplicitType = isRecord$34(value) && (!("type" in value) || typeof value.type === "string" && allowedMediaTypes.includes(value.type));
+	const hasRetiredEnvironmentField = isRecord$34(value) && ("assetId" in value || "storagePath" in value || "storageBucket" in value || "src" in value || "mimeType" in value || looksLikeUuid(value.id));
+	if (hasValidIdentifier && hasValidExplicitType && !hasRetiredEnvironmentField) return [];
+	return [{
+		tag: "malformed-object",
+		context,
+		path,
+		valueSummary: summarizeContentMediaValue(value),
+		expectedMediaType
+	}];
+}
+function auditFields(context, fields, value, parentPath) {
+	if (!isRecord$34(value)) return [];
+	const findings = [];
+	for (const field of fields) {
+		if (!(field.id in value)) continue;
+		const fieldValue = value[field.id];
+		const fieldPath = [...parentPath, field.id];
+		switch (field.kind) {
+			case "media":
+				findings.push(...auditMediaValue(context, fieldPath, field.allowedMediaTypes, fieldValue));
+				break;
+			case "object":
+				findings.push(...auditFields(context, field.fields, fieldValue, fieldPath));
+				break;
+			case "repeater":
+				if (!Array.isArray(fieldValue)) break;
+				for (const [index, item] of fieldValue.entries()) {
+					const itemPath = [...fieldPath, index];
+					if (!isRecord$34(item)) {
+						findings.push({
+							tag: "missing-schema",
+							context,
+							path: itemPath,
+							valueSummary: summarizeContentMediaValue(item)
+						});
+						continue;
+					}
+					if (field.mode === "fields") {
+						findings.push(...auditFields(context, field.fields, item, itemPath));
+						continue;
+					}
+					const discriminator = field.discriminator ?? "_type";
+					const typeId = item[discriminator];
+					const variant = typeof typeId === "string" ? field.variants.find((candidate) => candidate.typeId === typeId) : void 0;
+					if (variant) findings.push(...auditFields(context, variant.fields, item, itemPath));
+					else findings.push({
+						tag: "missing-schema",
+						context,
+						path: [...itemPath, discriminator],
+						valueSummary: summarizeContentMediaValue(typeId)
+					});
+				}
+				break;
+		}
+	}
+	return findings;
+}
+var init_contentMediaAudit = __esmMin((() => {
+	init_mediaRefNormalizer();
+}));
+//#endregion
+//#region ../media-core/src/contentMediaAuditFieldAdapter.ts
+function isRecord$33(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function unknownArray(value) {
+	return Array.isArray(value) ? value : null;
+}
+function fieldsArray(value) {
+	const directFields = unknownArray(value);
+	if (directFields) return directFields;
+	if (!isRecord$33(value)) return null;
+	return unknownArray(value.fields);
+}
+function nestedFields$1(field) {
+	const directFields = unknownArray(field.fields);
+	if (directFields) return directFields;
+	return fieldsArray(field.schema) ?? [];
+}
+function allowedMediaTypes(field, fieldType, defaultFileKinds) {
+	const configured = fieldType === "media" ? field.mediaKinds : field.fileKinds;
+	const parsed = Array.isArray(configured) ? configured.filter((value) => typeof value === "string" && contentMediaTypes.has(value)) : [];
+	if (parsed.length > 0) return parsed;
+	return fieldType === "media" ? ["image"] : defaultFileKinds;
+}
+function mergeVariants(variants) {
+	const merged = /* @__PURE__ */ new Map();
+	for (const variant of variants) merged.set(variant.typeId, mergeFields([...merged.get(variant.typeId) ?? [], ...variant.fields]));
+	return [...merged].map(([typeId, fields]) => ({
+		typeId,
+		fields
+	}));
+}
+function mergeFields(fields) {
+	const merged = [];
+	for (const field of fields) {
+		const index = merged.findIndex((candidate) => candidate.kind === field.kind && candidate.id === field.id);
+		const existing = index === -1 ? void 0 : merged[index];
+		if (!existing) {
+			merged.push(field);
+			continue;
+		}
+		if (existing.kind === "media" && field.kind === "media") {
+			merged[index] = {
+				...existing,
+				allowedMediaTypes: [.../* @__PURE__ */ new Set([...existing.allowedMediaTypes, ...field.allowedMediaTypes])]
+			};
+			continue;
+		}
+		if (existing.kind === "object" && field.kind === "object") {
+			merged[index] = {
+				...existing,
+				fields: mergeFields([...existing.fields, ...field.fields])
+			};
+			continue;
+		}
+		if (existing.kind === "repeater" && field.kind === "repeater" && existing.mode === "fields" && field.mode === "fields") {
+			merged[index] = {
+				...existing,
+				fields: mergeFields([...existing.fields, ...field.fields])
+			};
+			continue;
+		}
+		if (existing.kind === "repeater" && field.kind === "repeater" && existing.mode === "variants" && field.mode === "variants") {
+			merged[index] = {
+				...existing,
+				variants: mergeVariants([...existing.variants, ...field.variants])
+			};
+			continue;
+		}
+		merged.push(field);
+	}
+	return merged;
+}
+function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds = ["document"]) {
+	return mergeFields(rawFields.flatMap((rawField) => {
+		if (!isRecord$33(rawField)) return [];
+		const { id, type } = rawField;
+		if (typeof id !== "string" || !id || typeof type !== "string") return [];
+		if (type === "media" || type === "file") return [{
+			kind: "media",
+			id,
+			allowedMediaTypes: allowedMediaTypes(rawField, type, defaultFileKinds)
+		}];
+		if (flattenRepeaterGroups && type === "group" && isRecord$33(rawField.ui) && rawField.ui.flattenInRepeater === true) return adaptFields(nestedFields$1(rawField), false, defaultFileKinds);
+		if (type === "group" || type === "modal") return [{
+			kind: "object",
+			id,
+			fields: adaptFields(nestedFields$1(rawField), false, defaultFileKinds)
+		}];
+		if (type === "tabGroup") return [{
+			kind: "object",
+			id,
+			fields: adaptFields((unknownArray(rawField.tabs) ?? []).flatMap((tab) => isRecord$33(tab) ? unknownArray(tab.fields) ?? [] : []), false, defaultFileKinds)
+		}];
+		if (type !== "repeater") return [];
+		if (isRecord$33(rawField.itemTypes)) return [{
+			kind: "repeater",
+			id,
+			mode: "variants",
+			variants: Object.entries(rawField.itemTypes).flatMap(([typeId, itemType]) => isRecord$33(itemType) && Array.isArray(itemType.fields) ? [{
+				typeId,
+				fields: adaptFields(itemType.fields, true, defaultFileKinds)
+			}] : []),
+			discriminator: "_type"
+		}];
+		return [{
+			kind: "repeater",
+			id,
+			mode: "fields",
+			fields: adaptFields(nestedFields$1(rawField), true, defaultFileKinds)
+		}];
+	}));
+}
+var contentMediaTypes;
+var init_contentMediaAuditFieldAdapter = __esmMin((() => {
+	contentMediaTypes = /* @__PURE__ */ new Set([
+		"image",
+		"video",
+		"audio",
+		"document",
+		"spreadsheet",
+		"archive"
+	]);
+}));
+var init_contentMediaSnapshotAudit = __esmMin((() => {
+	init_src$3();
+	init_contentMediaAudit();
+	init_contentMediaAuditFieldAdapter();
+	init_identifiers();
+}));
 //#endregion
 //#region ../media-core/src/index.ts
 var init_src$2 = __esmMin((() => {
-	init_types$17();
+	init_types$16();
 	init_fileDomain();
 	init_fileStorage();
 	init_storagePathDomain();
@@ -1644,7 +1903,9 @@ var init_src$2 = __esmMin((() => {
 	init_mediaUsageProjection();
 	init_portableMediaReferences();
 	init_renderableMediaAsset();
-	init_legacyMediaValue();
+	init_contentMediaAudit();
+	init_contentMediaAuditFieldAdapter();
+	init_contentMediaSnapshotAudit();
 })), PUBLIC_DOWNLOAD_MEDIA_TYPES, hotspotSchema$1, rotationSchema$1, rectSchema$1, aspectCropSchema$1, transformSchema$1, mediaPosterSchema, mediaBaseSchema, imageMediaSchema, videoMediaSchema, audioMediaSchema, documentMediaSchema, spreadsheetMediaSchema, archiveMediaSchema, mediaSchema$1;
 var init_media$2 = __esmMin((() => {
 	init_src$2();
@@ -1746,123 +2007,85 @@ function isObjectRecord$1(value) {
 	return typeof value === "object" && value !== null;
 }
 var init_typeGuards = __esmMin((() => {}));
+//#endregion
+//#region ../blocks/src/system/manifest/richTextSchema.ts
 /**
-* Permissive unwrap for a value known to be the root of a rich-text field.
+* Type guard for {@link RichTextDoc}.
 *
-* Producers should emit the canonical unwrapped form `{ type: 'doc', content: [...] }`,
-* but two legacy shapes still appear in older data and pre-Phase-1 fixtures:
-*
-*   - `{ doc: <typed-doc> }` — pre-migration DB storage.
-*   - `{ doc: <typed-doc>, html, plain }` — pre-Phase-1 dummy-content output.
-*
-* This helper is the single right place to tolerate either shape at a known
-* rich-text root (transforms, coercion, validators that operate on rich text).
-* The strictness sits on the inner node's `type === 'doc'`, which prevents
-* misidentifying random objects that happen to carry a field named `doc`.
-*
-* Returns the inner doc node when the input matches a legacy shape, otherwise
-* returns the input unchanged.
-*
-* For deep structural traversal where any nested key might be named `doc`
-* (and unwrapping would be incorrect), use the strict `isDocWrapper` private
-* helper inside `@riverbankcms/blocks/bindings`.
+* Returns `true` only for the canonical unwrapped form. The shared structural
+* contract lives in `@riverbankcms/core`; parity tests keep its dependency-free
+* guard aligned with this detailed Zod validator.
 */
-function unwrapRichTextRoot(value) {
-	if (!isRecord$32(value)) return value;
-	if (!("doc" in value)) return value;
-	const inner = value.doc;
-	if (isRecord$32(inner) && inner.type === "doc") return inner;
-	return value;
-}
-function createHardBreakNode() {
-	return { type: "hardBreak" };
+function isRichTextDoc(value) {
+	return RichTextDocSchema.safeParse(value).success;
 }
 /**
-* Parse a small markdown subset into TipTap inline nodes.
+* Build a canonical {@link RichTextDoc} from plain-text paragraphs.
 *
-* This intentionally supports only bold (`**text**`) because the SDK/content
-* import paths use it for lightweight default content, not full markdown.
-*/
-function parseRichTextInlineMarkdown(text) {
-	const out = [];
-	const pushText = (value, marks) => {
-		if (!value) return;
-		out.push(marks && marks.length > 0 ? {
-			type: "text",
-			text: value,
-			marks
-		} : {
-			type: "text",
-			text: value
-		});
-	};
-	let rest = text;
-	while (rest.length > 0) {
-		const start = rest.indexOf("**");
-		if (start === -1) {
-			pushText(rest);
-			break;
-		}
-		const end = rest.indexOf("**", start + 2);
-		if (end === -1) {
-			pushText(rest);
-			break;
-		}
-		pushText(rest.slice(0, start));
-		pushText(rest.slice(start + 2, end), [{ type: "bold" }]);
-		rest = rest.slice(end + 2);
-	}
-	return out;
-}
-function parseRichTextParagraphInlineMarkdown(text) {
-	return text.split("\n").flatMap((line, index) => {
-		const lineNodes = parseRichTextInlineMarkdown(line.trim());
-		return index === 0 ? lineNodes : [createHardBreakNode(), ...lineNodes];
-	});
-}
-/**
-* Convert a plain string with a tiny markdown subset to canonical TipTap JSON.
+* Single source of truth for constructing a TipTap doc from strings.
+* Used by:
+*   - `@riverbankcms/dummy-content` (fixture body generators)
+*   - `@riverbankcms/content-model` (default template `cta-full` content)
 *
-* Double newlines create semantic paragraphs. Single newlines remain inside the
-* current paragraph as TipTap `hardBreak` nodes for line-oriented content such
-* as addresses, opening hours, and contact details.
+* Empty strings produce a paragraph with no `content` array — matching
+* the TipTap convention for empty paragraphs. The shape is exactly what
+* {@link RichTextDocSchema} validates, so the type and runtime check
+* never drift from the constructor.
 */
-function createRichTextDocFromMarkdown(markdown) {
-	const normalized = markdown.replace(/\r\n/g, "\n").trim();
-	if (!normalized) return {
-		type: "doc",
-		content: []
-	};
+function createRichTextDoc(paragraphs) {
 	return {
 		type: "doc",
-		content: normalized.split(/\n{2,}/).map((paragraph) => paragraph.trim()).filter(Boolean).map((paragraph) => {
-			const inline = parseRichTextParagraphInlineMarkdown(paragraph);
-			return inline.length > 0 ? {
-				type: "paragraph",
-				content: inline
-			} : { type: "paragraph" };
-		})
+		content: paragraphs.map((text) => text ? {
+			type: "paragraph",
+			content: [{
+				type: "text",
+				text
+			}]
+		} : { type: "paragraph" })
 	};
 }
 var TipTapMarkSchema, TipTapNodeSchema, RichTextDocSchema;
 var init_richTextSchema = __esmMin((() => {
 	init_typeGuards();
 	TipTapMarkSchema = z$1.object({
-		type: z$1.string(),
+		type: z$1.string().min(1),
 		attrs: z$1.record(z$1.string(), z$1.unknown()).optional()
-	});
+	}).strict();
 	TipTapNodeSchema = z$1.lazy(() => z$1.object({
-		type: z$1.string(),
+		type: z$1.string().min(1),
 		content: z$1.array(TipTapNodeSchema).optional(),
 		text: z$1.string().optional(),
 		attrs: z$1.record(z$1.string(), z$1.unknown()).optional(),
 		marks: z$1.array(TipTapMarkSchema).optional()
+	}).strict().superRefine((node, ctx) => {
+		if (node.type === "doc") ctx.addIssue({
+			code: "custom",
+			path: ["type"],
+			message: "Document nodes are only valid at the rich-text root"
+		});
+		if (node.type === "text") {
+			if (node.text === void 0 || node.text.length === 0) ctx.addIssue({
+				code: "custom",
+				path: ["text"],
+				message: "Text nodes require a non-empty text value"
+			});
+			if (node.content !== void 0) ctx.addIssue({
+				code: "custom",
+				path: ["content"],
+				message: "Text nodes cannot contain child nodes"
+			});
+			return;
+		}
+		if (node.text !== void 0) ctx.addIssue({
+			code: "custom",
+			path: ["text"],
+			message: "Only text nodes can contain a text value"
+		});
 	}));
-	z$1.union([TipTapNodeSchema, z$1.object({ doc: TipTapNodeSchema })]);
 	RichTextDocSchema = z$1.object({
 		type: z$1.literal("doc"),
 		content: z$1.array(TipTapNodeSchema)
-	});
+	}).strict();
 }));
 //#endregion
 //#region ../blocks/src/system/blocks/shared/bookingPaymentTerms.ts
@@ -2450,7 +2673,7 @@ function validateProps(props, context = "node builder") {
 	else console.error(message);
 }
 var RESERVED_KEYS;
-var init_types$16 = __esmMin((() => {
+var init_types$15 = __esmMin((() => {
 	init_env();
 	RESERVED_KEYS = [
 		"children",
@@ -2555,7 +2778,7 @@ function devValidate(node) {
 var section$1, headerSection, stack, inline, accordion, accordionItem, carousel, text, richText, icon, media, fileDownload, videoEmbed, spinner, button, link, form, bookingForm, eventRegistration, shop, productList, productDetail, cart, checkout, gifting, courseRegistration;
 var init_builder$2 = __esmMin((() => {
 	init_schema$2();
-	init_types$16();
+	init_types$15();
 	init_env();
 	section$1 = (props, children, ...mods) => el("section", props, children, ...mods);
 	headerSection = (props, children, ...mods) => el("headerSection", props, children, ...mods);
@@ -3673,7 +3896,7 @@ function createTransformRegistry(definitions) {
 	}
 	return registry;
 }
-var init_core$2 = __esmMin((() => {}));
+var init_core$1 = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/palette/utils/colorConversion.ts
 function hexToRgb$1(hex) {
@@ -3977,7 +4200,7 @@ function defineBlockDesignCapability(capability) {
 	};
 }
 var plainFrame, tileTreatmentValues, eventListTreatmentValues, eyebrowTreatmentValues, visibleHeadingDecorationFamilyValues, headingDecorationOverrideValues, headingDecorationColorTokenValues, noHeadingDecoration, accordionIconSetValues, accordionIconColorTokenValues, accordionIconMotionValues;
-var init_types$15 = __esmMin((() => {
+var init_types$14 = __esmMin((() => {
 	plainFrame = { kind: "plain" };
 	tileTreatmentValues = [
 		"default",
@@ -4042,14 +4265,14 @@ function defineBlockAppearancePreset(preset) {
 	return preset;
 }
 var init_appearancePresetResolution = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 }));
 //#endregion
 //#region ../theme-core/src/site-styles/blockAppearancePresets.ts
 var blockAppearancePresets;
 var init_blockAppearancePresets = __esmMin((() => {
 	init_appearancePresetResolution();
-	init_types$15();
+	init_types$14();
 	blockAppearancePresets = [
 		defineBlockAppearancePreset({
 			kind: "block-design",
@@ -4862,168 +5085,10 @@ function assertUniqueLayoutProfileKeys(profiles) {
 	if (duplicates.length > 0) throw new Error(`Duplicate block layout design profiles: ${duplicates.join(", ")}`);
 }
 var init_blockFlow = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 }));
 var init_classic_professional = __esmMin((() => {}));
-//#endregion
-//#region ../theme-core/src/mock-themes/modern-minimal.ts
-var modernMinimalTheme;
-var init_modern_minimal = __esmMin((() => {
-	modernMinimalTheme = {
-		name: "Modern Minimal",
-		description: "Clean, monochromatic design with subtle styling and modern typography",
-		rationale: "Perfect for professional services, portfolios, and content-focused sites that need a clean, trustworthy appearance",
-		axes: {
-			tone: "minimal",
-			energy: "calm",
-			density: "airy",
-			mediaBias: "text",
-			conversionBias: "low",
-			motion: "subtle"
-		},
-		palette: {
-			colors: [
-				{
-					name: "primary",
-					hex: "#1f2937"
-				},
-				{
-					name: "primaryForeground",
-					hex: "#ffffff"
-				},
-				{
-					name: "secondary",
-					hex: "#6b7280"
-				},
-				{
-					name: "accent",
-					hex: "#3b82f6"
-				},
-				{
-					name: "success",
-					hex: "#10b981"
-				},
-				{
-					name: "warning",
-					hex: "#f59e0b"
-				},
-				{
-					name: "destructive",
-					hex: "#ef4444"
-				},
-				{
-					name: "background",
-					hex: "#ffffff"
-				},
-				{
-					name: "surface",
-					hex: "#ffffff"
-				},
-				{
-					name: "surfaceAlt",
-					hex: "#f9fafb"
-				},
-				{
-					name: "muted",
-					hex: "#f3f4f6"
-				},
-				{
-					name: "text",
-					hex: "#1f2937"
-				},
-				{
-					name: "border",
-					hex: "#e5e7eb"
-				}
-			],
-			meta: { mode: "light" }
-		},
-		typography: {
-			headings: {
-				default: {
-					family: "Inter, system-ui, sans-serif",
-					weight: "medium",
-					letterSpacing: "tight",
-					lineHeight: "normal",
-					case: "normal",
-					italic: null
-				},
-				h1: {
-					weight: "semibold",
-					letterSpacing: "tight",
-					size: "xl",
-					lineHeight: "normal",
-					italic: null
-				},
-				h2: {
-					weight: "medium",
-					letterSpacing: "normal",
-					size: "lg",
-					lineHeight: "normal",
-					italic: null
-				},
-				h3: {
-					weight: "medium",
-					letterSpacing: "normal",
-					size: "md",
-					lineHeight: "normal",
-					italic: null
-				}
-			},
-			body: {
-				family: "Inter, system-ui, sans-serif",
-				weight: "regular",
-				size: "md",
-				letterSpacing: "normal",
-				lineHeight: "relaxed"
-			},
-			scale: "minorThird"
-		},
-		space: "comfortable",
-		corners: "rounded",
-		border: {
-			width: "hairline",
-			style: "solid"
-		},
-		shadow: {
-			elevation: "low",
-			softness: "soft",
-			position: "bottom"
-		},
-		motion: {
-			level: "low",
-			easing: "standard"
-		},
-		header: {
-			variant: "classic",
-			positioning: "static",
-			shrinkOnScroll: false,
-			maxWidth: "container",
-			logoOverride: null,
-			background: {
-				type: "color",
-				color: "surface"
-			},
-			navStyle: "minimal",
-			navWeight: "medium",
-			navContainer: {
-				type: "none",
-				opacity: 0,
-				tint: null
-			}
-		},
-		footer: {
-			variant: "simple",
-			maxWidth: "container",
-			background: {
-				type: "color",
-				color: "surface"
-			},
-			navStyle: "minimal",
-			navWeight: "medium"
-		}
-	};
-}));
+var init_modern_minimal = __esmMin((() => {}));
 var init_vibrant_creative = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/palette/generateCssVars.ts
@@ -5349,7 +5414,7 @@ var init_all = __esmMin((() => {
 }));
 //#endregion
 //#region ../theme-core/src/palette/types.ts
-var init_types$14 = __esmMin((() => {}));
+var init_types$13 = __esmMin((() => {}));
 //#endregion
 //#region ../../node_modules/.pnpm/@vibrant+image@4.0.4/node_modules/@vibrant/image/dist/esm/histogram.js
 var Histogram;
@@ -6763,7 +6828,7 @@ function defineCuratedPalette(input) {
 	};
 }
 var curatedPaletteAuthoringKeySchema;
-var init_types$13 = __esmMin((() => {
+var init_types$12 = __esmMin((() => {
 	init_styleTags();
 	init_themeColorTokens();
 	init_colors();
@@ -6804,7 +6869,7 @@ var init_types$13 = __esmMin((() => {
 //#region ../theme-core/src/palette/curated/brand-led.ts
 var brandLedCool, brandLedWarm, brandLedJewel, brandLedSpruce, brandLedBurgundyGold;
 var init_brand_led = __esmMin((() => {
-	init_types$13();
+	init_types$12();
 	brandLedCool = defineCuratedPalette({
 		authoringKey: "brand-led-cool",
 		name: "Brand-led — Cool",
@@ -7135,7 +7200,7 @@ var init_brand_led = __esmMin((() => {
 //#region ../theme-core/src/palette/curated/high-contrast.ts
 var highContrastInk, highContrastCharcoal, highContrastMonochrome;
 var init_high_contrast = __esmMin((() => {
-	init_types$13();
+	init_types$12();
 	highContrastInk = defineCuratedPalette({
 		authoringKey: "high-contrast-ink",
 		name: "High Contrast — Ink",
@@ -7336,7 +7401,7 @@ var init_high_contrast = __esmMin((() => {
 //#region ../theme-core/src/palette/curated/soft-natural.ts
 var softNaturalSage, softNaturalStone, softNaturalWatercolor, softNaturalLilac;
 var init_soft_natural = __esmMin((() => {
-	init_types$13();
+	init_types$12();
 	softNaturalSage = defineCuratedPalette({
 		authoringKey: "soft-natural-sage",
 		name: "Soft Natural — Sage",
@@ -7602,7 +7667,7 @@ var init_soft_natural = __esmMin((() => {
 //#region ../theme-core/src/palette/curated/warm-neutral.ts
 var warmNeutralClay, warmNeutralCream, warmNeutralSoftEarth, warmNeutralForest;
 var init_warm_neutral = __esmMin((() => {
-	init_types$13();
+	init_types$12();
 	warmNeutralClay = defineCuratedPalette({
 		authoringKey: "warm-neutral-clay",
 		name: "Warm Neutral — Clay",
@@ -7868,7 +7933,7 @@ var init_warm_neutral = __esmMin((() => {
 //#region ../theme-core/src/palette/curated/warm-dark.ts
 var warmDarkEmber, warmDarkKirtanGold;
 var init_warm_dark = __esmMin((() => {
-	init_types$13();
+	init_types$12();
 	warmDarkEmber = defineCuratedPalette({
 		authoringKey: "warm-dark-ember",
 		name: "Warm Dark — Ember",
@@ -8034,7 +8099,7 @@ var init_curated = __esmMin((() => {
 	init_soft_natural();
 	init_warm_neutral();
 	init_warm_dark();
-	init_types$13();
+	init_types$12();
 	curatedPalettes = [
 		admitCuratedPaletteDefinition(brandLedCool),
 		admitCuratedPaletteDefinition(brandLedWarm),
@@ -8166,7 +8231,7 @@ var init_palette$1 = __esmMin((() => {
 	init_generateCssVars();
 	init_generateShades();
 	init_neutralScale();
-	init_types$14();
+	init_types$13();
 	init_utils$6();
 	init_paletteAccess();
 	init_extractPalette();
@@ -8407,7 +8472,7 @@ var init_backgroundAppearance = __esmMin((() => {
 	backgroundAppearanceColorTokenNameSet = new Set(backgroundAppearanceColorTokenNames);
 }));
 var init_compositionBudget = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 }));
 var init_schemaVersionedJson = __esmMin((() => {}));
 //#endregion
@@ -8425,7 +8490,7 @@ function boundaryRuntimeMetricsForTransition(transition) {
 }
 var sectionBoundaryRuntimeMetricsByTransition, noneBoundaryOption, softBoundaryOption, spaciousBoundaryOption;
 var init_sectionTransitions = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	sectionBoundaryRuntimeMetricsByTransition = {
 		none: null,
 		"soft-fade-short": boundaryRuntimeMetrics("gradient", "medium", "6rem + 2px"),
@@ -8514,7 +8579,7 @@ function boundaryKey$1(previousBlockId, nextBlockId) {
 }
 var pageDesignUserPinnedAppearanceChoiceSchema, pageDesignUserPinnedBoundaryChoiceSchema, pageDesignBoundaryTreatmentSchema, pageDesignUserPinnedBoundaryTreatmentChoiceSchema, pageDesignBlockLookPinSchema, pageDesignBoundaryPinSchema, legacyPageDesignBoundaryPinSchema;
 var init_pageDesignIntent = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	init_schemaVersionedJson();
 	init_sectionTransitions();
 	asBoundaryOptionId("break:unknown");
@@ -8619,109 +8684,7 @@ var init_pageDesignIntent = __esmMin((() => {
 var init_contentTemplateDesignIntent = __esmMin((() => {
 	init_pageDesignIntent();
 	init_sectionTransitions();
-	init_types$15();
-}));
-//#endregion
-//#region ../theme-core/src/buttons/effectClassification.ts
-function getButtonEffectPolicy(effectId) {
-	return Object.prototype.hasOwnProperty.call(BUTTON_EFFECT_POLICIES, effectId) ? BUTTON_EFFECT_POLICIES[effectId] : null;
-}
-function classifyButtonEffectId(effectId) {
-	return getButtonEffectPolicy(effectId)?.classification ?? "unknown";
-}
-var BUTTON_EFFECT_POLICIES;
-var init_effectClassification = __esmMin((() => {
-	BUTTON_EFFECT_POLICIES = {
-		"darken-background": {
-			classification: "colour-transition",
-			transition: {
-				kind: "adjust-shade",
-				direction: "darker"
-			}
-		},
-		"lighten-background": {
-			classification: "colour-transition",
-			transition: {
-				kind: "adjust-shade",
-				direction: "lighter"
-			}
-		},
-		"background-on-hover": {
-			classification: "colour-transition",
-			transition: { kind: "replace-background" }
-		},
-		"background-on-hover-alpha": {
-			classification: "unsupported-colour",
-			reason: "alpha_requires_surface"
-		},
-		"fade-background": {
-			classification: "unsupported-colour",
-			reason: "changes_element_opacity"
-		},
-		"opacity-reduce": {
-			classification: "unsupported-colour",
-			reason: "changes_element_opacity"
-		},
-		"gradient-text": {
-			classification: "unsupported-colour",
-			reason: "changes_foreground"
-		},
-		"text-color-change": {
-			classification: "unsupported-colour",
-			reason: "changes_foreground"
-		},
-		"border-color-change": {
-			classification: "unsupported-colour",
-			reason: "changes_border"
-		},
-		"aurora-glow": {
-			classification: "unsupported-background-overlay",
-			reason: "unresolved_background_overlay"
-		},
-		"cosmic-stardust": {
-			classification: "unsupported-background-overlay",
-			reason: "unresolved_background_overlay"
-		},
-		"gradient-border-fill": {
-			classification: "unsupported-background-overlay",
-			reason: "unresolved_background_overlay"
-		},
-		"animated-gradient-border-fill": {
-			classification: "unsupported-background-overlay",
-			reason: "unresolved_background_overlay"
-		},
-		"nav-underline": {
-			classification: "not-button",
-			reason: "not_button_effect"
-		},
-		"nav-frosted-base": {
-			classification: "not-button",
-			reason: "not_button_effect"
-		},
-		"nav-frosted-hover": {
-			classification: "not-button",
-			reason: "not_button_effect"
-		},
-		"nav-frosted-active": {
-			classification: "not-button",
-			reason: "not_button_effect"
-		},
-		"animated-gradient": { classification: "non-colour" },
-		"border-glow": { classification: "non-colour" },
-		"drop-shadow": { classification: "non-colour" },
-		"inner-shadow": { classification: "non-colour" },
-		"neumorphic-shadow": { classification: "non-colour" },
-		"outer-glow": { classification: "non-colour" },
-		"retro-3d-shadow": { classification: "non-colour" },
-		"scale-up": { classification: "non-colour" },
-		"scale-down": { classification: "non-colour" },
-		lift: { classification: "non-colour" },
-		"press-down": { classification: "non-colour" },
-		pop: { classification: "non-colour" },
-		"border-bottom-grow": { classification: "non-colour" },
-		"sketchy-border": { classification: "non-colour" },
-		"pulse-animation": { classification: "non-colour" }
-	};
+	init_types$14();
 }));
 //#endregion
 //#region ../theme-core/src/buttons/types.ts
@@ -8729,8 +8692,9 @@ function isVariantRole(value) {
 	return VARIANT_ROLES.includes(value);
 }
 function asSpecialVariantId(value) {
-	if (value.length === 0) throw new Error("SpecialVariantId must be a non-empty string");
-	return value;
+	const parsed = buttonVariantIdSchema.safeParse(value);
+	if (!parsed.success) throw new Error("SpecialVariantId must be a CSS-safe button variant ID");
+	return parsed.data;
 }
 function parseOpaqueButtonColourToken(value) {
 	const token = parseThemeColorToken(value);
@@ -8741,144 +8705,8 @@ function parseOpaqueButtonColourToken(value) {
 function unsafeAsOpaqueButtonColourToken(value) {
 	return value;
 }
-function normalizeLegacyButtonVariantInput(input) {
-	if (!isUnknownRecord(input)) return input;
-	const background = input.background;
-	if (!isUnknownRecord(background)) return input;
-	if (!(background.type === "transparent" || Object.prototype.hasOwnProperty.call(input, "textColorToken") || isUnknownRecord(input.border) && Object.prototype.hasOwnProperty.call(input.border, "colorToken") || hasLegacyButtonEffects(input.effects) || hasLegacyAlphaToken(input, background))) return input;
-	const { textColorToken, ...withoutLegacyText } = input;
-	const normalizedBorder = isUnknownRecord(input.border) && typeof input.border.widthClass === "string" ? { widthClass: input.border.widthClass } : input.border;
-	const normalizedAffordance = isUnknownRecord(input.affordance) && typeof input.affordance.iconId === "string" ? { iconId: input.affordance.iconId } : input.affordance;
-	const normalizedEffects = normalizeLegacyButtonEffects(input.effects, background.type);
-	const hoverBackgroundToken = stripLegacyTokenAlpha(input.hoverBackgroundToken);
-	if (background.type === "transparent") return {
-		...withoutLegacyText,
-		background: {
-			type: "surface",
-			role: "link"
-		},
-		border: normalizedBorder,
-		affordance: normalizedAffordance,
-		effects: normalizedEffects,
-		hoverBackgroundToken
-	};
-	if (background.type === "gradient") {
-		const stops = Array.isArray(background.stops) ? background.stops.map(stripLegacyTokenAlpha) : background.stops;
-		return {
-			...withoutLegacyText,
-			background: {
-				...background,
-				stops,
-				foregroundToken: stripLegacyTokenAlpha(background.foregroundToken ?? textColorToken)
-			},
-			border: normalizedBorder,
-			affordance: normalizedAffordance,
-			effects: normalizedEffects,
-			hoverBackgroundToken
-		};
-	}
-	return {
-		...withoutLegacyText,
-		background: background.type === "solid" ? {
-			...background,
-			colorToken: stripLegacyTokenAlpha(background.colorToken)
-		} : background,
-		border: normalizedBorder,
-		affordance: normalizedAffordance,
-		effects: normalizedEffects,
-		hoverBackgroundToken
-	};
-}
-function normalizeLegacyButtonGlobalInput(input) {
-	if (!isUnknownRecord(input)) return input;
-	const hoverColorToken = stripLegacyTokenAlpha(input.hoverColorToken);
-	return hoverColorToken === input.hoverColorToken ? input : {
-		...input,
-		hoverColorToken
-	};
-}
-function hasLegacyAlphaToken(input, background) {
-	const stops = isUnknownArray$4(background.stops) ? background.stops : [];
-	return [
-		input.hoverBackgroundToken,
-		background.colorToken,
-		background.foregroundToken,
-		...stops
-	].some((token) => stripLegacyTokenAlpha(token) !== token);
-}
-function stripLegacyTokenAlpha(value) {
-	if (typeof value !== "string") return value;
-	const slashIndex = value.indexOf("/");
-	return slashIndex < 0 ? value : value.slice(0, slashIndex);
-}
-function hasLegacyButtonEffects(input) {
-	if (!isUnknownRecord(input)) return false;
-	return [
-		"base",
-		"hover",
-		"active",
-		"focus"
-	].some((state) => {
-		const effects = input[state];
-		return Array.isArray(effects) && effects.some((effect) => {
-			if (!isUnknownRecord(effect) || typeof effect.effectId !== "string") return true;
-			const classification = classifyButtonEffectId(effect.effectId);
-			if (classification !== "colour-transition" && classification !== "non-colour") return true;
-			return effect.effectId === "background-on-hover" && isUnknownRecord(effect.options) && stripLegacyTokenAlpha(effect.options.colorToken) !== effect.options.colorToken;
-		});
-	});
-}
-function normalizeLegacyButtonEffects(input, backgroundType) {
-	if (!isUnknownRecord(input)) return input;
-	const normalized = {};
-	for (const state of [
-		"base",
-		"hover",
-		"active",
-		"focus"
-	]) {
-		const effects = input[state];
-		if (!Array.isArray(effects)) continue;
-		const safeEffects = effects.flatMap((effect) => {
-			if (!isUnknownRecord(effect) || typeof effect.effectId !== "string") return [];
-			const classification = classifyButtonEffectId(effect.effectId);
-			if (classification === "non-colour") return [effect];
-			if (classification !== "colour-transition") return [];
-			if (effect.effectId === "background-on-hover") {
-				const options = isUnknownRecord(effect.options) ? effect.options : null;
-				const colorToken = options === null ? null : parseOpaqueButtonColourToken(stripLegacyTokenAlpha(options.colorToken));
-				return colorToken === null ? [] : [{
-					...effect,
-					options: {
-						...options,
-						colorToken
-					}
-				}];
-			}
-			if (backgroundType !== "solid") return [];
-			const rawAmount = isUnknownRecord(effect.options) ? effect.options.amount : void 0;
-			const amount = typeof rawAmount === "number" && rawAmount > 0 ? Math.max(100, Math.round(rawAmount / 100) * 100) : 100;
-			return [{
-				...effect,
-				options: {
-					...isUnknownRecord(effect.options) ? effect.options : {},
-					amount
-				}
-			}];
-		});
-		if (safeEffects.length > 0) normalized[state] = safeEffects;
-	}
-	return Object.keys(normalized).length === 0 ? void 0 : normalized;
-}
-function isUnknownRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isUnknownArray$4(value) {
-	return Array.isArray(value);
-}
-var VARIANT_ROLES, DEFAULT_VARIANT_ALIAS_ID, opaqueButtonColourTokenSchema, cornerStyleSchema, shadowSizeSchema, textTransformSchema, fontWeightSchema, buttonTypographySchema, letterSpacingSchema, hoverTransformSchema, hoverColorSchema, buttonPaddingPresetSchema, gradientStyleSchema, gradientSharpnessSchema, prioritySchema, buttonSizeNameSchema, PADDING_TOKEN_PATTERN, paddingShorthandSchema, buttonSizeConfigSchema, buttonSizesSchema, canonicalButtonGlobalSettingsSchema, buttonGlobalSettingsSchema, gradientDirectionSchema$1, buttonColourTreatmentSchema, buttonBackgroundSchema, effectApplicationSchema$1, buttonBorderSchema, buttonVariantAffordanceSchema, variantShadowSchema, variantEffectsSchema, variantSizeOverridesSchema, canonicalButtonVariantSchema, buttonVariantSchema, buttonSystemSchema;
-var init_types$12 = __esmMin((() => {
-	init_effectClassification();
+var VARIANT_ROLES, buttonVariantIdSchema, DEFAULT_VARIANT_ALIAS_ID, opaqueButtonColourTokenSchema, buttonShadeAmountSchema, buttonShadowIntensitySchema, buttonEffectApplicationSchema, cornerStyleSchema, shadowSizeSchema, textTransformSchema, fontWeightSchema, buttonTypographySchema, letterSpacingSchema, hoverTransformSchema, buttonPaddingPresetSchema, gradientStyleSchema, gradientSharpnessSchema, prioritySchema, buttonSizeNameSchema, PADDING_TOKEN_PATTERN, paddingShorthandSchema, buttonSizeConfigSchema, buttonSizesSchema, buttonGlobalSettingsBaseSchema, buttonGlobalSettingsSchema, gradientDirectionSchema$1, buttonColourTreatmentSchema, buttonBackgroundSchema, buttonBorderSchema, buttonVariantAffordanceSchema, variantShadowSchema, variantEffectsSchema, variantSizeOverridesSchema, buttonVariantSchema, buttonSystemSchema;
+var init_types$11 = __esmMin((() => {
 	init_themeColorTokens();
 	init_colorTokenParts();
 	VARIANT_ROLES = [
@@ -8890,12 +8718,109 @@ var init_types$12 = __esmMin((() => {
 		"tertiary",
 		"accent"
 	];
+	buttonVariantIdSchema = z$1.string().min(1).max(50).regex(/^[a-z0-9-]+$/, "Button variant IDs may contain lowercase letters, numbers, and hyphens only");
 	DEFAULT_VARIANT_ALIAS_ID = "default";
 	opaqueButtonColourTokenSchema = themeColorTokenSchema.refine((value) => parseOpaqueButtonColourToken(value) !== null, "Button colour tokens must be opaque").transform((value) => {
 		const token = parseOpaqueButtonColourToken(value);
 		if (token === null) throw new Error("Invariant: opaque button token passed its schema");
 		return token;
 	});
+	buttonShadeAmountSchema = z$1.number().finite().min(0).max(900).multipleOf(100);
+	buttonShadowIntensitySchema = z$1.enum([
+		"subtle",
+		"medium",
+		"strong"
+	]);
+	buttonEffectApplicationSchema = z$1.discriminatedUnion("effectId", [
+		z$1.strictObject({
+			effectId: z$1.literal("darken-background"),
+			options: z$1.strictObject({ amount: buttonShadeAmountSchema.optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("lighten-background"),
+			options: z$1.strictObject({ amount: buttonShadeAmountSchema.optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("background-on-hover"),
+			options: z$1.strictObject({ colorToken: opaqueButtonColourTokenSchema.optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("animated-gradient"),
+			options: z$1.strictObject({ direction: z$1.enum(["horizontal", "vertical"]).optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("drop-shadow"),
+			options: z$1.strictObject({ intensity: buttonShadowIntensitySchema.optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("inner-shadow"),
+			options: z$1.strictObject({}).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("neumorphic-shadow"),
+			options: z$1.strictObject({
+				mode: z$1.enum(["raised", "pressed"]).optional(),
+				intensity: buttonShadowIntensitySchema.optional()
+			}).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("retro-3d-shadow"),
+			options: z$1.strictObject({}).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("scale-up"),
+			options: z$1.strictObject({ scale: z$1.enum([
+				"1.02",
+				"1.03",
+				"1.05",
+				"1.10"
+			]).optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("scale-down"),
+			options: z$1.strictObject({ scale: z$1.enum([
+				"0.90",
+				"0.95",
+				"0.97",
+				"0.98"
+			]).optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("lift"),
+			options: z$1.strictObject({ amount: z$1.enum([
+				"0.25",
+				"0.5",
+				"1"
+			]).optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("press-down"),
+			options: z$1.strictObject({}).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("pop"),
+			options: z$1.strictObject({ intensity: z$1.enum([
+				"subtle",
+				"medium",
+				"dramatic"
+			]).optional() }).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("border-bottom-grow"),
+			options: z$1.strictObject({
+				height: z$1.union([z$1.literal(1), z$1.literal(2)]).optional(),
+				origin: z$1.enum([
+					"left",
+					"center",
+					"right"
+				]).optional()
+			}).optional()
+		}),
+		z$1.strictObject({
+			effectId: z$1.literal("sketchy-border"),
+			options: z$1.strictObject({ intensity: buttonShadowIntensitySchema.optional() }).optional()
+		})
+	]);
 	cornerStyleSchema = z$1.enum([
 		"square",
 		"rounded",
@@ -8930,13 +8855,7 @@ var init_types$12 = __esmMin((() => {
 		"scale",
 		"press"
 	]);
-	hoverColorSchema = z$1.enum([
-		"none",
-		"brighten",
-		"darken",
-		"saturate",
-		"token"
-	]);
+	z$1.enum(["none", "token"]);
 	buttonPaddingPresetSchema = z$1.enum([
 		"compact",
 		"default",
@@ -8984,7 +8903,7 @@ var init_types$12 = __esmMin((() => {
 		lg,
 		xl: xl ?? lg
 	}));
-	canonicalButtonGlobalSettingsSchema = z$1.object({
+	buttonGlobalSettingsBaseSchema = z$1.strictObject({
 		cornerStyle: cornerStyleSchema,
 		cornerRadius: z$1.number().min(0).max(24).optional(),
 		/**
@@ -8997,30 +8916,23 @@ var init_types$12 = __esmMin((() => {
 		shadow: shadowSizeSchema.optional(),
 		textTransform: textTransformSchema,
 		fontWeight: fontWeightSchema,
-		/**
-		* @deprecated Set per-variant via `variant.border.widthClass` instead.
-		* Schema field is preserved so existing presets parse; the value is unread
-		* by the current generator and will be removed once the legacy
-		* `primitives/content/components/Button.tsx` slot exports are deleted.
-		*/
-		borderWidth: z$1.union([
-			z$1.literal(1),
-			z$1.literal(2),
-			z$1.literal(3)
-		]),
 		typography: buttonTypographySchema.optional(),
 		fontSize: z$1.string().optional(),
 		letterSpacing: letterSpacingSchema.optional(),
 		italic: z$1.boolean().optional(),
 		paddingPreset: buttonPaddingPresetSchema.optional(),
 		hoverTransform: hoverTransformSchema,
-		hoverColor: hoverColorSchema,
-		hoverColorToken: opaqueButtonColourTokenSchema.optional(),
 		gradientStyle: gradientStyleSchema.optional(),
 		gradientAngle: z$1.number().min(0).max(360).optional(),
 		gradientSharpness: gradientSharpnessSchema.optional()
 	});
-	buttonGlobalSettingsSchema = z$1.preprocess(normalizeLegacyButtonGlobalInput, canonicalButtonGlobalSettingsSchema);
+	buttonGlobalSettingsSchema = z$1.discriminatedUnion("hoverColor", [buttonGlobalSettingsBaseSchema.extend({
+		hoverColor: z$1.literal("none"),
+		hoverColorToken: z$1.never().optional()
+	}), buttonGlobalSettingsBaseSchema.extend({
+		hoverColor: z$1.literal("token"),
+		hoverColorToken: opaqueButtonColourTokenSchema
+	})]);
 	gradientDirectionSchema$1 = z$1.enum([
 		"to-r",
 		"to-l",
@@ -9032,11 +8944,11 @@ var init_types$12 = __esmMin((() => {
 		"to-bl"
 	]);
 	buttonColourTreatmentSchema = z$1.discriminatedUnion("type", [
-		z$1.object({
+		z$1.strictObject({
 			type: z$1.literal("solid"),
 			colorToken: opaqueButtonColourTokenSchema
 		}),
-		z$1.object({
+		z$1.strictObject({
 			type: z$1.literal("gradient"),
 			stops: z$1.array(opaqueButtonColourTokenSchema).min(2).transform((stops) => {
 				const [first, second, ...rest] = stops;
@@ -9050,19 +8962,15 @@ var init_types$12 = __esmMin((() => {
 			direction: gradientDirectionSchema$1,
 			foregroundToken: opaqueButtonColourTokenSchema
 		}),
-		z$1.object({
+		z$1.strictObject({
 			type: z$1.literal("surface"),
 			role: z$1.literal("link")
 		})
 	]);
 	buttonBackgroundSchema = buttonColourTreatmentSchema;
-	effectApplicationSchema$1 = z$1.object({
-		effectId: z$1.string(),
-		options: z$1.record(z$1.string(), z$1.json()).optional()
-	});
-	buttonBorderSchema = z$1.object({ widthClass: z$1.string() });
-	buttonVariantAffordanceSchema = z$1.object({ iconId: z$1.string().min(1) });
-	variantShadowSchema = z$1.object({
+	buttonBorderSchema = z$1.strictObject({ widthClass: z$1.string() });
+	buttonVariantAffordanceSchema = z$1.strictObject({ iconId: z$1.string().min(1) });
+	variantShadowSchema = z$1.strictObject({
 		elevation: z$1.enum([
 			"none",
 			"low",
@@ -9075,13 +8983,13 @@ var init_types$12 = __esmMin((() => {
 			"hard"
 		]).nullable(),
 		position: z$1.enum(["bottom", "bottom-right"]).default("bottom"),
-		colorToken: themeColorTokenSchema.optional()
+		colorToken: opaqueButtonColourTokenSchema.optional()
 	});
-	variantEffectsSchema = z$1.object({
-		base: z$1.array(effectApplicationSchema$1).optional(),
-		hover: z$1.array(effectApplicationSchema$1).optional(),
-		active: z$1.array(effectApplicationSchema$1).optional(),
-		focus: z$1.array(effectApplicationSchema$1).optional()
+	variantEffectsSchema = z$1.strictObject({
+		base: z$1.array(buttonEffectApplicationSchema).optional(),
+		hover: z$1.array(buttonEffectApplicationSchema).optional(),
+		active: z$1.array(buttonEffectApplicationSchema).optional(),
+		focus: z$1.array(buttonEffectApplicationSchema).optional()
 	});
 	variantSizeOverridesSchema = z$1.object({
 		sm: buttonSizeConfigSchema.optional(),
@@ -9089,8 +8997,8 @@ var init_types$12 = __esmMin((() => {
 		lg: buttonSizeConfigSchema.optional(),
 		xl: buttonSizeConfigSchema.optional()
 	});
-	canonicalButtonVariantSchema = z$1.object({
-		id: z$1.string(),
+	buttonVariantSchema = z$1.strictObject({
+		id: buttonVariantIdSchema,
 		name: z$1.string().min(1).max(20),
 		enabled: z$1.boolean(),
 		priority: prioritySchema,
@@ -9104,11 +9012,24 @@ var init_types$12 = __esmMin((() => {
 		sizes: variantSizeOverridesSchema.optional(),
 		affordance: buttonVariantAffordanceSchema.optional()
 	});
-	buttonVariantSchema = z$1.preprocess(normalizeLegacyButtonVariantInput, canonicalButtonVariantSchema);
-	buttonSystemSchema = z$1.object({
+	buttonSystemSchema = z$1.strictObject({
 		global: buttonGlobalSettingsSchema,
 		variants: z$1.array(buttonVariantSchema).min(1).max(6),
 		sizes: buttonSizesSchema.optional()
+	}).superRefine((system, ctx) => {
+		const seen = /* @__PURE__ */ new Set();
+		system.variants.forEach((variant, index) => {
+			if (seen.has(variant.id)) ctx.addIssue({
+				code: "custom",
+				path: [
+					"variants",
+					index,
+					"id"
+				],
+				message: `Duplicate button variant ID: ${variant.id}`
+			});
+			seen.add(variant.id);
+		});
 	});
 }));
 //#endregion
@@ -9192,7 +9113,7 @@ function rolePriority(role) {
 }
 var PUBLIC_BUTTON_ROLES;
 var init_domain = __esmMin((() => {
-	init_types$12();
+	init_types$11();
 	PUBLIC_BUTTON_ROLES = [
 		"primary",
 		"secondary",
@@ -9248,7 +9169,7 @@ var init_selection = __esmMin((() => {
 var quietArrowRecipe;
 var init_quietArrow = __esmMin((() => {
 	init_domain();
-	init_types$12();
+	init_types$11();
 	init_selection();
 	quietArrowRecipe = defineButtonStyleRecipe({
 		id: "quiet-arrow",
@@ -9278,7 +9199,6 @@ var init_quietArrow = __esmMin((() => {
 				cornerStyle: "rounded",
 				textTransform: "uppercase",
 				fontWeight: 500,
-				borderWidth: 1,
 				typography: "body",
 				fontSize: "text-sm",
 				letterSpacing: "loose",
@@ -9342,7 +9262,7 @@ var init_quietArrow = __esmMin((() => {
 						affordance: { iconId: "ArrowRight" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surfaceAlt" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surfaceAlt") }
 						}] }
 					}
 				},
@@ -9438,7 +9358,7 @@ function normalizeAppearanceOverrides(overrides) {
 }
 var emptyParametersSchema;
 var init_defineStaticButtonStyleRecipe = __esmMin((() => {
-	init_types$12();
+	init_types$11();
 	init_domain();
 	emptyParametersSchema = z$1.object({}).strict();
 }));
@@ -9447,6 +9367,7 @@ var init_defineStaticButtonStyleRecipe = __esmMin((() => {
 var softPillRecipe, earthPillRecipe, confidentChipRecipe, editorialSizes, editorialLinkRecipe, pebbleRecipe, brushedWashRecipe, inkStampRecipe, flatInkRecipe, showtimePillRecipe, joyStampRecipe, ornateGhostSizes, ornateRitualRecipe;
 var init_staticRecipes = __esmMin((() => {
 	init_defineStaticButtonStyleRecipe();
+	init_types$11();
 	softPillRecipe = defineStaticButtonStyleRecipe({
 		id: "soft-pill",
 		accessibilityLabel: "Rounded pill buttons with a gentle hover lift",
@@ -9462,7 +9383,6 @@ var init_staticRecipes = __esmMin((() => {
 				shadow: "low",
 				textTransform: "none",
 				fontWeight: 500,
-				borderWidth: 2,
 				hoverTransform: "lift",
 				hoverColor: "none"
 			},
@@ -9481,10 +9401,7 @@ var init_staticRecipes = __esmMin((() => {
 							position: "bottom"
 						},
 						effects: {
-							hover: [{
-								effectId: "lift",
-								options: { translateY: "-1px" }
-							}],
+							hover: [{ effectId: "lift" }],
 							active: [{
 								effectId: "scale-down",
 								options: { scale: "0.98" }
@@ -9503,7 +9420,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border-2" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -9518,7 +9435,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -9532,7 +9449,7 @@ var init_staticRecipes = __esmMin((() => {
 						borderRadius: "rounded-full",
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -9562,7 +9479,6 @@ var init_staticRecipes = __esmMin((() => {
 				shadow: "low",
 				textTransform: "none",
 				fontWeight: 500,
-				borderWidth: 1,
 				hoverTransform: "lift",
 				hoverColor: "none",
 				typography: "body",
@@ -9598,12 +9514,9 @@ var init_staticRecipes = __esmMin((() => {
 							position: "bottom"
 						},
 						effects: {
-							hover: [{
-								effectId: "lift",
-								options: { translateY: "-1px" }
-							}, {
+							hover: [{ effectId: "lift" }, {
 								effectId: "background-on-hover",
-								options: { colorToken: "accent" }
+								options: { colorToken: unsafeAsOpaqueButtonColourToken("accent") }
 							}],
 							active: [{
 								effectId: "scale-down",
@@ -9623,7 +9536,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "muted" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("muted") }
 						}] }
 					}
 				},
@@ -9638,7 +9551,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surfaceAlt" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surfaceAlt") }
 						}] }
 					}
 				},
@@ -9698,7 +9611,6 @@ var init_staticRecipes = __esmMin((() => {
 				shadow: "medium",
 				textTransform: "none",
 				fontWeight: 600,
-				borderWidth: 1,
 				hoverTransform: "none",
 				hoverColor: "none"
 			},
@@ -9739,7 +9651,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "background" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("background") }
 						}] }
 					}
 				},
@@ -9754,7 +9666,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -9768,7 +9680,7 @@ var init_staticRecipes = __esmMin((() => {
 						borderRadius: "rounded-md",
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -9803,7 +9715,6 @@ var init_staticRecipes = __esmMin((() => {
 				cornerStyle: "square",
 				textTransform: "none",
 				fontWeight: 500,
-				borderWidth: 1,
 				hoverTransform: "none",
 				hoverColor: "none"
 			},
@@ -9821,7 +9732,6 @@ var init_staticRecipes = __esmMin((() => {
 							effectId: "border-bottom-grow",
 							options: {
 								height: 2,
-								colorToken: "text",
 								origin: "left"
 							}
 						}] }
@@ -9840,7 +9750,6 @@ var init_staticRecipes = __esmMin((() => {
 							effectId: "border-bottom-grow",
 							options: {
 								height: 1,
-								colorToken: "mutedText",
 								origin: "left"
 							}
 						}] }
@@ -9859,7 +9768,6 @@ var init_staticRecipes = __esmMin((() => {
 							effectId: "border-bottom-grow",
 							options: {
 								height: 1,
-								colorToken: "accent",
 								origin: "left"
 							}
 						}] }
@@ -9883,7 +9791,6 @@ var init_staticRecipes = __esmMin((() => {
 						effectId: "border-bottom-grow",
 						options: {
 							height: 2,
-							colorToken: "accent",
 							origin: "left"
 						}
 					}] } }
@@ -9905,7 +9812,6 @@ var init_staticRecipes = __esmMin((() => {
 				cornerStyle: "pill",
 				textTransform: "none",
 				fontWeight: 500,
-				borderWidth: 2,
 				hoverTransform: "none",
 				hoverColor: "none"
 			},
@@ -9950,7 +9856,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border-2" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "accent" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("accent") }
 						}] }
 					}
 				},
@@ -9965,7 +9871,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10020,7 +9926,6 @@ var init_staticRecipes = __esmMin((() => {
 				shadow: "low",
 				textTransform: "none",
 				fontWeight: 500,
-				borderWidth: 1,
 				hoverTransform: "none",
 				hoverColor: "none"
 			},
@@ -10085,7 +9990,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10099,7 +10004,7 @@ var init_staticRecipes = __esmMin((() => {
 						borderRadius: "rounded-lg",
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10128,7 +10033,6 @@ var init_staticRecipes = __esmMin((() => {
 				cornerStyle: "rounded",
 				textTransform: "uppercase",
 				fontWeight: 600,
-				borderWidth: 1,
 				hoverTransform: "none",
 				hoverColor: "none",
 				letterSpacing: "loose"
@@ -10186,7 +10090,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border-2" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10201,7 +10105,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border-2" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10235,7 +10139,6 @@ var init_staticRecipes = __esmMin((() => {
 							effectId: "border-bottom-grow",
 							options: {
 								height: 1,
-								colorToken: "accent",
 								origin: "left"
 							}
 						}] }
@@ -10266,7 +10169,6 @@ var init_staticRecipes = __esmMin((() => {
 				cornerStyle: "rounded",
 				textTransform: "none",
 				fontWeight: 600,
-				borderWidth: 1,
 				typography: "body",
 				letterSpacing: "tight",
 				paddingPreset: "default",
@@ -10298,12 +10200,9 @@ var init_staticRecipes = __esmMin((() => {
 						},
 						borderRadius: "rounded-lg",
 						affordance: { iconId: "ArrowRight" },
-						effects: { hover: [{
-							effectId: "lift",
-							options: { translateY: "-2px" }
-						}, {
+						effects: { hover: [{ effectId: "lift" }, {
 							effectId: "background-on-hover",
-							options: { colorToken: "secondary" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("secondary") }
 						}] }
 					}
 				},
@@ -10316,12 +10215,9 @@ var init_staticRecipes = __esmMin((() => {
 						},
 						borderRadius: "rounded-lg",
 						border: { widthClass: "border" },
-						effects: { hover: [{
-							effectId: "lift",
-							options: { translateY: "-2px" }
-						}, {
+						effects: { hover: [{ effectId: "lift" }, {
 							effectId: "background-on-hover",
-							options: { colorToken: "surfaceAlt" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surfaceAlt") }
 						}] }
 					}
 				},
@@ -10334,12 +10230,9 @@ var init_staticRecipes = __esmMin((() => {
 						},
 						borderRadius: "rounded-lg",
 						border: { widthClass: "border" },
-						effects: { hover: [{
-							effectId: "lift",
-							options: { translateY: "-2px" }
-						}, {
+						effects: { hover: [{ effectId: "lift" }, {
 							effectId: "background-on-hover",
-							options: { colorToken: "surfaceAlt" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surfaceAlt") }
 						}] }
 					}
 				},
@@ -10351,10 +10244,7 @@ var init_staticRecipes = __esmMin((() => {
 							role: "link"
 						},
 						borderRadius: "rounded-lg",
-						effects: { hover: [{
-							effectId: "lift",
-							options: { translateY: "-2px" }
-						}] }
+						effects: { hover: [{ effectId: "lift" }] }
 					}
 				},
 				accent: {
@@ -10366,10 +10256,7 @@ var init_staticRecipes = __esmMin((() => {
 						},
 						borderRadius: "rounded-lg",
 						affordance: { iconId: "ArrowRight" },
-						effects: { hover: [{
-							effectId: "lift",
-							options: { translateY: "-2px" }
-						}] }
+						effects: { hover: [{ effectId: "lift" }] }
 					}
 				}
 			}
@@ -10390,9 +10277,8 @@ var init_staticRecipes = __esmMin((() => {
 				shadow: "low",
 				textTransform: "uppercase",
 				fontWeight: 700,
-				borderWidth: 2,
 				hoverTransform: "lift",
-				hoverColor: "darken",
+				hoverColor: "none",
 				typography: "body",
 				paddingPreset: "spacious",
 				italic: false
@@ -10450,7 +10336,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border-2" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "background" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("background") }
 						}] }
 					}
 				},
@@ -10464,7 +10350,7 @@ var init_staticRecipes = __esmMin((() => {
 						borderRadius: "rounded-full",
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10499,7 +10385,6 @@ var init_staticRecipes = __esmMin((() => {
 				typography: "heading",
 				fontWeight: 700,
 				fontSize: "text-lg",
-				borderWidth: 2,
 				hoverTransform: "none",
 				hoverColor: "none"
 			},
@@ -10534,7 +10419,7 @@ var init_staticRecipes = __esmMin((() => {
 							elevation: "high",
 							softness: "hard",
 							position: "bottom-right",
-							colorToken: "text"
+							colorToken: unsafeAsOpaqueButtonColourToken("text")
 						},
 						effects: { hover: [{ effectId: "press-down" }] }
 					}
@@ -10552,7 +10437,7 @@ var init_staticRecipes = __esmMin((() => {
 							elevation: "high",
 							softness: "hard",
 							position: "bottom-right",
-							colorToken: "secondary"
+							colorToken: unsafeAsOpaqueButtonColourToken("secondary")
 						},
 						effects: { hover: [{ effectId: "press-down" }] }
 					}
@@ -10615,7 +10500,6 @@ var init_staticRecipes = __esmMin((() => {
 				cornerStyle: "rounded",
 				textTransform: "uppercase",
 				fontWeight: 600,
-				borderWidth: 1,
 				hoverTransform: "none",
 				hoverColor: "none",
 				letterSpacing: "loose"
@@ -10651,7 +10535,7 @@ var init_staticRecipes = __esmMin((() => {
 						effects: {
 							hover: [{
 								effectId: "background-on-hover",
-								options: { colorToken: "primary-100" }
+								options: { colorToken: unsafeAsOpaqueButtonColourToken("primary-100") }
 							}],
 							active: [{
 								effectId: "scale-down",
@@ -10671,7 +10555,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "surface" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("surface") }
 						}] }
 					}
 				},
@@ -10686,7 +10570,7 @@ var init_staticRecipes = __esmMin((() => {
 						border: { widthClass: "border" },
 						effects: { hover: [{
 							effectId: "background-on-hover",
-							options: { colorToken: "muted" }
+							options: { colorToken: unsafeAsOpaqueButtonColourToken("muted") }
 						}] }
 					}
 				},
@@ -10703,7 +10587,6 @@ var init_staticRecipes = __esmMin((() => {
 							effectId: "border-bottom-grow",
 							options: {
 								height: 1,
-								colorToken: "accent",
 								origin: "left"
 							}
 						}] }
@@ -11104,7 +10987,7 @@ var init_testimonialQuotePresets = __esmMin((() => {
 * Gradient configuration types and schemas
 */
 var gradientStopSchema, radialGradientShapeSchema, gradientConfigSchema;
-var init_types$11 = __esmMin((() => {
+var init_types$10 = __esmMin((() => {
 	init_themeColorTokens();
 	gradientStopSchema = z$1.object({
 		color: themeColorTokenSchema,
@@ -11364,15 +11247,15 @@ var init_utils$4 = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/gradients/index.ts
 var init_gradients = __esmMin((() => {
-	init_types$11();
+	init_types$10();
 	init_presets$2();
 	init_utils$4();
 }));
 var init_customizableSurfaces = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 })), logoTextConfidenceValues, logoAssetShapeValues, logoKindValues, logoDensityValues, logoContainsTextSchema, logoAnalysisSourceSchema, brandDisplayModeValues, logoAccommodationPatternValues, logoSizePolicyValues;
 var init_logoBranding = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	logoTextConfidenceValues = [
 		"low",
 		"medium",
@@ -11845,7 +11728,7 @@ var init_headerLooks = __esmMin((() => {
 	init_headerCtaVariants();
 	init_customizableSurfaces();
 	init_logoBranding();
-	init_types$15();
+	init_types$14();
 	titleOnlyLogoAccommodation = {
 		pattern: "title-only",
 		supportedShapes: [
@@ -12521,7 +12404,7 @@ function emphasizedFooterLinks(theme) {
 }
 var footerLookCatalog;
 var init_footerLooks = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	footerLookCatalog = defineExactCatalog()([{
 		id: asFooterLookId("footer-links-quiet"),
 		label: "Quiet links",
@@ -12537,7 +12420,7 @@ var init_footerLooks = __esmMin((() => {
 }));
 var init_curatedChoices = __esmMin((() => {})), generatedContentFrames, userContentFrames, generatedDesignOptionCatalog, userDesignOptionCatalog;
 var init_sourceCatalogs = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	generatedContentFrames = [
 		plainFrame,
 		panelFrame("inset"),
@@ -13122,6 +13005,643 @@ var init_media$1 = __esmMin((() => {
 	});
 }));
 //#endregion
+//#region ../theme-core/src/buttons/constants.ts
+/**
+* Generate shadow CSS value dynamically based on elevation, softness, and position
+*
+* This replaces the static shadow maps with a single dynamic function.
+* Benefits: single source of truth, easy to adjust algorithm, no redundancy.
+*
+* @param elevation - Shadow elevation level
+* @param softness - Shadow softness/blur style
+* @param position - Shadow position (bottom or bottom-right diagonal)
+* @returns CSS box-shadow value
+*/
+function generateShadowValue$1(elevation, softness, position = "bottom", color) {
+	if (elevation === "none") return "none";
+	const config = {
+		low: {
+			blur: 4,
+			spread: 0
+		},
+		medium: {
+			blur: 8,
+			spread: -1
+		},
+		high: {
+			blur: 12,
+			spread: -2
+		}
+	}[elevation];
+	const baseOffset = ELEVATION_OFFSET[elevation];
+	const xOffset = position === "bottom-right" ? baseOffset : 0;
+	const yOffset = baseOffset;
+	switch (softness) {
+		case null:
+		case "soft": return `${xOffset}px ${yOffset}px ${config.blur}px ${config.spread}px ${color ?? "rgb(0 0 0 / 0.3)"}`;
+		case "hard": return `${xOffset}px ${yOffset}px 0 0 ${color ?? "rgb(0 0 0 / 1)"}`;
+		case "crisp": return `${xOffset}px ${yOffset}px ${baseOffset}px ${config.spread}px ${color ?? "rgb(0 0 0 / 0.4)"}`;
+	}
+}
+var GRADIENT_DIRECTION_MAP$2, BORDER_RADIUS_MAP, ELEVATION_OFFSET, BORDER_WIDTH_MAP$4, FONT_SIZE_MAP, DEFAULT_BUTTON_SIZES;
+var init_constants$2 = __esmMin((() => {
+	GRADIENT_DIRECTION_MAP$2 = {
+		"to-r": "to right",
+		"to-l": "to left",
+		"to-t": "to top",
+		"to-b": "to bottom",
+		"to-br": "to bottom right",
+		"to-bl": "to bottom left",
+		"to-tr": "to top right",
+		"to-tl": "to top left"
+	};
+	BORDER_RADIUS_MAP = {
+		"rounded-none": "0",
+		"rounded-sm": "0.125rem",
+		"rounded": "0.25rem",
+		"rounded-md": "0.375rem",
+		"rounded-lg": "0.5rem",
+		"rounded-xl": "0.75rem",
+		"rounded-2xl": "1rem",
+		"rounded-3xl": "1.5rem",
+		"rounded-full": "9999px"
+	};
+	ELEVATION_OFFSET = {
+		none: 0,
+		low: 2,
+		medium: 4,
+		high: 6
+	};
+	BORDER_WIDTH_MAP$4 = {
+		"border-0": "0px",
+		"border": "1px",
+		"border-2": "2px",
+		"border-4": "4px",
+		"border-8": "8px"
+	};
+	FONT_SIZE_MAP = {
+		"text-xs": "0.75rem",
+		"text-sm": "0.875rem",
+		"text-base": "1rem",
+		"text-lg": "1.125rem",
+		"text-xl": "1.25rem",
+		"text-2xl": "1.5rem"
+	};
+	DEFAULT_BUTTON_SIZES = {
+		sm: {
+			padding: "0.5rem 1rem",
+			fontSize: "text-sm"
+		},
+		md: { padding: "0.75rem 1.5rem" },
+		lg: {
+			padding: "1rem 2rem",
+			fontSize: "text-lg"
+		},
+		xl: {
+			padding: "1.25rem 2.5rem",
+			fontSize: "text-xl"
+		}
+	};
+}));
+//#endregion
+//#region ../theme-core/src/buttons/effectClassification.ts
+function validateButtonEffectOptions(effect) {
+	const parsed = buttonEffectApplicationSchema.safeParse(effect);
+	if (parsed.success) return { ok: true };
+	const firstIssue = parsed.error.issues[0];
+	const firstPathPart = firstIssue?.path[firstIssue.path.length - 1];
+	return {
+		ok: false,
+		option: (firstIssue?.code === "unrecognized_keys" ? firstIssue.keys[0] : void 0) ?? (typeof firstPathPart === "string" ? firstPathPart : "options")
+	};
+}
+function getButtonEffectPolicy(effectId) {
+	return Object.prototype.hasOwnProperty.call(BUTTON_EFFECT_POLICIES, effectId) ? BUTTON_EFFECT_POLICIES[effectId] : null;
+}
+var BUTTON_EFFECT_POLICIES;
+var init_effectClassification = __esmMin((() => {
+	init_types$11();
+	BUTTON_EFFECT_POLICIES = {
+		"darken-background": {
+			classification: "colour-transition",
+			transition: {
+				kind: "adjust-shade",
+				direction: "darker"
+			}
+		},
+		"lighten-background": {
+			classification: "colour-transition",
+			transition: {
+				kind: "adjust-shade",
+				direction: "lighter"
+			}
+		},
+		"background-on-hover": {
+			classification: "colour-transition",
+			transition: { kind: "replace-background" }
+		},
+		"background-on-hover-alpha": {
+			classification: "unsupported-colour",
+			reason: "alpha_requires_surface"
+		},
+		"fade-background": {
+			classification: "unsupported-colour",
+			reason: "changes_element_opacity"
+		},
+		"opacity-reduce": {
+			classification: "unsupported-colour",
+			reason: "changes_element_opacity"
+		},
+		"gradient-text": {
+			classification: "unsupported-colour",
+			reason: "changes_foreground"
+		},
+		"text-color-change": {
+			classification: "unsupported-colour",
+			reason: "changes_foreground"
+		},
+		"border-color-change": {
+			classification: "unsupported-colour",
+			reason: "changes_border"
+		},
+		"aurora-glow": {
+			classification: "unsupported-background-overlay",
+			reason: "unresolved_background_overlay"
+		},
+		"cosmic-stardust": {
+			classification: "unsupported-background-overlay",
+			reason: "unresolved_background_overlay"
+		},
+		"gradient-border-fill": {
+			classification: "unsupported-background-overlay",
+			reason: "unresolved_background_overlay"
+		},
+		"animated-gradient-border-fill": {
+			classification: "unsupported-background-overlay",
+			reason: "unresolved_background_overlay"
+		},
+		"nav-underline": {
+			classification: "not-button",
+			reason: "not_button_effect"
+		},
+		"nav-frosted-base": {
+			classification: "not-button",
+			reason: "not_button_effect"
+		},
+		"nav-frosted-hover": {
+			classification: "not-button",
+			reason: "not_button_effect"
+		},
+		"nav-frosted-active": {
+			classification: "not-button",
+			reason: "not_button_effect"
+		},
+		"animated-gradient": { classification: "non-colour" },
+		"border-glow": {
+			classification: "unsupported-colour",
+			reason: "changes_shadow_colour"
+		},
+		"drop-shadow": { classification: "decorative-colour" },
+		"inner-shadow": { classification: "decorative-colour" },
+		"neumorphic-shadow": { classification: "decorative-colour" },
+		"outer-glow": {
+			classification: "unsupported-colour",
+			reason: "changes_shadow_colour"
+		},
+		"retro-3d-shadow": { classification: "decorative-colour" },
+		"scale-up": { classification: "non-colour" },
+		"scale-down": { classification: "non-colour" },
+		lift: { classification: "non-colour" },
+		"press-down": { classification: "non-colour" },
+		pop: { classification: "non-colour" },
+		"border-bottom-grow": { classification: "non-colour" },
+		"sketchy-border": { classification: "decorative-colour" },
+		"pulse-animation": {
+			classification: "unsupported-colour",
+			reason: "changes_element_opacity"
+		}
+	};
+}));
+//#endregion
+//#region ../theme-core/src/buttons/resolveButtonColourStates.ts
+function compileButtonColourStates(input) {
+	const baseTransition = applyColourEffects({
+		variantId: input.variant.id,
+		state: "base",
+		treatment: input.variant.background,
+		effects: input.variant.effects?.base,
+		palette: input.palette
+	});
+	if (!baseTransition.ok) return baseTransition;
+	const stateTreatments = {
+		base: baseTransition.treatment,
+		hover: hoverTreatment(input.variant, input.global, baseTransition.treatment),
+		focus: baseTransition.treatment,
+		active: baseTransition.treatment,
+		disabled: baseTransition.treatment
+	};
+	const nonColourEffects = { ...baseTransition.nonColourEffects.length > 0 ? { base: [...baseTransition.nonColourEffects] } : {} };
+	for (const state of [
+		"hover",
+		"focus",
+		"active"
+	]) {
+		const transition = applyColourEffects({
+			variantId: input.variant.id,
+			state,
+			treatment: stateTreatments[state],
+			effects: input.variant.effects?.[state],
+			palette: input.palette
+		});
+		if (!transition.ok) return transition;
+		stateTreatments[state] = transition.treatment;
+		if (transition.nonColourEffects.length > 0) nonColourEffects[state] = [...transition.nonColourEffects];
+	}
+	const resolved = {};
+	for (const state of BUTTON_VISUAL_STATES) {
+		const result = resolveTreatment$1({
+			variantId: input.variant.id,
+			state,
+			treatment: stateTreatments[state],
+			palette: input.palette
+		});
+		if (!result.ok) return result;
+		resolved[state] = result.colour;
+	}
+	return {
+		ok: true,
+		states: resolved,
+		focusIndicator: resolveFocusIndicator(resolved.focus),
+		nonColourEffects
+	};
+}
+function formatButtonColourContractError(error) {
+	switch (error.tag) {
+		case "unknown_palette_token": return `Button "${error.variantId}" ${error.state} state uses unknown palette token "${error.token}".`;
+		case "missing_on_colour": return `Button "${error.variantId}" ${error.state} state cannot derive ${error.foregroundToken} from ${error.backgroundToken}.`;
+		case "insufficient_contrast": return `Button "${error.variantId}" ${error.state} state has ${error.ratio.toFixed(2)}:1 contrast (${error.requiredRatio}:1 required).`;
+		case "unsupported_colour_effect": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" is not contrast-safe (${error.reason}).`;
+		case "invalid_colour_effect_options": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" has an invalid ${error.option} option.`;
+		case "inapplicable_colour_effect": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" cannot apply to a ${error.treatment} treatment.`;
+		case "unknown_button_effect": return `Button "${error.variantId}" ${error.state} uses unknown effect "${error.effectId}".`;
+	}
+}
+function hoverTreatment(variant, global, fallback) {
+	const token = variant.hoverBackgroundToken ?? (global.hoverColor === "token" ? global.hoverColorToken : void 0);
+	return token === void 0 ? fallback : {
+		type: "solid",
+		colorToken: token
+	};
+}
+function applyColourEffects(input) {
+	let treatment = input.treatment;
+	const nonColourEffects = [];
+	for (const effect of input.effects ?? []) {
+		const policy = getButtonEffectPolicy(effect.effectId);
+		if (policy === null) return unknownEffect(input, effect);
+		if (policy.classification === "unsupported-colour" || policy.classification === "unsupported-background-overlay" || policy.classification === "not-button") return unsupportedEffect(input, effect, policy.reason);
+		const options = validateButtonEffectOptions(effect);
+		if (!options.ok) return invalidEffectOption(input, effect, options.option);
+		switch (policy.classification) {
+			case "non-colour":
+			case "decorative-colour":
+				nonColourEffects.push(effect);
+				break;
+			case "colour-transition":
+				if (policy.transition.kind === "adjust-shade") {
+					if (effect.effectId !== "darken-background" && effect.effectId !== "lighten-background") return unknownEffect(input, effect);
+					if (treatment.type !== "solid") return inapplicableEffect(input, effect, treatment);
+					const amount = readShadeAmount(effect);
+					if (amount === null) return invalidEffectOption(input, effect, "amount");
+					const signedAmount = policy.transition.direction === "darker" ? amount : -amount;
+					treatment = {
+						type: "solid",
+						colorToken: adjustShade(treatment.colorToken, signedAmount, input.palette)
+					};
+					break;
+				}
+				if (policy.transition.kind === "replace-background") {
+					if (effect.effectId !== "background-on-hover") return unknownEffect(input, effect);
+					const colorToken = readOpaqueToken(effect);
+					if (colorToken === null) return invalidEffectOption(input, effect, "colorToken");
+					treatment = {
+						type: "solid",
+						colorToken
+					};
+					break;
+				}
+				return unknownEffect(input, effect);
+		}
+	}
+	return {
+		ok: true,
+		treatment,
+		nonColourEffects
+	};
+}
+function resolveTreatment$1(input) {
+	const treatment = input.treatment;
+	switch (treatment.type) {
+		case "surface": return {
+			ok: true,
+			colour: {
+				kind: "surface",
+				role: treatment.role,
+				backgroundCss: "transparent",
+				foregroundCss: surfaceForegroundValue(treatment.role)
+			}
+		};
+		case "solid": return resolveSolid(input, treatment.colorToken);
+		case "gradient": return resolveGradient$2(input, treatment);
+	}
+}
+function resolveFocusIndicator(colour) {
+	switch (colour.kind) {
+		case "solid": return {
+			kind: "two-tone",
+			innerCss: colour.foregroundCss,
+			outerCss: colour.backgroundCss,
+			minimumPairContrast: BUTTON_CONTRAST_POLICY.textMinimumRatio
+		};
+		case "gradient": return {
+			kind: "two-tone",
+			innerCss: colour.foregroundCss,
+			outerCss: tokenCss(colour.backgroundTokens[0]),
+			minimumPairContrast: BUTTON_CONTRAST_POLICY.textMinimumRatio
+		};
+		case "surface": return {
+			kind: "surface-role",
+			colorCss: colour.foregroundCss,
+			minimumSurfaceContrast: BUTTON_CONTRAST_POLICY.nonTextMinimumRatio
+		};
+	}
+}
+function resolveSolid(input, backgroundToken) {
+	const backgroundHex = paletteHex(input, backgroundToken);
+	if (!backgroundHex.ok) return backgroundHex;
+	const foregroundToken = unsafeAsOpaqueButtonColourToken(onColorTokenName(backgroundToken));
+	const foregroundHex = input.palette[foregroundToken];
+	if (typeof foregroundHex !== "string") return {
+		ok: false,
+		error: {
+			tag: "missing_on_colour",
+			variantId: input.variantId,
+			state: input.state,
+			backgroundToken,
+			foregroundToken
+		}
+	};
+	const contrast = validateContrast({
+		...input,
+		background: backgroundToken,
+		backgroundHex: backgroundHex.hex,
+		foreground: foregroundToken,
+		foregroundHex
+	});
+	if (!contrast.ok) return contrast;
+	return {
+		ok: true,
+		colour: {
+			kind: "solid",
+			backgroundToken,
+			foregroundToken,
+			backgroundCss: tokenCss(backgroundToken),
+			foregroundCss: tokenCss(foregroundToken)
+		}
+	};
+}
+function resolveGradient$2(input, treatment) {
+	const foregroundHex = paletteHex(input, treatment.foregroundToken);
+	if (!foregroundHex.ok) return foregroundHex;
+	const stopHexes = [];
+	for (const token of treatment.stops) {
+		const stop = paletteHex(input, token);
+		if (!stop.ok) return stop;
+		stopHexes.push(stop.hex);
+	}
+	for (let segment = 0; segment < stopHexes.length - 1; segment += 1) {
+		const start = stopHexes[segment];
+		const end = stopHexes[segment + 1];
+		const startToken = treatment.stops[segment];
+		const endToken = treatment.stops[segment + 1];
+		if (start === void 0 || end === void 0 || startToken === void 0 || endToken === void 0) continue;
+		for (let sample = 0; sample <= BUTTON_CONTRAST_POLICY.gradientSamplesPerSegment; sample += 1) {
+			const position = sample / BUTTON_CONTRAST_POLICY.gradientSamplesPerSegment;
+			const sampleHex = interpolateHex(start, end, position);
+			const contrast = validateContrast({
+				...input,
+				background: `${startToken}→${endToken}@${position.toFixed(2)}`,
+				backgroundHex: sampleHex,
+				foreground: treatment.foregroundToken,
+				foregroundHex: foregroundHex.hex
+			});
+			if (!contrast.ok) return contrast;
+		}
+	}
+	const direction = GRADIENT_DIRECTION_MAP$2[treatment.direction] ?? "to right";
+	return {
+		ok: true,
+		colour: {
+			kind: "gradient",
+			backgroundTokens: treatment.stops,
+			foregroundToken: treatment.foregroundToken,
+			backgroundCss: `linear-gradient(${direction}, ${treatment.stops.map(tokenCss).join(", ")})`,
+			foregroundCss: tokenCss(treatment.foregroundToken)
+		}
+	};
+}
+function paletteHex(input, token) {
+	const hex = input.palette[token];
+	return typeof hex === "string" ? {
+		ok: true,
+		hex
+	} : {
+		ok: false,
+		error: {
+			tag: "unknown_palette_token",
+			variantId: input.variantId,
+			state: input.state,
+			token
+		}
+	};
+}
+function validateContrast(input) {
+	const ratio = contrastRatio(input.backgroundHex, input.foregroundHex);
+	return ratio >= BUTTON_CONTRAST_POLICY.textMinimumRatio ? { ok: true } : {
+		ok: false,
+		error: {
+			tag: "insufficient_contrast",
+			variantId: input.variantId,
+			state: input.state,
+			background: input.background,
+			foreground: input.foreground,
+			ratio,
+			requiredRatio: BUTTON_CONTRAST_POLICY.textMinimumRatio
+		}
+	};
+}
+function tokenCss(token) {
+	return `rgb(var(--tb-${token}))`;
+}
+function adjustShade(token, amount, palette) {
+	const match = token.match(/^(.*)-(\d{2,3})$/);
+	const base = match?.[1] ?? token;
+	const currentShade = match?.[2] === void 0 ? 500 : Number(match[2]);
+	const availableShades = [
+		50,
+		100,
+		200,
+		300,
+		400,
+		500,
+		600,
+		700,
+		800,
+		900,
+		950
+	].filter((shade) => typeof palette[`${base}-${shade}`] === "string");
+	if (availableShades.length === 0) return token;
+	const firstShade = availableShades[0];
+	if (firstShade === void 0) return token;
+	const exactIndex = availableShades.indexOf(currentShade);
+	const startingIndex = exactIndex >= 0 ? exactIndex : availableShades.indexOf(availableShades.reduce((closestShade, shade) => Math.abs(shade - currentShade) < Math.abs(closestShade - currentShade) ? shade : closestShade, firstShade));
+	const stepCount = Math.abs(amount) / 100;
+	const direction = amount < 0 ? -1 : 1;
+	const targetShade = availableShades[Math.max(0, Math.min(availableShades.length - 1, startingIndex + direction * stepCount))];
+	return targetShade === void 0 ? token : unsafeAsOpaqueButtonColourToken(`${base}-${targetShade}`);
+}
+function readShadeAmount(effect) {
+	const value = effect.options?.amount ?? 100;
+	return typeof value === "number" && Number.isFinite(value) && value >= 0 && value % 100 === 0 ? value : null;
+}
+function readOpaqueToken(effect) {
+	return parseOpaqueButtonColourToken(effect.options?.colorToken ?? "neutral-800");
+}
+function unsupportedEffect(input, effect, reason) {
+	return {
+		ok: false,
+		error: {
+			tag: "unsupported_colour_effect",
+			variantId: input.variantId,
+			state: input.state,
+			effectId: effect.effectId,
+			reason
+		}
+	};
+}
+function invalidEffectOption(input, effect, option) {
+	return {
+		ok: false,
+		error: {
+			tag: "invalid_colour_effect_options",
+			variantId: input.variantId,
+			state: input.state,
+			effectId: effect.effectId,
+			option
+		}
+	};
+}
+function inapplicableEffect(input, effect, treatment) {
+	return {
+		ok: false,
+		error: {
+			tag: "inapplicable_colour_effect",
+			variantId: input.variantId,
+			state: input.state,
+			effectId: effect.effectId,
+			treatment: treatment.type
+		}
+	};
+}
+function unknownEffect(input, effect) {
+	return {
+		ok: false,
+		error: {
+			tag: "unknown_button_effect",
+			variantId: input.variantId,
+			state: input.state,
+			effectId: effect.effectId
+		}
+	};
+}
+function interpolateHex(startHex, endHex, position) {
+	const start = hexToRgb$1(startHex);
+	const end = hexToRgb$1(endHex);
+	const channel = (from, to) => Math.round(from + (to - from) * position).toString(16).padStart(2, "0");
+	return `#${channel(start.r, end.r)}${channel(start.g, end.g)}${channel(start.b, end.b)}`;
+}
+var BUTTON_VISUAL_STATES, BUTTON_CONTRAST_POLICY;
+var init_resolveButtonColourStates = __esmMin((() => {
+	init_contrast$1();
+	init_colorConversion();
+	init_onColor();
+	init_foregroundContract();
+	init_types$11();
+	init_constants$2();
+	init_effectClassification();
+	BUTTON_VISUAL_STATES = [
+		"base",
+		"hover",
+		"focus",
+		"active",
+		"disabled"
+	];
+	BUTTON_CONTRAST_POLICY = {
+		textMinimumRatio: 4.5,
+		nonTextMinimumRatio: 3,
+		gradientSamplesPerSegment: 20,
+		alphaBackgrounds: "reject-without-known-surface",
+		disabled: "retain-full-colour-contract"
+	};
+}));
+//#endregion
+//#region ../theme-core/src/buttons/parseThemeForPersistence.ts
+/**
+* Proves that every persisted button variant compiles against the theme's
+* concrete palette. Public rendering may still recover from malformed
+* external/runtime input, but persistence boundaries must reject it.
+*/
+function parseThemeForPersistence(value) {
+	const parsed = themeSchema.safeParse(value);
+	if (!parsed.success) return {
+		ok: false,
+		error: {
+			kind: "invalid-theme-schema",
+			issues: parsed.error.issues
+		}
+	};
+	const theme = parsed.data;
+	if (!theme.buttons) return {
+		ok: true,
+		value: theme
+	};
+	const palette = expandPalette(theme.palette);
+	for (const variant of theme.buttons.variants) {
+		const result = compileButtonColourStates({
+			variant,
+			global: theme.buttons.global,
+			palette
+		});
+		if (!result.ok) return {
+			ok: false,
+			error: {
+				kind: "invalid-button-colour-contract",
+				variantId: variant.id,
+				cause: result.error
+			}
+		};
+	}
+	return {
+		ok: true,
+		value: theme
+	};
+}
+var init_parseThemeForPersistence = __esmMin((() => {
+	init_schema$1();
+	init_expandPalette();
+	init_resolveButtonColourStates();
+}));
+//#endregion
 //#region ../theme-core/src/buttons/classNames.ts
 /**
 * Parse content/runtime variant identifiers into the closed theme-button class
@@ -13131,6 +13651,7 @@ var init_media$1 = __esmMin((() => {
 function parseThemeButtonVariantId(value) {
 	const normalized = value?.trim() ?? "";
 	if (normalized.length === 0) return null;
+	if (!buttonVariantIdSchema.safeParse(normalized).success) return null;
 	if (normalized === "default") return DEFAULT_VARIANT_ALIAS_ID;
 	return isVariantRole(normalized) ? normalized : asSpecialVariantId(normalized);
 }
@@ -13154,7 +13675,7 @@ function themeButtonClassName(spec) {
 	].filter(Boolean).join(" ");
 }
 var init_classNames = __esmMin((() => {
-	init_types$12();
+	init_types$11();
 }));
 //#endregion
 //#region ../theme-core/src/interactive/generateBaseCSS.ts
@@ -13225,9 +13746,21 @@ var init_background$2 = __esmMin((() => {
 		applicableTo: ["button"],
 		customizableOption: {
 			name: "amount",
-			type: "number",
+			type: "select",
 			label: "Darken Amount (shade step)",
-			default: 100
+			default: 100,
+			options: [
+				0,
+				100,
+				200,
+				300,
+				400,
+				500,
+				600,
+				700,
+				800,
+				900
+			]
 		},
 		isApplicable: (buttonConfig) => {
 			return buttonConfig.background.type === "solid";
@@ -13254,9 +13787,21 @@ var init_background$2 = __esmMin((() => {
 		applicableTo: ["button"],
 		customizableOption: {
 			name: "amount",
-			type: "number",
+			type: "select",
 			label: "Lighten Amount (shade step)",
-			default: 100
+			default: 100,
+			options: [
+				0,
+				100,
+				200,
+				300,
+				400,
+				500,
+				600,
+				700,
+				800,
+				900
+			]
 		},
 		isApplicable: (buttonConfig) => {
 			return buttonConfig.background.type === "solid";
@@ -13280,7 +13825,7 @@ var init_background$2 = __esmMin((() => {
 		description: "Reduces background opacity on hover",
 		category: "background",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "opacity",
 			type: "percentage",
@@ -13299,10 +13844,10 @@ var init_background$2 = __esmMin((() => {
 	opacityReduceEffect = {
 		id: "opacity-reduce",
 		name: "Reduce Opacity",
-		description: "Reduces button opacity on hover by a percentage",
+		description: "Reduces navigation-link opacity on hover by a percentage",
 		category: "background",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "reduction",
 			type: "percentage",
@@ -13390,7 +13935,7 @@ var init_background$2 = __esmMin((() => {
 		description: "Adds semi-transparent background on hover",
 		category: "background",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "opacity",
 			type: "percentage",
@@ -13464,7 +14009,7 @@ var init_shadow = __esmMin((() => {
 		description: "Adds a glowing shadow on hover",
 		category: "shadow",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "glowColorToken",
 			type: "colorToken",
@@ -13563,10 +14108,10 @@ var init_shadow = __esmMin((() => {
 	outerGlowEffect = {
 		id: "outer-glow",
 		name: "Outer Glow",
-		description: "Creates an outer glow around the button",
+		description: "Creates an outer glow around a navigation link",
 		category: "shadow",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "spread",
 			type: "number",
@@ -13622,105 +14167,6 @@ var init_shadow = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../theme-core/src/buttons/constants.ts
-/**
-* Generate shadow CSS value dynamically based on elevation, softness, and position
-*
-* This replaces the static shadow maps with a single dynamic function.
-* Benefits: single source of truth, easy to adjust algorithm, no redundancy.
-*
-* @param elevation - Shadow elevation level
-* @param softness - Shadow softness/blur style
-* @param position - Shadow position (bottom or bottom-right diagonal)
-* @returns CSS box-shadow value
-*/
-function generateShadowValue$1(elevation, softness, position = "bottom", color) {
-	if (elevation === "none") return "none";
-	const config = {
-		low: {
-			blur: 4,
-			spread: 0
-		},
-		medium: {
-			blur: 8,
-			spread: -1
-		},
-		high: {
-			blur: 12,
-			spread: -2
-		}
-	}[elevation];
-	const baseOffset = ELEVATION_OFFSET[elevation];
-	const xOffset = position === "bottom-right" ? baseOffset : 0;
-	const yOffset = baseOffset;
-	switch (softness) {
-		case null:
-		case "soft": return `${xOffset}px ${yOffset}px ${config.blur}px ${config.spread}px ${color ?? "rgb(0 0 0 / 0.3)"}`;
-		case "hard": return `${xOffset}px ${yOffset}px 0 0 ${color ?? "rgb(0 0 0 / 1)"}`;
-		case "crisp": return `${xOffset}px ${yOffset}px ${baseOffset}px ${config.spread}px ${color ?? "rgb(0 0 0 / 0.4)"}`;
-	}
-}
-var GRADIENT_DIRECTION_MAP$2, BORDER_RADIUS_MAP, ELEVATION_OFFSET, BORDER_WIDTH_MAP$4, FONT_SIZE_MAP, DEFAULT_BUTTON_SIZES;
-var init_constants$2 = __esmMin((() => {
-	GRADIENT_DIRECTION_MAP$2 = {
-		"to-r": "to right",
-		"to-l": "to left",
-		"to-t": "to top",
-		"to-b": "to bottom",
-		"to-br": "to bottom right",
-		"to-bl": "to bottom left",
-		"to-tr": "to top right",
-		"to-tl": "to top left"
-	};
-	BORDER_RADIUS_MAP = {
-		"rounded-none": "0",
-		"rounded-sm": "0.125rem",
-		"rounded": "0.25rem",
-		"rounded-md": "0.375rem",
-		"rounded-lg": "0.5rem",
-		"rounded-xl": "0.75rem",
-		"rounded-2xl": "1rem",
-		"rounded-3xl": "1.5rem",
-		"rounded-full": "9999px"
-	};
-	ELEVATION_OFFSET = {
-		none: 0,
-		low: 2,
-		medium: 4,
-		high: 6
-	};
-	BORDER_WIDTH_MAP$4 = {
-		"border-0": "0px",
-		"border": "1px",
-		"border-2": "2px",
-		"border-4": "4px",
-		"border-8": "8px"
-	};
-	FONT_SIZE_MAP = {
-		"text-xs": "0.75rem",
-		"text-sm": "0.875rem",
-		"text-base": "1rem",
-		"text-lg": "1.125rem",
-		"text-xl": "1.25rem",
-		"text-2xl": "1.5rem"
-	};
-	DEFAULT_BUTTON_SIZES = {
-		sm: {
-			padding: "0.5rem 1rem",
-			fontSize: "text-sm"
-		},
-		md: { padding: "0.75rem 1.5rem" },
-		lg: {
-			padding: "1rem 2rem",
-			fontSize: "text-lg"
-		},
-		xl: {
-			padding: "1.25rem 2.5rem",
-			fontSize: "text-xl"
-		}
-	};
-}));
-//#endregion
 //#region ../theme-core/src/buttons/effects/presets/transform.ts
 var scaleUpEffect, scaleDownEffect, liftEffect, pressDownEffect, popEffect;
 var init_transform = __esmMin((() => {
@@ -13740,6 +14186,7 @@ var init_transform = __esmMin((() => {
 			default: "1.05",
 			options: [
 				"1.02",
+				"1.03",
 				"1.05",
 				"1.10"
 			]
@@ -13864,7 +14311,7 @@ var init_overlay = __esmMin((() => {
 		description: "Blurred gradient glow that appears on hover",
 		category: "overlay",
 		pseudoElement: "before",
-		applicableTo: ["button"],
+		applicableTo: [],
 		customizableOption: {
 			name: "intensity",
 			type: "percentage",
@@ -13922,7 +14369,7 @@ var init_overlay = __esmMin((() => {
 		description: "Rotating rainbow gradient glow (always visible, intensifies on hover)",
 		category: "overlay",
 		pseudoElement: "before",
-		applicableTo: ["button"],
+		applicableTo: [],
 		customizableOption: {
 			name: "speed",
 			type: "select",
@@ -13989,7 +14436,7 @@ var init_overlay = __esmMin((() => {
 		description: "Gradient border that fills on hover using ::before pseudo-element",
 		category: "overlay",
 		pseudoElement: "before",
-		applicableTo: ["button"],
+		applicableTo: [],
 		customizableOption: {
 			name: "borderWidth",
 			type: "number",
@@ -14038,7 +14485,7 @@ var init_overlay = __esmMin((() => {
 		description: "Rotating gradient border that fills on hover",
 		category: "overlay",
 		pseudoElement: "before",
-		applicableTo: ["button"],
+		applicableTo: [],
 		customizableOption: {
 			name: "speed",
 			type: "select",
@@ -14112,15 +14559,13 @@ var init_overlay = __esmMin((() => {
 		applicableTo: ["button", "nav-link"],
 		customizableOption: {
 			name: "height",
-			type: "number",
+			type: "select",
 			label: "Border Height (px)",
-			default: 1
+			default: 1,
+			options: [1, 2]
 		},
 		generateCSS: (ctx) => {
-			const { themeId, variantId, options, tokens } = ctx;
-			const height = options.height || 1;
-			const colorToken = options.colorToken || "neutral-400";
-			const origin = options.origin || "left";
+			const { themeId, variantId, options } = ctx;
 			return `
       /* Setup button for pseudo-element */
       :where([data-theme-scope="${themeId}"]) .${variantId} {
@@ -14134,10 +14579,10 @@ var init_overlay = __esmMin((() => {
         bottom: 0;
         left: 0;
         width: 100%;
-        height: ${height}px;
-        background: ${tokens.getColor(colorToken)};
+        height: ${options.height || 1}px;
+        background: currentColor;
         transform: scaleX(0);
-        transform-origin: ${origin};
+        transform-origin: ${options.origin || "left"};
         transition: transform 300ms ease-in-out;
       }
 
@@ -14159,7 +14604,7 @@ var init_text = __esmMin((() => {
 		description: "Gradient text using background-clip",
 		category: "text",
 		pseudoElement: "none",
-		applicableTo: ["button"],
+		applicableTo: [],
 		customizableOption: {
 			name: "solidOnHover",
 			type: "select",
@@ -14202,7 +14647,7 @@ var init_text = __esmMin((() => {
 		description: "Changes text color on hover",
 		category: "text",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "hoverColorToken",
 			type: "select",
@@ -14238,7 +14683,7 @@ var init_border = __esmMin((() => {
 		description: "Changes border color on hover",
 		category: "border",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "hoverColorToken",
 			type: "select",
@@ -14292,8 +14737,7 @@ var init_border = __esmMin((() => {
 				medium: "rotate(-1deg)",
 				strong: "rotate(-1.5deg)"
 			}[intensity]};
-        filter: contrast(0.95) brightness(1.02);
-        transition: transform 0.2s ease, filter 0.2s ease;
+        transition: transform 0.2s ease;
       }
 
       :where([data-theme-scope="${themeId}"]) .${variantId}:hover {
@@ -14302,7 +14746,6 @@ var init_border = __esmMin((() => {
 				medium: "rotate(1deg)",
 				strong: "rotate(1.5deg)"
 			}[intensity]} scale(1.02);
-        filter: contrast(1) brightness(1);
       }
 
       :where([data-theme-scope="${themeId}"]) .${variantId}:active {
@@ -14322,7 +14765,7 @@ var init_animation = __esmMin((() => {
 		description: "Continuous pulse animation (opacity fade)",
 		category: "animation",
 		pseudoElement: "none",
-		applicableTo: ["button", "nav-link"],
+		applicableTo: ["nav-link"],
 		customizableOption: {
 			name: "speed",
 			type: "select",
@@ -14518,6 +14961,7 @@ var init_registry$1 = __esmMin((() => {
 	init_border();
 	init_animation();
 	init_effects();
+	init_effectClassification();
 	EFFECT_PRESETS = [
 		darkenBackgroundEffect,
 		lightenBackgroundEffect,
@@ -14619,11 +15063,11 @@ function narrowCornerStyle(corners) {
 /**
 * Generate default button system from theme settings.
 *
-* Creates 4 sized variants when theme.buttons is not defined:
-* 1. Primary - primary color background with opacity-reduce hover effect
-* 2. Secondary - neutral-700 background with opacity-reduce hover effect
-* 3. Outline - transparent background with primary border and opacity-reduce hover effect
-* 4. Ghost - transparent background, no border, with opacity-reduce hover effect
+* Creates 4 sized canonical variants when theme.buttons is not defined:
+* 1. Primary - solid primary treatment
+* 2. Secondary - solid neutral treatment
+* 3. Outline - surface treatment with a border
+* 4. Ghost - surface treatment without a border
 *
 * All four are sized variants — they inherit padding/fontSize from the theme's
 * `sizes` config (or the system defaults) so they're consistent at any size.
@@ -14700,7 +15144,6 @@ function generateDefaultButtonSystem(theme) {
 			cornerStyle: narrowCornerStyle(theme.corners),
 			textTransform: "none",
 			fontWeight: 500,
-			borderWidth: theme.border.width === "none" ? 1 : theme.border.width === "thick" ? 3 : 2,
 			hoverTransform: "none",
 			hoverColor: "none"
 		},
@@ -14709,7 +15152,7 @@ function generateDefaultButtonSystem(theme) {
 }
 var BORDER_WIDTH_TO_CLASS_MAP, VALID_CORNER_STYLES;
 var init_generateDefaultButtonSystem = __esmMin((() => {
-	init_types$12();
+	init_types$11();
 	BORDER_WIDTH_TO_CLASS_MAP = {
 		none: "border-0",
 		hairline: "border",
@@ -14745,375 +15188,6 @@ var init_affordanceIcons = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../theme-core/src/buttons/resolveButtonColourStates.ts
-function compileButtonColourStates(input) {
-	const baseTransition = applyColourEffects({
-		variantId: input.variant.id,
-		state: "base",
-		treatment: input.variant.background,
-		effects: input.variant.effects?.base,
-		palette: input.palette
-	});
-	if (!baseTransition.ok) return baseTransition;
-	const stateTreatments = {
-		base: baseTransition.treatment,
-		hover: hoverTreatment(input.variant, input.global, baseTransition.treatment),
-		focus: baseTransition.treatment,
-		active: baseTransition.treatment,
-		disabled: baseTransition.treatment
-	};
-	const nonColourEffects = { ...baseTransition.nonColourEffects.length > 0 ? { base: [...baseTransition.nonColourEffects] } : {} };
-	for (const state of [
-		"hover",
-		"focus",
-		"active"
-	]) {
-		const transition = applyColourEffects({
-			variantId: input.variant.id,
-			state,
-			treatment: stateTreatments[state],
-			effects: input.variant.effects?.[state],
-			palette: input.palette
-		});
-		if (!transition.ok) return transition;
-		stateTreatments[state] = transition.treatment;
-		if (transition.nonColourEffects.length > 0) nonColourEffects[state] = [...transition.nonColourEffects];
-	}
-	const resolved = {};
-	for (const state of BUTTON_VISUAL_STATES) {
-		const result = resolveTreatment$1({
-			variantId: input.variant.id,
-			state,
-			treatment: stateTreatments[state],
-			palette: input.palette
-		});
-		if (!result.ok) return result;
-		resolved[state] = result.colour;
-	}
-	return {
-		ok: true,
-		states: resolved,
-		focusIndicator: resolveFocusIndicator(resolved.focus),
-		nonColourEffects
-	};
-}
-function formatButtonColourContractError(error) {
-	switch (error.tag) {
-		case "unknown_palette_token": return `Button "${error.variantId}" ${error.state} state uses unknown palette token "${error.token}".`;
-		case "missing_on_colour": return `Button "${error.variantId}" ${error.state} state cannot derive ${error.foregroundToken} from ${error.backgroundToken}.`;
-		case "insufficient_contrast": return `Button "${error.variantId}" ${error.state} state has ${error.ratio.toFixed(2)}:1 contrast (${error.requiredRatio}:1 required).`;
-		case "unsupported_colour_effect": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" is not contrast-safe (${error.reason}).`;
-		case "invalid_colour_effect_options": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" has an invalid ${error.option} option.`;
-		case "inapplicable_colour_effect": return `Button "${error.variantId}" ${error.state} effect "${error.effectId}" cannot apply to a ${error.treatment} treatment.`;
-		case "unknown_button_effect": return `Button "${error.variantId}" ${error.state} uses unknown effect "${error.effectId}".`;
-	}
-}
-function hoverTreatment(variant, global, fallback) {
-	const token = variant.hoverBackgroundToken ?? (global.hoverColor === "token" ? global.hoverColorToken : void 0);
-	return token === void 0 ? fallback : {
-		type: "solid",
-		colorToken: token
-	};
-}
-function applyColourEffects(input) {
-	let treatment = input.treatment;
-	const nonColourEffects = [];
-	for (const effect of input.effects ?? []) {
-		const policy = getButtonEffectPolicy(effect.effectId);
-		if (policy === null) return unknownEffect(input, effect);
-		switch (policy.classification) {
-			case "non-colour":
-				nonColourEffects.push(effect);
-				break;
-			case "unsupported-colour":
-			case "unsupported-background-overlay":
-			case "not-button": return unsupportedEffect(input, effect, policy.reason);
-			case "colour-transition":
-				if (policy.transition.kind === "adjust-shade") {
-					if (treatment.type !== "solid") return inapplicableEffect(input, effect, treatment);
-					const amount = readShadeAmount(effect);
-					if (amount === null) return invalidEffectOption(input, effect, "amount");
-					const signedAmount = policy.transition.direction === "darker" ? amount : -amount;
-					treatment = {
-						type: "solid",
-						colorToken: adjustShade(treatment.colorToken, signedAmount, input.palette)
-					};
-					break;
-				}
-				if (policy.transition.kind === "replace-background") {
-					const colorToken = readOpaqueToken(effect, "colorToken", "neutral-800");
-					if (colorToken === null) return invalidEffectOption(input, effect, "colorToken");
-					treatment = {
-						type: "solid",
-						colorToken
-					};
-					break;
-				}
-				return unknownEffect(input, effect);
-		}
-	}
-	return {
-		ok: true,
-		treatment,
-		nonColourEffects
-	};
-}
-function resolveTreatment$1(input) {
-	const treatment = input.treatment;
-	switch (treatment.type) {
-		case "surface": return {
-			ok: true,
-			colour: {
-				kind: "surface",
-				role: treatment.role,
-				backgroundCss: "transparent",
-				foregroundCss: surfaceForegroundValue(treatment.role)
-			}
-		};
-		case "solid": return resolveSolid(input, treatment.colorToken);
-		case "gradient": return resolveGradient$2(input, treatment);
-	}
-}
-function resolveFocusIndicator(colour) {
-	switch (colour.kind) {
-		case "solid": return {
-			kind: "two-tone",
-			innerCss: colour.foregroundCss,
-			outerCss: colour.backgroundCss,
-			minimumPairContrast: BUTTON_CONTRAST_POLICY.textMinimumRatio
-		};
-		case "gradient": return {
-			kind: "two-tone",
-			innerCss: colour.foregroundCss,
-			outerCss: tokenCss(colour.backgroundTokens[0]),
-			minimumPairContrast: BUTTON_CONTRAST_POLICY.textMinimumRatio
-		};
-		case "surface": return {
-			kind: "surface-role",
-			colorCss: colour.foregroundCss,
-			minimumSurfaceContrast: BUTTON_CONTRAST_POLICY.nonTextMinimumRatio
-		};
-	}
-}
-function resolveSolid(input, backgroundToken) {
-	const backgroundHex = paletteHex(input, backgroundToken);
-	if (!backgroundHex.ok) return backgroundHex;
-	const foregroundToken = unsafeAsOpaqueButtonColourToken(onColorTokenName(backgroundToken));
-	const foregroundHex = input.palette[foregroundToken];
-	if (typeof foregroundHex !== "string") return {
-		ok: false,
-		error: {
-			tag: "missing_on_colour",
-			variantId: input.variantId,
-			state: input.state,
-			backgroundToken,
-			foregroundToken
-		}
-	};
-	const contrast = validateContrast({
-		...input,
-		background: backgroundToken,
-		backgroundHex: backgroundHex.hex,
-		foreground: foregroundToken,
-		foregroundHex
-	});
-	if (!contrast.ok) return contrast;
-	return {
-		ok: true,
-		colour: {
-			kind: "solid",
-			backgroundToken,
-			foregroundToken,
-			backgroundCss: tokenCss(backgroundToken),
-			foregroundCss: tokenCss(foregroundToken)
-		}
-	};
-}
-function resolveGradient$2(input, treatment) {
-	const foregroundHex = paletteHex(input, treatment.foregroundToken);
-	if (!foregroundHex.ok) return foregroundHex;
-	const stopHexes = [];
-	for (const token of treatment.stops) {
-		const stop = paletteHex(input, token);
-		if (!stop.ok) return stop;
-		stopHexes.push(stop.hex);
-	}
-	for (let segment = 0; segment < stopHexes.length - 1; segment += 1) {
-		const start = stopHexes[segment];
-		const end = stopHexes[segment + 1];
-		const startToken = treatment.stops[segment];
-		const endToken = treatment.stops[segment + 1];
-		if (start === void 0 || end === void 0 || startToken === void 0 || endToken === void 0) continue;
-		for (let sample = 0; sample <= BUTTON_CONTRAST_POLICY.gradientSamplesPerSegment; sample += 1) {
-			const position = sample / BUTTON_CONTRAST_POLICY.gradientSamplesPerSegment;
-			const sampleHex = interpolateHex(start, end, position);
-			const contrast = validateContrast({
-				...input,
-				background: `${startToken}→${endToken}@${position.toFixed(2)}`,
-				backgroundHex: sampleHex,
-				foreground: treatment.foregroundToken,
-				foregroundHex: foregroundHex.hex
-			});
-			if (!contrast.ok) return contrast;
-		}
-	}
-	const direction = GRADIENT_DIRECTION_MAP$2[treatment.direction] ?? "to right";
-	return {
-		ok: true,
-		colour: {
-			kind: "gradient",
-			backgroundTokens: treatment.stops,
-			foregroundToken: treatment.foregroundToken,
-			backgroundCss: `linear-gradient(${direction}, ${treatment.stops.map(tokenCss).join(", ")})`,
-			foregroundCss: tokenCss(treatment.foregroundToken)
-		}
-	};
-}
-function paletteHex(input, token) {
-	const hex = input.palette[token];
-	return typeof hex === "string" ? {
-		ok: true,
-		hex
-	} : {
-		ok: false,
-		error: {
-			tag: "unknown_palette_token",
-			variantId: input.variantId,
-			state: input.state,
-			token
-		}
-	};
-}
-function validateContrast(input) {
-	const ratio = contrastRatio(input.backgroundHex, input.foregroundHex);
-	return ratio >= BUTTON_CONTRAST_POLICY.textMinimumRatio ? { ok: true } : {
-		ok: false,
-		error: {
-			tag: "insufficient_contrast",
-			variantId: input.variantId,
-			state: input.state,
-			background: input.background,
-			foreground: input.foreground,
-			ratio,
-			requiredRatio: BUTTON_CONTRAST_POLICY.textMinimumRatio
-		}
-	};
-}
-function tokenCss(token) {
-	return `rgb(var(--tb-${token}))`;
-}
-function adjustShade(token, amount, palette) {
-	const match = token.match(/^(.*)-(\d{2,3})$/);
-	const base = match?.[1] ?? token;
-	const currentShade = match?.[2] === void 0 ? 500 : Number(match[2]);
-	const availableShades = [
-		50,
-		100,
-		200,
-		300,
-		400,
-		500,
-		600,
-		700,
-		800,
-		900,
-		950
-	].filter((shade) => typeof palette[`${base}-${shade}`] === "string");
-	if (availableShades.length === 0) return token;
-	const firstShade = availableShades[0];
-	if (firstShade === void 0) return token;
-	const exactIndex = availableShades.indexOf(currentShade);
-	const startingIndex = exactIndex >= 0 ? exactIndex : availableShades.indexOf(availableShades.reduce((closestShade, shade) => Math.abs(shade - currentShade) < Math.abs(closestShade - currentShade) ? shade : closestShade, firstShade));
-	const stepCount = Math.abs(amount) / 100;
-	const direction = amount < 0 ? -1 : 1;
-	const targetShade = availableShades[Math.max(0, Math.min(availableShades.length - 1, startingIndex + direction * stepCount))];
-	return targetShade === void 0 ? token : unsafeAsOpaqueButtonColourToken(`${base}-${targetShade}`);
-}
-function readShadeAmount(effect) {
-	const value = effect.options?.amount ?? 100;
-	return typeof value === "number" && Number.isFinite(value) && value >= 0 && value % 100 === 0 ? value : null;
-}
-function readOpaqueToken(effect, key, fallback) {
-	return parseOpaqueButtonColourToken(effect.options?.[key] ?? fallback);
-}
-function unsupportedEffect(input, effect, reason) {
-	return {
-		ok: false,
-		error: {
-			tag: "unsupported_colour_effect",
-			variantId: input.variantId,
-			state: input.state,
-			effectId: effect.effectId,
-			reason
-		}
-	};
-}
-function invalidEffectOption(input, effect, option) {
-	return {
-		ok: false,
-		error: {
-			tag: "invalid_colour_effect_options",
-			variantId: input.variantId,
-			state: input.state,
-			effectId: effect.effectId,
-			option
-		}
-	};
-}
-function inapplicableEffect(input, effect, treatment) {
-	return {
-		ok: false,
-		error: {
-			tag: "inapplicable_colour_effect",
-			variantId: input.variantId,
-			state: input.state,
-			effectId: effect.effectId,
-			treatment: treatment.type
-		}
-	};
-}
-function unknownEffect(input, effect) {
-	return {
-		ok: false,
-		error: {
-			tag: "unknown_button_effect",
-			variantId: input.variantId,
-			state: input.state,
-			effectId: effect.effectId
-		}
-	};
-}
-function interpolateHex(startHex, endHex, position) {
-	const start = hexToRgb$1(startHex);
-	const end = hexToRgb$1(endHex);
-	const channel = (from, to) => Math.round(from + (to - from) * position).toString(16).padStart(2, "0");
-	return `#${channel(start.r, end.r)}${channel(start.g, end.g)}${channel(start.b, end.b)}`;
-}
-var BUTTON_VISUAL_STATES, BUTTON_CONTRAST_POLICY;
-var init_resolveButtonColourStates = __esmMin((() => {
-	init_contrast$1();
-	init_colorConversion();
-	init_onColor();
-	init_foregroundContract();
-	init_types$12();
-	init_constants$2();
-	init_effectClassification();
-	BUTTON_VISUAL_STATES = [
-		"base",
-		"hover",
-		"focus",
-		"active",
-		"disabled"
-	];
-	BUTTON_CONTRAST_POLICY = {
-		textMinimumRatio: 4.5,
-		nonTextMinimumRatio: 3,
-		gradientSamplesPerSegment: 20,
-		alphaBackgrounds: "reject-without-known-surface",
-		disabled: "retain-full-colour-contract"
-	};
-}));
-//#endregion
 //#region ../theme-core/src/buttons/resolvedButtonCss.ts
 /**
 * Canonical colour declaration mapping shared by full themes and ThemeBridge.
@@ -15322,8 +15396,8 @@ function variantChunks(variant, global, themeSizes, themeId, tokens, theme, colo
 * Only variants that declare `affordance` with a known icon id produce a rule —
 * every other variant is byte-identical to before. The `:not(.rb-affordance-off)`
 * guard lets a `button` node that renders its own trailing icon suppress this
-* one (node overrides personality). Colour comes from the affordance token, or
-* `currentColor` (the button text colour) when no token is given.
+* one. The mask uses `currentColor`, so the icon always shares the canonical
+* button foreground.
 */
 function variantAffordanceRule(variant, selector) {
 	const affordance = variant.affordance;
@@ -15483,7 +15557,7 @@ function resolveBoxShadow(variant, global, theme, tokens) {
 }
 var AFFORDANCE_SUPPRESS_CLASS, BUTTON_SIZE_NAMES, LETTER_SPACING_MAP, STRUCTURAL_DECLARATIONS;
 var init_generateButtonCss = __esmMin((() => {
-	init_types$12();
+	init_types$11();
 	init_classNames();
 	init_resolver$1();
 	init_generateBaseCSS();
@@ -15540,17 +15614,10 @@ var init_presets$1 = __esmMin((() => {
 	});
 }));
 //#endregion
-//#region ../theme-core/src/buttons/effects/types.ts
-var init_types$10 = __esmMin((() => {}));
-var init_core$1 = __esmMin((() => {
-	init_resolveButtonColourStates();
-	init_resolvedButtonCss();
-	init_types$12();
-}));
-//#endregion
 //#region ../theme-core/src/buttons/index.ts
 var init_buttons = __esmMin((() => {
-	init_types$12();
+	init_types$11();
+	init_parseThemeForPersistence();
 	init_classNames();
 	init_generateButtonCss();
 	init_resolveButtonColourStates();
@@ -15559,10 +15626,6 @@ var init_buttons = __esmMin((() => {
 	init_constants$2();
 	init_presets$1();
 	init_styles();
-	init_types$10();
-	init_registry$1();
-	init_transform();
-	init_core$1();
 }));
 //#endregion
 //#region ../theme-core/src/cards/types.ts
@@ -15711,9 +15774,9 @@ function generateShadowValue(shadow) {
 		case "high": return soft ? `${xOffset}px 25px 50px rgba(0,0,0,.18)` : `${xOffset}px 20px 30px rgba(0,0,0,.28)`;
 	}
 }
-var CORNER_RADIUS_MAP$2, GRADIENT_DIRECTION_MAP$1;
+var CORNER_RADIUS_MAP$3, GRADIENT_DIRECTION_MAP$1;
 var init_constants$1 = __esmMin((() => {
-	CORNER_RADIUS_MAP$2 = {
+	CORNER_RADIUS_MAP$3 = {
 		square: "0px",
 		soft: "8px",
 		rounded: "16px",
@@ -15797,7 +15860,7 @@ var init_generateDefaultCardSystem = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/cards/generateCardCss.ts
 function resolveCornerRadiiCss$1(cornerRadii, fallback) {
-	const fallbackValue = CORNER_RADIUS_MAP$2[fallback];
+	const fallbackValue = CORNER_RADIUS_MAP$3[fallback];
 	const at = (value) => value ? PER_CORNER_RADIUS_MAP$1[value] : fallbackValue;
 	return `${at(cornerRadii.topLeft)} ${at(cornerRadii.topRight)} ${at(cornerRadii.bottomRight)} ${at(cornerRadii.bottomLeft)}`;
 }
@@ -15855,7 +15918,7 @@ function generateVariantCSS(variant, themeId, tokens, theme) {
 		rules.push(`border: ${borderWidth} solid ${borderColor}`);
 	}
 	const corners = variant.corners ?? theme.corners;
-	const radius = variant.cornerRadii ? resolveCornerRadiiCss$1(variant.cornerRadii, corners) : CORNER_RADIUS_MAP$2[corners];
+	const radius = variant.cornerRadii ? resolveCornerRadiiCss$1(variant.cornerRadii, corners) : CORNER_RADIUS_MAP$3[corners];
 	rules.push(`border-radius: ${radius}`);
 	const shadow = variant.shadow ?? theme.shadow;
 	if (shadow.elevation !== "none") {
@@ -16763,12 +16826,12 @@ var init_schema$1 = __esmMin((() => {
 	init_cards();
 	init_types$8();
 	init_types$7();
-	init_types$11();
+	init_types$10();
 	init_types$6();
 	init_validation$2();
 	init_atRuleValidation();
 	init_shared$5();
-	init_types$15();
+	init_types$14();
 	init_logoBranding();
 	init_rawStyleFields();
 	init_themeColorTokens();
@@ -17626,7 +17689,7 @@ function uniqueNonEmpty$1(values) {
 var designResolutionPolicySchema, runtimeStyleFieldNameSchema, nonEmptyRuntimeStyleFieldNamesSchema, heroLegibilityStrategySchema, heroCompositionIntentSchema, heroTypographyScaleIntentSchema, sectionHeightIntentSchema, imageSurfaceTreatmentIntensitySchema, imageSurfaceMotionSchema, imageSurfaceTreatmentSchema, testimonialCardTreatmentSchema, tileTreatmentSchema, eventListTreatmentSchema, eyebrowTreatmentSchema, userPanelTreatments, userFlushTreatments, userFlushBleeds, contentFrameIntentSchema, blockDesignPlanSchema, styleAuthoritySchema, blockRuntimeStyleAuthoritySchema;
 var init_designState = __esmMin((() => {
 	init_sourceCatalogs();
-	init_types$15();
+	init_types$14();
 	init_schemaVersionedJson();
 	init_rawStyleFields();
 	designResolutionPolicySchema = z$1.enum([
@@ -17805,7 +17868,7 @@ var init_runtimeCompiler = __esmMin((() => {
 	init_styles();
 	init_colors();
 	init_designState();
-	init_types$15();
+	init_types$14();
 	init_accessibleSurfaces();
 	init_sectionTransitions();
 	init_tokens();
@@ -18224,7 +18287,7 @@ var init_curatedSiteStyles = __esmMin((() => {
 	init_footerLooks();
 	init_curatedChoices();
 	init_sourceCatalogs();
-	init_types$15();
+	init_types$14();
 	init_siteStyleTypography();
 	init_runtimeCompiler();
 	SOFT_EARTH_SITE_STYLE_ID_VALUE = "site-style:soft-earth";
@@ -19638,13 +19701,13 @@ var init_curatedSiteStyles = __esmMin((() => {
 	curatedSiteStylesById = new Map(curatedSiteStyles.map((style) => [style.id, style]));
 })), init_lookResolution = __esmMin((() => {
 	init_appearancePresets();
-	init_types$15();
+	init_types$14();
 }));
 var init_siteStyleBlockPolicies = __esmMin((() => {
 	init_lookResolution();
 	init_appearancePresets();
 	init_pageDesignIntent();
-	init_types$15();
+	init_types$14();
 	init_sectionTransitions();
 	asPageFlowPresetId("generated-default");
 	asSiteStyleId("site-style:south-west-twerk-school");
@@ -19657,12 +19720,12 @@ var init_siteStyleBlockPolicies = __esmMin((() => {
 	init_lookResolution();
 	init_siteStyleBlockPolicies();
 	init_pageDesignIntent();
-	init_types$15();
+	init_types$14();
 	init_sectionTransitions();
 	asPageFlowPresetId("flow:quiet"), noneBoundaryOption.id, asPageFlowPresetId("flow:balanced"), softBoundaryOption.id, asPageFlowPresetId("flow:expressive"), spaciousBoundaryOption.id;
 }));
 var init_resolver = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 }));
 var init_siteStyleThemeCompiler = __esmMin((() => {
 	init_schema$1();
@@ -19672,7 +19735,7 @@ var init_siteStyleThemeCompiler = __esmMin((() => {
 	init_resolveSelection();
 }));
 var init_previewCustomization = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 }));
 var init_previewCompiler = __esmMin((() => {
 	init_schema$1();
@@ -19682,7 +19745,7 @@ var init_previewCompiler = __esmMin((() => {
 	init_resolveSelection();
 	init_curatedSiteStyles();
 	init_resolver();
-	init_types$15();
+	init_types$14();
 	init_footerLooks();
 	init_headerLooks();
 	init_runtimeCompiler();
@@ -19721,7 +19784,7 @@ var generatedPanelTreatments, generatedFlushTreatments, generatedFlushBleeds, ge
 var init_generatedSchemas = __esmMin((() => {
 	init_curatedSiteStyles();
 	init_sourceCatalogs();
-	init_types$15();
+	init_types$14();
 	generatedPanelTreatments = uniqueNonEmpty(generatedDesignOptionCatalog.contentFrames.filter((frame) => frame.kind === "panel").map((frame) => frame.treatment));
 	generatedFlushTreatments = uniqueNonEmpty(generatedDesignOptionCatalog.contentFrames.filter((frame) => frame.kind === "flush-panel").map((frame) => frame.treatment));
 	generatedFlushBleeds = uniqueNonEmpty(generatedDesignOptionCatalog.contentFrames.filter((frame) => frame.kind === "flush-panel").map((frame) => frame.bleed));
@@ -19788,7 +19851,7 @@ var init_generatedDesignPipeline = __esmMin((() => {
 	init_headerOpeningSection();
 	init_resolver();
 	init_runtimeCompiler();
-	init_types$15();
+	init_types$14();
 }));
 function validateBlockSequence(snapshots, ctx) {
 	for (const issue of collectBlockSequenceIssues(snapshots)) ctx.addIssue(issue);
@@ -19823,7 +19886,7 @@ function collectBlockSequenceIssues(snapshots) {
 }
 var nonEmptyStringSchema, blockContentVersionIdSchema, designBlockIdSchema, designPageIdSchema, designEntryIdSchema, blockOrderIndexSchema, publishedPageBlockSnapshotSchema, draftPageBlockSnapshotSchema, missingPageBlockSnapshotSchema, pageBlockSnapshotSchema, publishedPageBlockSequenceSchema, draftPageBlockSequenceSchema, publishedPageDesignVersionDataV1Schema, draftPageDesignVersionDataV1Schema;
 var init_pageDesignAuthority = __esmMin((() => {
-	init_types$15();
+	init_types$14();
 	init_pageDesignIntent();
 	nonEmptyStringSchema = z$1.string().min(1);
 	blockContentVersionIdSchema = nonEmptyStringSchema.transform(asBlockContentVersionId);
@@ -20119,7 +20182,7 @@ var init_site_styles = __esmMin((() => {
 	init_tokenRecipes();
 	init_siteStyleTypography();
 	init_themeParity();
-	init_types$15();
+	init_types$14();
 }));
 //#endregion
 //#region ../blocks/src/system/transforms/registry/_utils/themeColorResolution.ts
@@ -20186,7 +20249,7 @@ function isEventListTreatment(value) {
 }
 var spacingTransform, raisedTransform, roundedTransform, boxStylesCompositeTransform, cardVariantClassTransform, boxStylesBorderColorTransform, fixedFrameScopeClass, tileTreatmentClassMap, tileTreatmentSet, eventListTreatmentClassMap, eventListTreatmentSet, sectionClassNameTransform, containerStylesResolveClassName, containerStylesResolveBoxClassName, sectionColorsStyleTransform, GAP_CLASS_MAP, GAP_VALUE_MAP, semanticGapTransform, semanticGapValueTransform, boxStylesTransforms;
 var init_boxStyles$1 = __esmMin((() => {
-	init_core$2();
+	init_core$1();
 	init_spacing();
 	init_site_styles();
 	init_colorStyles();
@@ -21342,6 +21405,16 @@ function isDisplayMediaKind$2(kind) {
 function assertNeverSelectSource(value) {
 	throw new Error(`Unhandled select source: ${JSON.stringify(value)}`);
 }
+function hasMediaDefaultIdentifier(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0;
+}
+function validateMediaFieldDefault(field, ctx) {
+	if (field.defaultValue !== void 0 && field.defaultValue !== null && !hasMediaDefaultIdentifier(field.defaultValue)) ctx.addIssue({
+		code: z$1.ZodIssueCode.custom,
+		path: ["defaultValue"],
+		message: `${field.type} defaultValue must be null or an object with a non-empty identifier`
+	});
+}
 function getFieldSchemaInternal() {
 	if (_fieldSchemaInternal) return _fieldSchemaInternal;
 	_fieldSchemaInternal = z$1.discriminatedUnion("type", [
@@ -21418,7 +21491,7 @@ function createSdkSelectField(input) {
 		}
 	}));
 }
-var visibilityLevels, MEDIA_KINDS, DISPLAY_MEDIA_KINDS$2, PUBLIC_FILE_FIELD_KINDS, siteOptionSources, mediaDeliverySchema, selectOptionSchema, selectSourceSchema, visibleWhenPredicateSchema, visibleWhenSchema, uiSchema, baseFieldSchema, textFieldSchema, richTextFieldSchema, inlineTextFieldSchema, mediaFieldSchema, fileFieldSchema, booleanFieldSchema, dateFieldSchema, timeFieldSchema, dateTimeFieldSchema, slugFieldSchema, urlFieldSchema, linkFieldSchema, selectFieldSchema, referenceFieldSchema, itemTypeSchema, repeaterFieldSchema, groupFieldSchema, modalFieldSchema, numberFieldSchema, tabDefinitionSchema, tabGroupFieldSchema, presetOptionSchema, presetOrCustomFieldSchema, contentTypeSelectFieldSchema, entryPickerFieldSchema, _fieldSchemaInternal, fieldSchema, slotSchema, typographyTokens, colorTokens, spacingTokens, radiusTokens, styleTokenSchema, behaviourSchema, quickFieldPrioritySchema, previewCustomizeManifestCurationSchema, blockCategoryEnum, blockContentSourceKinds, blockContentSourceSchema;
+var visibilityLevels, MEDIA_KINDS, DISPLAY_MEDIA_KINDS$2, DEFAULT_MEDIA_FIELD_KINDS, PUBLIC_FILE_FIELD_KINDS, siteOptionSources, mediaDeliverySchema, selectOptionSchema, selectSourceSchema, visibleWhenPredicateSchema, visibleWhenSchema, uiSchema, baseFieldSchema, textFieldSchema, richTextFieldSchema, inlineTextFieldSchema, mediaFieldSchema, fileFieldSchema, booleanFieldSchema, dateFieldSchema, timeFieldSchema, dateTimeFieldSchema, slugFieldSchema, urlFieldSchema, linkFieldSchema, selectFieldSchema, referenceFieldSchema, itemTypeSchema, repeaterFieldSchema, groupFieldSchema, modalFieldSchema, numberFieldSchema, tabDefinitionSchema, tabGroupFieldSchema, presetOptionSchema, presetOrCustomFieldSchema, contentTypeSelectFieldSchema, entryPickerFieldSchema, _fieldSchemaInternal, fieldSchema, slotSchema, typographyTokens, colorTokens, spacingTokens, radiusTokens, styleTokenSchema, behaviourSchema, quickFieldPrioritySchema, previewCustomizeManifestCurationSchema, blockCategoryEnum, blockContentSourceKinds, blockContentSourceSchema;
 var init_schema = __esmMin((() => {
 	init_src$2();
 	init_node();
@@ -21442,6 +21515,7 @@ var init_schema = __esmMin((() => {
 		"video",
 		"audio"
 	];
+	DEFAULT_MEDIA_FIELD_KINDS = ["image"];
 	PUBLIC_FILE_FIELD_KINDS = [
 		"document",
 		"spreadsheet",
@@ -21638,16 +21712,16 @@ var init_schema = __esmMin((() => {
 	});
 	mediaFieldSchema = baseFieldSchema.extend({
 		type: z$1.literal("media"),
-		mediaKinds: z$1.array(z$1.enum(MEDIA_KINDS)).default(["image"]).transform((kinds) => {
+		mediaKinds: z$1.array(z$1.enum(MEDIA_KINDS)).default([...DEFAULT_MEDIA_FIELD_KINDS]).transform((kinds) => {
 			const displayKinds = kinds.filter(isDisplayMediaKind$2);
-			return displayKinds.length > 0 ? displayKinds : ["image"];
+			return displayKinds.length > 0 ? displayKinds : [...DEFAULT_MEDIA_FIELD_KINDS];
 		}),
 		aspectRatio: z$1.string().optional()
-	});
+	}).superRefine(validateMediaFieldDefault);
 	fileFieldSchema = baseFieldSchema.extend({
 		type: z$1.literal("file"),
 		fileKinds: z$1.array(z$1.enum(PUBLIC_FILE_FIELD_KINDS)).default([...PUBLIC_FILE_FIELD_KINDS])
-	});
+	}).superRefine(validateMediaFieldDefault);
 	booleanFieldSchema = baseFieldSchema.extend({ type: z$1.literal("boolean") });
 	dateFieldSchema = baseFieldSchema.extend({ type: z$1.literal("date") });
 	timeFieldSchema = baseFieldSchema.extend({ type: z$1.literal("time") });
@@ -23124,45 +23198,6 @@ var init_formEmbed = __esmMin((() => {
 	});
 }));
 //#endregion
-//#region ../blocks/src/system/fragments/library/footerBottomText.ts
-var footerBottomTextFragment;
-var init_footerBottomText = __esmMin((() => {
-	init_types$4();
-	init_builder$2();
-	init_colorStyles();
-	footerBottomTextFragment = defineFragment({
-		id: "footerBottomText",
-		title: "Footer Text",
-		description: "Rich text content for the main footer body and optional bottom bar.",
-		fields: [{
-			id: "bodyText",
-			type: "richText",
-			label: "Body text",
-			description: "Appears in the main footer area.",
-			ui: { variant: "limited" }
-		}, {
-			id: "bottomText",
-			type: "richText",
-			label: "Bottom bar text",
-			description: "Appears in the optional footer bottom bar.",
-			ui: { variant: "limited" }
-		}],
-		layout: [richText({
-			className: "rb-prose rb-prose-sm rb-mx-auto rb-max-w-3xl rb-text-center",
-			style: textColorStyle("text/80")
-		}, when("bodyText"), bind("bodyText", { transforms: [{
-			id: "content.interpolateRichTextTokens",
-			options: { tokens: ["year", "site_name"] }
-		}] })), richText({
-			className: "rb-prose rb-prose-sm rb-mx-auto rb-max-w-3xl rb-text-center",
-			style: textColorStyle("text/80")
-		}, when("bottomText"), bind("bottomText", { transforms: [{
-			id: "content.interpolateRichTextTokens",
-			options: { tokens: ["year", "site_name"] }
-		}] }))]
-	});
-}));
-//#endregion
 //#region ../blocks/src/system/fragments/library/headerCta.ts
 var headerCtaFragment;
 var init_headerCta = __esmMin((() => {
@@ -23676,7 +23711,6 @@ var init_lazyInit = __esmMin((() => {
 	init_testimonialsCarousel();
 	init_formCopy();
 	init_formEmbed();
-	init_footerBottomText();
 	init_headerCta();
 	init_singleButton();
 	init_blogFeaturedPost();
@@ -23696,7 +23730,6 @@ var init_lazyInit = __esmMin((() => {
 		testimonialsCarouselFragment,
 		formCopyFragment,
 		formEmbedFragment,
-		footerBottomTextFragment,
 		headerCtaFragment,
 		singleButtonFragment,
 		blogFeaturedPostFragment,
@@ -24513,7 +24546,6 @@ function ensureFragmentsRegistered() {
 	registerFragment(formCopyFragment);
 	registerFragment(formEmbedFragment);
 	registerFragment(bookingFormFragment);
-	registerFragment(footerBottomTextFragment);
 	registerFragment(headerCtaFragment);
 	registerFragment(singleButtonFragment);
 	registerFragment(blogFeaturedPostFragment);
@@ -24543,7 +24575,6 @@ var init_init = __esmMin((() => {
 	init_formCopy();
 	init_formEmbed();
 	init_bookingForm$1();
-	init_footerBottomText();
 	init_headerCta();
 	init_singleButton();
 	init_blogFeaturedPost();
@@ -24836,7 +24867,6 @@ var init_fragments = __esmMin((() => {
 	init_formCopy();
 	init_formEmbed();
 	init_bookingForm$1();
-	init_footerBottomText();
 	init_headerCta();
 	init_singleButton();
 	init_blogFeaturedPost();
@@ -109050,15 +109080,32 @@ var init_RichText = __esmMin((() => {
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/richText-coerce.ts
-function coerceRichTextDoc(value) {
-	const raw = unwrapRichTextRoot(value);
-	if (typeof raw === "string") return createRichTextDocFromMarkdown(raw);
-	if (isRecord$32(raw) && typeof raw.type === "string") return raw;
+function parseRichTextDoc(value) {
+	const parsed = RichTextDocSchema.safeParse(value);
+	if (parsed.success) return {
+		kind: "valid",
+		doc: parsed.data
+	};
+	return {
+		kind: "invalid",
+		issues: parsed.error.issues.map((issue) => ({
+			path: issue.path.map((segment) => String(segment)),
+			message: issue.message
+		}))
+	};
+}
+function coerceRichTextDoc(value, source) {
+	const parsed = parseRichTextDoc(value);
+	if (parsed.kind === "valid") return parsed.doc;
+	if (value !== null && value !== void 0) logger.warn("blocks:rich-text:invalid-document", {
+		source,
+		issues: parsed.issues.slice(0, 3)
+	});
 	return null;
 }
 var init_richText_coerce = __esmMin((() => {
+	init_noop();
 	init_richTextSchema();
-	init_typeGuards();
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/commerce/shared/view.tsx
@@ -109859,7 +109906,7 @@ function ProductDetailController(props) {
 		selectedProduct,
 		variantId
 	]);
-	const bodyDoc = display.state === "ready" && props.render.hydration.showBody ? coerceRichTextDoc(display.body) : null;
+	const bodyDoc = display.state === "ready" && props.render.hydration.showBody ? coerceRichTextDoc(display.body, "block-runtime:product-detail:body") : null;
 	return /* @__PURE__ */ jsx(ProductDetailView, {
 		display,
 		gallery: display.state === "ready" ? /* @__PURE__ */ jsx(ProductGalleryFrameView, {
@@ -112455,6 +112502,7 @@ function resolveBlockIconRenderValue(value, generatedAssets = /* @__PURE__ */ ne
 //#region ../blocks/src/system/manifest/fieldValidation/index.ts
 init_src$2();
 init_schema();
+init_richTextSchema();
 const TEL_RE = /^[+()0-9\s-]{3,}$/;
 const SLUG_PATTERN = /^(?:[a-z0-9]+(?:-[a-z0-9]+)*)(?:\/(?:[a-z0-9]+(?:-[a-z0-9]+)*))*$/;
 const ALLOWED_URL_PROTOCOLS = ["http:", "https:"];
@@ -112511,7 +112559,7 @@ function fieldIssueToMessage(issue) {
 		case "tooManyItems": return `${issue.label} must have at most ${issue.maximum} ${pluralize(issue.itemLabel, issue.maximum)}`;
 		case "invalidRichText": return `${issue.label} must be valid rich text`;
 		case "invalidInlineText": return `${issue.label} must be valid styled text`;
-		case "invalidMedia": return `${issue.label} must be a valid media item`;
+		case "invalidMedia": return `${issue.label} must be a media object with an identifier`;
 		case "invalidLink": return `${issue.label} must be a valid link`;
 		case "invalidReference": return `${issue.label} must reference a valid item`;
 		default: return assertNever$7(issue);
@@ -112599,7 +112647,7 @@ function deriveFieldValidationPlan(field, path = [field.id]) {
 		case "media":
 		case "file": return {
 			...makePlan("media", "object", field, path, required, commonConstraints(required, { kind: "mediaObject" })),
-			legacyStringType: legacyStringMediaTypeForField(field)
+			allowedMediaTypes: field.type === "media" ? field.mediaKinds ?? DEFAULT_MEDIA_FIELD_KINDS : field.fileKinds ?? PUBLIC_FILE_FIELD_KINDS
 		};
 		case "link": return makePlan("link", "object", field, path, required, commonConstraints(required, { kind: "linkObject" }));
 		case "boolean": return makePlan("boolean", "boolean", field, path, required, requiredConstraints(required));
@@ -112611,12 +112659,25 @@ function deriveFieldValidationPlan(field, path = [field.id]) {
 		case "group":
 		case "modal": return {
 			...makePlan("group", "object", field, path, required, requiredConstraints(required)),
-			children: deriveNestedFieldPlans(field.schema?.fields ?? [], path),
+			childSelection: {
+				kind: "all",
+				fields: deriveNestedFieldPlans(field.schema?.fields ?? [], path)
+			},
 			allowNullChildren: field.type === "group" && field.ui?.widget === "locationPicker"
 		};
 		case "tabGroup": return {
 			...makePlan("group", "object", field, path, required, requiredConstraints(required)),
-			children: field.tabs.flatMap((tab) => deriveNestedFieldPlans(tab.fields, path))
+			childSelection: field.activeTabField ? {
+				kind: "discriminatedTabs",
+				activeTabField: field.activeTabField,
+				tabs: field.tabs.map((tab) => ({
+					typeId: tab.id,
+					fields: deriveNestedFieldPlans(tab.fields, path)
+				}))
+			} : {
+				kind: "all",
+				fields: field.tabs.flatMap((tab) => deriveNestedFieldPlans(tab.fields, path))
+			}
 		};
 		case "presetOrCustom":
 		case "contentTypeSelect":
@@ -112711,10 +112772,59 @@ function normalizeStoredContentValues(plans, content, options = {}) {
 	normalizeInlineTextFallbacks(plans, normalized, ctx);
 	return normalized;
 }
+function allGroupChildPlans(plan) {
+	switch (plan.childSelection.kind) {
+		case "all": return plan.childSelection.fields;
+		case "discriminatedTabs": return plan.childSelection.tabs.flatMap((tab) => tab.fields);
+		default: return assertNever$7(plan.childSelection);
+	}
+}
+function selectedGroupChildPlans(plan, value) {
+	if (plan.childSelection.kind === "all") return plan.childSelection.fields;
+	if (!isPlainObject$5(value)) return [];
+	const selectedType = value[plan.childSelection.activeTabField];
+	return plan.childSelection.tabs.find((tab) => tab.typeId === selectedType)?.fields ?? [];
+}
+function canonicalizeFieldValueForWrite(plan, value) {
+	switch (plan.kind) {
+		case "media": {
+			if (!isPlainObject$5(value)) return value;
+			const canonical = { ...value };
+			if (typeof canonical.identifier === "string" && canonical.identifier.trim().length > 0) deleteEnvSpecificKeys(canonical);
+			return canonical;
+		}
+		case "group": return canonicalizeObjectForWrite(selectedGroupChildPlans(plan, value), value);
+		case "repeater":
+			if (!isUnknownArray$2(value)) return value;
+			return value.map((item) => {
+				if (!isPlainObject$5(item)) return item;
+				const childPlans = plan.repeatedItemVariants ? plan.repeatedItemVariants.find((variant) => variant.typeId === item._type)?.fields : plan.repeatedItemPlan;
+				return childPlans ? canonicalizeObjectForWrite(childPlans, item) : item;
+			});
+		case "string":
+		case "number":
+		case "boolean":
+		case "richText":
+		case "inlineText":
+		case "link":
+		case "select":
+		case "passthrough": return value;
+		default: return assertNever$7(plan);
+	}
+}
+function canonicalizeObjectForWrite(plans, value) {
+	if (!isPlainObject$5(value)) return value;
+	const canonical = { ...value };
+	for (const plan of plans) {
+		if (!(plan.fieldId in canonical)) continue;
+		canonical[plan.fieldId] = canonicalizeFieldValueForWrite(plan, canonical[plan.fieldId]);
+	}
+	return canonical;
+}
 function normalizeStoredFieldValueWithContext(plan, value, ctx) {
 	if (value === null && !plan.required) return;
 	switch (plan.kind) {
-		case "group": return normalizeStoredObjectChildren(plan.children, value, childValidationContext(plan, ctx));
+		case "group": return normalizeStoredObjectChildren(selectedGroupChildPlans(plan, value), value, childValidationContext(plan, ctx));
 		case "repeater": return normalizeStoredRepeaterItems(plan, value, ctx);
 		case "string":
 		case "number":
@@ -112753,7 +112863,7 @@ function normalizeFieldValue(plan, value, ctx) {
 	switch (plan.kind) {
 		case "number": return normalizeNumberInput(value, ctx.allowNull);
 		case "string": return acceptsOptionalBlankAsMissing(plan, value) ? void 0 : value;
-		case "group": return normalizeObjectChildren(plan.children, value, childValidationContext(plan, ctx));
+		case "group": return normalizeObjectChildren(selectedGroupChildPlans(plan, value), value, childValidationContext(plan, ctx));
 		case "repeater": return normalizeRepeaterItems(plan, value, ctx);
 		case "boolean":
 		case "richText":
@@ -112761,17 +112871,10 @@ function normalizeFieldValue(plan, value, ctx) {
 		case "link":
 		case "select":
 		case "passthrough": return value;
-		case "media": return normalizeMediaInput(plan, value);
+		case "media": return value;
 		default: return assertNever$7(plan);
 	}
 }
-function normalizeMediaInput(plan, value) {
-	return normalizeLegacyStringMediaValueForField(value, {
-		type: plan.fieldType,
-		mediaKinds: plan.fieldType === "media" ? [plan.legacyStringType] : void 0,
-		fileKinds: plan.fieldType === "file" ? [plan.legacyStringType] : void 0
-	});
-}
 function normalizeObjectChildren(children, value, ctx) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return value;
 	const normalized = { ...value };
@@ -112823,7 +112926,7 @@ function validateNormalizedFieldValue(plan, value, ctx) {
 		case "select": return validateSelectPlan(plan, value);
 		case "richText": return isValidRichTextDoc(value) ? [] : [issue(plan, "invalidRichText")];
 		case "inlineText": return validateInlineTextPlan(plan, value);
-		case "media": return isPlainObject$5(value) ? [] : [issue(plan, "invalidMedia")];
+		case "media": return isPlainObject$5(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0 && (value.type === void 0 || typeof value.type === "string" && plan.allowedMediaTypes.includes(value.type)) ? [] : [issue(plan, "invalidMedia")];
 		case "link": return linkSchema.safeParse(value).success ? [] : [issue(plan, "invalidLink")];
 		case "repeater": return validateRepeaterPlan(plan, value, ctx);
 		case "group": return validateGroupPlan(plan, value, ctx);
@@ -112916,9 +113019,26 @@ function validateRepeaterPlan(plan, value, ctx) {
 	}), ...value.flatMap((item, index) => validateRepeaterItem(plan, item, index, ctx))];
 }
 function validateRepeaterItem(plan, item, index, ctx) {
-	if (!isPlainObject$5(item)) return [];
+	if (!isPlainObject$5(item)) return [{
+		kind: "wrongType",
+		path: [...plan.path, index],
+		fieldId: plan.fieldId,
+		label: plan.label,
+		expected: "an object"
+	}];
 	const itemType = item._type;
-	const fields = plan.repeatedItemVariants ? plan.repeatedItemVariants.find((variant) => variant.typeId === itemType)?.fields : plan.repeatedItemPlan;
+	const variant = plan.repeatedItemVariants ? plan.repeatedItemVariants.find((candidate) => candidate.typeId === itemType) : void 0;
+	if (plan.repeatedItemVariants && !variant) return [{
+		kind: "invalidOption",
+		path: [
+			...plan.path,
+			index,
+			"_type"
+		],
+		fieldId: "_type",
+		label: `${plan.label} item type`
+	}];
+	const fields = variant?.fields ?? plan.repeatedItemPlan;
 	if (!fields) return [];
 	return fields.flatMap((childPlan) => {
 		return validateNormalizedFieldValue(materializeRepeaterItemPlan(childPlan, plan.path, index), item[childPlan.fieldId], ctx);
@@ -112926,8 +113046,17 @@ function validateRepeaterItem(plan, item, index, ctx) {
 }
 function validateGroupPlan(plan, value, ctx) {
 	if (!isPlainObject$5(value)) return [issue(plan, "wrongType", { expected: "an object" })];
+	if (plan.childSelection.kind === "discriminatedTabs") {
+		const selectedType = value[plan.childSelection.activeTabField];
+		if (selectedType !== void 0 && selectedType !== null && !plan.childSelection.tabs.some((tab) => tab.typeId === selectedType)) return [{
+			kind: "invalidOption",
+			path: [...plan.path, plan.childSelection.activeTabField],
+			fieldId: plan.childSelection.activeTabField,
+			label: `${plan.label} type`
+		}];
+	}
 	const childCtx = childValidationContext(plan, ctx);
-	return plan.children.flatMap((childPlan) => validateNormalizedFieldValue(childPlan, value[childPlan.fieldId], childCtx));
+	return selectedGroupChildPlans(plan, value).flatMap((childPlan) => validateNormalizedFieldValue(childPlan, value[childPlan.fieldId], childCtx));
 }
 function childValidationContext(plan, ctx) {
 	return plan.allowNullChildren ? {
@@ -112944,7 +113073,16 @@ function rebaseFieldPlanPath(plan, fromPrefix, toPrefix) {
 		case "group": return {
 			...plan,
 			path,
-			children: plan.children.map((childPlan) => rebaseFieldPlanPath(childPlan, fromPrefix, toPrefix))
+			childSelection: plan.childSelection.kind === "all" ? {
+				kind: "all",
+				fields: plan.childSelection.fields.map((childPlan) => rebaseFieldPlanPath(childPlan, fromPrefix, toPrefix))
+			} : {
+				...plan.childSelection,
+				tabs: plan.childSelection.tabs.map((tab) => ({
+					...tab,
+					fields: tab.fields.map((childPlan) => rebaseFieldPlanPath(childPlan, fromPrefix, toPrefix))
+				}))
+			}
 		};
 		case "repeater": return {
 			...plan,
@@ -113100,7 +113238,7 @@ function findFieldValidationPlan(plans, path) {
 }
 function findNestedFieldValidationPlan(plan, path) {
 	switch (plan.kind) {
-		case "group": return findFieldValidationPlan(plan.children, path);
+		case "group": return findFieldValidationPlan(allGroupChildPlans(plan), path);
 		case "repeater": {
 			const index = path[plan.path.length];
 			if (typeof index !== "number") return null;
@@ -113128,7 +113266,7 @@ function validateExplicitNullsForPush(plans, content, ctx) {
 function validateExplicitNullForPushPlan(plan, value, ctx) {
 	if (value === null) return !plan.required && !ctx.allowNull && !acceptsOptionalNullValue(plan) ? validateFieldValue(plan, value, { allowNull: false }) : [];
 	switch (plan.kind) {
-		case "group": return validateExplicitNullsForPush(plan.children, value, childValidationContext(plan, ctx));
+		case "group": return validateExplicitNullsForPush(selectedGroupChildPlans(plan, value), value, childValidationContext(plan, ctx));
 		case "repeater": return validateExplicitNullsForPushRepeater(plan, value, ctx);
 		case "string":
 		case "number":
@@ -113235,23 +113373,17 @@ function isUnknownArray$2(value) {
 	return Array.isArray(value);
 }
 function isValidRichTextDoc(value) {
-	const doc = richTextDoc(value);
-	return Boolean(isPlainObject$5(doc) && doc.type === "doc");
+	return isRichTextDoc(value);
 }
 function isEmptyRichTextDoc(value) {
-	const doc = richTextDoc(value);
-	if (!isPlainObject$5(doc)) return false;
-	if (doc.type !== "doc") return false;
-	const content = doc.content;
+	if (!isPlainObject$5(value)) return false;
+	if (value.type !== "doc") return false;
+	const content = value.content;
 	if (!Array.isArray(content) || content.length === 0) return true;
 	if (content.length !== 1) return false;
 	const first = content[0];
 	return first?.type === "paragraph" && (!Array.isArray(first.content) || first.content.length === 0);
 }
-function richTextDoc(value) {
-	if (!isPlainObject$5(value)) return value;
-	return isPlainObject$5(value.doc) ? value.doc : value;
-}
 //#endregion
 //#region ../blocks/src/system/manifest/registry.ts
 const REGISTRY_SYMBOL$1 = Symbol.for("@riverbankcms/blocks/manifest-registry");
@@ -113275,11 +113407,14 @@ function preprocessEmptyValues(content) {
 	return result;
 }
 function createManifestValidator(manifestOrFields, options = {}) {
+	return createManifestValidatorWithNormalizer(manifestOrFields, options, normalizeStoredContentValues);
+}
+function createManifestValidatorWithNormalizer(manifestOrFields, options, normalize) {
 	const isDraft = options.mode === "draft";
 	const plans = derivePlansFromManifestOrFields(manifestOrFields);
 	const baseSchema = deriveContentZodFromPlans(plans, options);
-	if (isDraft) return z$1.preprocess((content) => preprocessEmptyValues(normalizeStoredContentValues(plans, content, options)), baseSchema);
-	return z$1.preprocess((content) => normalizeStoredContentValues(plans, content, options), baseSchema);
+	if (isDraft) return z$1.preprocess((content) => preprocessEmptyValues(normalize(plans, content, options)), baseSchema);
+	return z$1.preprocess((content) => normalize(plans, content, options), baseSchema);
 }
 function deriveContentZodFromPlans(plans, options) {
 	const shape = {};
@@ -114992,7 +115127,7 @@ const formattingTransforms = [
 ];
 //#endregion
 //#region ../blocks/src/system/transforms/registry/ui.ts
-init_core$2();
+init_core$1();
 init_site_styles();
 init_colorStyles();
 init_blockColorTokens();
@@ -115508,7 +115643,7 @@ const uiTransforms = [
 ];
 //#endregion
 //#region ../theme-core/src/siteChromePlacement.ts
-init_types$15();
+init_types$14();
 const SITE_CHROME_PLACEMENT_CLASSES = [
 	"rb-sticky",
 	"rb-fixed",
@@ -115570,7 +115705,7 @@ function splitSiteChromePlacementClasses(className) {
 //#endregion
 //#region ../blocks/src/system/transforms/registry/layout.ts
 init_colorConversion();
-init_core$2();
+init_core$1();
 init_colorStyles();
 init_surfaces();
 const joinClasses$1 = (parts) => parts.filter((part) => typeof part === "string" && part.trim().length > 0).join(" ").replace(/\s+/g, " ").trim();
@@ -116210,20 +116345,10 @@ function visitRichTextNode(node, allowedTokens, tokenValues) {
 }
 function interpolateRichTextTokens(value, options, context) {
 	if (!isRecord$32(value)) return value;
-	const allowedTokens = new Set(options.tokens);
-	const tokenValues = {
+	return visitRichTextNode(value, new Set(options.tokens), {
 		year: String((/* @__PURE__ */ new Date()).getFullYear()),
 		site_name: getSiteName(context)
-	};
-	if (isRecord$32(value.doc)) {
-		const nextDoc = visitRichTextNode(value.doc, allowedTokens, tokenValues);
-		if (nextDoc === value.doc) return value;
-		return {
-			...value,
-			doc: nextDoc
-		};
-	}
-	return visitRichTextNode(value, allowedTokens, tokenValues);
+	});
 }
 const contentTransforms = [{
 	id: "content.interpolateRichTextTokens",
@@ -126347,7 +126472,7 @@ const linksTransforms = [{
 }];
 //#endregion
 //#region ../blocks/src/system/transforms/registry/index.ts
-init_core$2();
+init_core$1();
 init_boxStyles$1();
 const defaultTransforms = createTransformRegistry([
 	...formattingTransforms,
@@ -126361,7 +126486,7 @@ const defaultTransforms = createTransformRegistry([
 ]);
 //#endregion
 //#region ../blocks/src/system/transforms/index.ts
-init_core$2();
+init_core$1();
 //#endregion
 //#region ../blocks/src/system/data/linkedContentEntries.ts
 init_src$3();
@@ -127009,29 +127134,11 @@ function normalize(value) {
 	return trimmed.length > 0 ? trimmed : null;
 }
 /**
-* Resolve the trailing affordance a button should render. Node overrides
-* personality; returns `null` when nothing is configured.
+* Resolve the node-authored trailing affordance, or `null` when no icon exists.
 */
 function resolveButtonAffordance(input) {
 	const nodeIcon = normalize(input.trailingIcon);
-	if (nodeIcon) {
-		const colorToken = normalize(input.trailingIconColorToken);
-		return {
-			iconId: nodeIcon,
-			source: "node",
-			...colorToken ? { colorToken } : {}
-		};
-	}
-	const personality = input.personalityAffordance;
-	const personalityIcon = normalize(personality?.iconId);
-	if (personality && personalityIcon) {
-		const colorToken = normalize(personality.colorToken);
-		return {
-			iconId: personalityIcon,
-			source: "personality",
-			...colorToken ? { colorToken } : {}
-		};
-	}
+	if (nodeIcon) return { iconId: nodeIcon };
 	return null;
 }
 //#endregion
@@ -127085,13 +127192,12 @@ function readStringPath(source, path) {
 }
 const RichTextNode = ({ value, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, ...rest }) => {
 	return /* @__PURE__ */ jsx(RichText$2, {
-		doc: coerceRichTextDoc(value) ?? void 0,
+		doc: coerceRichTextDoc(value, `block-runtime:${_blockKind ?? "unknown"}:${rest.path ?? "richText"}`) ?? void 0,
 		...rest
 	});
 };
 /**
-* Render the resolved trailing affordance icon. Colour is applied via a theme
-* CSS var so it recolours with the palette; the icon stroke uses `currentColor`.
+* Render the resolved trailing affordance icon using the button's foreground.
 */
 function renderTrailingAffordanceIcon(affordance) {
 	if (!affordance) return null;
@@ -127099,21 +127205,16 @@ function renderTrailingAffordanceIcon(affordance) {
 	if (!Icon) return null;
 	return /* @__PURE__ */ jsx(Icon, {
 		"aria-hidden": true,
-		className: "rb-ml-2 rb-h-4 rb-w-4 rb-inline-block",
-		style: affordance.colorToken ? { color: `rgb(var(--tb-${affordance.colorToken}))` } : void 0
+		className: "rb-ml-2 rb-h-4 rb-w-4 rb-inline-block"
 	});
 }
-const ButtonNode = ({ value, children, href, variantId = "primary", size = "md", disabled, type = "button", target, rel, linkRequired = false, trailingIcon, trailingIconColorToken, personalityAffordance, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, className, ...rest }) => {
+const ButtonNode = ({ value, children, href, variantId = "primary", size = "md", disabled, type = "button", target, rel, linkRequired = false, trailingIcon, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, className, ...rest }) => {
 	const content = value ?? children;
 	if (!content) {
 		console.warn("[ButtonNode] No content to render - value and children are both empty");
 		return null;
 	}
-	const affordanceIcon = renderTrailingAffordanceIcon(resolveButtonAffordance({
-		trailingIcon,
-		trailingIconColorToken,
-		personalityAffordance
-	}));
+	const affordanceIcon = renderTrailingAffordanceIcon(resolveButtonAffordance({ trailingIcon }));
 	const resolvedHref = typeof href === "string" ? href.trim() : "";
 	if (linkRequired && resolvedHref.length === 0) {
 		console.warn("[ButtonNode] Missing href for link-required button");
@@ -127736,9 +127837,9 @@ const AccordionItemNodeSSR = ({ className, value, trigger, content, question, an
 };
 function resolveNode$1(value) {
 	if (typeof value === "string" || typeof value === "number") return String(value);
-	const doc = coerceRichTextDoc(value);
+	const doc = coerceRichTextDoc(value, "block-runtime:accordion:item-content");
 	if (doc) return /* @__PURE__ */ jsx(RichText$2, { doc });
-	return value;
+	return React.isValidElement(value) ? value : null;
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/header-section.server.tsx
@@ -128243,7 +128344,7 @@ function CourseDetailsView(props) {
 	const sortedSessions = [...course.sessions ?? []].sort((a, b) => Date.parse(a.startsAt) - Date.parse(b.startsAt));
 	const visibleSessions = sessionLimit === "all" ? sortedSessions : sortedSessions.slice(0, sessionLimit);
 	const hasMoreSessions = sessionLimit !== "all" && sortedSessions.length > sessionLimit;
-	const descriptionDoc = showDescription ? coerceRichTextDoc(course.description) : null;
+	const descriptionDoc = showDescription ? coerceRichTextDoc(course.description, "block-runtime:course-details:description") : null;
 	const teamMembers = course.teamMembers ?? [];
 	return /* @__PURE__ */ jsxs("div", {
 		className: "rb-flex rb-flex-col rb-gap-6",
@@ -129416,7 +129517,7 @@ function ProductDetailServerContent(props) {
 		actions: props.render.display.state === "ready" ? renderServerPendingAction(props.render.display.actionLabel, props.render.display.soldOut) : null,
 		body: props.render.display.state === "ready" && props.render.display.body ? /* @__PURE__ */ jsx("div", {
 			className: "rb-prose rb-max-w-none",
-			children: /* @__PURE__ */ jsx(RichText$2, { doc: coerceRichTextDoc(props.render.display.body) })
+			children: /* @__PURE__ */ jsx(RichText$2, { doc: coerceRichTextDoc(props.render.display.body, "block-runtime:product-detail:body") })
 		}) : null
 	});
 }
@@ -130694,8 +130795,8 @@ function extractAlignmentClassName(className) {
 //#region ../blocks/src/system/runtime/resolver.ts
 init_src$3();
 init_node();
-init_richTextSchema();
 init_headingDecoration();
+init_richText_coerce();
 /**
 * Maps meta binding paths to their actual store keys.
 * The metadata store uses 'draft' prefixed keys (e.g., draftTitle, draftSlug)
@@ -131019,13 +131120,9 @@ function isTextConditionValueEmpty(value) {
 	return !value;
 }
 function isRichTextConditionValueEmpty(value) {
-	const root = unwrapRichTextRoot(value);
-	if (typeof root === "string") return root.trim().length === 0;
-	if (!isTipTapNode(root)) return root === null || root === void 0 || !root;
-	return richTextStructuralPresence(root).kind === "empty";
-}
-function isTipTapNode(value) {
-	return isPlainObject$3(value) && typeof value.type === "string";
+	const doc = coerceRichTextDoc(value, "block-runtime:condition:richText");
+	if (!doc) return true;
+	return richTextStructuralPresence(doc).kind === "empty";
 }
 function richTextStructuralPresence(node) {
 	if (typeof node.text === "string" && node.text.trim().length > 0) return {
@@ -132961,6 +133058,7 @@ function generateHeaderCss(options) {
 	cssChunks.push(generateMobilePanelStyles(header, themeId, tokens));
 	if (header.variant === "floating" && header.container) cssChunks.push(generateFloatingContainerStyles(header, themeId, tokens));
 	cssChunks.push(generateNavContainerStyles(header, themeId, tokens));
+	cssChunks.push(generateHeaderCtaTreatmentStyles(header, themeId, tokens));
 	cssChunks.push(generateCtaGapStyles(header, themeId));
 	return cssChunks.filter(Boolean).join("\n\n");
 }
@@ -133431,6 +133529,46 @@ const HEADER_CTA_GAP_MAP = {
 	spacious: "3rem"
 };
 /**
+* The inverted CTA treatment is contextual to branded header surfaces. It
+* cannot be represented by the generic secondary button role alone because
+* that role is transparent and inherits the surrounding surface foreground.
+* Keep the shared button's structure/effects while making the header own the
+* palette relationship for both desktop and mobile CTAs.
+*/
+function generateHeaderCtaTreatmentStyles(header, themeId, tokens) {
+	if (header.ctaTreatment !== "inverted") return "";
+	const desktopSelector = `:where([data-theme-scope="${themeId}"]) .header-cta`;
+	const mobileSelector = `:where([data-theme-scope="${themeId}"]) .nav-mobile-cta`;
+	const selectors = `${desktopSelector},\n${mobileSelector}`;
+	const hoverSelectors = [
+		`${desktopSelector}:hover`,
+		`${desktopSelector}[data-force-hover="true"]`,
+		`${mobileSelector}:hover`,
+		`${mobileSelector}[data-force-hover="true"]`
+	].join(",\n");
+	const focusSelectors = [`${desktopSelector}:focus-visible`, `${mobileSelector}:focus-visible`].join(",\n");
+	return `
+${selectors} {
+  background-color: ${tokens.getColor("background")};
+  background-image: none;
+  color: ${tokens.getColor("onBackground")};
+  border-color: currentColor;
+}
+
+${hoverSelectors} {
+  background-color: ${tokens.getColor("surface")};
+  background-image: none;
+  color: ${tokens.getColor("onSurface")};
+}
+
+${focusSelectors} {
+  outline: 2px solid ${tokens.getColor("onBackground")};
+  outline-offset: 2px;
+  box-shadow: 0 0 0 4px ${tokens.getColor("background")};
+}
+`;
+}
+/**
 * Generate CTA button gap styles (left margin between nav links and CTA)
 */
 function generateCtaGapStyles(header, themeId) {
@@ -133489,7 +133627,8 @@ ${`:where([data-theme-scope="${themeId}"])`} .footer-logo img {
 `;
 }
 function resolveFooterLogoSize(footer, headerLogo) {
-	return footerLogoSizeFromHeaderLogo(headerLogo) ?? footer.logo?.maxHeight ?? footer.logo?.size ?? "md";
+	const brandDrivenSize = footerLogoSizeFromHeaderLogo(headerLogo);
+	return footer.logo?.maxHeight ?? brandDrivenSize ?? footer.logo?.size ?? "md";
 }
 function footerLogoSizeFromHeaderLogo(headerLogo) {
 	const size = headerLogo?.size;
@@ -136492,11 +136631,8 @@ function summarizeValue(value) {
 			const preview = {};
 			for (const k of keys.slice(0, 8)) {
 				const v = rec[k];
-				if (k === "body" || k === "content") {
-					const isDocWrapper = !!(v && typeof v === "object" && isObjectRecord$1(v) && "doc" in v);
-					const isDoc = !!(v && typeof v === "object" && isObjectRecord$1(v) && v.type === "doc");
-					preview[k] = isDocWrapper ? "{doc}" : isDoc ? "{type:doc}" : summarizeValue(v);
-				} else preview[k] = summarizeValue(v);
+				if (k === "body" || k === "content") preview[k] = !!(v && typeof v === "object" && isObjectRecord$1(v) && v.type === "doc") ? "{type:doc}" : summarizeValue(v);
+				else preview[k] = summarizeValue(v);
 			}
 			return {
 				keys,
@@ -149609,7 +149745,12 @@ function ResponsiveScope({ children, responsiveMode = DEFAULT_THEME_RESPONSIVE_M
 }
 //#endregion
 //#region ../theme-core/src/siteChrome.tsx
-init_types$15();
+init_types$14();
+//#endregion
+//#region ../theme-core/src/buttons/core.ts
+init_resolveButtonColourStates();
+init_resolvedButtonCss();
+init_types$11();
 //#endregion
 //#region ../theme-core/src/runtime/buildThemeRuntimeFromBridge.ts
 /**
@@ -149622,7 +149763,6 @@ init_types$15();
 init_colorConversion();
 init_textColor();
 init_onColor();
-init_core$1();
 init_core();
 z$1.object({
 	tokens: z$1.record(z$1.string(), z$1.string()),
@@ -149675,41 +149815,11 @@ init_classic_professional();
 init_vibrant_creative();
 //#endregion
 //#region src/rendering/blocks-theme-runtime.ts
-const AXES_TONE_OPTIONS = [
-	"minimal",
-	"classic",
-	"bold"
-];
-const DEFAULT_AXES_TONE = AXES_TONE_OPTIONS[0];
-const AXES_TONE_SET = new Set(AXES_TONE_OPTIONS);
-const THEME_NAME_MAX_LENGTH = 30;
-function normalizeThemeForBlocks(theme) {
-	if (!theme || typeof theme !== "object") return theme;
-	const cloned = JSON.parse(JSON.stringify(theme));
-	if (typeof cloned.name === "string" && cloned.name.length > THEME_NAME_MAX_LENGTH) cloned.name = cloned.name.slice(0, THEME_NAME_MAX_LENGTH);
-	if (cloned.axes && typeof cloned.axes === "object") {
-		const axes = cloned.axes;
-		const tone = axes.tone;
-		if (typeof tone === "string" && !AXES_TONE_SET.has(tone)) axes.tone = DEFAULT_AXES_TONE;
-	}
-	return cloned;
-}
+init_buttons();
 function parseBlocksTheme(theme) {
-	const schema = themeSchema;
-	if (typeof schema.safeParse !== "function") {
-		console.warn("[sdk/rendering] themeSchema.safeParse is unavailable; skipping theme validation and using normalized theme data directly.");
-		return normalizeThemeForBlocks(theme);
-	}
-	const parsed = schema.safeParse(theme);
-	if (parsed.success) return parsed.data;
-	const normalized = normalizeThemeForBlocks(theme);
-	const reparsed = schema.safeParse(normalized);
-	if (reparsed.success) {
-		console.warn("[sdk/rendering] Repaired invalid theme to satisfy blocks schema:", parsed.error.issues);
-		return reparsed.data;
-	}
-	console.warn("[sdk/rendering] Failed to parse theme; falling back to modernMinimalTheme:", reparsed.error.issues);
-	return modernMinimalTheme;
+	const parsed = parseThemeForPersistence(theme);
+	if (!parsed.ok) throw new Error(`Theme does not satisfy the canonical runtime contract: ${parsed.error.kind}`);
+	return parsed.value;
 }
 function buildThemeRuntime(theme) {
 	return { tokens: buildThemeRuntime$1(parseBlocksTheme(theme)).tokens };
@@ -150550,16 +150660,6 @@ async function Layout({ siteData: providedSiteData, client, siteId, slug, domain
 	});
 }
 //#endregion
-//#region ../theme-core/src/styles/gradients.ts
-init_paletteAccess();
-init_colorConversion();
-//#endregion
-//#region ../theme-core/src/styles/glow.ts
-init_palette$1();
-//#endregion
-//#region ../theme-core/src/styles/buttons.ts
-init_colorStyles();
-//#endregion
 //#region ../blocks/src/structure/schema.ts
 const BlockKind = z.string();
 const blockSchema = z.object({
@@ -150578,8 +150678,9 @@ z.object({
 	blocks: z.array(blockSchema).min(1)
 });
 //#endregion
-//#region ../theme-core/src/recommend/generateThemes.ts
-init_expandPalette();
+//#region ../theme-core/src/styles/gradients.ts
+init_paletteAccess();
+init_colorConversion();
 //#endregion
 //#region ../blocks/src/system/runtime/bindings.ts
 init_node();
@@ -151607,6 +151708,7 @@ const CANONICAL_REFUND_PLANNER_ERROR_CODES = [
 		"idempotency_amount_mismatch",
 		"idempotency_method_mismatch",
 		"idempotency_receipt_mismatch",
+		"idempotency_scope_mismatch",
 		"refund_in_progress"
 	],
 	"invalid_amount",
@@ -151986,6 +152088,7 @@ BOOKING_QUESTION_ANSWER_EXPORT_SCOPES.site, BOOKING_QUESTION_ANSWER_EXPORT_SCOPE
 init_src$3();
 //#endregion
 //#region ../api/src/siteBanner.ts
+init_richTextSchema();
 const SITE_BANNER_SCOPE_VALUES = ["homepage", "all-pages"];
 const SITE_BANNER_TONE_VALUES = [
 	"announcement",
@@ -151995,7 +152098,7 @@ const SITE_BANNER_TONE_VALUES = [
 ];
 const siteBannerScopeSchema = z$1.enum(SITE_BANNER_SCOPE_VALUES);
 const siteBannerToneSchema = z$1.enum(SITE_BANNER_TONE_VALUES);
-const siteBannerBodySchema = z$1.unknown().transform(unwrapRichTextValue);
+const siteBannerBodySchema = RichTextDocSchema;
 const siteBannerCtaSchema = z$1.object({
 	label: z$1.string().trim().min(1),
 	link: linkPayloadSchema
@@ -152023,7 +152126,8 @@ const EMPTY_SITE_BANNER_BODY = {
 	}]
 };
 function analyzeSiteBannerBody(body) {
-	const sanitizedBody = sanitizeSiteBannerBodyInternal(body, { limitParagraphs: false });
+	const parsed = RichTextDocSchema.safeParse(body);
+	const sanitizedBody = parsed.success ? sanitizeSiteBannerBodyInternal(parsed.data, { limitParagraphs: false }) : EMPTY_SITE_BANNER_BODY;
 	const paragraphs = collectParagraphs(sanitizedBody);
 	const textLength = paragraphs.reduce((total, paragraph) => total + paragraphTextLength(paragraph), 0);
 	const issues = [];
@@ -152045,7 +152149,7 @@ function siteBannerBodyIssueMessage(issue) {
 	}
 }
 function sanitizeSiteBannerBodyInternal(input, options) {
-	const content = normalizeTopLevelNodes(unwrapRichTextValue(input).content ?? [], options);
+	const content = normalizeTopLevelNodes(input.content, options);
 	return {
 		type: "doc",
 		content: content.length > 0 ? content : EMPTY_SITE_BANNER_BODY.content
@@ -152126,28 +152230,6 @@ function sanitizeMarks(marks) {
 	});
 	return sanitized.length > 0 ? sanitized : void 0;
 }
-function unwrapRichTextValue(value) {
-	if (isRecord$6(value) && isRecord$6(value.doc)) return unwrapRichTextValue(value.doc);
-	if (isRecord$6(value) && value.type === "doc") return {
-		type: "doc",
-		content: Array.isArray(value.content) ? value.content.filter(isTipTapNodeLike).map(coerceTipTapNode) : []
-	};
-	return EMPTY_SITE_BANNER_BODY;
-}
-function isTipTapNodeLike(value) {
-	return isRecord$6(value) && typeof value.type === "string";
-}
-function coerceTipTapNode(value) {
-	return {
-		type: value.type,
-		...Array.isArray(value.content) ? { content: value.content.filter(isTipTapNodeLike).map(coerceTipTapNode) } : {},
-		...typeof value.text === "string" ? { text: value.text } : {},
-		...Array.isArray(value.marks) ? { marks: value.marks.filter((mark) => isRecord$6(mark) && typeof mark.type === "string").map((mark) => ({
-			type: mark.type,
-			...isRecord$6(mark.attrs) ? { attrs: mark.attrs } : {}
-		})) } : {}
-	};
-}
 function paragraphTextLength(paragraph) {
 	return collectText(paragraph).length;
 }
@@ -153760,20 +153842,14 @@ function textToInlineText(value) {
 /**
 * Extracts the first paragraph text from a TipTap/ProseMirror document.
 *
-* Accepts either the canonical unwrapped form (`{ type: 'doc', content: [...] }`)
-* or the legacy envelope (`{ doc: { type: 'doc', content: [...] } }`). New
-* producers must emit the unwrapped form; this tolerance only exists to read
-* data that pre-dates the unwrap migration.
+* Accepts the canonical unwrapped form (`{ type: 'doc', content: [...] }`).
 */
 function extractFirstParagraph$1(value) {
-	const unwrapped = unwrapRichTextRoot(value);
-	if (!isRecord$32(unwrapped)) return null;
-	const doc = unwrapped;
-	if (!Array.isArray(doc.content)) return null;
-	for (const node of doc.content) {
+	if (!isRichTextDoc(value)) return null;
+	for (const node of value.content) {
 		if (!isRecord$32(node)) continue;
 		if (node.type !== "paragraph" || !Array.isArray(node.content)) continue;
-		const text = node.content.filter((item) => isRecord$32(item) && item.type === "text").map((item) => typeof item.text === "string" ? item.text : "").join("").trim();
+		const text = node.content.filter((item) => item.type === "text").map((item) => typeof item.text === "string" ? item.text : "").join("").trim();
 		if (text.length > 0) return text;
 	}
 	return null;
@@ -153822,40 +153898,6 @@ function normalizeBindingInput$1(value) {
 	};
 	return null;
 }
-/**
-* Normalizes binding output by unwrapping doc wrappers.
-* Rich text fields are sometimes wrapped as { doc: { type: 'doc', content: [...] } }
-* This unwraps them to just the doc content.
-*/
-function normalizeBindingOutput$1(value) {
-	return normalizeValue(value);
-}
-function normalizeValue(value) {
-	if (Array.isArray(value)) return value.map((item) => normalizeValue(item));
-	if (!isRecord$32(value)) return value;
-	if (isDocWrapper(value)) return normalizeValue(value.doc);
-	const entries = Object.entries(value).map(([key, val]) => [key, normalizeValue(val)]);
-	return Object.fromEntries(entries);
-}
-/**
-* Strict doc-wrapper detector for recursive structure traversal.
-*
-* Matches ONLY the exact `{ doc: <typed-doc> }` shape with no sibling keys.
-* The strictness is deliberate: `normalizeBindingOutput` (this file) walks
-* every key of every nested object, and a permissive rule would corrupt
-* legitimate structures that happen to carry a field named `doc` (e.g.
-* `{ products: [{ doc: <node>, name: 'Widget' }] }`).
-*
-* For the *root* of a rich-text value — where we know any `doc` envelope
-* is rich-text bookkeeping rather than content — use `unwrapRichTextRoot`
-* (exported from `@riverbankcms/blocks/system/manifest/richTextSchema`).
-*/
-function isDocWrapper(value) {
-	if (!("doc" in value)) return false;
-	if (Object.keys(value).length !== 1) return false;
-	const doc = value.doc;
-	return isRecord$32(doc) && typeof doc.type === "string" && doc.type === "doc";
-}
 BINDING_TRANSFORM_VALUES$1.join(", ");
 //#endregion
 //#region src/contracts/rendering.ts
@@ -153882,7 +153924,6 @@ const ImagePresets = {
 	}
 };
 const isRecord$3 = isRecord$32;
-const normalizeBindingOutput = normalizeBindingOutput$1;
 const applyBindingsToContent = applyBindingsToContent$1;
 const builtInReferenceKindSet = /* @__PURE__ */ new Set([
 	"post",
@@ -154333,6 +154374,11 @@ const ContentFieldSchema = z$1.object({
 	ui: z$1.record(z$1.string(), z$1.unknown()).optional(),
 	itemLabel: z$1.string().optional()
 }).superRefine((field, ctx) => {
+	if ((field.type === "media" || field.type === "file") && field.defaultValue !== void 0 && field.defaultValue !== null && (typeof field.defaultValue !== "object" || Array.isArray(field.defaultValue) || typeof field.defaultValue.identifier !== "string" || !field.defaultValue.identifier.trim())) ctx.addIssue({
+		code: z$1.ZodIssueCode.custom,
+		path: ["defaultValue"],
+		message: `${field.type} defaultValue must be null or an object with a non-empty identifier`
+	});
 	if (field.multiple !== void 0 && field.type !== "select") ctx.addIssue({
 		code: z$1.ZodIssueCode.custom,
 		path: ["multiple"],
@@ -154504,6 +154550,13 @@ function subfieldsOf$1(field) {
 	if (direct && direct.length > 0) return direct;
 	return field.schema?.fields ?? [];
 }
+function repeaterVariantFields(field, item) {
+	const itemTypes = field.itemTypes;
+	if (!itemTypes) return subfieldsOf$1(field);
+	const typeId = item._type;
+	if (typeof typeId !== "string") return null;
+	return itemTypes[typeId]?.fields ?? null;
+}
 function selectOptionValues(field) {
 	const options = field.options;
 	return options ? options.map((o) => o.value) : [];
@@ -154511,19 +154564,23 @@ function selectOptionValues(field) {
 function isPlainObject(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-/** Field types whose value must be a string. */
 const STRING_TYPES = /* @__PURE__ */ new Set([
 	"text",
 	"textarea",
 	"url",
 	"link",
-	"media",
-	"file",
 	"reference",
 	"date",
 	"datetime",
 	"select"
 ]);
+function isAllowedIdentifierBearingMedia(field, value) {
+	if (!isPlainObject(value) || typeof value.identifier !== "string" || value.identifier.trim().length === 0) return false;
+	if (value.type === void 0) return true;
+	const allowedKinds = field.type === "media" ? field.mediaKinds : field.fileKinds;
+	if (typeof value.type !== "string") return false;
+	return (allowedKinds ?? (field.type === "media" ? ["image"] : ["document"])).some((kind) => kind === value.type);
+}
 function checkLeafType(field, value, path, errors) {
 	const push = (code, message) => {
 		errors.push({
@@ -154545,6 +154602,14 @@ function checkLeafType(field, value, path, errors) {
 		if (typeof value !== "string" && !isPlainObject(value)) push("wrong_type", `"${path}" must be rich-text (string or document object).`);
 		return;
 	}
+	if (field.type === "media" || field.type === "file") {
+		if (isPlainObject(value) && isPlaceholderSentinel(value.identifier)) {
+			push("unfilled_placeholder", `"${path}" still contains an unfilled placeholder (${value.identifier}).`);
+			return;
+		}
+		if (!isAllowedIdentifierBearingMedia(field, value)) push("wrong_type", `"${path}" must be a media object with an identifier.`);
+		return;
+	}
 	if (field.type === "select") {
 		if (typeof value !== "string") {
 			push("wrong_type", `"${path}" must be a string.`);
@@ -154558,9 +154623,9 @@ function checkLeafType(field, value, path, errors) {
 		if (typeof value !== "string") push("wrong_type", `"${path}" must be a string.`);
 	}
 }
-function validateField(field, value, path, errors) {
+function validateField(field, value, path, errors, allowIncomplete) {
 	if (value === void 0 || value === null || value === "") {
-		if (field.required === true) errors.push({
+		if (field.required === true && !allowIncomplete) errors.push({
 			path,
 			fieldType: field.type,
 			code: "missing_required",
@@ -154587,7 +154652,7 @@ function validateField(field, value, path, errors) {
 			});
 			return;
 		}
-		validateFields(subfieldsOf$1(field), value, path, errors);
+		validateFields(subfieldsOf$1(field), value, path, errors, allowIncomplete);
 		return;
 	}
 	if (field.type === "repeater") {
@@ -154600,7 +154665,6 @@ function validateField(field, value, path, errors) {
 			});
 			return;
 		}
-		const itemFields = subfieldsOf$1(field);
 		value.forEach((item, index) => {
 			const itemPath = `${path}[${index}]`;
 			if (!isPlainObject(item)) {
@@ -154612,16 +154676,26 @@ function validateField(field, value, path, errors) {
 				});
 				return;
 			}
-			validateFields(itemFields, item, itemPath, errors);
+			const itemFields = repeaterVariantFields(field, item);
+			if (!itemFields) {
+				errors.push({
+					path: itemPath,
+					fieldType: "repeater",
+					code: "invalid_option",
+					message: `"${itemPath}" has an unknown or missing repeater item type.`
+				});
+				return;
+			}
+			validateFields(itemFields, item, itemPath, errors, allowIncomplete);
 		});
 		return;
 	}
 	checkLeafType(field, value, path, errors);
 }
-function validateFields(fields, data, pathPrefix, errors) {
+function validateFields(fields, data, pathPrefix, errors, allowIncomplete) {
 	for (const field of fields) {
 		const path = pathPrefix ? `${pathPrefix}.${field.id}` : field.id;
-		validateField(field, data[field.id], path, errors);
+		validateField(field, data[field.id], path, errors, allowIncomplete);
 	}
 }
 //#endregion
@@ -154653,6 +154727,7 @@ function buildFieldValue(field) {
 		};
 		return {};
 	}
+	if (field.type === "media" || field.type === "file") return { identifier: buildSentinel(field) };
 	return buildSentinel(field);
 }
 /**
@@ -155062,39 +155137,7 @@ function selectBlocksForDeclaredEntrySlot(input) {
 }
 //#endregion
 //#region ../content-model/src/templates/defaults.ts
-/**
-* Build a canonical TipTap doc from plain-text paragraphs.
-*
-* Local mirror of `createRichTextDoc` from
-* `@riverbankcms/blocks/system/manifest/richTextSchema` — content-model
-* doesn't depend on blocks (blocks sits downstream), but the shape both
-* functions produce is governed by the same Zod schema in blocks.
-*
-* Exported with `@internal` so the cross-package parity test
-* (`packages/dummy-content/src/richTextDoc-parity.test.ts`) can import
-* the *real* implementation rather than reimplement it — eliminates the
-* "test verifies two copies of itself" failure mode.
-*
-* Returns `Record<string, unknown>` rather than the canonical
-* `RichTextDoc` type because that type lives in blocks; downstream
-* consumers narrow it via the canonical schema.
-*
-* @internal
-*/
-function createRichTextDocInternal(paragraphs) {
-	return {
-		type: "doc",
-		content: paragraphs.map((text) => text ? {
-			type: "paragraph",
-			content: [{
-				type: "text",
-				text
-			}]
-		} : { type: "paragraph" })
-	};
-}
-/** Local alias used by template defaults. Equivalent to `createRichTextDocInternal`. */
-const createRichTextDoc = createRichTextDocInternal;
+init_richTextSchema();
 const POST_EXCERPT_FALLBACK = fallbackBinding(fieldBinding("excerpt"), transformBinding(TEMPLATE_BINDING_TRANSFORMS.RICHTEXT_FIRST_PARAGRAPH, { input: fieldBinding("body") }));
 const EVENT_SUBHEADLINE_FALLBACK = fallbackBinding(fieldBinding("summary"), transformBinding(TEMPLATE_BINDING_TRANSFORMS.RICHTEXT_FIRST_PARAGRAPH, { input: fieldBinding("body") }));
 const COURSE_SUMMARY_FALLBACK = fallbackBinding(fieldBinding("summary"), transformBinding(TEMPLATE_BINDING_TRANSFORMS.RICHTEXT_FIRST_PARAGRAPH, { input: fieldBinding("body") }));
@@ -155488,13 +155531,9 @@ const META_FIELD_COMPATIBILITY = {
 	]
 };
 /**
-* Nested path suffixes and their compatible types
-* (e.g., richText.doc, media.url)
+* Nested path suffixes and their compatible types (for example media.url).
 */
 const NESTED_PATH_COMPATIBILITY = {
-	"richText.doc": ["richText"],
-	"richText.html": ["text", "inlineText"],
-	"richText.plain": ["text", "inlineText"],
 	"media.url": [
 		"text",
 		"inlineText",
@@ -155576,21 +155615,6 @@ function contentFieldPaths(fields, parentPath = "", parentLabel = "") {
 				label: baseLabel,
 				type: "richText",
 				category: "content"
-			}, {
-				path: `${basePath}.doc`,
-				label: `${baseLabel} (Document)`,
-				type: "richText.doc",
-				category: "content"
-			}, {
-				path: `${basePath}.html`,
-				label: `${baseLabel} (HTML)`,
-				type: "richText.html",
-				category: "content"
-			}, {
-				path: `${basePath}.plain`,
-				label: `${baseLabel} (Plain Text)`,
-				type: "richText.plain",
-				category: "content"
 			});
 			continue;
 		}
@@ -155780,12 +155804,12 @@ function isBindingDescriptor(value) {
 	return source === "field" || source === "meta" || source === "literal" || source === "transform" || source === "fallback";
 }
 /**
-* Check compatibility between a resolved source type (e.g. `'text'`, `'richText'`,
-* `'richText.doc'`) and a target block field type.
+* Check compatibility between a resolved source type (for example `'text'`,
+* `'richText'`, or `'media.url'`) and a target block field type.
 *
 * Handles three shapes of source type:
 *   - plain content-field type (e.g. `'text'`)
-*   - dotted nested suffix (e.g. `'richText.doc'`)
+*   - dotted nested suffix (e.g. `'media.url'`)
 *   - meta-typed value (treated as plain content type, since meta types
 *     already map cleanly into the matrix)
 */
@@ -156611,7 +156635,7 @@ async function processTemplatePage(input) {
 * - Entry-scoped blocks preserve defaults and resolve bindings over them
 */
 function resolveTemplateBlock(block, bindingContext) {
-	const baseContent = normalizeBindingOutput(sanitizeSdkRuntimeBlockContent(block.blockKind, block.content ?? {}));
+	const baseContent = sanitizeSdkRuntimeBlockContent(block.blockKind, block.content ?? {});
 	if (block.scope === "template") return {
 		id: block.id,
 		kind: block.blockKind,
@@ -156619,7 +156643,7 @@ function resolveTemplateBlock(block, bindingContext) {
 		content: baseContent
 	};
 	const bindings = block.bindings ?? {};
-	const resolvedContent = typeof bindings === "object" && Object.keys(bindings).length > 0 ? normalizeBindingOutput(applyBindingsToContent(baseContent, bindings, bindingContext)) : baseContent;
+	const resolvedContent = typeof bindings === "object" && Object.keys(bindings).length > 0 ? applyBindingsToContent(baseContent, bindings, bindingContext) : baseContent;
 	return {
 		id: block.id,
 		kind: block.blockKind,
@@ -156663,8 +156687,8 @@ function normalizeNullableEntrySlotContent(content) {
 	return content == null ? null : normalizeEntrySlotBlockContent(content);
 }
 function normalizeEntrySlotBlockContent(content) {
-	const normalized = normalizeBindingOutput(content ?? {});
-	return isRecord$3(normalized) ? normalized : {};
+	const value = content ?? {};
+	return isRecord$3(value) ? value : {};
 }
 //#endregion
 //#region src/rendering/primitives/RichText.tsx