@riverbankcms/sdk 0.143.0 → 0.145.0

package/dist/{SdkPreviewModeRuntime-OIABYLES.mjs → SdkPreviewModeRuntime-DYbA_4iv.mjs}

@@ -1,7 +1,7 @@
 "use client";
-import { $i as mapCurrentValueForSelect, $n as coerceLinkedContentEntriesPayload, $r as runTransforms, An as containerResponsiveThemeCss, Ar as compileTransitionRuntime, At as RichTextField, Ba as Button, Bi as parseThemeForPersistence, Bn as compileManifestContentContract, Bt as getBlockManifestFromSdkConfig, Ca as Dialog, Ci as isRecord$13, Cn as deriveLaunchReadiness, Cr as retargetCompiledRuntimeFieldsForContentAdjacency, Ct as ButtonVariantField, Da as DialogHeader, Di as asDesignBlockId, Dn as useApiMediaUploader, Dt as ReferenceField, Ea as DialogFooter, Ei as pageDesignEditorBackgroundOverrideOwner, En as useMediaEditorOptional, Er as componentRuntimeRulesForTheme, Et as MediaField, Fn as SITE_CHROME_VISIBLE_HEADER_SELECTOR, Fr as gradientToCss, Ft as LinkWidgetProvider, G as confirmAutosaveBatch, Gi as paletteModeSchema, Gn as escapeStyleContent, Gr as backgroundAppearanceColorTokenNames, Gt as canRedoHistory, Ha as cn, Hn as buildThemeRuntime, Hr as sectionTransitionFamilies, Ht as useEditorUiStore, In as SITE_OVERLAY_HEADER_CLEARANCE_CSS_VAR, Ir as GRADIENT_PRESETS, J as idleEditorTransactionQueueState, Ji as getFieldIntent, Jn as defaultTransforms, Jr as ctaButton, Jt as pushHistoryEntry, K as deriveTransactionCapabilities, Ki as resolveSdkFooterMode, Kn as readBlockComposition, Kr as backgroundAppearanceQuickColorTokenNames, Kt as canUndoHistory, Li as textColorStyle, Ln as planSiteOverlayHeaderClearance, Lr as GRADIENT_PRESET_IDS, Lt as hideThemeV2RawStyleFields, Mn as makeDefaultBlockComponent, Mt as EditorProvider, Nn as getBlockDefinition, Nt as useEditor, Oa as DialogTitle, Oi as assertNever$1, On as isSupportedLoaderEndpoint, Or as designRuntimeRulesForTheme, Ot as ReferenceWidgetProvider, Pn as projectRecurringSchedule, Pt as LinkField, Q as resolvePreviewSidebarTab, Qi as hasEmptyOption, Qn as LINKED_CONTENT_ENTRY_META_KEY, Qr as parseBackgroundContent, Qt as recordsEqual, Ri as defaultThemeTokens, Rn as visibleHeaderClearancePx, Rr as getGradientPreset, Rt as prepareBlockEditorManifest, Sa as TabsTrigger, Si as isObjectRecord, Sn as DEFAULT_LAUNCH_READINESS_INPUT, Sr as retargetCompiledBoundaryRuntimeForContentAdjacency, St as EntryPickerWidgetProvider, Ta as DialogDescription, Ti as isThemeV2NormalEditorRawStyleFieldName, Tn as MediaEditorContextProvider, Tr as planPageDesignLayoutLookCompatibility, Tt as FileField, Ua as X, Un as DEFAULT_THEME_RESPONSIVE_MODE, Ur as sectionTransitionFamilyForBoundaryOptionId, Ut as useEditorUiStoreInstance, Vi as ORDINARY_TEXT_MIN_CONTRAST_RATIO, Vn as validateManifestDraft, Vr as defaultSectionTransitionVariantForFamily, W as beginAutosaveBatch, Wa as Upload, Wi as paletteColorsSchema, Wn as getResponsiveScopeSpec, Wr as sectionTransitionVariantForBoundaryOptionId, Wt as useOptionalEditorUiStoreInstance, Xi as SdkConfigProvider, Xn as resolvePageRouteTarget, Xt as undoHistory, Y as rejectAutosaveBatch, Yi as isHeaderField, Yn as resolveEntryRouteTarget, Yr as bindingSchema, Yt as redoHistory, Za as RotateCcw, Zi as useSdkConfig, Zn as resolveRouteTarget, Zr as planSiteChromePlacement, Zt as unsafeAsLinkedContentEntryId, _ as reportPreviewDesignError, _i as BlockApiProvider, _n as MediaEditor, _o as expectParsedBrandedId, _r as heroCopyFragment, _t as loadMailingListAuthoringContext, ai as coerceInlineTextWithFallback, an as parseReferenceKind, ao as Image, ar as cardFragment, at as useUISelector, ba as TabsContent, bi as eventCalendarListLayoutOptions, bo as __exportAll, br as applyCompiledRuntimeFieldsToContent, bt as IconPickerField, ca as SelectContent, ci as Text$1, cr as blogFeaturedPostFragment, d as PreviewDesignCoordinatorProvider, da as SelectValue, di as getCurrentResolveImageUrlContext, dr as formCopyFragment, dt as createSiteOptionWidgetAdapters, ea as mapOptionValueForSelect, ei as parseBlockIconValue, en as useDebouncedLatestSave, er as getLinkedContentEntryMeta, et as renderSiteChromeBlock, fi as resolveImageUrlWithContext, fn as createManifestFormAdapter, fr as testimonialsCarouselFragment, ft as SiteOptionPickerField, g as PREVIEW_DESIGN_SAVE_ERROR_MESSAGE, gi as siblingPath, gn as createStoreBackend, go as assertNever$2, gr as ctaRowFragment, gt as MailingListTargetingField, h as PREVIEW_DESIGN_LOAD_ERROR_MESSAGE, hi as getAtPath, hn as evaluateVisibility, ho as unsafeAsEditorBlockValues, hr as heroCtaRowFragment, ht as OfferingsPreviewWidgetProvider, i as usePreviewDesignHistoryOrder, ii as logger, ir as headingFragment, jn as createCustomBlockRegistry, jr as surfaceResolutionContextFromTheme, jt as RichTextWidgetProvider, ki as makeBoundaryId, kn as ThemeScope, kt as useRichTextImagePicker, la as SelectItem, li as RichText$1, ln as PaletteProvider, lo as ChevronRight, lr as singleButtonFragment, lt as useEntryEditorController, m as usePreviewThemeOverlay, mi as SECTION_BACKGROUND_MIN_SOURCE_WIDTH, mn as FormRenderer, mo as unsafeAsEditorBlockId, mr as ctaCopyFragment, mt as OfferingsPreviewGroupOrderField, n as useSiteChromeCustomizeOptional, na as FieldFrame, ni as parseGeneratedIconSetId, nn as createSnapshotFromPageRecord, nr as ImageResolveContextProvider, nt as PreviewInlineTextEditor, oi as inlineTextToPlainText, oo as GripVertical, or as faqAccordionFragment, ot as EditableBlockProvider, p as PreviewThemeOverlayProvider, pi as setContextResolveImageUrlContext, po as parseFooterModuleId, pr as testimonialsHeadingFragment, pt as SiteOptionWidgetProvider, q as enqueueTransaction, qi as attachRenderableMediaAssetFields, qn as getDefaultComponentRegistry, qr as parseBackgroundAppearanceColorToken, qt as createHistoryState, r as PreviewDesignHistoryOrderProvider, ra as useField, ri as renderInlineText, rn as BUILT_IN_REFERENCE_KINDS, rr as richTextFragment, rt as PreviewTextEditor, sa as Select, si as isInlineTextEmpty, sr as faqHeadingFragment, st as EntryControllerProvider, t as SiteChromeCustomizeProvider, ta as unmapValueFromSelect, ti as parseGeneratedIconAssetId, tn as createRoutingHelpers, tr as clientComponentRegistry, tt as PreviewRichTextEditor, ua as SelectTrigger, ui as buildResolveImageUrlContext, un as usePalette, uo as ChevronLeft, ur as formEmbedFragment, ut as createSiteOptionApiLoader, vi as calendarWindowQuerySchema, vn as applyPageDesignEditorAction, vo as parseMediaAssetId, vr as bodyCopyFragment, vt as MailingListTargetingProvider, wa as DialogContent, wi as corners, wn as AMBIENT_BACKGROUND_ROLES, wr as formatSiteChromeBackgroundTokenLabel, wt as ButtonWidgetProvider, xa as TabsList, xi as bookingConsentCarrierSchema, xn as decodePublicProductCategorySelectorQuery, xr as compileEditorModelRuntime, xt as EntryPickerField, ya as Tabs, yi as eventCalendarListLayoutCompatibleDisplayModeValues, yn as getPageDesignEditorState, yo as parseSiteId, yr as defineFragment, yt as InlineTextField, zn as resolveVariantKey, zr as parseGradientPresetId, zt as stripTopLevelRoutingUi } from "./SiteChromeCustomizeContext-ohjTvZbc.mjs";
-import { i as useOptionalPreviewLayout, t as PreviewQueryProvider } from "./PreviewQueryProvider-BCYICImX.mjs";
-import { _ as API_ENDPOINTS, a as usePreviewToken, c as createBearerAPIClient, d as unwrapResponse, g as resolveSurfaceDocumentAttributes, h as SURFACE_IDS, i as usePreviewAuthFetch, m as SURFACE_DOCUMENT_DATA_ATTRIBUTE, n as markPreviewAuthExpired, o as isPreviewRuntimeSessionEditable, r as usePreviewAuth, s as ApiRequestError, t as initPreviewAuth } from "./previewAuthStore-JA6-I_sL.mjs";
+import { $i as attachRenderableMediaAssetFields, $n as LINKED_CONTENT_ENTRY_META_KEY, $r as ctaButton, Aa as DialogContent, Ai as corners, An as containerResponsiveThemeCss, Ar as surfaceResolutionContextFromTheme, At as RichTextField, Bn as compileManifestContentContract, Br as autoDesignChoice, Bt as getBlockManifestFromSdkConfig, Ci as BlockApiProvider, Cn as deriveLaunchReadiness, Co as expectParsedBrandedId, Cr as formatSiteChromeBackgroundTokenLabel, Ct as ButtonVariantField, Da as TabsList, Di as bookingConsentCarrierSchema, Dn as useApiMediaUploader, Dt as ReferenceField, Ea as TabsContent, Ei as eventCalendarListLayoutOptions, En as useMediaEditorOptional, Eo as __exportAll, Er as componentRuntimeRulesForTheme, Et as MediaField, Fi as assertNever$1, Fn as SITE_CHROME_VISIBLE_HEADER_SELECTOR, Fr as GRADIENT_PRESETS, Ft as LinkWidgetProvider, G as confirmAutosaveBatch, Gi as defaultThemeTokens, Gn as escapeStyleContent, Gr as boundaryTreatmentForBoundaryOptionId, Gt as canRedoHistory, Hn as buildThemeRuntime, Hr as boundaryLayout, Ht as useEditorUiStore, Ii as makeBoundaryId, In as SITE_OVERLAY_HEADER_CLEARANCE_CSS_VAR, Ir as GRADIENT_PRESET_IDS, J as idleEditorTransactionQueueState, Ja as cn, Jn as getDefaultComponentRegistry, Jr as sectionTransitionFamilyForBoundaryOptionId, Jt as pushHistoryEntry, K as deriveTransactionCapabilities, Ka as Button, Ki as parseThemeForPersistence, Kn as mergeContentWithBlockStyleOverrides, Kr as defaultSectionTransitionVariantForFamily, Kt as canUndoHistory, Ln as planSiteOverlayHeaderClearance, Lr as getGradientPreset, Lt as hideThemeV2RawStyleFields, Ma as DialogFooter, Mi as pageDesignEditorBackgroundOverrideOwner, Mn as makeDefaultBlockComponent, Mt as EditorProvider, Na as DialogHeader, Ni as stripStaleTransitionStyleGroup, Nn as getBlockDefinition, Nt as useEditor, Oa as TabsTrigger, Oi as isObjectRecord, On as isSupportedLoaderEndpoint, Or as designRuntimeRulesForTheme, Ot as ReferenceWidgetProvider, Pa as DialogTitle, Pi as asDesignBlockId, Pn as projectRecurringSchedule, Pr as gradientToCss, Pt as LinkField, Q as resolvePreviewSidebarTab, Qi as resolveSdkFooterMode, Qn as resolveRouteTarget, Qr as parseBackgroundAppearanceColorToken, Qt as recordsEqual, Rn as visibleHeaderClearancePx, Rr as parseGradientPresetId, Rt as prepareBlockEditorManifest, Si as siblingPath, Sn as DEFAULT_LAUNCH_READINESS_INPUT, So as assertNever$2, Sr as compileEditorModelRuntime, St as EntryPickerWidgetProvider, Ta as Tabs, Ti as eventCalendarListLayoutCompatibleDisplayModeValues, Tn as MediaEditorContextProvider, To as parseSiteId, Tr as resolvePageDesignEditorBoundaryForChoice, Tt as FileField, Un as DEFAULT_THEME_RESPONSIVE_MODE, Ur as composeBoundary, Ut as useEditorUiStoreInstance, Vn as validateManifestDraft, Vr as userPinnedDesignChoice, W as beginAutosaveBatch, Wi as textColorStyle, Wn as getResponsiveScopeSpec, Wr as sectionFactsForContent, Wt as useOptionalEditorUiStoreInstance, Xa as Upload, Xi as paletteColorsSchema, Xn as resolveEntryRouteTarget, Xr as backgroundAppearanceColorTokenNames, Xt as undoHistory, Y as rejectAutosaveBatch, Ya as X, Yn as defaultTransforms, Yr as sectionTransitionVariantForBoundaryOptionId, Yt as redoHistory, Zi as paletteModeSchema, Zn as resolvePageRouteTarget, Zr as backgroundAppearanceQuickColorTokenNames, Zt as unsafeAsLinkedContentEntryId, _ as reportPreviewDesignError, _a as SelectValue, _i as getCurrentResolveImageUrlContext, _n as MediaEditor, _r as ctaRowFragment, _t as loadMailingListAuthoringContext, aa as mapCurrentValueForSelect, ai as parseBlockIconValue, an as parseReferenceKind, ar as headingFragment, at as useUISelector, bi as SECTION_BACKGROUND_MIN_SOURCE_WIDTH, bo as unsafeAsEditorBlockId, br as defineFragment, bt as IconPickerField, ca as FieldFrame, cr as faqHeadingFragment, d as PreviewDesignCoordinatorProvider, di as coerceInlineTextWithFallback, do as Image, dr as formEmbedFragment, dt as createSiteOptionWidgetAdapters, ea as getFieldIntent, ei as bindingSchema, en as useDebouncedLatestSave, er as coerceLinkedContentEntriesPayload, et as renderSiteChromeBlock, fi as inlineTextToPlainText, fn as createManifestFormAdapter, fo as GripVertical, fr as formCopyFragment, ft as SiteOptionPickerField, g as PREVIEW_DESIGN_SAVE_ERROR_MESSAGE, ga as SelectTrigger, gi as buildResolveImageUrlContext, gn as createStoreBackend, go as ChevronLeft, gr as heroCtaRowFragment, gt as MailingListTargetingField, h as PREVIEW_DESIGN_LOAD_ERROR_MESSAGE, ha as SelectItem, hi as RichText$1, hn as evaluateVisibility, ho as ChevronRight, hr as ctaCopyFragment, ht as OfferingsPreviewWidgetProvider, i as usePreviewDesignHistoryOrder, ia as hasEmptyOption, ii as runTransforms, ir as richTextFragment, ja as DialogDescription, ji as isThemeV2NormalEditorRawStyleFieldName, jn as createCustomBlockRegistry, jt as RichTextWidgetProvider, ka as Dialog, ki as isRecord$11, kn as ThemeScope, kt as useRichTextImagePicker, la as useField, li as renderInlineText, ln as PaletteProvider, lr as blogFeaturedPostFragment, lt as useEntryEditorController, m as usePreviewThemeOverlay, ma as SelectContent, mi as Text$1, mn as FormRenderer, mr as testimonialsHeadingFragment, mt as OfferingsPreviewGroupOrderField, n as useSiteChromeCustomizeOptional, na as SdkConfigProvider, ni as planSiteChromePlacement, nn as createSnapshotFromPageRecord, nr as clientComponentRegistry, nt as PreviewInlineTextEditor, oa as mapOptionValueForSelect, oi as parseGeneratedIconAssetId, or as cardFragment, ot as EditableBlockProvider, p as PreviewThemeOverlayProvider, pa as Select, pi as isInlineTextEmpty, pr as testimonialsCarouselFragment, pt as SiteOptionWidgetProvider, q as enqueueTransaction, qi as ORDINARY_TEXT_MIN_CONTRAST_RATIO, qn as readBlockComposition, qr as sectionTransitionFamilies, qt as createHistoryState, r as PreviewDesignHistoryOrderProvider, ra as useSdkConfig, ri as parseBackgroundContent, rn as BUILT_IN_REFERENCE_KINDS, ro as RotateCcw, rr as ImageResolveContextProvider, rt as PreviewTextEditor, sa as unmapValueFromSelect, si as parseGeneratedIconSetId, sr as faqAccordionFragment, st as EntryControllerProvider, t as SiteChromeCustomizeProvider, ta as isHeaderField, tn as createRoutingHelpers, tr as getLinkedContentEntryMeta, tt as PreviewRichTextEditor, ui as logger, un as usePalette, ur as singleButtonFragment, ut as createSiteOptionApiLoader, vi as resolveImageUrlWithContext, vn as applyPageDesignEditorAction, vr as heroCopyFragment, vt as MailingListTargetingProvider, wi as calendarWindowQuerySchema, wn as AMBIENT_BACKGROUND_ROLES, wo as parseMediaAssetId, wr as planPageDesignLayoutLookCompatibility, wt as ButtonWidgetProvider, xi as getAtPath, xn as decodePublicProductCategorySelectorQuery, xo as unsafeAsEditorBlockValues, xr as applyCompiledRuntimeFieldsToContent, xt as EntryPickerField, yi as setContextResolveImageUrlContext, yn as getPageDesignEditorState, yo as parseFooterModuleId, yr as bodyCopyFragment, yt as InlineTextField, zn as resolveVariantKey, zt as stripTopLevelRoutingUi } from "./SiteChromeCustomizeContext-CNTKQ9nx.mjs";
+import { i as useOptionalPreviewLayout, t as PreviewQueryProvider } from "./PreviewQueryProvider-BxGwdOCV.mjs";
+import { _ as API_ENDPOINTS, a as usePreviewToken, c as createBearerAPIClient, d as unwrapResponse, g as resolveSurfaceDocumentAttributes, h as SURFACE_IDS, i as usePreviewAuthFetch, m as SURFACE_DOCUMENT_DATA_ATTRIBUTE, n as markPreviewAuthExpired, o as isPreviewRuntimeSessionEditable, r as usePreviewAuth, s as ApiRequestError, t as initPreviewAuth } from "./previewAuthStore-BxAFlu-j.mjs";
 import * as React$1 from "react";
 import React, { Children, Fragment, cloneElement, createContext, isValidElement, useCallback, useContext, useEffect, useId, useLayoutEffect, useMemo, useReducer, useRef, useState } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
@@ -175,7 +175,7 @@ function ResizableSplitPane({ left, right, defaultSplit = 40, minLeftWidth = 300
 }
 //#endregion
 //#region ../blocks/src/system/icons/generatedAssets.ts
-function isRecord$12(value) {
+function isRecord$10(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function generatedIconAssetRefKey(ref) {
@@ -185,11 +185,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$12(block.draftContent) ? block.draftContent : isRecord$12(block.content) ? block.content : null;
+		const content = isRecord$10(block.draftContent) ? block.draftContent : isRecord$10(block.content) ? block.content : null;
 		const cards = Array.isArray(content?.cards) ? content.cards : [];
 		const refs = /* @__PURE__ */ new Map();
 		for (const card of cards) {
-			if (!isRecord$12(card)) continue;
+			if (!isRecord$10(card)) continue;
 			const icon = parseBlockIconValue(card.icon);
 			if (icon.kind !== "generated") continue;
 			const ref = {
@@ -386,70 +386,171 @@ function requireThemeResources(resources, blockKind) {
 	return resources;
 }
 //#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 = run.length === 0 ? byPair.get(pairKey(previousSurvivor.id, block.id)) : joinAcrossRun(byPair, previousSurvivor.id, block.id, run);
+			if (join) retargeted.push(join);
+		}
+		previousSurvivor = block;
+		run = [];
+	}
+	return retargeted;
 }
-function boundaryMapForAdjacentBlockIds(boundaries) {
-	return new Map(boundaries.map((boundary) => [boundaryKey(boundary.previousBlockId, boundary.nextBlockId), boundary]));
+function joinAcrossRun(byPair, previousBlockId, nextBlockId, run) {
+	const firstOmittedId = run[0]?.id;
+	const lastOmittedId = run[run.length - 1]?.id;
+	const entering = firstOmittedId ? byPair.get(pairKey(previousBlockId, firstOmittedId)) : void 0;
+	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : void 0;
+	const donor = entering ?? exiting;
+	return donor ? {
+		previousBlockId,
+		nextBlockId,
+		treatment: donor.treatment
+	} : void 0;
 }
-function boundaryBetweenBlocks(previousBlock, nextBlock, boundaries) {
-	const previousBlockId = previousBlock?.id ?? null;
-	const nextBlockId = nextBlock?.id ?? null;
-	if (!previousBlockId || !nextBlockId) return null;
-	return boundaries.get(boundaryKey(previousBlockId, nextBlockId)) ?? null;
+/**
+* The single composition site. For every adjacent pair of survivors with ids,
+* finds its join and composes it from both survivors' final content: what
+* each paints with and the frame each draws.
+*/
+function composePageJoins(input) {
+	const byPair = joinsByPair(input.joins);
+	return input.survivors.flatMap((previous, index) => {
+		const next = input.survivors[index + 1];
+		if (!next || !previous.id || !next.id) return [];
+		const join = byPair.get(pairKey(previous.id, next.id));
+		return [{
+			previousBlockId: previous.id,
+			nextBlockId: next.id,
+			join: join ? composeJoin(join, previous, next) : null
+		}];
+	});
+}
+function composeJoin(join, previous, next) {
+	return {
+		boundaryId: pairKey(join.previousBlockId, join.nextBlockId),
+		previousBlockId: join.previousBlockId,
+		nextBlockId: join.nextBlockId,
+		treatment: join.treatment,
+		outcome: composeBoundary(sectionFactsForContent(previous.content), sectionFactsForContent(next.content))
+	};
+}
+/** Placement, reserves and paint for a join that draws; null otherwise. */
+function renderedJoinLayout(join) {
+	if (!join || join.outcome.kind !== "shown") return null;
+	return boundaryLayout(join.treatment, join.outcome.composition);
+}
+/** Joins with a missing id on either side cannot sit between two blocks. */
+function joinsByPair(joins) {
+	return new Map(joins.flatMap((join) => join.previousBlockId && join.nextBlockId ? [[pairKey(join.previousBlockId, join.nextBlockId), join]] : []));
+}
+/** Slot lookup key for an adjacent pair, in the one boundary-id scheme. */
+function joinSlotKey(previousBlockId, nextBlockId) {
+	return pairKey(previousBlockId, nextBlockId);
+}
+function 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__ */ jsx("div", {
+	return slots.get(joinSlotKey(previousBlockId, nextBlockId)) ?? null;
+}
+/**
+* The markup at one join: the painted boundary element when the join draws,
+* then whatever `renderJoin` adds. Null when there is nothing to render.
+*/
+function renderJoinSlot(input) {
+	const { slot } = input;
+	if (!slot) return null;
+	const layout = renderedJoinLayout(slot.join);
+	const painted = slot.join && layout ? /* @__PURE__ */ jsx("div", {
 		"aria-hidden": "true",
 		"data-block-boundary": "",
-		"data-boundary-id": boundary.boundaryId,
-		"data-boundary-previous-block-id": boundary.previousBlockId,
-		"data-boundary-next-block-id": boundary.nextBlockId,
-		"data-style-group": boundary.styleGroup,
-		style: boundaryCssVarsStyle(boundary)
-	}, `${input.blockKey}:boundary`);
-	return input.wrapBoundary ? input.wrapBoundary(boundary, rendered) : rendered;
-}
-function boundaryCssVarsStyle(boundary) {
-	return {
-		"--site-style-transition-from": boundary.cssVars.from,
-		"--site-style-transition-to": boundary.cssVars.to
-	};
+		"data-boundary-id": slot.join.boundaryId,
+		"data-boundary-previous-block-id": slot.previousBlockId,
+		"data-boundary-next-block-id": slot.nextBlockId,
+		"data-boundary-treatment": slot.join.treatment,
+		"data-boundary-placement": layout.placement,
+		style: boundaryPaintStyle(layout.paint)
+	}, `${input.blockKey}:boundary`) : null;
+	const extra = input.renderJoin?.({
+		previousBlockId: slot.previousBlockId,
+		nextBlockId: slot.nextBlockId,
+		join: slot.join
+	});
+	if (!painted && (extra === null || extra === void 0)) return null;
+	return /* @__PURE__ */ jsxs(React.Fragment, { children: [painted, extra] }, `${input.blockKey}:join`);
 }
-function boundaryReserveCssVarsStyle(input) {
-	const before = input.before?.metrics.reserveCss ?? null;
-	const after = input.after?.metrics.reserveCss ?? null;
-	if (!before && !after) return void 0;
-	return {
-		...before ? { "--site-style-boundary-before-reserve": before } : {},
-		...after ? { "--site-style-boundary-after-reserve": after } : {}
-	};
+/**
+* The one render-edge place a theme token becomes CSS.
+*/
+function themeTokenCss(token) {
+	return `rgb(var(--tb-${token}))`;
 }
-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 void 0;
+function boundaryPaintStyle(paint) {
 	return {
-		...from ? { "--site-style-transition-from": from } : {},
-		...to ? { "--site-style-transition-to": to } : {}
+		"--boundary-shape-paint": themeTokenCss(paint.shape),
+		...paint.band ? { "--boundary-band-paint": themeTokenCss(paint.band) } : {}
 	};
 }
-function mergeStyleObjects(left, right) {
-	if (!left) return right;
-	if (!right) return left;
-	return {
-		...left,
-		...right
+/**
+* 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 } : {}
 	};
+	return {
+		topPlacement: top?.placement,
+		bottomPlacement: bottom?.placement,
+		style: top || bottom ? style : void 0
+	};
+}
+/** The reserve one join needs on one side of itself, if it draws at all. */
+function reserveOnSide(slot, side) {
+	const layout = renderedJoinLayout(slot?.join ?? null);
+	const length = layout?.reserves[side] ?? null;
+	return layout && length ? {
+		length,
+		placement: layout.placement
+	} : null;
 }
 function pageBlockPosition(index, blockCount) {
 	if (blockCount <= 1) return "only";
@@ -460,7 +561,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,
@@ -469,6 +570,7 @@ function buildPageRendererRootRuntime(dataContext) {
 		previewStage,
 		apiBaseUrl,
 		portalToken,
+		readAuthority,
 		bookingOfferingPresets,
 		appointmentServicePathPrefix,
 		mailingList,
@@ -651,11 +753,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))
 		})
 	};
 }
@@ -757,86 +858,15 @@ function getBlockOverride(blockKind, overrides) {
 * For draft/preview: draftContent takes priority over content.
 * For published: content is the source of truth.
 */
-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.
+* 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 retargetBoundariesAcrossOmissions(input) {
-	const { boundaries, originalBlocks, survivingBlocks, previewStage } = input;
-	if (boundaries === void 0) return void 0;
-	if (boundaries.length === 0) return boundaries;
-	if (!originalBlocks.some((block) => !survivingBlocks.has(block))) return boundaries;
-	const byPair = new Map(boundaries.map((boundary) => [pairKey(boundary.previousBlockId, boundary.nextBlockId), boundary]));
-	const retargeted = [];
-	let previousSurvivor = null;
-	let run = [];
-	for (const block of originalBlocks) {
-		if (!survivingBlocks.has(block)) {
-			run.push(block);
-			continue;
-		}
-		if (previousSurvivor?.id && block.id) {
-			const boundary = run.length === 0 ? byPair.get(pairKey(previousSurvivor.id, block.id)) : mergedBoundary({
-				byPair,
-				previousBlock: previousSurvivor,
-				previousBlockId: previousSurvivor.id,
-				nextBlock: block,
-				nextBlockId: block.id,
-				run,
-				previewStage
-			});
-			if (boundary) retargeted.push(boundary);
-		}
-		previousSurvivor = block;
-		run = [];
-	}
-	return retargeted;
-}
-function mergedBoundary(input) {
-	const { byPair, previousBlock, previousBlockId, nextBlock, nextBlockId, run, previewStage } = input;
-	const firstOmittedId = run[0]?.id;
-	const lastOmittedId = run[run.length - 1]?.id;
-	const entering = firstOmittedId ? byPair.get(pairKey(previousBlockId, firstOmittedId)) : void 0;
-	const exiting = lastOmittedId ? byPair.get(pairKey(lastOmittedId, nextBlockId)) : void 0;
-	const donor = entering ?? exiting;
-	if (!donor) return void 0;
-	const transition = compileTransitionRuntime({
-		treatment: donor.treatment,
-		from: donor.from,
-		to: exiting?.to ?? donor.to
-	});
-	return retargetCompiledBoundaryRuntimeForContentAdjacency({
-		...donor,
-		boundaryId: makeBoundaryId(asDesignBlockId(previousBlockId), asDesignBlockId(nextBlockId)),
-		previousBlockId,
-		nextBlockId,
-		from: transition.from,
-		to: transition.to,
-		cssVars: transition.cssVars
-	}, {
-		currentContent: getRenderableContent(previousBlock, previewStage),
-		nextContent: getRenderableContent(nextBlock, previewStage)
-	});
+function getRenderableContent(block, previewStage = "published") {
+	const source = previewStage === "preview" && block.draftContent ? block.draftContent : block.content ?? {};
+	return isObjectRecord(source) ? stripStaleTransitionStyleGroup(source) : {};
 }
-const pairKey = boundaryKey;
 //#endregion
 //#region ../blocks/src/system/manifest/hydrateLinks.ts
 /**
@@ -871,7 +901,7 @@ function hydrateResolvedBookingConsentValue(value, context) {
 		const hydratedItems = value.map((item) => hydrateResolvedBookingConsentValue(item, context));
 		return hydratedItems.every((item, index) => item === value[index]) ? value : hydratedItems;
 	}
-	if (!isRecord$13(value)) return value;
+	if (!isRecord$11(value)) return value;
 	if (isBookingConsentCarrier(value)) {
 		const agreement = hydrateValue(value.agreement, context);
 		return agreement === value.agreement ? value : {
@@ -891,7 +921,7 @@ function hydrateValue(value, context) {
 			const resolvedItems = value.map((item) => hydrateValue(item, context));
 			return resolvedItems.every((item, index) => item === value[index]) ? value : resolvedItems;
 		}
-		if (isRecord$13(value)) {
+		if (isRecord$11(value)) {
 			if (isInternalLink(value)) return hydrateInternalLink(value, context.routes);
 			if (isPageLink(value)) return hydratePageLink(value, context);
 			if (isEntryLink(value)) return hydrateEntryLink(value, context);
@@ -956,7 +986,7 @@ function hydrateEntryLink(link, context) {
 //#region ../blocks/src/system/manifest/resolveBlockData.ts
 function resolveBlockData(blockId, dataLoaders, dataContext, routes) {
 	const raw = blockId ? dataContext?.resolvedData?.[blockId] : void 0;
-	if (isRecord$13(raw)) return routes ? hydrateResolvedBookingConsentLinks(raw, routes, dataContext?.pagesByIdentifier, dataContext?.entriesByIdentifier) : raw;
+	if (isRecord$11(raw)) return routes ? hydrateResolvedBookingConsentLinks(raw, routes, dataContext?.pagesByIdentifier, dataContext?.entriesByIdentifier) : raw;
 	return dataLoaders && typeof dataLoaders === "object" && Object.keys(dataLoaders).length > 0 ? {} : void 0;
 }
 //#endregion
@@ -991,23 +1021,44 @@ function preparePageRender(input) {
 			prepared
 		});
 	}
-	if (constructionFailures.length === 0 || input.audience === "authoring") return {
-		entries,
-		constructionFailures,
-		runtimeBoundaries: input.plan.runtimeBoundaries
-	};
-	const survivors = entries.filter((candidate) => candidate.prepared.kind !== "render-threw");
+	const survivors = input.audience === "authoring" ? entries : entries.filter((candidate) => candidate.prepared.kind !== "render-threw");
 	return {
 		entries: survivors,
 		constructionFailures,
-		runtimeBoundaries: retargetBoundariesAcrossOmissions({
-			boundaries: input.plan.runtimeBoundaries,
-			originalBlocks: input.plan.entries.map((planned) => planned.block),
-			survivingBlocks: new Set(survivors.map((survivor) => survivor.entry.block)),
-			previewStage: input.previewStage
-		})
+		joins: composeSurvivorJoins(input.plan, survivors, input.themeResources)
 	};
 }
+/**
+* The only place joins are composed. Plan-time omissions were already
+* re-pointed by the plan; construction failures are re-pointed here by the
+* same primitive, so `[A, B, C]` losing B still gets an A→C join. Each
+* survivor is then classified from its final content.
+*/
+function composeSurvivorJoins(plan, survivors, themeResources) {
+	return composePageJoins({
+		joins: retargetJoinsAcrossOmissions({
+			joins: plan.runtimeJoins,
+			originalBlocks: plan.entries.map((planned) => planned.block),
+			survivingBlocks: new Set(survivors.map((survivor) => survivor.entry.block))
+		}),
+		survivors: survivors.map(({ entry }) => ({
+			id: entry.block.id,
+			kind: entry.block.kind,
+			content: boundaryClassificationContent(entry, themeResources)
+		}))
+	});
+}
+/**
+* The content a join is classified from must be the content that paints the
+* section. The default block renderer layers the theme's per-block style
+* defaults (`theme.blockOverrides[kind].styles`, background included) under
+* the block's own `_sectionStyles`, so classify that same projection. An
+* override component renders its own markup from the unmerged content.
+*/
+function boundaryClassificationContent(entry, themeResources) {
+	if (entry.kind !== "renderable" || entry.override) return entry.renderableContent;
+	return mergeContentWithBlockStyleOverrides(entry.renderableContent, themeResources.kind === "available" ? themeResources.config : void 0, entry.block.kind);
+}
 function prepareEntry(entry, input) {
 	if (entry.kind !== "renderable") return { kind: "plan-decided" };
 	const draftContent = previewableEditorContent(entry);
@@ -1078,6 +1129,7 @@ function blockSessionProps(dataContext) {
 		supabaseUrl: dataContext?.supabaseUrl,
 		portalToken: dataContext?.portalToken ?? null,
 		previewToken: dataContext?.previewToken ?? null,
+		readAuthority: dataContext?.readAuthority,
 		stage: dataContext?.previewStage
 	};
 }
@@ -1179,7 +1231,7 @@ function EditorPageRenderer(props) {
 	});
 }
 function PageRendererCore(props) {
-	const { page, audience, runtimeBoundaries, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props;
+	const { page, audience, runtimeJoins, dataContext, routeMap, registry, sdkConfig, customBlocks, blockOverrides } = props;
 	const imageResolveContext = React$1.useMemo(() => resolvePageRendererImageResolveContext(dataContext), [
 		dataContext?.imageResolveContext,
 		dataContext?.mediaAssets,
@@ -1195,7 +1247,7 @@ function PageRendererCore(props) {
 			blocks: []
 		},
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -1203,7 +1255,7 @@ function PageRendererCore(props) {
 	}), [
 		page,
 		audience,
-		runtimeBoundaries,
+		runtimeJoins,
 		previewStage,
 		sdkConfig,
 		customBlocks,
@@ -1220,19 +1272,16 @@ function PageRendererCore(props) {
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	}), [
 		plan,
 		audience,
 		dataContext,
 		routeMap,
 		themeResources,
-		imageResolveContext,
-		previewStage
+		imageResolveContext
 	]);
-	const boundaryByAdjacentBlockIds = React$1.useMemo(() => boundaryMapForAdjacentBlockIds(preparation.runtimeBoundaries ?? []), [preparation.runtimeBoundaries]);
-	const usesRuntimeBoundaries = preparation.runtimeBoundaries !== void 0;
+	const joinSlots = React$1.useMemo(() => joinSlotsByPair(preparation.joins), [preparation.joins]);
 	reportAndReplayOmissions({
 		plan,
 		preparation,
@@ -1250,10 +1299,9 @@ function PageRendererCore(props) {
 		themeResources,
 		imageResolveContext,
 		resolvedRegistry,
-		boundaryByAdjacentBlockIds,
-		usesRuntimeBoundaries,
+		joinSlots,
 		wrapBlock: props.wrapBlock,
-		wrapBoundary: props.wrapBoundary
+		renderJoin: props.renderJoin
 	})) });
 }
 /**
@@ -1342,27 +1390,25 @@ function requireEntryBlockOverride(entry, themeResources) {
 }
 /**
 * Renders one planned block: its wrapper, style-group data attributes,
-* boundary reserve space and any boundary or transition sibling that follows.
+* boundary reserve space and the join markup that follows it.
 *
 * Extracted from PageRendererCore so the component stays about wiring the plan
 * rather than also owning per-block markup.
 */
 function renderPlanEntry(input) {
-	const { index, entries, props, themeResources, imageResolveContext, resolvedRegistry, boundaryByAdjacentBlockIds, usesRuntimeBoundaries, wrapBlock, wrapBoundary } = input;
+	const { index, entries, props, themeResources, imageResolveContext, resolvedRegistry, joinSlots, wrapBlock, renderJoin } = input;
 	const entry = input.entry.entry;
 	const block = entry.block;
 	const blockPosition = pageBlockPosition(index, entries.length);
 	const blockKey = blockKeyFor(block, index);
 	const previousBlock = entries[index - 1]?.entry.block ?? null;
 	const nextBlock = entries[index + 1]?.entry.block ?? null;
-	const boundaryBefore = boundaryBetweenBlocks(previousBlock, block, boundaryByAdjacentBlockIds);
-	const boundaryAfter = boundaryBetweenBlocks(block, nextBlock, boundaryByAdjacentBlockIds);
-	const boundaryElement = renderBoundaryAfterBlock({
-		block,
-		nextBlock,
+	const joinBefore = joinSlotBetween(previousBlock?.id, block.id, joinSlots);
+	const joinAfter = joinSlotBetween(block.id, nextBlock?.id, joinSlots);
+	const boundaryElement = renderJoinSlot({
+		slot: joinAfter,
 		blockKey,
-		boundaryByAdjacentBlockIds,
-		wrapBoundary
+		renderJoin
 	});
 	const cleanKind = block.kind.replace(/^block\./, "");
 	const managesOwnWrapper = entry.kind === "renderable" && entry.managesOwnWrapper;
@@ -1385,11 +1431,10 @@ function renderPlanEntry(input) {
 	const styleGroup = typeof renderableContent.styleGroup === "string" ? renderableContent.styleGroup : void 0;
 	const blockLook = typeof renderableContent.blockLook === "string" ? renderableContent.blockLook : void 0;
 	const blockComposition = readBlockComposition(renderableContent.blockComposition);
-	const transitionStyle = transitionCssVarsStyle(renderableContent);
-	const blockStyle = mergeStyleObjects(transitionStyle, boundaryReserveCssVarsStyle({
-		before: boundaryBefore,
-		after: boundaryAfter
-	}));
+	const reserves = blockBoundaryReserves({
+		before: joinBefore,
+		after: joinAfter
+	});
 	const blockElement = /* @__PURE__ */ jsx("div", {
 		className: wrapperClassName,
 		"data-block": cleanKind,
@@ -1401,21 +1446,14 @@ function renderPlanEntry(input) {
 		"data-block-composition": blockComposition?.treatment,
 		"data-block-composition-kind": blockComposition?.kind,
 		"data-page-block-position": blockPosition,
-		"data-site-style-boundary-before": boundaryBefore?.metrics.size,
-		"data-site-style-boundary-after": boundaryAfter?.metrics.size,
+		"data-site-style-boundary-before": reserves.topPlacement,
+		"data-site-style-boundary-after": reserves.bottomPlacement,
 		"data-style-group": styleGroup,
-		style: blockStyle,
+		style: reserves.style,
 		children: /* @__PURE__ */ jsx(MemoBlockSection, { ...blockSectionProps })
 	}, blockKey);
 	if (boundaryElement) return /* @__PURE__ */ jsxs(React$1.Fragment, { children: [blockElement, boundaryElement] }, blockKey);
-	if (usesRuntimeBoundaries || !isSiteStyleTransitionStyleGroup(styleGroup)) return blockElement;
-	return /* @__PURE__ */ jsxs(React$1.Fragment, { children: [blockElement, /* @__PURE__ */ jsx("div", {
-		"aria-hidden": "true",
-		"data-block-transition": "",
-		"data-block-transition-for": block.id ?? blockKey,
-		"data-style-group": styleGroup,
-		style: transitionStyle
-	})] }, blockKey);
+	return blockElement;
 }
 function resolvePageRendererImageResolveContext(dataContext) {
 	const input = dataContext?.imageResolveContext;
@@ -2061,6 +2099,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 }
 *
@@ -2075,7 +2124,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;
@@ -2652,12 +2701,19 @@ const bookingQuestionsFlatSchemaSchema = z.object({
 	version: z.string().default("1.0"),
 	fields: z.array(bookingQuestionFieldSchema).min(1, "Form must have at least one question")
 }).strict();
-z.union([bookingQuestionsFlatSchemaSchema, bookingQuestionsDetailedSchemaSchema]);
+const bookingQuestionsStoredSchemaSchema = z.union([bookingQuestionsFlatSchemaSchema, bookingQuestionsDetailedSchemaSchema]);
 const formSlugSchema = z.string().min(1, "Form slug is required").regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/, "Use lowercase letters, numbers, and hyphens only").transform((value) => value);
+/**
+* A form's fields as sent to the Forms API: the generic contract, or the
+* booking-questions contract (which adds file uploads). Which one a form may
+* use depends on its type, which the service checks — on update the type
+* lives on the stored form, not the request.
+*/
+const formPayloadFieldsSchema = z.union([formSchemaSchema, bookingQuestionsStoredSchemaSchema]);
 z.object({
 	name: z.string().min(1, "Form name is required"),
 	slug: formSlugSchema,
-	schema: formSchemaSchema,
+	schema: formPayloadFieldsSchema,
 	settings: formSettingsInputSchema.optional(),
 	presentation: formPresentationSettingsSchema.optional()
 }).strict();
@@ -2856,7 +2912,7 @@ function assertRelativeStoragePath(value) {
 	if (!parsed.ok) throw new Error(`Expected RelativeStoragePath, got ${parsed.error.tag}`);
 	return parsed.value;
 }
-function isRecord$11(value) {
+function isRecord$9(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function parseFileKindJson(value) {
@@ -3077,7 +3133,7 @@ function parseEntitledCustomerAccessScopeJson(value) {
 	}
 }
 function requireRecord(value) {
-	if (!isRecord$11(value)) return err("expected-object");
+	if (!isRecord$9(value)) return err("expected-object");
 	return ok(value);
 }
 function requireString(value) {
@@ -3329,7 +3385,7 @@ const DEFAULT_MESSAGES = {
 	update: "Failed to update media asset",
 	delete: "Failed to delete media asset"
 };
-function isRecord$10(value) {
+function isRecord$8(value) {
 	return typeof value === "object" && value !== null;
 }
 const normalizeLabels = (labels) => labels !== void 0 && labels.length > 0 ? labels.map((label) => label.trim()).filter((label) => label.length > 0).join(",") : void 0;
@@ -3363,7 +3419,7 @@ const filterUpdatePayload = (input) => {
 	return payload;
 };
 const extractErrorMessage = (body) => {
-	if (!isRecord$10(body)) return typeof body === "string" && body.trim().length > 0 ? body : null;
+	if (!isRecord$8(body)) return typeof body === "string" && body.trim().length > 0 ? body : null;
 	for (const key of [
 		"error",
 		"message",
@@ -3376,11 +3432,11 @@ const extractErrorMessage = (body) => {
 	const details = body.details;
 	if (Array.isArray(details)) for (const entry of details) {
 		if (typeof entry === "string" && entry.trim().length > 0) return entry;
-		if (isRecord$10(entry) && typeof entry.message === "string" && entry.message.trim().length > 0) return entry.message;
+		if (isRecord$8(entry) && typeof entry.message === "string" && entry.message.trim().length > 0) return entry.message;
 	}
 	const errors = body.errors;
 	if (Array.isArray(errors)) {
-		for (const entry of errors) if (isRecord$10(entry) && typeof entry.message === "string" && entry.message.trim().length > 0) return entry.message;
+		for (const entry of errors) if (isRecord$8(entry) && typeof entry.message === "string" && entry.message.trim().length > 0) return entry.message;
 	}
 	return null;
 };
@@ -5258,7 +5314,7 @@ function parseBackgroundOverrideFromContent(content) {
 * Only the explicit owner marker can make a background a page-design override.
 */
 function parseCanonicalSectionBackground(content) {
-	const background = (isRecord$9(content._sectionStyles) ? content._sectionStyles : null)?.background;
+	const background = (isRecord$7(content._sectionStyles) ? content._sectionStyles : null)?.background;
 	if (background === null || background === void 0) return { kind: "none" };
 	const canonical = parseBackgroundContent(background);
 	if (!canonical) return { kind: "none" };
@@ -5276,7 +5332,7 @@ function parseBackgroundOverride(value) {
 		kind: "supported",
 		override: DEFAULT_BACKGROUND_OVERRIDE
 	};
-	if (!isRecord$9(value)) return {
+	if (!isRecord$7(value)) return {
 		kind: "unsupported",
 		reason: "unsupported-shape",
 		background: {}
@@ -5364,7 +5420,7 @@ function parseBackgroundOverride(value) {
 	}
 }
 function applyBackgroundOverrideContentPatch(content, override) {
-	const sectionStyles = isRecord$9(content._sectionStyles) ? content._sectionStyles : {};
+	const sectionStyles = isRecord$7(content._sectionStyles) ? content._sectionStyles : {};
 	const serialized = serializeBackgroundOverride(override);
 	if (serialized === null) return withSectionStyles(content, omitRecordKey$1(sectionStyles, "background"));
 	return withSectionStyles(content, {
@@ -5588,7 +5644,7 @@ function imageAllowed(mediaId, pool) {
 	return pool?.some((item) => item.mediaId === mediaId) ?? false;
 }
 function parseImageMediaAssetId(value) {
-	if (!isRecord$9(value)) return { kind: "missing" };
+	if (!isRecord$7(value)) return { kind: "missing" };
 	if (value.type !== void 0 && value.type !== "image") return { kind: "missing" };
 	const parsed = parseMediaAssetId(value.assetId);
 	if (!parsed.ok) return value.assetId === void 0 || value.assetId === null ? { kind: "missing" } : { kind: "invalid" };
@@ -5629,7 +5685,7 @@ function withSectionStyles(content, sectionStyles) {
 function omitRecordKey$1(content, key) {
 	return Object.fromEntries(Object.entries(content).filter(([entryKey]) => entryKey !== key));
 }
-function isRecord$9(value) {
+function isRecord$7(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -6229,10 +6285,12 @@ function applyPreviewCustomizeActionToLoadedState(state, action) {
 				...state.editorModel,
 				boundaries: state.editorModel.boundaries.map((boundary) => {
 					if (boundary.previousBlockId !== action.previousBlockId || boundary.nextBlockId !== action.nextBlockId) return boundary;
-					return {
-						...boundary,
-						breakChoice: optimisticBoundaryBreakChoice(state.editorModel, boundary, action)
-					};
+					return resolvePageDesignEditorBoundaryForChoice({
+						editorModel: state.editorModel,
+						previousBlockId: boundary.previousBlockId,
+						nextBlockId: boundary.nextBlockId,
+						choice: optimisticBoundaryChoice(action)
+					}) ?? boundary;
 				})
 			}
 		};
@@ -6265,26 +6323,17 @@ function optimisticLayoutLookState(block, layoutVariantKey) {
 		default: return assertNever$1(plan, "Unhandled layout/Look compatibility plan");
 	}
 }
-function optimisticBoundaryBreakChoice(editorModel, boundary, action) {
+/**
+* The stored choice an action leaves behind. The effective break, its source
+* and the join are then resolved by theme-core, exactly as the server will.
+*/
+function optimisticBoundaryChoice(action) {
 	switch (action.kind) {
-		case "set-boundary": return {
-			kind: "user-pinned",
-			value: action.boundaryOptionId,
-			status: "supported",
-			effectiveValue: action.boundaryOptionId
-		};
-		case "reset-boundary": return {
-			kind: "auto",
-			effectiveValue: autoBoundaryEffectiveValue(editorModel, boundary)
-		};
+		case "set-boundary": return userPinnedDesignChoice(boundaryTreatmentForBoundaryOptionId(action.boundaryOptionId));
+		case "reset-boundary": return autoDesignChoice();
 		default: return assertNever$1(action, "Unhandled optimistic boundary action");
 	}
 }
-function autoBoundaryEffectiveValue(editorModel, boundary) {
-	const preferredBoundaryOptionId = editorModel.pageFlowPresets.find((preset) => preset.id === editorModel.pageFlow.effectiveValue)?.defaultBoundaryOptionId ?? null;
-	if (preferredBoundaryOptionId && boundary.availableBreaks.some((option) => option.id === preferredBoundaryOptionId)) return preferredBoundaryOptionId;
-	return boundary.availableBreaks[0]?.id ?? null;
-}
 //#endregion
 //#region ../blocks/src/system/customize/facets.ts
 function defineCustomizeFacet(definition) {
@@ -6430,8 +6479,8 @@ function contentWithPreviousLayoutVariant(currentContent, previousContent) {
 	return nextContent;
 }
 function contentWithPreviousBackground(currentContent, previousContent) {
-	const previousSectionStyles = isRecord$8(previousContent._sectionStyles) ? previousContent._sectionStyles : {};
-	const nextSectionStyles = { ...isRecord$8(currentContent._sectionStyles) ? currentContent._sectionStyles : {} };
+	const previousSectionStyles = isRecord$6(previousContent._sectionStyles) ? previousContent._sectionStyles : {};
+	const nextSectionStyles = { ...isRecord$6(currentContent._sectionStyles) ? currentContent._sectionStyles : {} };
 	if (Object.prototype.hasOwnProperty.call(previousSectionStyles, "background")) nextSectionStyles.background = previousSectionStyles.background;
 	else delete nextSectionStyles.background;
 	if (Object.keys(nextSectionStyles).length > 0) return {
@@ -6444,9 +6493,9 @@ function contentWithPreviousBackground(currentContent, previousContent) {
 }
 function withRuntimeBackgroundImageAsset(content, imageAsset) {
 	if (!imageAsset) return content;
-	const sectionStyles = isRecord$8(content._sectionStyles) ? content._sectionStyles : null;
-	const background = isRecord$8(sectionStyles?.background) ? sectionStyles.background : null;
-	const image = isRecord$8(background?.image) ? background.image : null;
+	const sectionStyles = isRecord$6(content._sectionStyles) ? content._sectionStyles : null;
+	const background = isRecord$6(sectionStyles?.background) ? sectionStyles.background : null;
+	const image = isRecord$6(background?.image) ? background.image : null;
 	if (!sectionStyles || !background || !image || background.type !== "image") return content;
 	return {
 		...content,
@@ -6459,7 +6508,7 @@ function withRuntimeBackgroundImageAsset(content, imageAsset) {
 		}
 	};
 }
-function isRecord$8(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -6489,7 +6538,7 @@ function rollbackPreviewCustomizeDraftPatch(uiStore, patch) {
 }
 function currentLocalBlockContent(uiStore, targetBlockId) {
 	const current = uiStore.getState().drafts.getCurrentValues(unsafeAsEditorBlockId(targetBlockId));
-	return isRecord$7(current) ? current : null;
+	return isRecord$5(current) ? current : null;
 }
 function replaceLocalBlockContentWithoutHistory(input) {
 	const editorBlockId = unsafeAsEditorBlockId(input.targetBlockId);
@@ -6542,7 +6591,7 @@ function localRuntimeDraftForBlock(input) {
 		}
 	};
 }
-function isRecord$7(value) {
+function isRecord$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -7029,6 +7078,7 @@ function PreviewEntryControllerProvider({ children, siteId, pageId, routeId: pro
 	const normalizedInitialBlocks = useMemo(() => {
 		return (initialBlocks ?? []).map((b, index) => ({
 			id: b.id ?? null,
+			contentVersionId: b.contentVersionId ?? null,
 			kind: b.kind,
 			orderIndex: typeof b.orderIndex === "number" ? b.orderIndex : index,
 			content: b.content ?? null,
@@ -7386,25 +7436,25 @@ const INITIAL_ONBOARDING_CONFIRMATION_STATE = {
 	resendFeedback: null,
 	statusLoadFailed: false
 };
-function isRecord$6(value) {
+function isRecord$4(value) {
 	return value !== null && typeof value === "object";
 }
 function getErrorMessageFromEnvelope(payload, fallback) {
-	const error = isRecord$6(payload) ? payload.error : null;
-	const message = isRecord$6(error) ? error.message : null;
+	const error = isRecord$4(payload) ? payload.error : null;
+	const message = isRecord$4(error) ? error.message : null;
 	return typeof message === "string" && message.trim().length > 0 ? message : fallback;
 }
 function isLaunchReadiness(value) {
-	return isRecord$6(value) && Array.isArray(value.requirements) && typeof value.pendingRequiredCount === "number" && typeof value.pendingRecommendedCount === "number" && typeof value.pendingOptionalCount === "number" && isRecord$6(value.goLiveDecision) && (value.goLiveDecision.kind === "allowed" || value.goLiveDecision.kind === "blocked");
+	return isRecord$4(value) && Array.isArray(value.requirements) && typeof value.pendingRequiredCount === "number" && typeof value.pendingRecommendedCount === "number" && typeof value.pendingOptionalCount === "number" && isRecord$4(value.goLiveDecision) && (value.goLiveDecision.kind === "allowed" || value.goLiveDecision.kind === "blocked");
 }
 function isOnboardingPreviewStatusResponse(value) {
-	return isRecord$6(value) && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
+	return isRecord$4(value) && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
 }
 function isResendOnboardingPreviewConfirmationResponse(value) {
-	return isRecord$6(value) && (value.result === "resent" || value.result === "already_confirmed") && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
+	return isRecord$4(value) && (value.result === "resent" || value.result === "already_confirmed") && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
 }
 function getSuccessData(payload, isData) {
-	if (!isRecord$6(payload) || payload.success !== true || !isData(payload.data)) return null;
+	if (!isRecord$4(payload) || payload.success !== true || !isData(payload.data)) return null;
 	return payload.data;
 }
 function useOnboardingConfirmationCheck(input) {
@@ -9250,10 +9300,10 @@ function resolveShellThemeRoles(props) {
 }
 const previewContainerResponsiveEnabled = process.env.NEXT_PUBLIC_ENABLE_PREVIEW_CONTAINER_RESPONSIVE !== "false";
 const PreviewEditorSidebar = React.lazy(async () => {
-	return { default: (await import("./PreviewEditorSidebar-DROGfMKi.mjs")).PreviewEditorSidebar };
+	return { default: (await import("./PreviewEditorSidebar-O-V6Pl5a.mjs")).PreviewEditorSidebar };
 });
 const PreviewEditorUI = React.lazy(async () => {
-	return { default: (await import("./PreviewEditorUI-BaRjhFu-.mjs")).PreviewEditorUI };
+	return { default: (await import("./PreviewEditorUI-1UlX_9cw.mjs")).PreviewEditorUI };
 });
 const previewPaneContainmentStyle = {
 	contain: "layout paint",
@@ -9700,11 +9750,11 @@ function resolveShellAccess(input) {
 //#region ../preview-next/src/client/utils/path.ts
 const PATH_SEPARATOR_REGEX = /\./g;
 const BRACKET_ACCESS_REGEX = /\[([^\]]+)\]/g;
-function isRecord$5(value) {
+function isRecord$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isPathContainer(value) {
-	return Array.isArray(value) || isRecord$5(value);
+	return Array.isArray(value) || isRecord$3(value);
 }
 function createPathContainer(nextIsIndex) {
 	return nextIsIndex ? [] : {};
@@ -9867,24 +9917,21 @@ function runtimeContentDecorationProjectionFromEditorModel(editorModel, surfaceR
 		kind: "runtime-content-decoration",
 		source: "page-design",
 		fieldsByBlockId: runtimeFieldsByBlockId(compiled.blocks),
-		boundaries: compiled.boundaries
+		joins: compiled.joins
 	};
 }
 function runtimeFieldsByBlockId(blocks) {
 	return new Map(blocks.map((block) => [block.blockId, block.fields]));
 }
-function applyRuntimeContentDecorationProjection(block, content, projection, adjacency) {
+function applyRuntimeContentDecorationProjection(block, content, projection) {
 	const blockId = designBlockIdFromBlockItem(block);
-	const retargetedFields = retargetCompiledRuntimeFieldsForContentAdjacency(blockId ? projection.fieldsByBlockId.get(blockId) : void 0, {
-		currentContent: isRecord$4(content) ? content : null,
-		nextContent: adjacency?.nextContent
-	});
-	return applyCompiledRuntimeFieldsToContent(isRecord$4(content) ? content : {}, retargetedFields);
+	const fields = blockId ? projection.fieldsByBlockId.get(blockId) : void 0;
+	return applyCompiledRuntimeFieldsToContent(isRecord$2(content) ? content : {}, fields);
 }
 function designBlockIdFromBlockItem(block) {
 	return typeof block.id === "string" && block.id.length > 0 ? asDesignBlockId(block.id) : null;
 }
-function isRecord$4(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -9901,10 +9948,10 @@ function applyPreviewContentFieldProjections(blockId, content, projections) {
 		return applyContentFieldOverrideProjection(blockId, current, projection);
 	}, content);
 }
-function applyPreviewRuntimeContentProjections(block, content, projections, adjacency) {
+function applyPreviewRuntimeContentProjections(block, content, projections) {
 	return projections.reduce((current, projection) => {
 		if (projection.kind !== "runtime-content-decoration") return current;
-		return applyRuntimeContentDecorationProjection(block, current, projection, adjacency);
+		return applyRuntimeContentDecorationProjection(block, current, projection);
 	}, content);
 }
 function blockHasPreviewContentFieldProjection(blockId, projections) {
@@ -9935,7 +9982,7 @@ function overlayValue(value, overlays) {
 		});
 		return changed ? next : value;
 	}
-	if (!isRecord$3(value)) return value;
+	if (!isRecord$1(value)) return value;
 	const meta = parseLinkedEntryMeta(value[LINKED_CONTENT_ENTRY_META_KEY]);
 	if (meta) {
 		const overlay = overlays.get(unsafeAsLinkedContentEntryId(meta.entryId));
@@ -10001,7 +10048,7 @@ function resolveOverlayTitle(content, meta) {
 function parseLinkedEntryMeta(value) {
 	return getLinkedContentEntryMeta({ [LINKED_CONTENT_ENTRY_META_KEY]: value });
 }
-function isRecord$3(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -10011,48 +10058,36 @@ function getDraftSnapshots(uiStore) {
 	const snapshots = uiStore.getState().drafts.inspect();
 	return new Map(snapshots.map((snap) => [snap.id, snap]));
 }
-function mergeBlockWithDraft(block, draftMap, index, projections = [], linkedEntryOverlays = EMPTY_LINKED_ENTRY_OVERLAY, nextBlock = null) {
+function mergeBlockWithDraft(block, draftMap, index, projections = [], linkedEntryOverlays = EMPTY_LINKED_ENTRY_OVERLAY) {
 	const id = block.id ?? null;
 	const editorBlockId = id ? unsafeAsEditorBlockId(id) : null;
 	const snap = editorBlockId ? draftMap.get(editorBlockId) ?? null : null;
 	const draftContent = editorBlockId ? readProjectedDraftRenderContent(block, editorBlockId, snap, projections) : null;
 	const baseline = snap?.baseline ?? block.content ?? block.publishedContent ?? null;
-	const nextContent = nextBlock ? readBlockRenderContents(nextBlock, draftMap, projections) : null;
 	return {
 		id,
+		contentVersionId: block.contentVersionId ?? null,
 		kind: block.kind,
 		purpose: "content",
 		orderIndex: block.orderIndex ?? index,
-		content: renderContent(block, baseline, projections, linkedEntryOverlays, nextContent?.baseline ?? null),
-		draftContent: renderContent(block, draftContent, projections, linkedEntryOverlays, nextContent?.draft ?? null),
-		publishedContent: renderContent(block, block.publishedContent ?? null, projections, EMPTY_LINKED_ENTRY_OVERLAY, nextContent?.published ?? null),
+		content: renderContent(block, baseline, projections, linkedEntryOverlays),
+		draftContent: renderContent(block, draftContent, projections, linkedEntryOverlays),
+		publishedContent: renderContent(block, block.publishedContent ?? null, projections, EMPTY_LINKED_ENTRY_OVERLAY),
 		bindings: block.bindings ?? null
 	};
 }
-function readBlockRenderContents(block, draftMap, projections) {
-	const id = block.id ?? null;
-	const editorBlockId = id ? unsafeAsEditorBlockId(id) : null;
-	const snap = editorBlockId ? draftMap.get(editorBlockId) ?? null : null;
-	return {
-		baseline: snap?.baseline ?? block.content ?? block.publishedContent ?? null,
-		draft: editorBlockId ? readProjectedDraftRenderContent(block, editorBlockId, snap, projections) : null,
-		published: block.publishedContent ?? null
-	};
-}
 function readProjectedDraftRenderContent(block, editorBlockId, snap, projections) {
 	return applyPreviewContentFieldProjections(editorBlockId, snap?.current ?? snap?.baseline ?? block.content ?? block.publishedContent ?? null, projections);
 }
-function renderContent(block, content, projections, linkedEntryOverlays, nextContent) {
-	return applyPreviewRuntimeContentProjections(block, applyLinkedEntryRenderOverlay(content, linkedEntryOverlays), projections, { nextContent: isRecord$2(nextContent) ? nextContent : null });
-}
-function isRecord$2(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
+function renderContent(block, content, projections, linkedEntryOverlays) {
+	return applyPreviewRuntimeContentProjections(block, applyLinkedEntryRenderOverlay(content, linkedEntryOverlays), projections);
 }
 //#endregion
 //#region ../preview-next/src/client/blocks/composer/transformBlock.ts
 function transformToPageBlock(enriched) {
 	return {
 		id: enriched.id,
+		...enriched.contentVersionId !== null ? { contentVersionId: enriched.contentVersionId } : {},
 		kind: enriched.kind,
 		purpose: enriched.purpose,
 		content: enriched.content ?? {},
@@ -10104,8 +10139,7 @@ function composePreviewRenderPage(args, cacheRef) {
 	if (!page) return page;
 	if (!blockItems.length) return page;
 	const draftMap = draftSnapshotMap(draftSnapshots);
-	const projectedBlockItems = applyPreviewStructureProjections(blockItems, projections);
-	const renderedBlocks = applyCacheOptimization([...projectedBlockItems.map((block, index) => mergeBlockWithDraft(block, draftMap, index, projections, linkedEntryOverlays, projectedBlockItems[index + 1] ?? null))].sort((a, b) => (a.orderIndex ?? 0) - (b.orderIndex ?? 0)), cacheRef);
+	const renderedBlocks = applyCacheOptimization([...applyPreviewStructureProjections(blockItems, projections).map((block, index) => mergeBlockWithDraft(block, draftMap, index, projections, linkedEntryOverlays))].sort((a, b) => (a.orderIndex ?? 0) - (b.orderIndex ?? 0)), cacheRef);
 	return {
 		...page,
 		blocks: renderedBlocks
@@ -10267,7 +10301,7 @@ const editorRegistry = {
 };
 //#endregion
 //#region ../preview-next/src/client/blocks/isRecord.ts
-function isRecord$1(value) {
+function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -10441,7 +10475,7 @@ function BlockToolbar({ blockId, blockKind, content, bookingOfferingPresets, the
 	const uiStore = useEditorUiStoreInstance();
 	const editorBlockId = useMemo(() => unsafeAsEditorBlockId(blockId), [blockId]);
 	const draftContent = useEditorUiStore((state) => state.drafts.getCurrentValues(editorBlockId));
-	const customizeContent = useMemo(() => isRecord$1(draftContent) ? draftContent : content, [content, draftContent]);
+	const customizeContent = useMemo(() => isRecord(draftContent) ? draftContent : content, [content, draftContent]);
 	const customizeSelection = usePreviewBlockCustomizeSelectionOptional();
 	const popover = useCustomizePopoverController();
 	const focusTarget = useMemo(() => computeDefaultFocus(blockKind, customizeContent), [blockKind, customizeContent]);
@@ -10997,13 +11031,13 @@ function findFirstFieldPath(fields, data, prefix) {
 		if (Array.isArray(field.visibleRoles) && !field.visibleRoles.includes("author")) continue;
 		const nextPrefix = [...prefix, field.id];
 		if (field.type === "group") {
-			const groupValue = isRecord$1(data) ? data[field.id] : void 0;
+			const groupValue = isRecord(data) ? data[field.id] : void 0;
 			const nested = findFirstFieldPath(field.schema.fields, groupValue, nextPrefix);
 			if (nested) return nested;
 			continue;
 		}
 		if (field.type === "repeater" && field.schema) {
-			const collection = isRecord$1(data) ? data[field.id] : void 0;
+			const collection = isRecord(data) ? data[field.id] : void 0;
 			const items = isUnknownArray(collection) ? collection : [];
 			if (items.length > 0) {
 				const firstItem = items[0];
@@ -11180,7 +11214,7 @@ function dedupeBackgroundImagePool(items) {
 }
 //#endregion
 //#region ../preview-next/src/client/blocks/BoundaryControl.tsx
-function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, nextBlockKind }) {
+function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, nextBlockKind, outcome }) {
 	const panelId = useId();
 	const panelDescriptionId = `${panelId}-description`;
 	const [open, setOpen] = useState(false);
@@ -11208,11 +11242,17 @@ function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, next
 	}, [hasControls]);
 	if (!boundary || !hasControls) return null;
 	const display = boundaryBreakDisplay(boundary);
-	const panelStatus = display.detail ? {
-		id: `${panelId}-status`,
-		text: display.detail
-	} : null;
-	const panelDescribedBy = panelStatus ? `${panelDescriptionId} ${panelStatus.id}` : panelDescriptionId;
+	const panelSummaryId = `${panelId}-summary`;
+	const panelStatuses = boundaryPanelStatuses({
+		panelId,
+		detail: display.detail,
+		outcome
+	});
+	const panelDescribedBy = [
+		panelDescriptionId,
+		panelSummaryId,
+		...panelStatuses.map((status) => status.id)
+	].join(" ");
 	const openPanel = (event) => {
 		event.preventDefault();
 		event.stopPropagation();
@@ -11316,15 +11356,9 @@ function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, next
 								})
 							})]
 						}),
-						/* @__PURE__ */ jsxs("div", {
-							className: "rounded-lg border border-slate-200 bg-slate-50 p-2 text-center",
-							children: [/* @__PURE__ */ jsx("div", {
-								className: "truncate text-sm font-medium",
-								children: boundaryBreakLabel(boundary)
-							}), /* @__PURE__ */ jsx("div", {
-								className: "mt-0.5 text-xs text-slate-500",
-								children: boundaryBreakModeLabel(boundary)
-							})]
+						/* @__PURE__ */ jsx(BoundaryBreakSummary, {
+							id: panelSummaryId,
+							display
 						}),
 						/* @__PURE__ */ jsxs("div", {
 							className: "mt-3",
@@ -11354,11 +11388,7 @@ function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, next
 								}, variant.boundaryOption.id))
 							})]
 						}) : null,
-						panelStatus ? /* @__PURE__ */ jsx("p", {
-							id: panelStatus.id,
-							className: "mt-2 text-xs text-slate-500",
-							children: panelStatus.text
-						}) : null,
+						/* @__PURE__ */ jsx(BoundaryPanelStatusLines, { statuses: panelStatuses }),
 						display.canReset ? /* @__PURE__ */ jsxs("button", {
 							type: "button",
 							className: "mt-2 inline-flex w-full items-center justify-center gap-2 rounded-md border border-slate-200 px-3 py-2 text-sm font-medium text-slate-700 transition hover:bg-slate-50 focus:outline-none focus:ring-2 focus:ring-sky-400",
@@ -11382,6 +11412,53 @@ function BoundaryControl({ previousBlockId, nextBlockId, previousBlockKind, next
 		})
 	});
 }
+/** Approved copy (issue 1422) for a join the renderer did not draw. */
+const notShownCopy = {
+	"both-unpainted": "This break won't show here, because both sections have an image or video background. It'll appear if you give one of them a color background.",
+	"flush-panel": "This break won't show here, because one of these sections has an image that runs right to its edge. It'll appear if you pick a different look for that section."
+};
+/**
+* Status lines under the controls, each wired into the dialog's
+* `aria-describedby`. The not-shown line comes from the same composition as
+* the painted page, so it appears or clears as backgrounds change.
+*/
+function boundaryPanelStatuses(input) {
+	return [...input.detail ? [{
+		id: `${input.panelId}-status`,
+		kind: "saved-break-unavailable",
+		text: input.detail
+	}] : [], ...input.outcome?.kind === "not-shown" ? [{
+		id: `${input.panelId}-not-shown`,
+		kind: `not-shown:${input.outcome.reason}`,
+		text: notShownCopy[input.outcome.reason]
+	}] : []];
+}
+function BoundaryPanelStatusLines({ statuses }) {
+	return statuses.map((status) => /* @__PURE__ */ jsx("p", {
+		id: status.id,
+		"data-boundary-status": status.kind,
+		className: "mt-2 text-xs text-slate-500",
+		children: status.text
+	}, status.id));
+}
+/**
+* The current break and where it comes from. The source is exposed as data so
+* the state is inspectable without reading the copy.
+*/
+function BoundaryBreakSummary({ id, display }) {
+	return /* @__PURE__ */ jsxs("div", {
+		id,
+		"data-boundary-break-source": display.source,
+		className: "rounded-lg border border-slate-200 bg-slate-50 p-2 text-center",
+		children: [/* @__PURE__ */ jsx("div", {
+			className: "truncate text-sm font-medium",
+			children: display.label
+		}), /* @__PURE__ */ jsx("div", {
+			className: "mt-0.5 text-xs text-slate-500",
+			children: display.modeLabel
+		})]
+	});
+}
 function SectionTransitionFamilyButton({ family, active, onClick }) {
 	return /* @__PURE__ */ jsx("button", {
 		type: "button",
@@ -11405,24 +11482,13 @@ function SectionTransitionVariantButton({ variant, active, onClick }) {
 function sectionTransitionChoiceClassName(active) {
 	return ["min-h-8 flex-1 rounded-md px-2.5 text-xs font-medium transition focus:outline-none focus:ring-2 focus:ring-sky-400", active ? "bg-slate-950 text-white shadow-sm" : "bg-transparent text-slate-600 hover:bg-white hover:text-slate-950"].join(" ");
 }
-function boundaryBreakLabel(boundary) {
-	return boundaryBreakDisplay(boundary).label;
-}
-function boundaryBreakModeLabel(boundary) {
-	return boundaryBreakDisplay(boundary).modeLabel;
-}
 function boundaryBreakDisplay(boundary) {
 	const option = boundary.availableBreaks.find((candidate) => candidate.id === boundary.breakChoice.effectiveValue) ?? null;
 	switch (boundary.breakChoice.kind) {
-		case "auto": return {
-			label: option ? `Default: ${option.label}` : "Default",
-			modeLabel: "Page Flow",
-			detail: null,
-			canReset: false,
-			resetLabel: "Default"
-		};
+		case "auto": return autoBoundaryBreakDisplay(boundary.breakChoice.source, option ? `Default: ${option.label}` : "Default");
 		case "user-pinned":
 			if (boundary.breakChoice.status === "supported") return {
+				source: "user-pinned",
 				label: option?.label ?? "Selected break",
 				modeLabel: "Custom",
 				detail: null,
@@ -11430,6 +11496,7 @@ function boundaryBreakDisplay(boundary) {
 				resetLabel: "Default"
 			};
 			return {
+				source: "unavailable",
 				label: "Saved break unavailable",
 				modeLabel: option ? `Using default: ${option.label}` : "Using Page Flow fallback",
 				detail: "This page still has a saved custom break that is no longer available for these sections.",
@@ -11439,6 +11506,31 @@ function boundaryBreakDisplay(boundary) {
 		default: return assertNever$1(boundary.breakChoice, "Unhandled boundary break choice");
 	}
 }
+/**
+* A default break has no reset: there is nothing saved to clear. Picking
+* another break pins it as a user choice, and reset returns here.
+*/
+function autoBoundaryBreakDisplay(source, label) {
+	switch (source.kind) {
+		case "site-style-default": return {
+			source: "site-style-default",
+			label,
+			modeLabel: "Set by your site style",
+			detail: null,
+			canReset: false,
+			resetLabel: "Default"
+		};
+		case "page-flow-default": return {
+			source: "page-flow-default",
+			label,
+			modeLabel: "Page Flow",
+			detail: null,
+			canReset: false,
+			resetLabel: "Default"
+		};
+		default: return assertNever$1(source, "Unhandled boundary default source");
+	}
+}
 function formatBlockKindLabel(blockKind) {
 	const blockTitle = getBlockDefinition(blockKind)?.manifest.title;
 	if (blockTitle) return blockTitle;
@@ -11673,33 +11765,32 @@ function EditablePageRenderer(props) {
 		uiStore,
 		renderStateVersion
 	]) ?? pageRendererProps.page;
-	const runtimeBoundaries = useMemo(() => retargetRuntimeBoundariesForRenderPage(runtimeProjection?.boundaries ?? pageRendererProps.runtimeBoundaries ?? [], renderPage), [
-		pageRendererProps.runtimeBoundaries,
-		renderPage,
-		runtimeProjection
-	]);
+	const runtimeJoins = editorRuntimeJoins(runtimeProjection, pageRendererProps.runtimeJoins);
 	const renderedBlockById = useMemo(() => {
 		return new Map((renderPage?.blocks ?? []).filter((block) => Boolean(block.id)).map((block) => [block.id, block]));
 	}, [renderPage?.blocks]);
-	const wrapBoundaryWithControl = useCallback((boundary, rendered) => {
-		const previousBlock = renderedBlockById.get(boundary.previousBlockId);
-		const nextBlock = renderedBlockById.get(boundary.nextBlockId);
+	const renderJoinWithControl = useCallback((input) => {
+		const previousBlock = renderedBlockById.get(input.previousBlockId);
+		const nextBlock = renderedBlockById.get(input.nextBlockId);
 		const control = !isEntryTemplatePage && previousBlock && nextBlock ? /* @__PURE__ */ jsx(BoundaryControl, {
-			previousBlockId: asDesignBlockId(boundary.previousBlockId),
-			nextBlockId: asDesignBlockId(boundary.nextBlockId),
+			previousBlockId: asDesignBlockId(input.previousBlockId),
+			nextBlockId: asDesignBlockId(input.nextBlockId),
 			previousBlockKind: previousBlock.kind,
-			nextBlockKind: nextBlock.kind
+			nextBlockKind: nextBlock.kind,
+			outcome: input.join?.outcome ?? null
 		}) : null;
-		const wrapped = pageRendererProps.wrapBoundary ? pageRendererProps.wrapBoundary(boundary, rendered) : rendered;
+		const extra = pageRendererProps.renderJoin?.(input) ?? null;
+		if (!control && !extra) return null;
 		return /* @__PURE__ */ jsxs("div", {
 			className: "relative",
 			"data-preview-boundary-wrapper": "",
-			"data-boundary-id": boundary.boundaryId,
-			children: [wrapped, control]
+			"data-boundary-previous-block-id": input.previousBlockId,
+			"data-boundary-next-block-id": input.nextBlockId,
+			children: [extra, control]
 		});
 	}, [
 		isEntryTemplatePage,
-		pageRendererProps.wrapBoundary,
+		pageRendererProps.renderJoin,
 		renderedBlockById
 	]);
 	const wrapBlockWithProvider = useCallback((blockId, rendered) => {
@@ -11770,32 +11861,20 @@ function EditablePageRenderer(props) {
 	return /* @__PURE__ */ jsx(EditorPageRenderer, {
 		...pageRendererProps,
 		page: renderPage,
-		runtimeBoundaries,
+		runtimeJoins,
 		registry: allowInlineEditing ? editorRegistry : pageRendererProps.registry ?? clientComponentRegistry,
 		wrapBlock: allowInlineEditing ? wrapBlockWithProvider : pageRendererProps.wrapBlock,
-		wrapBoundary: allowInlineEditing ? wrapBoundaryWithControl : pageRendererProps.wrapBoundary,
+		renderJoin: allowInlineEditing ? renderJoinWithControl : pageRendererProps.renderJoin,
 		dataContext,
 		previewAuthoring
 	});
 }
-function retargetRuntimeBoundariesForRenderPage(boundaries, page) {
-	if (!boundaries?.length) return boundaries;
-	const blockById = new Map(page.blocks.filter((block) => Boolean(block.id)).map((block) => [block.id, block]));
-	return boundaries.map((boundary) => {
-		const currentBlock = blockById.get(boundary.previousBlockId);
-		const nextBlock = blockById.get(boundary.nextBlockId);
-		return retargetCompiledBoundaryRuntimeForContentAdjacency(boundary, {
-			currentContent: renderableBoundaryContent(currentBlock),
-			nextContent: renderableBoundaryContent(nextBlock)
-		});
-	});
-}
-function renderableBoundaryContent(block) {
-	const source = block?.draftContent ?? block?.content ?? null;
-	return isRecord(source) ? source : null;
-}
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
+const emptyRuntimeJoins = [];
+/**
+* The editor's joins: its live projection wins, then whatever the caller sent.
+*/
+function editorRuntimeJoins(projection, fallback) {
+	return projection?.joins ?? fallback ?? emptyRuntimeJoins;
 }
 function usePreviewBlockResolvedData(args) {
 	const { page, dataContext, apiClient } = args;
@@ -12135,6 +12214,7 @@ function resolveSdkPreviewRuntimeModel(props) {
 	const customBlocks = isSdkCustomBlockArray(content.customBlocks) ? content.customBlocks : null;
 	const initialBlocks = (page.blocks ?? []).map((block, index) => ({
 		id: block.id ?? null,
+		contentVersionId: typeof block.contentVersionId === "string" ? block.contentVersionId : null,
 		kind: block.kind,
 		purpose: block.purpose ?? null,
 		orderIndex: index,