@riverbankcms/sdk 0.144.0 → 0.145.0

package/dist/client/rendering.mjs

@@ -1011,7 +1011,7 @@ function parseEventPageSurfaceDestinationMode(value) {
 	return value === "cms-managed" || value === "system-managed" ? value : void 0;
 }
 function parseEventPageSurfaceSubject(value) {
-	if (!isRecord$44(value)) return err$3({ kind: "notObject" });
+	if (!isRecord$45(value)) return err$3({ kind: "notObject" });
 	switch (value.kind) {
 		case "eventSeries": {
 			const eventSeriesId = parseEventSeriesId(value.eventSeriesId);
@@ -1066,7 +1066,7 @@ function parseEventSeriesIdList(values) {
 	}
 	return ok$3(parsed);
 }
-function isRecord$44(value) {
+function isRecord$45(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_event_page_surface_subject = __esmMin((() => {
@@ -1518,7 +1518,76 @@ var init_booking_date_time = __esmMin((() => {
 }));
 //#endregion
 //#region ../core/src/booking-consent.ts
-var init_booking_consent = __esmMin((() => {})), init_dated_offering_settlement = __esmMin((() => {
+var init_booking_consent = __esmMin((() => {}));
+//#endregion
+//#region ../core/src/appointment-service-categories.ts
+/**
+* Groups services under their categories.
+*
+* A service whose `categoryId` names no category in `categories` lands in
+* Other. The composite foreign key keeps that from happening with stored data,
+* so this is only the total, safe answer for a caller holding a stale list.
+*/
+function layoutServicesByCategory(categories, services, options) {
+	if (categories.length === 0) return {
+		kind: "uncategorized-site",
+		services: [...services]
+	};
+	const buckets = new Map(categories.map((category) => [category.id, []]));
+	const other = [];
+	for (const service of services) {
+		const bucket = service.categoryId === null ? void 0 : buckets.get(service.categoryId);
+		if (bucket !== void 0) bucket.push(service);
+		else other.push(service);
+	}
+	const groups = [];
+	for (const category of categories) {
+		const groupServices = buckets.get(category.id) ?? [];
+		if (groupServices.length === 0 && !options.keepEmptyGroups) continue;
+		groups.push({
+			category,
+			services: groupServices
+		});
+	}
+	if (groups.length === 0 && !options.keepEmptyGroups) return {
+		kind: "uncategorized-site",
+		services: other
+	};
+	return {
+		kind: "categorized-site",
+		groups,
+		other
+	};
+}
+/**
+* Selects the public view for an optional category filter.
+*
+* It takes the category and service lists rather than a prebuilt layout
+* because the public layout has already dropped empty categories, and then an
+* empty category (`single` with no services) could not be told apart from a
+* deleted one (`fallback-all`).
+*/
+function selectCategoryView(categories, services, filterCategoryId) {
+	const publicLayout = () => layoutServicesByCategory(categories, services, { keepEmptyGroups: false });
+	if (filterCategoryId === null || filterCategoryId === void 0) return {
+		kind: "all",
+		layout: publicLayout()
+	};
+	const category = categories.find((candidate) => candidate.id === filterCategoryId);
+	if (category === void 0) return {
+		kind: "fallback-all",
+		missingCategoryId: filterCategoryId,
+		layout: publicLayout()
+	};
+	return {
+		kind: "single",
+		group: {
+			category,
+			services: services.filter((service) => service.categoryId === filterCategoryId)
+		}
+	};
+}
+var init_appointment_service_categories = __esmMin((() => {})), init_dated_offering_settlement = __esmMin((() => {
 	init_result$1();
 }));
 var init_person_records = __esmMin((() => {
@@ -1572,7 +1641,7 @@ var init_public_profile = __esmMin((() => {
 var init_public_experience = __esmMin((() => {}));
 //#endregion
 //#region ../core/src/rich-text.ts
-function isRecord$42(value) {
+function isRecord$43(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasOnlyKeys(value, allowed) {
@@ -1583,10 +1652,10 @@ function isDenseArrayOf(value, predicate) {
 	return true;
 }
 function isTipTapMark(value) {
-	return isRecord$42(value) && hasOnlyKeys(value, markKeys) && typeof value.type === "string" && value.type.length > 0 && (value.attrs === void 0 || isRecord$42(value.attrs));
+	return isRecord$43(value) && hasOnlyKeys(value, markKeys) && typeof value.type === "string" && value.type.length > 0 && (value.attrs === void 0 || isRecord$43(value.attrs));
 }
 function isTipTapNode(value) {
-	if (!isRecord$42(value) || !hasOnlyKeys(value, nodeKeys) || typeof value.type !== "string" || value.type.length === 0 || value.type === "doc" || value.attrs !== void 0 && !isRecord$42(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 (!isRecord$43(value) || !hasOnlyKeys(value, nodeKeys) || typeof value.type !== "string" || value.type.length === 0 || value.type === "doc" || value.attrs !== void 0 && !isRecord$43(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;
 }
@@ -1637,10 +1706,10 @@ var init_mailing_list_identifiers = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-targeting-parser.ts
 function parseMailingListPlacementTargeting(value) {
-	if (!isRecord$41(value)) return targetingError("shape");
+	if (!isRecord$42(value)) return targetingError("shape");
 	if (value.mode === "default") return ok$3({ mode: "default" });
 	if (value.mode !== "custom") return targetingError("mode");
-	if (!isRecord$41(value.selection)) return targetingError("selection");
+	if (!isRecord$42(value.selection)) return targetingError("selection");
 	switch (value.provider) {
 		case "native": return parseNativeTargeting(value.selection);
 		case "brevo": return parseBrevoTargeting(value.selection);
@@ -1649,7 +1718,7 @@ function parseMailingListPlacementTargeting(value) {
 	}
 }
 function parseMailingListVisitorSelection(value) {
-	if (!isRecord$41(value)) return visitorSelectionError$1("shape");
+	if (!isRecord$42(value)) return visitorSelectionError$1("shape");
 	switch (value.provider) {
 		case "native": {
 			const topicIds = parseVisitorIds(value.topicIds, parseNewsletterListId);
@@ -1782,7 +1851,7 @@ function parseVisitorIds(value, parseId) {
 	}
 	return parsed;
 }
-function isRecord$41(value) {
+function isRecord$42(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function targetingError(field) {
@@ -1833,11 +1902,11 @@ var init_footer_navigation_layout = __esmMin((() => {}));
 var init_footer_composition_types = __esmMin((() => {}));
 //#endregion
 //#region ../core/src/mailing-list-setup.ts
-function isRecord$38(value) {
+function isRecord$39(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseMailingListProviderScope(value) {
-	if (!isRecord$38(value)) return err$3("invalid_mailing_list_provider_scope");
+	if (!isRecord$39(value)) return err$3("invalid_mailing_list_provider_scope");
 	if (value.provider === "native") return ok$3({ provider: "native" });
 	if (value.provider === "brevo") {
 		const accountId = parseBrevoAccountId(value.accountId);
@@ -1864,7 +1933,7 @@ var init_mailing_list_setup = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-setup-parser.ts
 function parseMailingListGlobalForm(value) {
-	if (!isRecord$37(value)) return formError("shape");
+	if (!isRecord$38(value)) return formError("shape");
 	const fields = parseGlobalFields(value.fields);
 	if (fields === null) return formError("fields");
 	if (typeof value.includeOptionalPhone !== "boolean") return formError("includeOptionalPhone");
@@ -1883,7 +1952,7 @@ function parseMailingListGlobalForm(value) {
 	});
 }
 function parseGlobalFields(value) {
-	if (!isRecord$37(value) || typeof value.preset !== "string") return null;
+	if (!isRecord$38(value) || typeof value.preset !== "string") return null;
 	switch (value.preset) {
 		case "emailOnly": return { preset: "emailOnly" };
 		case "emailName": return isRequirement(value.name) ? {
@@ -1920,7 +1989,7 @@ function parseOptionalString(value) {
 function isRequirement(value) {
 	return value === "required" || value === "optional";
 }
-function isRecord$37(value) {
+function isRecord$38(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function formError(field) {
@@ -1978,7 +2047,7 @@ var init_mailing_list_targeting = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-runtime.ts
 function parseMailingListRuntimeContext(value) {
-	if (!isRecord$36(value)) return invalidRuntimeContext();
+	if (!isRecord$37(value)) return invalidRuntimeContext();
 	if (value.tag === "not_configured") return ok$3({ tag: "not_configured" });
 	if (value.tag !== "configured") return invalidRuntimeContext();
 	const revision = parseMailingListSetupRevision(value.revision);
@@ -1993,7 +2062,7 @@ function parseMailingListRuntimeContext(value) {
 	});
 }
 function parseRuntimeProvider(value) {
-	if (!isRecord$36(value)) return null;
+	if (!isRecord$37(value)) return null;
 	switch (value.provider) {
 		case "native": return parseNativeRuntimeProvider(value);
 		case "brevo": return parseBrevoRuntimeProvider(value);
@@ -2025,7 +2094,7 @@ function parseMailchimpRuntimeProvider(value) {
 	if (defaultAudienceId === null) return null;
 	const audiences = [];
 	for (const audience of value.audiences) {
-		if (!isRecord$36(audience)) return null;
+		if (!isRecord$37(audience)) return null;
 		const id = parseMailchimpAudienceId$1(audience.id);
 		const name = parseName(audience.name);
 		if (id === null || name === null || !Array.isArray(audience.interests)) return null;
@@ -2046,7 +2115,7 @@ function parseMailchimpRuntimeProvider(value) {
 function parseMailchimpInterests(value) {
 	const interests = [];
 	for (const interest of value) {
-		if (!isRecord$36(interest)) return null;
+		if (!isRecord$37(interest)) return null;
 		const id = parseMailchimpInterestId(interest.id);
 		const name = parseName(interest.name);
 		const categoryName = parseName(interest.categoryName);
@@ -2063,7 +2132,7 @@ function parseNamedItems(value, parseId) {
 	if (!Array.isArray(value)) return null;
 	const items = [];
 	for (const item of value) {
-		if (!isRecord$36(item)) return null;
+		if (!isRecord$37(item)) return null;
 		const id = parseId(item.id);
 		const name = parseName(item.name);
 		if (id === null || name === null) return null;
@@ -2079,7 +2148,7 @@ function parseName(value) {
 	const name = value.trim();
 	return name.length > 0 ? name : null;
 }
-function isRecord$36(value) {
+function isRecord$37(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function invalidRuntimeContext() {
@@ -2670,6 +2739,7 @@ var init_src$2 = __esmMin((() => {
 	init_booking_instalments();
 	init_booking_date_time();
 	init_booking_consent();
+	init_appointment_service_categories();
 	init_dated_offering_settlement();
 	init_person_records();
 	init_rectification();
@@ -2854,11 +2924,11 @@ var init_storagePathDomain = __esmMin((() => {}));
 var init_fileAssetLegacyProjection = __esmMin((() => {}));
 //#endregion
 //#region ../media-core/src/typeGuards.ts
-function isRecord$34(value) {
+function isRecord$35(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function asRecord$3(value) {
-	return isRecord$34(value) ? value : void 0;
+	return isRecord$35(value) ? value : void 0;
 }
 var init_typeGuards$1 = __esmMin((() => {}));
 function isFileJsonObject(value) {
@@ -2868,7 +2938,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$34(value) && isFileJsonObject(value);
+	return isRecord$35(value) && isFileJsonObject(value);
 }
 var init_filePersistence = __esmMin((() => {
 	init_src$2();
@@ -3234,7 +3304,7 @@ function isCmsMediaObjectType(value) {
 	return typeof value === "string" && CMS_MEDIA_OBJECT_TYPES.includes(value);
 }
 function isCmsMediaObject(value) {
-	if (!isRecord$34(value)) return false;
+	if (!isRecord$35(value)) return false;
 	const type = value.type;
 	if (!isCmsMediaObjectType(type)) return false;
 	if ("attrs" in value) return false;
@@ -3245,7 +3315,7 @@ function collectMediaObjects(value, out, location = "") {
 		value.forEach((item, index) => collectMediaObjects(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$34(value)) return;
+	if (!isRecord$35(value)) return;
 	if (isCmsMediaObject(value)) out.push({
 		obj: value,
 		location
@@ -3291,8 +3361,8 @@ function walkAndCollectImageAttrs(value, out, location = "") {
 		value.forEach((item, index) => walkAndCollectImageAttrs(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$34(value)) return;
-	if (value.type === "image" && isRecord$34(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"
 	});
@@ -3352,7 +3422,7 @@ function mediaIdentifierOrFallback(current, fallback) {
 var init_renderableMediaAsset = __esmMin((() => {}));
 //#endregion
 //#region ../media-core/src/contentMediaAudit.ts
-function isRecord$33(value) {
+function isRecord$34(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function summarizeContentMediaValue(value) {
@@ -3363,7 +3433,7 @@ function summarizeContentMediaValue(value) {
 	}
 	if (value === null) return "null";
 	if (Array.isArray(value)) return `array(${value.length})`;
-	if (isRecord$33(value)) return `object(${Object.keys(value).sort().join(",")})`;
+	if (isRecord$34(value)) return `object(${Object.keys(value).sort().join(",")})`;
 	return typeof value;
 }
 function auditMediaValue(context, path, allowedMediaTypes, value) {
@@ -3387,9 +3457,9 @@ function auditMediaValue(context, path, allowedMediaTypes, value) {
 			allowedMediaTypes
 		}];
 	}
-	const hasValidIdentifier = isRecord$33(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0;
-	const hasValidExplicitType = isRecord$33(value) && (!("type" in value) || typeof value.type === "string" && allowedMediaTypes.includes(value.type));
-	const hasRetiredEnvironmentField = isRecord$33(value) && ("assetId" in value || "storagePath" in value || "storageBucket" in value || "src" in value || "mimeType" in value || looksLikeUuid(value.id));
+	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",
@@ -3400,7 +3470,7 @@ function auditMediaValue(context, path, allowedMediaTypes, value) {
 	}];
 }
 function auditFields(context, fields, value, parentPath) {
-	if (!isRecord$33(value)) return [];
+	if (!isRecord$34(value)) return [];
 	const findings = [];
 	for (const field of fields) {
 		if (!(field.id in value)) continue;
@@ -3417,7 +3487,7 @@ function auditFields(context, fields, value, parentPath) {
 				if (!Array.isArray(fieldValue)) break;
 				for (const [index, item] of fieldValue.entries()) {
 					const itemPath = [...fieldPath, index];
-					if (!isRecord$33(item)) {
+					if (!isRecord$34(item)) {
 						findings.push({
 							tag: "missing-schema",
 							context,
@@ -3451,7 +3521,7 @@ var init_contentMediaAudit = __esmMin((() => {
 }));
 //#endregion
 //#region ../media-core/src/contentMediaAuditFieldAdapter.ts
-function isRecord$32(value) {
+function isRecord$33(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function unknownArray(value) {
@@ -3460,7 +3530,7 @@ function unknownArray(value) {
 function fieldsArray(value) {
 	const directFields = unknownArray(value);
 	if (directFields) return directFields;
-	if (!isRecord$32(value)) return null;
+	if (!isRecord$33(value)) return null;
 	return unknownArray(value.fields);
 }
 function nestedFields$1(field) {
@@ -3525,7 +3595,7 @@ function mergeFields(fields) {
 }
 function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds = ["document"]) {
 	return mergeFields(rawFields.flatMap((rawField) => {
-		if (!isRecord$32(rawField)) return [];
+		if (!isRecord$33(rawField)) return [];
 		const { id, type } = rawField;
 		if (typeof id !== "string" || !id || typeof type !== "string") return [];
 		if (type === "media" || type === "file") return [{
@@ -3533,7 +3603,7 @@ function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds
 			id,
 			allowedMediaTypes: allowedMediaTypes(rawField, type, defaultFileKinds)
 		}];
-		if (flattenRepeaterGroups && type === "group" && isRecord$32(rawField.ui) && rawField.ui.flattenInRepeater === true) return adaptFields(nestedFields$1(rawField), false, 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,
@@ -3542,14 +3612,14 @@ function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds
 		if (type === "tabGroup") return [{
 			kind: "object",
 			id,
-			fields: adaptFields((unknownArray(rawField.tabs) ?? []).flatMap((tab) => isRecord$32(tab) ? unknownArray(tab.fields) ?? [] : []), false, defaultFileKinds)
+			fields: adaptFields((unknownArray(rawField.tabs) ?? []).flatMap((tab) => isRecord$33(tab) ? unknownArray(tab.fields) ?? [] : []), false, defaultFileKinds)
 		}];
 		if (type !== "repeater") return [];
-		if (isRecord$32(rawField.itemTypes)) return [{
+		if (isRecord$33(rawField.itemTypes)) return [{
 			kind: "repeater",
 			id,
 			mode: "variants",
-			variants: Object.entries(rawField.itemTypes).flatMap(([typeId, itemType]) => isRecord$32(itemType) && Array.isArray(itemType.fields) ? [{
+			variants: Object.entries(rawField.itemTypes).flatMap(([typeId, itemType]) => isRecord$33(itemType) && Array.isArray(itemType.fields) ? [{
 				typeId,
 				fields: adaptFields(itemType.fields, true, defaultFileKinds)
 			}] : []),
@@ -8420,7 +8490,7 @@ var init_resolvedButtonCss = __esmMin((() => {
 }));
 //#endregion
 //#region ../theme-core/src/buttons/generateButtonCss.ts
-function rule$1(selector, declarations) {
+function rule$2(selector, declarations) {
 	return {
 		selectors: typeof selector === "string" ? [selector] : selector,
 		declarations
@@ -8594,7 +8664,7 @@ function variantAffordanceRule(variant, selector) {
 	const maskUrl = affordanceIconMaskUrl(affordance.iconId);
 	if (!maskUrl) return null;
 	const mask = `url("${maskUrl}") no-repeat center / contain`;
-	return rule$1(`${selector}:not(.${AFFORDANCE_SUPPRESS_CLASS})::after`, [
+	return rule$2(`${selector}:not(.${AFFORDANCE_SUPPRESS_CLASS})::after`, [
 		["content", "\"\""],
 		["display", "inline-block"],
 		["width", "1em"],
@@ -8633,7 +8703,7 @@ function variantBaseRule(variant, selector, global, tokens, theme, colour) {
 		const borderWidth = BORDER_WIDTH_MAP$4[variant.border.widthClass] || "1px";
 		decls.push(["border", `${borderWidth} solid currentColor`]);
 	}
-	return rule$1(selector, decls);
+	return rule$2(selector, decls);
 }
 /**
 * Resolve a colour for a button that does not own its own background.
@@ -8644,13 +8714,13 @@ function variantBaseRule(variant, selector, global, tokens, theme, colour) {
 */
 function variantStateColourRule(variantId, themeId, state, colour) {
 	const baseSelector = `:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}`;
-	return rule$1(state === "hover" ? [`${baseSelector}:hover`, `${baseSelector}[data-force-hover="true"]`] : `${baseSelector}:${state}`, resolvedButtonColourDeclarations(colour, {
+	return rule$2(state === "hover" ? [`${baseSelector}:hover`, `${baseSelector}[data-force-hover="true"]`] : `${baseSelector}:${state}`, resolvedButtonColourDeclarations(colour, {
 		role: variantId,
 		state
 	}));
 }
 function variantFocusVisibleRule(variantId, themeId, focusIndicator) {
-	return rule$1(`:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}:focus-visible`, resolvedButtonFocusDeclarations(focusIndicator, variantId));
+	return rule$2(`:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}:focus-visible`, resolvedButtonFocusDeclarations(focusIndicator, variantId));
 }
 function variantEffectsCss(variant, effects, themeId, tokens, theme) {
 	if (!effects) return "";
@@ -8676,10 +8746,10 @@ function variantDisabledRules(variantId, themeId, colour) {
 		`${base}:focus`
 	];
 	const pseudoSelectors = [`${base}::before`, `${base}::after`];
-	return [rule$1(disabledSelectors, [...resolvedButtonColourDeclarations(colour, {
+	return [rule$2(disabledSelectors, [...resolvedButtonColourDeclarations(colour, {
 		role: variantId,
 		state: "disabled"
-	}), ...RESOLVED_BUTTON_DISABLED_DECLARATIONS]), rule$1(pseudoSelectors, [
+	}), ...RESOLVED_BUTTON_DISABLED_DECLARATIONS]), rule$2(pseudoSelectors, [
 		["opacity", "0"],
 		["animation", "none"],
 		["pointer-events", "none"]
@@ -8694,7 +8764,7 @@ function variantSizeRules(variant, variantId, themeSizes, themeId) {
 		const decls = [];
 		for (const decl of paddingDeclarations(config.padding, borderWidth)) decls.push(decl);
 		if (config.fontSize) decls.push(["font-size", FONT_SIZE_MAP[config.fontSize] || "1rem"]);
-		rules.push(rule$1(selector, decls));
+		rules.push(rule$2(selector, decls));
 	}
 	return rules;
 }
@@ -12073,6 +12143,15 @@ function asSiteStyleId(value) {
 function asDesignSystemTemplateId(value) {
 	return brandNonEmptyString(value, "DesignSystemTemplateId");
 }
+function toNonEmptyReadonlyArray(values) {
+	const [first, ...rest] = values;
+	return first === void 0 ? null : [first, ...rest];
+}
+function requireNonEmptyReadonlyArray(values, message = "Expected a non-empty array.") {
+	const result = toNonEmptyReadonlyArray(values);
+	if (!result) throw new Error(message);
+	return result;
+}
 function makeBoundaryId(previousBlockId, nextBlockId) {
 	return asDesignBoundaryId(`boundary:${encodeURIComponent(previousBlockId)}:${encodeURIComponent(nextBlockId)}`);
 }
@@ -12180,7 +12259,8 @@ var init_types$8 = __esmMin((() => {
 		"swap"
 	];
 }));
-var logoTextConfidenceValues, logoAssetShapeValues, logoKindValues, logoDensityValues, logoContainsTextSchema, logoAnalysisSourceSchema, brandDisplayModeValues, logoAccommodationPatternValues, logoSizePolicyValues, defaultNoLogoFacts, sizeOrder, init_logoBranding = __esmMin((() => {
+var logoTextConfidenceValues, logoAssetShapeValues, logoKindValues, logoDensityValues, logoContainsTextSchema, logoAnalysisSourceSchema, brandDisplayModeValues, logoAccommodationPatternValues, logoSizePolicyValues, defaultNoLogoFacts, sizeOrder;
+var init_logoBranding = __esmMin((() => {
 	init_types$8();
 	logoTextConfidenceValues = [
 		"low",
@@ -12270,26 +12350,44 @@ var logoTextConfidenceValues, logoAssetShapeValues, logoKindValues, logoDensityV
 		"generous",
 		"display"
 	];
-})), themeV2RuntimeStyleFieldNames, themeV2BlockSpecificRawStyleFieldNames, themeV2NormalEditorRawStyleFieldNames, pageDesignEditorBackgroundOverrideOwner, siteChromeBackgroundOverrideOwner;
+}));
+/**
+* A `styleGroup` in the retired `site-style-transition-*` namespace is residue
+* from the old per-block transition path (issue 1422). Any other value is
+* authored and must survive.
+*/
+function isStaleTransitionStyleGroup(value) {
+	return typeof value === "string" && value.startsWith(staleTransitionStyleGroupPrefix);
+}
+/** Drops a stale transition `styleGroup`, leaving authored values untouched. */
+function stripStaleTransitionStyleGroup(content) {
+	if (!isStaleTransitionStyleGroup(content.styleGroup)) return { ...content };
+	const { styleGroup: _stale, ...rest } = content;
+	return rest;
+}
+var themeV2RuntimeStyleFieldNames, themeV2BlockSpecificRawStyleFieldNames, themeV2NormalEditorRawStyleFieldNames, pageDesignEditorBackgroundOverrideOwner, siteChromeBackgroundOverrideOwner, staleTransitionStyleGroupPrefix;
 var init_rawStyleFields = __esmMin((() => {
 	themeV2RuntimeStyleFieldNames = [
 		"_frameStyles",
 		"_sectionStyles",
 		"_containerStyles",
-		"_cardStyles",
-		"_transitionStyles",
-		"styleGroup"
+		"_cardStyles"
 	];
 	themeV2BlockSpecificRawStyleFieldNames = [
 		"_contentCardStyles",
 		"_heroLayoutStyles",
 		"_textCardStyles"
 	];
-	themeV2NormalEditorRawStyleFieldNames = [...themeV2RuntimeStyleFieldNames, ...themeV2BlockSpecificRawStyleFieldNames];
+	themeV2NormalEditorRawStyleFieldNames = [
+		...themeV2RuntimeStyleFieldNames,
+		...themeV2BlockSpecificRawStyleFieldNames,
+		"styleGroup"
+	];
 	new Set(themeV2NormalEditorRawStyleFieldNames);
 	[...themeV2RuntimeStyleFieldNames, ...themeV2BlockSpecificRawStyleFieldNames];
 	pageDesignEditorBackgroundOverrideOwner = "page-design-editor";
 	siteChromeBackgroundOverrideOwner = "site-chrome-editor";
+	staleTransitionStyleGroupPrefix = "site-style-transition-";
 })), headerVariantValues, legacyHeaderVariants, legacyHeaderVariantValues, headerVariantWithLegacyAliasSchema;
 var init_legacyHeaderVariant = __esmMin((() => {
 	headerVariantValues = [
@@ -12513,7 +12611,7 @@ var init_interactionPalette = __esmMin((() => {
 //#endregion
 //#region ../theme-core/src/boxBackgroundSchema.ts
 function normalizeAuthoringOpacity(value) {
-	if (!isRecord$31(value)) return value;
+	if (!isRecord$32(value)) return value;
 	return {
 		...value,
 		opacity: normalizeOpacity(value.opacity)
@@ -12522,7 +12620,7 @@ function normalizeAuthoringOpacity(value) {
 function normalizeOpacity(value) {
 	return typeof value === "number" && value > 1 && value <= 100 ? value / 100 : value;
 }
-function isRecord$31(value) {
+function isRecord$32(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var boxBackgroundOverlaySchema, commonSchema, mediaPresentationSchema, boxBackgroundSchema;
@@ -13341,7 +13439,7 @@ var init_media$1 = __esmMin((() => {
 /**
 * Strict record guard: excludes null, primitives, and arrays.
 */
-function isRecord$30(value) {
+function isRecord$31(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /**
@@ -16153,17 +16251,280 @@ var init_cardRoleVocabulary = __esmMin((() => {
 	Object.keys(legacyItemSurfaceCardRoles);
 	cardRoleWithLegacyAliasSchema = z$1.preprocess((value) => cardRoleFromLegacyVocabulary(value) ?? value, cardRoleSchema);
 }));
-var init_compositionBudget = __esmMin((() => {
-	init_types$8();
-}));
-var defaultHeaderBrandPreferences;
-var init_compilationPlan = __esmMin((() => {
-	defaultHeaderBrandPreferences = {
-		brandDisplay: "auto",
-		logoSize: "auto"
+//#endregion
+//#region ../theme-core/src/site-styles/runtimeBackgroundResolution.ts
+function parseCanonicalRuntimeBackground(content) {
+	const background = readRecord(readRecord(content._sectionStyles)?.background);
+	if (!background) return { kind: "none" };
+	const parsed = boxBackgroundSchema.safeParse(background);
+	if (!parsed.success) return { kind: "none" };
+	return parsed.data.contentOwner === "page-design-editor" ? {
+		kind: "page-design-override",
+		background: parsed.data
+	} : {
+		kind: "block-authored",
+		background: parsed.data
 	};
+}
+function readRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+var init_runtimeBackgroundResolution = __esmMin((() => {
+	init_boxBackgroundSchema();
+	init_surfaces();
+	init_rawStyleFields();
+}));
+//#endregion
+//#region ../theme-core/src/site-styles/transitionCatalogue.ts
+/** CSS `clip-path` value for an angle shape, as `generateLayoutCss` draws it. */
+function anglePolygonCss(polygon) {
+	return `polygon(0 ${polygon.startTopPercent}%, 100% ${polygon.endTopPercent}%, 100% 100%, 0 100%)`;
+}
+var transitionCatalogueFamilies, mediumHeight, compactHeight, largeHeight, transitionCatalogueEntries;
+var init_transitionCatalogue = __esmMin((() => {
+	init_types$8();
+	transitionCatalogueFamilies = [
+		{
+			id: "gradient",
+			label: "Gradient"
+		},
+		{
+			id: "wave",
+			label: "Wave"
+		},
+		{
+			id: "angle",
+			label: "Angle"
+		}
+	];
+	mediumHeight = "6rem + 2px";
+	compactHeight = "4.5rem + 2px";
+	largeHeight = "7rem + 2px";
+	transitionCatalogueEntries = defineExactCatalog()([
+		{
+			intent: "soft-fade-short",
+			optionId: asBoundaryOptionId("break:soft"),
+			family: "gradient",
+			variantId: "soft",
+			label: "Soft",
+			variantLabel: "Soft",
+			treatment: {
+				kind: "soft-fade",
+				height: "medium",
+				curve: "soft"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "soft-fade-long",
+			optionId: asBoundaryOptionId("break:spacious"),
+			family: "gradient",
+			variantId: "spacious",
+			label: "Spacious",
+			variantLabel: "Spacious",
+			treatment: {
+				kind: "soft-fade",
+				height: "large",
+				curve: "spacious"
+			},
+			size: "spacious",
+			heightExpression: "10rem",
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "soft-fade-expansive",
+			optionId: asBoundaryOptionId("break:expansive"),
+			family: "gradient",
+			variantId: "expansive",
+			label: "Expansive",
+			variantLabel: "Expansive",
+			treatment: {
+				kind: "soft-fade",
+				height: "expansive",
+				curve: "expansive"
+			},
+			size: "expansive",
+			heightExpression: "14rem",
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "wave-edge-balanced",
+			optionId: asBoundaryOptionId("break:wave-balanced"),
+			family: "wave",
+			variantId: "balanced",
+			label: "Balanced wave",
+			variantLabel: "Balanced",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "symmetrical"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "balanced"
+			}
+		},
+		{
+			intent: "wave-edge",
+			optionId: asBoundaryOptionId("break:wave"),
+			family: "wave",
+			variantId: "classic",
+			label: "Classic wave",
+			variantLabel: "Classic",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "asymmetrical"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "classic"
+			}
+		},
+		{
+			intent: "wave-edge-gentle",
+			optionId: asBoundaryOptionId("break:wave-gentle"),
+			family: "wave",
+			variantId: "gentle",
+			label: "Gentle wave",
+			variantLabel: "Gentle",
+			treatment: {
+				kind: "wave-edge",
+				height: "compact",
+				amplitude: "subtle",
+				rhythm: "single",
+				symmetry: "symmetrical"
+			},
+			size: "compact",
+			heightExpression: compactHeight,
+			shape: {
+				kind: "wave",
+				mask: "gentle"
+			}
+		},
+		{
+			intent: "wave-edge-bold",
+			optionId: asBoundaryOptionId("break:wave-bold"),
+			family: "wave",
+			variantId: "bold",
+			label: "Bold wave",
+			variantLabel: "Bold",
+			treatment: {
+				kind: "wave-edge",
+				height: "large",
+				amplitude: "bold",
+				rhythm: "double",
+				symmetry: "symmetrical"
+			},
+			size: "large",
+			heightExpression: largeHeight,
+			shape: {
+				kind: "wave",
+				mask: "bold"
+			}
+		},
+		{
+			intent: "wave-edge-drift",
+			optionId: asBoundaryOptionId("break:wave-drift"),
+			family: "wave",
+			variantId: "drift",
+			label: "Drift wave",
+			variantLabel: "Drift",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "drift"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "drift"
+			}
+		},
+		{
+			intent: "angle-edge-subtle",
+			optionId: asBoundaryOptionId("break:angle-subtle"),
+			family: "angle",
+			variantId: "subtle",
+			label: "Subtle angle",
+			variantLabel: "Subtle",
+			treatment: {
+				kind: "angle-edge",
+				height: "compact",
+				slope: "subtle",
+				direction: "forward"
+			},
+			size: "compact",
+			heightExpression: compactHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 34,
+					endTopPercent: 18
+				}
+			}
+		},
+		{
+			intent: "angle-edge",
+			optionId: asBoundaryOptionId("break:angle-balanced"),
+			family: "angle",
+			variantId: "balanced",
+			label: "Balanced angle",
+			variantLabel: "Balanced",
+			treatment: {
+				kind: "angle-edge",
+				height: "medium",
+				slope: "balanced",
+				direction: "forward"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 42,
+					endTopPercent: 8
+				}
+			}
+		},
+		{
+			intent: "angle-edge-steep",
+			optionId: asBoundaryOptionId("break:angle-steep"),
+			family: "angle",
+			variantId: "steep",
+			label: "Steep angle",
+			variantLabel: "Steep",
+			treatment: {
+				kind: "angle-edge",
+				height: "large",
+				slope: "steep",
+				direction: "forward"
+			},
+			size: "large",
+			heightExpression: largeHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 54,
+					endTopPercent: 0
+				}
+			}
+		}
+	]);
 }));
-var init_schemaVersionedJson = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/site-styles/sectionTransitions.ts
 function boundaryRuntimeMetrics(family, size, heightExpression) {
@@ -16174,62 +16535,268 @@ function boundaryRuntimeMetrics(family, size, heightExpression) {
 		reserveCss: `calc((${heightExpression}) / 2)`
 	};
 }
-function boundaryRuntimeMetricsForTransition(transition) {
-	return sectionBoundaryRuntimeMetricsByTransition[transition];
+/**
+* The catalogue's compile-time coverage check guarantees an entry per
+* decorative intent, so a miss here is a broken invariant, not bad input.
+*/
+function requireCatalogueValue(values, intent) {
+	const value = values.get(intent);
+	if (value === void 0) throw new Error(`Transition catalogue has no entry for ${intent}`);
+	return value;
+}
+function boundaryRuntimeMetricsForDecorativeTransition(transition) {
+	return requireCatalogueValue(metricsByIntent, transition);
+}
+function boundaryOptionForTransitionIntent(intent) {
+	return requireCatalogueValue(boundaryOptionByIntent, intent);
+}
+function transitionVariantForEntry(entry) {
+	return {
+		familyId: entry.family,
+		variantId: entry.variantId,
+		label: entry.variantLabel,
+		boundaryOption: boundaryOptionForTransitionIntent(entry.intent)
+	};
+}
+function stableTreatmentKey(treatment) {
+	switch (treatment.kind) {
+		case "none": return "none";
+		case "soft-fade": return `${treatment.kind}:${treatment.height}:${treatment.curve}`;
+		case "wave-edge": return [
+			treatment.kind,
+			treatment.height,
+			treatment.amplitude,
+			treatment.rhythm,
+			treatment.symmetry
+		].join(":");
+		case "angle-edge": return [
+			treatment.kind,
+			treatment.height,
+			treatment.slope,
+			treatment.direction
+		].join(":");
+		case "legacy-unsupported": return `${treatment.kind}:${treatment.boundaryOptionId}`;
+	}
 }
-var sectionBoundaryRuntimeMetricsByTransition, noneBoundaryOption, softBoundaryOption, spaciousBoundaryOption;
+var metricsByIntent, noneBoundaryOption, boundaryOptionByIntent, softBoundaryOption, spaciousBoundaryOption, boundaryOptions, noneTransitionVariant, sectionTransitionFamilies;
 var init_sectionTransitions = __esmMin((() => {
 	init_types$8();
-	sectionBoundaryRuntimeMetricsByTransition = {
-		none: null,
-		"soft-fade-short": boundaryRuntimeMetrics("gradient", "medium", "6rem + 2px"),
-		"soft-fade-long": boundaryRuntimeMetrics("gradient", "spacious", "10rem"),
-		"soft-fade-expansive": boundaryRuntimeMetrics("gradient", "expansive", "14rem"),
-		"wave-edge": boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"),
-		"wave-edge-balanced": boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"),
-		"wave-edge-gentle": boundaryRuntimeMetrics("wave", "compact", "4.5rem + 2px"),
-		"wave-edge-bold": boundaryRuntimeMetrics("wave", "large", "7rem + 2px"),
-		"wave-edge-drift": boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"),
-		"angle-edge": boundaryRuntimeMetrics("angle", "medium", "6rem + 2px"),
-		"angle-edge-subtle": boundaryRuntimeMetrics("angle", "compact", "4.5rem + 2px"),
-		"angle-edge-steep": boundaryRuntimeMetrics("angle", "large", "7rem + 2px")
-	};
+	init_transitionCatalogue();
+	new Map(transitionCatalogueEntries.map((entry) => [entry.intent, entry]));
+	metricsByIntent = new Map(transitionCatalogueEntries.map((entry) => [entry.intent, boundaryRuntimeMetrics(entry.family, entry.size, entry.heightExpression)]));
 	noneBoundaryOption = {
 		id: asBoundaryOptionId("break:none"),
 		label: "None",
 		transitionAfter: "none",
 		treatment: { kind: "none" }
 	};
-	softBoundaryOption = {
-		id: asBoundaryOptionId("break:soft"),
-		label: "Soft",
-		transitionAfter: "soft-fade-short",
-		treatment: {
-			kind: "soft-fade",
-			height: "medium",
-			curve: "soft"
+	boundaryOptionByIntent = new Map(transitionCatalogueEntries.map((entry) => [entry.intent, {
+		id: entry.optionId,
+		label: entry.label,
+		transitionAfter: entry.intent,
+		treatment: entry.treatment
+	}]));
+	softBoundaryOption = boundaryOptionForTransitionIntent("soft-fade-short");
+	spaciousBoundaryOption = boundaryOptionForTransitionIntent("soft-fade-long");
+	boundaryOptionForTransitionIntent("soft-fade-expansive");
+	boundaryOptionForTransitionIntent("wave-edge");
+	boundaryOptionForTransitionIntent("wave-edge-balanced");
+	boundaryOptionForTransitionIntent("wave-edge-gentle");
+	boundaryOptionForTransitionIntent("wave-edge-bold");
+	boundaryOptionForTransitionIntent("wave-edge-drift");
+	boundaryOptionForTransitionIntent("angle-edge-subtle");
+	boundaryOptionForTransitionIntent("angle-edge");
+	boundaryOptionForTransitionIntent("angle-edge-steep");
+	boundaryOptions = [noneBoundaryOption, ...transitionCatalogueEntries.map((entry) => boundaryOptionForTransitionIntent(entry.intent))];
+	noneTransitionVariant = {
+		familyId: "none",
+		variantId: "none",
+		label: "None",
+		boundaryOption: noneBoundaryOption
+	};
+	sectionTransitionFamilies = [{
+		id: "none",
+		label: "None",
+		variants: [noneTransitionVariant]
+	}, ...transitionCatalogueFamilies.map((family) => ({
+		id: family.id,
+		label: family.label,
+		variants: requireNonEmptyReadonlyArray(transitionCatalogueEntries.filter((entry) => entry.family === family.id).map(transitionVariantForEntry), `Transition family ${family.id} has no catalogue entries.`)
+	}))];
+	new Map(boundaryOptions.map((option) => [option.id, option]));
+	new Map(boundaryOptions.map((option) => [stableTreatmentKey(option.treatment), option]));
+	new Map(sectionTransitionFamilies.flatMap((family) => family.variants.map((variant) => [variant.boundaryOption.id, variant])));
+	new Map(sectionTransitionFamilies.map((family) => [family.id, family]));
+}));
+//#endregion
+//#region ../theme-core/src/site-styles/sectionBoundaryComposition.ts
+/**
+* Classifies a section from its final render content. `_sectionStyles`
+* already holds the effective background (Look default, page-design override
+* and block-authored media merged by `resolveSectionBackground`), so this only
+* reads it and never re-decides precedence. A missing or unparseable
+* background is the page background, as it is for the renderer.
+*/
+function boundaryEndpointForSectionContent(content) {
+	const background = parseCanonicalRuntimeBackground(content);
+	if (background.kind === "none") return {
+		kind: "paint",
+		token: backgroundToken
+	};
+	const effective = background.background;
+	switch (effective.type) {
+		case "color": {
+			if (effective.color === null || effective.color === void 0) return {
+				kind: "paint",
+				token: backgroundToken
+			};
+			const token = parseThemeColorToken(effective.color);
+			return token ? {
+				kind: "paint",
+				token
+			} : {
+				kind: "unpainted",
+				reason: "literal-color"
+			};
+		}
+		case "gradient": return {
+			kind: "unpainted",
+			reason: "gradient"
+		};
+		case "image":
+		case "video": return {
+			kind: "unpainted",
+			reason: "media"
+		};
+		default: return assertNever$12(effective, "Unhandled section background type");
+	}
+}
+/**
+* Reads both facts from final render content in one place. `_frameStyles` is
+* the compiled frame; content without one (no page design, an SDK block)
+* draws a plain frame.
+*/
+function sectionFactsForContent(content) {
+	return {
+		endpoint: boundaryEndpointForSectionContent(content),
+		frame: frameKindForContent(content)
+	};
+}
+function frameKindForContent(content) {
+	const frameStyles = content._frameStyles;
+	const kind = typeof frameStyles === "object" && frameStyles !== null && "kind" in frameStyles ? frameStyles.kind : null;
+	return kind === "panel" || kind === "flush-panel" ? kind : "plain";
+}
+/**
+* The frame rule: a flush panel owns the edge it runs to, so no break is
+* drawn next to one. The single home for this rule; the generated
+* pipeline's budget and the site-style lab ask it with their plan frames.
+*/
+function frameNotShownReason(previous, next) {
+	return previous === "flush-panel" || next === "flush-panel" ? "flush-panel" : null;
+}
+/**
+* Decides whether and how a join draws. The frame rule wins before paint is
+* considered; two unpainted sides show nothing.
+*/
+function composeBoundary(previous, next) {
+	const frameReason = frameNotShownReason(previous.frame, next.frame);
+	if (frameReason) return {
+		kind: "not-shown",
+		reason: frameReason
+	};
+	const from = previous.endpoint;
+	const to = next.endpoint;
+	if (from.kind === "paint") return {
+		kind: "shown",
+		composition: to.kind === "paint" ? {
+			kind: "paint-to-paint",
+			from: from.token,
+			to: to.token
+		} : {
+			kind: "paint-to-unpainted",
+			from: from.token
 		}
 	};
-	spaciousBoundaryOption = {
-		id: asBoundaryOptionId("break:spacious"),
-		label: "Spacious",
-		transitionAfter: "soft-fade-long",
-		treatment: {
-			kind: "soft-fade",
-			height: "large",
-			curve: "spacious"
+	return to.kind === "paint" ? {
+		kind: "shown",
+		composition: {
+			kind: "unpainted-to-paint",
+			to: to.token
 		}
+	} : {
+		kind: "not-shown",
+		reason: "both-unpainted"
+	};
+}
+/**
+* Placement, reserves and paint for a shown boundary, derived from the
+* composition and the catalogue's metrics for the treatment.
+*/
+function boundaryLayout(intent, composition) {
+	const metrics = boundaryRuntimeMetricsForDecorativeTransition(intent);
+	switch (composition.kind) {
+		case "paint-to-paint": return {
+			placement: "centred",
+			reserves: {
+				before: metrics.reserveCss,
+				after: metrics.reserveCss
+			},
+			paint: {
+				band: composition.from,
+				shape: composition.to
+			}
+		};
+		case "unpainted-to-paint": return {
+			placement: "previous",
+			reserves: {
+				before: metrics.heightCss,
+				after: null
+			},
+			paint: {
+				band: null,
+				shape: composition.to
+			}
+		};
+		case "paint-to-unpainted": return {
+			placement: "next",
+			reserves: {
+				before: null,
+				after: metrics.heightCss
+			},
+			paint: {
+				band: null,
+				shape: composition.from
+			}
+		};
+		default: return assertNever$12(composition, "Unhandled boundary composition");
+	}
+}
+function requireThemeColorToken$1(value) {
+	const token = parseThemeColorToken(value);
+	if (!token) throw new Error(`Expected a theme color token. Received: ${value}`);
+	return token;
+}
+var backgroundToken;
+var init_sectionBoundaryComposition = __esmMin((() => {
+	init_themeColorTokens();
+	init_runtimeBackgroundResolution();
+	init_sectionTransitions();
+	init_types$8();
+	backgroundToken = requireThemeColorToken$1("background");
+}));
+var init_compositionBudget = __esmMin((() => {
+	init_types$8();
+	init_sectionBoundaryComposition();
+}));
+var defaultHeaderBrandPreferences;
+var init_compilationPlan = __esmMin((() => {
+	defaultHeaderBrandPreferences = {
+		brandDisplay: "auto",
+		logoSize: "auto"
 	};
-	asBoundaryOptionId("break:expansive");
-	asBoundaryOptionId("break:wave");
-	asBoundaryOptionId("break:wave-balanced");
-	asBoundaryOptionId("break:wave-gentle");
-	asBoundaryOptionId("break:wave-bold");
-	asBoundaryOptionId("break:wave-drift");
-	asBoundaryOptionId("break:angle-subtle");
-	asBoundaryOptionId("break:angle-balanced");
-	asBoundaryOptionId("break:angle-steep");
 }));
+var init_schemaVersionedJson = __esmMin((() => {}));
 function addDuplicateStringIssues(ctx, input) {
 	const seen = /* @__PURE__ */ new Set();
 	const duplicates = /* @__PURE__ */ new Set();
@@ -16258,14 +16825,11 @@ function validateUniquePageDesignPins(intent, ctx) {
 		label: "block Look pin"
 	});
 	addDuplicateStringIssues(ctx, {
-		values: intent.boundaryPins.map((pin) => boundaryKey$1(pin.previousBlockId, pin.nextBlockId)),
+		values: intent.boundaryPins.map((pin) => makeBoundaryId(pin.previousBlockId, pin.nextBlockId)),
 		path: ["boundaryPins"],
 		label: "boundary pin"
 	});
 }
-function boundaryKey$1(previousBlockId, nextBlockId) {
-	return makeBoundaryId(previousBlockId, nextBlockId);
-}
 var pageDesignUserPinnedAppearanceChoiceSchema, pageDesignUserPinnedBoundaryChoiceSchema, pageDesignBoundaryTreatmentSchema, pageDesignUserPinnedBoundaryTreatmentChoiceSchema, pageDesignBlockLookPinSchema, pageDesignBoundaryPinSchema, legacyPageDesignBoundaryPinSchema;
 var init_pageDesignIntent = __esmMin((() => {
 	init_types$8();
@@ -19332,6 +19896,33 @@ var init_designState = __esmMin((() => {
 		authority: styleAuthoritySchema
 	}).strict();
 }));
+var init_pageFlowPresets = __esmMin((() => {
+	init_sectionTransitions();
+	init_types$8();
+	asPageFlowPresetId("flow:quiet"), noneBoundaryOption.id, asPageFlowPresetId("flow:balanced"), softBoundaryOption.id, asPageFlowPresetId("flow:expressive"), spaciousBoundaryOption.id;
+})), init_lookResolution = __esmMin((() => {
+	init_appearancePresets();
+	init_types$8();
+}));
+var init_siteStyleBlockPolicies = __esmMin((() => {
+	init_lookResolution();
+	init_appearancePresets();
+	init_pageDesignIntent();
+	init_types$8();
+	asPageFlowPresetId("generated-default");
+	asSiteStyleId("site-style:south-west-twerk-school");
+	asAppearancePresetId("hero-brand-scrim-fixed-frame");
+	asLayoutVariantKey("classic");
+	asLayoutVariantKey("micro");
+	asBoundaryOptionId("break:wave");
+}));
+var init_joinTreatment = __esmMin((() => {
+	init_pageFlowPresets();
+	init_pageDesignIntent();
+	init_sectionTransitions();
+	init_siteStyleBlockPolicies();
+	init_types$8();
+}));
 var init_imageSurfaceBackground = __esmMin((() => {
 	init_types$8();
 }));
@@ -19364,37 +19955,6 @@ function uniformSectionForeground(token) {
 		supportingColor: token
 	};
 }
-function compileTransitionRuntime(input) {
-	return {
-		treatment: input.treatment,
-		from: input.from,
-		to: input.to,
-		cssVars: {
-			from: input.from.kind === "surface" && input.from.surface === "hero-image" ? "transparent" : transitionEndpointCssValue(input.from),
-			to: transitionEndpointCssValue(input.to)
-		}
-	};
-}
-function transitionEndpointCssValue(endpoint) {
-	switch (endpoint.kind) {
-		case "color-token": return themeColorTokenCssValue(endpoint.token);
-		case "surface": return themeColorTokenCssValue(tokenForTransitionSurface(endpoint.surface));
-		default: return assertNever$12(endpoint);
-	}
-}
-function tokenForTransitionSurface(surface) {
-	switch (surface) {
-		case "base":
-		case "hero-image": return "background";
-		case "muted-band": return "muted";
-		case "accent-band": return "accent";
-		case "brand-depth-band": return "primary-800";
-		default: return assertNever$12(surface);
-	}
-}
-function themeColorTokenCssValue(token) {
-	return `rgb(var(--tb-${token}))`;
-}
 var defaultDesignRuntimeRules, defaultComponentRuntimeRules;
 var init_runtimeCompiler = __esmMin((() => {
 	init_schema$2();
@@ -19403,8 +19963,9 @@ var init_runtimeCompiler = __esmMin((() => {
 	init_styles();
 	init_designState();
 	init_types$8();
+	init_joinTreatment();
+	init_rawStyleFields();
 	init_accessibleSurfaces();
-	init_sectionTransitions();
 	init_tokens();
 	init_gradients();
 	init_imageSurfaceBackground();
@@ -19441,8 +20002,7 @@ var init_runtimeCompiler = __esmMin((() => {
 				color: "surface",
 				opacity: .88
 			}
-		},
-		transitionClassName: (transition, fromSurface, toSurface) => transition === "none" ? null : `site-style-transition-${transition}-from-${fromSurface}-to-${toSurface}`
+		}
 	});
 	defaultComponentRuntimeRules = defineComponentRuntimeRules({
 		panelFrames: {
@@ -21181,22 +21741,12 @@ var init_curatedSiteStyles = __esmMin((() => {
 	];
 	curatedSiteStylesById = new Map(curatedSiteStyles.map((style) => [style.id, style]));
 }));
-var init_pageDesignEditorCapabilities = __esmMin((() => {})), init_lookResolution = __esmMin((() => {
-	init_appearancePresets();
-	init_types$8();
-}));
-var init_siteStyleBlockPolicies = __esmMin((() => {
-	init_lookResolution();
-	init_appearancePresets();
+var init_pageDesignEditorCapabilities = __esmMin((() => {}));
+var init_pageDesignEditorBoundaries = __esmMin((() => {
 	init_pageDesignIntent();
-	init_types$8();
+	init_joinTreatment();
 	init_sectionTransitions();
-	asPageFlowPresetId("generated-default");
-	asSiteStyleId("site-style:south-west-twerk-school");
-	asAppearancePresetId("hero-brand-scrim-fixed-frame");
-	asLayoutVariantKey("classic");
-	asLayoutVariantKey("micro");
-	asBoundaryOptionId("break:wave");
+	init_types$8();
 }));
 var init_pageDesignEditorModel = __esmMin((() => {
 	init_curatedSiteStyles();
@@ -21205,8 +21755,9 @@ var init_pageDesignEditorModel = __esmMin((() => {
 	init_siteStyleBlockPolicies();
 	init_pageDesignIntent();
 	init_types$8();
+	init_pageFlowPresets();
+	init_pageDesignEditorBoundaries();
 	init_sectionTransitions();
-	asPageFlowPresetId("flow:quiet"), noneBoundaryOption.id, asPageFlowPresetId("flow:balanced"), softBoundaryOption.id, asPageFlowPresetId("flow:expressive"), spaciousBoundaryOption.id;
 })), init_concretePalette = __esmMin((() => {
 	init_colors();
 })), blockDesignFallback;
@@ -21215,7 +21766,6 @@ var init_resolver = __esmMin((() => {
 	blockDesignFallback = {
 		sectionSurface: "base",
 		contentFrame: plainFrame,
-		transitionAfter: "none",
 		sectionHeight: "default",
 		heroLegibility: "none",
 		imageSurfaceTreatment: { kind: "none" },
@@ -21226,7 +21776,7 @@ var init_resolver = __esmMin((() => {
 		accordionIconTreatment: null,
 		composition: null
 	};
-	blockDesignFallback.sectionSurface, blockDesignFallback.contentFrame, blockDesignFallback.transitionAfter, blockDesignFallback.sectionHeight, blockDesignFallback.heroLegibility, blockDesignFallback.imageSurfaceTreatment, blockDesignFallback.imageSurfaceMotion, blockDesignFallback.tileTreatment, blockDesignFallback.eventListTreatment, blockDesignFallback.eyebrowTreatment, blockDesignFallback.accordionIconTreatment, blockDesignFallback.composition;
+	blockDesignFallback.sectionSurface, blockDesignFallback.contentFrame, blockDesignFallback.sectionHeight, blockDesignFallback.heroLegibility, blockDesignFallback.imageSurfaceTreatment, blockDesignFallback.imageSurfaceMotion, blockDesignFallback.tileTreatment, blockDesignFallback.eventListTreatment, blockDesignFallback.eyebrowTreatment, blockDesignFallback.accordionIconTreatment, blockDesignFallback.composition;
 }));
 function parseSiteChromeBackgroundColorToken(value) {
 	const token = parseBackgroundAppearanceColorToken(value);
@@ -21340,11 +21890,6 @@ var init_headerRecompile = __esmMin((() => {
 	init_headerBrandPresentation();
 	init_siteChromeNavPreferences();
 }));
-var init_runtimeBackgroundResolution = __esmMin((() => {
-	init_boxBackgroundSchema();
-	init_surfaces();
-	init_rawStyleFields();
-}));
 var init_previewRuntimeCapabilities = __esmMin((() => {
 	init_types$8();
 }));
@@ -21363,38 +21908,9 @@ var init_buttonSelectionCompiler = __esmMin((() => {
 var init_previewCustomization = __esmMin((() => {
 	init_types$8();
 }));
-function retargetCompiledBoundaryRuntimeForContentAdjacency(boundary, adjacency) {
-	const fromSurface = contentOwnedBackgroundEndpoint(adjacency.currentContent) ?? boundary.from;
-	const toSurface = contentOwnedBackgroundEndpoint(adjacency.nextContent) ?? boundary.to;
-	if (fromSurface === boundary.from && toSurface === boundary.to) return boundary;
-	const transition = compileTransitionRuntime({
-		treatment: boundary.treatment,
-		from: fromSurface,
-		to: toSurface
-	});
-	return {
-		...boundary,
-		from: transition.from,
-		to: transition.to,
-		cssVars: transition.cssVars
-	};
-}
-function contentOwnedBackgroundEndpoint(content) {
-	const background = readRecord(readRecord(content?._sectionStyles)?.background);
-	if (background?.contentOwner !== "page-design-editor" || background.type !== "color") return null;
-	const token = parseThemeColorToken(background.color);
-	if (!token) return null;
-	return {
-		kind: "color-token",
-		token
-	};
-}
-function readRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
-}
 var init_previewCompiler = __esmMin((() => {
+	init_sectionTransitions();
 	init_schema$2();
-	init_tokens();
 	init_curated();
 	init_concretePalette();
 	init_curatedSiteStyles();
@@ -21404,7 +21920,6 @@ var init_previewCompiler = __esmMin((() => {
 	init_headerRecompile();
 	init_siteChromeNavPreferences();
 	init_runtimeCompiler();
-	init_rawStyleFields();
 	init_runtimeBackgroundResolution();
 	init_previewRuntimeCapabilities();
 	init_siteStyleThemeCompiler();
@@ -21414,6 +21929,7 @@ var init_previewCompiler = __esmMin((() => {
 	init_pageDesignIntent();
 	init_previewCustomization();
 	init_curatedChoices();
+	init_joinTreatment();
 	init_types$8();
 }));
 var init_contentTemplateRuntimeCompiler = __esmMin((() => {
@@ -21515,6 +22031,7 @@ var init_generatedDesignPipeline = __esmMin((() => {
 	init_curatedSiteStyles();
 	init_lookResolution();
 	init_headerOpeningSection();
+	init_joinTreatment();
 	init_resolver();
 	init_runtimeCompiler();
 	init_types$8();
@@ -21883,6 +22400,7 @@ var init_site_styles = __esmMin((() => {
 	init_headerRecompile();
 	init_headerOpeningForeground();
 	init_headerOpeningSection();
+	init_joinTreatment();
 	init_lookResolution();
 	init_lookOptionGroups();
 	init_logoBranding();
@@ -21902,6 +22420,7 @@ var init_site_styles = __esmMin((() => {
 	init_runtimeCompiler();
 	init_runtimeBackgroundResolution();
 	init_sectionTransitions();
+	init_sectionBoundaryComposition();
 	init_siteChromeBackgrounds();
 	init_siteChromeNavPreferences();
 	init_siteStyleThemeCompiler();
@@ -21909,6 +22428,7 @@ var init_site_styles = __esmMin((() => {
 	init_sourceCatalogs();
 	init_styleTags();
 	init_tokenRecipes();
+	init_transitionCatalogue();
 	init_siteStyleTypography();
 	init_themeParity();
 	init_types$8();
@@ -24187,7 +24707,8 @@ var init_schema = __esmMin((() => {
 		"eventCategories",
 		"eventSeries",
 		"venues",
-		"staffMembers"
+		"staffMembers",
+		"appointmentServiceCategories"
 	];
 	mediaDeliverySchema = z$1.object({
 		sizes: z$1.string().optional(),
@@ -28356,7 +28877,7 @@ function successSubmissionFeedback(message) {
 		message
 	};
 }
-function isRecord$28(value) {
+function isRecord$29(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function deepEqualJsonValue(left, right) {
@@ -28366,8 +28887,8 @@ function deepEqualJsonValue(left, right) {
 		if (left.length !== right.length) return false;
 		return left.every((item, index) => deepEqualJsonValue(item, right[index]));
 	}
-	if (isRecord$28(left) || isRecord$28(right)) {
-		if (!isRecord$28(left) || !isRecord$28(right)) return false;
+	if (isRecord$29(left) || isRecord$29(right)) {
+		if (!isRecord$29(left) || !isRecord$29(right)) return false;
 		const leftKeys = Object.keys(left).sort();
 		if (!deepEqualJsonValue(leftKeys, Object.keys(right).sort())) return false;
 		return leftKeys.every((key) => deepEqualJsonValue(left[key], right[key]));
@@ -28549,12 +29070,12 @@ function resolveBookingSiteId(siteId, form) {
 	return siteId || form?.siteId || "";
 }
 function normalizeBookingFormConfig(form) {
-	if (!isRecord$27(form)) return null;
+	if (!isRecord$28(form)) return null;
 	const id = readNonEmptyString(form.id);
 	const name = readNonEmptyString(form.name);
 	if (!id || !name) return null;
-	const schemaSource = isRecord$27(form.schema) ? form.schema : isRecord$27(form.schemaJson) ? form.schemaJson : null;
-	const settingsSource = isRecord$27(form.settings) ? form.settings : isRecord$27(form.settingsJson) ? form.settingsJson : null;
+	const schemaSource = isRecord$28(form.schema) ? form.schema : isRecord$28(form.schemaJson) ? form.schemaJson : null;
+	const settingsSource = isRecord$28(form.settings) ? form.settings : isRecord$28(form.settingsJson) ? form.settingsJson : null;
 	return {
 		id,
 		name,
@@ -28574,8 +29095,8 @@ function normalizeBookingServices(services) {
 	};
 	if (!services) return [];
 	if (Array.isArray(services)) return services.filter(isBookingFormService).map(normalizeService);
-	if (isRecord$27(services) && "services" in services) return Array.isArray(services.services) ? services.services.filter(isBookingFormService).map(normalizeService) : [];
-	return isRecord$27(services) ? Object.values(services).filter(isBookingFormService).map(normalizeService) : [];
+	if (isRecord$28(services) && "services" in services) return Array.isArray(services.services) ? services.services.filter(isBookingFormService).map(normalizeService) : [];
+	return isRecord$28(services) ? Object.values(services).filter(isBookingFormService).map(normalizeService) : [];
 }
 function normalizeBookingSchema(value) {
 	if (!value) return void 0;
@@ -28586,7 +29107,7 @@ function normalizeBookingSchema(value) {
 	};
 }
 function readBookingFormField(value) {
-	if (!isRecord$27(value)) return null;
+	if (!isRecord$28(value)) return null;
 	const id = readNonEmptyString(value.id);
 	const label = readNonEmptyString(value.label);
 	const type = readBookingFieldType(value.type);
@@ -28629,7 +29150,7 @@ function readBookingFieldOptions(value) {
 	return options.length > 0 ? options : void 0;
 }
 function readBookingFieldOption(value) {
-	if (!isRecord$27(value)) return null;
+	if (!isRecord$28(value)) return null;
 	const optionValue = readNonEmptyString(value.value);
 	const label = readNonEmptyString(value.label);
 	return optionValue && label ? {
@@ -28649,7 +29170,7 @@ function normalizeBookingSettings(value) {
 	};
 }
 function isBookingFormService(value) {
-	return isRecord$27(value) && typeof value.id === "string" && typeof value.siteId === "string" && typeof value.title === "string" && (value.consent === void 0 || blockBookingConsentSchema.safeParse(value.consent).success);
+	return isRecord$28(value) && typeof value.id === "string" && typeof value.siteId === "string" && typeof value.title === "string" && (value.consent === void 0 || blockBookingConsentSchema.safeParse(value.consent).success);
 }
 function collectBookingCustomFields(data) {
 	const customFields = {};
@@ -28699,7 +29220,7 @@ function readStringArray(value) {
 	const strings = value.filter((item) => typeof item === "string");
 	return strings.length > 0 ? strings : void 0;
 }
-function isRecord$27(value) {
+function isRecord$28(value) {
 	return typeof value === "object" && value !== null;
 }
 function getBookingServicePaymentSelectionMode(service) {
@@ -28900,6 +29421,32 @@ var init_booking_form_state = __esmMin((() => {
 	init_booking_form_consent();
 }));
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/booking-form.service-categories.ts
+function isRecord$27(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readCategory(value) {
+	if (!isRecord$27(value)) return [];
+	const { id, name, description } = value;
+	if (typeof id !== "string" || id.trim() === "" || typeof name !== "string") return [];
+	return [{
+		id,
+		name,
+		description: typeof description === "string" ? description : null
+	}];
+}
+/**
+* The ordered service categories carried by a catalogue-shaped services
+* source (`{ services, categories }`). Every other shape has none, which
+* reads as a site without categories. Order is preserved: the database owns
+* it.
+*/
+function normalizeBookingServiceCategories(services) {
+	if (!isRecord$27(services) || !Array.isArray(services.categories)) return [];
+	return services.categories.flatMap(readCategory);
+}
+var init_booking_form_service_categories = __esmMin((() => {}));
+//#endregion
 //#region ../logger/src/noop.ts
 var noop, logger;
 var init_noop = __esmMin((() => {
@@ -28996,11 +29543,12 @@ function buildBookingFormInteractiveIslandProps(props) {
 		source: props
 	});
 }
-var blockBookingPaymentTermsAvailabilitySchema, bookingServiceSchema, bookingServicesSourceSchema, bookingConfigSchema, bookingSourceSchema, bookingDisplaySchema, bookingHydrationSchema, bookingRenderSchema, bookingFormIslandMetaCodec, bookingFormIslandMetaKeys, bookingFormBlockRuntime, bookingFormInteractiveIslandPropsCodec;
+var blockBookingPaymentTermsAvailabilitySchema, bookingServiceSchema, bookingServiceCategorySchema, bookingServicesSourceSchema, bookingConfigSchema, bookingSourceSchema, bookingDisplaySchema, bookingHydrationSchema, bookingRenderSchema, bookingFormIslandMetaCodec, bookingFormIslandMetaKeys, bookingFormBlockRuntime, bookingFormInteractiveIslandPropsCodec;
 var init_booking_form_interactive = __esmMin((() => {
 	init_islands();
 	init_runtime();
 	init_booking_form_state();
+	init_booking_form_service_categories();
 	init_booking_runtime_sources();
 	init_bookingPaymentTerms();
 	init_bookingConsent();
@@ -29023,11 +29571,20 @@ var init_booking_form_interactive = __esmMin((() => {
 		priceCurrency: z$1.string().nullable().optional(),
 		paymentTerms: blockBookingPaymentTermsSchema.optional(),
 		paymentTermsAvailability: blockBookingPaymentTermsAvailabilitySchema.optional(),
-		consent: blockBookingConsentSchema.optional()
+		consent: blockBookingConsentSchema.optional(),
+		categoryId: z$1.string().nullable().optional()
+	});
+	bookingServiceCategorySchema = z$1.object({
+		id: z$1.string(),
+		name: z$1.string(),
+		description: z$1.string().nullable()
 	});
 	bookingServicesSourceSchema = z$1.union([
 		z$1.array(bookingServiceSchema),
-		z$1.object({ services: z$1.array(bookingServiceSchema).optional() }),
+		z$1.object({
+			services: z$1.array(bookingServiceSchema).optional(),
+			categories: z$1.array(bookingServiceCategorySchema).optional()
+		}),
 		z$1.record(z$1.string(), bookingServiceSchema)
 	]);
 	bookingConfigSchema = z$1.object({
@@ -29080,6 +29637,7 @@ var init_booking_form_interactive = __esmMin((() => {
 		rebookContext: z$1.object({ kind: z$1.literal("portal_rebook") }).nullable().optional(),
 		form: bookingConfigSchema.nullable(),
 		services: z$1.array(bookingServiceSchema),
+		serviceCategories: z$1.array(bookingServiceCategorySchema).optional(),
 		spamProtectionEnabled: z$1.boolean().optional()
 	});
 	bookingRenderSchema = z$1.object({
@@ -29115,6 +29673,7 @@ var init_booking_form_interactive = __esmMin((() => {
 					rebookContext: source.rebookContext ?? null,
 					form,
 					services,
+					serviceCategories: normalizeBookingServiceCategories(source.services),
 					spamProtectionEnabled: source.spamProtectionEnabled
 				}
 			};
@@ -99337,6 +99896,7 @@ var init_booking_form_headless_state = __esmMin((() => {
 	init_src$2();
 	init_dist$1();
 	init_booking_form_state();
+	init_booking_form_service_categories();
 	init_booking_form_validationErrors();
 	init_booking_form_field_values();
 	unsafeAsBookingFieldId = (id) => id;
@@ -99901,6 +100461,7 @@ function useHeadlessBookingFlow(options) {
 		data,
 		services: {
 			items: options.services,
+			categories: readServiceCategories(options),
 			selected: selectedService,
 			defaultServiceId,
 			requiresSelection: Boolean(options.requiresServiceSelection)
@@ -99965,6 +100526,9 @@ function useHeadlessBookingFlow(options) {
 		actions
 	};
 }
+function readServiceCategories(options) {
+	return options.serviceCategories ?? EMPTY_SERVICE_CATEGORIES;
+}
 function navigateToCheckout(checkoutUrl) {
 	window.location.href = checkoutUrl;
 }
@@ -99978,6 +100542,7 @@ function useLatestRef(value) {
 	}, [value]);
 	return ref;
 }
+var EMPTY_SERVICE_CATEGORIES;
 var init_useHeadlessBookingFlow = __esmMin((() => {
 	init_client();
 	init_src();
@@ -99993,6 +100558,7 @@ var init_useHeadlessBookingFlow = __esmMin((() => {
 	init_bookingPaymentOptions();
 	init_useHeadlessBookingFlow_state();
 	init_booking_form_validationErrors();
+	EMPTY_SERVICE_CATEGORIES = [];
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/hooks/usePolling.state.ts
@@ -100842,10 +101408,102 @@ var init_BookingConsentAgreement = __esmMin((() => {
 	init_RichText();
 }));
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/booking-form.default-ui.tsx
+//#region ../blocks/src/system/runtime/nodes/booking-form.service-choices.tsx
 function optionCardClassName(isSelected) {
 	return `rb-option-card${isSelected ? " rb-option-card--selected" : ""}`;
 }
+function SelectedCheck() {
+	return /* @__PURE__ */ jsx("div", {
+		className: "rb-option-check",
+		children: /* @__PURE__ */ jsx(CheckIcon, {})
+	});
+}
+/**
+* The service buttons. A site with no categories keeps its single grid; a
+* categorised site gets a heading per category, then "Other", above the same
+* grid (issue 1403). Empty categories are skipped, and there are no intros
+* here, to keep the step compact.
+*/
+function DefaultServiceChoices({ booking }) {
+	const layout = layoutServicesByCategory(booking.services.categories, booking.services.items.map((service) => ({
+		service,
+		categoryId: service.categoryId ?? null
+	})), { keepEmptyGroups: false });
+	switch (layout.kind) {
+		case "uncategorized-site": return /* @__PURE__ */ jsxs("div", {
+			className: "rb-reg-stack rb-reg-stack--sm",
+			children: [/* @__PURE__ */ jsx("span", {
+				className: "ab-subtitle",
+				children: "Service"
+			}), /* @__PURE__ */ jsx(ServiceChoiceGrid, {
+				booking,
+				choices: layout.services
+			})]
+		});
+		case "categorized-site": return /* @__PURE__ */ jsx("div", {
+			className: "rb-reg-stack",
+			children: [...layout.groups.map((group) => ({
+				key: group.category.id,
+				heading: group.category.name,
+				choices: group.services
+			})), ...layout.other.length > 0 ? [{
+				key: "other",
+				heading: "Other",
+				choices: layout.other
+			}] : []].map((group) => /* @__PURE__ */ jsxs("div", {
+				className: "rb-reg-stack rb-reg-stack--sm",
+				"data-booking-service-group": group.key,
+				children: [/* @__PURE__ */ jsx("h3", {
+					className: "ab-subtitle",
+					children: group.heading
+				}), /* @__PURE__ */ jsx(ServiceChoiceGrid, {
+					booking,
+					choices: group.choices
+				})]
+			}, group.key))
+		});
+		default: return assertNever$11(layout);
+	}
+}
+function ServiceChoiceGrid({ booking, choices }) {
+	const selectedServiceId = booking.services.selected?.id;
+	return /* @__PURE__ */ jsx("div", {
+		className: "rb-reg-grid",
+		children: choices.map(({ service }) => {
+			const isSelected = selectedServiceId === service.id;
+			return /* @__PURE__ */ jsxs("button", {
+				type: "button",
+				onClick: () => booking.actions.selectService(service.id),
+				className: optionCardClassName(isSelected),
+				"aria-pressed": isSelected,
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "rb-flex-1",
+					children: [
+						/* @__PURE__ */ jsx("div", {
+							className: "ab-subtitle",
+							children: service.title
+						}),
+						service.description ? /* @__PURE__ */ jsx("div", {
+							className: "ab-text rb-on-surface--muted",
+							children: service.description
+						}) : null,
+						service.durationMinutes ? /* @__PURE__ */ jsxs("div", {
+							className: "ab-text rb-on-surface--muted",
+							children: [service.durationMinutes, " minutes"]
+						}) : null
+					]
+				}), isSelected ? /* @__PURE__ */ jsx(SelectedCheck, {}) : null]
+			}, service.id);
+		})
+	});
+}
+var init_booking_form_service_choices = __esmMin((() => {
+	init_src$2();
+	init_dist$1();
+	init_CheckIcon$1();
+}));
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/booking-form.default-ui.tsx
 function formatBookingAmount(amount, currency) {
 	return formatCurrencyAmount(amount, currency, { decimals: "auto" });
 }
@@ -100936,7 +101594,6 @@ function DefaultBookingStepContent({ booking, errorSummaryId }) {
 function DefaultServiceSelectionStep({ booking }) {
 	const services = booking.services.items;
 	const resources = booking.resources.items;
-	const selectedServiceId = booking.services.selected?.id;
 	const selectedResourceId = booking.resources.selectedResourceId;
 	const showServiceSelect = booking.services.requiresSelection || services.length > 1;
 	const showResourceSelect = booking.resources.requiresSelection || resources.length > 1;
@@ -100951,41 +101608,7 @@ function DefaultServiceSelectionStep({ booking }) {
 				className: "ab-text rb-on-surface--muted",
 				children: "Choose the service you'd like to book"
 			})] }),
-			showServiceSelect ? /* @__PURE__ */ jsxs("div", {
-				className: "rb-reg-stack rb-reg-stack--sm",
-				children: [/* @__PURE__ */ jsx("span", {
-					className: "ab-subtitle",
-					children: "Service"
-				}), /* @__PURE__ */ jsx("div", {
-					className: "rb-reg-grid",
-					children: services.map((service) => {
-						const isSelected = selectedServiceId === service.id;
-						return /* @__PURE__ */ jsxs("button", {
-							type: "button",
-							onClick: () => booking.actions.selectService(service.id),
-							className: optionCardClassName(isSelected),
-							"aria-pressed": isSelected,
-							children: [/* @__PURE__ */ jsxs("div", {
-								className: "rb-flex-1",
-								children: [
-									/* @__PURE__ */ jsx("div", {
-										className: "ab-subtitle",
-										children: service.title
-									}),
-									service.description ? /* @__PURE__ */ jsx("div", {
-										className: "ab-text rb-on-surface--muted",
-										children: service.description
-									}) : null,
-									service.durationMinutes ? /* @__PURE__ */ jsxs("div", {
-										className: "ab-text rb-on-surface--muted",
-										children: [service.durationMinutes, " minutes"]
-									}) : null
-								]
-							}), isSelected ? /* @__PURE__ */ jsx(SelectedCheck, {}) : null]
-						}, service.id);
-					})
-				})]
-			}) : null,
+			showServiceSelect ? /* @__PURE__ */ jsx(DefaultServiceChoices, { booking }) : null,
 			booking.resources.state.tag === "loading" ? /* @__PURE__ */ jsxs("div", {
 				className: "ab-center",
 				children: [/* @__PURE__ */ jsx(SpinnerNode, {
@@ -101564,12 +102187,6 @@ function DefaultBookingErrorSummary({ errors, id }) {
 		children: [errors.formError ? /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: errors.formError }) }) : null, Object.entries(errors.fieldErrors).map(([key, message]) => /* @__PURE__ */ jsx("p", { children: message }, key))]
 	});
 }
-function SelectedCheck() {
-	return /* @__PURE__ */ jsx("div", {
-		className: "rb-option-check",
-		children: /* @__PURE__ */ jsx(CheckIcon, {})
-	});
-}
 var init_booking_form_default_ui = __esmMin((() => {
 	init_src$2();
 	init_ThemedButton();
@@ -101579,12 +102196,12 @@ var init_booking_form_default_ui = __esmMin((() => {
 	init_DatePicker();
 	init_TimeSlotSelector();
 	init_spinner();
-	init_CheckIcon$1();
 	init_StepIndicator$1();
 	init_FeedbackMessage();
 	init_DiscountCodeDisclosure();
 	init_FieldValidationMessage();
 	init_BookingConsentAgreement();
+	init_booking_form_service_choices();
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/shared/utils/checkoutUrls.ts
@@ -102015,6 +102632,7 @@ var init_booking_form_client = __esmMin((() => {
 			formId: render.hydration.formId ?? form?.id ?? "booking-form",
 			form,
 			services,
+			serviceCategories: render.hydration.serviceCategories,
 			initialServiceId,
 			initialResourceId,
 			initialData: render.hydration.initialData ?? void 0,
@@ -108844,7 +109462,7 @@ var init_event_registration_client = __esmMin((() => {
 * Loads Leaflet CSS/JS from CDN to avoid bundling in the blocks package.
 */
 function isLeafletApi(value) {
-	if (!isRecord$30(value)) return false;
+	if (!isRecord$31(value)) return false;
 	return typeof value.map === "function" && typeof value.tileLayer === "function" && typeof value.marker === "function";
 }
 function loadLeaflet() {
@@ -114887,6 +115505,16 @@ var init_newsletter_form_client_state = __esmMin((() => {
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.submission.ts
+/**
+* Logs a refusal with its reason so a QA session can tell the cases apart in
+* the console, since the visitor-facing copy deliberately does not.
+*/
+function reportNewsletterSignupRefusal(reason, detail = {}) {
+	console.warn("[newsletter-form] Signup refused before sending", {
+		reason,
+		...detail
+	});
+}
 function mapNewsletterFormFieldsToSubscriberInput(fields) {
 	return {
 		email: readSubmittedText(fields.email),
@@ -114907,7 +115535,7 @@ function resolveNewsletterSubmitTarget(input) {
 		case "signed-footer-source": return publishedSourceTarget(input.sourceRef);
 		case "preview": return {
 			tag: "unavailable",
-			reason: "missing_block_source"
+			reason: "preview_only_source"
 		};
 		default: return assertNever$20(input);
 	}
@@ -114969,13 +115597,23 @@ function NewsletterFormClient({ render }) {
 		}
 		const submitTarget = resolveNewsletterSubmitTarget(render.hydration.target);
 		if (submitTarget.tag === "unavailable") {
+			reportNewsletterSignupRefusal(submitTarget.reason, { target: render.hydration.target });
 			dispatchSubmission({
 				type: "failed",
 				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
-		if (render.hydration.setupRevision === null || render.display.availability === "unavailable") {
+		if (render.hydration.setupRevision === null) {
+			reportNewsletterSignupRefusal("setup_not_configured");
+			dispatchSubmission({
+				type: "failed",
+				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+			});
+			return;
+		}
+		if (render.display.availability === "unavailable") {
+			reportNewsletterSignupRefusal("destination_unavailable", { setupRevision: render.hydration.setupRevision });
 			dispatchSubmission({
 				type: "failed",
 				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
@@ -114985,6 +115623,7 @@ function NewsletterFormClient({ render }) {
 		const selection = readVisitorSelection(formData, render.hydration);
 		const selectionError = visitorSelectionError(selection);
 		if (selectionError) {
+			if (selection.tag === "unusable") reportNewsletterSignupRefusal("choices_unusable", { choiceProvider: render.hydration.choiceProvider });
 			dispatchSubmission({
 				type: "failed",
 				error: selectionError
@@ -117471,16 +118110,16 @@ const interpolateRichTextTokensOptionsSchema = z$1.object({ tokens: z$1.array(su
 const richTextTokenPattern = /\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g;
 function getSiteName(context) {
 	const viewModel = context.viewModel;
-	if (!isRecord$30(viewModel)) return null;
+	if (!isRecord$31(viewModel)) return null;
 	const site = viewModel.site;
-	if (isRecord$30(site) && typeof site.title === "string") {
+	if (isRecord$31(site) && typeof site.title === "string") {
 		const title = site.title.trim();
 		return title.length > 0 ? title : null;
 	}
 	const root = viewModel.$root;
-	if (isRecord$30(root)) {
+	if (isRecord$31(root)) {
 		const rootSite = root.site;
-		if (isRecord$30(rootSite) && typeof rootSite.title === "string") {
+		if (isRecord$31(rootSite) && typeof rootSite.title === "string") {
 			const title = rootSite.title.trim();
 			if (title.length > 0) return title;
 		}
@@ -117502,7 +118141,7 @@ function replaceTokenText(input, allowedTokens, tokenValues) {
 	});
 }
 function visitRichTextNode(node, allowedTokens, tokenValues) {
-	if (!isRecord$30(node)) return node;
+	if (!isRecord$31(node)) return node;
 	let changed = false;
 	const nextNode = { ...node };
 	if (nextNode.type === "text" && typeof nextNode.text === "string") {
@@ -117523,7 +118162,7 @@ function visitRichTextNode(node, allowedTokens, tokenValues) {
 	return changed ? nextNode : node;
 }
 function interpolateRichTextTokens(value, options, context) {
-	if (!isRecord$30(value)) return value;
+	if (!isRecord$31(value)) return value;
 	return visitRichTextNode(value, new Set(options.tokens), {
 		year: String((/* @__PURE__ */ new Date()).getFullYear()),
 		site_name: getSiteName(context)
@@ -118987,18 +119626,43 @@ const publicAppointmentServiceSchema = z$1.object({
 	pricing: publicPricingSchema.optional(),
 	priceAmount: z$1.number().nullable(),
 	priceCurrency: z$1.string().nullable(),
-	location: publicLocationSchema
+	location: publicLocationSchema,
+	categoryId: z$1.string().nullable().optional().transform((value) => value ?? null)
+});
+const publicServiceCategorySchema = z$1.object({
+	id: z$1.string().min(1),
+	name: z$1.string(),
+	description: z$1.string().nullable().optional().transform((value) => value ?? null)
 });
-const publicAppointmentServicesSchema = z$1.array(publicAppointmentServiceSchema);
+/**
+* The loader hands over the catalogue `{ services, categories }` (issue 1403).
+* A bare services array is still accepted and read as a site with no
+* categories, so callers from before categories keep the flat list.
+*/
+const publicAppointmentServicesSchema = z$1.union([z$1.array(publicAppointmentServiceSchema).transform((services) => ({
+	services,
+	categories: []
+})), z$1.object({
+	services: z$1.array(publicAppointmentServiceSchema),
+	categories: z$1.array(publicServiceCategorySchema)
+})]);
 const EMPTY_MESSAGE = "No appointments are available right now.";
 const ERROR_MESSAGE = "Appointments are temporarily unavailable. Please try again shortly.";
+const OTHER_GROUP_KEY = "other";
+const OTHER_GROUP_HEADING = "Other";
 function parseServices(value) {
 	const result = publicAppointmentServicesSchema.safeParse(value);
 	return result.success ? {
 		kind: "valid",
-		services: result.data
+		services: result.data.services,
+		categories: result.data.categories
 	} : { kind: "invalid" };
 }
+function readCategoryFilter(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
 function formatAppointmentDuration(durationMinutes) {
 	return `${durationMinutes} min`;
 }
@@ -119072,8 +119736,44 @@ function buildRows(services, pathname, servicePathPrefix) {
 		detailsHref: servicePathPrefix && service.slug ? `${servicePathPrefix.replace(/\/$/, "")}/${encodeURIComponent(service.slug)}` : null
 	}));
 }
+const EMPTY_VIEW = {
+	kind: "empty",
+	message: EMPTY_MESSAGE
+};
+function categoryGroup(category, services, toRows) {
+	return {
+		key: category.id,
+		heading: category.name,
+		intro: category.description,
+		rows: toRows(services)
+	};
+}
+function viewFromLayout(layout, toRows) {
+	switch (layout.kind) {
+		case "uncategorized-site": return layout.services.length === 0 ? EMPTY_VIEW : {
+			kind: "items",
+			rows: toRows(layout.services)
+		};
+		case "categorized-site": {
+			const groups = layout.groups.map((group) => categoryGroup(group.category, group.services, toRows));
+			const other = layout.other.length === 0 ? [] : [{
+				key: OTHER_GROUP_KEY,
+				heading: OTHER_GROUP_HEADING,
+				intro: null,
+				rows: toRows(layout.other)
+			}];
+			const allGroups = [...groups, ...other];
+			return allGroups.length === 0 ? EMPTY_VIEW : {
+				kind: "groups",
+				groups: allGroups
+			};
+		}
+		default: return assertNever$20(layout);
+	}
+}
 function buildAppointmentServicesView(input) {
-	if (!input.pathname) return {
+	const pathname = input.pathname;
+	if (!pathname) return {
 		kind: "error",
 		message: ERROR_MESSAGE
 	};
@@ -119082,76 +119782,128 @@ function buildAppointmentServicesView(input) {
 		kind: "error",
 		message: ERROR_MESSAGE
 	};
-	if (parsed.services.length === 0) return {
-		kind: "empty",
-		message: EMPTY_MESSAGE
-	};
-	return {
-		kind: "items",
-		rows: buildRows(parsed.services, input.pathname, input.servicePathPrefix ?? null)
-	};
+	const toRows = (services) => buildRows(services, pathname, input.servicePathPrefix ?? null);
+	const view = selectCategoryView(parsed.categories, parsed.services, readCategoryFilter(input.categoryId));
+	switch (view.kind) {
+		case "single": return view.group.services.length === 0 ? EMPTY_VIEW : {
+			kind: "groups",
+			groups: [categoryGroup(view.group.category, view.group.services, toRows)]
+		};
+		case "all":
+		case "fallback-all": return viewFromLayout(view.layout, toRows);
+		default: return assertNever$20(view);
+	}
 }
-function AppointmentServicesNode({ sectionHeading, services, pathname, servicePathPrefix, className }) {
+function AppointmentServiceRows({ rows, RowTitle }) {
+	return /* @__PURE__ */ jsx("div", {
+		className: "appointment-services-rows rb-flex rb-flex-col",
+		children: rows.map((row) => /* @__PURE__ */ jsxs("article", {
+			className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
+			children: [
+				/* @__PURE__ */ jsxs("div", {
+					className: "appointment-services-row-main rb-min-w-0",
+					children: [
+						/* @__PURE__ */ jsx(RowTitle, {
+							className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
+							children: row.detailsHref ? /* @__PURE__ */ jsx("a", {
+								href: row.detailsHref,
+								children: row.title
+							}) : row.title
+						}),
+						row.description ? /* @__PURE__ */ jsx("p", {
+							className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
+							children: row.description
+						}) : null,
+						/* @__PURE__ */ jsxs("p", {
+							className: "appointment-services-row-meta rb-caption status-muted",
+							children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
+						})
+					]
+				}),
+				row.priceLabel ? /* @__PURE__ */ jsx("span", {
+					className: "appointment-services-row-price rb-text-lg",
+					children: row.priceLabel
+				}) : null,
+				/* @__PURE__ */ jsx(ThemedButtonLink, {
+					variant: "secondary",
+					size: "sm",
+					extraClassName: "appointment-services-row-action",
+					href: row.href,
+					label: "Check times",
+					screenReaderSuffix: ` for ${row.title}`
+				})
+			]
+		}, row.id))
+	});
+}
+function AppointmentServiceGroups({ groups, hasSectionHeading, idPrefix }) {
+	const GroupHeading = hasSectionHeading ? "h3" : "h2";
+	const RowTitle = hasSectionHeading ? "h4" : "h3";
+	return /* @__PURE__ */ jsx("div", {
+		className: "appointment-services-groups rb-flex rb-flex-col rb-gap-10",
+		children: groups.map((group) => {
+			const headingId = `${idPrefix}-group-${group.key}`;
+			return /* @__PURE__ */ jsxs("section", {
+				className: "appointment-services-group rb-flex rb-flex-col rb-gap-2",
+				"aria-labelledby": headingId,
+				"data-appointment-services-group": group.key,
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "appointment-services-group-heading",
+					children: [/* @__PURE__ */ jsx(GroupHeading, {
+						id: headingId,
+						className: "appointment-services-group-title rb-text-sm rb-font-semibold rb-uppercase rb-tracking-wide",
+						children: group.heading
+					}), group.intro ? /* @__PURE__ */ jsx("p", {
+						className: "appointment-services-group-intro rb-text-sm rb-leading-6 rb-max-w-prose status-muted",
+						children: group.intro
+					}) : null]
+				}), /* @__PURE__ */ jsx(AppointmentServiceRows, {
+					rows: group.rows,
+					RowTitle
+				})]
+			}, group.key);
+		})
+	});
+}
+function AppointmentServicesNode({ sectionHeading, categoryId, services, pathname, servicePathPrefix, blockId, className }) {
 	const view = buildAppointmentServicesView({
 		services,
+		categoryId,
 		pathname: typeof pathname === "string" ? pathname : void 0,
 		servicePathPrefix: typeof servicePathPrefix === "string" ? servicePathPrefix : null
 	});
 	const rootClassName = `appointment-services ${className ?? ""}`.trim();
-	const RowTitle = sectionHeading ? "h3" : "h2";
-	if (view.kind === "error" || view.kind === "empty") return /* @__PURE__ */ jsx("div", {
-		className: rootClassName,
-		"data-appointment-services-state": view.kind,
-		children: /* @__PURE__ */ jsx("p", {
-			className: "rb-caption status-muted",
-			role: "status",
-			children: view.message
-		})
-	});
-	return /* @__PURE__ */ jsx("div", {
-		className: `${rootClassName} rb-flex rb-flex-col`,
-		"data-appointment-services-state": "populated",
-		children: /* @__PURE__ */ jsx("div", {
-			className: "appointment-services-rows rb-flex rb-flex-col",
-			children: view.rows.map((row) => /* @__PURE__ */ jsxs("article", {
-				className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
-				children: [
-					/* @__PURE__ */ jsxs("div", {
-						className: "appointment-services-row-main rb-min-w-0",
-						children: [
-							/* @__PURE__ */ jsx(RowTitle, {
-								className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
-								children: row.detailsHref ? /* @__PURE__ */ jsx("a", {
-									href: row.detailsHref,
-									children: row.title
-								}) : row.title
-							}),
-							row.description ? /* @__PURE__ */ jsx("p", {
-								className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
-								children: row.description
-							}) : null,
-							/* @__PURE__ */ jsxs("p", {
-								className: "appointment-services-row-meta rb-caption status-muted",
-								children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
-							})
-						]
-					}),
-					row.priceLabel ? /* @__PURE__ */ jsx("span", {
-						className: "appointment-services-row-price rb-text-lg",
-						children: row.priceLabel
-					}) : null,
-					/* @__PURE__ */ jsx(ThemedButtonLink, {
-						variant: "secondary",
-						size: "sm",
-						extraClassName: "appointment-services-row-action",
-						href: row.href,
-						label: "Check times",
-						screenReaderSuffix: ` for ${row.title}`
-					})
-				]
-			}, row.id))
-		})
-	});
+	const hasSectionHeading = Boolean(sectionHeading);
+	switch (view.kind) {
+		case "error":
+		case "empty": return /* @__PURE__ */ jsx("div", {
+			className: rootClassName,
+			"data-appointment-services-state": view.kind,
+			children: /* @__PURE__ */ jsx("p", {
+				className: "rb-caption status-muted",
+				role: "status",
+				children: view.message
+			})
+		});
+		case "items": return /* @__PURE__ */ jsx("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ jsx(AppointmentServiceRows, {
+				rows: view.rows,
+				RowTitle: hasSectionHeading ? "h3" : "h2"
+			})
+		});
+		case "groups": return /* @__PURE__ */ jsx("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ jsx(AppointmentServiceGroups, {
+				groups: view.groups,
+				hasSectionHeading,
+				idPrefix: `appointment-services-${blockId ?? "block"}`
+			})
+		});
+		default: return assertNever$20(view);
+	}
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/booking-form.server.tsx
@@ -127352,9 +128104,127 @@ function generateFooterBottomTextLinkStyles(footer, themeId, tokens) {
 	return cssChunks.join("\n");
 }
 //#endregion
+//#region ../theme-core/src/layout/boundaryCss.ts
+init_sectionTransitions();
+init_transitionCatalogue();
+/**
+* Section-break CSS, generated from the transition catalogue (issue 1422).
+*
+* The renderer emits one element per shown join:
+*
+*   <div data-block-boundary data-boundary-treatment="wave-edge-gentle"
+*        data-boundary-placement="previous"
+*        style="--boundary-shape-paint: …; --boundary-band-paint: …">
+*
+* Every selector matches an exact attribute value, so there is no reliance on
+* prefix ordering in the cascade and nothing reads colours out of a string.
+* The shape layer is `::after`; the band layer (paint → paint only) is
+* `::before`.
+*/
+const waveMaskSvgPaths = {
+	classic: "M0 72V46C130 55 260 24 420 30C590 36 690 62 860 42C1035 21 1160 47 1305 36C1365 31 1415 33 1440 38V72H0Z",
+	balanced: "M0 72V42C120 24 240 24 360 42C480 60 600 60 720 42C840 24 960 24 1080 42C1200 60 1320 60 1440 42V72H0Z",
+	gentle: "M0 72V43C180 32 300 32 480 43C660 54 780 54 960 43C1140 32 1260 32 1440 43V72H0Z",
+	bold: "M0 72V44C90 14 270 14 360 44C450 74 630 74 720 44C810 14 990 14 1080 44C1170 74 1350 74 1440 44V72H0Z",
+	drift: "M0 72V39C115 31 205 54 340 48C505 41 610 16 760 33C920 51 1015 64 1160 44C1280 27 1375 35 1440 50V72H0Z"
+};
+function waveMaskDataUrl(mask) {
+	return svgDataUrl(`<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='${waveMaskSvgPaths[mask]}' fill='white'/></svg>`);
+}
+/**
+* How each placement anchors the layers against the zero-height boundary
+* element that sits exactly on the join.
+*
+* - `centred` straddles the join, band under shape.
+* - `previous` sits above the join, inside the previous section.
+* - `next` sits below the join, inside the next section, with the shape
+*   flipped so it reads as the mirror of `previous`.
+*/
+const placementRules = {
+	centred: {
+		shape: ["top: 0;", "transform: translateY(-50%);"],
+		band: ["top: 0;", "transform: translateY(-50%);"]
+	},
+	previous: {
+		shape: ["bottom: 0;"],
+		band: null
+	},
+	next: {
+		shape: ["top: 0;", "transform: scaleY(-1);"],
+		band: null
+	}
+};
+function generateBoundaryCss(selector) {
+	const boundary = `${selector} [data-block-boundary]`;
+	return [
+		rule$1(boundary, [
+			"position: relative;",
+			"z-index: 3;",
+			"height: 0;",
+			"pointer-events: none;"
+		]),
+		rule$1(`${selector} [data-block][data-site-style-boundary-before] > :where([data-slot='section'])`, ["padding-top: calc(var(--rb-section-pad-y, 0rem) + var(--site-style-boundary-before-reserve, 0rem));"]),
+		rule$1(`${selector} [data-block][data-site-style-boundary-after] > :where([data-slot='section'])`, ["padding-bottom: calc(var(--rb-section-pad-y, 0rem) + var(--site-style-boundary-after-reserve, 0rem));"]),
+		rule$1(`${boundary}::before,\n${boundary}::after`, [
+			"content: '';",
+			"position: absolute;",
+			"left: 0;",
+			"right: 0;",
+			"height: var(--boundary-height);",
+			"pointer-events: none;"
+		]),
+		rule$1(`${boundary}::before`, ["z-index: 0;", "background: var(--boundary-band-paint, transparent);"]),
+		rule$1(`${boundary}::after`, ["z-index: 1;"]),
+		...placementCss(boundary),
+		...transitionCatalogueEntries.flatMap((entry) => treatmentCss(boundary, entry))
+	].join("\n\n");
+}
+function placementCss(boundary) {
+	return Object.keys(placementRules).flatMap((placement) => {
+		const placed = `${boundary}[data-boundary-placement='${placement}']`;
+		const rules = placementRules[placement];
+		return [rule$1(`${placed}::after`, rules.shape), rules.band ? rule$1(`${placed}::before`, rules.band) : rule$1(`${placed}::before`, ["content: none;"])];
+	});
+}
+function treatmentCss(boundary, entry) {
+	const selected = `${boundary}[data-boundary-treatment='${entry.intent}']`;
+	return [rule$1(selected, [`--boundary-height: ${boundaryRuntimeMetricsForDecorativeTransition(entry.intent).heightCss};`]), rule$1(`${selected}::after`, shapeDeclarations(entry))];
+}
+function shapeDeclarations(entry) {
+	switch (entry.shape.kind) {
+		case "fade": return [
+			"/* Fallback for browsers without color-mix(). */",
+			"background: linear-gradient(to bottom, transparent 0%, var(--boundary-shape-paint) 100%);",
+			"background: linear-gradient(to bottom, transparent 0%, color-mix(in srgb, var(--boundary-shape-paint) 16%, transparent) 34%, color-mix(in srgb, var(--boundary-shape-paint) 68%, transparent) 78%, var(--boundary-shape-paint) 100%);"
+		];
+		case "wave": {
+			const mask = waveMaskDataUrl(entry.shape.mask);
+			return [
+				"background: var(--boundary-shape-paint);",
+				`mask-image: url("${mask}");`,
+				"mask-repeat: no-repeat;",
+				"mask-size: 100% 100%;",
+				`-webkit-mask-image: url("${mask}");`,
+				"-webkit-mask-repeat: no-repeat;",
+				"-webkit-mask-size: 100% 100%;"
+			];
+		}
+		case "angle": return [
+			"height: calc(var(--boundary-height) + 2px);",
+			"background: var(--boundary-shape-paint);",
+			`clip-path: ${anglePolygonCss(entry.shape.polygon)};`
+		];
+	}
+}
+function rule$1(selector, declarations) {
+	return `${selector} {\n  ${declarations.join("\n  ")}\n}`;
+}
+function svgDataUrl(svg) {
+	return `data:image/svg+xml,${encodeURIComponent(svg)}`;
+}
+//#endregion
 //#region ../theme-core/src/layout/generateLayoutCss.ts
 init_breakpoints();
-init_sectionTransitions();
 /**
 * Generate layout CSS for theme scope (background, text color)
 *
@@ -127378,7 +128248,7 @@ function generateLayoutCss(options) {
 	if (heroTypographyCss) cssChunks.push(heroTypographyCss);
 	const bodyTextTypographyCss = generateBodyTextTypographyCss(themeId, theme);
 	if (bodyTextTypographyCss) cssChunks.push(bodyTextTypographyCss);
-	cssChunks.push(generateSiteStyleTransitionCss(themeId));
+	cssChunks.push(generateBoundaryCss(selector));
 	return cssChunks.join("\n\n");
 }
 function toPaddingValue(preset) {
@@ -127389,193 +128259,6 @@ function toPaddingValue(preset) {
 		relaxed: "1.5rem"
 	}[preset];
 }
-const classicWaveTransitionMask = svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V46C130 55 260 24 420 30C590 36 690 62 860 42C1035 21 1160 47 1305 36C1365 31 1415 33 1440 38V72H0Z' fill='white'/></svg>");
-const balancedWaveTransitionMask = svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V42C120 24 240 24 360 42C480 60 600 60 720 42C840 24 960 24 1080 42C1200 60 1320 60 1440 42V72H0Z' fill='white'/></svg>");
-const gentleWaveTransitionMask = svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V43C180 32 300 32 480 43C660 54 780 54 960 43C1140 32 1260 32 1440 43V72H0Z' fill='white'/></svg>");
-const boldWaveTransitionMask = svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V44C90 14 270 14 360 44C450 74 630 74 720 44C810 14 990 14 1080 44C1170 74 1350 74 1440 44V72H0Z' fill='white'/></svg>");
-const driftWaveTransitionMask = svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V39C115 31 205 54 340 48C505 41 610 16 760 33C920 51 1015 64 1160 44C1280 27 1375 35 1440 50V72H0Z' fill='white'/></svg>");
-function generateSiteStyleTransitionCss(themeId) {
-	const selector = `:where([data-theme-scope="${themeId}"])`;
-	const compactBoundaryHeight = requiredBoundaryHeightCss("wave-edge-gentle");
-	const mediumBoundaryHeight = requiredBoundaryHeightCss("wave-edge");
-	const largeBoundaryHeight = requiredBoundaryHeightCss("wave-edge-bold");
-	return `${selector} [data-style-group^='site-style-transition-'] {
-  position: relative;
-  z-index: 2;
-  --site-style-transition-from: transparent;
-  --site-style-transition-to: rgb(var(--tb-background));
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-'] {
-  position: relative;
-  z-index: 3;
-  height: 0;
-  pointer-events: none;
-  --site-style-boundary-height: ${mediumBoundaryHeight};
-}
-
-${selector} [data-block][data-site-style-boundary-before] > :where([data-slot='section']) {
-  padding-top: calc(var(--rb-section-pad-y, 0rem) + var(--site-style-boundary-before-reserve, 0rem));
-}
-
-${selector} [data-block][data-site-style-boundary-after] > :where([data-slot='section']) {
-  padding-bottom: calc(var(--rb-section-pad-y, 0rem) + var(--site-style-boundary-after-reserve, 0rem));
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-']::before,
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-']::before,
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade']::before {
-  content: '';
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  transform: translateY(-50%);
-  z-index: 0;
-  height: var(--site-style-boundary-height);
-  background: var(--site-style-transition-from);
-  pointer-events: none;
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-']::after,
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-']::after,
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade']::after {
-  content: '';
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  transform: translateY(-50%);
-  z-index: 1;
-  height: var(--site-style-boundary-height);
-  pointer-events: none;
-}
-
-${selector} [data-style-group*='-from-base-'] {
-  --site-style-transition-from: rgb(var(--tb-background));
-}
-
-${selector} [data-style-group*='-from-muted-band-'] {
-  --site-style-transition-from: rgb(var(--tb-muted));
-}
-
-${selector} [data-style-group*='-from-accent-band-'] {
-  --site-style-transition-from: rgb(var(--tb-accent));
-}
-
-${selector} [data-style-group*='-from-brand-depth-band-'] {
-  --site-style-transition-from: rgb(var(--tb-primary-800));
-}
-
-${selector} [data-style-group$='-to-base'],
-${selector} [data-style-group$='-to-hero-image'] {
-  --site-style-transition-to: rgb(var(--tb-background));
-}
-
-${selector} [data-style-group$='-to-muted-band'] {
-  --site-style-transition-to: rgb(var(--tb-muted));
-}
-
-${selector} [data-style-group$='-to-accent-band'] {
-  --site-style-transition-to: rgb(var(--tb-accent));
-}
-
-${selector} [data-style-group$='-to-brand-depth-band'] {
-  --site-style-transition-to: rgb(var(--tb-primary-800));
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade']::after {
-  /* Fallback for browsers without color-mix(). */
-  background: linear-gradient(
-    to bottom,
-    transparent 0%,
-    var(--site-style-transition-to) 100%
-  );
-  background: linear-gradient(
-    to bottom,
-    transparent 0%,
-    color-mix(in srgb, var(--site-style-transition-to) 16%, transparent) 34%,
-    color-mix(in srgb, var(--site-style-transition-to) 68%, transparent) 78%,
-    var(--site-style-transition-to) 100%
-  );
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade-long-'] {
-  --site-style-boundary-height: ${requiredBoundaryHeightCss("soft-fade-long")};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade-expansive-'] {
-  --site-style-boundary-height: ${requiredBoundaryHeightCss("soft-fade-expansive")};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-']::after {
-  height: calc(var(--site-style-boundary-height) + 2px);
-  background: var(--site-style-transition-to);
-  clip-path: polygon(0 42%, 100% 8%, 100% 100%, 0 100%);
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-subtle-'] {
-  --site-style-boundary-height: ${compactBoundaryHeight};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-subtle-']::after {
-  clip-path: polygon(0 34%, 100% 18%, 100% 100%, 0 100%);
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-steep-'] {
-  --site-style-boundary-height: ${largeBoundaryHeight};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-angle-edge-steep-']::after {
-  clip-path: polygon(0 54%, 100% 0%, 100% 100%, 0 100%);
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-']::after {
-  background: var(--site-style-transition-to);
-  mask-image: url("${classicWaveTransitionMask}");
-  mask-repeat: no-repeat;
-  mask-size: 100% 100%;
-  -webkit-mask-image: url("${classicWaveTransitionMask}");
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-size: 100% 100%;
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-balanced-']::after {
-  mask-image: url("${balancedWaveTransitionMask}");
-  -webkit-mask-image: url("${balancedWaveTransitionMask}");
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-gentle-'] {
-  --site-style-boundary-height: ${compactBoundaryHeight};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-gentle-']::after {
-  mask-image: url("${gentleWaveTransitionMask}");
-  -webkit-mask-image: url("${gentleWaveTransitionMask}");
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-bold-'] {
-  --site-style-boundary-height: ${largeBoundaryHeight};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-bold-']::after {
-  mask-image: url("${boldWaveTransitionMask}");
-  -webkit-mask-image: url("${boldWaveTransitionMask}");
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-wave-edge-drift-']::after {
-  mask-image: url("${driftWaveTransitionMask}");
-  -webkit-mask-image: url("${driftWaveTransitionMask}");
-}`;
-}
-function requiredBoundaryHeightCss(transition) {
-	const metrics = boundaryRuntimeMetricsForTransition(transition);
-	if (!metrics) throw new Error(`Missing boundary runtime metrics for ${transition}`);
-	return metrics.heightCss;
-}
-function svgDataUrl(svg) {
-	return `data:image/svg+xml,${encodeURIComponent(svg)}`;
-}
 function generateHeroTypographyCss(themeId, theme) {
 	const typography = theme.hero?.typography;
 	if (!typography) return "";
@@ -127594,24 +128277,23 @@ function generateHeroTypographyCss(themeId, theme) {
 	if (microHeadlineRules.length > 0) chunks.push(`${microHeadlineSelector} {\n  ${microHeadlineRules.join("\n  ")}\n}`);
 	const microSubheadlineRules = buildTypographyRules("subheadline", typography.microSubheadlineSize, typography.microSubheadlineLineHeight);
 	if (microSubheadlineRules.length > 0) chunks.push(`${microSubheadlineSelector} {\n  ${microSubheadlineRules.join("\n  ")}\n}`);
-	if (typography.responsive?.tablet) {
-		const tabletHeadlineRules = buildTypographyRules("headline", typography.responsive.tablet.headlineSize, typography.responsive.tablet.headlineLineHeight);
-		const tabletSubheadlineRules = buildTypographyRules("subheadline", typography.responsive.tablet.subheadlineSize, typography.responsive.tablet.subheadlineLineHeight);
-		const tabletChunks = [];
-		if (tabletHeadlineRules.length > 0) tabletChunks.push(`${headlineSelector} {\n    ${tabletHeadlineRules.join("\n    ")}\n  }`);
-		if (tabletSubheadlineRules.length > 0) tabletChunks.push(`${subheadlineSelector} {\n    ${tabletSubheadlineRules.join("\n    ")}\n  }`);
-		if (tabletChunks.length > 0) chunks.push(`@media ${MQ_TABLET_ONLY} {\n  ${tabletChunks.join("\n\n  ")}\n}`);
-	}
-	if (typography.responsive?.mobile) {
-		const mobileHeadlineRules = buildTypographyRules("headline", typography.responsive.mobile.headlineSize, typography.responsive.mobile.headlineLineHeight);
-		const mobileSubheadlineRules = buildTypographyRules("subheadline", typography.responsive.mobile.subheadlineSize, typography.responsive.mobile.subheadlineLineHeight);
-		const mobileChunks = [];
-		if (mobileHeadlineRules.length > 0) mobileChunks.push(`${headlineSelector} {\n    ${mobileHeadlineRules.join("\n    ")}\n  }`);
-		if (mobileSubheadlineRules.length > 0) mobileChunks.push(`${subheadlineSelector} {\n    ${mobileSubheadlineRules.join("\n    ")}\n  }`);
-		if (mobileChunks.length > 0) chunks.push(`@media ${MQ_SM_DOWN} {\n  ${mobileChunks.join("\n\n  ")}\n}`);
-	}
+	const selectors = {
+		headline: headlineSelector,
+		subheadline: subheadlineSelector
+	};
+	const responsiveChunks = [responsiveHeroTypographyCss(MQ_TABLET_ONLY, selectors, typography.responsive?.tablet), responsiveHeroTypographyCss(MQ_SM_DOWN, selectors, typography.responsive?.mobile)];
+	for (const chunk of responsiveChunks) if (chunk) chunks.push(chunk);
 	return chunks.join("\n\n");
 }
+function responsiveHeroTypographyCss(media, selectors, overrides) {
+	if (!overrides) return null;
+	const headlineRules = buildTypographyRules("headline", overrides.headlineSize, overrides.headlineLineHeight);
+	const subheadlineRules = buildTypographyRules("subheadline", overrides.subheadlineSize, overrides.subheadlineLineHeight);
+	const mediaChunks = [];
+	if (headlineRules.length > 0) mediaChunks.push(`${selectors.headline} {\n    ${headlineRules.join("\n    ")}\n  }`);
+	if (subheadlineRules.length > 0) mediaChunks.push(`${selectors.subheadline} {\n    ${subheadlineRules.join("\n    ")}\n  }`);
+	return mediaChunks.length > 0 ? `@media ${media} {\n  ${mediaChunks.join("\n\n  ")}\n}` : null;
+}
 function buildTypographyRules(role, size, lineHeight) {
 	const rules = [];
 	if (size) rules.push(`font-size: ${toHeroSize(role, size)};`);
@@ -129603,72 +130285,173 @@ function requireThemeResources(resources, blockKind) {
 	return resources;
 }
 //#endregion
-//#region ../blocks/src/pageRendererBoundaries.tsx
-init_typeGuards();
-const boundaryKey = (previousBlockId, nextBlockId) => `${previousBlockId}\u0000${nextBlockId}`;
-function isSiteStyleTransitionStyleGroup(value) {
-	return value?.startsWith("site-style-transition-") === true;
+//#region ../blocks/src/pageRenderJoins.ts
+init_site_styles();
+/**
+* Re-points joins across omitted blocks. Pure over joins.
+*
+* Joins are keyed by adjacent block-id pairs, so dropping B from [A, B, C]
+* removes the A→C join as well as B's own, because no A→C join was ever
+* resolved. For each surviving pair the original join is kept when the pair
+* was already adjacent. Across a gap, the treatment comes from the join
+* entering the omitted run (A→first omitted), falling back to the one leaving
+* it (last omitted→C). Nothing visual is carried: the survivors are composed
+* from their own content afterwards.
+*
+* `survivors` are compared by identity against `originalBlocks`.
+*/
+function retargetJoinsAcrossOmissions(input) {
+	const { joins, originalBlocks, survivingBlocks } = input;
+	if (joins.length === 0) return joins;
+	if (originalBlocks.every((block) => survivingBlocks.has(block))) return joins;
+	const byPair = joinsByPair(joins);
+	const retargeted = [];
+	let previousSurvivor = null;
+	let run = [];
+	for (const block of originalBlocks) {
+		if (!survivingBlocks.has(block)) {
+			run.push(block);
+			continue;
+		}
+		if (previousSurvivor?.id && block.id) {
+			const join = run.length === 0 ? byPair.get(pairKey(previousSurvivor.id, block.id)) : joinAcrossRun(byPair, previousSurvivor.id, block.id, run);
+			if (join) retargeted.push(join);
+		}
+		previousSurvivor = block;
+		run = [];
+	}
+	return retargeted;
 }
-function boundaryMapForAdjacentBlockIds(boundaries) {
-	return new Map(boundaries.map((boundary) => [boundaryKey(boundary.previousBlockId, boundary.nextBlockId), boundary]));
+function joinAcrossRun(byPair, previousBlockId, nextBlockId, run) {
+	const firstOmittedId = run[0]?.id;
+	const lastOmittedId = run[run.length - 1]?.id;
+	const entering = firstOmittedId ? byPair.get(pairKey(previousBlockId, firstOmittedId)) : void 0;
+	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : void 0;
+	const donor = entering ?? exiting;
+	return donor ? {
+		previousBlockId,
+		nextBlockId,
+		treatment: donor.treatment
+	} : void 0;
 }
-function boundaryBetweenBlocks(previousBlock, nextBlock, boundaries) {
-	const previousBlockId = previousBlock?.id ?? null;
-	const nextBlockId = nextBlock?.id ?? null;
-	if (!previousBlockId || !nextBlockId) return null;
-	return boundaries.get(boundaryKey(previousBlockId, nextBlockId)) ?? null;
+/**
+* The single composition site. For every adjacent pair of survivors with ids,
+* finds its join and composes it from both survivors' final content: what
+* each paints with and the frame each draws.
+*/
+function composePageJoins(input) {
+	const byPair = joinsByPair(input.joins);
+	return input.survivors.flatMap((previous, index) => {
+		const next = input.survivors[index + 1];
+		if (!next || !previous.id || !next.id) return [];
+		const join = byPair.get(pairKey(previous.id, next.id));
+		return [{
+			previousBlockId: previous.id,
+			nextBlockId: next.id,
+			join: join ? composeJoin(join, previous, next) : null
+		}];
+	});
+}
+function composeJoin(join, previous, next) {
+	return {
+		boundaryId: pairKey(join.previousBlockId, join.nextBlockId),
+		previousBlockId: join.previousBlockId,
+		nextBlockId: join.nextBlockId,
+		treatment: join.treatment,
+		outcome: composeBoundary(sectionFactsForContent(previous.content), sectionFactsForContent(next.content))
+	};
+}
+/** Placement, reserves and paint for a join that draws; null otherwise. */
+function renderedJoinLayout(join) {
+	if (!join || join.outcome.kind !== "shown") return null;
+	return boundaryLayout(join.treatment, join.outcome.composition);
+}
+/** Joins with a missing id on either side cannot sit between two blocks. */
+function joinsByPair(joins) {
+	return new Map(joins.flatMap((join) => join.previousBlockId && join.nextBlockId ? [[pairKey(join.previousBlockId, join.nextBlockId), join]] : []));
+}
+/** Slot lookup key for an adjacent pair, in the one boundary-id scheme. */
+function joinSlotKey(previousBlockId, nextBlockId) {
+	return pairKey(previousBlockId, nextBlockId);
 }
-function renderBoundaryAfterBlock(input) {
-	const previousBlockId = input.block.id;
-	const nextBlockId = input.nextBlock?.id ?? null;
+function pairKey(previousBlockId, nextBlockId) {
+	return makeBoundaryId(asDesignBlockId(previousBlockId), asDesignBlockId(nextBlockId));
+}
+//#endregion
+//#region ../blocks/src/pageRendererBoundaries.tsx
+function joinSlotsByPair(slots) {
+	return new Map(slots.map((slot) => [joinSlotKey(slot.previousBlockId, slot.nextBlockId), slot]));
+}
+function joinSlotBetween(previousBlockId, nextBlockId, slots) {
 	if (!previousBlockId || !nextBlockId) return null;
-	const boundary = input.boundaryByAdjacentBlockIds.get(boundaryKey(previousBlockId, nextBlockId));
-	if (!boundary) return null;
-	const rendered = /* @__PURE__ */ jsx("div", {
+	return slots.get(joinSlotKey(previousBlockId, nextBlockId)) ?? null;
+}
+/**
+* The markup at one join: the painted boundary element when the join draws,
+* then whatever `renderJoin` adds. Null when there is nothing to render.
+*/
+function renderJoinSlot(input) {
+	const { slot } = input;
+	if (!slot) return null;
+	const layout = renderedJoinLayout(slot.join);
+	const painted = slot.join && layout ? /* @__PURE__ */ jsx("div", {
 		"aria-hidden": "true",
 		"data-block-boundary": "",
-		"data-boundary-id": boundary.boundaryId,
-		"data-boundary-previous-block-id": boundary.previousBlockId,
-		"data-boundary-next-block-id": boundary.nextBlockId,
-		"data-style-group": boundary.styleGroup,
-		style: boundaryCssVarsStyle(boundary)
-	}, `${input.blockKey}:boundary`);
-	return input.wrapBoundary ? input.wrapBoundary(boundary, rendered) : rendered;
+		"data-boundary-id": slot.join.boundaryId,
+		"data-boundary-previous-block-id": slot.previousBlockId,
+		"data-boundary-next-block-id": slot.nextBlockId,
+		"data-boundary-treatment": slot.join.treatment,
+		"data-boundary-placement": layout.placement,
+		style: boundaryPaintStyle(layout.paint)
+	}, `${input.blockKey}:boundary`) : null;
+	const extra = input.renderJoin?.({
+		previousBlockId: slot.previousBlockId,
+		nextBlockId: slot.nextBlockId,
+		join: slot.join
+	});
+	if (!painted && (extra === null || extra === void 0)) return null;
+	return /* @__PURE__ */ jsxs(React.Fragment, { children: [painted, extra] }, `${input.blockKey}:join`);
 }
-function boundaryCssVarsStyle(boundary) {
-	return {
-		"--site-style-transition-from": boundary.cssVars.from,
-		"--site-style-transition-to": boundary.cssVars.to
-	};
+/**
+* The one render-edge place a theme token becomes CSS.
+*/
+function themeTokenCss(token) {
+	return `rgb(var(--tb-${token}))`;
 }
-function boundaryReserveCssVarsStyle(input) {
-	const before = input.before?.metrics.reserveCss ?? null;
-	const after = input.after?.metrics.reserveCss ?? null;
-	if (!before && !after) return void 0;
+function boundaryPaintStyle(paint) {
 	return {
-		...before ? { "--site-style-boundary-before-reserve": before } : {},
-		...after ? { "--site-style-boundary-after-reserve": after } : {}
+		"--boundary-shape-paint": themeTokenCss(paint.shape),
+		...paint.band ? { "--boundary-band-paint": themeTokenCss(paint.band) } : {}
 	};
 }
-function transitionCssVarsStyle(content) {
-	const transitionStyles = isObjectRecord$2(content._transitionStyles) ? content._transitionStyles : null;
-	const cssVars = isObjectRecord$2(transitionStyles?.cssVars) ? transitionStyles.cssVars : null;
-	const from = typeof cssVars?.from === "string" ? cssVars.from : null;
-	const to = typeof cssVars?.to === "string" ? cssVars.to : null;
-	if (!from && !to) return void 0;
-	return {
-		...from ? { "--site-style-transition-from": from } : {},
-		...to ? { "--site-style-transition-to": to } : {}
+/**
+* Reserve attributes and variables for a block wrapper, from the joins on
+* either side. A join's `before` reserve sits inside its previous section, so
+* it pads the bottom of the block above the join; its `after` reserve pads the
+* top of the block below. Joins that do not draw reserve nothing.
+*/
+function blockBoundaryReserves(input) {
+	const top = reserveOnSide(input.before, "after");
+	const bottom = reserveOnSide(input.after, "before");
+	const style = {
+		...top ? { "--site-style-boundary-before-reserve": top.length } : {},
+		...bottom ? { "--site-style-boundary-after-reserve": bottom.length } : {}
 	};
-}
-function mergeStyleObjects(left, right) {
-	if (!left) return right;
-	if (!right) return left;
 	return {
-		...left,
-		...right
+		topPlacement: top?.placement,
+		bottomPlacement: bottom?.placement,
+		style: top || bottom ? style : void 0
 	};
 }
+/** The reserve one join needs on one side of itself, if it draws at all. */
+function reserveOnSide(slot, side) {
+	const layout = renderedJoinLayout(slot?.join ?? null);
+	const length = layout?.reserves[side] ?? null;
+	return layout && length ? {
+		length,
+		placement: layout.placement
+	} : null;
+}
 function pageBlockPosition(index, blockCount) {
 	if (blockCount <= 1) return "only";
 	if (index === 0) return "first";
@@ -134500,6 +135283,7 @@ init_styledSection();
 init_fragments$1();
 init_boxStyles();
 init_defineBlock();
+init_schema();
 const appointmentServicesBlockDefinition = {
 	manifest: createBlockManifest({
 		id: "block.appointment-services",
@@ -134525,6 +135309,15 @@ const appointmentServicesBlockDefinition = {
 				required: false,
 				ui: { intent: "content" }
 			},
+			createSiteOptionSelectField({
+				id: "categoryId",
+				label: "Category",
+				description: "Show one category (with its heading and intro), or leave it on All categories to show everything grouped.",
+				required: false,
+				multiple: false,
+				optionSource: "appointmentServiceCategories",
+				ui: { intent: "content" }
+			}),
 			sectionStylesField({
 				id: "_sectionStyles",
 				label: "Section styles",
@@ -134559,6 +135352,7 @@ const appointmentServicesBlockDefinition = {
 				richText({ className: "rb-prose rb-max-w-none" }, bind("content.description"), when("content.description")),
 				el("appointment-services", {
 					sectionHeading: { $bind: { from: "content.heading" } },
+					categoryId: { $bind: { from: "content.categoryId" } },
 					services: { $bind: { from: "data.services" } },
 					pathname: { $bind: { from: "$root.pathname" } },
 					servicePathPrefix: { $bind: { from: "$root.appointmentServicePathPrefix" } }
@@ -139308,9 +140102,8 @@ function sourceLabel(source) {
 }
 //#endregion
 //#region ../blocks/src/pageRenderPlan.ts
-init_site_styles();
-init_previewCompiler();
 init_typeGuards();
+init_site_styles();
 /**
 * Decides, once per page render, which blocks can render and what happens to
 * the ones that cannot.
@@ -139353,11 +140146,10 @@ function buildPageRenderPlan(input) {
 	return {
 		entries,
 		omitted,
-		runtimeBoundaries: retargetBoundariesAcrossOmissions({
-			boundaries: input.runtimeBoundaries,
+		runtimeJoins: retargetJoinsAcrossOmissions({
+			joins: input.runtimeJoins ?? [],
 			originalBlocks: input.page.blocks,
-			survivingBlocks: new Set(entries.map((entry) => entry.block)),
-			previewStage: input.previewStage
+			survivingBlocks: new Set(entries.map((entry) => entry.block))
 		})
 	};
 }
@@ -139459,86 +140251,15 @@ function getBlockOverride(blockKind, overrides) {
 * For draft/preview: draftContent takes priority over content.
 * For published: content is the source of truth.
 */
+/**
+* The content a block renders with. Every render path (public, preview,
+* templates, SDK) chooses content here, so this is also where a stale
+* `site-style-transition-*` styleGroup is dropped; authored values survive.
+*/
 function getRenderableContent(block, previewStage = "published") {
 	const source = previewStage === "preview" && block.draftContent ? block.draftContent : block.content ?? {};
-	return isObjectRecord$2(source) ? source : {};
-}
-/**
-* Re-points section boundaries across omitted blocks.
-*
-* Boundaries are keyed by adjacent block-id *pairs*, so dropping B from
-* [A, B, C] does not merely remove B's boundaries — it removes the boundary
-* between the survivors, because no `A→C` key was ever compiled.
-*
-* Per decision D2 the treatment for a merged gap comes from the boundary
-* entering the omitted run (`A→firstOmitted`), falling back to the one leaving
-* it (`lastOmitted→C`). The destination surface is a separate question: only
-* the exiting boundary knows what C looks like, so the merged boundary ends on
-* that endpoint rather than on the omitted block's. In the exiting-only
-* fallback the origin remains an approximation: `from` is the omitted block's
-* surface, because no compiled boundary carries A's. The hosted path no longer
-* needs this at all (site-renderer admits blocks before compiling boundaries);
-* it remains the safety net for an SDK whose compiled boundaries predate an
-* omission.
-*/
-function retargetBoundariesAcrossOmissions(input) {
-	const { boundaries, originalBlocks, survivingBlocks, previewStage } = input;
-	if (boundaries === void 0) return void 0;
-	if (boundaries.length === 0) return boundaries;
-	if (!originalBlocks.some((block) => !survivingBlocks.has(block))) return boundaries;
-	const byPair = new Map(boundaries.map((boundary) => [pairKey(boundary.previousBlockId, boundary.nextBlockId), boundary]));
-	const retargeted = [];
-	let previousSurvivor = null;
-	let run = [];
-	for (const block of originalBlocks) {
-		if (!survivingBlocks.has(block)) {
-			run.push(block);
-			continue;
-		}
-		if (previousSurvivor?.id && block.id) {
-			const boundary = run.length === 0 ? byPair.get(pairKey(previousSurvivor.id, block.id)) : mergedBoundary({
-				byPair,
-				previousBlock: previousSurvivor,
-				previousBlockId: previousSurvivor.id,
-				nextBlock: block,
-				nextBlockId: block.id,
-				run,
-				previewStage
-			});
-			if (boundary) retargeted.push(boundary);
-		}
-		previousSurvivor = block;
-		run = [];
-	}
-	return retargeted;
-}
-function mergedBoundary(input) {
-	const { byPair, previousBlock, previousBlockId, nextBlock, nextBlockId, run, previewStage } = input;
-	const firstOmittedId = run[0]?.id;
-	const lastOmittedId = run[run.length - 1]?.id;
-	const entering = firstOmittedId ? byPair.get(pairKey(previousBlockId, firstOmittedId)) : void 0;
-	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : void 0;
-	const donor = entering ?? exiting;
-	if (!donor) return void 0;
-	const transition = compileTransitionRuntime({
-		treatment: donor.treatment,
-		from: donor.from,
-		to: exiting?.to ?? donor.to
-	});
-	return retargetCompiledBoundaryRuntimeForContentAdjacency({
-		...donor,
-		boundaryId: makeBoundaryId(asDesignBlockId(previousBlockId), asDesignBlockId(nextBlockId)),
-		previousBlockId,
-		nextBlockId,
-		from: transition.from,
-		to: transition.to,
-		cssVars: transition.cssVars
-	}, {
-		currentContent: getRenderableContent(previousBlock, previewStage),
-		nextContent: getRenderableContent(nextBlock, previewStage)
-	});
+	return isObjectRecord$2(source) ? stripStaleTransitionStyleGroup(source) : {};
 }
-const pairKey = boundaryKey;
 //#endregion
 //#region ../blocks/src/system/manifest/hydrateLinks.ts
 init_typeGuards();
@@ -139575,7 +140296,7 @@ function hydrateResolvedBookingConsentValue(value, context) {
 		const hydratedItems = value.map((item) => hydrateResolvedBookingConsentValue(item, context));
 		return hydratedItems.every((item, index) => item === value[index]) ? value : hydratedItems;
 	}
-	if (!isRecord$30(value)) return value;
+	if (!isRecord$31(value)) return value;
 	if (isBookingConsentCarrier(value)) {
 		const agreement = hydrateValue(value.agreement, context);
 		return agreement === value.agreement ? value : {
@@ -139595,7 +140316,7 @@ function hydrateValue(value, context) {
 			const resolvedItems = value.map((item) => hydrateValue(item, context));
 			return resolvedItems.every((item, index) => item === value[index]) ? value : resolvedItems;
 		}
-		if (isRecord$30(value)) {
+		if (isRecord$31(value)) {
 			if (isInternalLink$1(value)) return hydrateInternalLink(value, context.routes);
 			if (isPageLink$1(value)) return hydratePageLink(value, context);
 			if (isEntryLink$1(value)) return hydrateEntryLink(value, context);
@@ -139661,7 +140382,7 @@ function hydrateEntryLink(link, context) {
 init_typeGuards();
 function resolveBlockData$1(blockId, dataLoaders, dataContext, routes) {
 	const raw = blockId ? dataContext?.resolvedData?.[blockId] : void 0;
-	if (isRecord$30(raw)) return routes ? hydrateResolvedBookingConsentLinks(raw, routes, dataContext?.pagesByIdentifier, dataContext?.entriesByIdentifier) : raw;
+	if (isRecord$31(raw)) return routes ? hydrateResolvedBookingConsentLinks(raw, routes, dataContext?.pagesByIdentifier, dataContext?.entriesByIdentifier) : raw;
 	return dataLoaders && typeof dataLoaders === "object" && Object.keys(dataLoaders).length > 0 ? {} : void 0;
 }
 //#endregion
@@ -139696,23 +140417,44 @@ function preparePageRender(input) {
 			prepared
 		});
 	}
-	if (constructionFailures.length === 0 || input.audience === "authoring") return {
-		entries,
-		constructionFailures,
-		runtimeBoundaries: input.plan.runtimeBoundaries
-	};
-	const survivors = entries.filter((candidate) => candidate.prepared.kind !== "render-threw");
+	const survivors = input.audience === "authoring" ? entries : entries.filter((candidate) => candidate.prepared.kind !== "render-threw");
 	return {
 		entries: survivors,
 		constructionFailures,
-		runtimeBoundaries: retargetBoundariesAcrossOmissions({
-			boundaries: input.plan.runtimeBoundaries,
-			originalBlocks: input.plan.entries.map((planned) => planned.block),
-			survivingBlocks: new Set(survivors.map((survivor) => survivor.entry.block)),
-			previewStage: input.previewStage
-		})
+		joins: composeSurvivorJoins(input.plan, survivors, input.themeResources)
 	};
 }
+/**
+* The only place joins are composed. Plan-time omissions were already
+* re-pointed by the plan; construction failures are re-pointed here by the
+* same primitive, so `[A, B, C]` losing B still gets an A→C join. Each
+* survivor is then classified from its final content.
+*/
+function composeSurvivorJoins(plan, survivors, themeResources) {
+	return composePageJoins({
+		joins: retargetJoinsAcrossOmissions({
+			joins: plan.runtimeJoins,
+			originalBlocks: plan.entries.map((planned) => planned.block),
+			survivingBlocks: new Set(survivors.map((survivor) => survivor.entry.block))
+		}),
+		survivors: survivors.map(({ entry }) => ({
+			id: entry.block.id,
+			kind: entry.block.kind,
+			content: boundaryClassificationContent(entry, themeResources)
+		}))
+	});
+}
+/**
+* The content a join is classified from must be the content that paints the
+* section. The default block renderer layers the theme's per-block style
+* defaults (`theme.blockOverrides[kind].styles`, background included) under
+* the block's own `_sectionStyles`, so classify that same projection. An
+* override component renders its own markup from the unmerged content.
+*/
+function boundaryClassificationContent(entry, themeResources) {
+	if (entry.kind !== "renderable" || entry.override) return entry.renderableContent;
+	return mergeContentWithBlockStyleOverrides(entry.renderableContent, themeResources.kind === "available" ? themeResources.config : void 0, entry.block.kind);
+}
 function prepareEntry(entry, input) {
 	if (entry.kind !== "renderable") return { kind: "plan-decided" };
 	const draftContent = previewableEditorContent(entry);
@@ -139921,7 +140663,7 @@ function EditorPageRenderer$1(props) {
 	});
 }
 function PageRendererCore(props) {
-	const { page, audience, runtimeBoundaries, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props;
+	const { page, audience, runtimeJoins, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props;
 	const imageResolveContext = React$1.useMemo(() => resolvePageRendererImageResolveContext(dataContext), [
 		dataContext?.imageResolveContext,
 		dataContext?.mediaAssets,
@@ -139937,7 +140679,7 @@ function PageRendererCore(props) {
 			blocks: []
 		},
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -139945,7 +140687,7 @@ function PageRendererCore(props) {
 	}), [
 		page,
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -139962,19 +140704,16 @@ function PageRendererCore(props) {
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	}), [
 		plan,
 		audience,
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	]);
-	const boundaryByAdjacentBlockIds = React$1.useMemo(() => boundaryMapForAdjacentBlockIds(preparation.runtimeBoundaries ?? []), [preparation.runtimeBoundaries]);
-	const usesRuntimeBoundaries = preparation.runtimeBoundaries !== void 0;
+	const joinSlots = React$1.useMemo(() => joinSlotsByPair(preparation.joins), [preparation.joins]);
 	reportAndReplayOmissions({
 		plan,
 		preparation,
@@ -139992,10 +140731,9 @@ function PageRendererCore(props) {
 		themeResources,
 		imageResolveContext,
 		resolvedRegistry,
-		boundaryByAdjacentBlockIds,
-		usesRuntimeBoundaries,
+		joinSlots,
 		wrapBlock: props.wrapBlock,
-		wrapBoundary: props.wrapBoundary
+		renderJoin: props.renderJoin
 	})) });
 }
 /**
@@ -140084,27 +140822,25 @@ function requireEntryBlockOverride(entry, themeResources) {
 }
 /**
 * Renders one planned block: its wrapper, style-group data attributes,
-* boundary reserve space and any boundary or transition sibling that follows.
+* boundary reserve space and the join markup that follows it.
 *
 * Extracted from PageRendererCore so the component stays about wiring the plan
 * rather than also owning per-block markup.
 */
 function renderPlanEntry(input) {
-	const { index, entries, props, themeResources, imageResolveContext, resolvedRegistry, boundaryByAdjacentBlockIds, usesRuntimeBoundaries, wrapBlock, wrapBoundary } = input;
+	const { index, entries, props, themeResources, imageResolveContext, resolvedRegistry, joinSlots, wrapBlock, renderJoin } = input;
 	const entry = input.entry.entry;
 	const block = entry.block;
 	const blockPosition = pageBlockPosition(index, entries.length);
 	const blockKey = blockKeyFor(block, index);
 	const previousBlock = entries[index - 1]?.entry.block ?? null;
 	const nextBlock = entries[index + 1]?.entry.block ?? null;
-	const boundaryBefore = boundaryBetweenBlocks(previousBlock, block, boundaryByAdjacentBlockIds);
-	const boundaryAfter = boundaryBetweenBlocks(block, nextBlock, boundaryByAdjacentBlockIds);
-	const boundaryElement = renderBoundaryAfterBlock({
-		block,
-		nextBlock,
+	const joinBefore = joinSlotBetween(previousBlock?.id, block.id, joinSlots);
+	const joinAfter = joinSlotBetween(block.id, nextBlock?.id, joinSlots);
+	const boundaryElement = renderJoinSlot({
+		slot: joinAfter,
 		blockKey,
-		boundaryByAdjacentBlockIds,
-		wrapBoundary
+		renderJoin
 	});
 	const cleanKind = block.kind.replace(/^block\./, "");
 	const managesOwnWrapper = entry.kind === "renderable" && entry.managesOwnWrapper;
@@ -140127,11 +140863,10 @@ function renderPlanEntry(input) {
 	const styleGroup = typeof renderableContent.styleGroup === "string" ? renderableContent.styleGroup : void 0;
 	const blockLook = typeof renderableContent.blockLook === "string" ? renderableContent.blockLook : void 0;
 	const blockComposition = readBlockComposition(renderableContent.blockComposition);
-	const transitionStyle = transitionCssVarsStyle(renderableContent);
-	const blockStyle = mergeStyleObjects(transitionStyle, boundaryReserveCssVarsStyle({
-		before: boundaryBefore,
-		after: boundaryAfter
-	}));
+	const reserves = blockBoundaryReserves({
+		before: joinBefore,
+		after: joinAfter
+	});
 	const blockElement = /* @__PURE__ */ jsx("div", {
 		className: wrapperClassName,
 		"data-block": cleanKind,
@@ -140143,21 +140878,14 @@ function renderPlanEntry(input) {
 		"data-block-composition": blockComposition?.treatment,
 		"data-block-composition-kind": blockComposition?.kind,
 		"data-page-block-position": blockPosition,
-		"data-site-style-boundary-before": boundaryBefore?.metrics.size,
-		"data-site-style-boundary-after": boundaryAfter?.metrics.size,
+		"data-site-style-boundary-before": reserves.topPlacement,
+		"data-site-style-boundary-after": reserves.bottomPlacement,
 		"data-style-group": styleGroup,
-		style: blockStyle,
+		style: reserves.style,
 		children: /* @__PURE__ */ jsx(MemoBlockSection, { ...blockSectionProps })
 	}, blockKey);
 	if (boundaryElement) return /* @__PURE__ */ jsxs(React$1.Fragment, { children: [blockElement, boundaryElement] }, blockKey);
-	if (usesRuntimeBoundaries || !isSiteStyleTransitionStyleGroup(styleGroup)) return blockElement;
-	return /* @__PURE__ */ jsxs(React$1.Fragment, { children: [blockElement, /* @__PURE__ */ jsx("div", {
-		"aria-hidden": "true",
-		"data-block-transition": "",
-		"data-block-transition-for": block.id ?? blockKey,
-		"data-style-group": styleGroup,
-		style: transitionStyle
-	})] }, blockKey);
+	return blockElement;
 }
 function resolvePageRendererImageResolveContext(dataContext) {
 	const input = dataContext?.imageResolveContext;
@@ -154015,7 +154743,7 @@ function toBlocksPageRendererDataContext(dataContext) {
 function toBlocksCommonProps(props) {
 	return {
 		page: props.page,
-		runtimeBoundaries: props.runtimeBoundaries,
+		runtimeJoins: props.runtimeJoins,
 		dataContext: props.dataContext ? toBlocksPageRendererDataContext(props.dataContext) : void 0,
 		routeMap: props.routeMap,
 		wrapBlock: props.wrapBlock,
@@ -154139,10 +154867,10 @@ function buildPageRouteRenderContext(dataContext) {
 	};
 }
 function PageContent(props) {
-	const { page, runtimeBoundaries, siteId, resolvedData, bookingOfferingPresets, mailingList, bookingTimeZone, routeMap, pagesByIdentifier, entriesByIdentifier, wrapBlock, registry, blockOverrides, sdkConfig, customBlocks, supabaseUrl, mediaAssets, apiBaseUrl, portalToken, previewToken, readAuthority, dataContext } = props;
+	const { page, runtimeJoins, siteId, resolvedData, bookingOfferingPresets, mailingList, bookingTimeZone, routeMap, pagesByIdentifier, entriesByIdentifier, wrapBlock, registry, blockOverrides, sdkConfig, customBlocks, supabaseUrl, mediaAssets, apiBaseUrl, portalToken, previewToken, readAuthority, dataContext } = props;
 	const rendererCommonProps = {
 		page,
-		runtimeBoundaries,
+		runtimeJoins,
 		dataContext: {
 			siteId,
 			...buildPageRouteRenderContext(dataContext),
@@ -155984,6 +156712,17 @@ function coerceToString(value) {
 	return "";
 }
 /**
+* The appointment-services catalogue (issue 1403) pairs the services with the
+* site's ordered categories. Both are needed to group them, so that response
+* is passed through whole; any other `{ services }` wrapper is unwrapped.
+*/
+function coerceServicesPayload(record) {
+	return Array.isArray(record.services) && Array.isArray(record.categories) ? {
+		services: record.services,
+		categories: record.categories
+	} : record.services;
+}
+/**
 * Extract data from API response.
 * Unwraps common response wrappers: { data }, { form }, { entries }, { services }, { teamMembers }
 *
@@ -155998,7 +156737,7 @@ function coercePayload(payload) {
 		if ("data" in record && typeof record.data !== "function") return record.data;
 		if ("form" in record && typeof record.form !== "function") return record.form;
 		if ("entries" in record && typeof record.entries !== "function") return record.entries;
-		if ("services" in record && typeof record.services !== "function") return record.services;
+		if ("services" in record && typeof record.services !== "function") return coerceServicesPayload(record);
 		if ("teamMembers" in record && typeof record.teamMembers !== "function") return record.teamMembers;
 	}
 	return payload;
@@ -156707,6 +157446,75 @@ async function Layout(props) {
 	});
 }
 //#endregion
+//#region ../api/src/defineEndpointDefinitions.ts
+/**
+* Validates extracted endpoint descriptors while preserving each literal path,
+* method, and parameter contract for the typed URL builders.
+*/
+function defineEndpointDefinitions(definitions) {
+	return definitions;
+}
+//#endregion
+//#region ../api/src/publicNewsletterEndpointDefinitions.ts
+const PUBLIC_NEWSLETTER_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	subscribeNewsletter: {
+		path: "/public/sites/{siteId}/newsletter/subscribe",
+		method: "POST",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "json"
+	},
+	confirmNewsletter: {
+		path: "/public/sites/{siteId}/newsletter/confirm/{token}",
+		method: "GET",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	unsubscribeNewsletter: {
+		path: "/public/sites/{siteId}/newsletter/unsubscribe/{token}",
+		method: "GET",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	unsubscribeNewsletterPost: {
+		path: "/public/sites/{siteId}/newsletter/unsubscribe/{token}",
+		method: "POST",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	confirmNewsletterPost: {
+		path: "/public/sites/{siteId}/newsletter/confirm/{token}",
+		method: "POST",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	getNewsletterPreferences: {
+		path: "/public/sites/{siteId}/newsletter/preferences/{token}",
+		method: "GET",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	saveNewsletterPreferences: {
+		path: "/public/sites/{siteId}/newsletter/preferences/{token}",
+		method: "POST",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	},
+	getNewsletterArchive: {
+		path: "/public/sites/{siteId}/newsletter/archive/{token}",
+		method: "GET",
+		tags: ["public-newsletter-{siteId}"],
+		auth: "public",
+		responseKind: "text"
+	}
+});
+//#endregion
 //#region ../api/src/apiEndpointTypes.ts
 function allowedDemoMutationPolicy() {
 	return {
@@ -156796,17 +157604,85 @@ const SDK_ENTRY_READ_ENDPOINTS = {
 	}
 };
 //#endregion
-//#region ../api/src/defineEndpointDefinitions.ts
-/**
-* Validates extracted endpoint descriptors while preserving each literal path,
-* method, and parameter contract for the typed URL builders.
-*/
-function defineEndpointDefinitions(definitions) {
-	return definitions;
-}
-//#endregion
 //#region ../api/src/appointmentEndpointDefinitions.ts
 const APPOINTMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	...defineEndpointDefinitions({
+		listGroupedAppointmentServices: {
+			path: "/sites/{siteId}/bookings/services/grouped",
+			method: "GET",
+			auth: "user",
+			responseKind: "json",
+			errors: ["server:internal_error"]
+		},
+		reorderAppointmentServices: {
+			path: "/sites/{siteId}/bookings/services/order",
+			method: "PUT",
+			auth: "user",
+			responseKind: "json",
+			errors: [
+				"validation:invalid_input",
+				"auth:forbidden",
+				"resource:not_found",
+				"resource:conflict",
+				"server:internal_error"
+			]
+		},
+		listAppointmentServiceCategories: {
+			path: "/sites/{siteId}/bookings/service-categories",
+			method: "GET",
+			auth: "user",
+			responseKind: "json",
+			errors: ["server:internal_error"]
+		},
+		createAppointmentServiceCategory: {
+			path: "/sites/{siteId}/bookings/service-categories",
+			method: "POST",
+			auth: "user",
+			responseKind: "json",
+			errors: [
+				"validation:invalid_input",
+				"auth:forbidden",
+				"resource:conflict",
+				"server:internal_error"
+			]
+		},
+		updateAppointmentServiceCategory: {
+			path: "/sites/{siteId}/bookings/service-categories/{categoryId}",
+			method: "PUT",
+			auth: "user",
+			responseKind: "json",
+			errors: [
+				"validation:invalid_input",
+				"auth:forbidden",
+				"resource:not_found",
+				"resource:conflict",
+				"server:internal_error"
+			]
+		},
+		deleteAppointmentServiceCategory: {
+			path: "/sites/{siteId}/bookings/service-categories/{categoryId}",
+			method: "DELETE",
+			auth: "user",
+			responseKind: "json",
+			errors: [
+				"auth:forbidden",
+				"resource:not_found",
+				"server:internal_error"
+			]
+		},
+		reorderAppointmentServiceCategories: {
+			path: "/sites/{siteId}/bookings/service-categories/order",
+			method: "PUT",
+			auth: "user",
+			responseKind: "json",
+			errors: [
+				"validation:invalid_input",
+				"auth:forbidden",
+				"resource:conflict",
+				"server:internal_error"
+			]
+		}
+	}),
 	listAppointmentResources: {
 		path: "/sites/{siteId}/bookings/resources",
 		method: "GET",
@@ -157954,39 +158830,6 @@ const NEWSLETTER_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 		auth: "user",
 		responseKind: "json",
 		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
-	},
-	listNewsletterSendJobs: {
-		path: "/sites/{siteId}/newsletter/jobs",
-		method: "GET",
-		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
-		auth: "user",
-		responseKind: "json"
-	},
-	retryNewsletterSendJob: {
-		path: "/sites/{siteId}/newsletter/jobs/{jobId}/retry",
-		method: "POST",
-		errors: [
-			"validation:invalid_input",
-			"resource:not_found",
-			"auth:forbidden",
-			"server:internal_error"
-		],
-		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
-		auth: "user",
-		responseKind: "json"
-	},
-	cancelNewsletterSendJob: {
-		path: "/sites/{siteId}/newsletter/jobs/{jobId}/cancel",
-		method: "POST",
-		errors: [
-			"validation:invalid_input",
-			"resource:not_found",
-			"auth:forbidden",
-			"server:internal_error"
-		],
-		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
-		auth: "user",
-		responseKind: "json"
 	}
 });
 //#endregion
@@ -158755,6 +159598,7 @@ const BILLING_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 	}
 });
 ({
+	...PUBLIC_NEWSLETTER_ENDPOINT_DEFINITIONS,
 	...ACCOUNT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_ONBOARDING_ATTEMPT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_EVENT_ENDPOINT_DEFINITIONS,
@@ -159768,7 +160612,12 @@ const appointmentSetupServiceDraftSchema = z$1.object({
 	venue: appointmentSetupVenueChoiceSchema,
 	timezone: z$1.string().trim().min(1).nullable(),
 	payment: appointmentSetupPaymentDraftSchema,
-	assignment: appointmentSetupServiceAssignmentDraftSchema
+	assignment: appointmentSetupServiceAssignmentDraftSchema,
+	/**
+	* The service's category, or null for "Other" (issue 1403). Omitted leaves
+	* an existing service's category alone and puts a new one in "Other".
+	*/
+	categoryId: z$1.string().uuid().nullable().optional()
 }).superRefine((service, ctx) => {
 	if (service.payment.kind !== "free" && (service.priceAmount === null || service.priceAmount <= 0)) ctx.addIssue({
 		code: "custom",
@@ -161368,7 +162217,7 @@ async function loadPageWithDeps(deps, params) {
 	});
 	return {
 		page: pageOutline,
-		runtimeBoundaries: pageData.runtimeBoundaries,
+		runtimeJoins: pageData.runtimeJoins,
 		theme: requireSdkTheme(support.theme, siteId),
 		sdkConfig: support.sdkConfig,
 		siteId,
@@ -163648,7 +164497,7 @@ function applyBindings$1(bindings, context) {
 			if (value !== void 0 && value !== null) setBindingValue(result, key, value);
 			continue;
 		}
-		if (isRecord$30(bindingSpec)) {
+		if (isRecord$31(bindingSpec)) {
 			const nested = applyBindings$1(bindingSpec, context);
 			if (Object.keys(nested).length > 0) setBindingValue(result, key, nested);
 		}
@@ -163689,7 +164538,7 @@ function mergeResolvedBindings(base, resolved) {
 	const merged = { ...base };
 	for (const [key, resolvedValue] of Object.entries(resolved)) {
 		const baseValue = merged[key];
-		merged[key] = isRecord$30(baseValue) && isRecord$30(resolvedValue) ? mergeResolvedBindings(baseValue, resolvedValue) : resolvedValue;
+		merged[key] = isRecord$31(baseValue) && isRecord$31(resolvedValue) ? mergeResolvedBindings(baseValue, resolvedValue) : resolvedValue;
 	}
 	return merged;
 }
@@ -163714,7 +164563,7 @@ function setBindingValue(target, path, value) {
 				current[Number(segment)] = value;
 				return;
 			}
-			if (isRecord$30(current)) current[segment] = value;
+			if (isRecord$31(current)) current[segment] = value;
 			return;
 		}
 		const nextWantsArray = typeof nextSegment === "string" && isIndex(nextSegment);
@@ -163723,15 +164572,15 @@ function setBindingValue(target, path, value) {
 			const existing = current[index];
 			if (nextWantsArray) {
 				if (!Array.isArray(existing)) current[index] = [];
-			} else if (!isRecord$30(existing)) current[index] = {};
+			} else if (!isRecord$31(existing)) current[index] = {};
 			current = current[index];
 			continue;
 		}
-		if (isRecord$30(current)) {
+		if (isRecord$31(current)) {
 			const existing = current[segment];
 			if (nextWantsArray) {
 				if (!Array.isArray(existing)) current[segment] = [];
-			} else if (!isRecord$30(existing)) current[segment] = {};
+			} else if (!isRecord$31(existing)) current[segment] = {};
 			current = current[segment];
 			continue;
 		}
@@ -163769,7 +164618,7 @@ function getPath$1(source, path) {
 	const segments = path.split(".").map((segment) => segment.trim()).filter(Boolean);
 	let current = source;
 	for (const segment of segments) {
-		if (!isRecord$30(current)) return void 0;
+		if (!isRecord$31(current)) return void 0;
 		current = current[segment];
 	}
 	return current;
@@ -163802,7 +164651,7 @@ function textToInlineText(value) {
 function extractFirstParagraph$1(value) {
 	if (!isRichTextDoc(value)) return null;
 	for (const node of value.content) {
-		if (!isRecord$30(node)) continue;
+		if (!isRecord$31(node)) continue;
 		if (node.type !== "paragraph" || !Array.isArray(node.content)) continue;
 		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;
@@ -163822,7 +164671,7 @@ function formatDate$1(value, options) {
 * Type guard to check if a value is a valid binding descriptor.
 */
 function isBindingDescriptor$1(value) {
-	if (!isRecord$30(value) || typeof value.source !== "string") return false;
+	if (!isRecord$31(value) || typeof value.source !== "string") return false;
 	if (!BINDING_SOURCES$1.includes(value.source)) return false;
 	switch (value.source) {
 		case "field":
@@ -163837,7 +164686,7 @@ function isBindingDescriptor$1(value) {
 * Type guard to check if a value is binding-descriptor-like (can be normalized).
 */
 function isBindingDescriptorLike$1(value) {
-	return isBindingDescriptor$1(value) || typeof value === "string" || isRecord$30(value) && typeof value.source === "string" && typeof value.path === "string";
+	return isBindingDescriptor$1(value) || typeof value === "string" || isRecord$31(value) && typeof value.source === "string" && typeof value.path === "string";
 }
 /**
 * Normalizes a binding input to a binding descriptor.
@@ -163878,7 +164727,7 @@ const ImagePresets = {
 		resize: "contain"
 	}
 };
-const isRecord = isRecord$30;
+const isRecord = isRecord$31;
 const applyBindingsToContent = applyBindingsToContent$1;
 //#endregion
 //#region src/rendering/helpers/templateContent.ts
@@ -164327,7 +165176,7 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 			ogImageId: pageRecord.ogImageId ?? null
 		},
 		page: pageOutline,
-		runtimeBoundaries: pageData.runtimeBoundaries,
+		runtimeJoins: pageData.runtimeJoins,
 		theme: support.theme,
 		siteId,
 		...support.customBlocks ? { customBlocks: support.customBlocks } : {},