@riverbankcms/sdk 0.79.0 → 0.81.0

package/dist/{chunk-GP555I66.mjs → chunk-3VT7LZY2.mjs}

@@ -1,7 +1,7 @@
 "use client";
-import { assertNever2, useOptionalEditorUiStoreInstance, getPageDesignEditorState, PAGE_DESIGN_EDITOR_STATE_FETCH_ERROR_MESSAGE, unwrapResponse, useDebouncedLatestSave, applyPageDesignEditorAction, AMBIENT_BACKGROUND_ROLES, unsafeAsEditorBlockId, unsafeAsEditorBlockValues, resolvePreviewSidebarTab, applyBackgroundOverrideContentPatch, systemCustomizeFacetDefinitionForBlock, systemCustomizeFacetRollbackContentPatch, systemCustomizeFacetApplyContentPatch, createHistoryState, redoHistory, undoHistory, pushHistoryEntry, canRedoHistory, canUndoHistory, backgroundOverrideEquals, planPageDesignLayoutLookCompatibility } from './chunk-V47ZU33I.mjs';
-import { ApiRequestError, resolveSurfaceDocumentAttributes, SURFACE_DOCUMENT_DATA_ATTRIBUTE, SURFACE_IDS } from './chunk-K2IIF34C.mjs';
-import { createContext, useState, useRef, useEffect, useMemo, useContext } from 'react';
+import { assertNever2, usePreviewDesignHistoryOrder, useOptionalEditorUiStoreInstance, getPageDesignEditorState, PAGE_DESIGN_EDITOR_STATE_FETCH_ERROR_MESSAGE, unwrapResponse, useDebouncedLatestSave, AMBIENT_BACKGROUND_ROLES, applyPageDesignEditorAction, resolvePreviewSidebarTab, confirmAutosaveBatch, beginAutosaveBatch, enqueueTransaction, applyBackgroundOverrideContentPatch, systemCustomizeFacetDefinitionForBlock, systemCustomizeFacetRollbackContentPatch, systemCustomizeFacetApplyContentPatch, unsafeAsEditorBlockId, createHistoryState, rejectAutosaveBatch, redoHistory, undoHistory, pushHistoryEntry, idleEditorTransactionQueueState, canRedoHistory, deriveTransactionCapabilities, canUndoHistory, backgroundOverrideEquals, attachRenderableMediaAssetFields, planPageDesignLayoutLookCompatibility, unsafeAsEditorBlockValues } from './chunk-WUHKQBB6.mjs';
+import { ApiRequestError, resolveSurfaceDocumentAttributes, SURFACE_DOCUMENT_DATA_ATTRIBUTE, SURFACE_IDS } from './chunk-E3NZYEKF.mjs';
+import { createContext, useState, useRef, useEffect, useMemo, useLayoutEffect, useContext } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
 // ../preview-next/src/client/preview/previewCustomizeHistory.ts
@@ -23,6 +23,16 @@ function pushPreviewCustomizeHistoryEntry(state, entry, editorModel) {
     }
   );
 }
+function previewCustomizeBatchHistoryEntry(entries) {
+  const atomicEntries = entries.flatMap((entry) => {
+    if (!entry) return [];
+    return entry.kind === "batch" ? entry.entries : [entry];
+  });
+  if (atomicEntries.length === 0) return null;
+  const firstEntry = atomicEntries[0];
+  if (atomicEntries.length === 1 && firstEntry) return firstEntry;
+  return { kind: "batch", entries: atomicEntries };
+}
 function replacePreviewCustomizeHistoryModel(state, editorModel) {
   return {
     past: pruneHistoryPresents(state.past, editorModel),
@@ -125,11 +135,11 @@ function previewCustomizeHistoryEntryFromAction(editorModel, action) {
       return assertNever2(action, "Unhandled preview customize action");
   }
 }
-function previewCustomizeUndoActionForEntry(entry, editorModel) {
-  return previewCustomizeActionForEntryValue(entry, "from", editorModel);
+function previewCustomizeUndoActionsForEntry(entry, editorModel) {
+  return previewCustomizeActionsForEntryValue(entry, "from", editorModel);
 }
-function previewCustomizeRedoActionForEntry(entry, editorModel) {
-  return previewCustomizeActionForEntryValue(entry, "to", editorModel);
+function previewCustomizeRedoActionsForEntry(entry, editorModel) {
+  return previewCustomizeActionsForEntryValue(entry, "to", editorModel);
 }
 function previewCustomizeHistoryPresentEquals(left, right) {
   return left.editorModel === right.editorModel && previewCustomizeHistoryEntryEquals(left.entry, right.entry);
@@ -189,6 +199,15 @@ function previewCustomizeActionForEntryValue(entry, valueKey, editorModel) {
       return assertNever2(entry, "Unhandled preview customize history entry");
   }
 }
+function previewCustomizeActionsForEntryValue(entry, valueKey, editorModel) {
+  if (entry.kind === "batch") {
+    const entries = valueKey === "from" ? [...entry.entries].reverse() : entry.entries;
+    return entries.map(
+      (batchEntry) => previewCustomizeActionForEntryValue(batchEntry, valueKey, editorModel)
+    );
+  }
+  return [previewCustomizeActionForEntryValue(entry, valueKey, editorModel)];
+}
 function contentRevisionIdForBlock(editorModel, blockId) {
   return editorModel.blocks.find((block) => block.blockId === blockId)?.contentRevision?.contentId ?? null;
 }
@@ -214,6 +233,10 @@ function previewCustomizeHistoryEntryStillApplies(entry, editorModel) {
       return editorModel.boundaries.some(
         (boundary) => boundary.boundaryId === entry.boundaryId && boundary.previousBlockId === entry.previousBlockId && boundary.nextBlockId === entry.nextBlockId
       );
+    case "batch":
+      return entry.entries.every(
+        (batchEntry) => previewCustomizeHistoryEntryStillApplies(batchEntry, editorModel)
+      );
     default:
       return assertNever2(entry, "Unhandled preview customize history entry");
   }
@@ -232,6 +255,13 @@ function previewCustomizeHistoryEntryEquals(left, right) {
       return right.kind === "background" && left.blockId === right.blockId && backgroundOverrideEquals(left.fromOverride, right.fromOverride) && backgroundOverrideEquals(left.toOverride, right.toOverride);
     case "boundary":
       return right.kind === "boundary" && left.boundaryId === right.boundaryId && left.previousBlockId === right.previousBlockId && left.nextBlockId === right.nextBlockId && left.fromBoundaryOptionId === right.fromBoundaryOptionId && left.toBoundaryOptionId === right.toBoundaryOptionId;
+    case "batch":
+      return right.kind === "batch" && left.entries.length === right.entries.length && left.entries.every(
+        (entry, index) => previewCustomizeHistoryEntryEquals(
+          entry,
+          right.entries[index] ?? null
+        )
+      );
     default:
       return assertNever2(left, "Unhandled preview customize history entry");
   }
@@ -286,23 +316,21 @@ function beginPreviewCustomizeApply(workflow, action) {
     workflow.pageState.editorModel,
     action
   );
-  const nextIntent = { action, historyEntry };
-  const nextMutation = workflow.mutation.kind === "applying" ? {
-    ...workflow.mutation,
-    queuedActions: coalescePreviewCustomizeActions(
-      workflow.mutation.queuedActions,
-      nextIntent
-    )
-  } : {
-    kind: "dirty",
-    actions: coalescePreviewCustomizeActions(
-      pendingCustomizeIntents(workflow.mutation),
+  const nextIntent = {
+    targetKey: previewCustomizeTargetKey(action),
+    action,
+    historyEntry
+  };
+  const nextMutation = previewCustomizeMutationFromQueueState(
+    enqueueTransaction(
+      previewCustomizeQueueStateFromMutation(workflow.mutation),
       nextIntent
     )
-  };
+  );
   return {
     kind: "started",
-    action,
+    actions: [action],
+    recordsHistoryEntry: Boolean(historyEntry),
     state: {
       ...workflow,
       pageState: applyPreviewCustomizeActionToLoadedState(
@@ -316,21 +344,27 @@ function beginPreviewCustomizeApply(workflow, action) {
 function beginPreviewCustomizeAutosave(workflow) {
   if (workflow.kind !== "loaded")
     return skippedPreviewCustomizeBeginResult("not-loaded");
-  if (workflow.mutation.kind !== "dirty")
+  if (workflow.mutation.kind !== "dirty" && workflow.mutation.kind !== "failed")
+    return skippedPreviewCustomizeBeginResult("no-history-entry");
+  const nextMutation = previewCustomizeMutationFromQueueState(
+    beginAutosaveBatch(
+      previewCustomizeQueueStateFromMutation(workflow.mutation)
+    )
+  );
+  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");
-  const intent = workflow.mutation.actions[0] ?? null;
-  if (!intent) return skippedPreviewCustomizeBeginResult("no-history-entry");
   return {
     kind: "started",
-    action: intent.action,
+    actions,
+    recordsHistoryEntry: nextMutation.batch.transactions.some(
+      (intent) => Boolean(intent.historyEntry)
+    ),
     state: {
       ...workflow,
-      mutation: {
-        kind: "applying",
-        action: intent.action,
-        historyEntry: intent.historyEntry,
-        queuedActions: []
-      }
+      mutation: nextMutation
     }
   };
 }
@@ -343,22 +377,24 @@ function beginPreviewCustomizeUndo(workflow) {
     return skippedPreviewCustomizeBeginResult("cannot-undo");
   const entry = workflow.history.present.entry;
   if (!entry) return skippedPreviewCustomizeBeginResult("no-history-entry");
-  const action = previewCustomizeUndoActionForEntry(
+  const actions = previewCustomizeUndoActionsForEntry(
     entry,
     workflow.pageState.editorModel
   );
+  assertPreviewCustomizeActions(actions);
   return {
     kind: "started",
-    action,
+    actions,
+    recordsHistoryEntry: true,
     state: {
       ...workflow,
-      pageState: applyPreviewCustomizeActionToLoadedState(
+      pageState: applyPreviewCustomizeActionsToLoadedState(
         workflow.pageState,
-        action
+        actions
       ),
       mutation: {
         kind: "undoing",
-        action,
+        actions,
         entry
       }
     }
@@ -373,22 +409,24 @@ function beginPreviewCustomizeRedo(workflow) {
     return skippedPreviewCustomizeBeginResult("cannot-redo");
   const entry = workflow.history.future[0]?.entry ?? null;
   if (!entry) return skippedPreviewCustomizeBeginResult("no-history-entry");
-  const action = previewCustomizeRedoActionForEntry(
+  const actions = previewCustomizeRedoActionsForEntry(
     entry,
     workflow.pageState.editorModel
   );
+  assertPreviewCustomizeActions(actions);
   return {
     kind: "started",
-    action,
+    actions,
+    recordsHistoryEntry: true,
     state: {
       ...workflow,
-      pageState: applyPreviewCustomizeActionToLoadedState(
+      pageState: applyPreviewCustomizeActionsToLoadedState(
         workflow.pageState,
-        action
+        actions
       ),
       mutation: {
         kind: "redoing",
-        action,
+        actions,
         entry
       }
     }
@@ -402,6 +440,11 @@ function confirmPreviewCustomizeMutation(workflow, response) {
         workflow.pageState,
         response
       );
+      const historyEntry = previewCustomizeBatchHistoryEntry(
+        workflow.mutation.batch.transactions.map(
+          (intent) => intent.historyEntry
+        )
+      );
       const pageStateWithQueuedActions = workflow.mutation.queuedActions.reduce(
         (pageState, intent) => applyPreviewCustomizeActionToLoadedState(pageState, intent.action),
         confirmedPageState
@@ -409,15 +452,19 @@ function confirmPreviewCustomizeMutation(workflow, response) {
       return {
         ...workflow,
         pageState: pageStateWithQueuedActions,
-        history: workflow.mutation.historyEntry ? pushPreviewCustomizeHistoryEntry(
+        history: historyEntry ? pushPreviewCustomizeHistoryEntry(
           workflow.history,
-          workflow.mutation.historyEntry,
+          historyEntry,
           response.editorModel
         ) : replacePreviewCustomizeHistoryModel(
           workflow.history,
           response.editorModel
         ),
-        mutation: workflow.mutation.queuedActions.length > 0 ? { kind: "dirty", actions: workflow.mutation.queuedActions } : { kind: "idle" }
+        mutation: previewCustomizeMutationFromQueueState(
+          confirmAutosaveBatch(
+            previewCustomizeQueueStateFromMutation(workflow.mutation)
+          )
+        )
       };
     }
     case "undoing":
@@ -456,7 +503,10 @@ function rejectPreviewCustomizeMutation(previousWorkflow, outcome) {
   if (previousWorkflow.kind !== "loaded") return previousWorkflow;
   return {
     ...previousWorkflow,
-    mutation: outcome.kind === "stale" ? { kind: "stale", message: outcome.message } : { kind: "failed", message: outcome.message }
+    mutation: rejectedPreviewCustomizeMutation(
+      previousWorkflow.mutation,
+      outcome
+    )
   };
 }
 function previewCustomizeCanUndo(workflow) {
@@ -525,6 +575,8 @@ function skippedPreviewCustomizeMessage(reason) {
 function skipReasonForCustomizeApply(workflow) {
   if (workflow.kind !== "loaded") return "not-loaded";
   if (workflow.mutation.kind === "stale") return "stale";
+  if (workflow.mutation.kind === "undoing" || workflow.mutation.kind === "redoing")
+    return "mutation-pending";
   return null;
 }
 function skipReasonForHistoryMutation(workflow) {
@@ -535,7 +587,11 @@ function skipReasonForHistoryMutation(workflow) {
   return null;
 }
 function previewCustomizeCanStartHistoryMutation(workflow) {
-  return workflow.mutation.kind !== "stale" && workflow.mutation.kind !== "dirty" && !isPendingMutation(workflow.mutation);
+  if (workflow.mutation.kind === "undoing" || workflow.mutation.kind === "redoing")
+    return false;
+  return deriveTransactionCapabilities(
+    previewCustomizeQueueStateFromMutation(workflow.mutation)
+  ).canUseHistory;
 }
 function isPendingMutation(mutation) {
   switch (mutation.kind) {
@@ -558,10 +614,11 @@ function pendingCustomizeIntents(mutation) {
       return mutation.actions;
     case "applying":
       return mutation.queuedActions;
+    case "failed":
+      return mutation.actions;
     case "idle":
     case "undoing":
     case "redoing":
-    case "failed":
     case "stale":
       return [];
     default:
@@ -571,31 +628,93 @@ function pendingCustomizeIntents(mutation) {
 function previewCustomizePendingActions(workflow) {
   return workflow.kind === "loaded" ? pendingCustomizeIntents(workflow.mutation).map((intent) => intent.action) : [];
 }
-function coalescePreviewCustomizeActions(actions, nextAction) {
-  return [
-    ...actions.filter(
-      (action) => !sameCustomizeTarget(action.action, nextAction.action)
-    ),
-    nextAction
-  ];
-}
-function sameCustomizeTarget(left, right) {
-  switch (left.kind) {
+function previewCustomizeTargetKey(action) {
+  switch (action.kind) {
     case "set-layout":
-      return right.kind === "set-layout" && left.blockId === right.blockId;
+      return `block:${action.blockId}:layout`;
     case "set-look":
-      return right.kind === "set-look" && left.blockId === right.blockId;
+      return `block:${action.blockId}:look`;
     case "set-block-facet":
-      return right.kind === "set-block-facet" && left.blockId === right.blockId && left.facetId === right.facetId;
+      return `block:${action.blockId}:facet:${action.facetId}`;
     case "set-background":
-      return right.kind === "set-background" && left.blockId === right.blockId;
+      return `block:${action.blockId}:background`;
     case "set-boundary":
     case "reset-boundary":
-      return (right.kind === "set-boundary" || right.kind === "reset-boundary") && left.previousBlockId === right.previousBlockId && left.nextBlockId === right.nextBlockId;
+      return `boundary:${action.previousBlockId}:${action.nextBlockId}`;
+    default:
+      return assertNever2(action, "Unhandled preview customize action");
+  }
+}
+function previewCustomizeQueueStateFromMutation(mutation) {
+  switch (mutation.kind) {
+    case "idle":
+      return idleEditorTransactionQueueState();
+    case "dirty":
+      return { kind: "dirty", transactions: mutation.actions };
+    case "applying":
+      return {
+        kind: "saving",
+        batch: mutation.batch,
+        followUpTransactions: mutation.queuedActions
+      };
+    case "failed":
+      return {
+        kind: "failed",
+        message: mutation.message,
+        transactions: mutation.actions
+      };
+    case "stale":
+      return {
+        kind: "stale",
+        message: mutation.message,
+        transactions: mutation.actions
+      };
+    case "undoing":
+    case "redoing":
+      return idleEditorTransactionQueueState();
+    default:
+      return assertNever2(mutation, "Unhandled preview customize mutation");
+  }
+}
+function previewCustomizeMutationFromQueueState(state) {
+  switch (state.kind) {
+    case "idle":
+      return { kind: "idle" };
+    case "dirty":
+      return { kind: "dirty", actions: state.transactions };
+    case "saving":
+      return {
+        kind: "applying",
+        batch: state.batch,
+        queuedActions: state.followUpTransactions
+      };
+    case "failed":
+      return {
+        kind: "failed",
+        message: state.message,
+        actions: state.transactions
+      };
+    case "stale":
+      return {
+        kind: "stale",
+        message: state.message,
+        actions: state.transactions
+      };
     default:
-      return assertNever2(left, "Unhandled preview customize action");
+      return assertNever2(state, "Unhandled editor transaction queue state");
   }
 }
+function rejectedPreviewCustomizeMutation(mutation, outcome) {
+  if (mutation.kind === "applying") {
+    return previewCustomizeMutationFromQueueState(
+      rejectAutosaveBatch(previewCustomizeQueueStateFromMutation(mutation), {
+        kind: outcome.kind === "stale" ? "stale" : "retryable",
+        message: outcome.message
+      })
+    );
+  }
+  return outcome.kind === "stale" ? { kind: "stale", message: outcome.message, actions: [] } : { kind: "failed", message: outcome.message, actions: [] };
+}
 function confirmedLoadedState(current, response) {
   return {
     ...current,
@@ -673,6 +792,15 @@ function applyPreviewCustomizeActionToLoadedState(state, action) {
       return assertNever2(action, "Unhandled preview customize action");
   }
 }
+function applyPreviewCustomizeActionsToLoadedState(state, actions) {
+  return actions.reduce(applyPreviewCustomizeActionToLoadedState, state);
+}
+function assertPreviewCustomizeActions(actions) {
+  const action = actions[0] ?? null;
+  if (!action) {
+    throw new Error("Expected preview customize history to produce an action");
+  }
+}
 function optimisticLayoutLookState(block, layoutVariantKey) {
   const plan = planPageDesignLayoutLookCompatibility(block, layoutVariantKey);
   switch (plan.kind) {
@@ -746,6 +874,7 @@ function derivePreviewCustomizeRuntimePatch(input) {
     case "set-layout":
       return {
         blockId: action.blockId,
+        ownedRuntimeFieldPaths: [],
         previousContent,
         nextContent: contentWithLayoutVariant(
           previousContent,
@@ -765,6 +894,7 @@ function derivePreviewCustomizeRuntimePatch(input) {
       if (!definition) return null;
       return {
         blockId: action.blockId,
+        ownedRuntimeFieldPaths: [],
         previousContent,
         nextContent: systemCustomizeFacetApplyContentPatch(
           definition,
@@ -781,10 +911,14 @@ function derivePreviewCustomizeRuntimePatch(input) {
     case "set-background":
       return {
         blockId: action.blockId,
+        ownedRuntimeFieldPaths: ["_sectionStyles.background"],
         previousContent,
-        nextContent: applyBackgroundOverrideContentPatch(
-          previousContent,
-          action.override
+        nextContent: withRuntimeBackgroundImageAsset(
+          applyBackgroundOverrideContentPatch(
+            previousContent,
+            action.override
+          ),
+          action.imageAsset
         ),
         rollback: (currentContent) => contentWithPreviousBackground(currentContent, previousContent)
       };
@@ -829,9 +963,108 @@ function contentWithPreviousBackground(currentContent, previousContent) {
   delete nextContent._sectionStyles;
   return nextContent;
 }
+function withRuntimeBackgroundImageAsset(content, imageAsset) {
+  if (!imageAsset) return content;
+  const sectionStyles = isRecord(content._sectionStyles) ? content._sectionStyles : null;
+  const background = isRecord(sectionStyles?.background) ? sectionStyles.background : null;
+  const image = isRecord(background?.image) ? background.image : null;
+  if (!sectionStyles || !background || !image || background.type !== "image") {
+    return content;
+  }
+  return {
+    ...content,
+    _sectionStyles: {
+      ...sectionStyles,
+      background: {
+        ...background,
+        image: {
+          ...attachRenderableMediaAssetFields(image, imageAsset)
+        }
+      }
+    }
+  };
+}
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
+
+// ../preview-next/src/client/preview/previewCustomizeEditorDraftPatch.ts
+function applyPreviewCustomizeDraftPatch(uiStore, patch, editorModel) {
+  return replaceLocalBlockContentWithoutHistory({
+    uiStore,
+    targetBlockId: patch.blockId,
+    nextContent: patch.nextContent,
+    previousContent: patch.previousContent,
+    editorModel
+  });
+}
+function rollbackPreviewCustomizeDraftPatch(uiStore, patch) {
+  if (!patch) return { kind: "missing-current-content" };
+  const currentContent = currentLocalBlockContent(uiStore, patch.blockId);
+  if (!currentContent) return { kind: "missing-current-content" };
+  return replaceLocalBlockContentWithoutHistory({
+    uiStore,
+    targetBlockId: patch.blockId,
+    nextContent: patch.rollback(currentContent),
+    previousContent: patch.previousContent,
+    editorModel: null
+  });
+}
+function currentLocalBlockContent(uiStore, targetBlockId) {
+  const current = uiStore.getState().drafts.getCurrentValues(unsafeAsEditorBlockId(targetBlockId));
+  return isRecord2(current) ? current : null;
+}
+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) : 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
+    }
+  });
+  return { kind: "applied" };
+}
+function applyDraftContentPatch(draft, nextContent) {
+  return {
+    ...draft,
+    version: draft.version + 1,
+    current: unsafeAsEditorBlockValues(nextContent)
+  };
+}
+function localRuntimeDraftForBlock(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: {
+      kind: block.blockKind,
+      purpose: null,
+      orderIndex: null,
+      publishedContent: null
+    }
+  };
+}
+function isRecord2(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
 var PREVIEW_CUSTOMIZE_STALE_MESSAGE = "This page changed since that design choice. Refresh the preview, then try again.";
 var PageDesignEditorStateContext = createContext({
   state: { kind: "unsupported" },
@@ -862,8 +1095,12 @@ function PreviewPageDesignEditorStateProvider({
     unsupportedPreviewCustomizeWorkflowState
   );
   const [backgroundImagePool, setBackgroundImagePool] = useState([]);
-  const [backgroundImagePoolStatus, setBackgroundImagePoolStatus] = useState("idle");
+  const [backgroundImagePoolStatus, setBackgroundImagePoolStatus] = useState(
+    "idle"
+  );
   const workflowStateRef = useRef(workflowState);
+  const pendingDesignHistoryOrderRecordRef = useRef(false);
+  const previewDesignHistoryOrder = usePreviewDesignHistoryOrder();
   const backgroundImagePoolRequestRef = useRef(null);
   const uiStore = useOptionalEditorUiStoreInstance();
   useEffect(() => {
@@ -919,7 +1156,10 @@ function PreviewPageDesignEditorStateProvider({
         options: { cache: "no-store" }
       }).then((response) => {
         const result = unwrapResponse(response);
-        const nextPool = result.items.map(backgroundImagePoolItemForAsset);
+        const nextPool = result.items.flatMap((asset) => {
+          const item = backgroundImagePoolItemForAsset(asset);
+          return item ? [item] : [];
+        });
         setBackgroundImagePool(nextPool);
         setBackgroundImagePoolStatus("loaded");
         return nextPool;
@@ -954,31 +1194,23 @@ function PreviewPageDesignEditorStateProvider({
     delay: autosaveDelayMs,
     save: async (actions) => {
       if (!pageId) return null;
-      let lastResponse = null;
-      for (const action of actions) {
-        const currentPageState = previewCustomizeWorkflowPageState(
-          workflowStateRef.current
-        );
-        const currentEditorModel = currentPageState.kind === "loaded" ? currentPageState.editorModel : null;
-        lastResponse = await applyPageDesignEditorAction(apiClient, {
-          siteId,
-          pageId,
-          body: {
-            action: pageDesignEditorActionForPersistence(
-              actionWithCurrentBaseContentId(
-                action,
-                lastResponse?.editorModel ?? currentEditorModel
-              )
-            )
-          }
-        });
-      }
-      return lastResponse;
+      const currentPageState = previewCustomizeWorkflowPageState(
+        workflowStateRef.current
+      );
+      return persistPageDesignEditorActions({
+        apiClient,
+        siteId,
+        pageId,
+        actions,
+        editorModel: currentPageState.kind === "loaded" ? currentPageState.editorModel : null
+      });
     },
     onSaving: () => {
       setWorkflowState((current) => {
         const begin = beginPreviewCustomizeAutosave(current);
-        return begin.kind === "started" ? begin.state : current;
+        if (begin.kind !== "started") return current;
+        pendingDesignHistoryOrderRecordRef.current = begin.recordsHistoryEntry;
+        return begin.state;
       });
     },
     onSaved: (response) => {
@@ -986,15 +1218,27 @@ function PreviewPageDesignEditorStateProvider({
       setWorkflowState(
         (current) => confirmPreviewCustomizeMutation(current, response)
       );
+      if (pendingDesignHistoryOrderRecordRef.current) {
+        pendingDesignHistoryOrderRecordRef.current = false;
+        previewDesignHistoryOrder.record("theme-customize");
+      }
     },
     onFailed: (error) => {
+      pendingDesignHistoryOrderRecordRef.current = false;
       const outcome = classifyApplyActionError(error);
       setWorkflowState(
         (current) => rejectPreviewCustomizeMutation(current, outcome)
       );
-      setReloadKey((current) => current + 1);
+      if (outcome.kind === "stale") {
+        setReloadKey((current) => current + 1);
+      }
     }
   });
+  useLayoutEffect(() => {
+    return () => {
+      autosave.flush();
+    };
+  }, [autosave]);
   const value = useMemo(
     () => ({
       state: previewCustomizeWorkflowPageState(workflowState),
@@ -1002,7 +1246,7 @@ function PreviewPageDesignEditorStateProvider({
       backgroundImagePool,
       backgroundImagePoolStatus,
       loadBackgroundImagePool,
-      applyAction: async (action) => {
+      applyAction: async (action, options) => {
         if (!enabled) return skippedPreviewCustomizeOutcome("disabled");
         if (!pageId) return skippedPreviewCustomizeOutcome("missing-page");
         const previousWorkflow = workflowState;
@@ -1010,7 +1254,12 @@ function PreviewPageDesignEditorStateProvider({
         if (begin.kind === "skipped") return begin;
         const previousPageState = previewCustomizeWorkflowPageState(previousWorkflow);
         if (previousPageState.kind === "loaded" && uiStore) {
-          applyLocalRuntimePatch(uiStore, action, previousPageState.editorModel);
+          applyLocalRuntimePatch(
+            uiStore,
+            action,
+            previousPageState.editorModel,
+            options?.runtimeContent ?? null
+          );
         }
         setWorkflowState(begin.state);
         autosave.trigger();
@@ -1023,20 +1272,24 @@ function PreviewPageDesignEditorStateProvider({
         const begin = beginPreviewCustomizeUndo(previousWorkflow);
         if (begin.kind === "skipped") return begin;
         const previousPageState = previewCustomizeWorkflowPageState(previousWorkflow);
-        const runtimePatch = previousPageState.kind === "loaded" && uiStore ? applyLocalRuntimePatch(
-          uiStore,
-          begin.action,
-          previousPageState.editorModel
-        ) : null;
+        const runtimePatches = previousPageState.kind === "loaded" && uiStore ? begin.actions.map(
+          (action) => applyLocalRuntimePatch(
+            uiStore,
+            action,
+            previousPageState.editorModel
+          )
+        ) : [];
         setWorkflowState(begin.state);
         try {
-          const response = await applyPageDesignEditorAction(apiClient, {
+          const response = await persistPageDesignEditorActions({
+            apiClient,
             siteId,
             pageId,
-            body: {
-              action: pageDesignEditorActionForPersistence(begin.action)
-            }
+            actions: begin.actions,
+            editorModel: previousPageState.kind === "loaded" ? previousPageState.editorModel : null
           });
+          if (!response)
+            return skippedPreviewCustomizeOutcome("no-history-entry");
           setWorkflowState(
             (current) => confirmPreviewCustomizeMutation(current, response)
           );
@@ -1047,7 +1300,7 @@ function PreviewPageDesignEditorStateProvider({
             rejectPreviewCustomizeMutation(previousWorkflow, outcome)
           );
           if (uiStore) {
-            rollbackLocalRuntimePatch(uiStore, runtimePatch);
+            rollbackLocalRuntimePatches(uiStore, runtimePatches);
           }
           return outcome;
         }
@@ -1059,20 +1312,24 @@ function PreviewPageDesignEditorStateProvider({
         const begin = beginPreviewCustomizeRedo(previousWorkflow);
         if (begin.kind === "skipped") return begin;
         const previousPageState = previewCustomizeWorkflowPageState(previousWorkflow);
-        const runtimePatch = previousPageState.kind === "loaded" && uiStore ? applyLocalRuntimePatch(
-          uiStore,
-          begin.action,
-          previousPageState.editorModel
-        ) : null;
+        const runtimePatches = previousPageState.kind === "loaded" && uiStore ? begin.actions.map(
+          (action) => applyLocalRuntimePatch(
+            uiStore,
+            action,
+            previousPageState.editorModel
+          )
+        ) : [];
         setWorkflowState(begin.state);
         try {
-          const response = await applyPageDesignEditorAction(apiClient, {
+          const response = await persistPageDesignEditorActions({
+            apiClient,
             siteId,
             pageId,
-            body: {
-              action: pageDesignEditorActionForPersistence(begin.action)
-            }
+            actions: begin.actions,
+            editorModel: previousPageState.kind === "loaded" ? previousPageState.editorModel : null
           });
+          if (!response)
+            return skippedPreviewCustomizeOutcome("no-history-entry");
           setWorkflowState(
             (current) => confirmPreviewCustomizeMutation(current, response)
           );
@@ -1083,7 +1340,7 @@ function PreviewPageDesignEditorStateProvider({
             rejectPreviewCustomizeMutation(previousWorkflow, outcome)
           );
           if (uiStore) {
-            rollbackLocalRuntimePatch(uiStore, runtimePatch);
+            rollbackLocalRuntimePatches(uiStore, runtimePatches);
           }
           return outcome;
         }
@@ -1111,10 +1368,20 @@ function PreviewPageDesignEditorStateProvider({
 }
 function backgroundImagePoolItemForAsset(asset) {
   const backgroundUse = backgroundUseForAsset(asset.fileUses ?? []);
+  if (backgroundUse === null) return null;
   return {
     mediaId: asset.id,
-    source: backgroundUse === null ? "general-media" : backgroundUse === "selected-background" ? "previous-background" : "generated-ambient",
+    source: backgroundUse === "selected-background" ? "previous-background" : "generated-ambient",
     label: asset.title || asset.filename,
+    mediaAsset: {
+      id: asset.id,
+      identifier: asset.identifier ?? null,
+      storageBucket: asset.storageBucket,
+      storagePath: asset.storagePath,
+      width: asset.width ?? null,
+      height: asset.height ?? null,
+      mimeType: asset.mimeType
+    },
     ...isAmbientBackgroundRole(backgroundUse) ? { rank: AMBIENT_BACKGROUND_ROLES.indexOf(backgroundUse) } : {}
   };
 }
@@ -1169,6 +1436,30 @@ function pageDesignEditorActionForPersistence(action) {
       return assertNever2(action, "Unhandled page design editor action");
   }
 }
+async function persistPageDesignEditorActions({
+  apiClient,
+  siteId,
+  pageId,
+  actions,
+  editorModel
+}) {
+  let lastResponse = null;
+  for (const action of actions) {
+    lastResponse = await applyPageDesignEditorAction(apiClient, {
+      siteId,
+      pageId,
+      body: {
+        action: pageDesignEditorActionForPersistence(
+          actionWithCurrentBaseContentId(
+            action,
+            lastResponse?.editorModel ?? editorModel
+          )
+        )
+      }
+    });
+  }
+  return lastResponse;
+}
 function actionWithCurrentBaseContentId(action, editorModel) {
   switch (action.kind) {
     case "set-layout":
@@ -1205,35 +1496,26 @@ function classifyApplyActionError(error) {
 function usePreviewPageDesignEditorState() {
   return useContext(PageDesignEditorStateContext);
 }
-function applyLocalRuntimePatch(uiStore, action, editorModel) {
+function applyLocalRuntimePatch(uiStore, action, editorModel, fallbackContent = null) {
   if (classifyPreviewCustomizeActionDomain(action).kind !== "block-content-write") {
     return null;
   }
   const patch = derivePreviewCustomizeRuntimePatch({
     action,
     editorModel,
-    currentContent: currentLocalBlockContent(
-      uiStore,
-      blockIdForRuntimePatch(action)
-    )
+    currentContent: currentLocalBlockContent(uiStore, blockIdForRuntimePatch(action)) ?? fallbackContent
   });
   if (!patch) return null;
-  replaceLocalBlockContentWithoutHistory(
-    uiStore,
-    patch.blockId,
-    patch.nextContent
-  );
+  applyPreviewCustomizeDraftPatch(uiStore, patch, editorModel);
   return patch;
 }
 function rollbackLocalRuntimePatch(uiStore, patch) {
-  if (!patch) return;
-  const currentContent = currentLocalBlockContent(uiStore, patch.blockId);
-  if (!currentContent) return;
-  replaceLocalBlockContentWithoutHistory(
-    uiStore,
-    patch.blockId,
-    patch.rollback(currentContent)
-  );
+  rollbackPreviewCustomizeDraftPatch(uiStore, patch);
+}
+function rollbackLocalRuntimePatches(uiStore, patches) {
+  for (const patch of [...patches].reverse()) {
+    rollbackLocalRuntimePatch(uiStore, patch);
+  }
 }
 function blockIdForRuntimePatch(action) {
   switch (action.kind) {
@@ -1249,30 +1531,6 @@ function blockIdForRuntimePatch(action) {
       return assertNever2(action, "Unhandled runtime patch action");
   }
 }
-function currentLocalBlockContent(uiStore, targetBlockId) {
-  const current = uiStore.getState().drafts.getCurrentValues(unsafeAsEditorBlockId(targetBlockId));
-  return isRecord2(current) ? current : null;
-}
-function replaceLocalBlockContentWithoutHistory(uiStore, targetBlockId, nextContent) {
-  const editorBlockId = unsafeAsEditorBlockId(targetBlockId);
-  const history = uiStore.getState().history;
-  const snapshot = history.getState().present;
-  const draft = snapshot.drafts[editorBlockId];
-  if (!draft) return;
-  history.restorePresent({
-    ...snapshot,
-    drafts: {
-      ...snapshot.drafts,
-      [editorBlockId]: {
-        ...draft,
-        current: unsafeAsEditorBlockValues(nextContent)
-      }
-    }
-  });
-}
-function isRecord2(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
 
 // ../preview-next/src/client/preview/previewChromeSurface.ts
 var PREVIEW_CHROME_THEME_CLASS_NAME = "builder-dashboard-chrome-theme";
@@ -1350,7 +1608,5 @@ function onPreviewSidebarOpenRequest(handler) {
 function isRecord3(value) {
   return typeof value === "object" && value !== null;
 }
-var PREVIEW_SURFACE_PARAM = "preview_surface";
-var PREVIEW_THEME_COOKIE_NAME = "preview_theme_id";
 
-export { PREVIEW_CHROME_PORTAL_CLASS_NAME, PREVIEW_CHROME_THEME_CLASS_NAME, PREVIEW_SURFACE_PARAM, PREVIEW_THEME_COOKIE_NAME, PreviewPageDesignEditorStateProvider, applyPreviewChromeSurfaceToElement, getPreviewChromeSurfaceDataProps, getPreviewSidebarTab, onPreviewSidebarOpenRequest, resolvePreviewChromeSurface, setPreviewSidebarTab, usePreviewPageDesignEditorState };
+export { PREVIEW_CHROME_PORTAL_CLASS_NAME, PREVIEW_CHROME_THEME_CLASS_NAME, PreviewPageDesignEditorStateProvider, applyPreviewChromeSurfaceToElement, getPreviewChromeSurfaceDataProps, getPreviewSidebarTab, onPreviewSidebarOpenRequest, resolvePreviewChromeSurface, setPreviewSidebarTab, usePreviewPageDesignEditorState };