@riverbankcms/sdk 0.147.0 → 0.149.0

package/dist/_dts/editor/src/EditorProvider.d.ts

@@ -6,9 +6,13 @@ export type DrawerFocusTarget = {
 };
 export type DraftSyncState = 'baseline' | 'pending' | 'failed';
 interface EditorContextType {
+    /** Requested and allowed: the tab is editing right now. */
     isEditingMode: boolean;
+    /** The person asked to edit, whether or not editing is allowed yet (e.g. while the lease is held elsewhere). */
+    requestedEditingMode: boolean;
     toggleEditingMode: () => void;
     setEditingMode: (value: boolean) => void;
+    setEditingAllowed: (value: boolean) => void;
     editingElement: string | null;
     setEditingElement: (elementId: string | null) => void;
     currentBlockId?: string;
@@ -21,6 +25,7 @@ export declare const useEditor: () => EditorContextType;
 interface EditorProviderProps {
     children: ReactNode;
     initialEditingMode?: boolean;
+    initialEditingAllowed?: boolean;
 }
 export declare const EditorProvider: React.FC<EditorProviderProps>;
 export {};

package/dist/_dts/editor/src/chrome/EditorChrome.d.ts

@@ -1,5 +1,19 @@
 import { type ReactNode } from 'react';
 import { type EditorHistoryBarControls, type EditorStatusBarToolbar, type StatusBarMenuItem } from './EditorStatusBar';
+/**
+ * The status bar's toolbar: the caller's overrides, with anything they leave
+ * out following whether there is something unpublished.
+ */
+export declare function resolveChromeToolbar(toolbarOverrides: Partial<EditorStatusBarToolbar> | undefined, draftSyncState: 'baseline' | 'pending' | 'failed'): EditorStatusBarToolbar;
+/**
+ * The kebab menu: Discard draft when the editor offers it (greyed while there
+ * is nothing to go back to), then Leave edit mode.
+ */
+export declare function buildChromeMenuItems(input: Readonly<{
+    onDiscard?: () => void | Promise<void>;
+    disableDiscard?: boolean;
+    leaveEditMode: () => void;
+}>): StatusBarMenuItem[];
 type EditorChromeProps = {
     toolbarOverrides?: Partial<EditorStatusBarToolbar>;
     onPublish?: () => void | Promise<void>;

package/dist/_dts/editor/src/chrome/EditorStatusBar.d.ts

@@ -19,6 +19,7 @@ export type StatusBarMenuItem = {
     label: string;
     onClick: () => void;
     variant?: "default" | "destructive";
+    disabled?: boolean;
 };
 export type EditorStatusBarProps = {
     status: DraftWorkflowStatus;

package/dist/_dts/editor/src/chrome/statusBarPresentation.d.ts

@@ -1,7 +1,6 @@
 import type { ReactNode } from 'react';
 import type { DraftSyncState } from '../EditorProvider';
 import type { DraftWorkflowStatus, EditorStatusBarProps, EditorStatusBarToolbar, StatusBarMenuItem } from './EditorStatusBar';
-export declare function getLatestSavedAt(values: readonly (string | null)[]): string | null;
 export type EditorStatusBarPresentationInput = Readonly<{
     status: DraftWorkflowStatus;
     lastSavedAt: string | null;

package/dist/_dts/editor/src/index.d.ts

@@ -1,6 +1,6 @@
 export { EditorChrome } from './chrome/EditorChrome';
 export { EditorStatusBar } from './chrome/EditorStatusBar';
-export { buildEditorStatusBarPresentationProps, getLatestSavedAt, } from './chrome/statusBarPresentation';
+export { buildEditorStatusBarPresentationProps } from './chrome/statusBarPresentation';
 export type { DraftWorkflowStatus, EditorHistoryBarControls, EditorStatusBarProps, EditorStatusBarToolbar, StatusBarMenuItem, } from './chrome/EditorStatusBar';
 export type { EditorStatusBarPresentationInput } from './chrome/statusBarPresentation';
 export { EditingToggle } from './components/EditingToggle';

package/dist/_dts/editor-blocks/src/BlockEditor.d.ts

@@ -1,3 +1,4 @@
+import type { EditorBlockCollectionReadBaseline } from '../../core/src/index';
 import { type ReactNode } from 'react';
 import { type StoreApi } from './utils/useStoreSelector';
 import { type ApiClient } from '../../api/src/request';
@@ -6,10 +7,12 @@ import type { PageDesignEditorReadModel } from '../../theme-core/src/site-styles
 import { type EditorStructuralCommand } from '../../core/src/index';
 import { type CustomBlockRegistryEntry, type SdkConfigForBlockPicker } from './block-editor/sdkBlockMerger';
 import { type BlockCreationCopy } from './block-editor/EmptyState';
+import { type BlockCollectionSlice, type BlockCollectionSource } from './block-editor/hooks/useBlockBaselineSync';
+import type { BlockInsertStore } from './block-editor/hooks/buildInsertBlockHistoryCommand';
 import { type BlockActionPresentation } from './block-editor/actionPresentation';
 import { type ReorderControlMode } from './block-editor/reorderControlMode';
 import { type BlockEditorOwner } from './block-editor/owner';
-import type { ArrayKeysManager, BlockEditorHandle, BlockItem, BlockFocusRequest, UiSlice, DraftsSlice } from './block-editor/types';
+import type { ArrayKeysManager, BlockEditorHandle, BlockItem, BlockFocusRequest, UiSlice, DraftsSlice, FlushBlockValues } from './block-editor/types';
 import type { BlockDraftSaveability } from '../../block-form/src/blockDraftSaveability';
 import type { FieldWidgetComponent } from '../../block-form/src/index';
 type UiState = {
@@ -30,27 +33,25 @@ type UiState = {
             manifest: import('../../blocks/src/index').BlockManifest;
         }>[]) => void;
     };
-    structure: {
-        getList: () => readonly BlockItem[];
-    };
+    structure: BlockCollectionSlice;
     history: {
         applyCommand?: (command: EditorStructuralCommand) => void;
     };
+    insertServerBlock: ReturnType<BlockInsertStore['getState']>['insertServerBlock'];
     generatedIconAssets: {
         setForBlock: (blockId: Parameters<DraftsSlice['setAtPath']>[0], assets: readonly import('../../blocks/src/system/icons/index').GeneratedBlockIconRenderAssetInput[]) => void;
     };
     autosave: {
-        saveNow: (types: 'blocks'[]) => void;
-    };
-    drafts: DraftsSlice & {
-        setFailed?: (blockId: Parameters<DraftsSlice['autosaveFailed']>[0], message?: string) => void;
+        flushValues: FlushBlockValues;
     };
+    drafts: DraftsSlice;
 };
 export type BlockEditorProps = {
     siteId: string;
     dashboardBaseUrl?: string | null;
     owner: BlockEditorOwner;
-    blocks: readonly BlockItem[];
+    source: BlockCollectionSource;
+    collectionReads?: readonly EditorBlockCollectionReadBaseline[];
     recoveryConflictBlockIds?: readonly string[];
     recoveryConflictReviewRequestId?: number | null;
     uiStore: StoreApi<UiState>;

package/dist/_dts/editor-blocks/src/BlockForm.d.ts

@@ -17,7 +17,7 @@ export type BlockFormUiStoreState = GeneratedIconApplyState & {
         showAllValidation: (blockId: EditorBlockId) => boolean;
         getBlockSaveability: (blockId: EditorBlockId) => BlockDraftSaveability;
     };
-    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'clearError' | 'setAtPath' | 'getAtPath'> & {
+    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'setAtPath' | 'getAtPath'> & {
         updateBlockBaseline?: (blockId: EditorBlockId, data: Record<string, unknown> | null) => void;
     };
     arrayKeys: ArrayKeysManager;

package/dist/_dts/editor-blocks/src/block-editor/BlockCard.d.ts

@@ -20,7 +20,7 @@ type BlockCardStore = UiStore<Pick<UiSlice, 'activeBlockId' | 'setActiveBlockId'
         showAllValidation: (blockId: EditorBlockId) => boolean;
         getBlockSaveability: (blockId: EditorBlockId) => BlockDraftSaveability;
     };
-    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'getAtPath' | 'setAtPath' | 'edit' | 'initNewBlock' | 'updateBlockBaseline' | 'clearError'>;
+    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'getAtPath' | 'setAtPath' | 'edit' | 'updateBlockBaseline'>;
     arrayKeys: ArrayKeysManager;
 } & GeneratedIconApplyState>;
 export declare function BlockCard({ interactionReady, siteId, block, manifest, isFirst, isLast, isMoving, onMove, onDuplicate, onDelete, dragListeners, canReorder, collapsed, onCollapsedChange, highlighted, hasRecoveryConflict, focusSignal, onFocusHandled, onBlockSave, theme, widgetOverrides, uiStore, hideThemeV2RawStyleFields, pageDesignBlock, reorderControlMode, actionPresentation, currentStyleGuideVersionId, iconStyleGuideSummary, iconStyleGuideEditHref, onGenerateIconSet, }: {

package/dist/_dts/editor-blocks/src/block-editor/BlockCardFrame.d.ts

@@ -10,7 +10,7 @@ import { type GeneratedIconApplyState } from './generatedIconApplyCoordination';
 /** Drag listener props from dnd-kit */
 type DragListeners = SyntheticListenerMap | undefined;
 type BlockCardFrameStore = UiStore<GeneratedIconApplyState & Pick<UiSlice, 'focusRequest' | 'clearFocus'> & {
-    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'initNewBlock' | 'updateBlockBaseline' | 'clearError' | 'setAtPath' | 'getAtPath'>;
+    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'updateBlockBaseline' | 'setAtPath' | 'getAtPath'>;
     arrayKeys: ArrayKeysManager;
 }>;
 /**

package/dist/_dts/editor-blocks/src/block-editor/BlockSettingsModal.d.ts

@@ -4,7 +4,7 @@ import type { SystemBlockDefinition, Theme } from '../../../blocks/src/index';
 import { type FieldWidgetComponent } from '../../../block-form/src/index';
 import type { ArrayKeysManager, BlockItem, BlockFocusRequest, DraftsSlice, UiSlice, UiStore } from './types';
 type BlockSettingsModalStore = UiStore<Pick<UiSlice, 'focusRequest' | 'clearFocus'> & {
-    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'clearError' | 'setAtPath' | 'getAtPath'>;
+    drafts: Pick<DraftsSlice, 'getBlockSnapshot' | 'getCurrentValues' | 'setAtPath' | 'getAtPath'>;
     arrayKeys: ArrayKeysManager;
 }>;
 export declare function settingsFocusPath(signal: BlockFocusRequest | null, blockId: EditorBlockId | null): string | null;

package/dist/_dts/editor-blocks/src/block-editor/applyExtendedFieldDefaults.d.ts

@@ -1,8 +1,7 @@
-type BlockFieldExtensions = Readonly<Record<string, {
+export type BlockFieldExtensions = Readonly<Record<string, {
     fields?: ReadonlyArray<{
         id: string;
         defaultValue?: unknown;
     }>;
-}>> | null;
-export declare function applyExtendedFieldDefaults(blockKind: string, content: unknown, blockFieldExtensions: BlockFieldExtensions): Record<string, unknown> | null;
-export {};
+}>>;
+export declare function applyExtendedFieldDefaults(blockKind: string, content: unknown, blockFieldExtensions: BlockFieldExtensions | null): Record<string, unknown> | null;

package/dist/_dts/editor-blocks/src/block-editor/blockDraftBaselineSeed.d.ts

@@ -1,15 +1,11 @@
 import { type EditorBlockBaselineInput, type EditorBlockId, type EditorDraftBlockBaselineUpdateMetaInput, type EditorDraftBlockInitMetaInput } from '../../../core/src/index';
-import type { BlockItem } from './types';
-export type BlockFieldExtensions = Readonly<Record<string, {
-    fields?: ReadonlyArray<{
-        id: string;
-        defaultValue?: unknown;
-    }>;
-}>>;
+import { type BlockFieldExtensions } from './applyExtendedFieldDefaults';
+import type { BlockItem, ServerBlockItem } from './types';
+export type { BlockFieldExtensions } from './applyExtendedFieldDefaults';
 export type BlockDraftBaselineSeed = Readonly<{
     blockId: EditorBlockId;
     baseline: EditorBlockBaselineInput;
     initMeta: EditorDraftBlockInitMetaInput;
     refreshMeta: EditorDraftBlockBaselineUpdateMetaInput;
 }>;
-export declare function buildBlockDraftBaselineSeed(block: BlockItem, index: number, blockFieldExtensions?: BlockFieldExtensions | null): BlockDraftBaselineSeed | null;
+export declare function buildBlockDraftBaselineSeed(block: BlockItem | ServerBlockItem, index: number, blockFieldExtensions?: BlockFieldExtensions | null): BlockDraftBaselineSeed | null;

package/dist/_dts/editor-blocks/src/block-editor/editorBlockItem.d.ts

@@ -0,0 +1,23 @@
+import type { BlockListItem } from '../../../api/src/index';
+import { type EditorBlockVersions, type EditorBlockVersionsEntry } from '../../../core/src/index';
+import type { BlockItem, ServerBlockItem } from './types';
+type WireBlock = Omit<BlockListItem, 'id'> & Readonly<{
+    id: string | null;
+    bindings?: Record<string, unknown> | null;
+}>;
+/** The one conversion from an API block to an editor block. */
+export declare function toEditorBlockItem(wire: WireBlock): ServerBlockItem;
+/** The wire identity fields for a block's versions. */
+export declare function wireVersionsOf(versions: EditorBlockVersions): Pick<BlockListItem, 'draftContentId' | 'publishedContentId' | 'publishedContent'>;
+/** The one conversion back to the API shape, for callers that update a block-list response. */
+export declare function toBlockListItem(block: BlockItem & Readonly<{
+    id: string;
+}>, versions: EditorBlockVersions): BlockListItem;
+/**
+ * A block for lists the editor holds. Server versions live only in the store
+ * (recorded on ingestion), so held lists never carry them to go stale.
+ */
+export declare function withoutServerVersions(block: ServerBlockItem): BlockItem;
+/** The server versions carried by blocks just read from the API, for the store. */
+export declare function serverVersionsEntries(blocks: readonly ServerBlockItem[]): readonly EditorBlockVersionsEntry[];
+export {};

package/dist/_dts/editor-blocks/src/block-editor/generatedIconApplyCoordination.d.ts

@@ -1,6 +1,6 @@
 import { type GeneratedBlockIconRenderAssetInput } from '../../../blocks/src/system/icons/index';
 import type { EditorBlockId } from '../../../core/src/index';
-import type { DraftsSlice, UiStore } from './types';
+import type { DraftsSlice, FlushBlockValues, UiStore } from './types';
 import { type FeatureCardGeneratedIconSetActionResult } from './featureCardIconActions';
 import type { GeneratedIconSetPreview } from './GeneratedIconSetDialog';
 export type GeneratedIconApplyState = {
@@ -9,12 +9,7 @@ export type GeneratedIconApplyState = {
         setForBlock: (blockId: EditorBlockId, assets: readonly GeneratedBlockIconRenderAssetInput[]) => void;
     };
     autosave: {
-        saveNow: (types: 'blocks'[]) => void;
-        blocks?: Readonly<{
-            status: 'idle' | 'saving' | 'success' | 'error';
-            lastSavedAt: string | null;
-            hasFailedSaves: boolean;
-        }>;
+        flushValues: FlushBlockValues;
     };
 };
 export type GeneratedIconApplyStore = UiStore<GeneratedIconApplyState>;

package/dist/_dts/editor-blocks/src/block-editor/hooks/applyBlockStructureChange.d.ts

@@ -0,0 +1,4 @@
+import type { EditorStructuralCommand } from '../../../../core/src/index';
+import type { BlockItem } from '../types';
+/** Keep history capture ahead of membership writes; standalone consumers lack history. */
+export declare function applyBlockStructureChange<TCommand extends EditorStructuralCommand>(command: TCommand | null, applyCommand: ((command: TCommand) => void) | undefined, next: BlockItem[], setBlockList: (blocks: BlockItem[]) => void): void;

package/dist/_dts/editor-blocks/src/block-editor/hooks/buildInsertBlockHistoryCommand.d.ts

@@ -1,8 +1,17 @@
-import { type EditorInsertBlockCommand } from '../../../../core/src/index';
-import type { BlockItem } from '../types';
-export declare function buildInsertBlockHistoryCommand({ block, index, draftContent, publishedContent, }: {
-    block: BlockItem;
+import { type EditorBlockVersions, type EditorInsertBlockCommand } from '../../../../core/src/index';
+import type { ServerBlockItem } from '../types';
+export declare function buildInsertBlockHistoryCommand({ block, index, draftContent, }: {
+    block: ServerBlockItem;
     index: number;
     draftContent?: Record<string, unknown> | null;
-    publishedContent?: Record<string, unknown> | null;
 }): EditorInsertBlockCommand | null;
+export type BlockInsertStore = {
+    getState: () => {
+        insertServerBlock: (command: EditorInsertBlockCommand, versions: EditorBlockVersions) => void;
+    };
+};
+/**
+ * Record a server-created block in the editor: an undoable insert, plus its
+ * server versions, which live outside undo history.
+ */
+export declare function applyBlockInsert(uiStore: BlockInsertStore | null | undefined, input: Parameters<typeof buildInsertBlockHistoryCommand>[0]): EditorInsertBlockCommand | null;

package/dist/_dts/editor-blocks/src/block-editor/hooks/useBlockBaselineSync.d.ts

@@ -1,26 +1,28 @@
-import { type EditorBlockId, type EditorBlockBaselineInput, type EditorDraftBlockBaselineUpdateMetaInput, type EditorDraftBlockInitMetaInput } from '../../../../core/src/index';
-import type { BlockItem } from '../types';
-import { type BlockFieldExtensions } from '../blockDraftBaselineSeed';
-type DraftsSlice = {
-    getBlockSnapshot: (blockId: EditorBlockId) => {
-        id: EditorBlockId;
-    } | null;
-    initNewBlock: (blockId: EditorBlockId, baseline: EditorBlockBaselineInput, meta: EditorDraftBlockInitMetaInput) => void;
-    updateBlockBaseline: (blockId: EditorBlockId, baseline: EditorBlockBaselineInput, meta?: EditorDraftBlockBaselineUpdateMetaInput) => void;
-    inspect: () => Array<{
-        id: EditorBlockId;
-    }>;
-    remove: (blockId: EditorBlockId) => void;
+import { type EditorBlockCollectionOwner, type EditorBlockCollectionReadBaseline } from '../../../../core/src/index';
+import type { BlockItem, ServerBlockItem } from '../types';
+export type BlockCollectionSource = Readonly<{
+    kind: 'server';
+    blocks: readonly ServerBlockItem[];
+}> | Readonly<{
+    kind: 'mounted';
+}>;
+export type BlockCollectionSlice = {
+    getOwner: () => EditorBlockCollectionOwner | null;
+    getList: () => readonly BlockItem[];
+    mount: (owner: EditorBlockCollectionOwner, blocks: readonly ServerBlockItem[], reads?: readonly EditorBlockCollectionReadBaseline[]) => void;
+    unmount: (owner: EditorBlockCollectionOwner) => void;
+    replaceList: (blocks: readonly BlockItem[]) => void;
 };
 type UiStore = {
     getState: () => {
-        drafts: DraftsSlice;
+        structure: BlockCollectionSlice;
     };
 };
-export declare function useBlockBaselineSync({ enabled, blockList, blockFieldExtensions, uiStore, }: {
-    enabled: boolean;
-    blockList: readonly BlockItem[];
-    blockFieldExtensions?: BlockFieldExtensions | null;
-    uiStore: UiStore | null;
+/** Server collections admit values and versions atomically; mounted page collections already have an owner. */
+export declare function useBlockBaselineSync({ owner, source, collectionReads, uiStore }: {
+    owner: EditorBlockCollectionOwner | null;
+    source: BlockCollectionSource;
+    collectionReads?: readonly EditorBlockCollectionReadBaseline[];
+    uiStore: UiStore;
 }): void;
 export {};

package/dist/_dts/editor-blocks/src/block-editor/hooks/useBlockCreation.d.ts

@@ -1,15 +1,8 @@
 import type { ApiClient } from '../../../../api/src/request';
 import type { BlockDescriptor } from '../../../../blocks/src/index';
-import type { EditorInsertBlockCommand } from '../../../../core/src/index';
 import type { BlockItem, BlockFocusTarget } from '../types';
+import { type BlockInsertStore } from './buildInsertBlockHistoryCommand';
 import { type BlockEditorOwner } from '../owner';
-type UiStore = {
-    getState: () => {
-        history: {
-            applyCommand?: (command: EditorInsertBlockCommand) => void;
-        };
-    };
-};
 export declare function useBlockCreation({ allowCreation, apiClient, siteId, owner, blockList, setBlockList, onBlocksChange, triggerFocus, uiStore, onStructuralRevisionChange, }: {
     allowCreation: boolean;
     apiClient: ApiClient;
@@ -19,7 +12,7 @@ export declare function useBlockCreation({ allowCreation, apiClient, siteId, own
     setBlockList: (next: BlockItem[]) => void;
     onBlocksChange?: (blocks: BlockItem[]) => void;
     triggerFocus?: (target: BlockFocusTarget) => void;
-    uiStore?: UiStore | null;
+    uiStore?: BlockInsertStore | null;
     onStructuralRevisionChange?: (revision: string) => void;
 }): {
     pickerOpen: boolean;
@@ -32,4 +25,3 @@ export declare function useBlockCreation({ allowCreation, apiClient, siteId, own
     closePicker: () => void;
     handleCreateBlock: (descriptor: BlockDescriptor) => Promise<void>;
 };
-export {};

package/dist/_dts/editor-blocks/src/block-editor/hooks/useBlockDuplication.d.ts

@@ -1,23 +1,16 @@
 import type { ApiClient } from '../../../../api/src/request';
-import { type EditorInsertBlockCommand } from '../../../../core/src/index';
-import type { BlockItem, BlockFocusTarget } from '../types';
+import { type SavedBlockContentVersion } from '../../../../core/src/index';
+import type { BlockItem, BlockFocusTarget, ServerBlockItem } from '../types';
+import { type BlockInsertStore } from './buildInsertBlockHistoryCommand';
 import { type BlockEditorOwner } from '../owner';
-type UiStore = {
-    getState: () => {
-        history: {
-            applyCommand?: (command: EditorInsertBlockCommand) => void;
-        };
-    };
-};
 export declare function buildDuplicatedBlockItem(input: Readonly<{
-    createdBlock: BlockItem;
+    createdBlock: ServerBlockItem;
     copiedContent: Record<string, unknown> | null;
-    persistedCopy: Readonly<{
-        data: unknown;
+    persistedCopy: (SavedBlockContentVersion & Readonly<{
         optimistic_hash?: string | null;
-    }> | null;
+    }>) | null;
     orderIndex: number;
-}>): BlockItem;
+}>): ServerBlockItem;
 export declare function requirePersistedDuplicateRevision(owner: BlockEditorOwner, persistedCopy: Readonly<{
     optimistic_hash?: string | null;
 }>): string | null;
@@ -31,10 +24,9 @@ export declare function useBlockDuplication({ allowCreation, apiClient, siteId,
     onBlocksChange?: (blocks: BlockItem[]) => void;
     triggerFocus?: (target: BlockFocusTarget) => void;
     setErrorMessage: (msg: string | null) => void;
-    uiStore?: UiStore | null;
+    uiStore?: BlockInsertStore | null;
     onStructuralRevisionChange?: (revision: string) => void;
 }): {
     duplicatingBlockId: string | null;
     duplicateBlock: (blockId: string) => Promise<void>;
 };
-export {};

package/dist/_dts/editor-blocks/src/block-editor/owner.d.ts

@@ -1,18 +1,12 @@
 import type { ApiClient } from '../../../api/src/request';
-export type BlockEditorOwner = Readonly<{
-    kind: 'page';
-    pageId: string;
-}> | Readonly<{
-    kind: 'entry-slot';
-    type: string;
-    entryId: string;
-    slotKey: string;
-}> | Readonly<{
+import { type EditorBlockCollectionOwner } from '../../../core/src/index';
+export type BlockEditorOwner = Extract<EditorBlockCollectionOwner, {
+    kind: 'page' | 'entry-slot';
+}> | (Extract<EditorBlockCollectionOwner, {
     kind: 'surface-slot';
-    pageSurfaceId: string;
-    slotKey: string;
+}> & Readonly<{
     compositionHash: string;
-}>;
+}>);
 export type CreateEditableBlockInput = Readonly<{
     kind: string;
     position?: number;
@@ -21,12 +15,8 @@ export type CreateEditableBlockInput = Readonly<{
 }>;
 export declare function blockEditorOwnerKey(owner: BlockEditorOwner): string;
 export declare function createEditableBlockForOwner(apiClient: ApiClient, siteId: string, owner: BlockEditorOwner, input: CreateEditableBlockInput): Promise<{
-    ok: boolean;
-    block: Record<string, unknown>;
-} | {
     ok: boolean;
     block: import("../../../api/src/index").BlockListItem;
-    compositionHash: string;
 }>;
 export declare function reorderEditableBlocksForOwner(apiClient: ApiClient, siteId: string, owner: BlockEditorOwner, blockIds: string[]): Promise<{
     ok: boolean;

package/dist/_dts/editor-blocks/src/block-editor/types.d.ts

@@ -1,14 +1,34 @@
-import type { EditorBlockId, EditorBlockBaselineInput, EditorDraftBlockBaselineUpdateMetaInput, EditorDraftBlockInitMetaInput, EditorStructuralDraftSnapshot, BlockContentIdentity } from '../../../core/src/index';
-export type BlockItem = Partial<BlockContentIdentity> & {
+import type { EditorBlockId, EditorBlockBaselineInput, EditorDraftBlockBaselineUpdateMetaInput, EditorStructuralDraftSnapshot, EditorBlockVersions } from '../../../core/src/index';
+type BlockItemFields = {
     id?: string | null;
     kind: string;
     content?: Record<string, unknown> | null;
     orderIndex?: number | null;
     draftContent?: Record<string, unknown> | null;
-    publishedContent?: Record<string, unknown> | null;
     bindings?: Record<string, unknown> | null;
     purpose?: string | null;
     optimisticHash?: string | null;
+    /**
+     * Wire identity fields are rejected, so an API block can't be passed where an
+     * editor block is expected without going through `toEditorBlockItem`.
+     */
+    draftContentId?: never;
+    publishedContentId?: never;
+    publishedContent?: never;
+};
+/**
+ * A block the editor holds. It carries no server versions: those live only in
+ * the store, recorded when blocks are ingested, so held lists can't go stale.
+ */
+export type BlockItem = BlockItemFields & {
+    versions?: never;
+};
+/**
+ * A block just read from the server (see `toEditorBlockItem`), carrying its
+ * versions until ingestion records them in the store.
+ */
+export type ServerBlockItem = BlockItemFields & {
+    versions: EditorBlockVersions;
 };
 export type DraftBlockSnapshot = EditorStructuralDraftSnapshot;
 /**
@@ -19,19 +39,26 @@ export type DraftsSlice = {
     getBlockSnapshot: (blockId: EditorBlockId) => DraftBlockSnapshot | null;
     getCurrentValues: (blockId: EditorBlockId) => Record<string, unknown> | null;
     inspect: () => DraftBlockSnapshot[];
-    initNewBlock: (blockId: EditorBlockId, baseline: EditorBlockBaselineInput, meta: EditorDraftBlockInitMetaInput) => void;
     updateBlockBaseline: (blockId: EditorBlockId, baseline: EditorBlockBaselineInput, meta?: EditorDraftBlockBaselineUpdateMetaInput) => void;
     edit: (blockId: EditorBlockId, content: Record<string, unknown> | null) => void;
     remove: (blockId: EditorBlockId) => void;
-    clearError: (blockId: EditorBlockId) => void;
-    setPending: (blockId: EditorBlockId) => void;
-    clearPending: (blockId: EditorBlockId) => void;
-    autosaveSucceeded: (blockId: EditorBlockId, content: Record<string, unknown> | null) => void;
-    autosaveFailed: (blockId: EditorBlockId, message?: string) => void;
     setAtPath: (blockId: EditorBlockId, path: string, value: unknown) => void;
     getAtPath: <T = unknown>(blockId: EditorBlockId, path: string) => T | undefined;
     updateBlockOrder: (blockIds: EditorBlockId[]) => void;
 };
+/**
+ * The editor's flush waiter, as block editing uses it: resolves once the given blocks
+ * are saved (`ready`), or can't be (`failed`, `blocked`); rejects on timeout.
+ */
+export type FlushBlockValues = (policy: 'save-draft', options: Readonly<{
+    keys: readonly Readonly<{
+        kind: 'block';
+        blockId: EditorBlockId;
+    }>[];
+    timeoutMs?: number;
+}>) => Promise<Readonly<{
+    kind: 'ready' | 'failed' | 'blocked' | 'operation-failed';
+}>>;
 /**
  * UI state slice - methods for managing editor UI state (focus, active block, etc.)
  */
@@ -95,3 +122,4 @@ export type BlockFocusRequest = BlockFocusTarget & {
 export type BlockEditorHandle = {
     focusField: (target: BlockFocusTarget) => void;
 };
+export {};

package/dist/_dts/editor-blocks/src/index.d.ts

@@ -4,8 +4,9 @@ export type { BlockEditorOwner } from './block-editor/owner';
 export type { BlockCreationCopy } from './block-editor/EmptyState';
 export { createCustomBlockRegistry, mergeBlockDescriptorsWithRegistry, mergeBlockDescriptors, getBlockManifestFromSdkConfig, transformSdkBlockToManifest, transformSdkBlockToDefinition, transformToBlockDescriptor, } from './block-editor/sdkBlockMerger';
 export type { CustomBlockManifestSource, CustomBlockRegistry, CustomBlockRegistryEntry, ResolvedCustomBlockManifest, SdkCustomBlock, SdkConfigForBlockPicker, } from './block-editor/sdkBlockMerger';
-export type { BlockEditorHandle, BlockFocusRequest, BlockFocusTarget, BlockItem, } from './block-editor/types';
+export type { BlockEditorHandle, BlockFocusRequest, BlockFocusTarget, BlockItem, ServerBlockItem, } from './block-editor/types';
 export { buildBlockDraftBaselineSeed, type BlockDraftBaselineSeed, type BlockFieldExtensions, } from './block-editor/blockDraftBaselineSeed';
+export { toBlockListItem, toEditorBlockItem, serverVersionsEntries, wireVersionsOf, withoutServerVersions, } from './block-editor/editorBlockItem';
 export { useBlockListContext, useBlockListContextOptional, BlockListProvider, } from './block-editor/BlockListContext';
 export type { BlockListContextValue } from './block-editor/BlockListContext';
 export { BlockThumbnail } from './block-editor/BlockThumbnail';

package/dist/_dts/editor-blocks/src/widgets/entry-picker/loaders.d.ts

@@ -3,7 +3,7 @@ import type { ApiClient } from '../../../../api/src/request';
 import type { SiteId } from '../../../../core/src/index';
 import type { EntryPickerItem, EntryPickerValueFrom } from './types';
 export type EntryPickerLoaderArgs = Readonly<{
-    apiClient: ApiClient;
+    apiClient: ApiClient<'listContentEntries'>;
     siteId: SiteId;
     contentType: string;
     valueFrom?: EntryPickerValueFrom;

package/dist/_dts/editor-blocks/src/widgets/link/loaders.d.ts

@@ -2,7 +2,7 @@ import type { RoutableContentItem } from '../../../../api/src/navigation';
 import type { ApiClient } from '../../../../api/src/request';
 import type { SiteId } from '../../../../core/src/index';
 export type RoutableContentLoaderArgs = Readonly<{
-    apiClient: ApiClient;
+    apiClient: ApiClient<'getRoutableContent'>;
     siteId: SiteId;
 }>;
 export declare function loadRoutableContentItems({ apiClient, siteId, }: RoutableContentLoaderArgs): Promise<RoutableContentItem[]>;

package/dist/_dts/editor-blocks/src/widgets/mailing-list-targeting/loaders.d.ts

@@ -2,6 +2,6 @@ import type { MailingListAuthoringContext } from '../../../../api/src/index';
 import type { ApiClient } from '../../../../api/src/request';
 import type { SiteId } from '../../../../core/src/index';
 export declare function loadMailingListAuthoringContext(input: Readonly<{
-    apiClient: ApiClient;
+    apiClient: ApiClient<'getMailingListAuthoringContext'>;
     siteId: SiteId;
 }>): Promise<MailingListAuthoringContext>;

package/dist/_dts/editor-blocks/src/widgets/reference/loaders.d.ts

@@ -19,7 +19,7 @@ import type { BuiltInReferenceKind, ReferenceContentTypeKey } from '../../../../
 import { type SiteId } from '../../../../core/src/index';
 import type { ReferenceWidgetItem } from './types';
 export interface ReferenceLoaderArgs {
-    apiClient: ApiClient;
+    apiClient: ApiClient<'listContentEntries' | 'listForms' | 'listBookingForms' | 'getAppointmentServicesReference' | 'getAppointmentResourcesReference' | 'getRoutableContent' | 'listNewsletterLists' | 'listMailchimpAudiences'>;
     siteId: SiteId;
 }
 export interface DynamicContentReferenceLoaderArgs extends ReferenceLoaderArgs {

package/dist/_dts/editor-blocks/src/widgets/site-option-picker/loaders.d.ts

@@ -80,10 +80,11 @@ export declare function mapAppointmentServiceCategoriesToSiteOptionItems(payload
  * calendar pickers keep their existing behaviour.
  */
 export declare const siteOptionSingleSelection: Partial<Readonly<Record<SiteOptionSource, SiteOptionSingleSelectionConfig>>>;
+type SiteOptionApiClient = ApiClient<'listEvents' | 'listEventCategories' | 'listVenues' | 'listAppointmentResources' | 'listAppointmentServiceCategories'>;
 export declare function loadSiteOptionItemsFromApi({ apiClient, siteId, source }: SiteOptionLoadItemsArgs & Readonly<{
-    apiClient: ApiClient;
+    apiClient: SiteOptionApiClient;
 }>): Promise<SiteOptionWidgetItem[]>;
-export declare function createSiteOptionApiLoader(apiClient: ApiClient): SiteOptionLoadItems;
+export declare function createSiteOptionApiLoader(apiClient: SiteOptionApiClient): SiteOptionLoadItems;
 export declare function createSiteOptionWidgetAdapters({ loadItems, mapLoadError, renderManageLink, }: Readonly<{
     loadItems: SiteOptionLoadItems;
     mapLoadError?: SiteOptionLoadErrorMapper;

package/dist/_dts/media-core/src/fileStorage.d.ts

@@ -4,8 +4,12 @@ export declare const FILE_STORAGE_BUCKETS: {
     readonly publicSite: StorageBucketName;
     readonly privateSite: StorageBucketName;
     readonly temporary: StorageBucketName;
+    readonly siteAssets: StorageBucketName;
+    readonly siteFonts: StorageBucketName;
+    readonly bookingRequirementDocuments: StorageBucketName;
 };
 export declare const PUBLIC_SITE_FILE_STORAGE_BUCKETS: readonly [StorageBucketName, StorageBucketName, StorageBucketName];
+export declare const SITE_STORAGE_BUCKETS: readonly [StorageBucketName, StorageBucketName, StorageBucketName, StorageBucketName, StorageBucketName, StorageBucketName];
 export declare const FILE_UPLOAD_STAGING_PREFIX = "temp-file-uploads";
 export declare const DURABLE_FILE_STORAGE_PREFIX = "sites";
 export declare const DURABLE_FILE_FOLDER = "files";

package/dist/_dts/media-editor/src/MediaPickerDialog.d.ts

@@ -6,6 +6,8 @@ export type MediaPickerDialogProps = {
     onOpenChange: (open: boolean) => void;
     assets: MediaAssetWithLabels[];
     loading: boolean;
+    error?: Error | null;
+    retryLoad?: () => void;
     hasMore: boolean;
     selectAsset: (asset: MediaAssetWithLabels) => void;
     loadMore: () => void;
@@ -33,4 +35,4 @@ export type MediaPickerAssetSelection = Readonly<{
     tag: 'disabled';
     reason: string;
 }>;
-export declare const MediaPickerDialog: ({ allowedKinds, open, onOpenChange, assets, loading, hasMore, selectAsset, loadMore, enqueueUploads, uploads, closeOnSelect, disableSelection, statusMessage, statusTone, title, dialogMaxWidth, uploadButtonLabel, uploadAccept, showCameraInput, policy, }: MediaPickerDialogProps) => import("react").JSX.Element;
+export declare const MediaPickerDialog: ({ allowedKinds, open, onOpenChange, assets, loading, error, retryLoad, hasMore, selectAsset, loadMore, enqueueUploads, uploads, closeOnSelect, disableSelection, statusMessage, statusTone, title, dialogMaxWidth, uploadButtonLabel, uploadAccept, showCameraInput, policy, }: MediaPickerDialogProps) => import("react").JSX.Element;