@riverbankcms/sdk 0.147.0 → 0.149.0

package/dist/{SdkPreviewModeRuntime-DMMNCngt.mjs → SdkPreviewModeRuntime-DJPmPY-r.mjs}

@@ -1,10 +1,11 @@
 "use client";
-import { $i as resolveSdkFooterMode, $n as resolveRouteTarget, $r as parseBackgroundAppearanceColorToken, $t as recordsEqual, Aa as Dialog, Ai as isRecord$11, An as ThemeScope, Ao as __exportAll, At as useRichTextImagePicker, Bn as resolveVariantKey, Bt as stripTopLevelRoutingUi, Ci as siblingPath, Cn as DEFAULT_LAUNCH_READINESS_INPUT, Co as parseMailingListPlacementTargeting, Cr as compileEditorModelRuntime, Ct as EntryPickerWidgetProvider, Da as TabsContent, Di as eventCalendarListLayoutOptions, Dn as useMediaEditorOptional, Do as expectParsedBrandedId, Dr as componentRuntimeRulesForTheme, Dt as MediaField, Ea as Tabs, Ei as eventCalendarListLayoutCompatibleDisplayModeValues, En as MediaEditorContextProvider, Eo as assertNever$2, Er as resolvePageDesignEditorBoundaryForChoice, Et as FileField, Fa as DialogTitle, Fi as asDesignBlockId, Fn as projectRecurringSchedule, Fr as gradientToCss, Ft as LinkField, G as confirmAutosaveBatch, Gi as textColorStyle, Gn as getResponsiveScopeSpec, Gr as sectionFactsForContent, Gt as useOptionalEditorUiStoreInstance, Hn as validateManifestDraft, Hr as userPinnedDesignChoice, Ii as assertNever$1, In as SITE_CHROME_VISIBLE_HEADER_SELECTOR, Ir as GRADIENT_PRESETS, It as LinkWidgetProvider, J as idleEditorTransactionQueueState, Ji as ORDINARY_TEXT_MIN_CONTRAST_RATIO, Jn as readBlockComposition, Jr as sectionTransitionFamilies, Jt as createHistoryState, K as deriveTransactionCapabilities, Ki as defaultThemeTokens, Kn as escapeStyleContent, Kr as boundaryTreatmentForBoundaryOptionId, Kt as canRedoHistory, Li as makeBoundaryId, Ln as SITE_OVERLAY_HEADER_CLEARANCE_CSS_VAR, Lr as GRADIENT_PRESET_IDS, Ma as DialogDescription, Mi as isThemeV2NormalEditorRawStyleFieldName, Mn as createCustomBlockRegistry, Mt as RichTextWidgetProvider, Na as DialogFooter, Ni as pageDesignEditorBackgroundOverrideOwner, Nn as makeDefaultBlockComponent, Nt as EditorProvider, Oa as TabsList, Oi as bookingConsentCarrierSchema, On as useApiMediaUploader, Oo as parseMediaAssetId, Ot as ReferenceField, Pa as DialogHeader, Pi as stripStaleTransitionStyleGroup, Pn as getBlockDefinition, Pt as useEditor, Q as resolvePreviewSidebarTab, Qi as paletteModeSchema, Qn as resolvePageRouteTarget, Qr as backgroundAppearanceQuickColorTokenNames, Qt as unsafeAsLinkedContentEntryId, Rn as planSiteOverlayHeaderClearance, Rr as getGradientPreset, Rt as hideThemeV2RawStyleFields, Si as getAtPath, Sn as decodePublicProductCategorySelectorQuery, So as parseFooterModuleId, Sr as applyCompiledRuntimeFieldsToContent, St as EntryPickerField, Ti as calendarWindowQuerySchema, Tn as AMBIENT_BACKGROUND_ROLES, To as unsafeAsEditorBlockValues, Tr as planPageDesignLayoutLookCompatibility, Tt as ButtonWidgetProvider, Un as buildThemeRuntime, Ur as boundaryLayout, Ut as useEditorUiStore, Vn as compileManifestContentContract, Vr as autoDesignChoice, Vt as getBlockManifestFromSdkConfig, W as beginAutosaveBatch, Wn as DEFAULT_THEME_RESPONSIVE_MODE, Wr as composeBoundary, Wt as useEditorUiStoreInstance, Xa as X, Xn as defaultTransforms, Xr as sectionTransitionVariantForBoundaryOptionId, Xt as redoHistory, Y as rejectAutosaveBatch, Ya as cn, Yn as getDefaultComponentRegistry, Yr as sectionTransitionFamilyForBoundaryOptionId, Yt as pushHistoryEntry, Za as Upload, Zi as paletteColorsSchema, Zn as resolveEntryRouteTarget, Zr as backgroundAppearanceColorTokenNames, Zt as undoHistory, _ as reportPreviewDesignError, _a as SelectTrigger, _i as buildResolveImageUrlContext, _n as createStoreBackend, _o as ChevronLeft, _r as heroCtaRowFragment, _t as MailingListTargetingField, aa as hasEmptyOption, ai as runTransforms, ar as richTextFragment, bi as setContextResolveImageUrlContext, bn as getPageDesignEditorState, bo as buildMailingListSignupBlockSourceRef, br as bodyCopyFragment, bt as InlineTextField, ca as unmapValueFromSelect, ci as parseGeneratedIconSetId, cr as faqAccordionFragment, ct as EntryControllerProvider, d as PreviewDesignCoordinatorProvider, di as logger, dn as usePalette, dr as singleButtonFragment, dt as createSiteOptionApiLoader, ea as attachRenderableMediaAssetFields, ei as ctaButton, er as LINKED_CONTENT_ENTRY_META_KEY, et as renderSiteChromeBlock, fi as coerceInlineTextWithFallback, fo as Image, fr as formEmbedFragment, ft as createSiteOptionWidgetAdapters, g as PREVIEW_DESIGN_SAVE_ERROR_MESSAGE, ga as SelectItem, gi as RichText$1, gn as evaluateVisibility, go as ChevronRight, gr as ctaCopyFragment, gt as OfferingsPreviewWidgetProvider, h as PREVIEW_DESIGN_LOAD_ERROR_MESSAGE, ha as SelectContent, hi as Text$1, hn as FormRenderer, hr as testimonialsHeadingFragment, ht as OfferingsPreviewGroupOrderField, i as usePreviewDesignHistoryOrder, ia as useSdkConfig, ii as parseBackgroundContent, in as BUILT_IN_REFERENCE_KINDS, io as RotateCcw, ir as ImageResolveContextProvider, it as PREVIEW_EDITABLE_OUTLINE, ja as DialogContent, ji as corners, jn as containerResponsiveThemeCss, jr as surfaceResolutionContextFromTheme, jt as RichTextField, ka as TabsTrigger, ki as isObjectRecord, kn as isSupportedLoaderEndpoint, ko as parseSiteId, kr as designRuntimeRulesForTheme, kt as ReferenceWidgetProvider, la as FieldFrame, lr as faqHeadingFragment, m as usePreviewThemeOverlay, ma as Select, mi as isInlineTextEmpty, mr as testimonialsCarouselFragment, mt as SiteOptionWidgetProvider, n as useSiteChromeCustomizeOptional, na as isHeaderField, nn as createRoutingHelpers, nr as getLinkedContentEntryMeta, nt as PreviewInlineTextEditor, oa as mapCurrentValueForSelect, oi as parseBlockIconValue, on as parseReferenceKind, or as headingFragment, ot as useUISelector, p as PreviewThemeOverlayProvider, pi as inlineTextToPlainText, pn as createManifestFormAdapter, po as GripVertical, pr as formCopyFragment, pt as SiteOptionPickerField, q as enqueueTransaction, qa as Button, qi as parseThemeForPersistence, qn as mergeContentWithBlockStyleOverrides, qr as defaultSectionTransitionVariantForFamily, qt as canUndoHistory, r as PreviewDesignHistoryOrderProvider, ra as SdkConfigProvider, ri as planSiteChromePlacement, rn as createSnapshotFromPageRecord, rr as clientComponentRegistry, rt as PreviewTextEditor, sa as mapOptionValueForSelect, si as parseGeneratedIconAssetId, sr as cardFragment, st as EditableBlockProvider, t as SiteChromeCustomizeProvider, ta as getFieldIntent, ti as bindingSchema, tn as useDebouncedLatestSave, tr as coerceLinkedContentEntriesPayload, tt as PreviewRichTextEditor, ua as useField, ui as renderInlineText, un as PaletteProvider, ur as blogFeaturedPostFragment, ut as useEntryEditorController, va as SelectValue, vi as getCurrentResolveImageUrlContext, vn as MediaEditor, vr as ctaRowFragment, vt as loadMailingListAuthoringContext, wi as BlockApiProvider, wn as deriveLaunchReadiness, wo as unsafeAsEditorBlockId, wr as formatSiteChromeBackgroundTokenLabel, wt as ButtonVariantField, xi as SECTION_BACKGROUND_MIN_SOURCE_WIDTH, xo as sameMailingListPlacementTargeting, xr as defineFragment, xt as IconPickerField, yi as resolveImageUrlWithContext, yn as applyPageDesignEditorAction, yr as heroCopyFragment, yt as MailingListTargetingProvider, zn as visibleHeaderClearancePx, zr as parseGradientPresetId, zt as prepareBlockEditorManifest } from "./SiteChromeCustomizeContext-DQXZXiqS.mjs";
-import { i as useOptionalPreviewLayout, t as PreviewQueryProvider } from "./PreviewQueryProvider-Dd4dxOiU.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-C_EHQ5XA.mjs";
+import { $a as DialogFooter, $n as canUndoHistory, $r as SECTION_BACKGROUND_MIN_SOURCE_WIDTH, $t as createStoreBackend, Aa as attachRenderableMediaAssetFields, Ao as GripVertical, Ar as parseGeneratedIconSetId, At as MailingListTargetingProvider, Bi as gradientToCss, Bo as baselineRevisionOf, Br as bookingConsentCarrierSchema, Bt as ReferenceWidgetProvider, Ca as makeBoundaryId, Ci as parseBackgroundContent, Cn as stripTopLevelRoutingUi, Cr as escapeStyleContent, Ct as createSiteOptionWidgetAdapters, Da as bodyCopyFragment, Di as planPageDesignLayoutLookCompatibility, Dn as createManifestFormAdapter, Dt as OfferingsPreviewWidgetProvider, Ea as ctaButton, Ei as formatSiteChromeBackgroundTokenLabel, En as isHeaderField, Er as getDefaultComponentRegistry, Et as OfferingsPreviewGroupOrderField, Fa as SelectContent, Fi as parseThemeForPersistence, Fr as RichText$1, Ft as ButtonVariantField, G as confirmAutosaveBatch, Go as buildMailingListSignupBlockSourceRef, Gr as resolvePageRouteTarget, Gt as useEditor, Hi as GRADIENT_PRESET_IDS, Hn as useEditorUiStore, Ho as recordsEqual, Hr as eventCalendarListLayoutCompatibleDisplayModeValues, Ht as RichTextField, Ia as SelectItem, Ii as resolveSdkFooterMode, In as BUILT_IN_REFERENCE_KINDS, Ir as getAtPath, It as ButtonWidgetProvider, J as idleEditorTransactionQueueState, Ja as TabsList, Jn as remoteDraftValues, Jo as parseMailingListPlacementTargeting, Jr as isRecord$11, K as deriveTransactionCapabilities, Ka as Tabs, Kn as activeLinkedSaveHandover, Ko as sameMailingListPlacementTargeting, Kr as resolveRouteTarget, Kt as LinkField, La as SelectTrigger, Lo as Button, Lr as siblingPath, Lt as FileField, Mn as getBlockManifestFromSdkConfig, Mr as renderInlineText, Mt as IconPickerField, Ni as surfaceResolutionContextFromTheme, Nn as createRoutingHelpers, No as ChevronRight, Nr as logger, Nt as EntryPickerField, Oa as defineFragment, Oi as resolvePageDesignEditorBoundaryForChoice, Or as parseBlockIconValue, Ot as MailingListTargetingField, Pa as Select, Pi as corners, Pn as createSnapshotFromPageRecord, Po as ChevronLeft, Pr as Text$1, Pt as EntryPickerWidgetProvider, Q as resolvePreviewSidebarTab, Qa as DialogDescription, Qn as canRedoHistory, Qr as setContextResolveImageUrlContext, Qt as FormRenderer, Ra as SelectValue, Rn as parseReferenceKind, Rr as defaultTransforms, Rt as MediaField, Sa as assertNever$1, Si as heroCopyFragment, Sn as prepareBlockEditorManifest, Sr as getResponsiveScopeSpec, St as createSiteOptionApiLoader, Ta as runTransforms, Ti as compileEditorModelRuntime, Tn as getFieldIntent, Tr as readBlockComposition, Tt as SiteOptionWidgetProvider, Ui as getGradientPreset, Un as useEditorUiStoreInstance, Ur as eventCalendarListLayoutOptions, Ut as RichTextWidgetProvider, Vi as GRADIENT_PRESETS, Vo as isEdited, Vr as isRichTextDoc, Vt as useRichTextImagePicker, W as beginAutosaveBatch, Wi as parseGradientPresetId, Wn as useOptionalEditorUiStoreInstance, Wo as canEditorWrite, Wr as resolveEntryRouteTarget, Wt as EditorProvider, Xa as Dialog, Xn as renderedFieldChanges, Xo as selectedContentVersionId, Xr as getCurrentResolveImageUrlContext, Xt as usePalette, Y as rejectAutosaveBatch, Ya as TabsTrigger, Yn as renderSourceFor, Yo as NO_BLOCK_VERSIONS, Yr as buildResolveImageUrlContext, Yt as PaletteProvider, Za as DialogContent, Zn as resolveRenderedValues, Zo as parseEditLeaseScope, Zr as resolveImageUrlWithContext, _ as reportPreviewDesignError, _i as testimonialsCarouselFragment, _n as mapOptionValueForSelect, _r as resolveVariantKey, _t as VIEWING_PARTICIPATION, aa as boundaryTreatmentForBoundaryOptionId, ai as LINKED_CONTENT_ENTRY_META_KEY, an as deriveLaunchReadiness, ar as unsafeAsLinkedContentEntryId, as as parseSiteId, ba as defaultThemeTokens, bi as heroCtaRowFragment, bn as useField, br as buildThemeRuntime, bt as EditLeaseModal, ca as sectionTransitionFamilyForBoundaryOptionId, ci as richTextFragment, cn as useMediaEditorOptional, cr as containerResponsiveThemeCss, ct as EntryControllerProvider, d as PreviewDesignCoordinatorProvider, da as pageDesignEditorBackgroundOverrideOwner, di as faqAccordionFragment, dn as ImageResolveContextProvider, dr as getBlockDefinition, ea as autoDesignChoice, ei as planSiteChromePlacement, en as MediaEditor, eo as DialogHeader, er as createHistoryState, et as renderSiteChromeBlock, fa as stripStaleTransitionStyleGroup, fi as faqHeadingFragment, fn as BlockApiProvider, fr as projectRecurringSchedule, g as PREVIEW_DESIGN_SAVE_ERROR_MESSAGE, ga as textColorStyle, gi as formCopyFragment, gn as mapCurrentValueForSelect, gr as visibleHeaderClearancePx, gt as useRetentionTicks, h as PREVIEW_DESIGN_LOAD_ERROR_MESSAGE, ha as parseBackgroundAppearanceColorToken, hi as formEmbedFragment, hn as hasEmptyOption, hr as planSiteOverlayHeaderClearance, ht as createPageSurfaceEditorServices, i as usePreviewDesignHistoryOrder, ia as sectionFactsForContent, ii as plainTextToInlineText, in as DEFAULT_LAUNCH_READINESS_INPUT, ir as toEditorBlockItem, is as parseMediaAssetId, it as PREVIEW_EDITABLE_OUTLINE, ji as designRuntimeRulesForTheme, jn as blocksKeys, jt as InlineTextField, ka as bindingSchema, ki as componentRuntimeRulesForTheme, ko as Image, kr as parseGeneratedIconAssetId, kt as loadMailingListAuthoringContext, la as sectionTransitionVariantForBoundaryOptionId, li as headingFragment, ln as useApiMediaUploader, lr as createCustomBlockRegistry, m as usePreviewThemeOverlay, ma as backgroundAppearanceQuickColorTokenNames, mi as singleButtonFragment, mn as useSdkConfig, mo as Upload, mr as SITE_OVERLAY_HEADER_CLEARANCE_CSS_VAR, mt as createEditorApiClientFactory, n as useSiteChromeCustomizeOptional, na as boundaryLayout, ni as inlineTextToPlainText, nn as getPageDesignEditorState, nr as redoHistory, ns as assertNever$2, nt as PreviewInlineTextEditor, oa as defaultSectionTransitionVariantForFamily, oi as coerceLinkedContentEntriesPayload, on as AMBIENT_BACKGROUND_ROLES, or as isSupportedLoaderEndpoint, os as __exportAll, ot as useUISelector, p as PreviewThemeOverlayProvider, pa as backgroundAppearanceColorTokenNames, pi as blogFeaturedPostFragment, pn as SdkConfigProvider, po as X, pr as SITE_CHROME_VISIBLE_HEADER_SELECTOR, pt as useDebouncedLatestSave, q as enqueueTransaction, qa as TabsContent, qn as planLinkedSaveHandoverRetention, qo as parseFooterModuleId, qr as isObjectRecord, qt as LinkWidgetProvider, r as PreviewDesignHistoryOrderProvider, ra as composeBoundary, ri as isInlineTextEmpty, rn as decodePublicProductCategorySelectorQuery, rr as undoHistory, rs as expectParsedBrandedId, rt as PreviewTextEditor, sa as sectionTransitionFamilies, si as getLinkedContentEntryMeta, sn as MediaEditorContextProvider, sr as ThemeScope, st as EditableBlockProvider, t as SiteChromeCustomizeProvider, ta as userPinnedDesignChoice, ti as coerceInlineTextWithFallback, tn as applyPageDesignEditorAction, to as DialogTitle, tr as pushHistoryEntry, ts as unsafeAsEditorBlockId, tt as PreviewRichTextEditor, ua as isThemeV2NormalEditorRawStyleFieldName, ui as cardFragment, un as clientComponentRegistry, ur as makeDefaultBlockComponent, ut as useEntryEditorController, va as paletteColorsSchema, vi as testimonialsHeadingFragment, vn as unmapValueFromSelect, vr as compileManifestContentContract, wa as ORDINARY_TEXT_MIN_CONTRAST_RATIO, wi as applyCompiledRuntimeFieldsToContent, wn as evaluateVisibility, wr as mergeContentWithBlockStyleOverrides, wt as SiteOptionPickerField, xa as asDesignBlockId, xi as ctaRowFragment, xn as hideThemeV2RawStyleFields, xo as RotateCcw, xr as DEFAULT_THEME_RESPONSIVE_MODE, xt as EditorWriteSurface, ya as paletteModeSchema, yi as ctaCopyFragment, yn as FieldFrame, yr as validateManifestDraft, yt as EditLeaseDiscardedNotice, zo as cn, zr as calendarWindowQuerySchema, zt as ReferenceField } from "./SiteChromeCustomizeContext-JYA0cJ_Z.mjs";
+import { i as useOptionalPreviewLayout, t as PreviewQueryProvider } from "./PreviewQueryProvider-C0mndwHB.mjs";
+import { _ as SURFACE_IDS, a as usePreviewAuth, g as SURFACE_DOCUMENT_DATA_ATTRIBUTE, i as setPreviewAccessToken, l as isPreviewRuntimeSessionEditable, n as initPreviewAuth, o as usePreviewAuthFetch, p as unwrapResponse, r as markPreviewAuthExpired, s as usePreviewToken, t as createGuardedPreviewApiClient, u as ApiRequestError, v as resolveSurfaceDocumentAttributes, y as API_ENDPOINTS } from "./previewAuthStore-BBmV7UsW.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";
+import { useQueryClient } from "@tanstack/react-query";
 import { z } from "zod";
 import { createPortal } from "react-dom";
 //#region ../ui/src/fixed-bottom-surface.tsx
@@ -174,70 +175,6 @@ function ResizableSplitPane({ left, right, defaultSplit = 40, minLeftWidth = 300
 	});
 }
 //#endregion
-//#region ../blocks/src/system/icons/generatedAssets.ts
-function isRecord$10(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function generatedIconAssetRefKey(ref) {
-	return `${ref.setId}\u0000${ref.assetId}`;
-}
-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$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$10(card)) continue;
-			const icon = parseBlockIconValue(card.icon);
-			if (icon.kind !== "generated") continue;
-			const ref = {
-				setId: icon.setId,
-				assetId: icon.assetId
-			};
-			refs.set(generatedIconAssetRefKey(ref), ref);
-		}
-		if (refs.size > 0) blocks.push({
-			blockId: block.id,
-			refs: [...refs.values()]
-		});
-	}
-	return blocks;
-}
-function dedupeGeneratedIconAssetRefs(blocks) {
-	return [...new Map(blocks.flatMap((block) => block.refs).map((ref) => [generatedIconAssetRefKey(ref), ref])).values()];
-}
-function mapGeneratedIconAssetsToBlocks(blocks, resolvedAssets) {
-	const byKey = new Map(resolvedAssets.map((asset) => [generatedIconAssetRefKey(asset), asset]));
-	return Object.fromEntries(blocks.flatMap((block) => {
-		const assets = block.refs.flatMap((ref) => {
-			const asset = byKey.get(generatedIconAssetRefKey(ref));
-			if (!asset) return [];
-			const setId = parseGeneratedIconSetId(asset.setId);
-			const assetId = parseGeneratedIconAssetId(asset.assetId);
-			if (!setId || !assetId) return [];
-			return [{
-				setId,
-				assetId,
-				src: asset.src,
-				...asset.width === void 0 ? {} : { width: asset.width },
-				...asset.height === void 0 ? {} : { height: asset.height }
-			}];
-		});
-		return assets.length > 0 ? [[block.blockId, assets]] : [];
-	}));
-}
-function mergeGeneratedIconAssetsIntoResolvedData(resolvedData, assetsByBlock) {
-	if (Object.keys(assetsByBlock).length === 0) return resolvedData;
-	const merged = { ...resolvedData };
-	for (const [blockId, generatedIconAssets] of Object.entries(assetsByBlock)) merged[blockId] = {
-		...merged[blockId] ?? {},
-		generatedIconAssets
-	};
-	return merged;
-}
-//#endregion
 //#region ../blocks/src/system/fragments/library/headerCta.ts
 const headerCtaFragment = defineFragment({
 	id: "headerCta",
@@ -345,6 +282,70 @@ function getFragmentRegistry() {
 	return fragmentRegistry;
 }
 //#endregion
+//#region ../blocks/src/system/icons/generatedAssets.ts
+function isRecord$10(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function generatedIconAssetRefKey(ref) {
+	return `${ref.setId}\u0000${ref.assetId}`;
+}
+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$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$10(card)) continue;
+			const icon = parseBlockIconValue(card.icon);
+			if (icon.kind !== "generated") continue;
+			const ref = {
+				setId: icon.setId,
+				assetId: icon.assetId
+			};
+			refs.set(generatedIconAssetRefKey(ref), ref);
+		}
+		if (refs.size > 0) blocks.push({
+			blockId: block.id,
+			refs: [...refs.values()]
+		});
+	}
+	return blocks;
+}
+function dedupeGeneratedIconAssetRefs(blocks) {
+	return [...new Map(blocks.flatMap((block) => block.refs).map((ref) => [generatedIconAssetRefKey(ref), ref])).values()];
+}
+function mapGeneratedIconAssetsToBlocks(blocks, resolvedAssets) {
+	const byKey = new Map(resolvedAssets.map((asset) => [generatedIconAssetRefKey(asset), asset]));
+	return Object.fromEntries(blocks.flatMap((block) => {
+		const assets = block.refs.flatMap((ref) => {
+			const asset = byKey.get(generatedIconAssetRefKey(ref));
+			if (!asset) return [];
+			const setId = parseGeneratedIconSetId(asset.setId);
+			const assetId = parseGeneratedIconAssetId(asset.assetId);
+			if (!setId || !assetId) return [];
+			return [{
+				setId,
+				assetId,
+				src: asset.src,
+				...asset.width === void 0 ? {} : { width: asset.width },
+				...asset.height === void 0 ? {} : { height: asset.height }
+			}];
+		});
+		return assets.length > 0 ? [[block.blockId, assets]] : [];
+	}));
+}
+function mergeGeneratedIconAssetsIntoResolvedData(resolvedData, assetsByBlock) {
+	if (Object.keys(assetsByBlock).length === 0) return resolvedData;
+	const merged = { ...resolvedData };
+	for (const [blockId, generatedIconAssets] of Object.entries(assetsByBlock)) merged[blockId] = {
+		...merged[blockId] ?? {},
+		generatedIconAssets
+	};
+	return merged;
+}
+//#endregion
 //#region ../blocks/src/pageRenderingMode.ts
 var MissingBlockOverrideError = class extends Error {
 	constructor(blockKind) {
@@ -564,6 +565,7 @@ function buildPageRendererRootRuntime(dataContext) {
 	const { siteId = null, siteName, 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,
+		demoEmailSuppressed: resolveDemoEmailSuppression(dataContext),
 		siteName,
 		pageId,
 		pathname,
@@ -579,6 +581,9 @@ function buildPageRendererRootRuntime(dataContext) {
 		loaderFailures
 	};
 }
+function resolveDemoEmailSuppression(dataContext) {
+	return dataContext?.demoEmailSuppressed === true;
+}
 //#endregion
 //#region ../blocks/src/pageRenderAudience.tsx
 /**
@@ -1001,15 +1006,17 @@ function planNewsletterBlockSubmission(placement) {
 			sourceRef
 		} : { tag: "unavailable" };
 	}
-	if (placement.publishedPlacement && "kind" in placement.publishedPlacement) return { tag: "unpublished-settings" };
-	if (placement.publishedPlacement) return planNewsletterPreviewSubmission({
-		blockId: placement.blockId,
-		publishedContentId: placement.publishedPlacement.id,
-		renderedContent: placement.renderedContent,
-		publishedContent: placement.publishedPlacement.content
-	});
-	if (placement.stage === "preview") return { tag: "unpublished-form" };
-	return { tag: "unavailable" };
+	const published = placement.publishedPlacement;
+	if (published === null) return placement.stage === "preview" ? { tag: "unpublished-form" } : { tag: "unavailable" };
+	switch (published.kind) {
+		case "incomplete": return { tag: "unpublished-settings" };
+		case "published": return planNewsletterPreviewSubmission({
+			blockId: placement.blockId,
+			publishedContentId: published.id,
+			renderedContent: placement.renderedContent,
+			publishedContent: published.content
+		});
+	}
 }
 /** Decide whether the visible draft can safely cite the published placement. */
 function planNewsletterPreviewSubmission(placement) {
@@ -1256,19 +1263,6 @@ function createBlockErrorBoundary() {
 const BlockErrorBoundary = createBlockErrorBoundary();
 //#endregion
 //#region ../blocks/src/pageRenderAdmission.ts
-/** Pair a published version with the content it authorises at the render boundary. */
-function readPublishedBlockPlacement(id, content) {
-	if (id == null && content == null) return null;
-	if (id == null || content == null) return {
-		kind: "incomplete",
-		id: id ?? null,
-		content: content ?? null
-	};
-	return {
-		id,
-		content
-	};
-}
 function toEditorPresentationPage(page) {
 	if (!page) return null;
 	return {
@@ -2842,11 +2836,16 @@ function isNonEmptyString(value) {
 function hasText(value) {
 	return isNonEmptyString(value);
 }
-({
+const FILE_STORAGE_BUCKETS = {
 	publicSite: unsafeAsStorageBucketName("media"),
 	privateSite: unsafeAsStorageBucketName("site-files-private"),
-	temporary: unsafeAsStorageBucketName("temp-uploads")
-}).publicSite;
+	temporary: unsafeAsStorageBucketName("temp-uploads"),
+	siteAssets: unsafeAsStorageBucketName("site-assets"),
+	siteFonts: unsafeAsStorageBucketName("site-fonts"),
+	bookingRequirementDocuments: unsafeAsStorageBucketName("booking-requirement-documents")
+};
+FILE_STORAGE_BUCKETS.publicSite, FILE_STORAGE_BUCKETS.siteAssets, FILE_STORAGE_BUCKETS.siteFonts;
+FILE_STORAGE_BUCKETS.publicSite, FILE_STORAGE_BUCKETS.privateSite, FILE_STORAGE_BUCKETS.temporary, FILE_STORAGE_BUCKETS.siteAssets, FILE_STORAGE_BUCKETS.siteFonts, FILE_STORAGE_BUCKETS.bookingRequirementDocuments;
 const IMAGE_FILE_FORMATS = [
 	"jpeg",
 	"png",
@@ -3782,9 +3781,9 @@ function MediaEditorProvider({ siteId, apiClient, children, bucket = DEFAULT_MED
 		});
 	}, [baseAssetsSnapshotKey, siteId]);
 	const repo = useMemo(() => {
-		const clientFn = ((request) => {
+		const clientFn = (request) => {
 			return apiClient(augmentRequest ? augmentRequest(request, { siteId }) : request);
-		});
+		};
 		return createCachedMediaRepo(createApiMediaRepo({ client: clientFn }));
 	}, [
 		apiClient,
@@ -5166,6 +5165,11 @@ function canInspectSiteStyle(access) {
 	return access.kind === "apply-allowed";
 }
 //#endregion
+//#region ../preview-next/src/constants.ts
+const PREVIEW_THEME_COOKIE_NAME = "preview_theme_id";
+const PREVIEW_KEEP_ALIVE_INTERVAL_MS = 600 * 1e3;
+const PREVIEW_KEEP_ALIVE_JITTER_RATIO = .1;
+//#endregion
 //#region ../preview-next/src/client/preview/previewChromeSurface.ts
 const PREVIEW_CHROME_THEME_CLASS_NAME = "builder-dashboard-chrome-theme";
 const PREVIEW_CHROME_PORTAL_CLASS_NAME = "builder-editor-chrome";
@@ -5195,6 +5199,25 @@ function applyPreviewChromeSurfaceToElement(element, surface, options) {
 	element.removeAttribute(SURFACE_DOCUMENT_DATA_ATTRIBUTE);
 }
 //#endregion
+//#region ../preview-next/src/client/preview/previewCustomizeAutosave.ts
+/** Work selection and checkpoint capture share the existing transaction objects. */
+function previewCustomizeCanAutosave(workflow) {
+	return workflow.kind === "loaded" && (workflow.mutation.kind === "dirty" || workflow.mutation.kind === "failed") && workflow.mutation.actions.length > 0;
+}
+/** Preserve transaction identity and history while a checkpoint waits for an active save. */
+function previewCustomizePendingBatch(workflow) {
+	if (workflow.kind !== "loaded") return { transactions: [] };
+	switch (workflow.mutation.kind) {
+		case "dirty":
+		case "failed": return { transactions: workflow.mutation.actions };
+		case "applying": return { transactions: workflow.mutation.queuedActions };
+		case "idle":
+		case "undoing":
+		case "redoing":
+		case "stale": return { transactions: [] };
+	}
+}
+//#endregion
 //#region ../blocks/src/system/customize/serializeBackgroundOverride.ts
 function serializeBackgroundOverride(override) {
 	switch (override.kind) {
@@ -6019,10 +6042,10 @@ function beginPreviewCustomizeApply(workflow, action) {
 		}
 	};
 }
-function beginPreviewCustomizeAutosave(workflow) {
+function beginPreviewCustomizeAutosave(workflow, captured) {
 	if (workflow.kind !== "loaded") return skippedPreviewCustomizeBeginResult("not-loaded");
-	if (workflow.mutation.kind !== "dirty" && workflow.mutation.kind !== "failed") return skippedPreviewCustomizeBeginResult("no-history-entry");
-	const nextMutation = previewCustomizeMutationFromQueueState(beginAutosaveBatch(previewCustomizeQueueStateFromMutation(workflow.mutation)));
+	if (!previewCustomizeCanAutosave(workflow)) return skippedPreviewCustomizeBeginResult("no-history-entry");
+	const nextMutation = previewCustomizeMutationFromQueueState(beginAutosaveBatch(previewCustomizeQueueStateFromMutation(workflow.mutation), captured));
 	if (nextMutation.kind !== "applying") return skippedPreviewCustomizeBeginResult("no-history-entry");
 	const actions = nextMutation.batch.transactions.map((intent) => intent.action);
 	if (actions.length === 0) return skippedPreviewCustomizeBeginResult("no-history-entry");
@@ -6200,21 +6223,6 @@ function isPendingMutation(mutation) {
 		default: return assertNever$1(mutation, "Unhandled preview customize mutation");
 	}
 }
-function pendingCustomizeIntents(mutation) {
-	switch (mutation.kind) {
-		case "dirty": return mutation.actions;
-		case "applying": return mutation.queuedActions;
-		case "failed": return mutation.actions;
-		case "idle":
-		case "undoing":
-		case "redoing":
-		case "stale": return [];
-		default: return assertNever$1(mutation, "Unhandled preview customize mutation");
-	}
-}
-function previewCustomizePendingActions(workflow) {
-	return workflow.kind === "loaded" ? pendingCustomizeIntents(workflow.mutation).map((intent) => intent.action) : [];
-}
 function previewCustomizeTargetKey(action) {
 	switch (action.kind) {
 		case "set-layout": return `block:${action.blockId}:layout`;
@@ -6395,6 +6403,22 @@ function optimisticBoundaryChoice(action) {
 	}
 }
 //#endregion
+//#region ../preview-next/src/client/preview/usePreviewCustomizeWorkflowState.ts
+/** Update the scheduler's authoritative workflow before its next serialized request. */
+function usePreviewCustomizeWorkflowState() {
+	const [state, setRenderedState] = useState(unsupportedPreviewCustomizeWorkflowState);
+	const stateRef = useRef(state);
+	return [
+		state,
+		useCallback((next) => {
+			const value = typeof next === "function" ? next(stateRef.current) : next;
+			stateRef.current = value;
+			setRenderedState(value);
+		}, []),
+		stateRef
+	];
+}
+//#endregion
 //#region ../blocks/src/system/customize/facets.ts
 function defineCustomizeFacet(definition) {
 	return definition;
@@ -6600,56 +6624,37 @@ function currentLocalBlockContent(uiStore, targetBlockId) {
 	const current = uiStore.getState().drafts.getCurrentValues(unsafeAsEditorBlockId(targetBlockId));
 	return isRecord$5(current) ? current : null;
 }
+/**
+* The customize runtime drives these values and owns their undo, so they go in as a
+* history-free `edited` event (issue 1553). A block the store hasn't loaded is created
+* first, pristine at the content the runtime started from.
+*/
 function replaceLocalBlockContentWithoutHistory(input) {
 	const editorBlockId = unsafeAsEditorBlockId(input.targetBlockId);
-	const history = input.uiStore.getState().history;
-	const snapshot = history.getState().present;
-	const draft = snapshot.drafts[editorBlockId];
-	const nextDraft = draft ? applyDraftContentPatch(draft, input.nextContent, input.baselineEquivalentContent) : localRuntimeDraftForBlock({
-		editorBlockId,
-		targetBlockId: input.targetBlockId,
-		editorModel: input.editorModel,
-		previousContent: input.previousContent,
-		nextContent: input.nextContent
-	});
-	if (!nextDraft) return { kind: "missing-block-model" };
-	history.restorePresent({
-		...snapshot,
-		drafts: {
-			...snapshot.drafts,
-			[editorBlockId]: nextDraft
-		}
-	});
+	const drafts = input.uiStore.getState().drafts;
+	const draft = drafts.getBlockSnapshot(editorBlockId);
+	if (!draft && !initRuntimeBlock(input.uiStore, editorBlockId, input)) return { kind: "missing-block-model" };
+	drafts.editWithoutHistory(editorBlockId, shownContent(draft, input.nextContent, input.baselineEquivalentContent));
 	return { kind: "applied" };
 }
-function applyDraftContentPatch(draft, nextContent, baselineEquivalentContent) {
-	const nextValues = unsafeAsEditorBlockValues(nextContent);
-	const baselineEquivalentValues = baselineEquivalentContent ? unsafeAsEditorBlockValues(baselineEquivalentContent) : null;
-	const current = baselineEquivalentValues && recordsEqual(nextValues, baselineEquivalentValues) ? draft.baseline : nextValues;
-	return {
-		...draft,
-		version: draft.version + 1,
-		current,
-		syncState: recordsEqual(draft.baseline, current) ? { kind: "baseline" } : { kind: "pending" }
-	};
+/** Content equivalent to the baseline shows the baseline itself, so the block is pristine again. */
+function shownContent(draft, nextContent, baselineEquivalentContent) {
+	return draft && baselineEquivalentContent && recordsEqual(nextContent, baselineEquivalentContent) ? draft.sync.baseline.values : nextContent;
 }
-function localRuntimeDraftForBlock(input) {
+function initRuntimeBlock(uiStore, editorBlockId, input) {
 	const block = input.editorModel?.blocks.find((candidate) => candidate.blockId === input.targetBlockId) ?? null;
-	if (!block) return null;
-	return {
-		id: input.editorBlockId,
-		version: 1,
-		baseline: unsafeAsEditorBlockValues(input.previousContent),
-		current: unsafeAsEditorBlockValues(input.nextContent),
-		syncState: { kind: "pending" },
-		meta: {
+	if (!block) return false;
+	const state = uiStore.getState();
+	state.admitServerBlocks([{
+		block: {
+			id: editorBlockId,
 			kind: block.blockKind,
-			purpose: null,
-			orderIndex: null,
-			publishedContent: null,
-			optimisticHash: null
-		}
-	};
+			content: input.previousContent,
+			versions: state.blockVersions.require(editorBlockId)
+		},
+		action: "reconcile"
+	}]);
+	return true;
 }
 function isRecord$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
@@ -6674,17 +6679,13 @@ const PageDesignEditorStateContext = createContext({
 });
 function PreviewPageDesignEditorStateProvider({ apiClient, siteId, pageId, enabled, autosaveDelayMs, children }) {
 	const [reloadKey, setReloadKey] = useState(0);
-	const [workflowState, setWorkflowState] = useState(unsupportedPreviewCustomizeWorkflowState);
+	const [workflowState, setWorkflowState, workflowStateRef] = usePreviewCustomizeWorkflowState();
 	const [backgroundImagePool, setBackgroundImagePool] = useState([]);
 	const [backgroundImagePoolStatus, setBackgroundImagePoolStatus] = useState("idle");
-	const workflowStateRef = useRef(workflowState);
 	const pendingDesignHistoryOrderRecordRef = useRef(false);
 	const previewDesignHistoryOrder = usePreviewDesignHistoryOrder();
 	const backgroundImagePoolRequestRef = useRef(null);
 	const uiStore = useOptionalEditorUiStoreInstance();
-	useEffect(() => {
-		workflowStateRef.current = workflowState;
-	}, [workflowState]);
 	useEffect(() => {
 		if (!enabled || !pageId) {
 			setWorkflowState(unsupportedPreviewCustomizeWorkflowState());
@@ -6754,9 +6755,9 @@ function PreviewPageDesignEditorStateProvider({ apiClient, siteId, pageId, enabl
 		siteId
 	]);
 	const autosave = useDebouncedLatestSave({
-		getSnapshot: () => previewCustomizePendingActions(workflowStateRef.current),
-		buildPayload: (actions) => actions,
-		shouldSkip: (actions) => actions.length === 0 || !enabled || !pageId,
+		getSnapshot: () => previewCustomizePendingBatch(workflowStateRef.current),
+		buildPayload: (batch) => batch.transactions.map((transaction) => transaction.action),
+		shouldSkip: (batch) => batch.transactions.length === 0 || !enabled || !pageId || !previewCustomizeCanAutosave(workflowStateRef.current),
 		delay: autosaveDelayMs,
 		save: async (actions) => {
 			if (!pageId) return null;
@@ -6769,9 +6770,9 @@ function PreviewPageDesignEditorStateProvider({ apiClient, siteId, pageId, enabl
 				editorModel: currentPageState.kind === "loaded" ? currentPageState.editorModel : null
 			});
 		},
-		onSaving: () => {
+		onSaving: (batch) => {
 			setWorkflowState((current) => {
-				const begin = beginPreviewCustomizeAutosave(current);
+				const begin = beginPreviewCustomizeAutosave(current, batch);
 				if (begin.kind !== "started") return current;
 				pendingDesignHistoryOrderRecordRef.current = begin.recordsHistoryEntry;
 				return begin.state;
@@ -6794,7 +6795,7 @@ function PreviewPageDesignEditorStateProvider({ apiClient, siteId, pageId, enabl
 	});
 	useLayoutEffect(() => {
 		return () => {
-			autosave.flush();
+			autosave.flush().catch(() => {});
 		};
 	}, [autosave]);
 	const value = useMemo(() => ({
@@ -7045,7 +7046,7 @@ function blockIdForRuntimePatch(action) {
 function PreviewAuthInit({ children, session, siteId, siteSlug, pageId, token }) {
 	const lastInitRef = useRef(null);
 	const sessionKey = session ? session.kind === "userSession" ? `${session.kind}:${session.canEdit}:${session.canManage}:${session.expiresAt ?? "no-expiry"}` : `${session.kind}:${session.expiresAt ?? "no-expiry"}` : "none";
-	const currentKey = `${siteId}:${pageId ?? "no-page"}:${sessionKey}:${token ? "has-token" : "no-token"}`;
+	const currentKey = `${siteId}:${pageId ?? "no-page"}:${sessionKey}:${token ?? "no-token"}`;
 	if (lastInitRef.current !== currentKey) {
 		initPreviewAuth({
 			session,
@@ -7075,169 +7076,578 @@ const PAGE_CONTENT_TYPE_SCHEMA = {
 	}
 };
 //#endregion
-//#region ../preview-next/src/client/preview/PreviewEntryControllerProvider.tsx
-function toEditorInitialBlock(block, index) {
-	return {
-		id: block.id,
-		draftContentId: block.draftContentId ?? null,
-		publishedContentId: block.publishedContentId ?? null,
-		kind: block.kind,
-		orderIndex: typeof block.orderIndex === "number" ? block.orderIndex : index,
-		content: block.content ?? null,
-		draftContent: block.draftContent ?? null,
-		publishedContent: block.publishedContent ?? null,
-		bindings: block.bindings ?? null,
-		optimisticHash: block.optimisticHash ?? null
-	};
+//#region ../preview-next/src/client/blocks/linkedEntryRenderOverlay.ts
+/**
+* What a tab rendering its own edits lays over the server render for one record:
+* its edit, or else its accepted save until the render catches up (rows H1, H3, H4).
+* A pristine record with no handover (even one kept after a discard, issue 1553 D2)
+* contributes nothing, so it never masks later server-rendered content.
+*/
+function ownEditsOverlay(entry, handovers) {
+	if (isEdited(entry.sync)) {
+		const content = resolveRenderedValues("own-edits", entry, null);
+		return content ? {
+			content: { ...content },
+			optimisticHash: baselineRevisionOf(entry.sync) ?? null
+		} : null;
+	}
+	const handover = activeLinkedSaveHandover(handovers, entry.meta.entryId, entry.sync);
+	const saved = entry.sync.baseline.values;
+	return handover && saved ? {
+		content: { ...saved },
+		optimisticHash: handover.revision,
+		handoverRevision: handover.revision
+	} : null;
 }
-function PreviewEntryControllerProvider({ children, siteId, pageId, routeId: providedRouteId, entryData, contentTypeSchema, draftContent, initialStatus = "draft", initialBlocks, pageMetadata, apiClient }) {
-	const { isEditingMode } = useEditor();
-	const schema = contentTypeSchema ?? PAGE_CONTENT_TYPE_SCHEMA;
-	const initialEntry = useMemo(() => {
-		if (entryData) {
-			const draftPath = entryData.draftPath ?? entryData.path ?? "";
-			const publishedPath = entryData.path ?? "";
-			return {
-				kind: "routable",
-				id: entryData.id,
-				draft: {
-					title: entryData.title ?? "",
-					slug: entryData.slug || "",
-					status: entryData.status ?? "draft",
-					publishAt: entryData.publishAt ?? null,
-					path: draftPath
-				},
-				published: {
-					title: entryData.title ?? "",
-					path: publishedPath,
-					status: entryData.status ?? "draft",
-					publishAt: entryData.publishAt ?? null
-				},
-				status: entryData.status ?? "draft",
-				route: {
-					draftMetaTitle: entryData.draftMetaTitle ?? null,
-					draftMetaDescription: entryData.draftMetaDescription ?? null,
-					publishedMetaTitle: entryData.metaTitle ?? null,
-					publishedMetaDescription: entryData.metaDescription ?? null,
-					ogImageId: entryData.ogImageId ?? null
-				}
-			};
-		}
-		if (!pageMetadata || !pageId) return void 0;
-		const routing = createRoutingHelpers(schema, { slug: null });
-		return createSnapshotFromPageRecord({
-			id: pageId,
-			draftTitle: pageMetadata.draftTitle,
-			draftPath: pageMetadata.draftPath,
-			draftStatus: pageMetadata.draftStatus,
-			title: pageMetadata.title,
-			path: pageMetadata.path,
-			status: pageMetadata.status,
-			publishedAt: pageMetadata.publishedAt,
-			draftMetaTitle: pageMetadata.draftMetaTitle,
-			draftMetaDescription: pageMetadata.draftMetaDescription,
-			publishedMetaTitle: pageMetadata.publishedMetaTitle,
-			publishedMetaDescription: pageMetadata.publishedMetaDescription,
-			ogImageId: pageMetadata.ogImageId
-		}, routing, {
-			title: "",
-			slug: null
+/** A viewer lays another tab's live draft over the render, and nothing else. */
+function liveDraftOverlay(entry, remote) {
+	const content = remote ? resolveRenderedValues("live-drafts", entry, remote) : null;
+	return content ? {
+		content: { ...content },
+		optimisticHash: baselineRevisionOf(entry.sync) ?? null
+	} : null;
+}
+/**
+* The linked-entry values the preview renders, following the tab's render source
+* (its own edits, or another tab's live drafts while it only views). Entries only
+* another tab is editing are included too. A viewer never reads its own handovers,
+* so a later external write is never masked (row H8).
+*/
+function linkedEntryRenderOverlaysFromStore(uiStore) {
+	const state = uiStore.getState();
+	const source = renderSourceFor(state.editability);
+	const entries = state.linkedEntries.inspect();
+	const local = entries.flatMap((entry) => {
+		const remote = remoteDraftValues(state.remoteDrafts, {
+			kind: "linked-entry",
+			id: entry.meta.entryId
 		});
-	}, [
-		entryData,
-		pageMetadata,
-		pageId,
-		schema
-	]);
-	const normalizedInitialBlocks = useMemo(() => {
-		return (initialBlocks ?? []).map(toEditorInitialBlock);
-	}, [initialBlocks]);
-	const entityId = pageId || entryData?.id || "";
-	const entityType = entryData ? entryData.type : "page";
-	const entityLabel = entryData ? "Entry" : "Page";
-	const routeId = providedRouteId ?? void 0;
-	const initialContent = entryData ? draftContent ?? entryData.content ?? {} : null;
-	const common = {
-		apiClient,
-		type: entityType || "page",
-		siteId,
-		owner: {
-			kind: "contentEntry",
-			contentEntryId: entityId
-		},
-		routeId,
-		schema,
-		entityLabel,
-		initialEntry,
-		initialBlocks: normalizedInitialBlocks,
-		historyShortcutsEnabled: isEditingMode
-	};
-	return entryData ? /* @__PURE__ */ jsx(EntryControllerProvider, {
-		...common,
-		kind: "content",
-		initialContent,
-		children
-	}) : /* @__PURE__ */ jsx(EntryControllerProvider, {
-		...common,
-		kind: "page",
-		initialStatus,
-		children
+		const overlay = source === "own-edits" ? ownEditsOverlay(entry, state.linkedSaveHandovers) : liveDraftOverlay(entry, remote);
+		return overlay ? [[entry.meta.entryId, overlay]] : [];
 	});
+	const localIds = new Set(entries.map((entry) => entry.meta.entryId));
+	const remoteOnly = [...state.remoteDrafts?.values() ?? []].flatMap((entry) => {
+		if (entry.item.kind !== "linked-entry") return [];
+		const entryId = unsafeAsLinkedContentEntryId(entry.item.id);
+		return localIds.has(entryId) ? [] : [[entryId, { content: entry.item.values }]];
+	});
+	return new Map([...local, ...remoteOnly]);
 }
-//#endregion
-//#region ../preview-next/src/client/preview/usePreviewKeepAlive.ts
-const DEFAULT_INTERVAL_MS = 600 * 1e3;
-function withJitter(baseMs) {
-	const jitter = .1 * baseMs;
-	const delta = (Math.random() * 2 - 1) * jitter;
-	return Math.max(15e3, Math.round(baseMs + delta));
-}
-function usePreviewKeepAlive({ enabled, fetcher, onExpired, intervalMs = DEFAULT_INTERVAL_MS }) {
-	useEffect(() => {
-		if (!enabled) return void 0;
-		let isActive = true;
-		async function keepAlive() {
-			try {
-				const response = await fetcher("/api/preview/keep-alive", { method: "POST" }, "keep-alive");
-				if (response.status === 401 && isActive) {
-					onExpired("keep-alive");
-					return;
-				}
-				if (!response.ok && isActive) console.warn("Preview keep-alive failed", await response.text());
-			} catch (error) {
-				if (isActive) console.warn("Preview keep-alive error", error);
-			}
-		}
-		keepAlive();
-		const id = window.setInterval(keepAlive, withJitter(intervalMs));
-		return () => {
-			isActive = false;
-			window.clearInterval(id);
-		};
-	}, [
-		enabled,
-		fetcher,
-		intervalMs,
-		onExpired
-	]);
+function applyLinkedEntryRenderOverlay(value, overlays) {
+	if (overlays.size === 0) return value;
+	return overlayValue(value, overlays);
 }
-//#endregion
-//#region ../preview-next/src/client/preview/PreviewKeepAliveClient.tsx
-function PreviewKeepAliveClient({ baseFetch }) {
+function applyLinkedEntryRenderOverlayToDataContext(dataContext, overlays) {
+	if (!dataContext?.resolvedData || overlays.size === 0) return dataContext;
+	const resolvedData = applyLinkedEntryRenderOverlay(dataContext.resolvedData, overlays);
+	if (resolvedData === dataContext.resolvedData) return dataContext;
+	return {
+		...dataContext,
+		resolvedData
+	};
+}
+function overlayValue(value, overlays) {
+	if (Array.isArray(value)) {
+		let changed = false;
+		const next = value.map((item) => {
+			const overlaid = overlayValue(item, overlays);
+			if (overlaid !== item) changed = true;
+			return overlaid;
+		});
+		return changed ? next : value;
+	}
+	if (!isRecord$4(value)) return value;
+	const match = matchingOverlay(value, overlays);
+	if (match) return overlaidEntry(value, match.meta, match.overlay);
+	let changed = false;
+	const next = {};
+	for (const [key, child] of Object.entries(value)) {
+		const overlaid = overlayValue(child, overlays);
+		if (overlaid !== child) changed = true;
+		next[key] = overlaid;
+	}
+	return changed ? next : value;
+}
+/**
+* The overlay for a rendered linked entry, if one applies. A handover stops at an
+* occurrence already rendered at the saved revision (issue 1553, DP6).
+*/
+function matchingOverlay(value, overlays) {
+	const meta = parseLinkedEntryMeta(value[LINKED_CONTENT_ENTRY_META_KEY]);
+	const overlay = meta ? overlays.get(unsafeAsLinkedContentEntryId(meta.entryId)) : void 0;
+	if (!meta || !overlay) return null;
+	return overlay.handoverRevision !== void 0 && meta.optimisticHash === overlay.handoverRevision ? null : {
+		meta,
+		overlay
+	};
+}
+function overlaidEntry(value, meta, overlay) {
+	const displayProjections = resolveOverlayDisplayProjections(overlay.content, meta);
+	const titleProjection = resolveOverlayTitleProjection({
+		currentValue: value,
+		content: overlay.content,
+		meta,
+		displayProjections
+	});
+	const title = titleProjection ? { title: titleProjection } : {};
+	return {
+		...value,
+		...displayProjections,
+		...title,
+		content: overlay.content,
+		optimisticHash: overlayRevision(overlay, meta),
+		[LINKED_CONTENT_ENTRY_META_KEY]: {
+			...meta,
+			...title,
+			optimisticHash: overlayRevision(overlay, meta)
+		}
+	};
+}
+/**
+* Each linked entry's rendered revisions, one per occurrence in the loader data, read
+* before any overlay. Local handover retention compares them with the saved revision
+* (issue 1553, DP7).
+*/
+function renderedLinkedRevisions(dataContext) {
+	const occurrences = linkedEntryOccurrences(dataContext?.resolvedData);
+	const entryIds = [...new Set(occurrences.map((meta) => meta.entryId))];
+	return new Map(entryIds.map((entryId) => [unsafeAsLinkedContentEntryId(entryId), occurrences.filter((meta) => meta.entryId === entryId).map((meta) => meta.optimisticHash)]));
+}
+function linkedEntryOccurrences(value) {
+	if (Array.isArray(value)) return value.flatMap(linkedEntryOccurrences);
+	if (!isRecord$4(value)) return [];
+	const meta = parseLinkedEntryMeta(value[LINKED_CONTENT_ENTRY_META_KEY]);
+	const nested = Object.entries(value).filter(([key]) => key !== LINKED_CONTENT_ENTRY_META_KEY).flatMap(([, child]) => linkedEntryOccurrences(child));
+	return meta ? [meta, ...nested] : nested;
+}
+function resolveOverlayDisplayProjections(content, meta) {
+	const projections = {};
+	for (const source of meta.fieldSources) {
+		if (source.kind !== "content-field") continue;
+		if (source.displayPath.startsWith("content.")) continue;
+		if (source.displayPath.includes(".")) continue;
+		if (!(source.fieldPath in content)) continue;
+		projections[source.displayPath] = content[source.fieldPath];
+	}
+	return projections;
+}
+function resolveOverlayTitleProjection(input) {
+	const projectedTitle = input.displayProjections.title;
+	if (typeof projectedTitle === "string") return projectedTitle;
+	if (input.meta.fieldSources.find((source) => source.displayPath === "title")?.kind === "read-only") {
+		const currentTitle = input.currentValue.title;
+		return typeof currentTitle === "string" ? currentTitle : input.meta.title;
+	}
+	return resolveOverlayTitle(input.content, input.meta);
+}
+function resolveOverlayTitle(content, meta) {
+	const titleField = meta.contentType.titleField;
+	if (titleField) {
+		const value = content[titleField];
+		if (typeof value === "string" && value.trim().length > 0) return value;
+	}
+	return meta.title;
+}
+function parseLinkedEntryMeta(value) {
+	return getLinkedContentEntryMeta({ [LINKED_CONTENT_ENTRY_META_KEY]: value });
+}
+function isRecord$4(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function overlayRevision(overlay, meta) {
+	return overlay.optimisticHash === void 0 ? meta.optimisticHash : overlay.optimisticHash;
+}
+//#endregion
+//#region ../preview-next/src/client/blocks/renderPrecedence.ts
+/** A block's content as the preview renders it, from the tab's render source. */
+function renderedBlockContent(uiStore, blockId) {
+	const state = uiStore.getState();
+	return resolveRenderedValues(renderSourceFor(state.editability), state.drafts.getBlockSnapshot(blockId), remoteDraftValues(state.remoteDrafts, {
+		kind: "block",
+		id: blockId
+	}));
+}
+/**
+* An entry template page renders the entry's own fields from `contentEntry`. The
+* server sent them as they were on load; the editor's rendered values (local
+* edits, then another tab's live draft) take over from there.
+*/
+function withRenderedContentEntry(dataContext, content) {
+	if (!dataContext?.contentEntry || !content) return dataContext;
+	return {
+		...dataContext,
+		contentEntry: {
+			...dataContext.contentEntry,
+			...content
+		}
+	};
+}
+/** Loader data fetched in the browser replaces the server's, block by block. */
+function mergeResolvedDataContext(dataContext, liveResolvedData) {
+	if (!dataContext || !liveResolvedData) return dataContext;
+	return {
+		...dataContext,
+		resolvedData: {
+			...dataContext.resolvedData ?? {},
+			...liveResolvedData
+		}
+	};
+}
+//#endregion
+//#region ../preview-next/src/client/blocks/useLinkedSaveHandoverRetention.ts
+/**
+* The host's refresh of its server data: the same callback live drafts give a viewer
+* whose saved remote draft lags. Absent when the host supplies none.
+*/
+const PreviewRefreshBaselinesContext = createContext(null);
+/** Changes whenever a handover is recorded or dropped, so the renderer re-renders. */
+function linkedSaveHandoversVersion(handovers) {
+	return [...handovers].map(([entryId, handover]) => `${entryId}@${handover.revision}`).join("|");
+}
+/**
+* Local retention of this tab's linked-entry save handovers (issue 1553, DP7). The
+* renderer holds the rendered data, so it decides catch-up: a handover whose entry is
+* rendered at the saved revision everywhere drops with no refresh (row H1b); otherwise
+* the shared timing asks the host for one refresh, then drops it (row H2).
+*/
+function useLinkedSaveHandoverRetention(uiStore, dataContext, liveResolvedData) {
+	const rendered = useMemo(() => renderedLinkedRevisions(mergeResolvedDataContext(dataContext, liveResolvedData)), [dataContext, liveResolvedData]);
+	const refreshBaselines = useContext(PreviewRefreshBaselinesContext);
+	const refreshRef = useRef(refreshBaselines);
+	useEffect(() => {
+		refreshRef.current = refreshBaselines;
+	});
+	useRetentionTicks(uiStore, useCallback(() => {
+		const state = uiStore.getState();
+		if (state.linkedSaveHandovers.size === 0) return;
+		const plan = planLinkedSaveHandoverRetention(state.linkedSaveHandovers, rendered, Date.now());
+		if (!plan.changed) return;
+		state.setLinkedSaveHandovers(plan.entries);
+		if (plan.refresh) refreshRef.current?.();
+	}, [rendered, uiStore]));
+}
+//#endregion
+//#region ../preview-next/src/client/preview/PreviewEntryControllerProvider.tsx
+function toEditorInitialBlock(block, index) {
+	return {
+		...block,
+		orderIndex: typeof block.orderIndex === "number" ? block.orderIndex : index
+	};
+}
+function previewLiveDraftsConfig(liveDrafts, previewToken, siteId, scope) {
+	if (!liveDrafts || !previewToken) return null;
+	return {
+		client: liveDrafts.client,
+		auth: {
+			kind: "token",
+			accessToken: previewToken
+		},
+		siteId,
+		scope,
+		refreshBaselines: liveDrafts.refreshBaselines
+	};
+}
+function previewEntryRoute(entryData) {
+	return {
+		draftMetaTitle: entryData.draftMetaTitle ?? null,
+		draftMetaDescription: entryData.draftMetaDescription ?? null,
+		publishedMetaTitle: entryData.metaTitle ?? null,
+		publishedMetaDescription: entryData.metaDescription ?? null,
+		ogImageId: entryData.ogImageId ?? null
+	};
+}
+function snapshotFromPreviewEntry(entryData) {
+	const title = entryData.title ?? "";
+	const status = entryData.status ?? "draft";
+	const publishAt = entryData.publishAt ?? null;
+	return {
+		kind: "routable",
+		id: entryData.id,
+		draft: {
+			title,
+			slug: entryData.slug || "",
+			status,
+			publishAt,
+			path: entryData.draftPath ?? entryData.path ?? ""
+		},
+		published: {
+			title,
+			path: entryData.path ?? "",
+			status,
+			publishAt
+		},
+		status,
+		route: previewEntryRoute(entryData)
+	};
+}
+function snapshotFromPreviewPage(pageId, metadata, schema) {
+	return createSnapshotFromPageRecord({
+		id: pageId,
+		draftTitle: metadata.draftTitle,
+		draftPath: metadata.draftPath,
+		draftStatus: metadata.draftStatus,
+		title: metadata.title,
+		path: metadata.path,
+		status: metadata.status,
+		publishedAt: metadata.publishedAt,
+		draftMetaTitle: metadata.draftMetaTitle,
+		draftMetaDescription: metadata.draftMetaDescription,
+		publishedMetaTitle: metadata.publishedMetaTitle,
+		publishedMetaDescription: metadata.publishedMetaDescription,
+		ogImageId: metadata.ogImageId
+	}, createRoutingHelpers(schema, { slug: null }), {
+		title: "",
+		slug: null
+	});
+}
+function initialPreviewEntry(entryData, pageMetadata, pageId, schema) {
+	if (entryData) return snapshotFromPreviewEntry(entryData);
+	return pageMetadata && pageId ? snapshotFromPreviewPage(pageId, pageMetadata, schema) : void 0;
+}
+function previewEntity(pageId, pageNodeType, entryData, routeId) {
+	return {
+		id: pageId || entryData?.id || "",
+		type: entryData?.type || "page",
+		label: entryData && pageNodeType !== "page_surface" ? "Entry" : "Page",
+		routeId: routeId ?? void 0
+	};
+}
+function previewValues(entryData, pageMetadata) {
+	if (!entryData) return {
+		kind: "page",
+		metadataRevision: pageMetadata?.draftUpdatedAt ?? null
+	};
+	const revision = entryData.editorRevision;
+	if (!revision?.content) throw new Error("Preview draft is missing its editor revision");
+	return {
+		kind: "content",
+		content: revision.contentValues,
+		publishedContent: revision.publishedContent,
+		contentRevision: revision.content,
+		metadataRevision: revision.metadata
+	};
+}
+function PreviewEntryControllerProvider({ children, siteId, pageId, pageNodeType = "page", routeId: providedRouteId, entryData, contentTypeSchema, initialStatus = "draft", initialBlocks, blockFieldExtensions, pageMetadata, apiClient, subscribeToLeaseChanges, onLeaseGranted, liveDrafts }) {
+	const { isEditingMode, requestedEditingMode } = useEditor();
+	const previewToken = usePreviewToken();
+	const schema = contentTypeSchema ?? PAGE_CONTENT_TYPE_SCHEMA;
+	const initialEntry = useMemo(() => initialPreviewEntry(entryData, pageMetadata, pageId, schema), [
+		entryData,
+		pageMetadata,
+		pageId,
+		schema
+	]);
+	const normalizedInitialBlocks = useMemo(() => (initialBlocks ?? []).map(toEditorInitialBlock), [initialBlocks]);
+	const entity = previewEntity(pageId, pageNodeType, entryData, providedRouteId);
+	const leaseScope = requiredPreviewLeaseScope({
+		nodeType: previewLeaseNodeType(pageNodeType, entryData),
+		nodeId: entity.id
+	});
+	const values = previewValues(entryData, pageMetadata);
+	const rendered = /* @__PURE__ */ jsx(RefreshBaselinesForRender, {
+		liveDrafts,
+		children
+	});
+	const editLease = usePreviewLeaseParticipation({
+		requestedEditingMode,
+		siteId,
+		pageId,
+		pageNodeType,
+		leaseScope,
+		subscribeToLeaseChanges,
+		onLeaseGranted
+	});
+	const common = {
+		apiClientFactory: useMemo(() => createEditorApiClientFactory(apiClient), [apiClient]),
+		editLease,
+		type: entity.type,
+		siteId,
+		owner: {
+			kind: "contentEntry",
+			contentEntryId: entity.id
+		},
+		routeId: entity.routeId,
+		schema,
+		entityLabel: entity.label,
+		initialEntry,
+		initialMetadataRevision: values.metadataRevision,
+		initialBlocks: pageNodeType === "page_surface" ? void 0 : normalizedInitialBlocks,
+		blockFieldExtensions,
+		historyShortcutsEnabled: isEditingMode,
+		liveDrafts: previewLiveDraftsConfig(liveDrafts, previewToken, siteId, leaseScope)
+	};
+	if (pageNodeType === "page_surface" && pageId && pageMetadata) {
+		if (values.kind !== "content") throw new Error("Preview draft is missing its editor revision");
+		return /* @__PURE__ */ jsx(PreviewPageSurfaceController, {
+			common,
+			pageSurfaceId: pageId,
+			pageMetadata,
+			values,
+			children: rendered
+		});
+	}
+	return values.kind === "content" ? /* @__PURE__ */ jsx(EntryControllerProvider, {
+		...common,
+		kind: "content",
+		initialContent: values.content,
+		initialPublishedContent: values.publishedContent,
+		initialContentRevision: values.contentRevision,
+		children: rendered
+	}) : /* @__PURE__ */ jsx(EntryControllerProvider, {
+		...common,
+		kind: "page",
+		initialStatus,
+		children: rendered
+	});
+}
+/** Lease participation and its server-read invalidation share the same preview identity. */
+function usePreviewLeaseParticipation({ requestedEditingMode, siteId, pageId, pageNodeType, leaseScope, subscribeToLeaseChanges, onLeaseGranted }) {
+	const queryClient = useQueryClient();
+	return requestedEditingMode ? {
+		siteId,
+		scope: leaseScope,
+		subscribeToLeaseChanges,
+		onGranted: () => {
+			onLeaseGranted?.();
+			if (pageId) queryClient.invalidateQueries({ queryKey: previewBlocksQueryKey(siteId, pageId, pageNodeType) });
+		}
+	} : VIEWING_PARTICIPATION;
+}
+function RefreshBaselinesForRender({ liveDrafts, children }) {
+	return /* @__PURE__ */ jsx(PreviewRefreshBaselinesContext.Provider, {
+		value: liveDrafts?.refreshBaselines ?? null,
+		children
+	});
+}
+/**
+* An event's page in preview: its content is the page surface's, saved and
+* published through the page-surface services. Its published content is what
+* the draft is compared with, and a page with none has never been published,
+* so it has no Discard.
+*/
+function PreviewPageSurfaceController({ common, pageSurfaceId, pageMetadata, values, children }) {
+	const route = {
+		draftTitle: pageMetadata.draftTitle,
+		draftPath: pageMetadata.draftPath
+	};
+	const siteId = common.siteId;
+	return /* @__PURE__ */ jsx(EntryControllerProvider, {
+		...common,
+		kind: "content",
+		owner: {
+			kind: "pageSurface",
+			pageSurfaceId
+		},
+		services: (client) => createPageSurfaceEditorServices({
+			siteId,
+			pageSurfaceId,
+			route
+		}, { apiClient: client }),
+		initialContent: values.content,
+		initialContentRevision: values.contentRevision,
+		initialPublishedContent: values.publishedContent,
+		children
+	});
+}
+function previewLeaseNodeType(pageNodeType, entryData) {
+	if (pageNodeType === "page_surface") return "page_surface";
+	return entryData ? "content_entry" : "page";
+}
+/** The blocks a lease grant re-reads, so they reflect the latest server state. */
+function previewBlocksQueryKey(siteId, pageId, pageNodeType) {
+	return pageNodeType === "page_surface" ? blocksKeys.surfaceSlots(siteId, pageId) : blocksKeys.list(siteId, pageId);
+}
+function requiredPreviewLeaseScope(input) {
+	const scope = parseEditLeaseScope(input);
+	if (!scope) throw new Error("Invalid preview editor lease scope");
+	return scope;
+}
+//#endregion
+//#region ../preview-next/src/client/preview/usePreviewKeepAlive.ts
+function withJitter(baseMs) {
+	const jitter = PREVIEW_KEEP_ALIVE_JITTER_RATIO * baseMs;
+	const delta = (Math.random() * 2 - 1) * jitter;
+	return Math.max(15e3, Math.round(baseMs + delta));
+}
+async function readCurrentAccessToken(response) {
+	const payload = await response.json();
+	if (typeof payload !== "object" || payload === null || !("accessToken" in payload) || typeof payload.accessToken !== "string" || !payload.accessToken) throw new Error("Preview keep-alive returned no access token");
+	return payload.accessToken;
+}
+function usePreviewKeepAlive({ enabled, fetcher, onExpired, intervalMs = PREVIEW_KEEP_ALIVE_INTERVAL_MS }) {
+	useEffect(() => {
+		if (!enabled) return void 0;
+		const requestState = {
+			active: true,
+			pending: false
+		};
+		async function keepAlive() {
+			if (requestState.pending) return;
+			requestState.pending = true;
+			try {
+				const response = await fetcher("/api/preview/keep-alive", { method: "POST" }, "keep-alive");
+				if (response.status === 401 && requestState.active) {
+					onExpired("keep-alive");
+					return;
+				}
+				if (!response.ok && requestState.active) {
+					console.warn("Preview keep-alive failed", await response.text());
+					return;
+				}
+				const currentToken = await readCurrentAccessToken(response);
+				if (requestState.active) setPreviewAccessToken(currentToken);
+			} catch (error) {
+				if (requestState.active) console.warn("Preview keep-alive error", error);
+			} finally {
+				requestState.pending = false;
+			}
+		}
+		function checkWhenVisible() {
+			if (document.visibilityState === "visible") keepAlive();
+		}
+		keepAlive();
+		const id = window.setInterval(keepAlive, withJitter(intervalMs));
+		document.addEventListener("visibilitychange", checkWhenVisible);
+		return () => {
+			requestState.active = false;
+			window.clearInterval(id);
+			document.removeEventListener("visibilitychange", checkWhenVisible);
+		};
+	}, [
+		enabled,
+		fetcher,
+		intervalMs,
+		onExpired
+	]);
+}
+//#endregion
+//#region ../preview-next/src/client/preview/PreviewKeepAliveClient.tsx
+function PreviewKeepAliveClient({ baseFetch }) {
 	const { canEdit } = usePreviewAuth();
-	const guardedFetch = usePreviewAuthFetch(baseFetch ?? fetch);
-	const { setEditingMode } = useEditor();
 	usePreviewKeepAlive({
 		enabled: canEdit,
-		fetcher: guardedFetch,
+		fetcher: usePreviewAuthFetch(baseFetch ?? fetch),
 		onExpired: useCallback((source) => {
 			markPreviewAuthExpired(source);
-			setEditingMode(false);
-		}, [setEditingMode])
+		}, [])
 	});
 	return null;
 }
 //#endregion
+//#region ../preview-next/src/client/preview/PreviewLeaseEditingMode.tsx
+/** Derives preview editing permission from the live auth and lease authorities. */
+function PreviewLeaseEditingMode() {
+	const { canEdit } = usePreviewAuth();
+	const editable = useEditorUiStore((state) => canEditorWrite(state.editability));
+	const { setEditingAllowed } = useEditor();
+	useEffect(() => setEditingAllowed(canEdit && editable), [
+		canEdit,
+		editable,
+		setEditingAllowed
+	]);
+	return null;
+}
+//#endregion
 //#region ../preview-next/src/client/preview/previewSetupGuidance.ts
 function resolvePreviewSetupBannerState(input) {
 	if (input.authMode === "onboardingGrant") return input.dashboardUnlocked ? "dashboard_ready" : "awaiting_confirmation";
@@ -7500,25 +7910,25 @@ const INITIAL_ONBOARDING_CONFIRMATION_STATE = {
 	resendFeedback: null,
 	statusLoadFailed: false
 };
-function isRecord$4(value) {
+function isRecord$3(value) {
 	return value !== null && typeof value === "object";
 }
 function getErrorMessageFromEnvelope(payload, fallback) {
-	const error = isRecord$4(payload) ? payload.error : null;
-	const message = isRecord$4(error) ? error.message : null;
+	const error = isRecord$3(payload) ? payload.error : null;
+	const message = isRecord$3(error) ? error.message : null;
 	return typeof message === "string" && message.trim().length > 0 ? message : fallback;
 }
 function isLaunchReadiness(value) {
-	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");
+	return isRecord$3(value) && Array.isArray(value.requirements) && typeof value.pendingRequiredCount === "number" && typeof value.pendingRecommendedCount === "number" && typeof value.pendingOptionalCount === "number" && isRecord$3(value.goLiveDecision) && (value.goLiveDecision.kind === "allowed" || value.goLiveDecision.kind === "blocked");
 }
 function isOnboardingPreviewStatusResponse(value) {
-	return isRecord$4(value) && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
+	return isRecord$3(value) && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
 }
 function isResendOnboardingPreviewConfirmationResponse(value) {
-	return isRecord$4(value) && (value.result === "resent" || value.result === "already_confirmed") && typeof value.dashboardUnlocked === "boolean" && typeof value.requiresEmailConfirmation === "boolean" && isLaunchReadiness(value.launchReadiness);
+	return isRecord$3(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$4(payload) || payload.success !== true || !isData(payload.data)) return null;
+	if (!isRecord$3(payload) || payload.success !== true || !isData(payload.data)) return null;
 	return payload.data;
 }
 function useOnboardingConfirmationCheck(input) {
@@ -7887,6 +8297,36 @@ function PreviewAuthBanner({ dashboardBaseUrl = null, surfaceId }) {
 	})] });
 }
 //#endregion
+//#region ../preview-next/src/client/preview/PreviewAccessBanners.tsx
+function previewLeaseThing(isEntry, pageNodeType) {
+	if (pageNodeType === "page_surface") return "this event page";
+	return isEntry ? "this entry" : "this page";
+}
+function PreviewAccessBanners({ dashboardBaseUrl, surfaceId, isEntry, pageNodeType }) {
+	const { state } = usePreviewAuth();
+	const { requestedEditingMode, setEditingMode } = useEditor();
+	const showDiscardedNotice = useEditorUiStore((editor) => canEditorWrite(editor.editability) && editor.leaseDiscardedChanges);
+	const thing = previewLeaseThing(isEntry, pageNodeType);
+	const active = state !== "expired";
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+		/* @__PURE__ */ jsx(PreviewAuthBanner, {
+			dashboardBaseUrl,
+			surfaceId
+		}),
+		active && requestedEditingMode ? /* @__PURE__ */ jsx(EditLeaseModal, {
+			thing,
+			onKeepViewing: () => setEditingMode(false)
+		}) : null,
+		active && showDiscardedNotice ? /* @__PURE__ */ jsx(FixedBottomSurface, {
+			variant: "light",
+			width: "centered",
+			offsetCssVar: "--builder-editor-chrome-offset",
+			reserveOffsetCssVar: "--builder-preview-banner-offset",
+			children: /* @__PURE__ */ jsx(EditLeaseDiscardedNotice, { thing })
+		}) : null
+	] });
+}
+//#endregion
 //#region ../preview-next/src/client/preview/sidebarTabPreference.ts
 const STORAGE_KEY = "preview-sidebar-tab";
 function getPreviewSidebarTab() {
@@ -9402,10 +9842,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-DtpB3_sS.mjs")).PreviewEditorSidebar };
+	return { default: (await import("./PreviewEditorSidebar-DBKln68M.mjs")).PreviewEditorSidebar };
 });
 const PreviewEditorUI = React.lazy(async () => {
-	return { default: (await import("./PreviewEditorUI-DxTLgaHo.mjs")).PreviewEditorUI };
+	return { default: (await import("./PreviewEditorUI-DpRX4Mum.mjs")).PreviewEditorUI };
 });
 const previewPaneContainmentStyle = {
 	contain: "layout paint",
@@ -9639,6 +10079,7 @@ function PreviewShellLayout(props) {
 				siteId,
 				dashboardBaseUrl,
 				pageId,
+				pageNodeType: props.pageNodeType,
 				entryData,
 				contentTypeSchema,
 				referenceContentTypeKeys,
@@ -9695,15 +10136,17 @@ function PreviewShellLayout(props) {
 					apiClient
 				})
 			}),
-			/* @__PURE__ */ jsx(PreviewAuthBanner, {
+			/* @__PURE__ */ jsx(PreviewAccessBanners, {
 				dashboardBaseUrl,
-				surfaceId
+				surfaceId,
+				isEntry: Boolean(entryData),
+				pageNodeType: props.pageNodeType
 			}),
 			/* @__PURE__ */ jsx("div", {
 				className: "fixed inset-0 overflow-hidden bg-background",
 				children: isOpen ? /* @__PURE__ */ jsx(ResizableSplitPane, {
 					left: leftPane,
-					right: rightPane,
+					right: /* @__PURE__ */ jsx(EditorWriteSurface, { children: rightPane }),
 					defaultSplit: 100 - sidebarWidth,
 					minLeftWidth: 400,
 					minRightWidth: 320,
@@ -9730,13 +10173,14 @@ function resolveShellLayoutProps(input) {
 		siteId: props.siteId,
 		dashboardBaseUrl: props.dashboardBaseUrl ?? null,
 		pageId: props.pageId,
+		pageNodeType: props.pageNodeType,
 		entryData: props.entryData ?? null,
 		contentTypeSchema: props.contentTypeSchema,
 		referenceContentTypeKeys: props.referenceContentTypeKeys ?? [],
 		draftContent: props.draftContent,
 		currentTemplate: props.currentTemplate,
 		apiClient: input.apiClient,
-		bearerToken: props.previewToken,
+		bearerToken: input.bearerToken,
 		themeId: props.themeId ?? null,
 		themeSelectionId: props.themeSelectionId ?? null,
 		themeSelectionVersion: props.themeSelectionVersion ?? null,
@@ -9778,9 +10222,52 @@ function wrapPreviewSiteFontStorage(children, siteFontStorageUrl) {
 		children
 	});
 }
+function PreviewEditorBody({ props, designEditorEnabled, siteStyleAccess }) {
+	const { apiClient } = useEntryEditorController();
+	const bearerToken = usePreviewToken();
+	return /* @__PURE__ */ jsx(PreviewDesignHistoryOrderProvider, { children: /* @__PURE__ */ jsx(PreviewPageDesignEditorStateProvider, {
+		apiClient,
+		siteId: props.siteId,
+		pageId: props.pageId,
+		enabled: designEditorEnabled,
+		children: /* @__PURE__ */ jsxs(MediaEditorProvider, {
+			siteId: props.siteId,
+			apiClient,
+			bearerToken,
+			supabaseUrl: props.supabaseUrl,
+			mediaAssets: props.mediaAssets,
+			children: [/* @__PURE__ */ jsx(PreviewKeepAliveClient, { baseFetch: props.baseFetch }), wrapPreviewSiteFontStorage(renderShellLayout({
+				props,
+				apiClient,
+				siteStyleAccess,
+				bearerToken
+			}), props.siteFontStorageUrl)]
+		})
+	}) });
+}
+function PreviewBlockApiProvider({ config, children }) {
+	const token = usePreviewToken();
+	return /* @__PURE__ */ jsx(BlockApiProvider, {
+		config: useMemo(() => {
+			if (!config || !token) return config;
+			return {
+				...config,
+				auth: config.auth.type === "bearer" ? {
+					...config.auth,
+					token
+				} : config.auth,
+				readAuthority: config.readAuthority?.kind === "preview" ? {
+					...config.readAuthority,
+					token
+				} : config.readAuthority
+			};
+		}, [config, token]),
+		children
+	});
+}
 function PreviewShell(props) {
-	const { children, apiBaseUrl, blockApiConfig, siteId, siteSlug, editableId, previewSession, previewToken, dashboardBaseUrl = null, surfaceId, themeId = null, themeSelectionId = null, themeSelectionVersion = null, themeSelectionUpdatedAt = null, themeSelectionButtonStyleSelection = null, themeSelectionHeaderSelection = null, themeSelectionFooterLookId = null, themeSelectionHeaderLogo, pageId, routeId, entryData, contentTypeSchema, referenceContentTypeKeys = [], draftContent, currentTemplate, initialStatus, initialBlocks, pageMetadata, isSiteLaunched, maintenanceModeEnabled, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, bookingOfferingPresets, supabaseUrl, designEditorEligibility, hideSiteStyleConfigurator = false, baseFetch, onFooterSaved } = props;
-	const apiClient = useMemo(() => createBearerAPIClient(previewToken, apiBaseUrl), [previewToken, apiBaseUrl]);
+	const { apiBaseUrl, blockApiConfig, siteId, siteSlug, editableId, previewSession, previewToken, pageId, routeId, entryData, contentTypeSchema, initialStatus, initialBlocks, pageMetadata, designEditorEligibility, hideSiteStyleConfigurator = false } = props;
+	const apiClient = useMemo(() => createGuardedPreviewApiClient(apiBaseUrl), [apiBaseUrl]);
 	const { designEditorEnabled, siteStyleAccess } = resolveShellAccess({
 		previewSession,
 		designEditorEligibility,
@@ -9788,50 +10275,41 @@ function PreviewShell(props) {
 		entryData,
 		hideSiteStyleConfigurator
 	});
-	const shellLayout = renderShellLayout({
-		props,
-		apiClient,
-		siteStyleAccess
-	});
-	return /* @__PURE__ */ jsx(BlockApiProvider, {
-		config: blockApiConfig,
-		children: /* @__PURE__ */ jsx(PreviewQueryProvider, { children: /* @__PURE__ */ jsx(PreviewAuthInit, {
-			session: previewSession,
-			token: previewToken,
-			siteId,
-			siteSlug,
-			pageId: editableId,
+	return /* @__PURE__ */ jsx(PreviewQueryProvider, { children: /* @__PURE__ */ jsx(PreviewAuthInit, {
+		session: previewSession,
+		token: previewToken,
+		siteId,
+		siteSlug,
+		pageId: editableId,
+		children: /* @__PURE__ */ jsx(PreviewBlockApiProvider, {
+			config: blockApiConfig,
 			children: /* @__PURE__ */ jsx(EditorProvider, {
-				initialEditingMode: true,
-				children: /* @__PURE__ */ jsx(PreviewEntryControllerProvider, {
+				initialEditingMode: false,
+				initialEditingAllowed: false,
+				children: /* @__PURE__ */ jsxs(PreviewEntryControllerProvider, {
+					blockFieldExtensions: props.sdkConfig?.blockFieldExtensions ?? null,
 					siteId,
 					pageId,
+					pageNodeType: props.pageNodeType,
 					routeId,
 					entryData,
 					contentTypeSchema,
-					draftContent,
 					initialStatus,
 					initialBlocks,
 					pageMetadata,
 					apiClient,
-					children: /* @__PURE__ */ jsx(PreviewDesignHistoryOrderProvider, { children: /* @__PURE__ */ jsx(PreviewPageDesignEditorStateProvider, {
-						apiClient,
-						siteId,
-						pageId,
-						enabled: designEditorEnabled,
-						children: /* @__PURE__ */ jsxs(MediaEditorProvider, {
-							siteId,
-							apiClient,
-							bearerToken: previewToken,
-							supabaseUrl,
-							mediaAssets,
-							children: [/* @__PURE__ */ jsx(PreviewKeepAliveClient, { baseFetch }), wrapPreviewSiteFontStorage(shellLayout, props.siteFontStorageUrl)]
-						})
-					}) })
+					subscribeToLeaseChanges: props.subscribeToLeaseChanges,
+					onLeaseGranted: props.onLeaseGranted,
+					liveDrafts: props.liveDrafts ?? void 0,
+					children: [/* @__PURE__ */ jsx(PreviewLeaseEditingMode, {}), /* @__PURE__ */ jsx(PreviewEditorBody, {
+						props,
+						designEditorEnabled,
+						siteStyleAccess
+					})]
 				})
 			})
-		}) })
-	});
+		})
+	}) });
 }
 function defaultDesignEditorEligibility(input) {
 	if (input.entryData) return { kind: "content-entry" };
@@ -9852,11 +10330,11 @@ function resolveShellAccess(input) {
 //#region ../preview-next/src/client/utils/path.ts
 const PATH_SEPARATOR_REGEX = /\./g;
 const BRACKET_ACCESS_REGEX = /\[([^\]]+)\]/g;
-function isRecord$3(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isPathContainer(value) {
-	return Array.isArray(value) || isRecord$3(value);
+	return Array.isArray(value) || isRecord$2(value);
 }
 function createPathContainer(nextIsIndex) {
 	return nextIsIndex ? [] : {};
@@ -10028,15 +10506,317 @@ function runtimeFieldsByBlockId(blocks) {
 function applyRuntimeContentDecorationProjection(block, content, projection) {
 	const blockId = designBlockIdFromBlockItem(block);
 	const fields = blockId ? projection.fieldsByBlockId.get(blockId) : void 0;
-	return applyCompiledRuntimeFieldsToContent(isRecord$2(content) ? content : {}, fields);
+	return applyCompiledRuntimeFieldsToContent(isRecord$1(content) ? content : {}, fields);
 }
 function designBlockIdFromBlockItem(block) {
 	return typeof block.id === "string" && block.id.length > 0 ? asDesignBlockId(block.id) : null;
 }
-function isRecord$2(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
+//#region ../field-primitives/src/bindings/index.ts
+const BINDING_TRANSFORMS = {
+	RICHTEXT_FIRST_PARAGRAPH: "richtext.firstParagraph",
+	DATE_FORMAT_SHORT: "date.formatShort",
+	DATE_FORMAT_LONG: "date.formatLong",
+	TEXT_INLINE_TEXT: "text.inlineText"
+};
+Object.values(BINDING_TRANSFORMS);
+//#endregion
+//#region ../blocks/src/bindings/types.ts
+/**
+* Shared types for template binding resolution.
+*
+* Used by SDK, site-renderer, and dashboard for resolving
+* bindings in template blocks to actual content values.
+*/
+/**
+* Available transform function names.
+*/
+const TRANSFORMS = BINDING_TRANSFORMS;
+const BINDING_SOURCES = [
+	"field",
+	"meta",
+	"literal",
+	"transform",
+	"fallback"
+];
+//#endregion
+//#region ../blocks/src/bindings/index.ts
+/**
+* Resolves a binding map to actual content values.
+*
+* Returns only keys whose binding resolved to a non-null, non-undefined value.
+* To merge resolved bindings over a base content object (the dashboard
+* template preview's use case), see {@link applyBindingsToContent}.
+*
+* @param bindings - Map of field keys to binding descriptors
+* @param context - Entry data context (fields and meta)
+* @returns Resolved content object with actual values
+*
+* @example
+* ```typescript
+* const content = applyBindings(
+*   {
+*     headline: { source: 'meta', path: 'title' },
+*     body: { source: 'field', path: 'content' },
+*   },
+*   {
+*     fields: { content: 'Hello world' },
+*     meta: { title: 'My Post', slug: 'my-post' },
+*   }
+* );
+* // Result: { headline: 'My Post', body: 'Hello world' }
+* ```
+*/
+function applyBindings(bindings, context) {
+	const result = {};
+	for (const [key, bindingSpec] of Object.entries(bindings)) {
+		if (isBindingDescriptor(bindingSpec)) {
+			const value = resolveBindingValue(bindingSpec, context);
+			if (value !== void 0 && value !== null) setBindingValue(result, key, value);
+			continue;
+		}
+		if (typeof bindingSpec === "string") {
+			const value = resolveBindingValue({
+				source: "field",
+				path: bindingSpec
+			}, context);
+			if (value !== void 0 && value !== null) setBindingValue(result, key, value);
+			continue;
+		}
+		if (isRecord$11(bindingSpec)) {
+			const nested = applyBindings(bindingSpec, context);
+			if (Object.keys(nested).length > 0) setBindingValue(result, key, nested);
+		}
+	}
+	return result;
+}
+/**
+* Resolve a binding map and merge the result over a base content object.
+*
+* Use this when a block has *some* hard-coded content (from a template's
+* `block.content`) and *some* values driven by template bindings against
+* an entry. The base provides defaults; resolved bindings override them.
+*
+* Same null-handling as {@link applyBindings}: keys whose binding resolves
+* to `null`/`undefined` do NOT overwrite the base. This means "no resolved
+* value" leaves the base value (or absence) intact, which is the correct
+* semantic for both the SDK/frontend render paths and the dashboard preview.
+*
+* Replaces the dashboard's bespoke `applyBindings` that lived in
+* `apps/dashboard/src/lib/templates/applyBindings.ts` — its divergent
+* "always-set-null" behaviour produced the `subheadline: null` regression
+* documented in Phase 1.
+*
+* @example
+* ```typescript
+* const content = applyBindingsToContent(
+*   { eyebrow: 'Default eyebrow', headline: 'Default headline' },
+*   { headline: { source: 'meta', path: 'title' } },
+*   { fields: {}, meta: { title: 'Entry title' } },
+* );
+* // Result: { eyebrow: 'Default eyebrow', headline: 'Entry title' }
+* ```
+*/
+function applyBindingsToContent(baseContent, bindings, context) {
+	return mergeResolvedBindings(baseContent, applyBindings(bindings, context));
+}
+function mergeResolvedBindings(base, resolved) {
+	const merged = { ...base };
+	for (const [key, resolvedValue] of Object.entries(resolved)) {
+		const baseValue = merged[key];
+		merged[key] = isRecord$11(baseValue) && isRecord$11(resolvedValue) ? mergeResolvedBindings(baseValue, resolvedValue) : resolvedValue;
+	}
+	return merged;
+}
+function setBindingValue(target, path, value) {
+	const segments = path.split(".").map((segment) => segment.trim()).filter(Boolean);
+	if (segments.length === 0) return;
+	const firstSegment = segments[0];
+	if (!firstSegment) return;
+	if (segments.length === 1) {
+		target[firstSegment] = value;
+		return;
+	}
+	const isIndex = (segment) => /^\d+$/.test(segment);
+	let current = target;
+	for (let i = 0; i < segments.length; i++) {
+		const segment = segments[i];
+		if (!segment) return;
+		const last = i === segments.length - 1;
+		const nextSegment = segments[i + 1];
+		if (last) {
+			if (Array.isArray(current) && isIndex(segment)) {
+				current[Number(segment)] = value;
+				return;
+			}
+			if (isRecord$11(current)) current[segment] = value;
+			return;
+		}
+		const nextWantsArray = typeof nextSegment === "string" && isIndex(nextSegment);
+		if (Array.isArray(current) && isIndex(segment)) {
+			const index = Number(segment);
+			const existing = current[index];
+			if (nextWantsArray) {
+				if (!Array.isArray(existing)) current[index] = [];
+			} else if (!isRecord$11(existing)) current[index] = {};
+			current = current[index];
+			continue;
+		}
+		if (isRecord$11(current)) {
+			const existing = current[segment];
+			if (nextWantsArray) {
+				if (!Array.isArray(existing)) current[segment] = [];
+			} else if (!isRecord$11(existing)) current[segment] = {};
+			current = current[segment];
+			continue;
+		}
+		return;
+	}
+}
+/**
+* Resolves a single binding descriptor to its value.
+*/
+function resolveBindingValue(descriptor, context) {
+	switch (descriptor.source) {
+		case "field": return descriptor.path ? getPath(context.fields, descriptor.path) : void 0;
+		case "meta": return descriptor.path ? getPath(context.meta, descriptor.path) : void 0;
+		case "literal": return descriptor.value;
+		case "transform": {
+			const inputDescriptor = descriptor.input && isBindingDescriptorLike(descriptor.input) ? normalizeBindingInput(descriptor.input) : descriptor.path ? normalizeBindingInput(descriptor.path) : null;
+			const inputValue = inputDescriptor ? resolveBindingValue(inputDescriptor, context) : void 0;
+			return applyTransform(descriptor.transform, inputValue);
+		}
+		case "fallback":
+			for (const option of descriptor.options ?? []) {
+				const normalized = normalizeBindingInput(option);
+				if (!normalized) continue;
+				const value = resolveBindingValue(normalized, context);
+				if (value !== void 0 && value !== null && value !== "") return value;
+			}
+			return null;
+		default: return null;
+	}
+}
+/**
+* Gets a nested path from an object.
+*/
+function getPath(source, path) {
+	const segments = path.split(".").map((segment) => segment.trim()).filter(Boolean);
+	let current = source;
+	for (const segment of segments) {
+		if (!isRecord$11(current)) return void 0;
+		current = current[segment];
+	}
+	return current;
+}
+/**
+* Applies a transform function to a value.
+*/
+function applyTransform(name, value) {
+	if (!name) return value;
+	switch (name) {
+		case TRANSFORMS.RICHTEXT_FIRST_PARAGRAPH: return extractFirstParagraph(value);
+		case TRANSFORMS.DATE_FORMAT_SHORT: return formatDate(value, { dateStyle: "medium" });
+		case TRANSFORMS.DATE_FORMAT_LONG: return formatDate(value, {
+			dateStyle: "long",
+			timeStyle: "short"
+		});
+		case TRANSFORMS.TEXT_INLINE_TEXT: return textToInlineText(value);
+		default: return value;
+	}
+}
+function textToInlineText(value) {
+	if (typeof value !== "string") return null;
+	return plainTextToInlineText(value);
+}
+/**
+* Extracts the first paragraph text from a TipTap/ProseMirror document.
+*
+* Accepts the canonical unwrapped form (`{ type: 'doc', content: [...] }`).
+*/
+function extractFirstParagraph(value) {
+	if (!isRichTextDoc(value)) return null;
+	for (const node of value.content) {
+		if (!isRecord$11(node)) continue;
+		if (node.type !== "paragraph" || !Array.isArray(node.content)) continue;
+		const text = node.content.filter((item) => item.type === "text").map((item) => typeof item.text === "string" ? item.text : "").join("").trim();
+		if (text.length > 0) return text;
+	}
+	return null;
+}
+/**
+* Formats a date string using Intl.DateTimeFormat.
+*/
+function formatDate(value, options) {
+	if (typeof value !== "string") return null;
+	const date = new Date(value);
+	if (Number.isNaN(date.getTime())) return null;
+	return new Intl.DateTimeFormat(void 0, options).format(date);
+}
+/**
+* Type guard to check if a value is a valid binding descriptor.
+*/
+function isBindingDescriptor(value) {
+	if (!isRecord$11(value) || typeof value.source !== "string") return false;
+	if (!BINDING_SOURCES.includes(value.source)) return false;
+	switch (value.source) {
+		case "field":
+		case "meta": return typeof value.path === "string";
+		case "literal": return "value" in value;
+		case "transform": return typeof value.transform === "string" && (value.input === void 0 || isBindingDescriptorLike(value.input)) && (value.path === void 0 || typeof value.path === "string");
+		case "fallback": return Array.isArray(value.options);
+		default: return false;
+	}
+}
+/**
+* Type guard to check if a value is binding-descriptor-like (can be normalized).
+*/
+function isBindingDescriptorLike(value) {
+	return isBindingDescriptor(value) || typeof value === "string" || isRecord$11(value) && typeof value.source === "string" && typeof value.path === "string";
+}
+/**
+* Normalizes a binding input to a binding descriptor.
+*
+* Converts string shorthand to field descriptors and validates
+* that objects have valid binding source values.
+*/
+function normalizeBindingInput(value) {
+	if (isBindingDescriptor(value)) return value;
+	if (typeof value === "string") return {
+		source: "field",
+		path: value
+	};
+	return null;
+}
+//#endregion
+//#region ../preview-next/src/client/blocks/previewProjection/entryFieldRebinding.ts
+/**
+* Only the entry fields that changed are bound in again: unchanged fields keep
+* the server's materialised value, which may be richer than the stored one
+* (media the loaders have hydrated, for instance).
+*/
+function entryFieldRebindingProjection(changedFields) {
+	return Object.keys(changedFields).length === 0 ? null : {
+		kind: "entry-field-rebinding",
+		source: "entry-draft",
+		changedFields
+	};
+}
+/**
+* Binds the changed entry fields into a block with template bindings. A binding
+* whose source did not change resolves to nothing and leaves the content as it is.
+*/
+function applyEntryFieldRebindingProjection(block, content, projection) {
+	if (!isRecord$11(block.bindings)) return content;
+	return applyBindingsToContent(content ?? {}, block.bindings, {
+		fields: { ...projection.changedFields },
+		meta: {}
+	});
+}
+//#endregion
 //#region ../preview-next/src/client/blocks/previewProjection/applyPreviewProjections.ts
 function applyPreviewStructureProjections(blockItems, projections) {
 	return projections.reduce((current, projection) => {
@@ -10052,6 +10832,7 @@ function applyPreviewContentFieldProjections(blockId, content, projections) {
 }
 function applyPreviewRuntimeContentProjections(block, content, projections) {
 	return projections.reduce((current, projection) => {
+		if (projection.kind === "entry-field-rebinding") return applyEntryFieldRebindingProjection(block, current, projection);
 		if (projection.kind !== "runtime-content-decoration") return current;
 		return applyRuntimeContentDecorationProjection(block, current, projection);
 	}, content);
@@ -10060,108 +10841,25 @@ function blockHasPreviewContentFieldProjection(blockId, projections) {
 	return projections.some((projection) => projection.kind === "content-field-overrides" && blockHasContentFieldOverrideProjection(blockId, projection));
 }
 //#endregion
-//#region ../preview-next/src/client/blocks/linkedEntryRenderOverlay.ts
-function applyLinkedEntryRenderOverlay(value, overlays) {
-	if (overlays.size === 0) return value;
-	return overlayValue(value, overlays);
-}
-function applyLinkedEntryRenderOverlayToDataContext(dataContext, overlays) {
-	if (!dataContext?.resolvedData || overlays.size === 0) return dataContext;
-	const resolvedData = applyLinkedEntryRenderOverlay(dataContext.resolvedData, overlays);
-	if (resolvedData === dataContext.resolvedData) return dataContext;
-	return {
-		...dataContext,
-		resolvedData
-	};
-}
-function overlayValue(value, overlays) {
-	if (Array.isArray(value)) {
-		let changed = false;
-		const next = value.map((item) => {
-			const overlaid = overlayValue(item, overlays);
-			if (overlaid !== item) changed = true;
-			return overlaid;
-		});
-		return changed ? next : 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));
-		if (overlay) {
-			const displayProjections = resolveOverlayDisplayProjections(overlay.content, meta);
-			const titleProjection = resolveOverlayTitleProjection({
-				currentValue: value,
-				content: overlay.content,
-				meta,
-				displayProjections
-			});
-			return {
-				...value,
-				...displayProjections,
-				...titleProjection ? { title: titleProjection } : {},
-				content: overlay.content,
-				optimisticHash: overlay.optimisticHash,
-				[LINKED_CONTENT_ENTRY_META_KEY]: {
-					...meta,
-					...titleProjection ? { title: titleProjection } : {},
-					optimisticHash: overlay.optimisticHash
-				}
-			};
-		}
-	}
-	let changed = false;
-	const next = {};
-	for (const [key, child] of Object.entries(value)) {
-		const overlaid = overlayValue(child, overlays);
-		if (overlaid !== child) changed = true;
-		next[key] = overlaid;
-	}
-	return changed ? next : value;
-}
-function resolveOverlayDisplayProjections(content, meta) {
-	const projections = {};
-	for (const source of meta.fieldSources) {
-		if (source.kind !== "content-field") continue;
-		if (source.displayPath.startsWith("content.")) continue;
-		if (source.displayPath.includes(".")) continue;
-		if (!(source.fieldPath in content)) continue;
-		projections[source.displayPath] = content[source.fieldPath];
-	}
-	return projections;
-}
-function resolveOverlayTitleProjection(input) {
-	const projectedTitle = input.displayProjections.title;
-	if (typeof projectedTitle === "string") return projectedTitle;
-	if (input.meta.fieldSources.find((source) => source.displayPath === "title")?.kind === "read-only") {
-		const currentTitle = input.currentValue.title;
-		return typeof currentTitle === "string" ? currentTitle : input.meta.title;
-	}
-	return resolveOverlayTitle(input.content, input.meta);
-}
-function resolveOverlayTitle(content, meta) {
-	const titleField = meta.contentType.titleField;
-	if (titleField) {
-		const value = content[titleField];
-		if (typeof value === "string" && value.trim().length > 0) return value;
-	}
-	return meta.title;
-}
-function parseLinkedEntryMeta(value) {
-	return getLinkedContentEntryMeta({ [LINKED_CONTENT_ENTRY_META_KEY]: value });
-}
-function isRecord$1(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-//#endregion
 //#region ../preview-next/src/client/blocks/composer/mergeDrafts.ts
 const EMPTY_LINKED_ENTRY_OVERLAY = /* @__PURE__ */ new Map();
+/**
+* Draft snapshots as the preview renders them: `current` follows the tab's render
+* source (its own edits, or another tab's live drafts while it only views).
+*/
 function getDraftSnapshots(uiStore) {
-	const snapshots = uiStore.getState().drafts.inspect();
-	return new Map(snapshots.map((snap) => [snap.id, snap]));
+	const state = uiStore.getState();
+	const source = renderSourceFor(state.editability);
+	return new Map(state.drafts.inspect().map((snap) => [snap.id, {
+		id: snap.id,
+		baseline: snap.sync.baseline.values,
+		current: resolveRenderedValues(source, snap, remoteDraftValues(state.remoteDrafts, {
+			kind: "block",
+			id: snap.id
+		}))
+	}]));
 }
-function mergeBlockWithDraft(block, draftMap, index, projections = [], linkedEntryOverlays = EMPTY_LINKED_ENTRY_OVERLAY) {
-	const { draftContentId = null, publishedContentId = null } = block;
+function mergeBlockWithDraft(block, draftMap, index, projections = [], linkedEntryOverlays = EMPTY_LINKED_ENTRY_OVERLAY, versions = NO_BLOCK_VERSIONS) {
 	const id = block.id ?? null;
 	const editorBlockId = id ? unsafeAsEditorBlockId(id) : null;
 	const snap = editorBlockId ? draftMap.get(editorBlockId) ?? null : null;
@@ -10169,14 +10867,12 @@ function mergeBlockWithDraft(block, draftMap, index, projections = [], linkedEnt
 	const baseline = blockBaseline(block, snap);
 	return {
 		id,
-		draftContentId,
-		publishedContentId,
 		kind: block.kind,
 		purpose: "content",
 		orderIndex: block.orderIndex ?? index,
-		content: renderContent(block, baseline, projections, linkedEntryOverlays),
-		draftContent: renderContent(block, draftContent, projections, linkedEntryOverlays),
-		publishedContent: block.publishedContent ?? null,
+		content: renderBlockContent(block, baseline, projections, linkedEntryOverlays),
+		draftContent: renderBlockContent(block, draftContent, projections, linkedEntryOverlays),
+		versions,
 		bindings: block.bindings ?? null
 	};
 }
@@ -10184,19 +10880,18 @@ function readProjectedDraftRenderContent(block, editorBlockId, snap, projections
 	return applyPreviewContentFieldProjections(editorBlockId, snap?.current ?? blockBaseline(block, snap), projections);
 }
 function blockBaseline(block, snapshot) {
-	return snapshot?.baseline ?? block.content ?? block.publishedContent ?? null;
+	return snapshot?.baseline ?? block.content ?? null;
 }
-function renderContent(block, content, projections, linkedEntryOverlays) {
+function renderBlockContent(block, content, projections, linkedEntryOverlays = EMPTY_LINKED_ENTRY_OVERLAY) {
 	return applyPreviewRuntimeContentProjections(block, applyLinkedEntryRenderOverlay(content, linkedEntryOverlays), projections);
 }
 //#endregion
 //#region ../preview-next/src/client/blocks/composer/transformBlock.ts
 function transformToPageBlock(enriched) {
-	const publishedPlacement = readPublishedBlockPlacement(enriched.publishedContentId, enriched.publishedContent);
 	return {
 		id: enriched.id,
-		publishedPlacement,
-		contentVersionId: enriched.draftContentId ?? enriched.publishedContentId,
+		publishedPlacement: enriched.versions.publishedPlacement,
+		contentVersionId: selectedContentVersionId(enriched.versions),
 		kind: enriched.kind,
 		purpose: enriched.purpose,
 		content: enriched.content ?? {},
@@ -10233,45 +10928,46 @@ function composePageFromBlocks(args, cacheRef) {
 	const { page, blockItems, projections = [], uiStore } = args;
 	const draftMap = getDraftSnapshots(uiStore);
 	const aiProjections = previewProjectionsFromAiOverlays(uiStore.getState().aiOverlays);
-	const linkedEntryOverlays = getLinkedEntryRenderOverlays(uiStore);
+	const entryProjections = entryDraftProjections(uiStore);
+	const linkedEntryOverlays = linkedEntryRenderOverlaysFromStore(uiStore);
 	return composePreviewRenderPage({
 		page,
 		blockItems,
 		draftSnapshots: Array.from(draftMap.values()),
-		projections: [...aiProjections, ...projections],
-		linkedEntryOverlays
+		projections: [
+			...entryProjections,
+			...aiProjections,
+			...projections
+		],
+		linkedEntryOverlays,
+		blockVersions: uiStore.getState().blockVersions.get
 	}, cacheRef);
 }
 function composePreviewRenderPage(args, cacheRef) {
-	const { page, blockItems, draftSnapshots, projections, linkedEntryOverlays } = args;
+	const { page, blockItems, draftSnapshots, projections, linkedEntryOverlays, blockVersions } = args;
 	if (!page) return page;
 	if (!blockItems.length) return {
 		...page,
 		blocks: page.blocks.map((block) => ({
 			...block,
+			content: renderBlockContent(block, block.content ?? null, projections, linkedEntryOverlays) ?? void 0,
+			draftContent: block.draftContent ? renderBlockContent(block, block.draftContent, projections, linkedEntryOverlays) : block.draftContent,
 			publishedPlacement: null,
 			contentVersionId: null
 		}))
 	};
 	const draftMap = draftSnapshotMap(draftSnapshots);
-	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);
+	const renderedBlocks = applyCacheOptimization([...applyPreviewStructureProjections(blockItems, projections).map((block, index) => mergeBlockWithDraft(block, draftMap, index, projections, linkedEntryOverlays, (block.id ? blockVersions(unsafeAsEditorBlockId(block.id)) : null) ?? NO_BLOCK_VERSIONS))].sort((a, b) => (a.orderIndex ?? 0) - (b.orderIndex ?? 0)), cacheRef);
 	return {
 		...page,
 		blocks: renderedBlocks
 	};
 }
-function getLinkedEntryRenderOverlays(uiStore) {
-	const linkedEntries = uiStore.getState().linkedEntries.inspect();
-	const overlays = /* @__PURE__ */ new Map();
-	for (const linkedEntry of linkedEntries) {
-		const content = linkedEntry.current ?? linkedEntry.baseline;
-		if (!content) continue;
-		overlays.set(linkedEntry.meta.entryId, {
-			content,
-			optimisticHash: linkedEntry.meta.optimisticHash
-		});
-	}
-	return overlays;
+/** Entry fields changed in the editor (locally or live from another tab) are bound in first. */
+function entryDraftProjections(uiStore) {
+	const state = uiStore.getState();
+	const projection = entryFieldRebindingProjection(renderedFieldChanges(renderSourceFor(state.editability), state.content?.getSnapshot() ?? null, remoteDraftValues(state.remoteDrafts, { kind: "content" })));
+	return projection ? [projection] : [];
 }
 function draftSnapshotMap(snapshots) {
 	return new Map(snapshots.map((snap) => [snap.id, snap]));
@@ -11842,22 +12538,27 @@ function EditablePageRenderer(props) {
 			snapshots.map((s) => `${s.id}:${s.version}`).join("|"),
 			linkedEntries.map((entry) => `${entry.meta.entryId}:${entry.version}`).join("|"),
 			`overlay:${overlayRevision}`,
-			`generated-icons:${state.generatedIconAssets?.revision ?? 0}`
+			`generated-icons:${state.generatedIconAssets?.revision ?? 0}`,
+			linkedSaveHandoversVersion(state.linkedSaveHandovers),
+			`block-versions:${state.blockVersions.revision}`
 		].join("|");
 	});
-	const linkedEntryOverlays = useMemo(() => {
-		const overlays = /* @__PURE__ */ new Map();
-		for (const linkedEntry of uiStore.getState().linkedEntries.inspect()) {
-			const content = linkedEntry.current ?? linkedEntry.baseline;
-			if (!content) continue;
-			overlays.set(linkedEntry.meta.entryId, {
-				content,
-				optimisticHash: linkedEntry.meta.optimisticHash
-			});
-		}
-		return overlays;
-	}, [uiStore, renderStateVersion]);
-	const linkedEntryDataContext = useMemo(() => applyLinkedEntryRenderOverlayToDataContext(pageRendererProps.dataContext, linkedEntryOverlays), [linkedEntryOverlays, pageRendererProps.dataContext]);
+	const remoteDrafts = useEditorUiStore((state) => state.remoteDrafts);
+	const contentSnapshot = useEditorUiStore((state) => state.content.getSnapshot());
+	const renderSource = useEditorUiStore((state) => renderSourceFor(state.editability));
+	const linkedEntryOverlays = useMemo(() => linkedEntryRenderOverlaysFromStore(uiStore), [
+		uiStore,
+		renderStateVersion,
+		remoteDrafts,
+		renderSource
+	]);
+	const entryDataContext = useMemo(() => withRenderedContentEntry(pageRendererProps.dataContext, resolveRenderedValues(renderSource, contentSnapshot, remoteDraftValues(remoteDrafts, { kind: "content" }))), [
+		contentSnapshot,
+		pageRendererProps.dataContext,
+		remoteDrafts,
+		renderSource
+	]);
+	const linkedEntryDataContext = useMemo(() => applyLinkedEntryRenderOverlayToDataContext(entryDataContext, linkedEntryOverlays), [linkedEntryOverlays, entryDataContext]);
 	const aiProjections = useMemo(() => previewProjectionsFromAiOverlays(uiStore.getState().aiOverlays), [uiStore, renderStateVersion]);
 	const previewTheme = pageRendererProps.rendering?.kind === "overrides-only" ? null : pageRendererProps.theme;
 	const runtimePreviewSource = useMemo(() => resolveRuntimePreviewSourceForTheme(pageDesignState, previewTheme), [pageDesignState, previewTheme]);
@@ -11878,7 +12579,10 @@ function EditablePageRenderer(props) {
 		pageRendererProps.page,
 		renderProjections,
 		uiStore,
-		renderStateVersion
+		renderStateVersion,
+		remoteDrafts,
+		contentSnapshot,
+		renderSource
 	]) ?? {
 		name: "",
 		path: "",
@@ -11925,7 +12629,7 @@ function EditablePageRenderer(props) {
 			blockId,
 			children: rendered
 		});
-		const rawContent = uiStore.getState().drafts.getBlockSnapshot(editorBlockId)?.current ?? block.content ?? {};
+		const rawContent = renderedBlockContent(uiStore, editorBlockId) ?? block.content ?? {};
 		const content = applyPreviewRuntimeContentProjections(block, applyPreviewContentFieldProjections(editorBlockId, rawContent, aiProjections) ?? rawContent, renderProjections);
 		return /* @__PURE__ */ jsx(EditableBlockProvider, {
 			blockId,
@@ -11960,23 +12664,17 @@ function EditablePageRenderer(props) {
 		dataContext: linkedEntryDataContext,
 		apiClient: blockDataApiClient
 	});
-	const generatedIconAssetOverlay = useMemo(() => {
-		const byBlock = {};
-		for (const block of renderPage.blocks) {
-			if (!block.id) continue;
-			const assets = uiStore.getState().generatedIconAssets?.getForBlock(unsafeAsEditorBlockId(block.id)) ?? [];
-			if (assets.length > 0) byBlock[block.id] = assets;
-		}
-		return byBlock;
-	}, [
+	useLinkedSaveHandoverRetention(uiStore, entryDataContext, liveResolvedData);
+	const generatedIconAssetOverlay = useMemo(() => generatedIconAssetsByBlock(uiStore, renderPage.blocks), [
 		renderPage.blocks,
 		renderStateVersion,
 		uiStore
 	]);
-	const dataContext = useMemo(() => mergeGeneratedIconAssetsIntoDataContext(mergeResolvedDataContext(linkedEntryDataContext, liveResolvedData), generatedIconAssetOverlay), [
+	const dataContext = useMemo(() => mergeGeneratedIconAssetsIntoDataContext(applyLinkedEntryRenderOverlayToDataContext(mergeResolvedDataContext(linkedEntryDataContext, liveResolvedData), linkedEntryOverlays), generatedIconAssetOverlay), [
 		generatedIconAssetOverlay,
 		linkedEntryDataContext,
-		liveResolvedData
+		liveResolvedData,
+		linkedEntryOverlays
 	]);
 	return /* @__PURE__ */ jsx(EditorPageRenderer, {
 		...pageRendererProps,
@@ -12008,8 +12706,7 @@ function usePreviewBlockResolvedData(args) {
 				id: block.id,
 				kind: block.kind,
 				content: block.content ?? null,
-				draftContent: block.draftContent ?? null,
-				publishedContent: block.publishedContent ?? null
+				draftContent: block.draftContent ?? null
 			}))
 		});
 	}, [
@@ -12085,15 +12782,13 @@ function buildPreviewBlockDataContext(dataContext) {
 		}
 	};
 }
-function mergeResolvedDataContext(dataContext, liveResolvedData) {
-	if (!dataContext || !liveResolvedData) return dataContext;
-	return {
-		...dataContext,
-		resolvedData: {
-			...dataContext.resolvedData ?? {},
-			...liveResolvedData
-		}
-	};
+/** Each rendered block's generated icon assets, for blocks that have any. */
+function generatedIconAssetsByBlock(uiStore, blocks) {
+	const assets = uiStore.getState().generatedIconAssets;
+	return Object.fromEntries(blocks.flatMap((block) => {
+		const forBlock = block.id ? assets?.getForBlock(unsafeAsEditorBlockId(block.id)) ?? [] : [];
+		return block.id && forBlock.length > 0 ? [[block.id, forBlock]] : [];
+	}));
 }
 function createPreviewBlockDataApiClient(dashboardApiClient, context) {
 	const batcher = createMicrobatcher({
@@ -12226,23 +12921,35 @@ function resolveContentStorageUrl(content) {
 //#endregion
 //#region ../preview-next/src/client/sdk/SdkPreviewModeRuntime.tsx
 var SdkPreviewModeRuntime_exports = /* @__PURE__ */ __exportAll({ SdkPreviewModeRuntime: () => SdkPreviewModeRuntime });
+function SdkEditablePageRenderer(props) {
+	const previewToken = usePreviewToken();
+	return /* @__PURE__ */ jsx(EditablePageRenderer, {
+		...props,
+		dataContext: {
+			...props.dataContext,
+			previewToken
+		}
+	});
+}
 function isSdkCustomBlockArray(value) {
 	return Array.isArray(value);
 }
+function recordOrNull(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
 function toPreviewBlock(block, index) {
-	const publishedContent = block.publishedContent;
-	return {
+	return toEditorBlockItem({
 		id: block.id,
-		draftContentId: typeof block.draftContentId === "string" ? block.draftContentId : null,
-		publishedContentId: typeof block.publishedContentId === "string" ? block.publishedContentId : null,
 		kind: block.kind,
 		purpose: block.purpose,
 		orderIndex: index,
 		content: block.content ?? null,
 		draftContent: block.draftContent ?? null,
-		publishedContent: publishedContent && typeof publishedContent === "object" && !Array.isArray(publishedContent) ? publishedContent : null,
-		bindings: block.bindings ?? null
-	};
+		bindings: block.bindings ?? null,
+		draftContentId: typeof block.draftContentId === "string" ? block.draftContentId : null,
+		publishedContentId: typeof block.publishedContentId === "string" ? block.publishedContentId : null,
+		publishedContent: recordOrNull(block.publishedContent)
+	});
 }
 function getSdkConfigForPreview(value) {
 	if (!value || typeof value !== "object") return null;
@@ -12278,7 +12985,7 @@ function SdkPreviewModeRuntime(props) {
 		previewToken,
 		siteId
 	]);
-	const editablePage = model.rendering.kind === "overrides-only" ? /* @__PURE__ */ jsx(EditablePageRenderer, {
+	const editablePage = model.rendering.kind === "overrides-only" ? /* @__PURE__ */ jsx(SdkEditablePageRenderer, {
 		rendering: { kind: "overrides-only" },
 		page,
 		dataContext,
@@ -12286,7 +12993,7 @@ function SdkPreviewModeRuntime(props) {
 		blockOverrides: typedBlockOverrides ?? {},
 		sdkConfig: sdkConfig ?? void 0,
 		customBlocks: customBlocks ?? void 0
-	}) : /* @__PURE__ */ jsx(EditablePageRenderer, {
+	}) : /* @__PURE__ */ jsx(SdkEditablePageRenderer, {
 		theme: requireSdkPreviewTheme(model.theme),
 		page,
 		dataContext,
@@ -12355,7 +13062,6 @@ function resolveSdkPreviewRuntimeModel(props) {
 			siteId,
 			apiBaseUrl,
 			portalToken: null,
-			previewToken: props.previewToken,
 			resolvedData: content.resolvedData,
 			routes: routeMap,
 			pagesByIdentifier: content.pagesByIdentifier ?? void 0,
@@ -12401,4 +13107,4 @@ function deriveDashboardBaseUrlFromApiBaseUrl(apiBaseUrl) {
 	}
 }
 //#endregion
-export { FixedBottomSurface as C, getSiteFontsStorageUrl as S, usePreviewBlockCustomizeSelectionOptional as _, usePreviewPageDesignEditorState as a, buildFontPreviewUrl as b, applyPreviewChromeSurfaceToElement as c, buildPreviewDashboardSetupUrl as d, resolvePreviewDashboardSetupHandoff as f, useBlockCustomizeControls as g, usePreviewSiteFontStorageUrl as h, PreviewShellLayout as i, resolvePreviewChromeSurface as l, resolvePreviewSidebarChromeModel as m, SdkPreviewModeRuntime_exports as n, PREVIEW_CHROME_PORTAL_CLASS_NAME as o, resolvePreviewEditorGuidanceModel as p, PreviewShell as r, PREVIEW_CHROME_THEME_CLASS_NAME as s, SdkPreviewModeRuntime as t, canInspectSiteStyle as u, PreviewFormProvider as v, generateFontFaceCss as x, previewWidgetOverrides as y };
+export { getSiteFontsStorageUrl as C, generateFontFaceCss as S, useBlockCustomizeControls as _, usePreviewPageDesignEditorState as a, previewWidgetOverrides as b, applyPreviewChromeSurfaceToElement as c, canInspectSiteStyle as d, buildPreviewDashboardSetupUrl as f, usePreviewSiteFontStorageUrl as g, resolvePreviewSidebarChromeModel as h, PreviewShellLayout as i, resolvePreviewChromeSurface as l, resolvePreviewEditorGuidanceModel as m, SdkPreviewModeRuntime_exports as n, PREVIEW_CHROME_PORTAL_CLASS_NAME as o, resolvePreviewDashboardSetupHandoff as p, PreviewShell as r, PREVIEW_CHROME_THEME_CLASS_NAME as s, SdkPreviewModeRuntime as t, PREVIEW_THEME_COOKIE_NAME as u, usePreviewBlockCustomizeSelectionOptional as v, FixedBottomSurface as w, buildFontPreviewUrl as x, PreviewFormProvider as y };