riverbankcms 0.8.0 → 0.10.0

package/dist/cli/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { $ as generateBaseInteractiveCSS, $n as createContentEntryRef, $t as NAV_LINK_LETTER_SPACING_MAP, A as getGradientPreset, An as featuresFromHex, At as resolveTokenOrCssColorValue, B as generateCssVars, Bn as normalizeCardRole, Bt as featureCardCompositionTreatmentValues, C as retargetCompiledBoundaryRuntimeForContentAdjacency, Cn as resolveSurfaceForeground, Ct as MQ_SM_DOWN, D as compileTransitionRuntime, Dn as defaultThemeTokens, Dt as isCssColorLiteral, E as getCuratedSiteStyle, En as buildThemeTokens, Et as headerVariantValues, F as parseBackgroundAppearanceColorToken, Fn as surfaceForegroundStyle, Ft as defineBlockDesignCapability, G as resolvedButtonColourDeclarations, Gn as footerModeSchema, Gt as testimonialsCompositionTreatmentValues, H as PUBLIC_BUTTON_ROLES, Hn as mediaSchema, Ht as introCompositionTreatmentValues, I as defineBlockDesignMetadata, In as surfaceForegroundValue, It as defineFrameCapability, J as contextualButtonSurfaceStyles, Jn as unsafeAsOpaqueButtonColourToken, Jt as getComponentBorderWidthPx, K as resolvedButtonFocusDeclarations, Kn as VARIANT_ROLES, Kt as tileTreatmentValues, L as require_jsx_runtime, Ln as generateShadowValue$1, Lt as defineNoBlockDesignCapability, M as boundaryRuntimeMetricsForTransition, Mn as oklchToHexGamut, N as backgroundAppearanceColorTokenNames, Nn as DEFAULT_SURFACE_TEXT_COLOR, Nt as asDesignBlockId, O as gradientToCss, On as ORDINARY_TEXT_MIN_CONTRAST_RATIO, Ot as resolveOnColorForThemeToken, P as backgroundAppearanceQuickColorTokenNames, Pn as surfaceForegroundDeclarations, Pt as assertNever$4, Q as generateEffectsCSS, Qn as createCommandRef, Qt as NAV_LINK_BORDER_RADIUS_MAP, R as require_react, Rn as cardRoleSchema, Rt as eventListTreatmentValues, Sn as textColorStyle, St as MQ_MD_DOWN, T as readHeaderNavFontSizePreference, Tn as onColorTokenName, Tt as MQ_TABLET_ONLY, U as generateButtonCss, Un as mediaTypeDiscriminants, Ut as makeBoundaryId, Vn as mediaIdentifierSchema, Vt as headingDecorationColorTokenValues, W as RESOLVED_BUTTON_DISABLED_DECLARATIONS, Wn as persistableMediaSchema, Wt as offeringsPreviewCompositionTreatmentValues, X as resolveContextualButtonRole, Xn as createBlockRef, Xt as parseBlockCustomCssRules, Y as deriveButtonSurfaceContext, Yn as parseBlockColorToken, Yt as getComponentShadowVar, Z as generateDefaultButtonSystem, Zn as createBlocksRef, Zt as parseCustomCssRules, _ as entryIdentifierForCommand, _n as backgroundColorStyle, _t as BREAKPOINT_LG, a as classifySdkEventBookingOffer, an as INPUT_SPACING_MAP, ar as createPageRef, at as compileButtonColourStates, b as pagePathForCommand, bn as mergeStyles, bt as BREAKPOINT_XL, c as stableStringify, cn as ACCORDION_SPACING_MAP, cr as refSlug, ct as expandPalette, d as mapEventCommandContent, dn as ICON_CONFIG, dt as boxBackgroundOverlaySchema, en as NAV_LINK_PADDING_MAP, er as createEventCategoryRef, et as generateInteractiveChildInheritanceCSS, f as evaluateSiteCommandBatchExposure, fn as ICON_SIZE_PX, ft as boxBackgroundSchema, g as blockOrderIdentifiersForCommand, gn as TokenResolver, gt as renderHeaderPaintTargetRules, h as blockIdentifierForCommand, hn as generateCardCss, ht as getHeaderPaintTargets, in as INPUT_FONT_SIZE_MAP, ir as createNavigationRef, it as parseThemeForPersistence, j as parseGradientPresetId, jn as hexToRgb, jt as pageDesignEditorBackgroundOverrideOwner, k as GRADIENT_PRESET_IDS, kn as contrastRatio, kt as resolveThemeColorReferenceValue, l as createDryRunReport, ln as ACCORDION_TRIGGER_FONT_SCALE, lr as slugPart, lt as getTextColorForBackground, m as getSiteCommandMetadata, mn as getDefaultCardVariants, mt as generateMobileOverlayBackdropFilterFix, nn as NAV_LINK_TEXT_SIZE_MAP, nr as createFooterRef, nt as themeButtonClassName, o as venueManagementFields, on as LABEL_FONT_SIZE_MAP, or as createSiteCommandSiteRef, ot as formatButtonColourContractError, p as evaluateSiteCommandExposure, pn as generateCardCoreCss, pt as generateHeaderScrollTreatmentStyles, q as contextualButtonSurfaceResetStyles, qn as buttonVariantIdSchema, qt as visibleHeadingDecorationFamilyValues, rn as FONT_WEIGHT_MAP, rr as createFormRef, rt as themeButtonClassNameWithTrailingIcon, s as sortRecord, sn as ACCORDION_OPEN_ACCENT_THICKNESS, sr as createVenueRef, st as generateShadowValue, t as classifySdkEventTiming, tn as NAV_LINK_PADDING_X_MAP, tr as createEventSeriesRef, tt as parseThemeButtonVariantId, u as parseAndPlanCommandBatchForTypes, un as ACCORDION_TRIGGER_LETTER_SPACING, ur as __toESM, ut as themeSchema, v as pageIdentifierForBlockCommand, vn as borderColorStyle, vt as BREAKPOINT_MD, w as mergeHeaderNavTypographyPreference, wn as isOnColorBackgroundCandidateToken, wt as MQ_SM_UP, x as hasConfiguredBookingVertical, xn as rgbColorValue, xt as MQ_LG_UP, y as pageIdentifierForCommand, yn as cssVarValue, yt as BREAKPOINT_SM, z as pickShadeTowardBackground, zn as cardVariantRoleValues, zt as eyebrowTreatmentValues } from "../sdk-event-upsert-Bf6wAl4s.mjs";
-import { $ as formatEventPricing, A as parseFooterCompositionV1, B as formatBookingTime, C as parseMailingListContentVersionId, D as DEFAULT_MAILING_LIST_SUCCESS_MESSAGE, E as planMailingListChoicePresentation, Et as unsafeAsMediaAssetId, F as normalizeLocationAddressText, G as getLocalScheduleTime, H as formatLocalScheduleTime, Ht as ok, I as toLocationCoordinates, It as unsafeAsStaffMemberId, J as toScheduledBookingDateRange, L as buildBookingUtcDateWindow, N as assertAllowedPublicUrl, O as parseMailingListProviderScope, Q as formatBookingPriceDisplay, R as formatBookingDate, S as parseMailingListBlockId, T as parseMailingListRuntimeContext, U as getBookingLocalDateKey, V as formatLocalScheduleDate, Vt as err, W as getLocalScheduleDate, Y as toScheduledBookingDateTime, Z as parseEventPageSurfaceSubject, _ as createSecret, at as resolvePricingOptionsPriceDisplay, bt as unsafeAsDemoCapability, c as DEFAULT_EVENT_TYPE_PRESETS, ct as formatCurrencyAmount, d as SURFACE_EVENT_PRESET_VALUES, dt as parseEventSeriesId, et as isPublicEventPricingOptionDisplayable, f as WHOLE_SERIES_EVENT_PRESET_VALUES, ft as parseMediaAssetId, g as resolveWholeSeriesBookingPhase, gt as unsafeAsAppointmentResourceId, h as orderedLiveRunSessions, ht as parseUserId, i as isEventSeriesVerticalPresetDefinition, it as resolveExactOrFreePriceDisplay, j as parseMailingListPlacementTargeting, kt as unsafeAsPositiveByteCount, l as EVENT_PRESET_VALUES, lt as assertNever, m as CANCELLED_SESSION_STATUS, mt as parseSiteId, n as areConfiguredBookingVerticalConfigsEqual, nt as publicEventPricingDisplay, p as publicReadFreshnessSeconds, pt as parsePageId, q as toBookingTimeZone, rt as publicEventPricingType, s as resolveSiteVerticalBookingConfig, t as NAVIGATION_LOCATIONS, tt as publicEventPricingCurrency, ut as parseApiKeyId, v as exposeSecret, w as parseMailingListSignedSourceToken, x as buildMailingListSignupBlockSourceRef, y as parseManagementKey, z as formatBookingDateParts } from "../src-B8fOSKJ6.mjs";
-import { $ as sdkUpsertEventResponseSchema, A as resolveMediaTransformForAspect, B as asRecord$1, C as walkAndCollectImageAttrs, D as normalizeWidthCandidates, E as rotateNormalizedPoint, F as buildMediaIdentifierFromFilename, G as parseSafeDownloadFilename, H as FILE_SIZE_LIMITS, I as parseMediaIdentifier, J as createHttpClient, K as ManagementApiError, L as deriveVideoSlotPolicy, M as getDirectImageUrlForSiteScopedPath, N as getImageUrl, O as isExplicitRectCrop, P as isSiteScopedDirectImageStoragePath, Q as sdkListEventsResponseSchema, R as resolveVideoSelectionIntentForMediaField, S as buildRenderableMediaAssetIndex, T as looksLikeUuid$1, U as classifyKnownMimeType, V as parseRelativeStoragePath, W as managementMediaLibraryUploadLimitForMimeType, X as sdkConfigureBookingVerticalResponseSchema, Y as is404Error, Z as sdkGetEventResponseSchema, _ as buildSettingsUpdateInput, _t as sdkConfiguredBookingVerticalConfigSchema, a as prepareLocalMediaForPush, at as externalLinkSchema$1, b as isMediaValue, c as writeBinaryFileAtomic, ct as internalRouteOnlyLinkSchema, d as normalizeMediaValueToIdentifierOnly, dt as linkSchema, et as sdkSettingsUpdateSchema, f as walkLocalContentMedia, ft as pageLinkSchema$1, g as SETTINGS_FILE_FIELDS, gt as sdkReorderResponseSchema, h as extractMediaIdentifiers, ht as sdkListEventOccurrencesResponseSchema, i as applyLocalMediaPush, it as entryLinkSchema$1, j as getDirectImageUrlForRelativePath, k as parseAspectRatioValue, l as sha256, lt as isInternalResolvedLinkValue, m as downloadMedia, mt as sdkEventOccurrenceResponseSchema, nt as RESOLVED_INTERNAL_LINK_ENTITY_TYPES, o as admitBinaryWriteDestination, ot as internalLinkSchema, p as buildStorageUrl, pt as sdkDeleteEventOccurrenceResponseSchema, q as buildRequestInfo, r as syncLocalMediaForPull, rt as customLinkSchema$1, s as readStableBinaryFile, st as internalResolvedLinkSchema, t as revalidateLocalMediaPushPlan, tt as linkPayloadSchema, u as normalizeMediaIdentifierInput, ut as isResolvedInternalLinkEntityType, v as hasOwnSettingsField, w as deleteEnvSpecificKeys, x as attachRenderableMediaAssetFields, y as writeMediaManifest, z as getMimeType } from "../local-sync-EcUwLrRx.mjs";
-import { n as CliSdkPeerError, r as CLI_VERSION, t as loadConfigFile } from "../load-config-De0cFlPg.mjs";
-import { a as RichTextDocSchema, c as isRecord$17, i as findUnfilledSentinels, n as buildEntryScaffold, o as isRichTextDoc, r as validateEntryInstance, s as isObjectRecord, t as eventUpsertInputSchema } from "../eventUpsertInputSchema-BE3nSNsn.mjs";
-import { a as prepareScaffoldExecution, c as LOCAL_PACKAGE_VENDOR_DIR, d as loadGeneratedPackageRanges, i as preflightScaffoldTargets, n as createScaffoldCompletion, s as deriveScaffoldLocalManifest, t as deriveScaffoldPlan } from "../plan-DtQEnwCM.mjs";
+import { $ as resolveContextualButtonRole, $n as footerModeSchema, $t as getComponentBorderWidthPx, A as boundaryLayout, An as surfaceToneFromForegroundToken, At as headerVariantValues, B as require_jsx_runtime, Bn as oklchToHexGamut, Bt as defineBlockDesignCapability, C as mergeHeaderNavTypographyPreference, Cn as borderColorStyle, Ct as BREAKPOINT_SM, D as GRADIENT_PRESET_IDS, Dn as textColorStyle, Dt as MQ_SM_DOWN, E as gradientToCss, En as rgbColorValue, Et as MQ_MD_DOWN, F as transitionCatalogueEntries, Fn as defaultThemeTokens, Ft as pageDesignEditorBackgroundOverrideOwner, G as PUBLIC_BUTTON_ROLES, Gn as generateShadowValue$1, Gt as featureCardCompositionTreatmentValues, H as pickShadeTowardBackground, Hn as surfaceForegroundDeclarations, Ht as defineNoBlockDesignCapability, I as backgroundAppearanceColorTokenNames, In as ORDINARY_TEXT_MIN_CONTRAST_RATIO, It as stripStaleTransitionStyleGroup, J as resolvedButtonColourDeclarations, Jn as normalizeCardRole, Jt as makeBoundaryId, K as generateButtonCss, Kn as cardRoleSchema, Kt as headingDecorationColorTokenValues, L as backgroundAppearanceQuickColorTokenNames, Ln as contrastRatio, M as sectionFactsForContent, Mn as isOnColorBackgroundCandidateToken, Mt as resolveOnColorForThemeToken, N as boundaryRuntimeMetricsForDecorativeTransition, Nn as onColorTokenName, Nt as resolveThemeColorReferenceValue, O as getGradientPreset, On as textColorValue, Ot as MQ_SM_UP, P as anglePolygonCss, Pn as buildThemeTokens, Pt as resolveTokenOrCssColorValue, Q as deriveButtonSurfaceContext, Qn as persistableMediaSchema, Qt as visibleHeadingDecorationFamilyValues, R as parseBackgroundAppearanceColorToken, Rn as featuresFromHex, Rt as asDesignBlockId, Sn as backgroundColorStyle, St as BREAKPOINT_MD, T as getCuratedSiteStyle, Tn as mergeStyles, Tt as MQ_LG_UP, U as generateCssVars, Un as surfaceForegroundStyle, Ut as eventListTreatmentValues, V as require_react, Vn as DEFAULT_SURFACE_TEXT_COLOR, Vt as defineFrameCapability, Wn as surfaceForegroundValue, Wt as eyebrowTreatmentValues, X as contextualButtonSurfaceResetStyles, Xn as mediaSchema, Xt as testimonialsCompositionTreatmentValues, Y as resolvedButtonFocusDeclarations, Yn as mediaIdentifierSchema, Yt as offeringsPreviewCompositionTreatmentValues, Z as contextualButtonSurfaceStyles, Zn as mediaTypeDiscriminants, Zt as tileTreatmentValues, _ as entryIdentifierForCommand, _n as ICON_SIZE_PX, _r as slugPart, _t as generateHeaderScrollTreatmentStyles, a as classifySdkEventBookingOffer, an as NAV_LINK_PADDING_MAP, ar as createBlocksRef, at as themeButtonExtraClassesWithTrailingIcon, b as pagePathForCommand, bn as generateCardCss, bt as renderHeaderPaintTargetRules, c as stableStringify, cn as FONT_WEIGHT_MAP, cr as createEventCategoryRef, ct as parseThemeForPersistence, d as mapEventCommandContent, dn as LABEL_FONT_SIZE_MAP, dr as createFormRef, dt as generateShadowValue, en as getComponentShadowVar, er as VARIANT_ROLES, et as generateDefaultButtonSystem, f as evaluateSiteCommandBatchExposure, fn as ACCORDION_OPEN_ACCENT_THICKNESS, fr as createNavigationRef, ft as expandPalette, g as blockOrderIdentifiersForCommand, gn as ICON_CONFIG, gr as refSlug, gt as boxBackgroundSchema, h as blockIdentifierForCommand, hn as ACCORDION_TRIGGER_LETTER_SPACING, hr as createVenueRef, ht as boxBackgroundOverlaySchema, in as NAV_LINK_LETTER_SPACING_MAP, ir as createBlockRef, it as parseThemeButtonVariantId, j as composeBoundary, jn as resolveSurfaceForeground, jt as isCssColorLiteral, k as parseGradientPresetId, kn as selectLogoVariant, kt as MQ_TABLET_ONLY, l as createDryRunReport, ln as INPUT_FONT_SIZE_MAP, lr as createEventSeriesRef, lt as compileButtonColourStates, m as getSiteCommandMetadata, mn as ACCORDION_TRIGGER_FONT_SCALE, mr as createSiteCommandSiteRef, mt as themeSchema, nn as parseCustomCssRules, nr as unsafeAsOpaqueButtonColourToken, nt as generateBaseInteractiveCSS, o as venueManagementFields, on as NAV_LINK_PADDING_X_MAP, or as createCommandRef, ot as themeButtonSizeClassName, p as evaluateSiteCommandExposure, pn as ACCORDION_SPACING_MAP, pr as createPageRef, pt as getTextColorForBackground, q as RESOLVED_BUTTON_DISABLED_DECLARATIONS, qn as cardVariantRoleValues, qt as introCompositionTreatmentValues, rn as NAV_LINK_BORDER_RADIUS_MAP, rr as parseBlockColorToken, rt as generateInteractiveChildInheritanceCSS, s as sortRecord, sn as NAV_LINK_TEXT_SIZE_MAP, sr as createContentEntryRef, st as themeButtonVariantClassNames, t as classifySdkEventTiming, tn as parseBlockCustomCssRules, tr as buttonVariantIdSchema, tt as generateEffectsCSS, u as parseAndPlanCommandBatchForTypes, un as INPUT_SPACING_MAP, ur as createFooterRef, ut as formatButtonColourContractError, v as pageIdentifierForBlockCommand, vn as generateCardCoreCss, vr as __toESM, vt as generateMobileOverlayBackdropFilterFix, w as readHeaderNavFontSizePreference, wn as cssVarValue, wt as BREAKPOINT_XL, x as hasConfiguredBookingVertical, xn as TokenResolver, xt as BREAKPOINT_LG, y as pageIdentifierForCommand, yn as getDefaultCardVariants, yt as getHeaderPaintTargets, z as defineBlockDesignMetadata, zn as hexToRgb, zt as assertNever$4 } from "../sdk-event-upsert-DhdlT2ko.mjs";
+import { $ as formatBookingPriceDisplay, A as parseFooterCompositionV1, At as unsafeAsPositiveByteCount, B as formatBookingDateParts, C as parseMailingListContentVersionId, D as DEFAULT_MAILING_LIST_SUCCESS_MESSAGE, Dt as unsafeAsMediaAssetId, E as planMailingListChoicePresentation, F as normalizeLocationAddressText, G as getLocalScheduleDate, H as formatLocalScheduleDate, Ht as err, I as toLocationCoordinates, J as toBookingTimeZone, K as getLocalScheduleTime, L as selectCategoryView, Lt as unsafeAsStaffMemberId, N as assertAllowedPublicUrl, O as parseMailingListProviderScope, Q as parseEventPageSurfaceSubject, R as buildBookingUtcDateWindow, S as parseMailingListBlockId, T as parseMailingListRuntimeContext, U as formatLocalScheduleTime, Ut as ok, V as formatBookingTime, W as getBookingLocalDateKey, X as toScheduledBookingDateTime, Y as toScheduledBookingDateRange, _ as createSecret, _t as unsafeAsAppointmentResourceId, at as resolveExactOrFreePriceDisplay, c as DEFAULT_EVENT_TYPE_PRESETS, d as SURFACE_EVENT_PRESET_VALUES, dt as parseApiKeyId, et as formatEventPricing, f as WHOLE_SERIES_EVENT_PRESET_VALUES, ft as parseEventSeriesId, g as resolveWholeSeriesBookingPhase, gt as parseUserId, h as orderedLiveRunSessions, ht as parseSiteId, it as publicEventPricingType, j as parseMailingListPlacementTargeting, l as EVENT_PRESET_VALUES, lt as formatCurrencyAmount, m as CANCELLED_SESSION_STATUS, mt as parsePageId, n as NAVIGATION_LOCATIONS, nt as publicEventPricingCurrency, ot as resolvePricingOptionsPriceDisplay, p as publicReadFreshnessSeconds, pt as parseMediaAssetId, r as areConfiguredBookingVerticalConfigsEqual, rt as publicEventPricingDisplay, s as resolveSiteVerticalBookingConfig, t as resolveEventCatalogue, tt as isPublicEventPricingOptionDisplayable, ut as assertNever, v as exposeSecret, w as parseMailingListSignedSourceToken, x as buildMailingListSignupBlockSourceRef, xt as unsafeAsDemoCapability, y as parseManagementKey, z as formatBookingDate } from "../src-DIAVNRwo.mjs";
+import { $ as sdkUpsertEventResponseSchema, A as resolveMediaTransformForAspect, B as asRecord$1, C as walkAndCollectImageAttrs, D as normalizeWidthCandidates, E as rotateNormalizedPoint, F as buildMediaIdentifierFromFilename, G as parseSafeDownloadFilename, H as FILE_SIZE_LIMITS, I as parseMediaIdentifier, J as createHttpClient, K as ManagementApiError, L as deriveVideoSlotPolicy, M as getDirectImageUrlForSiteScopedPath, N as getImageUrl, O as isExplicitRectCrop, P as isSiteScopedDirectImageStoragePath, Q as sdkListEventsResponseSchema, R as resolveVideoSelectionIntentForMediaField, S as buildRenderableMediaAssetIndex, T as looksLikeUuid$1, U as classifyKnownMimeType, V as parseRelativeStoragePath, W as managementMediaLibraryUploadLimitForMimeType, X as sdkConfigureBookingVerticalResponseSchema, Y as is404Error, Z as sdkGetEventResponseSchema, _ as buildSettingsUpdateInput, _t as sdkConfiguredBookingVerticalConfigSchema, a as prepareLocalMediaForPush, at as externalLinkSchema$1, b as isMediaValue, c as writeBinaryFileAtomic, ct as internalRouteOnlyLinkSchema, d as normalizeMediaValueToIdentifierOnly, dt as linkSchema, et as sdkSettingsUpdateSchema, f as walkLocalContentMedia, ft as pageLinkSchema$1, g as SETTINGS_FILE_FIELDS, gt as sdkReorderResponseSchema, h as extractMediaIdentifiers, ht as sdkListEventOccurrencesResponseSchema, i as applyLocalMediaPush, it as entryLinkSchema$1, j as getDirectImageUrlForRelativePath, k as parseAspectRatioValue, l as sha256, lt as isInternalResolvedLinkValue, m as downloadMedia, mt as sdkEventOccurrenceResponseSchema, nt as RESOLVED_INTERNAL_LINK_ENTITY_TYPES, o as admitBinaryWriteDestination, ot as internalLinkSchema, p as buildStorageUrl, pt as sdkDeleteEventOccurrenceResponseSchema, q as buildRequestInfo, r as syncLocalMediaForPull, rt as customLinkSchema$1, s as readStableBinaryFile, st as internalResolvedLinkSchema, t as revalidateLocalMediaPushPlan, tt as linkPayloadSchema, u as normalizeMediaIdentifierInput, ut as isResolvedInternalLinkEntityType, v as hasOwnSettingsField, w as deleteEnvSpecificKeys, x as attachRenderableMediaAssetFields, y as writeMediaManifest, z as getMimeType } from "../local-sync-3ZG1khGb.mjs";
+import { n as CliSdkPeerError, r as CLI_VERSION, t as loadConfigFile } from "../load-config-Bzc6Qo24.mjs";
+import { a as RichTextDocSchema, c as isRecord$17, i as findUnfilledSentinels, n as buildEntryScaffold, o as isRichTextDoc, r as validateEntryInstance, s as isObjectRecord, t as eventUpsertInputSchema } from "../eventUpsertInputSchema-yErCHdr6.mjs";
+import { a as prepareScaffoldExecution, c as LOCAL_PACKAGE_VENDOR_DIR, d as loadGeneratedPackageRanges, i as preflightScaffoldTargets, n as createScaffoldCompletion, s as deriveScaffoldLocalManifest, t as deriveScaffoldPlan } from "../plan-C1Frmu6F.mjs";
 import { config } from "dotenv";
 import { Command, CommanderError } from "commander";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -176,16 +176,16 @@ var BlockPatchStaleContentError = class extends ManagementApiError {
 function isBlockPatchStaleContentError(error$1) {
 	return error$1 instanceof BlockPatchStaleContentError;
 }
-function isRecord$36(value) {
+function isRecord$37(value) {
 	return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function extractStaleContentCurrentHash(error$1) {
 	if (error$1.statusCode !== 409) return null;
-	if (!isRecord$36(error$1.details)) return null;
+	if (!isRecord$37(error$1.details)) return null;
 	const fieldErrors = error$1.details.fieldErrors;
 	if (!Array.isArray(fieldErrors)) return null;
 	for (const fieldError of fieldErrors) {
-		if (isRecord$36(fieldError) && fieldError.field === SDK_PATCH_STALE_CONTENT_FIELD && fieldError.code === SDK_PATCH_STALE_CONTENT_CODE && typeof fieldError.message === "string") {
+		if (isRecord$37(fieldError) && fieldError.field === SDK_PATCH_STALE_CONTENT_FIELD && fieldError.code === SDK_PATCH_STALE_CONTENT_CODE && typeof fieldError.message === "string") {
 			return fieldError.message;
 		}
 	}
@@ -2524,6 +2524,77 @@ function parsePublicProductCategorySelector(value) {
 	return undefined;
 }
 
+//#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$1) {
+	return definitions$1;
+}
+
+//#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() {
@@ -2783,18 +2854,89 @@ 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$1) {
-	return definitions$1;
-}
+//#region ../api/src/appointmentServiceCategoryEndpoints.ts
+const APPOINTMENT_SERVICE_CATEGORY_ENDPOINT_DEFINITIONS = 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"
+		]
+	}
+});
 
 //#endregion
 //#region ../api/src/appointmentEndpointDefinitions.ts
 const APPOINTMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	...APPOINTMENT_SERVICE_CATEGORY_ENDPOINT_DEFINITIONS,
 	listAppointmentResources: {
 		path: "/sites/{siteId}/bookings/resources",
 		method: "GET",
@@ -3945,45 +4087,23 @@ 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
 //#region ../api/src/publicEventEndpointDefinitions.ts
 const PUBLIC_EVENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	checkPublicEventRegistrationNextStep: {
+		path: "/public/sites/{siteId}/events/registration-next-step",
+		method: "POST",
+		auth: "public",
+		responseKind: "json",
+		errors: [
+			"validation:invalid_input",
+			"auth:forbidden",
+			"server:internal_error"
+		]
+	},
 	listPublicEventCalendarWindow: {
 		path: "/public/sites/{siteId}/events/calendar-window",
 		method: "GET",
@@ -4746,6 +4866,7 @@ const BILLING_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 //#endregion
 //#region ../api/src/endpoints.ts
 const ENDPOINT_DEFINITIONS = {
+	...PUBLIC_NEWSLETTER_ENDPOINT_DEFINITIONS,
 	...ACCOUNT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_ONBOARDING_ATTEMPT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_EVENT_ENDPOINT_DEFINITIONS,
@@ -7880,41 +8001,6 @@ const ENDPOINT_DEFINITIONS = {
 			"server:internal_error"
 		]
 	},
-	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"
-	},
-	getNewsletterArchive: {
-		path: "/public/sites/{siteId}/newsletter/archive/{token}",
-		method: "GET",
-		tags: ["public-newsletter-{siteId}"],
-		auth: "public",
-		responseKind: "text"
-	},
 	listSiteContentTypes: {
 		path: "/sites/{siteId}/content-types",
 		method: "GET",
@@ -10413,6 +10499,12 @@ function matchSurfaceSiteRootHost(host) {
 	}
 	return matchSurfaceHost(host, SURFACE_SITE_ROOT_HOSTS);
 }
+function resolveSurfaceSiteHostContext(value) {
+	if (value === null || value === undefined || typeof value === "string" && value.length === 0) return null;
+	const normalizedHost = normalizeHostLike(value instanceof URL ? value.toString() : value);
+	if (normalizedHost === null) return null;
+	return matchSurfaceSiteRootHost(normalizedHost);
+}
 function resolveSurfaceHostContext(value) {
 	if (value === null || value === undefined || typeof value === "string" && value.length === 0) return null;
 	const normalizedHost = normalizeHostLike(value instanceof URL ? value.toString() : value);
@@ -10489,7 +10581,7 @@ function extractSurfaceAwareSiteSlug(value) {
 		return null;
 	}
 	const hostname$1 = parsed.hostname.toLowerCase();
-	const context = matchSurfaceSiteRootHost(hostname$1);
+	const context = resolveSurfaceSiteHostContext(hostname$1);
 	if (context === null) return null;
 	if (hostname$1 === context.surfaceRootHost) return null;
 	if (!hostname$1.endsWith(`.${context.surfaceRootHost}`)) return null;
@@ -10654,20 +10746,20 @@ function isApiError(result) {
 function isApiSuccess(result) {
 	return result.success === true;
 }
-function isRecord$35(value) {
+function isRecord$36(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isFieldError(value) {
-	return isRecord$35(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
+	return isRecord$36(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
 }
 function fieldErrorsFromUnknown(value) {
 	if (!Array.isArray(value)) return null;
 	return value.every(isFieldError) ? value : null;
 }
 function extractEnvelopeErrorObject(body) {
-	if (!isRecord$35(body)) return null;
+	if (!isRecord$36(body)) return null;
 	const error$1 = body.error;
-	if (!isRecord$35(error$1)) return null;
+	if (!isRecord$36(error$1)) return null;
 	if ("success" in body && body.success !== false) {
 		return null;
 	}
@@ -11277,7 +11369,7 @@ const DEFAULT_CONFIG_PATH = "./riverbank.config.ts";
 function formatPushConfigActionFailure() {
 	return "push-config failed";
 }
-function isRecord$34(value) {
+function isRecord$35(value) {
 	return typeof value === "object" && value !== null;
 }
 function parseErrorDetails(value) {
@@ -11285,10 +11377,10 @@ function parseErrorDetails(value) {
 	if (typeof value === "string") {
 		return { message: value };
 	}
-	if (!isRecord$34(value)) return {};
+	if (!isRecord$35(value)) return {};
 	const message = typeof value.message === "string" ? value.message : undefined;
 	const fieldErrorsRaw = value.fieldErrors;
-	const fieldErrors = Array.isArray(fieldErrorsRaw) ? fieldErrorsRaw.filter(isRecord$34).map((d) => ({
+	const fieldErrors = Array.isArray(fieldErrorsRaw) ? fieldErrorsRaw.filter(isRecord$35).map((d) => ({
 		field: typeof d.field === "string" ? d.field : "",
 		message: typeof d.message === "string" ? d.message : ""
 	})).filter((d) => d.field.length > 0 && d.message.length > 0) : undefined;
@@ -11303,7 +11395,7 @@ function formatFieldErrors(fieldErrors) {
 }
 function getDashboardErrorMessage(responseJson, fallback) {
 	if (!responseJson) return fallback;
-	if (isRecord$34(responseJson) && "error" in responseJson) {
+	if (isRecord$35(responseJson) && "error" in responseJson) {
 		const parsed = parseErrorDetails(responseJson.error);
 		const msg = parsed.message ?? fallback;
 		return msg + formatFieldErrors(parsed.fieldErrors);
@@ -13570,7 +13662,7 @@ function resolveDashboardBookingsNavPolicy(modules, ctx) {
 		appointments: role === "owner" ? { kind: "owner_setup" } : { kind: "hidden" }
 	};
 }
-function buildDashboardBookingsNavPlan(modules, ctx, verticalConfig) {
+function buildDashboardBookingsNavPlan(modules, ctx, catalogue) {
 	const policy = resolveDashboardBookingsNavPolicy(modules, ctx);
 	if (policy.kind === "staff_scoped") {
 		return buildStaffScopedBookingsNavPlan(policy);
@@ -13591,7 +13683,7 @@ function buildDashboardBookingsNavPlan(modules, ctx, verticalConfig) {
 	groups.push({
 		label: "Events",
 		items: modules.events ? [
-			...buildEventNavItems(verticalConfig),
+			...buildEventNavItems(catalogue),
 			{
 				label: "Venues",
 				destination: { kind: "venues" },
@@ -13848,59 +13940,49 @@ const bookingProductsItem = {
 		"unlimited"
 	]
 };
-function buildEventNavItems(verticalConfig) {
-	const resolved = resolveSiteVerticalBookingConfig(verticalConfig);
-	if (resolved.kind !== "configured") {
-		return [{
-			label: "Events",
+function buildEventNavItems(catalogue) {
+	const entries = catalogue.source === "generic" ? catalogue.entries.filter(({ preset }) => preset === "course") : catalogue.entries;
+	return [
+		{
+			label: catalogue.source === "generic" ? "Events" : "All events",
 			destination: { kind: "events_all" },
 			keywords: [
-				"classes",
-				"workshops",
+				"events",
+				"all events",
 				"sessions",
 				"recurring",
 				"shows",
-				"retreats"
+				...catalogue.entries.flatMap(({ label, pluralLabel }) => [label, pluralLabel])
 			]
-		}, {
-			label: "Courses",
-			destination: { kind: "courses" },
+		},
+		...entries.map(buildEventSeriesPresetNavItem),
+		...catalogue.source === "business_profile" ? [{
+			label: "Other events",
+			destination: { kind: "events_other" },
 			keywords: [
-				"multi-session",
-				"paid upfront",
-				"enrollment",
-				"series",
-				"terms",
-				"programmes"
+				"other",
+				"one-off",
+				"fundraiser",
+				"open day",
+				"jumble sale",
+				"party",
+				"uncategorised"
 			]
-		}];
-	}
-	const eventSeriesItems = resolved.selectedPresets.filter(isEventSeriesVerticalPresetDefinition).map(buildEventSeriesPresetNavItem);
-	return [{
-		label: "All events",
-		destination: { kind: "events_all" },
-		keywords: [
-			"events",
-			"all events",
-			...resolved.selectedPresets.flatMap((preset) => [
-				preset.label,
-				preset.pluralLabel,
-				preset.canonicalBehaviour
-			])
-		]
-	}, ...eventSeriesItems];
+		}] : []
+	];
 }
-function buildEventSeriesPresetNavItem(preset) {
+function buildEventSeriesPresetNavItem(entry) {
 	return {
-		label: preset.pluralLabel,
+		label: entry.pluralLabel,
 		destination: {
 			kind: "events_preset",
-			preset: preset.canonicalBehaviour
+			preset: entry.preset
 		},
 		keywords: [
-			preset.label,
-			preset.pluralLabel,
-			preset.canonicalBehaviour
+			entry.label,
+			entry.pluralLabel,
+			entry.preset,
+			...entry.preset === "term" ? ["course", "courses"] : []
 		]
 	};
 }
@@ -14617,7 +14699,8 @@ const siteOptionSources = [
 	"eventCategories",
 	"eventSeries",
 	"venues",
-	"staffMembers"
+	"staffMembers",
+	"appointmentServiceCategories"
 ];
 const mediaDeliverySchema = z.object({
 	sizes: z.string().optional(),
@@ -16626,9 +16709,7 @@ function navRow(opts) {
 		rel: { $bind: { from: `${childItemName}.rel` } },
 		"data-active": { $bind: { from: `${childItemName}.active` } }
 	}, [text({ as: "span" }, bind(`${childItemName}.label`))], repeat(`${itemName}.children`, childItemName));
-	const dropdown = el("div", { className: "nav-dropdown rb-relative" }, [button({
-		type: "button",
-		variantId: "",
+	const dropdown = el("div", { className: "nav-dropdown rb-relative" }, [el("headerControl", {
 		className: prependClassName("nav-dropdown-trigger", linkClassName),
 		"aria-haspopup": "menu",
 		"aria-expanded": "false",
@@ -16696,9 +16777,7 @@ function navColumn(opts) {
 	const dropdown = el("div", {
 		className: "nav-mobile-dropdown",
 		"data-nav-mobile-dropdown": "true"
-	}, [button({
-		type: "button",
-		variantId: "",
+	}, [el("headerControl", {
 		className: triggerClassName,
 		"aria-expanded": "false",
 		"aria-controls": childrenId,
@@ -20507,7 +20586,7 @@ const teamMemberFragment = defineFragment({
 //#region ../blocks/src/system/data/linkedContentEntries.ts
 const LINKED_CONTENT_ENTRY_META_KEY = "__rbLinkedContentEntry";
 function coerceLinkedContentEntriesPayload(payload) {
-	if (!isRecord$33(payload)) return payload;
+	if (!isRecord$34(payload)) return payload;
 	const response = payload;
 	if (!Array.isArray(response.entries)) return payload;
 	const contentType = parsePublicContentTypeMeta(response.contentType);
@@ -20515,16 +20594,16 @@ function coerceLinkedContentEntriesPayload(payload) {
 	return response.entries.map((entry) => enrichLinkedContentEntry(entry, contentType));
 }
 function getLinkedContentEntryMeta(value) {
-	if (!isRecord$33(value)) return null;
+	if (!isRecord$34(value)) return null;
 	const candidate = value[LINKED_CONTENT_ENTRY_META_KEY];
 	return isLinkedContentEntryMeta(candidate) ? candidate : null;
 }
 function buildLinkedContentEditTarget(input) {
 	const { entry, sourceBlockId, sourceBlockKind, itemIndex } = input;
-	if (!isRecord$33(entry)) return null;
+	if (!isRecord$34(entry)) return null;
 	const meta = getLinkedContentEntryMeta(entry);
 	if (!meta || meta.support.kind !== "supported") return null;
-	const content = isRecord$33(entry.content) ? entry.content : {};
+	const content = isRecord$34(entry.content) ? entry.content : {};
 	return {
 		kind: "linked-content-entry",
 		entryId: meta.entryId,
@@ -20598,12 +20677,12 @@ function resolveLinkedEntryInlineFieldEligibility(input) {
 	};
 }
 function enrichLinkedContentEntry(entry, contentType) {
-	if (!isRecord$33(entry)) return entry;
+	if (!isRecord$34(entry)) return entry;
 	const entryId = typeof entry.id === "string" ? entry.id : null;
 	if (!entryId) return entry;
 	const title = typeof entry.title === "string" && entry.title.trim().length > 0 ? entry.title : entryId;
 	const optimisticHash = typeof entry.optimisticHash === "string" && entry.optimisticHash.length > 0 ? entry.optimisticHash : null;
-	const content = isRecord$33(entry.content) ? entry.content : {};
+	const content = isRecord$34(entry.content) ? entry.content : {};
 	const meta = {
 		kind: "linked-content-entry",
 		entryId,
@@ -20712,7 +20791,7 @@ function capitalize(value) {
 	return value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
 }
 function parsePublicContentTypeMeta(value) {
-	if (!isRecord$33(value)) return null;
+	if (!isRecord$34(value)) return null;
 	if (typeof value.key !== "string" || value.key.trim().length === 0) return null;
 	return {
 		key: value.key,
@@ -20722,7 +20801,7 @@ function parsePublicContentTypeMeta(value) {
 	};
 }
 function parsePublicContentTypeLinkedEntryEditing(value) {
-	if (!isRecord$33(value) || typeof value.kind !== "string") return null;
+	if (!isRecord$34(value) || typeof value.kind !== "string") return null;
 	switch (value.kind) {
 		case "generic": return { kind: "generic" };
 		case "unsupported-domain-backed": return {
@@ -20733,7 +20812,7 @@ function parsePublicContentTypeLinkedEntryEditing(value) {
 	}
 }
 function parsePublicContentTypeFieldMeta(value) {
-	if (!isRecord$33(value)) return [];
+	if (!isRecord$34(value)) return [];
 	if (typeof value.id !== "string" || typeof value.type !== "string") return [];
 	return [{
 		id: value.id,
@@ -20748,14 +20827,14 @@ function parseStringArray(value) {
 	return value.filter((item) => typeof item === "string");
 }
 function isLinkedContentEntryMeta(value) {
-	if (!isRecord$33(value)) return false;
+	if (!isRecord$34(value)) return false;
 	if (value.kind !== "linked-content-entry") return false;
 	if (typeof value.entryId !== "string") return false;
 	if (typeof value.contentTypeKey !== "string") return false;
 	if (typeof value.contentTypeLabel !== "string") return false;
 	if (typeof value.title !== "string") return false;
 	if (!(value.optimisticHash === null || typeof value.optimisticHash === "string")) return false;
-	if (!isRecord$33(value.contentType)) return false;
+	if (!isRecord$34(value.contentType)) return false;
 	if (!isLinkedEntryFieldSourceArray(value.fieldSources)) return false;
 	return isLinkedContentEditSupport(value.support);
 }
@@ -20763,7 +20842,7 @@ function isLinkedEntryFieldSourceArray(value) {
 	return Array.isArray(value) && value.every(isLinkedEntryFieldSource);
 }
 function isLinkedEntryFieldSource(value) {
-	if (!isRecord$33(value)) return false;
+	if (!isRecord$34(value)) return false;
 	if (typeof value.displayPath !== "string") return false;
 	switch (value.kind) {
 		case "content-field": return typeof value.fieldPath === "string" && (value.fieldType === "text" || value.fieldType === "richText");
@@ -20784,7 +20863,7 @@ function isLinkedEntryInlineFieldReadOnlyReason(value) {
 	}
 }
 function isLinkedContentEditSupport(value) {
-	if (!isRecord$33(value) || typeof value.kind !== "string") return false;
+	if (!isRecord$34(value) || typeof value.kind !== "string") return false;
 	switch (value.kind) {
 		case "supported": return true;
 		case "unsupported-domain-backed":
@@ -20793,7 +20872,7 @@ function isLinkedContentEditSupport(value) {
 		default: return false;
 	}
 }
-function isRecord$33(value) {
+function isRecord$34(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function describeLinkedContentEditSupport(support) {
@@ -21732,6 +21811,58 @@ const layoutTransforms = [
 	footerLogoTextVisibleTransform
 ];
 
+//#endregion
+//#region ../blocks/src/system/transforms/registry/chromeLogo.ts
+const chromeLogoSurfaceValues = [
+	"header-root",
+	"header-mobile-panel",
+	"footer-root"
+];
+const chromeLogoSchema = z.object({ surface: z.enum(chromeLogoSurfaceValues) });
+/** The brand foreground shares the logo's surface; navigation may own a separate capsule. */
+function chromeSurfaceTextToken(surface, theme, palette) {
+	switch (surface) {
+		case "header-root": {
+			const header = theme.header;
+			const foreground = resolveHeaderRootForeground(header, palette, resolveHeaderVisualStyles(header).isTransparent);
+			return foreground.kind === "known" ? foreground.roles.text : resolveHeaderLeafTextColor(header);
+		}
+		case "header-mobile-panel": return theme.header?.dropdownStyle?.textColor ?? "text";
+		case "footer-root": {
+			const foreground = resolveFooterRootForeground(theme.footer, palette);
+			return foreground.kind === "known" ? foreground.roles.text : undefined;
+		}
+	}
+}
+function readChromeTheme(viewModel) {
+	const root = asPartialObject(viewModel?.["$root"]);
+	return asPartialObject(root?.theme) ?? {};
+}
+function resolveChromeSurfaceTone(surface, context) {
+	return surfaceToneFromForegroundToken(context.theme.palette, chromeSurfaceTextToken(surface, readChromeTheme(context.viewModel), context.theme.palette));
+}
+/**
+* Picks the site logo for the surface it is drawn on. Bound from block
+* `content`: `logoVariants` when the renderer supplies both logos, otherwise
+* the single `logo` older callers pass.
+*/
+const chromeLogoTransform = {
+	id: "layout.chromeLogo",
+	kind: "formatter",
+	summary: "Select the light- or dark-background site logo for a header or footer surface",
+	schema: chromeLogoSchema,
+	run: (value, options, context) => {
+		const content = asPartialObject(value);
+		const variants = asPartialObject(content?.logoVariants);
+		if (!variants) return content?.logo ?? null;
+		return selectLogoVariant(resolveChromeSurfaceTone(options.surface, context), {
+			forLightBackgrounds: variants.forLightBackgrounds ?? null,
+			forDarkBackgrounds: variants.forDarkBackgrounds ?? null
+		});
+	}
+};
+const chromeLogoTransforms = [chromeLogoTransform];
+
 //#endregion
 //#region ../blocks/src/system/transforms/registry/ui.ts
 const joinClasses$2 = (parts) => parts.filter((part) => typeof part === "string" && part.trim().length > 0).join(" ").replace(/\s+/g, " ").trim();
@@ -24514,6 +24645,33 @@ function normalizeEventCalendarDisplayMode(input) {
 	if (isEventCalendarDisplayMode(input.variant)) return input.variant;
 	return isEventCalendarDisplayMode(input.displayMode) ? input.displayMode : undefined;
 }
+/** One closed authority for the projections required by each rendered mode. */
+function resolveEventCalendarReadPlan(input) {
+	const mode = normalizeEventCalendarDisplayMode(input) ?? "combined";
+	switch (mode) {
+		case "combined": return {
+			mode,
+			jobs: "both",
+			readProfile: "listing-card"
+		};
+		case "list": return {
+			mode,
+			jobs: "list",
+			readProfile: "listing-card"
+		};
+		case "calendar": return {
+			mode,
+			jobs: "calendar",
+			readProfile: "listing-card"
+		};
+		case "timetable":
+		case "week-board": return {
+			mode,
+			jobs: "calendar",
+			readProfile: "timetable"
+		};
+	}
+}
 function isEventCalendarDefaultView(value) {
 	return typeof value === "string" && eventCalendarDefaultViewValues.includes(value);
 }
@@ -25649,8 +25807,7 @@ function normalizeEventStaffMemberId(value) {
 //#endregion
 //#region ../blocks/src/system/blocks/events/shared/calendarWindow.ts
 function resolveCalendarReadProfile(content) {
-	const mode = normalizeEventCalendarDisplayMode(content);
-	return mode === "timetable" || mode === "week-board" ? "timetable" : "listing-card";
+	return resolveEventCalendarReadPlan(content).readProfile;
 }
 /** Runtime picker sentinels and bound loader IDs must describe the same query. */
 function normalizeCalendarFilterId(value) {
@@ -25879,8 +26036,8 @@ const eventCalendarReadEnabled = {
 	schema: readJobSchema,
 	run(value, options) {
 		const content = asPartialObject(value) ?? {};
-		const mode = normalizeEventCalendarDisplayMode(content) ?? "combined";
-		return options.job === "calendar" ? mode !== "list" : mode === "list" || mode === "combined";
+		const plan = resolveEventCalendarReadPlan(content);
+		return plan.jobs === "both" || plan.jobs === options.job;
 	}
 };
 
@@ -25892,6 +26049,7 @@ const builtinTransformDefinitions = [
 	eventCalendarReadProfile,
 	...formattingTransforms,
 	...layoutTransforms,
+	...chromeLogoTransforms,
 	...uiTransforms,
 	...mediaTransforms,
 	...backgroundTransforms,
@@ -26062,12 +26220,12 @@ function Grid({ as: Comp = "div", cols, userColumns, gap = "md", className, styl
 
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/layout.tsx
-const SectionNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Section_default, { ...props$1 });
-const StackNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Stack, { ...props$1 });
-const InlineNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Inline, { ...props$1 });
-const GridNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Grid, { ...props$1 });
-const DivNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ...props$1 });
-const FigureNode = ({ blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, previewAuthoring: _previewAuthoring, pathBase: _pathBase, ...props$1 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("figure", { ...props$1 });
+const SectionNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Section_default, { ...props$1 });
+const StackNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Stack, { ...props$1 });
+const InlineNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Inline, { ...props$1 });
+const GridNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Grid, { ...props$1 });
+const DivNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ...props$1 });
+const FigureNode = (props$1) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("figure", { ...props$1 });
 
 //#endregion
 //#region ../path-utils/dist/redirectPaths.js
@@ -26248,11 +26406,11 @@ function assertSafePathSegments(segments) {
 		}
 	}
 }
-function isRecord$32(value) {
+function isRecord$33(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isPathContainer(value) {
-	return Array.isArray(value) || isRecord$32(value);
+	return Array.isArray(value) || isRecord$33(value);
 }
 function createPathContainer(nextIsIndex) {
 	return nextIsIndex ? [] : {};
@@ -26557,6 +26715,139 @@ function Text$1({ as: Comp = "span", children, className = "", path: path$3, max
 	});
 }
 
+//#endregion
+//#region ../logger/src/noop.ts
+const noop = () => {};
+const logger = {
+	debug: noop,
+	info: noop,
+	warn: noop,
+	error: noop,
+	withFields: (_) => logger
+};
+
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/richText-coerce.ts
+function parseRichTextDoc(value) {
+	const parsed = RichTextDocSchema.safeParse(value);
+	if (parsed.success) {
+		return {
+			kind: "valid",
+			doc: parsed.data
+		};
+	}
+	return {
+		kind: "invalid",
+		issues: parsed.error.issues.map((issue$1) => ({
+			path: issue$1.path.map((segment) => String(segment)),
+			message: issue$1.message
+		}))
+	};
+}
+function coerceRichTextDoc(value, source) {
+	const parsed = parseRichTextDoc(value);
+	if (parsed.kind === "valid") return parsed.doc;
+	if (value !== null && value !== undefined) {
+		logger.warn("blocks:rich-text:invalid-document", {
+			source,
+			issues: parsed.issues.slice(0, 3)
+		});
+	}
+	return null;
+}
+
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/renderInlineText.tsx
+function renderInlineText(value) {
+	return value.map((run, index) => renderRun(run, index));
+}
+function renderRun(run, key) {
+	return (run.marks ?? []).reduceRight((child, mark, index) => renderMark(mark, `${String(key)}-${index}`, child), run.text);
+}
+function renderMark(mark, key, child) {
+	switch (mark.kind) {
+		case "strong": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: child }, key);
+		case "emphasis": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("em", { children: child }, key);
+		case "accent": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: `rb-inline-text-accent rb-inline-text-accent-${mark.tone}`,
+			children: child
+		}, key);
+		case "highlight": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: `rb-inline-text-highlight rb-inline-text-highlight-${mark.tone}`,
+			children: child
+		}, key);
+	}
+}
+
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/spinner.tsx
+function resolveColorStyle(color) {
+	switch (color) {
+		case undefined: return undefined;
+		case "inherit": return { color: "inherit" };
+		case "foreground": return { color: "rgb(var(--tb-foreground))" };
+		case "text": return { color: "rgb(var(--tb-text))" };
+		case "primary":
+		default: return undefined;
+	}
+}
+function SpinnerNode({ className, size = "md", color, strokeWidth = 3, srLabel, style, ...rest }) {
+	const hasExplicitAriaLabel = typeof rest["aria-label"] === "string" && rest["aria-label"].trim().length > 0;
+	const accessibilityProps = srLabel ? {
+		role: "status",
+		"aria-live": "polite"
+	} : hasExplicitAriaLabel ? {} : { "aria-hidden": true };
+	const trackStroke = color === "inherit" ? "currentColor" : "var(--rb-spinner-track-color)";
+	const trackOpacity = color === "inherit" ? .25 : 1;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+		...accessibilityProps,
+		className: clsx_default("rb-spinner", size ? `rb-spinner--${size}` : null, color === "inherit" ? "rb-spinner--inherit" : null, className),
+		style: {
+			...resolveColorStyle(color),
+			...style ?? {}
+		},
+		...rest,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+			viewBox: "0 0 24 24",
+			fill: "none",
+			"aria-hidden": "true",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", {
+				cx: "12",
+				cy: "12",
+				r: "10",
+				stroke: trackStroke,
+				strokeWidth,
+				opacity: trackOpacity
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+				d: "M12 2a10 10 0 0 1 10 10",
+				stroke: "currentColor",
+				strokeWidth,
+				strokeLinecap: "round"
+			})]
+		}), srLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: "rb-sr-only",
+			children: srLabel
+		}) : null]
+	});
+}
+
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/buttonAffordance.ts
+function normalize$3(value) {
+	const trimmed = typeof value === "string" ? value.trim() : "";
+	return trimmed.length > 0 ? trimmed : null;
+}
+/**
+* Resolve the node-authored trailing affordance, or `null` when no icon exists.
+*/
+function resolveButtonAffordance(input) {
+	const nodeIcon = normalize$3(input.trailingIcon);
+	if (nodeIcon) {
+		return { iconId: nodeIcon };
+	}
+	return null;
+}
+
 //#endregion
 //#region ../blocks/src/system/icons/svg.tsx
 function createIcon(displayName, children) {
@@ -27700,89 +27991,146 @@ function getIconComponent(name) {
 }
 
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/buttonAffordance.ts
-function normalize$3(value) {
-	const trimmed = typeof value === "string" ? value.trim() : "";
-	return trimmed.length > 0 ? trimmed : null;
+//#region ../blocks/src/system/runtime/shared/components/ThemedButton.tsx
+function themedButtonClasses(variant, size, extraClassName) {
+	return [
+		...themeButtonVariantClassNames(variant),
+		themeButtonSizeClassName(size),
+		extraClassName
+	].filter(Boolean).join(" ");
 }
-/**
-* Resolve the node-authored trailing affordance, or `null` when no icon exists.
-*/
-function resolveButtonAffordance(input) {
-	const nodeIcon = normalize$3(input.trailingIcon);
-	if (nodeIcon) {
-		return { iconId: nodeIcon };
-	}
-	return null;
+function ThemedButtonLabel(props$1) {
+	const content = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+		props$1.pending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SpinnerNode, {
+			size: props$1.pending.spinnerSize ?? "sm",
+			color: "inherit",
+			className: props$1.pending.spinnerClassName ?? "rb-mr-2",
+			srLabel: props$1.pending.srLabel
+		}) : null,
+		props$1.labelClassName ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: props$1.labelClassName,
+			children: props$1.pending?.label ?? props$1.label
+		}) : props$1.pending?.label ?? props$1.label,
+		props$1.screenReaderSuffix ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+			className: "rb-sr-only",
+			children: props$1.screenReaderSuffix
+		}) : null
+	] });
+	return props$1.pending?.contentClassName ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+		className: props$1.pending.contentClassName,
+		children: content
+	}) : content;
 }
-
-//#endregion
-//#region ../logger/src/noop.ts
-const noop = () => {};
-const logger = {
-	debug: noop,
-	info: noop,
-	warn: noop,
-	error: noop,
-	withFields: (_) => logger
-};
-
-//#endregion
-//#region ../blocks/src/system/runtime/nodes/richText-coerce.ts
-function parseRichTextDoc(value) {
-	const parsed = RichTextDocSchema.safeParse(value);
-	if (parsed.success) {
-		return {
-			kind: "valid",
-			doc: parsed.data
-		};
-	}
-	return {
-		kind: "invalid",
-		issues: parsed.error.issues.map((issue$1) => ({
-			path: issue$1.path.map((segment) => String(segment)),
-			message: issue$1.message
-		}))
-	};
+function ThemedButton({ variant, size, extraClassName, screenReaderSuffix, labelClassName, pending, label, ...buttonProps }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+		...buttonProps,
+		className: themedButtonClasses(variant, size, extraClassName),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLabel, {
+			label,
+			pending,
+			screenReaderSuffix,
+			labelClassName
+		})
+	});
 }
-function coerceRichTextDoc(value, source) {
-	const parsed = parseRichTextDoc(value);
-	if (parsed.kind === "valid") return parsed.doc;
-	if (value !== null && value !== undefined) {
-		logger.warn("blocks:rich-text:invalid-document", {
-			source,
-			issues: parsed.issues.slice(0, 3)
-		});
-	}
-	return null;
+function ThemedButtonLink({ variant, size, extraClassName, screenReaderSuffix, labelClassName, label, ...anchorProps }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+		...anchorProps,
+		className: themedButtonClasses(variant, size, extraClassName),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLabel, {
+			label,
+			screenReaderSuffix,
+			labelClassName
+		})
+	});
 }
-
-//#endregion
-//#region ../blocks/src/system/runtime/nodes/renderInlineText.tsx
-function renderInlineText(value) {
-	return value.map((run, index) => renderRun(run, index));
+/** Noninteractive button-style preview with no caller-owned markup. */
+function ThemedButtonSpecimen({ variant, size, label, extraClassName, forceHover = false }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+		"data-force-hover": forceHover ? "true" : undefined,
+		className: themedButtonClasses(variant, size, extraClassName),
+		children: label
+	});
+}
+/** Fixed icon-only actions control; callers cannot supply icon children. */
+function ThemedActionsButton({ variant, size, extraClassName, ...buttonProps }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+		...buttonProps,
+		"aria-label": "Actions",
+		className: themedButtonClasses(variant, size, extraClassName),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+			width: "16",
+			height: "16",
+			viewBox: "0 0 16 16",
+			fill: "currentColor",
+			"aria-hidden": "true",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", {
+					cx: "8",
+					cy: "3",
+					r: "1.5"
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", {
+					cx: "8",
+					cy: "8",
+					r: "1.5"
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", {
+					cx: "8",
+					cy: "13",
+					r: "1.5"
+				})
+			]
+		})
+	});
 }
-function renderRun(run, key) {
-	return (run.marks ?? []).reduceRight((child, mark, index) => renderMark(mark, `${String(key)}-${index}`, child), run.text);
+/** Fixed semantic download affordance; callers cannot supply arbitrary icon children. */
+function ThemedDownloadLink({ variant, size, extraClassName, label, screenReaderSuffix, labelClassName, ...anchorProps }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("a", {
+		...anchorProps,
+		className: themedButtonClasses(variant, size, extraClassName),
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DownloadIcon, {
+			"aria-hidden": "true",
+			size: 24
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLabel, {
+			label,
+			screenReaderSuffix,
+			labelClassName
+		})]
+	});
 }
-function renderMark(mark, key, child) {
-	switch (mark.kind) {
-		case "strong": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: child }, key);
-		case "emphasis": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("em", { children: child }, key);
-		case "accent": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-			className: `rb-inline-text-accent rb-inline-text-accent-${mark.tone}`,
-			children: child
-		}, key);
-		case "highlight": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-			className: `rb-inline-text-highlight rb-inline-text-highlight-${mark.tone}`,
-			children: child
-		}, key);
-	}
+/** Boundary for authored button nodes and their registry-backed trailing icon. */
+function ThemedAuthoredButton({ label, href, variant, size, extraClassName, disabled, type = "button", target, rel, ariaLabel, dataTestId, trailingIcon, onClick }) {
+	const affordance = resolveButtonAffordance({ trailingIcon });
+	const Icon = affordance ? getIconComponent(affordance.iconId) : null;
+	const className = variant ? themedButtonClasses(variant, size, Icon ? [extraClassName, themeButtonExtraClassesWithTrailingIcon()].filter(Boolean).join(" ") : extraClassName) : extraClassName ?? undefined;
+	const content = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [label, Icon ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Icon, {
+		"aria-hidden": true,
+		className: "rb-ml-2 rb-h-4 rb-w-4 rb-inline-block"
+	}) : null] });
+	return href ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+		href,
+		target,
+		rel,
+		"aria-label": ariaLabel,
+		"data-testid": dataTestId,
+		className,
+		onClick,
+		children: content
+	}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+		type,
+		disabled,
+		"aria-label": ariaLabel,
+		"data-testid": dataTestId,
+		className,
+		onClick,
+		children: content
+	});
 }
 
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/basic.tsx
-const TextNode = ({ value, children, blockId: _blockId, blockKind: _blockKind, blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, inlineTextFallbackPath, ...rest }) => {
+const TextNode = ({ value, children, blockContent, inlineTextFallbackPath, ...rest }) => {
 	const inlineText = parseInlineTextFromUnknown(value);
 	if (inlineText.ok && !isInlineTextEmpty(inlineText.value)) {
 		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text$1, {
@@ -27805,37 +28153,23 @@ function readStringPath(source, path$3) {
 	const value = getAtPath(source, path$3);
 	return typeof value === "string" ? value : null;
 }
-const RichTextNode = ({ value, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, ...rest }) => {
-	const source = `block-runtime:${_blockKind ?? "unknown"}:${rest.path ?? "richText"}`;
+const RichTextNode = ({ value, blockKind, ...rest }) => {
+	const source = `block-runtime:${blockKind ?? "unknown"}:${rest.path ?? "richText"}`;
 	const doc = coerceRichTextDoc(value, source);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RichText$1, {
 		doc: doc ?? undefined,
 		...rest
 	});
 };
-/**
-* Render the resolved trailing affordance icon using the button's foreground.
-*/
-function renderTrailingAffordanceIcon(affordance) {
-	if (!affordance) return null;
-	const Icon = getIconComponent(affordance.iconId);
-	if (!Icon) return null;
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Icon, {
-		"aria-hidden": true,
-		className: "rb-ml-2 rb-h-4 rb-w-4 rb-inline-block"
-	});
-}
 function isMissingRequiredLink(linkRequired, resolvedHref) {
 	return linkRequired && resolvedHref.length === 0;
 }
-const ButtonNode = ({ value, children, href, variantId = "primary", size = "md", disabled, type = "button", target, rel, linkRequired = false, trailingIcon, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, className, ...rest }) => {
+const ButtonNode = ({ value, children, href, variantId = "primary", size = "md", disabled, type = "button", target, rel, linkRequired = false, trailingIcon, onClick, className, ...rest }) => {
 	const content = value ?? children;
 	if (!content) {
 		console.warn("[ButtonNode] No content to render - value and children are both empty");
 		return null;
 	}
-	const affordance = resolveButtonAffordance({ trailingIcon });
-	const affordanceIcon = renderTrailingAffordanceIcon(affordance);
 	const resolvedHref = typeof href === "string" ? href.trim() : "";
 	if (isMissingRequiredLink(linkRequired, resolvedHref)) {
 		if (process.env.NODE_ENV === "development") {
@@ -27848,31 +28182,23 @@ const ButtonNode = ({ value, children, href, variantId = "primary", size = "md",
 		console.error("[ButtonNode] Invalid button variant", { variantId });
 		return null;
 	}
-	const buildClassName = affordanceIcon ? themeButtonClassNameWithTrailingIcon : themeButtonClassName;
-	const combinedClassName = resolvedVariantId ? buildClassName({
-		variant: resolvedVariantId,
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedAuthoredButton, {
+		label: content,
+		href: resolvedHref || undefined,
+		target,
+		rel,
+		variant: resolvedVariantId ?? null,
 		size,
-		extraClassName: className
-	}) : className;
-	if (resolvedHref) {
-		return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("a", {
-			href: resolvedHref,
-			target,
-			rel,
-			className: combinedClassName,
-			...rest,
-			children: [content, affordanceIcon]
-		});
-	}
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
-		type,
 		disabled,
-		className: combinedClassName,
-		...rest,
-		children: [content, affordanceIcon]
+		type,
+		trailingIcon,
+		onClick,
+		extraClassName: className,
+		ariaLabel: rest["aria-label"],
+		dataTestId: rest["data-testid"]
 	});
 };
-const LinkNode = ({ href, children, className, target, rel, linkRequired = false, blockId: _blockId, blockKind: _blockKind, blockContent: _blockContent, fragmentRegistry: _fragmentRegistry, pathBase: _pathBase, ...rest }) => {
+const LinkNode = ({ href, children, className, target, rel, linkRequired = false, ...rest }) => {
 	if (!children) return null;
 	const resolvedHref = typeof href === "string" ? href.trim() : "";
 	if (resolvedHref.length === 0) {
@@ -27944,7 +28270,7 @@ function parseApprovedIconExampleSetId(value) {
 //#endregion
 //#region ../blocks/src/system/icons/value.ts
 const NO_BLOCK_ICON_VALUE = { kind: "none" };
-function isRecord$31(value) {
+function isRecord$32(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseBlockIconValue(value) {
@@ -27954,7 +28280,7 @@ function parseBlockIconValue(value) {
 			iconId: value
 		};
 	}
-	if (!isRecord$31(value)) {
+	if (!isRecord$32(value)) {
 		return NO_BLOCK_ICON_VALUE;
 	}
 	switch (value.kind) {
@@ -28047,7 +28373,7 @@ function buildGeneratedBlockIconRenderAssetLookupFromUnknown(value) {
 	}
 	const inputs = [];
 	for (const [index, item] of value.entries()) {
-		if (!isRecord$31(item)) {
+		if (!isRecord$32(item)) {
 			return {
 				kind: "invalid_asset_entry",
 				index,
@@ -28115,7 +28441,7 @@ function resolveBlockIconRenderValue(value, generatedAssets = new Map()) {
 	}
 }
 function getGeneratedBlockIconStyleState(value, currentStyleGuideVersionId) {
-	if (isRecord$31(value) && value.kind === "generated" && parseBlockIconValue(value).kind !== "generated") {
+	if (isRecord$32(value) && value.kind === "generated" && parseBlockIconValue(value).kind !== "generated") {
 		return { kind: "invalid_generated" };
 	}
 	const parsed = parseBlockIconValue(value);
@@ -28201,11 +28527,11 @@ function resolveFeatureCardGeneratedIconSizePx(value) {
 	const parsed = parseFeatureCardGeneratedIconSizePx(value);
 	return parsed.ok ? parsed.value : unsafeAsFeatureCardGeneratedIconSizePx(FEATURE_CARD_GENERATED_ICON_SIZE_PX.default);
 }
-function isRecord$30(value) {
+function isRecord$31(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function toPlainTextFromTipTap(value) {
-	if (!isRecord$30(value)) return "";
+	if (!isRecord$31(value)) return "";
 	if (typeof value.text === "string") return value.text;
 	const content = value.content;
 	if (!Array.isArray(content)) return "";
@@ -28262,7 +28588,7 @@ function suggestSemanticIconForFeatureCard(card) {
 
 //#endregion
 //#region ../blocks/src/system/icons/generatedAssets.ts
-function isRecord$29(value) {
+function isRecord$30(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function generatedIconAssetRefKey(ref) {
@@ -28272,11 +28598,11 @@ function collectGeneratedIconAssetRefs(page) {
 	const blocks = [];
 	for (const block of page.blocks) {
 		if (block.kind !== "block.feature-cards" || typeof block.id !== "string") continue;
-		const content = isRecord$29(block.draftContent) ? block.draftContent : isRecord$29(block.content) ? block.content : null;
+		const content = isRecord$30(block.draftContent) ? block.draftContent : isRecord$30(block.content) ? block.content : null;
 		const cards = Array.isArray(content?.cards) ? content.cards : [];
 		const refs = new Map();
 		for (const card of cards) {
-			if (!isRecord$29(card)) continue;
+			if (!isRecord$30(card)) continue;
 			const icon$1 = parseBlockIconValue(card.icon);
 			if (icon$1.kind !== "generated") continue;
 			const ref = {
@@ -28496,18 +28822,13 @@ function FileDownloadNode({ value, title, description, buttonLabel, buttonVarian
 							})
 						]
 					})]
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("a", {
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedDownloadLink, {
 					href,
 					download: filename,
-					className: themeButtonClassName({
-						variant,
-						size: "md",
-						extraClassName: "rb-inline-flex rb-shrink-0 rb-items-center rb-justify-center rb-gap-2"
-					}),
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DownloadIcon, {
-						"aria-hidden": "true",
-						size: 24
-					}), label]
+					variant,
+					size: "md",
+					extraClassName: "rb-inline-flex rb-shrink-0 rb-items-center rb-justify-center rb-gap-2",
+					label
 				})]
 			})
 		})
@@ -29171,54 +29492,19 @@ const HeaderSectionNode = ({ blockId, children, className, runtime, "data-previe
 var header_section_server_default = markEditableSurfaceForwarding(HeaderSectionNode);
 
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/spinner.tsx
-function resolveColorStyle(color) {
-	switch (color) {
-		case undefined: return undefined;
-		case "inherit": return { color: "inherit" };
-		case "foreground": return { color: "rgb(var(--tb-foreground))" };
-		case "text": return { color: "rgb(var(--tb-text))" };
-		case "primary":
-		default: return undefined;
-	}
-}
-function SpinnerNode({ className, size = "md", color, strokeWidth = 3, srLabel, style, ...rest }) {
-	const hasExplicitAriaLabel = typeof rest["aria-label"] === "string" && rest["aria-label"].trim().length > 0;
-	const accessibilityProps = srLabel ? {
-		role: "status",
-		"aria-live": "polite"
-	} : hasExplicitAriaLabel ? {} : { "aria-hidden": true };
-	const trackStroke = color === "inherit" ? "currentColor" : "var(--rb-spinner-track-color)";
-	const trackOpacity = color === "inherit" ? .25 : 1;
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-		...accessibilityProps,
-		className: clsx_default("rb-spinner", size ? `rb-spinner--${size}` : null, color === "inherit" ? "rb-spinner--inherit" : null, className),
-		style: {
-			...resolveColorStyle(color),
-			...style ?? {}
-		},
-		...rest,
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
-			viewBox: "0 0 24 24",
-			fill: "none",
-			"aria-hidden": "true",
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", {
-				cx: "12",
-				cy: "12",
-				r: "10",
-				stroke: trackStroke,
-				strokeWidth,
-				opacity: trackOpacity
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
-				d: "M12 2a10 10 0 0 1 10 10",
-				stroke: "currentColor",
-				strokeWidth,
-				strokeLinecap: "round"
-			})]
-		}), srLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-			className: "rb-sr-only",
-			children: srLabel
-		}) : null]
+//#region ../blocks/src/system/runtime/nodes/header-control.tsx
+/** System navigation controls retain their runtime hooks independently of authored CTAs. */
+function HeaderControlNode({ className, children, "aria-label": label, "aria-expanded": expanded, "aria-controls": controls, "aria-haspopup": hasPopup, "data-nav-mobile-toggle": mobileToggle, "data-nav-mobile-trigger": mobileTrigger }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+		type: "button",
+		className,
+		"aria-label": label,
+		"aria-expanded": expanded,
+		"aria-controls": controls,
+		"aria-haspopup": hasPopup,
+		"data-nav-mobile-toggle": mobileToggle,
+		"data-nav-mobile-trigger": mobileTrigger,
+		children
 	});
 }
 
@@ -29419,18 +29705,43 @@ const publicAppointmentServiceSchema = z.object({
 	pricing: publicPricingSchema.optional(),
 	priceAmount: z.number().nullable(),
 	priceCurrency: z.string().nullable(),
-	location: publicLocationSchema
+	location: publicLocationSchema,
+	categoryId: z.string().nullable().optional().transform((value) => value ?? null)
+});
+const publicServiceCategorySchema = z.object({
+	id: z.string().min(1),
+	name: z.string(),
+	description: z.string().nullable().optional().transform((value) => value ?? null)
 });
-const publicAppointmentServicesSchema = z.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.union([z.array(publicAppointmentServiceSchema).transform((services) => ({
+	services,
+	categories: []
+})), z.object({
+	services: z.array(publicAppointmentServiceSchema),
+	categories: z.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`;
 }
@@ -29504,8 +29815,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(layout);
+	}
+}
 function buildAppointmentServicesView(input) {
-	if (!input.pathname) {
+	const pathname = input.pathname;
+	if (!pathname) {
 		return {
 			kind: "error",
 			message: ERROR_MESSAGE
@@ -29518,27 +29865,101 @@ function buildAppointmentServicesView(input) {
 			message: ERROR_MESSAGE
 		};
 	}
-	if (parsed.services.length === 0) {
-		return {
-			kind: "empty",
-			message: EMPTY_MESSAGE
+	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(view);
 	}
-	return {
-		kind: "items",
-		rows: buildRows(parsed.services, input.pathname, input.servicePathPrefix ?? null)
-	};
 }
-function AppointmentServicesNode({ sectionHeading, services, pathname, servicePathPrefix, className }) {
+function AppointmentServiceRows({ rows, RowTitle }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "appointment-services-rows rb-flex rb-flex-col",
+		children: rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
+			className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "appointment-services-row-main rb-min-w-0",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(RowTitle, {
+							className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
+							children: row.detailsHref ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+								href: row.detailsHref,
+								children: row.title
+							}) : row.title
+						}),
+						row.description ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+							className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
+							children: row.description
+						}) : null,
+						/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", {
+							className: "appointment-services-row-meta rb-caption status-muted",
+							children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
+						})
+					]
+				}),
+				row.priceLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "appointment-services-row-price rb-text-lg",
+					children: row.priceLabel
+				}) : null,
+				/* @__PURE__ */ (0, import_jsx_runtime.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__ */ (0, import_jsx_runtime.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__ */ (0, import_jsx_runtime.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__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "appointment-services-group-heading",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.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__ */ (0, import_jsx_runtime.jsx)("p", {
+						className: "appointment-services-group-intro rb-text-sm rb-leading-6 rb-max-w-prose status-muted",
+						children: group.intro
+					}) : null]
+				}), /* @__PURE__ */ (0, import_jsx_runtime.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 : undefined,
 		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__ */ (0, import_jsx_runtime.jsx)("div", {
+	const hasSectionHeading = Boolean(sectionHeading);
+	switch (view.kind) {
+		case "error":
+		case "empty": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 			className: rootClassName,
 			"data-appointment-services-state": view.kind,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
@@ -29547,56 +29968,25 @@ function AppointmentServicesNode({ sectionHeading, services, pathname, servicePa
 				children: view.message
 			})
 		});
+		case "items": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppointmentServiceRows, {
+				rows: view.rows,
+				RowTitle: hasSectionHeading ? "h3" : "h2"
+			})
+		});
+		case "groups": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AppointmentServiceGroups, {
+				groups: view.groups,
+				hasSectionHeading,
+				idPrefix: `appointment-services-${blockId ?? "block"}`
+			})
+		});
+		default: return assertNever(view);
 	}
-	const actionClassName = themeButtonClassName({
-		variant: "secondary",
-		size: "sm",
-		extraClassName: "appointment-services-row-action"
-	});
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-		className: `${rootClassName} rb-flex rb-flex-col`,
-		"data-appointment-services-state": "populated",
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-			className: "appointment-services-rows rb-flex rb-flex-col",
-			children: view.rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
-				className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-						className: "appointment-services-row-main rb-min-w-0",
-						children: [
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(RowTitle, {
-								className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
-								children: row.detailsHref ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-									href: row.detailsHref,
-									children: row.title
-								}) : row.title
-							}),
-							row.description ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
-								className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
-								children: row.description
-							}) : null,
-							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", {
-								className: "appointment-services-row-meta rb-caption status-muted",
-								children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
-							})
-						]
-					}),
-					row.priceLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "appointment-services-row-price rb-text-lg",
-						children: row.priceLabel
-					}) : null,
-					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("a", {
-						className: actionClassName,
-						href: row.href,
-						children: ["Check times", /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-							className: "rb-sr-only",
-							children: [" for ", row.title]
-						})]
-					})
-				]
-			}, row.id))
-		})
-	});
 }
 var appointment_services_default = AppointmentServicesNode;
 
@@ -31161,8 +31551,8 @@ function createLoadableValueState(tag, key, value) {
 	};
 }
 function upsertRedirectRule(existing, next) {
-	if (existing.findIndex((rule$1) => rule$1.id === next.id) < 0) return [next, ...existing];
-	return existing.map((rule$1) => rule$1.id === next.id ? next : rule$1);
+	if (existing.findIndex((rule$2) => rule$2.id === next.id) < 0) return [next, ...existing];
+	return existing.map((rule$2) => rule$2.id === next.id ? next : rule$2);
 }
 function createInitialRedirectsClientState(initialState) {
 	return {
@@ -31517,7 +31907,7 @@ function getWizardLocalStorage() {
 	}
 }
 function parseEnvelope(raw, config$1) {
-	if (!isRecord$28(raw)) return {
+	if (!isRecord$29(raw)) return {
 		kind: "removed_invalid",
 		reason: "invalid_envelope"
 	};
@@ -31606,7 +31996,7 @@ function createWizardDraftStorage(config$1) {
 		}
 	};
 }
-function isRecord$28(value) {
+function isRecord$29(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function deepEqualJsonValue(left, right) {
@@ -31616,8 +32006,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]));
@@ -32079,12 +32469,12 @@ function resolveBookingSiteId(siteId, form$1) {
 	return siteId || form$1?.siteId || "";
 }
 function normalizeBookingFormConfig(form$1) {
-	if (!isRecord$27(form$1)) return null;
+	if (!isRecord$28(form$1)) return null;
 	const id = readNonEmptyString(form$1.id);
 	const name = readNonEmptyString(form$1.name);
 	if (!id || !name) return null;
-	const schemaSource = isRecord$27(form$1.schema) ? form$1.schema : isRecord$27(form$1.schemaJson) ? form$1.schemaJson : null;
-	const settingsSource = isRecord$27(form$1.settings) ? form$1.settings : isRecord$27(form$1.settingsJson) ? form$1.settingsJson : null;
+	const schemaSource = isRecord$28(form$1.schema) ? form$1.schema : isRecord$28(form$1.schemaJson) ? form$1.schemaJson : null;
+	const settingsSource = isRecord$28(form$1.settings) ? form$1.settings : isRecord$28(form$1.settingsJson) ? form$1.settingsJson : null;
 	return {
 		id,
 		name,
@@ -32108,10 +32498,10 @@ function normalizeBookingServices(services) {
 	if (Array.isArray(services)) {
 		return services.filter(isBookingFormService).map(normalizeService);
 	}
-	if (isRecord$27(services) && "services" in services) {
+	if (isRecord$28(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) : [];
+	return isRecord$28(services) ? Object.values(services).filter(isBookingFormService).map(normalizeService) : [];
 }
 function normalizeBookingSchema(value) {
 	if (!value) return undefined;
@@ -32123,7 +32513,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);
@@ -32166,7 +32556,7 @@ function readBookingFieldOptions(value) {
 	return options.length > 0 ? options : undefined;
 }
 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 ? {
@@ -32186,7 +32576,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 === undefined || blockBookingConsentSchema.safeParse(value.consent).success);
+	return isRecord$28(value) && typeof value.id === "string" && typeof value.siteId === "string" && typeof value.title === "string" && (value.consent === undefined || blockBookingConsentSchema.safeParse(value.consent).success);
 }
 function collectBookingCustomFields(data) {
 	const customFields = {};
@@ -32242,7 +32632,7 @@ function readStringArray(value) {
 	const strings = value.filter((item) => typeof item === "string");
 	return strings.length > 0 ? strings : undefined;
 }
-function isRecord$27(value) {
+function isRecord$28(value) {
 	return typeof value === "object" && value !== null;
 }
 function getBookingServicePaymentSelectionMode(service) {
@@ -32471,6 +32861,41 @@ function getBookingSuccessMessage(successMessage) {
 	return successMessage?.trim() || "Your appointment has been booked! Check your email for confirmation.";
 }
 
+//#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);
+}
+/**
+* The ordered service categories a headless booking override was given in
+* its loader data (`data.services`).
+*/
+function readOverrideServiceCategories(data) {
+	return isRecord$27(data) ? normalizeBookingServiceCategories(data.services) : [];
+}
+
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/booking-runtime-sources.ts
 const APPOINTMENT_BOOKING_RUNTIME_FORM_ID = "booking-form";
@@ -32597,7 +33022,8 @@ function normalizeAppointmentBookingServices(input) {
 		priceCurrency: service.priceCurrency,
 		paymentTerms: service.paymentTerms,
 		paymentTermsAvailability: service.paymentTermsAvailability,
-		consent: service.consent
+		consent: service.consent,
+		categoryId: service.categoryId ?? null
 	}));
 }
 function buildAppointmentBookingSourceProps(input) {
@@ -32615,6 +33041,7 @@ function buildAppointmentBookingSourceProps(input) {
 			siteId: input.siteId,
 			services: input.services
 		}),
+		serviceCategories: [...input.serviceCategories ?? []],
 		serviceId: input.serviceId,
 		resourceId: input.resourceId,
 		initialData: input.initialData,
@@ -32644,6 +33071,7 @@ function buildEventRegistrationSourceProps(input) {
 		apiBaseUrl: input.apiBaseUrl,
 		portalToken: input.portalToken,
 		previewToken: input.previewToken,
+		readAuthority: input.readAuthority,
 		occurrenceContext: input.occurrenceContext,
 		events: input.events ? [...input.events] : null,
 		stage: input.stage,
@@ -32680,11 +33108,20 @@ const bookingServiceSchema = z.object({
 	priceCurrency: z.string().nullable().optional(),
 	paymentTerms: blockBookingPaymentTermsSchema.optional(),
 	paymentTermsAvailability: blockBookingPaymentTermsAvailabilitySchema.optional(),
-	consent: blockBookingConsentSchema.optional()
+	consent: blockBookingConsentSchema.optional(),
+	categoryId: z.string().nullable().optional()
+});
+const bookingServiceCategorySchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	description: z.string().nullable()
 });
 const bookingServicesSourceSchema = z.union([
 	z.array(bookingServiceSchema),
-	z.object({ services: z.array(bookingServiceSchema).optional() }),
+	z.object({
+		services: z.array(bookingServiceSchema).optional(),
+		categories: z.array(bookingServiceCategorySchema).optional()
+	}),
 	z.record(z.string(), bookingServiceSchema)
 ]);
 const bookingConfigSchema = z.object({
@@ -32737,6 +33174,7 @@ const bookingHydrationSchema = z.object({
 	rebookContext: z.object({ kind: z.literal("portal_rebook") }).nullable().optional(),
 	form: bookingConfigSchema.nullable(),
 	services: z.array(bookingServiceSchema),
+	serviceCategories: z.array(bookingServiceCategorySchema).optional(),
 	spamProtectionEnabled: z.boolean().optional()
 });
 const bookingRenderSchema = z.object({
@@ -32782,6 +33220,7 @@ const bookingFormBlockRuntime = defineClientOwnedBlockRuntime({
 				rebookContext: source.rebookContext ?? null,
 				form: form$1,
 				services,
+				serviceCategories: normalizeBookingServiceCategories(source.services),
 				spamProtectionEnabled: source.spamProtectionEnabled
 			}
 		};
@@ -34557,16 +34996,14 @@ function LocationMapView({ addressText, location: location$1, zoom, heightPx, sh
 				style: textColorStyle("mutedText"),
 				children: addressText
 			}) : null,
-			showDirections && directionsUrl ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+			showDirections && directionsUrl ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 				href: directionsUrl,
 				target: "_blank",
 				rel: "noreferrer",
-				className: themeButtonClassName({
-					variant: "ghost",
-					size: "sm",
-					extraClassName: "rb-w-fit"
-				}),
-				children: directionsLabel
+				variant: "ghost",
+				size: "sm",
+				extraClassName: "rb-w-fit",
+				label: directionsLabel
 			}) : null
 		]
 	});
@@ -34724,10 +35161,6 @@ const EventCard = ({ event, cardRole = "default", buttonVariant = "primary", but
 	const formattedTime = `${formatTime(event.startsAt, { timeZone })} - ${formatTime(event.endsAt, { timeZone })}`;
 	const cta = resolveEventCta(event, buttonText);
 	const cardClass = boxStyleClassNames({ role: cardRole }, { baseClass: "event-card" });
-	const buttonClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "md"
-	});
 	const title = event.title;
 	const summary = event.presentation?.summary ?? event.description;
 	const image = event.presentation?.image ?? null;
@@ -34758,7 +35191,7 @@ const EventCard = ({ event, cardRole = "default", buttonVariant = "primary", but
 			image
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(EventCardContent, {
 			allowMap,
-			buttonClass,
+			buttonVariant,
 			capacityText,
 			categoryBadge,
 			categoryId: category?.id,
@@ -34862,7 +35295,7 @@ function EventCardContent(props$1) {
 				children: props$1.summary
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(EventCardFooter, {
-				buttonClass: props$1.buttonClass,
+				buttonVariant: props$1.buttonVariant,
 				capacityText: props$1.capacityText,
 				cta: props$1.cta,
 				priceText: props$1.priceText
@@ -34900,12 +35333,14 @@ function EventCardFooter(props$1) {
 				className: "event-card-status rb-caption status-muted rb-text-center",
 				children: props$1.cta.label
 			}),
-			!props$1.cta.hidden && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+			!props$1.cta.hidden && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 				href: props$1.cta.href,
 				target: props$1.cta.external ? "_blank" : undefined,
 				rel: props$1.cta.external ? "noopener noreferrer" : undefined,
-				className: `${props$1.buttonClass} event-card-cta`,
-				children: props$1.cta.label
+				variant: props$1.buttonVariant,
+				size: "md",
+				extraClassName: "event-card-cta",
+				label: props$1.cta.label
 			})
 		]
 	});
@@ -34977,10 +35412,6 @@ const EventCompactRow = ({ event, buttonVariant = "primary", buttonText }) => {
 	const price = formatEventPrice(event);
 	const teacherLine = formatEventTeacherLine(event);
 	const cta = resolveEventCta(event, buttonText);
-	const buttonClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "sm"
-	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
 		className: "event-compact-row",
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("time", {
@@ -35044,12 +35475,15 @@ const EventCompactRow = ({ event, buttonVariant = "primary", buttonText }) => {
 				}), cta.hidden ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 					className: "event-compact-row-status",
 					children: cta.label
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 					href: cta.href,
 					target: cta.external ? "_blank" : undefined,
 					rel: cta.external ? "noopener noreferrer" : undefined,
-					className: `${buttonClass} event-compact-row-cta`,
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: cta.label })
+					variant: buttonVariant,
+					size: "sm",
+					extraClassName: "event-compact-row-cta",
+					labelClassName: "event-compact-row-cta-label",
+					label: cta.label
 				})]
 			})]
 		})]
@@ -35093,10 +35527,6 @@ function EventQuickDateCard(props$1) {
 		kind: "event_occurrence",
 		occurrenceId: event.occurrenceId
 	});
-	const buttonClass = themeButtonClassName({
-		variant: props$1.buttonVariant,
-		size: "sm"
-	});
 	const quickDateLabel = `${event.title}, ${date.label}`;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
 		className: "event-quick-date rb-flex rb-min-w-12rem rb-shrink-0 rb-flex-col rb-gap-3 rb-rounded-lg rb-border rb-bg-surface rb-p-4",
@@ -35128,13 +35558,15 @@ function EventQuickDateCard(props$1) {
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 					className: "event-quick-date-price",
 					children: formatEventPrice(event)
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-					className: `${buttonClass} event-quick-date-cta`,
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
+					variant: props$1.buttonVariant,
+					size: "sm",
+					extraClassName: "event-quick-date-cta",
 					href: ctaHref,
 					target: cta.external ? "_blank" : undefined,
 					rel: cta.external ? "noopener noreferrer" : undefined,
 					"aria-label": `${cta.label} ${quickDateLabel}`,
-					children: cta.label
+					label: cta.label
 				})]
 			})
 		]
@@ -35214,10 +35646,6 @@ const EventSpotlight = ({ events, layout = "grid", columns = "3", cardRole = "de
 	}
 	const containerClass = getContainerClass(layout, columns);
 	const cardOrientation = getCardOrientation(layout);
-	const buttonClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "md"
-	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: `event-spotlight-section ${className || ""}`,
 		"data-block": "event-spotlight",
@@ -35235,16 +35663,45 @@ const EventSpotlight = ({ events, layout = "grid", columns = "3", cardRole = "de
 			}, event.occurrenceId || event.id))
 		}), ctaLabel && ctaUrl ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 			className: "rb-mt-8 rb-text-center",
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 				href: ctaUrl,
-				className: buttonClass,
-				children: ctaLabel
+				variant: buttonVariant,
+				size: "md",
+				label: ctaLabel
 			})
 		}) : null]
 	});
 };
 var EventSpotlight_default = EventSpotlight;
 
+//#endregion
+//#region ../blocks/src/system/runtime/api/readAuthority.ts
+const browserReadAuthoritySchema = z.discriminatedUnion("kind", [z.object({ kind: z.literal("published") }).strict(), z.object({
+	kind: z.literal("preview"),
+	token: z.string().min(1)
+}).strict()]);
+/** Generic SDK/editor configuration is projected here; hosted callers supply the closed union. */
+function getBlockApiReadStage(config$1) {
+	return config$1.readAuthority?.kind ?? (config$1.isPreview && config$1.auth.type !== "none" ? "preview" : "published");
+}
+function createHostedBlockApiConfig(input) {
+	const { baseUrl, siteId, readAuthority, portalToken } = input;
+	return {
+		baseUrl,
+		siteId,
+		readAuthority,
+		auth: readAuthority.kind === "preview" ? {
+			type: "bearer",
+			token: readAuthority.token
+		} : { type: "none" },
+		isPreview: readAuthority.kind === "preview",
+		authOverrides: { portal: portalToken ? {
+			type: "bearer",
+			token: portalToken
+		} : { type: "none" } }
+	};
+}
+
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/shared/contract-schemas.ts
 const previewStageSchema = z.enum(["preview", "published"]);
@@ -36249,6 +36706,7 @@ const eventCollectionSourceSchemaShape = {
 	events: z.array(publicEventSchema).nullable().optional(),
 	siteId: z.string(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional(),
 	listLayout: eventLayoutSchema.optional(),
 	listColumns: columnOptionSchema.optional(),
@@ -36301,7 +36759,6 @@ const eventCollectionDisplaySchemaShape = {
 const eventCollectionHydrationSchema = z.object({
 	siteId: z.string(),
 	calendarWindow: calendarWindowPageSchema.optional(),
-	stage: previewStageSchema.optional(),
 	prefetchedEvents: z.boolean(),
 	eventSurface: eventSurfaceScopeSchema$1,
 	filterEventPresets: z.string().nullable(),
@@ -36376,7 +36833,6 @@ function buildEventCollectionHydration(source, now = new Date()) {
 	return {
 		calendarWindow: source.calendarWindow ?? undefined,
 		siteId: source.siteId,
-		stage: source.stage,
 		prefetchedEvents: source.events != null,
 		eventSurface: selected ? "all" : normalizeEventSurfaceScope(source.eventSurface),
 		filterEventPresets: selected ? null : normalizeEventSurfacePresetsCsv(source.filterEventPresets),
@@ -36424,9 +36880,10 @@ const eventCombinedRenderSchema = z.object({
 const eventCombinedIslandMetaCodec = createZodCodec(z.object({
 	siteId: z.string(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 }));
-const eventCombinedIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "stage");
+const eventCombinedIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "readAuthority", "stage");
 function buildEventCombinedDisplay(source) {
 	return {
 		...buildEventCollectionDisplay(source),
@@ -36456,6 +36913,7 @@ const eventCombinedInteractiveIslandPropsCodec = createInteractiveIslandCodec({
 	selectMeta: (value) => ({
 		siteId: value.siteId,
 		apiBaseUrl: value.apiBaseUrl,
+		readAuthority: value.readAuthority,
 		stage: value.stage
 	})
 });
@@ -36466,6 +36924,7 @@ function buildEventCombinedInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: props$1
@@ -36960,11 +37419,6 @@ function OfferingsCatalogue(props$1) {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/offerings-preview-content.tsx
 function OfferingsPreviewContent(props$1) {
-	const groupLinkClass = themeButtonClassName({
-		variant: props$1.buttonVariant,
-		size: "md",
-		extraClassName: "offerings-preview-card-link rb-inline-flex rb-items-center rb-gap-2"
-	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: "offerings-preview rb-flex rb-flex-col rb-gap-6",
 		"data-block": "offerings-preview",
@@ -37004,10 +37458,12 @@ function OfferingsPreviewContent(props$1) {
 							}),
 							groupCta ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("footer", {
 								className: "offerings-preview-card-footer rb-mt-auto rb-flex",
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-									className: groupLinkClass,
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
+									variant: props$1.buttonVariant,
+									size: "md",
+									extraClassName: "offerings-preview-card-link rb-inline-flex rb-items-center rb-gap-2",
 									href: groupCta.href,
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: groupCta.label })
+									label: groupCta.label
 								})
 							}) : null
 						]
@@ -37343,10 +37799,6 @@ function WholeSeriesRunCompactRow({ group, path: path$3, now }) {
 	const timeRange = `${formatTime(firstSession.startsAt, { timeZone })} - ${formatTime(firstSession.endsAt, { timeZone })}`;
 	const price = formatEventPriceDisplay(group.representative.pricing);
 	const statusLabel = resolveWholeSeriesBookingPhase(group.run, now).kind === "open" ? null : "Registration closed";
-	const ctaClass = themeButtonClassName({
-		variant: "primary",
-		size: "sm"
-	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
 		className: "event-compact-row offerings-preview-whole-series-row",
 		children: [
@@ -37405,10 +37857,13 @@ function WholeSeriesRunCompactRow({ group, path: path$3, now }) {
 				}), statusLabel || !path$3 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 					className: "event-compact-row-status",
 					children: statusLabel ?? "Details coming soon"
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 					href: path$3,
-					className: `${ctaClass} event-compact-row-cta`,
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "Book now" })
+					variant: "primary",
+					size: "sm",
+					extraClassName: "event-compact-row-cta",
+					labelClassName: "event-compact-row-cta-label",
+					label: "Book now"
 				})]
 			})
 		]
@@ -37425,10 +37880,6 @@ function WholeSeriesRunFeatureCard({ group, now, path: path$3, buttonVariant, bu
 	const formattedDate = formatEventCompactDateRail(firstSession.startsAt, { timeZone }).label;
 	const timeRange = `${formatTime(firstSession.startsAt, { timeZone })} - ${formatTime(firstSession.endsAt, { timeZone })}`;
 	const price = formatEventPriceDisplay(group.representative.pricing);
-	const ctaClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "md"
-	});
 	const statusLabel = resolveWholeSeriesBookingPhase(group.run, now).kind === "open" ? null : "Registration closed";
 	const description = group.representative.description;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("article", {
@@ -37461,10 +37912,12 @@ function WholeSeriesRunFeatureCard({ group, now, path: path$3, buttonVariant, bu
 					}), statusLabel || !path$3 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 						className: "event-compact-row-status",
 						children: statusLabel ?? "Details coming soon"
-					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 						href: path$3,
-						className: `${ctaClass} event-card-cta`,
-						children: buttonText || "Book now"
+						variant: buttonVariant,
+						size: "md",
+						extraClassName: "event-card-cta",
+						label: buttonText || "Book now"
 					})]
 				})
 			]
@@ -37627,15 +38080,13 @@ function WeeklySlotAvailabilityView({ availability, loading = false, error: erro
 								"."
 							]
 						}),
-						resolvedCtaUrl ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-							className: themeButtonClassName({
-								variant: "ghost",
-								size: "sm",
-								extraClassName: "weekly-slot-availability__cta"
-							}),
+						resolvedCtaUrl ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
+							variant: "ghost",
+							size: "sm",
+							extraClassName: "weekly-slot-availability__cta",
 							href: buildSlotCtaUrl(resolvedCtaUrl, slot),
 							"aria-label": buildSlotCtaLabel(resolvedCtaText, slot),
-							children: resolvedCtaText
+							label: resolvedCtaText
 						}) : null
 					]
 				}, slot.id))
@@ -38590,6 +39041,7 @@ const shopSourceSchema = z.object({
 	products: z.array(publicProductSchema).nullable().optional(),
 	siteId: z.string().optional(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 });
 const productVariantOptionDisplaySchema = z.object({
@@ -38757,13 +39209,15 @@ function resolveShowPricePerCredit(source) {
 const shopIslandMetaCodec = createZodCodec(z.object({
 	siteId: z.string().optional(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 }));
-const shopIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "stage");
+const shopIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "readAuthority", "stage");
 function selectShopIslandMeta(value) {
 	return {
 		siteId: value.siteId,
 		apiBaseUrl: value.apiBaseUrl,
+		readAuthority: value.readAuthority,
 		stage: value.stage
 	};
 }
@@ -38934,6 +39388,7 @@ function buildShopInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: {
@@ -38949,6 +39404,7 @@ function buildProductListInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: {
@@ -38964,6 +39420,7 @@ function buildProductDetailInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: {
@@ -38979,6 +39436,7 @@ function buildCartInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: {
@@ -38994,6 +39452,7 @@ function buildCheckoutInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: {
@@ -39096,6 +39555,7 @@ const cartManifest = createBlockManifest({
 		baseClass: "",
 		spacing: "spacious",
 		children: sectionContainer([cart(withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			mode: "cart",
 			heading: { $bind: {
 				from: "content.heading",
@@ -39183,6 +39643,7 @@ const checkoutManifest = createBlockManifest({
 		baseClass: "",
 		spacing: "spacious",
 		children: sectionContainer([checkout(withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			mode: "checkout",
 			heading: { $bind: {
 				from: "content.heading",
@@ -39514,6 +39975,18 @@ function getStepNumber(step, wizardSteps) {
 
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
+/** Public requests share subject identity without copying the run's display sessions. */
+function toRegistrationRequestSubject(subject, attendanceMode) {
+	return subject.kind === "occurrence" ? {
+		kind: "occurrence",
+		occurrenceId: subject.occurrenceId,
+		attendanceMode: attendanceMode ?? undefined
+	} : {
+		kind: "wholeSeries",
+		eventSeriesId: subject.eventSeriesId,
+		attendanceMode: attendanceMode ?? undefined
+	};
+}
 function eventMatchesOccurrenceId(event, occurrenceId) {
 	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
 }
@@ -39724,6 +40197,7 @@ const eventRegistrationSourceSchema = z.object({
 	apiBaseUrl: z.string().optional(),
 	portalToken: z.string().nullable().optional(),
 	previewToken: z.string().nullable().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	...eventRegistrationHydrationSchemaShape,
 	events: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
 	wholeSeriesRunEvents: z.array(eventRegistrationPublicEventSchema).nullable().optional(),
@@ -39761,9 +40235,10 @@ const eventRegistrationIslandMetaCodec = createZodCodec(z.object({
 	apiBaseUrl: z.string().optional(),
 	portalToken: z.string().nullable().optional(),
 	previewToken: z.string().nullable().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 }));
-const eventRegistrationIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "portalToken", "previewToken", "stage");
+const eventRegistrationIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "portalToken", "previewToken", "readAuthority", "stage");
 function buildEventRegistrationDisplayFromScopedEvents(source, scopedSourceEvents) {
 	const selectedRun = resolveSelectedWholeSeriesRun(scopedSourceEvents);
 	if (selectedRun && (!selectedRun.run.enrollmentOpen || toWholeSeriesRegistrationEvent(selectedRun) === null)) {
@@ -39844,6 +40319,7 @@ function shellLabelForRegistrationStep(step, events) {
 		case "redirecting":
 		case "verifying-payment":
 		case "verifying-timeout":
+		case "payment-status":
 		case "payment-failed": return "Details";
 	}
 }
@@ -39918,6 +40394,7 @@ const eventRegistrationInteractiveIslandPropsCodec = createInteractiveIslandCode
 		apiBaseUrl: value.apiBaseUrl,
 		portalToken: value.portalToken,
 		previewToken: value.previewToken,
+		readAuthority: value.readAuthority,
 		stage: value.stage
 	})
 });
@@ -39930,6 +40407,7 @@ function buildEventRegistrationInteractiveIslandProps(props$1) {
 			apiBaseUrl: props$1.apiBaseUrl,
 			portalToken: props$1.portalToken,
 			previewToken: props$1.previewToken,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: props$1
@@ -40079,6 +40557,7 @@ const eventRegistrationManifest = createBlockManifest({
 			text({ as: "h2" }, bind("content.heading"), when("content.heading")),
 			richText({ className: "rb-prose rb-max-w-none" }, bind("content.description"), when("content.description")),
 			eventRegistration(withApiBindings({
+				readAuthority: { $bind: { from: "$root.readAuthority" } },
 				occurrenceContext: { $bind: { from: "$root.occurrenceContext" } },
 				subject: { $bind: { from: "$root.subject" } },
 				portalToken: { $bind: {
@@ -40540,9 +41019,10 @@ const eventCalendarRenderSchema = z.object({
 const eventCalendarIslandMetaCodec = createZodCodec(z.object({
 	siteId: z.string(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 }));
-const eventCalendarIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "stage");
+const eventCalendarIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "readAuthority", "stage");
 /**
 * Collapse an optional/blank string to `undefined` so downstream week-board
 * copy (title, footer note) and the CTA href stay hidden unless a site opts in
@@ -40562,7 +41042,7 @@ function buildEventCalendarDisplay(source) {
 			listColumns: source.listColumns ?? source.columns
 		}),
 		kind: "event-calendar",
-		displayMode: normalizeEventCalendarDisplayMode(source) ?? "combined",
+		displayMode: resolveEventCalendarReadPlan(source).mode,
 		className: source.className ?? null,
 		events: (source.events ?? []).slice().sort((left, right) => new Date(left.startsAt).getTime() - new Date(right.startsAt).getTime()),
 		boardTitle: normalizeOptionalText(source.boardTitle),
@@ -40583,7 +41063,6 @@ function buildEventCalendarListingRender(render, className = render.display.clas
 		display: buildEventCalendarListingDisplay(display, hydration.prefetchedEvents, className),
 		hydration: {
 			siteId: hydration.siteId,
-			stage: hydration.stage,
 			eventsPerPage: display.eventsPerPage,
 			paginationAction: display.paginationAction,
 			showFilters: display.showFilters,
@@ -40607,13 +41086,17 @@ const eventCalendarBlockRuntime = defineProgressiveBlockRuntime({
 		source: createZodCodec(eventCalendarSourceSchema),
 		render: createZodCodec(eventCalendarRenderSchema)
 	},
-	buildRender: (source) => ({
-		display: buildEventCalendarDisplay(source.calendarWindow && (source.variant ?? source.displayMode ?? "combined") !== "combined" && (source.variant ?? source.displayMode) !== "list" ? {
+	buildRender: (source) => {
+		const plan = resolveEventCalendarReadPlan(source);
+		const displaySource = source.calendarWindow && plan.jobs === "calendar" ? {
 			...source,
 			events: source.calendarWindow.events
-		} : source),
-		hydration: buildEventCollectionHydration(source)
-	})
+		} : source;
+		return {
+			display: buildEventCalendarDisplay(displaySource),
+			hydration: buildEventCollectionHydration(source)
+		};
+	}
 });
 const eventCalendarInteractiveIslandPropsCodec = createInteractiveIslandCodec({
 	runtime: eventCalendarBlockRuntime,
@@ -40623,6 +41106,7 @@ const eventCalendarInteractiveIslandPropsCodec = createInteractiveIslandCodec({
 	selectMeta: (value) => ({
 		siteId: value.siteId,
 		apiBaseUrl: value.apiBaseUrl,
+		readAuthority: value.readAuthority,
 		stage: value.stage
 	})
 });
@@ -40633,6 +41117,7 @@ function buildEventCalendarInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: props$1
@@ -40788,6 +41273,7 @@ const eventCalendarLayout = [styledSection({
 		rootType: "stack",
 		rootProps: { gap: "lg" },
 		children: [...eventSectionHeaderLayoutNodes({ splitClassName: "event-section-head event-section-head--split" }), el("event-calendar", withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			events: { $bind: { from: "data.events" } },
 			calendarWindow: { $bind: { from: "data.calendarWindow" } },
 			stage: { $bind: {
@@ -41671,6 +42157,7 @@ const eventListingSourceSchema = z.object({
 	events: z.array(publicEventSchema).nullable().optional(),
 	siteId: z.string(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional(),
 	layout: eventLayoutSchema.optional(),
 	columns: columnOptionSchema.optional(),
@@ -41711,7 +42198,6 @@ const eventListingDisplaySchema = z.object({
 });
 const eventListingHydrationSchema = z.object({
 	siteId: z.string(),
-	stage: previewStageSchema.optional(),
 	eventsPerPage: eventPageSizeSchema,
 	paginationAction: eventListPaginationActionSchema,
 	showFilters: z.boolean(),
@@ -41734,6 +42220,7 @@ const eventListingRenderSchema = z.object({
 const eventListingIslandMetaCodec = createZodCodec(z.object({
 	siteId: z.string(),
 	apiBaseUrl: z.string().optional(),
+	readAuthority: browserReadAuthoritySchema.optional(),
 	stage: previewStageSchema.optional()
 }));
 const eventListingBlockRuntime = defineProgressiveBlockRuntime({
@@ -41768,7 +42255,6 @@ const eventListingBlockRuntime = defineProgressiveBlockRuntime({
 			},
 			hydration: {
 				siteId: source.siteId,
-				stage: source.stage,
 				eventsPerPage: pageSize,
 				paginationAction: resolveEventListPaginationAction({
 					paginationMode: source.paginationMode,
@@ -41791,7 +42277,7 @@ const eventListingBlockRuntime = defineProgressiveBlockRuntime({
 		};
 	}
 });
-const eventListingIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "stage");
+const eventListingIslandMetaKeys = defineInteractiveIslandMetaKeys("siteId", "apiBaseUrl", "readAuthority", "stage");
 const eventListingInteractiveIslandPropsCodec = createInteractiveIslandCodec({
 	runtime: eventListingBlockRuntime,
 	mode: "event-listing",
@@ -41800,6 +42286,7 @@ const eventListingInteractiveIslandPropsCodec = createInteractiveIslandCodec({
 	selectMeta: (value) => ({
 		siteId: value.siteId,
 		apiBaseUrl: value.apiBaseUrl,
+		readAuthority: value.readAuthority,
 		stage: value.stage
 	})
 });
@@ -41810,6 +42297,7 @@ function buildEventListingInteractiveIslandProps(props$1) {
 		meta: {
 			siteId: props$1.siteId,
 			apiBaseUrl: props$1.apiBaseUrl,
+			readAuthority: props$1.readAuthority,
 			stage: props$1.stage
 		},
 		source: props$1
@@ -42055,6 +42543,7 @@ const eventListingLayout = [styledSection({
 		rootType: "stack",
 		rootProps: { gap: "lg" },
 		children: [...eventSectionHeaderLayoutNodes(), el("event-listing", withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			events: { $bind: { from: "data.events" } },
 			stage: { $bind: {
 				from: "$root.previewStage",
@@ -42777,6 +43266,7 @@ const productDetailManifest = createBlockManifest({
 		baseClass: "",
 		spacing: "spacious",
 		children: sectionContainer([productDetail(withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			mode: "product-detail",
 			heading: { $bind: {
 				from: "content.heading",
@@ -42949,6 +43439,7 @@ const productListManifest = createBlockManifest({
 		baseClass: "",
 		spacing: "spacious",
 		children: sectionContainer([productList(withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			mode: "product-list",
 			heading: { $bind: {
 				from: "content.heading",
@@ -43233,6 +43724,7 @@ const shopManifest = createBlockManifest({
 		baseClass: "",
 		spacing: "spacious",
 		children: sectionContainer([shop(withApiBindings({
+			readAuthority: { $bind: { from: "$root.readAuthority" } },
 			mode: "passes-memberships",
 			showPasses: { $bind: {
 				from: "content.showPasses",
@@ -43643,15 +44135,13 @@ function CheckoutShellView(props$1) {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/shop-commerce.server.tsx
 function renderServerPendingAction(label, soldOut) {
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 		type: "button",
-		className: themeButtonClassName({
-			variant: "default",
-			size: "md"
-		}),
+		variant: "default",
+		size: "md",
+		label: soldOut ? "Sold out" : label,
 		disabled: true,
-		"aria-disabled": "true",
-		children: soldOut ? "Sold out" : label
+		"aria-disabled": "true"
 	}), !soldOut ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
 		className: "rb-caption status-muted",
 		children: "Cart actions become interactive after page load."
@@ -43668,13 +44158,11 @@ function ProductListServerContent(props$1) {
 				selectedVariantId: card.selectedVariantId,
 				disabled: true
 			}),
-			actions: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [renderServerPendingAction(card.actionLabel, card.soldOut), card.path ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+			actions: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [renderServerPendingAction(card.actionLabel, card.soldOut), card.path ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 				href: card.path,
-				className: themeButtonClassName({
-					variant: "secondary",
-					size: "sm"
-				}),
-				children: "View details"
+				variant: "secondary",
+				size: "sm",
+				label: "View details"
 			}) : null] })
 		}, card.productId))
 	});
@@ -43978,10 +44466,6 @@ function AgendaLinkCard({ event, showCapacity, showVenue, buttonVariant, buttonT
 	const price = formatEventPrice(event);
 	const capacity = showCapacity ? formatEventRemainingPlaces(event) : null;
 	const cta = resolveEventCta(event, buttonText);
-	const buttonClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "sm"
-	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("article", {
 		className: "event-agenda-card event-agenda-card--agenda",
 		children: [
@@ -44033,12 +44517,14 @@ function AgendaLinkCard({ event, showCapacity, showVenue, buttonVariant, buttonT
 				}), cta.hidden ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 					className: "event-agenda-card-status status-muted",
 					children: cta.label
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
 					href: cta.href,
 					target: cta.external ? "_blank" : undefined,
 					rel: cta.external ? "noopener noreferrer" : undefined,
-					className: `${buttonClass} event-agenda-card-cta`,
-					children: cta.label
+					variant: buttonVariant,
+					size: "sm",
+					extraClassName: "event-agenda-card-cta",
+					label: cta.label
 				})]
 			})
 		]
@@ -44244,7 +44730,7 @@ const WeekBoardCard = ({ event, showCapacity, calendarTimeZone }) => {
 		]
 	});
 };
-const WeekBoardNavigationControls = ({ navigation: navigation$1, todayClassName }) => {
+const WeekBoardNavigationControls = ({ navigation: navigation$1, buttonVariant }) => {
 	const handlers = navigation$1.kind === "interactive" ? navigation$1 : {
 		onPrevious: undefined,
 		onNext: undefined,
@@ -44277,12 +44763,13 @@ const WeekBoardNavigationControls = ({ navigation: navigation$1, todayClassName
 				onClick: handlers.onNext,
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CalendarNavigationChevron, { direction: "next" })
 			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 				type: "button",
-				className: todayClassName,
+				variant: buttonVariant,
+				size: "sm",
+				label: "Today",
 				disabled: navigation$1.isCurrentWeek,
-				onClick: handlers.onToday,
-				children: "Today"
+				onClick: handlers.onToday
 			})
 		]
 	});
@@ -44298,18 +44785,19 @@ const WeekBoardLegend = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div",
 		}), item.label]
 	}, item.status))
 });
-const WeekBoardLoadError = ({ navigation: navigation$1, buttonClassName }) => {
+const WeekBoardLoadError = ({ navigation: navigation$1, buttonVariant }) => {
 	if (navigation$1.kind !== "interactive" || navigation$1.loadState.kind !== "error") {
 		return null;
 	}
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "event-week-board-error",
 		role: "status",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: "Failed to load events" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: "Failed to load events" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 			type: "button",
-			className: buttonClassName,
-			onClick: navigation$1.loadState.onRetry,
-			children: "Try again"
+			variant: buttonVariant,
+			size: "sm",
+			label: "Try again",
+			onClick: navigation$1.loadState.onRetry
 		})]
 	});
 };
@@ -44341,17 +44829,18 @@ const WeekBoardGrid = ({ days, eventsByDate, showCapacity, calendarTimeZone, tod
 		}, dateKey);
 	})
 });
-const WeekBoardFooter = ({ note, ctaHref, ctaLabel, ctaClassName }) => {
+const WeekBoardFooter = ({ note, ctaHref, ctaLabel, buttonVariant }) => {
 	if (note === null && ctaHref === null) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "event-week-board-foot",
 		children: [note === null ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
 			className: "event-week-board-foot-note",
 			children: note
-		}), ctaHref === null ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-			className: ctaClassName,
+		}), ctaHref === null ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButtonLink, {
+			variant: buttonVariant,
+			size: "sm",
 			href: ctaHref,
-			children: ctaLabel
+			label: ctaLabel
 		})]
 	});
 };
@@ -44366,14 +44855,6 @@ const WeekBoardFooter = ({ note, ctaHref, ctaLabel, ctaClassName }) => {
 const WeekBoardView = ({ days, events, navigation: navigation$1, showCapacity, emptyMessage = "No classes scheduled this week", title, footerNote, ctaLabel = "Reserve a place", ctaHref = null, buttonVariant = "outline", elevated = false, banded = false, calendarTimeZone, today }) => {
 	const eventsByDate = groupEventsByDate(events, calendarTimeZone);
 	const hasAnyEvents = days.some((date) => (eventsByDate.get(formatDateKey(date)) ?? []).length > 0);
-	const ctaClassName = themeButtonClassName({
-		variant: buttonVariant,
-		size: "sm"
-	});
-	const todayClassName = themeButtonClassName({
-		variant: buttonVariant,
-		size: "sm"
-	});
 	const hasTitle = typeof title === "string" && title.length > 0;
 	const hasFooterNote = typeof footerNote === "string" && footerNote.length > 0;
 	const footerNoteText = hasAnyEvents ? hasFooterNote ? footerNote : null : emptyMessage;
@@ -44396,14 +44877,14 @@ const WeekBoardView = ({ days, events, navigation: navigation$1, showCapacity, e
 						}) : null,
 						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WeekBoardNavigationControls, {
 							navigation: navigation$1,
-							todayClassName
+							buttonVariant
 						}),
 						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WeekBoardLegend, {})
 					]
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WeekBoardLoadError, {
 					navigation: navigation$1,
-					buttonClassName: todayClassName
+					buttonVariant
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WeekBoardGrid, {
 					days,
@@ -44416,7 +44897,7 @@ const WeekBoardView = ({ days, events, navigation: navigation$1, showCapacity, e
 					note: footerNoteText,
 					ctaHref: resolvedCtaHref,
 					ctaLabel,
-					ctaClassName
+					buttonVariant
 				})
 			]
 		})
@@ -44521,6 +45002,54 @@ function assertNeverDisplayMode(value) {
 function renderEventCard(event, display) {
 	return renderEventListItem(event, display);
 }
+function CalendarSsrHeader(props$1) {
+	const periodLabel = props$1.period === "week" ? "week" : "month";
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "event-calendar-header",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+			className: "event-calendar-nav",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "event-calendar-nav-btn",
+					"aria-label": `Previous ${periodLabel}`,
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CalendarSsrChevron, { direction: "previous" })
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", {
+					className: "event-calendar-title",
+					children: props$1.title
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "event-calendar-nav-btn",
+					"aria-label": `Next ${periodLabel}`,
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CalendarSsrChevron, { direction: "next" })
+				})
+			]
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
+			type: "button",
+			variant: props$1.buttonVariant,
+			size: "sm",
+			label: "Today"
+		})]
+	});
+}
+function CalendarSsrChevron(props$1) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", {
+		width: "20",
+		height: "20",
+		fill: "none",
+		stroke: "currentColor",
+		strokeWidth: 2,
+		viewBox: "0 0 24 24",
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+			strokeLinecap: "round",
+			strokeLinejoin: "round",
+			strokeWidth: 2,
+			d: props$1.direction === "previous" ? "M15 19l-7-7 7-7" : "M9 5l7 7-7 7"
+		})
+	});
+}
 function renderCombinedSsr(display, prefetchedEvents) {
 	const listDisplay = buildEventCalendarListingDisplay(display, prefetchedEvents, "event-combined-content");
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -44568,62 +45097,10 @@ function renderCalendarSsr(display, hydration) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: clsx_default("event-calendar", display.className ?? undefined),
 		"data-block": "event-calendar",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-			className: "event-calendar-header",
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "event-calendar-nav",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "event-calendar-nav-btn",
-						"aria-label": calendarView === "week" ? "Previous week" : "Previous month",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", {
-							width: "20",
-							height: "20",
-							fill: "none",
-							stroke: "currentColor",
-							strokeWidth: 2,
-							viewBox: "0 0 24 24",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
-								strokeLinecap: "round",
-								strokeLinejoin: "round",
-								strokeWidth: 2,
-								d: "M15 19l-7-7 7-7"
-							})
-						})
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", {
-						className: "event-calendar-title",
-						children: viewport.title
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "event-calendar-nav-btn",
-						"aria-label": calendarView === "week" ? "Next week" : "Next month",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", {
-							width: "20",
-							height: "20",
-							fill: "none",
-							stroke: "currentColor",
-							strokeWidth: 2,
-							viewBox: "0 0 24 24",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
-								strokeLinecap: "round",
-								strokeLinejoin: "round",
-								strokeWidth: 2,
-								d: "M9 5l7 7-7 7"
-							})
-						})
-					})
-				]
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-				type: "button",
-				className: themeButtonClassName({
-					variant: display.buttonVariant,
-					size: "sm"
-				}),
-				children: "Today"
-			})]
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CalendarSsrHeader, {
+			title: viewport.title,
+			period: calendarView,
+			buttonVariant: display.buttonVariant
 		}), viewport.kind === "week" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WeekAgendaView, {
 			days: viewport.days,
 			events: [...display.events],
@@ -44700,62 +45177,10 @@ function renderTimetableSsr(display, hydration) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: clsx_default("event-calendar", "event-calendar--timetable", display.className ?? undefined),
 		"data-block": "event-calendar",
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-			className: "event-calendar-header",
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "event-calendar-nav",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "event-calendar-nav-btn",
-						"aria-label": "Previous week",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", {
-							width: "20",
-							height: "20",
-							fill: "none",
-							stroke: "currentColor",
-							strokeWidth: 2,
-							viewBox: "0 0 24 24",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
-								strokeLinecap: "round",
-								strokeLinejoin: "round",
-								strokeWidth: 2,
-								d: "M15 19l-7-7 7-7"
-							})
-						})
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", {
-						className: "event-calendar-title",
-						children: viewport.title
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "event-calendar-nav-btn",
-						"aria-label": "Next week",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("svg", {
-							width: "20",
-							height: "20",
-							fill: "none",
-							stroke: "currentColor",
-							strokeWidth: 2,
-							viewBox: "0 0 24 24",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
-								strokeLinecap: "round",
-								strokeLinejoin: "round",
-								strokeWidth: 2,
-								d: "M9 5l7 7-7 7"
-							})
-						})
-					})
-				]
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-				type: "button",
-				className: themeButtonClassName({
-					variant: display.buttonVariant,
-					size: "sm"
-				}),
-				children: "Today"
-			})]
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CalendarSsrHeader, {
+			title: viewport.title,
+			period: "week",
+			buttonVariant: display.buttonVariant
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "event-timetable",
 			children: [
@@ -45271,14 +45696,12 @@ const FormNodeSSR = ({ blockId, value, submitLabel, successMessage, className, o
 					className: "fb-actions",
 					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 						className: "fb-actions-inner",
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 							type: "submit",
-							className: themeButtonClassName({
-								variant: "primary",
-								size: "md",
-								extraClassName: "rb-w-full rb-sm-w-auto"
-							}),
-							children: display.submitLabel
+							variant: "primary",
+							size: "md",
+							extraClassName: "rb-w-full rb-sm-w-auto",
+							label: display.submitLabel
 						})
 					})
 				})
@@ -45376,13 +45799,11 @@ function NewsletterFormSSR(props$1) {
 						}) : null,
 						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 							className: "newsletter-submit",
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 								type: "submit",
-								className: themeButtonClassName({
-									variant: display.buttonVariant,
-									size: "md"
-								}),
-								children: display.buttonLabel
+								variant: display.buttonVariant,
+								size: "md",
+								label: display.buttonLabel
 							})
 						})
 					]
@@ -45470,28 +45891,24 @@ function ShopSSR({ blockId, siteId, apiBaseUrl, stage, children, checkoutEndpoin
 				display: render.display,
 				passCards: render.display.passes.map((pass) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PassCardView, {
 					display: pass,
-					action: pass.action.kind === "unavailable" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PassPurchaseUnavailable, { label: pass.action.label }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+					action: pass.action.kind === "unavailable" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PassPurchaseUnavailable, { label: pass.action.label }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 						type: "button",
-						className: themeButtonClassName({
-							variant: render.hydration.buttonVariant,
-							size: "md"
-						}),
+						variant: render.hydration.buttonVariant,
+						size: "md",
+						label: pass.action.label,
 						disabled: true,
-						"aria-disabled": "true",
-						children: pass.action.label
+						"aria-disabled": "true"
 					})
 				}, pass.id)),
 				membershipCards: render.display.memberships.map((membership) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MembershipCardView, {
 					display: membership,
-					action: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+					action: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemedButton, {
 						type: "button",
-						className: themeButtonClassName({
-							variant: render.hydration.buttonVariant,
-							size: "md"
-						}),
+						variant: render.hydration.buttonVariant,
+						size: "md",
+						label: membership.actionLabel,
 						disabled: true,
-						"aria-disabled": "true",
-						children: membership.actionLabel
+						"aria-disabled": "true"
 					})
 				}, membership.id))
 			}),
@@ -45559,6 +45976,7 @@ const serverComponentRegistry = {
 	svg: SvgNode,
 	section: SectionNode,
 	headerSection: header_section_server_default,
+	headerControl: HeaderControlNode,
 	stack: StackNode,
 	inline: InlineNode,
 	grid: GridNode,
@@ -46501,16 +46919,73 @@ function resolveChildren(nodes, context) {
 function isReactNode(value) {
 	return value !== null && value !== undefined;
 }
+const RENDERER_METADATA_PROP_KEYS = new Set([
+	"pathBase",
+	"blockId",
+	"blockKind",
+	"blockContent",
+	"fragmentRegistry",
+	"previewAuthoring",
+	"contentVersionId",
+	"imageResolveContext"
+]);
+function omitRendererMetadataProps(props$1) {
+	const presentationProps = {};
+	for (const [key, value] of Object.entries(props$1)) {
+		if (!RENDERER_METADATA_PROP_KEYS.has(key)) presentationProps[key] = value;
+	}
+	return presentationProps;
+}
+const BLOCK_ID_METADATA_CONSUMERS = new Set([
+	"accordion",
+	"appointment-services",
+	"booking-form",
+	"carousel",
+	"cart",
+	"checkout",
+	"event-calendar",
+	"event-combined",
+	"event-details",
+	"event-listing",
+	"event-registration",
+	"form",
+	"gifting",
+	"headersection",
+	"location-map",
+	"newsletter-form",
+	"product-detail",
+	"product-list",
+	"shop",
+	"weekly-slot-availability"
+]);
+const BLOCK_CONTENT_METADATA_CONSUMERS = new Set([
+	"feature-card-icon",
+	"headersection",
+	"media",
+	"text"
+]);
+const BLOCK_KIND_METADATA_CONSUMERS = new Set([
+	"headersection",
+	"media",
+	"richtext"
+]);
+/**
+* Projects resolver context only to node kinds with an explicit metadata
+* contract. Presentation props and renderer metadata never share a universal
+* spread boundary, so adding metadata cannot leak it into DOM-backed nodes.
+*/
 function resolveNodeMetadata(nodeType, context) {
-	return {
-		pathBase: context.pathBase,
-		blockId: context.blockId,
-		blockKind: context.blockKind,
-		blockContent: context.blockContent,
-		fragmentRegistry: context.fragmentRegistry,
-		previewAuthoring: context.previewAuthoring,
-		...nodeType.toLowerCase() === "newsletter-form" ? { contentVersionId: context.contentVersionId } : {},
-		...nodeType === "media" && context.imageResolveContext ? { imageResolveContext: context.imageResolveContext } : {}
+	const normalizedType = nodeType.toLowerCase();
+	return {
+		...BLOCK_ID_METADATA_CONSUMERS.has(normalizedType) ? { blockId: context.blockId } : {},
+		...BLOCK_KIND_METADATA_CONSUMERS.has(normalizedType) ? { blockKind: context.blockKind } : {},
+		...BLOCK_CONTENT_METADATA_CONSUMERS.has(normalizedType) ? { blockContent: context.blockContent } : {},
+		...normalizedType === "headersection" ? {
+			pathBase: context.pathBase,
+			fragmentRegistry: context.fragmentRegistry
+		} : {},
+		...normalizedType === "newsletter-form" ? { contentVersionId: context.contentVersionId } : {},
+		...normalizedType === "media" && context.imageResolveContext ? { imageResolveContext: context.imageResolveContext } : {}
 	};
 }
 /**
@@ -46553,7 +47028,7 @@ function resolveNode(node, context, indexFallback) {
 	props$1 = omitHeadingDecorationProps(props$1);
 	const children = resolveChildren(node.children, scopeContext);
 	const elementProps = {
-		...props$1,
+		...omitRendererMetadataProps(props$1),
 		key: node.key ?? indexFallback,
 		...resolveNodeMetadata(node.type, context)
 	};
@@ -47276,7 +47751,7 @@ function generateInputCss({ themeId, theme, inputSystem }) {
 	baseInputRules.push("transition: border-color 0.2s ease, box-shadow 0.2s ease");
 	const labelSelector = `${rootSelector} .form-label`;
 	const labelRules = [];
-	labelRules.push(`color: ${rgbColorValue(inputSystem.label.textColorToken)}`);
+	labelRules.push(`color: ${textColorValue(inputSystem.label.textColorToken)}`);
 	labelRules.push(`font-weight: ${FONT_WEIGHT_MAP[inputSystem.label.fontWeight]}`);
 	labelRules.push(`font-size: ${LABEL_FONT_SIZE_MAP[inputSystem.label.fontSize]}`);
 	if (inputSystem.label.textTransform && inputSystem.label.textTransform !== "none") {
@@ -48556,6 +49031,125 @@ function generateFooterBottomTextLinkStyles(footer, themeId, tokens) {
 	return cssChunks.join("\n");
 }
 
+//#endregion
+//#region ../theme-core/src/layout/boundaryCss.ts
+/**
+* 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}']`;
+	const metrics = boundaryRuntimeMetricsForDecorativeTransition(entry.intent);
+	return [rule$1(selected, [`--boundary-height: ${metrics.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
 /**
@@ -48591,7 +49185,7 @@ function generateLayoutCss(options) {
 	if (bodyTextTypographyCss) {
 		cssChunks.push(bodyTextTypographyCss);
 	}
-	cssChunks.push(generateSiteStyleTransitionCss(themeId));
+	cssChunks.push(generateBoundaryCss(selector));
 	return cssChunks.join("\n\n");
 }
 function toPaddingValue(preset) {
@@ -48603,197 +49197,6 @@ function toPaddingValue(preset) {
 	};
 	return map[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");
-	const spaciousBoundaryHeight = requiredBoundaryHeightCss("soft-fade-long");
-	const expansiveBoundaryHeight = requiredBoundaryHeightCss("soft-fade-expansive");
-	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: ${spaciousBoundaryHeight};
-}
-
-${selector} [data-block-boundary][data-style-group^='site-style-transition-soft-fade-expansive-'] {
-  --site-style-boundary-height: ${expansiveBoundaryHeight};
-}
-
-${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 "";
@@ -48820,36 +49223,29 @@ function generateHeroTypographyCss(themeId, theme) {
 	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$1, 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$1} {\n  ${mediaChunks.join("\n\n  ")}\n}` : null;
+}
 function buildTypographyRules(role, size, lineHeight) {
 	const rules = [];
 	if (size) {
@@ -50066,7 +50462,7 @@ function escapeStyleContent(css) {
 function compileCustomCssRules(rules, themeId) {
 	if (!rules || rules.length === 0) return "";
 	const scopePrefix = `:where([data-theme-scope="${themeId}"])`;
-	return rules.map((rule$1) => compileRule(rule$1.selector, rule$1.declarations, scopePrefix)).filter(Boolean).join("\n\n");
+	return rules.map((rule$2) => compileRule(rule$2.selector, rule$2.declarations, scopePrefix)).filter(Boolean).join("\n\n");
 }
 /**
 * Compile an array of block-specific CSS rules to a scoped CSS string.
@@ -50079,15 +50475,15 @@ function compileCustomCssRules(rules, themeId) {
 function compileBlockCustomCssRules(rules, themeId) {
 	if (!rules || rules.length === 0) return "";
 	const rulesByBlock = new Map();
-	for (const rule$1 of rules) {
-		const existing = rulesByBlock.get(rule$1.blockKind) || [];
-		existing.push(rule$1);
-		rulesByBlock.set(rule$1.blockKind, existing);
+	for (const rule$2 of rules) {
+		const existing = rulesByBlock.get(rule$2.blockKind) || [];
+		existing.push(rule$2);
+		rulesByBlock.set(rule$2.blockKind, existing);
 	}
 	const cssChunks = [];
 	for (const [blockKind, blockRules] of rulesByBlock) {
 		const scopePrefix = `:where([data-theme-scope="${themeId}"]) :where([data-block="${blockKind}"])`;
-		const blockCss = blockRules.map((rule$1) => compileRule(rule$1.selector, rule$1.declarations, scopePrefix)).filter(Boolean).join("\n");
+		const blockCss = blockRules.map((rule$2) => compileRule(rule$2.selector, rule$2.declarations, scopePrefix)).filter(Boolean).join("\n");
 		if (blockCss) {
 			cssChunks.push(`/* Block: ${blockKind} */\n${blockCss}`);
 		}
@@ -50339,7 +50735,7 @@ function compileFontFace(atRule) {
 * }
 */
 function compileMedia(atRule, scopePrefix, options) {
-	const rules = atRule.rules.map((rule$1) => compileNestedRule(rule$1.selector, rule$1.declarations, scopePrefix)).filter(Boolean).join("\n");
+	const rules = atRule.rules.map((rule$2) => compileNestedRule(rule$2.selector, rule$2.declarations, scopePrefix)).filter(Boolean).join("\n");
 	if (!rules) return "";
 	const containerQuery = options.responsiveMode === "container" ? convertMediaQueryToContainerQuery(atRule.query) : null;
 	if (containerQuery) {
@@ -50357,7 +50753,7 @@ function compileMedia(atRule, scopePrefix, options) {
 * }
 */
 function compileSupports(atRule, scopePrefix) {
-	const rules = atRule.rules.map((rule$1) => compileNestedRule(rule$1.selector, rule$1.declarations, scopePrefix)).filter(Boolean).join("\n");
+	const rules = atRule.rules.map((rule$2) => compileNestedRule(rule$2.selector, rule$2.declarations, scopePrefix)).filter(Boolean).join("\n");
 	if (!rules) return "";
 	return `@supports ${atRule.condition} {\n${indent(rules, 2)}\n}`;
 }
@@ -50394,15 +50790,6 @@ function indent(str, spaces) {
 //#endregion
 //#region ../theme-core/src/customCss/patch.ts
 /**
-* Generate a unique ID for a new CSS rule.
-* Uses timestamp + random suffix for uniqueness.
-*/
-function generateCssRuleId() {
-	const timestamp = Date.now().toString(36);
-	const random = Math.random().toString(36).slice(2, 6);
-	return `css-${timestamp}-${random}`;
-}
-/**
 * Apply a single patch operation to a rules array.
 *
 * @param rules - Current rules array
@@ -50452,20 +50839,20 @@ function diffCssRules(before, after) {
 			});
 		}
 	}
-	for (const [id, rule$1] of afterMap) {
+	for (const [id, rule$2] of afterMap) {
 		const beforeRule = beforeMap.get(id);
 		if (!beforeRule) {
 			patches.push({
 				op: "add",
-				rule: rule$1
+				rule: rule$2
 			});
-		} else if (!rulesEqual(beforeRule, rule$1)) {
+		} else if (!rulesEqual(beforeRule, rule$2)) {
 			const changes = {};
-			if (beforeRule.selector !== rule$1.selector) {
-				changes.selector = rule$1.selector;
+			if (beforeRule.selector !== rule$2.selector) {
+				changes.selector = rule$2.selector;
 			}
-			if (!declarationsEqual(beforeRule.declarations, rule$1.declarations)) {
-				changes.declarations = rule$1.declarations;
+			if (!declarationsEqual(beforeRule.declarations, rule$2.declarations)) {
+				changes.declarations = rule$2.declarations;
 			}
 			if (Object.keys(changes).length > 0) {
 				patches.push({
@@ -51098,71 +51485,173 @@ function requireThemeResources(resources, blockKind) {
 }
 
 //#endregion
-//#region ../blocks/src/pageRendererBoundaries.tsx
-const boundaryKey = (previousBlockId, nextBlockId) => `${previousBlockId}\u0000${nextBlockId}`;
-function isSiteStyleTransitionStyleGroup(value) {
-	return value?.startsWith("site-style-transition-") === true;
+//#region ../blocks/src/pageRenderJoins.ts
+/**
+* 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$1 = run.length === 0 ? byPair.get(pairKey(previousSurvivor.id, block.id)) : joinAcrossRun(byPair, previousSurvivor.id, block.id, run);
+			if (join$1) retargeted.push(join$1);
+		}
+		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)) : undefined;
+	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : undefined;
+	const donor = entering ?? exiting;
+	return donor ? {
+		previousBlockId,
+		nextBlockId,
+		treatment: donor.treatment
+	} : undefined;
 }
-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$1 = byPair.get(pairKey(previous.id, next.id));
+		return [{
+			previousBlockId: previous.id,
+			nextBlockId: next.id,
+			join: join$1 ? composeJoin(join$1, previous, next) : null
+		}];
+	});
+}
+function composeJoin(join$1, previous, next) {
+	return {
+		boundaryId: pairKey(join$1.previousBlockId, join$1.nextBlockId),
+		previousBlockId: join$1.previousBlockId,
+		nextBlockId: join$1.nextBlockId,
+		treatment: join$1.treatment,
+		outcome: composeBoundary(sectionFactsForContent(previous.content), sectionFactsForContent(next.content))
+	};
+}
+/** Placement, reserves and paint for a join that draws; null otherwise. */
+function renderedJoinLayout(join$1) {
+	if (!join$1 || join$1.outcome.kind !== "shown") return null;
+	return boundaryLayout(join$1.treatment, join$1.outcome.composition);
+}
+/** Joins with a missing id on either side cannot sit between two blocks. */
+function joinsByPair(joins) {
+	return new Map(joins.flatMap((join$1) => join$1.previousBlockId && join$1.nextBlockId ? [[pairKey(join$1.previousBlockId, join$1.nextBlockId), join$1]] : []));
+}
+/** Slot lookup key for an adjacent pair, in the one boundary-id scheme. */
+function joinSlotKey(previousBlockId, nextBlockId) {
+	return pairKey(previousBlockId, nextBlockId);
+}
+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 renderBoundaryAfterBlock(input) {
-	const previousBlockId = input.block.id;
-	const nextBlockId = input.nextBlock?.id ?? null;
+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__ */ (0, import_jsx_runtime.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__ */ (0, import_jsx_runtime.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 === undefined)) return null;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_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 undefined;
+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(content._transitionStyles) ? content._transitionStyles : null;
-	const cssVars = isObjectRecord(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 undefined;
-	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 : undefined
 	};
 }
+/** 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";
@@ -51173,7 +51662,7 @@ function pageBlockPosition(index, blockCount) {
 //#endregion
 //#region ../blocks/src/pageRendererContracts.ts
 function buildPageRendererRootRuntime(dataContext) {
-	const { siteId = null, pageId = null, pathname = null, bookingTimeZone, previewStage = "published", apiBaseUrl = null, portalToken = null, bookingOfferingPresets = [], appointmentServicePathPrefix = null, mailingList = { tag: "not_configured" }, eventRegistrationOverlayEnabled = false, loaderFailures = {} } = dataContext ?? {};
+	const { siteId = null, pageId = null, pathname = null, bookingTimeZone, previewStage = "published", apiBaseUrl = null, portalToken = null, readAuthority, bookingOfferingPresets = [], appointmentServicePathPrefix = null, mailingList = { tag: "not_configured" }, eventRegistrationOverlayEnabled = false, loaderFailures = {} } = dataContext ?? {};
 	return {
 		siteId,
 		pageId,
@@ -51182,6 +51671,7 @@ function buildPageRendererRootRuntime(dataContext) {
 		previewStage,
 		apiBaseUrl,
 		portalToken,
+		readAuthority,
 		bookingOfferingPresets,
 		appointmentServicePathPrefix,
 		mailingList,
@@ -54322,6 +54812,7 @@ const transformDefinitions = {
 	"layout.headerRuntimeContract": headerRuntimeContractTransform,
 	"layout.headerLogoClass": headerLogoClassTransform,
 	"layout.headerLogoMediaClass": headerLogoMediaClassTransform,
+	"layout.chromeLogo": chromeLogoTransform,
 	"layout.headerLogoTextVisible": headerLogoTextVisibleTransform,
 	"layout.footerRootClass": footerRootClassTransform,
 	"layout.headerRootStyle": headerRootStyleTransform,
@@ -54401,46 +54892,42 @@ const whenTransformed = (from, transformId, equals = true) => (node) => ({
 		equals
 	}
 });
-const logoRow = link$1({
+/** Draw whichever site logo suits the surface this row sits on. */
+const bindChromeLogo = (surface) => bind("content", { transforms: [{
+	id: "layout.chromeLogo",
+	options: { surface }
+}] });
+/**
+* The brand link. The logo is chosen per surface because the open mobile menu
+* paints its own background, which may be the opposite tone to the header.
+*/
+const createLogoRow = (surface) => link$1({
 	href: "/",
 	className: bindProp("$root.theme.header.logo", {
 		transforms: pipe(tx("layout.headerLogoClass")),
 		fallback: "header-logo rb-flex rb-min-w-0 rb-items-center rb-gap-3 rb-no-underline rb-transition-opacity rb-hover-opacity-80"
 	})
-}, [
-	media({ className: bindProp("$root.theme.header.logo", {
-		transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300" })),
-		fallback: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300"
-	}) }, when("content.logo"), bind("content.logo")),
-	stack({ className: "rb-contents" }, [media({ className: bindProp("$root.theme.header.logo", {
-		transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300" })),
-		fallback: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300"
-	}) }, when("site.logo"), bind("site.logo"))], when("content.logo", { not: true })),
-	text({
-		as: "strong",
-		className: "header-logo-text rb-truncate"
-	}, whenTransformed("$root.theme.header.logo", "layout.headerLogoTextVisible"), bind("site.title", { fallback: "Your Site" }))
-]);
+}, [media({ className: bindProp("$root.theme.header.logo", {
+	transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300" })),
+	fallback: "rb-header-logo-sm rb-w-auto rb-transition-all rb-duration-300"
+}) }, when("content.logo"), bindChromeLogo(surface)), text({
+	as: "strong",
+	className: "header-logo-text rb-truncate"
+}, whenTransformed("$root.theme.header.logo", "layout.headerLogoTextVisible"), bind("site.title", { fallback: "Your Site" }))]);
+const logoRow = createLogoRow("header-root");
 const centeredLogoRow = link$1({
 	href: "/",
 	className: bindProp("$root.theme.header.logo", {
 		transforms: pipe(tx("layout.headerLogoClass", { base: "header-logo rb-flex rb-items-center rb-justify-center rb-gap-3 rb-text-center rb-no-underline rb-transition-opacity rb-hover-opacity-80" })),
 		fallback: "header-logo rb-flex rb-items-center rb-justify-center rb-gap-3 rb-text-center rb-no-underline rb-transition-opacity rb-hover-opacity-80"
 	})
-}, [
-	media({ className: bindProp("$root.theme.header.logo", {
-		transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300" })),
-		fallback: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300"
-	}) }, when("content.logo"), bind("content.logo")),
-	stack({ className: "rb-contents" }, [media({ className: bindProp("$root.theme.header.logo", {
-		transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300" })),
-		fallback: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300"
-	}) }, when("site.logo"), bind("site.logo"))], when("content.logo", { not: true })),
-	text({
-		as: "strong",
-		className: "header-logo-text"
-	}, whenTransformed("$root.theme.header.logo", "layout.headerLogoTextVisible"), bind("site.title", { fallback: "Your Site" }))
-]);
+}, [media({ className: bindProp("$root.theme.header.logo", {
+	transforms: pipe(tx("layout.headerLogoMediaClass", { base: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300" })),
+	fallback: "rb-header-logo-lg rb-w-auto rb-transition-all rb-duration-300"
+}) }, when("content.logo"), bindChromeLogo("header-root")), text({
+	as: "strong",
+	className: "header-logo-text"
+}, whenTransformed("$root.theme.header.logo", "layout.headerLogoTextVisible"), bind("site.title", { fallback: "Your Site" }))]);
 const createNavRow = (className, align = "end") => navRow({
 	className: `${className} header-nav-row`,
 	align,
@@ -54480,10 +54967,8 @@ const mobileToggleIcon = stack({
 	}
 ]);
 const mobileToggleButton = {
-	type: "button",
+	type: "headerControl",
 	props: {
-		type: "button",
-		variantId: "",
 		className: `nav-mobile-toggle ${mobileOnlyDisplay("inline-flex")} rb-h-10 rb-w-10 rb-items-center rb-justify-center rb-rounded-md transition-theme-standard`,
 		"aria-label": "Open menu",
 		"aria-expanded": "false",
@@ -54493,10 +54978,8 @@ const mobileToggleButton = {
 	children: [mobileToggleIcon]
 };
 const mobileOverlayToggleButton = {
-	type: "button",
+	type: "headerControl",
 	props: {
-		type: "button",
-		variantId: "",
 		className: "nav-mobile-toggle rb-inline-flex rb-h-10 rb-w-10 rb-items-center rb-justify-center rb-rounded-md transition-theme-standard",
 		"aria-label": "Open menu",
 		"aria-expanded": "false",
@@ -54520,7 +55003,7 @@ const mobileOverlayHeader = inline({
 	align: "center",
 	justify: "between",
 	style: borderColorStyle("border")
-}, [logoRow, mobileOverlayToggleButton]);
+}, [createLogoRow("header-mobile-panel"), mobileOverlayToggleButton]);
 const mobileOverlayBody = stack({
 	className: "rb-flex-1 rb-px-6 rb-py-6",
 	gap: "md",
@@ -54712,7 +55195,10 @@ const brandLogo = link$1({
 		options: { base: "rb-h-10 rb-w-auto" }
 	}],
 	fallback: "rb-h-10 rb-w-auto"
-} } }, when("module.showLogo", { equals: true }), when("content.logo"), bind("content.logo")), text({
+} } }, when("module.showLogo", { equals: true }), when("content.logo"), bind("content", { transforms: [{
+	id: "layout.chromeLogo",
+	options: { surface: "footer-root" }
+}] })), text({
 	as: "strong",
 	className: "footer-logo-text rb-nav-text"
 }, when("module.showTitle", { equals: true }), bind("site.title", { fallback: "Your Site" }))], when("module.kind", { equals: "brand" }));
@@ -56511,6 +56997,15 @@ const appointmentServicesManifest = createBlockManifest({
 			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",
@@ -56545,6 +57040,7 @@ const appointmentServicesManifest = createBlockManifest({
 			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" } }
@@ -62158,11 +62654,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))
 		})
 	};
 }
@@ -62271,88 +62766,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(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 === undefined) return undefined;
-	if (boundaries.length === 0) return boundaries;
-	const anyOmitted = originalBlocks.some((block) => !survivingBlocks.has(block));
-	if (!anyOmitted) 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;
+	return isObjectRecord(source) ? stripStaleTransitionStyleGroup(source) : {};
 }
-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)) : undefined;
-	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : undefined;
-	const donor = entering ?? exiting;
-	if (!donor) return undefined;
-	const transition = compileTransitionRuntime({
-		treatment: donor.treatment,
-		from: donor.from,
-		to: exiting?.to ?? donor.to
-	});
-	const rekeyed = {
-		...donor,
-		boundaryId: makeBoundaryId(asDesignBlockId(previousBlockId), asDesignBlockId(nextBlockId)),
-		previousBlockId,
-		nextBlockId,
-		from: transition.from,
-		to: transition.to,
-		cssVars: transition.cssVars
-	};
-	return retargetCompiledBoundaryRuntimeForContentAdjacency(rekeyed, {
-		currentContent: getRenderableContent(previousBlock, previewStage),
-		nextContent: getRenderableContent(nextBlock, previewStage)
-	});
-}
-const pairKey = boundaryKey;
 
 //#endregion
 //#region ../blocks/src/system/manifest/hydrateLinks.ts
@@ -62550,25 +62972,47 @@ 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) {
+	const joins = retargetJoinsAcrossOmissions({
+		joins: plan.runtimeJoins,
+		originalBlocks: plan.entries.map((planned) => planned.block),
+		survivingBlocks: new Set(survivors.map((survivor) => survivor.entry.block))
+	});
+	return composePageJoins({
+		joins,
+		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 : undefined, entry.block.kind);
+}
 function prepareEntry(entry, input) {
 	if (entry.kind !== "renderable") return { kind: "plan-decided" };
 	const draftContent = previewableEditorContent(entry);
@@ -62641,6 +63085,7 @@ function blockSessionProps(dataContext) {
 		supabaseUrl: dataContext?.supabaseUrl,
 		portalToken: dataContext?.portalToken ?? null,
 		previewToken: dataContext?.previewToken ?? null,
+		readAuthority: dataContext?.readAuthority,
 		stage: dataContext?.previewStage
 	};
 }
@@ -62781,7 +63226,7 @@ function EditorPageRenderer(props$1) {
 	});
 }
 function PageRendererCore(props$1) {
-	const { page, audience, runtimeBoundaries, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props$1;
+	const { page, audience, runtimeJoins, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props$1;
 	const imageResolveContext = import_react.useMemo(() => resolvePageRendererImageResolveContext(dataContext), [
 		dataContext?.imageResolveContext,
 		dataContext?.mediaAssets,
@@ -62797,7 +63242,7 @@ function PageRendererCore(props$1) {
 			blocks: []
 		},
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -62805,7 +63250,7 @@ function PageRendererCore(props$1) {
 	}), [
 		page,
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -62822,19 +63267,16 @@ function PageRendererCore(props$1) {
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	}), [
 		plan,
 		audience,
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	]);
-	const boundaryByAdjacentBlockIds = import_react.useMemo(() => boundaryMapForAdjacentBlockIds(preparation.runtimeBoundaries ?? []), [preparation.runtimeBoundaries]);
-	const usesRuntimeBoundaries = preparation.runtimeBoundaries !== undefined;
+	const joinSlots = import_react.useMemo(() => joinSlotsByPair(preparation.joins), [preparation.joins]);
 	reportAndReplayOmissions({
 		plan,
 		preparation,
@@ -62854,10 +63296,9 @@ function PageRendererCore(props$1) {
 		themeResources,
 		imageResolveContext,
 		resolvedRegistry,
-		boundaryByAdjacentBlockIds,
-		usesRuntimeBoundaries,
+		joinSlots,
 		wrapBlock: props$1.wrapBlock,
-		wrapBoundary: props$1.wrapBoundary
+		renderJoin: props$1.renderJoin
 	})) });
 }
 /**
@@ -62952,27 +63393,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: props$1, themeResources, imageResolveContext, resolvedRegistry, boundaryByAdjacentBlockIds, usesRuntimeBoundaries, wrapBlock, wrapBoundary } = input;
+	const { index, entries, props: props$1, 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;
@@ -62995,12 +63434,10 @@ function renderPlanEntry(input) {
 	const styleGroup = typeof renderableContent.styleGroup === "string" ? renderableContent.styleGroup : undefined;
 	const blockLook = typeof renderableContent.blockLook === "string" ? renderableContent.blockLook : undefined;
 	const blockComposition = readBlockComposition(renderableContent.blockComposition);
-	const transitionStyle = transitionCssVarsStyle(renderableContent);
-	const boundaryReserveStyle = boundaryReserveCssVarsStyle({
-		before: boundaryBefore,
-		after: boundaryAfter
+	const reserves = blockBoundaryReserves({
+		before: joinBefore,
+		after: joinAfter
 	});
-	const blockStyle = mergeStyleObjects(transitionStyle, boundaryReserveStyle);
 	const blockElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 		className: wrapperClassName,
 		"data-block": cleanKind,
@@ -63012,25 +63449,16 @@ 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__ */ (0, import_jsx_runtime.jsx)(MemoBlockSection, { ...blockSectionProps })
 	}, blockKey);
 	if (boundaryElement) {
 		return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Fragment, { children: [blockElement, boundaryElement] }, blockKey);
 	}
-	if (usesRuntimeBoundaries || !isSiteStyleTransitionStyleGroup(styleGroup)) {
-		return blockElement;
-	}
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Fragment, { children: [blockElement, /* @__PURE__ */ (0, import_jsx_runtime.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;
@@ -65770,6 +66198,12 @@ function generateRecommendedThemes(input, opts) {
 
 //#endregion
 //#region ../theme-core/src/inputs/core.ts
+/**
+* Core Input CSS Generator
+*
+* Pure functions for generating form input CSS without requiring the full Theme type.
+* Used by both the full CMS theme system and the SDK theme bridge.
+*/
 const CORNER_RADIUS_MAP$1 = {
 	square: "0",
 	soft: "0.25rem",
@@ -65804,7 +66238,7 @@ function generateInputCoreCss(scopeId, settings) {
 	const borderRadius = CORNER_RADIUS_MAP$1[settings.corners];
 	const cssBlocks = [];
 	cssBlocks.push(`${root} .form-label {
-  color: rgb(var(--tb-${settings.labelToken}));
+  color: ${textColorValue(settings.labelToken)};
   font-weight: 600;
   font-size: 0.875rem;
   display: block;
@@ -68063,6 +68497,12 @@ const containerResponsiveThemeCss = `/*
   :where(.theme-scope) .rb-prose p {
     margin: var(--rt-space-y) 0;
   }
+  :where(.theme-scope) .rb-prose li > p:first-child {
+    margin-top: 0;
+  }
+  :where(.theme-scope) .rb-prose li > p:last-child {
+    margin-bottom: 0;
+  }
   :where(.theme-scope) .rb-prose img {
     display: block;
     max-width: 100%;
@@ -80986,6 +81426,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 }
 *
@@ -81000,7 +81451,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;
@@ -95790,6 +96241,7 @@ function emptyPulledContent(overrides) {
 			homepageId: null,
 			seoDefaults: null,
 			logoIdentifier: null,
+			logoDarkBackgroundIdentifier: null,
 			faviconIdentifier: null
 		},
 		forms: [],
@@ -101567,7 +102019,7 @@ async function loadConfig(configPath, output) {
 		return { errorMessage: "No config path provided." };
 	}
 	try {
-		const { loadConfigFile: loadConfigFile$1 } = await import("../load-config-Ca13nCpT.mjs");
+		const { loadConfigFile: loadConfigFile$1 } = await import("../load-config-BToL9PfS.mjs");
 		const rawConfig = await loadConfigFile$1(configPath);
 		const parsed = riverbankSiteConfigSchema.safeParse(rawConfig);
 		if (!parsed.success) {
@@ -112976,6 +113428,7 @@ const allowedPathPrefixes = [
 	"/sites/{siteId}/bookings/closures",
 	"/sites/{siteId}/bookings/resources",
 	"/sites/{siteId}/bookings/services",
+	"/sites/{siteId}/bookings/service-categories",
 	"/sites/{siteId}/bookings/appointment-setup",
 	"/sites/{siteId}/bookings/appointments",
 	"/sites/{siteId}/bookings/appointment-reservations",
@@ -113109,13 +113562,13 @@ function classifyDemoDashboardMutationDescriptor(descriptor) {
 			publicMessage: descriptor.demoMutation.publicMessage
 		};
 	}
-	for (const rule$1 of demoMutationClassificationRules) {
-		if (!matchesClassificationRule(descriptor, rule$1)) continue;
+	for (const rule$2 of demoMutationClassificationRules) {
+		if (!matchesClassificationRule(descriptor, rule$2)) continue;
 		return {
 			kind: "classified",
 			capability,
-			classification: rule$1.classification,
-			publicMessage: rule$1.publicMessage
+			classification: rule$2.classification,
+			publicMessage: rule$2.publicMessage
 		};
 	}
 	return {
@@ -113124,12 +113577,12 @@ function classifyDemoDashboardMutationDescriptor(descriptor) {
 		publicMessage: "This demo action needs a safety classification before it can run."
 	};
 }
-function matchesClassificationRule(descriptor, rule$1) {
-	switch (rule$1.kind) {
-		case "path_starts_with": return rule$1.prefixes.some((prefix) => descriptor.path.startsWith(prefix));
-		case "path_fragments": return pathContainsAnySegmentSequence(descriptor.path, rule$1.fragments);
-		case "path_prefixes": return rule$1.prefixes.some((prefix) => descriptor.path.startsWith(prefix));
-		default: return assertNever(rule$1);
+function matchesClassificationRule(descriptor, rule$2) {
+	switch (rule$2.kind) {
+		case "path_starts_with": return rule$2.prefixes.some((prefix) => descriptor.path.startsWith(prefix));
+		case "path_fragments": return pathContainsAnySegmentSequence(descriptor.path, rule$2.fragments);
+		case "path_prefixes": return rule$2.prefixes.some((prefix) => descriptor.path.startsWith(prefix));
+		default: return assertNever(rule$2);
 	}
 }
 function isDashboardSiteMutation(descriptor) {
@@ -113887,25 +114340,10 @@ function deriveLaunchDomainRequirement(siteId, domainState) {
 		} : evidenceFromDerivedState(state)
 	});
 }
-function deriveLaunchReadiness(input) {
-	const siteId = input.siteId ?? null;
-	const overrides = input.overrides ?? [];
-	const appointmentOverrideDefinition = LAUNCH_REQUIREMENT_OVERRIDE_DEFINITIONS.configure_appointments;
+function generatedSiteReviewRequirements(input) {
+	if (input.publicExperience === "hosted_booking") return [];
 	const isGeneratedSiteReviewed = input.reviewGeneratedSite.kind === "reviewed";
-	const requirements = [];
-	const confirmEmailState = input.email.kind === "confirmed" ? "complete" : "pending";
-	requirements.push(requirement({
-		id: "confirm_email",
-		packId: "core",
-		priority: "required",
-		state: confirmEmailState,
-		owner: "either",
-		title: "Confirm your email",
-		description: confirmEmailState === "complete" ? "Email confirmed. Your dashboard and launch path are unlocked." : "Confirm your email before the site can go live.",
-		action: informationalAction("Confirm your email"),
-		evidence: evidenceFromDerivedState(confirmEmailState)
-	}));
-	requirements.push(requirement({
+	return [requirement({
 		id: "review_generated_site",
 		packId: "core",
 		priority: "required",
@@ -113927,7 +114365,26 @@ function deriveLaunchReadiness(input) {
 			kind: "deferred",
 			reason: "pending_acknowledgement"
 		}
+	})];
+}
+function deriveLaunchReadiness(input) {
+	const siteId = input.siteId ?? null;
+	const overrides = input.overrides ?? [];
+	const appointmentOverrideDefinition = LAUNCH_REQUIREMENT_OVERRIDE_DEFINITIONS.configure_appointments;
+	const requirements = [];
+	const confirmEmailState = input.email.kind === "confirmed" ? "complete" : "pending";
+	requirements.push(requirement({
+		id: "confirm_email",
+		packId: "core",
+		priority: "required",
+		state: confirmEmailState,
+		owner: "either",
+		title: "Confirm your email",
+		description: confirmEmailState === "complete" ? "Email confirmed. Your dashboard and launch path are unlocked." : "Confirm your email before the site can go live.",
+		action: informationalAction("Confirm your email"),
+		evidence: evidenceFromDerivedState(confirmEmailState)
 	}));
+	requirements.push(...generatedSiteReviewRequirements(input));
 	if (input.appointments.kind !== "disabled") {
 		const appointmentsOverride = input.appointments.kind === "pending_setup" ? findLaunchOverride(overrides, appointmentOverrideDefinition.requirementId) : null;
 		requirements.push(requirement({
@@ -114386,7 +114843,8 @@ const appointmentSetupServiceDraftSchema = z.object({
 	venue: appointmentSetupVenueChoiceSchema,
 	timezone: z.string().trim().min(1).nullable(),
 	payment: appointmentSetupPaymentDraftSchema,
-	assignment: appointmentSetupServiceAssignmentDraftSchema
+	assignment: appointmentSetupServiceAssignmentDraftSchema,
+	categoryId: z.string().uuid().nullable().optional()
 }).superRefine((service, ctx) => {
 	if (service.payment.kind !== "free" && (service.priceAmount === null || service.priceAmount <= 0)) {
 		ctx.addIssue({
@@ -116027,6 +116485,13 @@ function applyBookingSettingsSectionUpdate(settings, update) {
 function applyBookingSettingsSectionUpdates(settings, updates) {
 	return updates.reduce(applyBookingSettingsSectionUpdate, settings);
 }
+/** Normalize optional wire defaults once before projecting operational Event policy. */
+function resolveBookingSettingsEventCatalogue(settings) {
+	return resolveEventCatalogue({
+		verticalConfig: settings.verticalConfig,
+		eventTypePresets: settings.eventTypePresets ?? DEFAULT_EVENT_TYPE_PRESETS
+	});
+}
 
 //#endregion
 //#region ../api/src/bookingPaymentTermSchemas.ts
@@ -116652,16 +117117,12 @@ async function deleteRedirectRule(apiClient, { siteId, ruleId, options }) {
 
 //#endregion
 //#region ../api/src/billing.ts
-async function changePlan(apiClient, { attemptId, planId, interval, prorationBehavior, options }) {
+async function changePlan(apiClient, request) {
+	const { options, ...body } = request;
 	try {
 		return unwrapResponse(await apiClient({
 			endpoint: "changePlan",
-			body: {
-				attemptId,
-				planId,
-				interval,
-				prorationBehavior
-			},
+			body,
 			options
 		}));
 	} catch (error$1) {
@@ -118422,9 +118883,9 @@ function isNegationForEnvRule(line) {
 function normalizePattern(pattern) {
 	return pattern.replace(/^\.\//u, "").replace(/\/$/u, "");
 }
-function appendGitignoreRule(content, rule$1) {
-	if (content.length === 0) return `${rule$1}\n`;
-	return `${content.endsWith("\n") ? content : `${content}\n`}${rule$1}\n`;
+function appendGitignoreRule(content, rule$2) {
+	if (content.length === 0) return `${rule$2}\n`;
+	return `${content.endsWith("\n") ? content : `${content}\n`}${rule$2}\n`;
 }
 /**
 * Plan the one exact environment rule needed by local onboarding. Existing