@riverbankcms/sdk 0.62.4 → 0.67.0

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

@@ -18,6 +18,6 @@ export type { BlockDraftSaveability, BlockDraftValidationIssue } from '@riverban
 export { applyManifestIssuesToForm } from './manifestIssues';
 export { BlockPickerDialog } from './block-editor/BlockPickerDialog';
 export { MediaField } from './media/MediaField';
-export * from './widgets';
+export * from './widgets/index';
 export { createBlockFormLogger, setBlockFormLoggerFactory, setBlockFormAppLogger } from './block-form/debug';
 export type { BlockFormLogger } from './block-form/debug';

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

@@ -1,7 +1,7 @@
-export * from './button';
-export * from './content-type-select';
-export * from './entry-picker';
-export * from './icon-picker';
-export * from './link';
-export * from './reference';
-export * from './rich-text';
+export * from './button/index';
+export * from './content-type-select/index';
+export * from './entry-picker/index';
+export * from './icon-picker/index';
+export * from './link/index';
+export * from './reference/index';
+export * from './rich-text/index';

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

@@ -3,7 +3,7 @@ import { type LinkValue } from '@riverbankcms/blocks';
 import type { RoutableContentItem } from '@riverbankcms/api/navigation';
 import type { SiteId } from '@riverbankcms/core';
 import type { LinkWidgetAdapters } from './types';
-type LinkWidgetProps = {
+export type LinkWidgetProps = {
     siteId?: SiteId;
     value: LinkValue | null;
     onChange: (value: LinkValue | null) => void;
@@ -16,4 +16,3 @@ type LinkWidgetProps = {
     mode?: 'inline' | 'dialog';
 };
 export declare function LinkWidget({ siteId, value, onChange, disabled, initialItems, adapters, label, description, fieldPath, mode, }: LinkWidgetProps): import("react/jsx-runtime").JSX.Element;
-export {};

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

@@ -1,4 +1,5 @@
 export { LinkWidget } from './LinkWidget';
+export type { LinkWidgetProps } from './LinkWidget';
 export { LinkPicker } from './LinkPicker';
 export { LinkPickerDialog } from './LinkPickerDialog';
 export { LinkSummary } from './LinkSummary';

package/dist/_dts/preview-next/src/client/blocks/pageDesignRuntimePreview.d.ts

@@ -1,5 +1,5 @@
 import type { BlockItem } from '@riverbankcms/editor-blocks';
-import type { PageDesignEditorReadModel } from '@riverbankcms/theme-core/site-styles/previewCompiler';
+import type { PageDesignEditorReadModel, SurfaceResolutionContext } from '@riverbankcms/theme-core/site-styles/previewCompiler';
 import type { PreviewPageDesignEditorState } from '../preview/PageDesignEditorStateContext';
 import { type RuntimeContentDecorationProjection } from './previewProjection';
 export type RuntimePreviewSource = Readonly<{
@@ -7,9 +7,13 @@ export type RuntimePreviewSource = Readonly<{
 }> | Readonly<{
     kind: 'apply-editor-model';
     editorModel: PageDesignEditorReadModel;
+    surfaceResolutionContext: SurfaceResolutionContext;
 }>;
 export declare function applyPageDesignRuntimeFieldsToBlockItems(blockItems: readonly BlockItem[], source: RuntimePreviewSource): BlockItem[];
 export declare function applyPageDesignRuntimeFieldsToBlockContent(block: BlockItem, content: Record<string, unknown> | null, source: RuntimePreviewSource): Record<string, unknown> | null;
-export declare function buildPageDesignRuntimeFieldsByBlockId(editorModel: PageDesignEditorReadModel): RuntimeContentDecorationProjection['fieldsByBlockId'];
+export declare function buildPageDesignRuntimeFieldsByBlockId(editorModel: PageDesignEditorReadModel, surfaceResolutionContext: SurfaceResolutionContext): RuntimeContentDecorationProjection['fieldsByBlockId'];
 export declare function pageDesignRuntimeProjectionFromSource(source: RuntimePreviewSource): RuntimeContentDecorationProjection | null;
-export declare function resolveRuntimePreviewSource(pageDesignState: PreviewPageDesignEditorState): RuntimePreviewSource;
+export declare function resolveRuntimePreviewSource(input: Readonly<{
+    pageDesignState: PreviewPageDesignEditorState;
+    surfaceResolutionContext: SurfaceResolutionContext | null;
+}>): RuntimePreviewSource;

package/dist/_dts/preview-next/src/client/blocks/previewProjection/runtimeContentDecoration.d.ts

@@ -1,5 +1,5 @@
 import type { BlockItem } from '@riverbankcms/editor-blocks';
-import { type PageDesignEditorReadModel } from '@riverbankcms/theme-core/site-styles/previewCompiler';
+import { type PageDesignEditorReadModel, type SurfaceResolutionContext } from '@riverbankcms/theme-core/site-styles/previewCompiler';
 import type { CanonicalBlockContent, PreviewRenderContent, RuntimeContentDecorationProjection } from './types';
-export declare function runtimeContentDecorationProjectionFromEditorModel(editorModel: PageDesignEditorReadModel): RuntimeContentDecorationProjection;
+export declare function runtimeContentDecorationProjectionFromEditorModel(editorModel: PageDesignEditorReadModel, surfaceResolutionContext: SurfaceResolutionContext): RuntimeContentDecorationProjection;
 export declare function applyRuntimeContentDecorationProjection(block: BlockItem, content: CanonicalBlockContent | PreviewRenderContent | null, projection: RuntimeContentDecorationProjection): PreviewRenderContent;

package/dist/_dts/preview-next/src/client/preview/PreviewEditorSidebar.d.ts

@@ -33,6 +33,7 @@ export type PreviewEditorSidebarProps = {
     theme?: Theme | null;
     themeId?: string | null;
     themeSelectionId?: string | null;
+    themeSelectionUpdatedAt?: string | null;
     /** Persisted Style configurator selections (Phase C / E). */
     themeSelectionButtonPersonalityId?: ButtonPersonalityId | null;
     themeSelectionPaletteVariantId?: PaletteVariantId | null;
@@ -63,4 +64,4 @@ export type PreviewEditorSidebarProps = {
     onViewportWidthChange: (width: ViewportWidth) => void;
     onZoomChange: (zoom: ZoomLevel) => void;
 };
-export declare function PreviewEditorSidebar({ surfaceId, siteId, dashboardBaseUrl, pageId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, theme, themeId, themeSelectionId, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, designRowRequest, apiClient, bearerToken, supabaseUrl, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, siteStyleAccess, activeTab, onTabChange, onClose, viewportMode, viewportWidth, zoom, onViewportModeChange, onViewportWidthChange, onZoomChange, }: PreviewEditorSidebarProps): import("react/jsx-runtime").JSX.Element;
+export declare function PreviewEditorSidebar({ surfaceId, siteId, dashboardBaseUrl, pageId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, theme, themeId, themeSelectionId, themeSelectionUpdatedAt, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, designRowRequest, apiClient, bearerToken, supabaseUrl, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, siteStyleAccess, activeTab, onTabChange, onClose, viewportMode, viewportWidth, zoom, onViewportModeChange, onViewportWidthChange, onZoomChange, }: PreviewEditorSidebarProps): import("react/jsx-runtime").JSX.Element;

package/dist/_dts/preview-next/src/client/preview/PreviewShell.d.ts

@@ -34,6 +34,7 @@ export type PreviewShellProps = {
     theme: Theme;
     themeId?: string | null;
     themeSelectionId?: string | null;
+    themeSelectionUpdatedAt?: string | null;
     /**
      * Persisted Style configurator selections. Forwarded into StyleConfigurator
      * so reload renders the user's saved button personality, palette variant,
@@ -67,7 +68,7 @@ export type PreviewShellProps = {
     designEditorEligibility?: PreviewDesignEditorEligibility;
     baseFetch?: BaseFetch;
 };
-export declare function PreviewShell({ children, apiBaseUrl, blockApiConfig, siteId, siteSlug, editableId, previewSession, previewToken, dashboardBaseUrl, surfaceId, theme, themeId, themeSelectionId, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, pageId, routeId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, initialStatus, initialBlocks, pageMetadata, isSiteLaunched, maintenanceModeEnabled, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, supabaseUrl, useThemeScope, designEditorEligibility, baseFetch, }: PreviewShellProps): import("react/jsx-runtime").JSX.Element;
+export declare function PreviewShell({ children, apiBaseUrl, blockApiConfig, siteId, siteSlug, editableId, previewSession, previewToken, dashboardBaseUrl, surfaceId, theme, themeId, themeSelectionId, themeSelectionUpdatedAt, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, pageId, routeId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, initialStatus, initialBlocks, pageMetadata, isSiteLaunched, maintenanceModeEnabled, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, supabaseUrl, useThemeScope, designEditorEligibility, baseFetch, }: PreviewShellProps): import("react/jsx-runtime").JSX.Element;
 export declare function defaultDesignEditorEligibility(input: Readonly<{
     pageId: string | null;
     entryData?: PreviewContentEntryData | null;

package/dist/_dts/preview-next/src/client/preview/PreviewShellLayout.d.ts

@@ -25,6 +25,7 @@ export type PreviewShellLayoutProps = {
     bearerToken?: string | null;
     themeId?: string | null;
     themeSelectionId?: string | null;
+    themeSelectionUpdatedAt?: string | null;
     themeSelectionButtonPersonalityId?: ButtonPersonalityId | null;
     themeSelectionPaletteVariantId?: PaletteVariantId | null;
     themeSelectionPaletteOverrides?: PaletteOverrides | null;
@@ -42,4 +43,4 @@ export type PreviewShellLayoutProps = {
     useThemeScope?: boolean;
     siteStyleAccess?: SiteStyleAccess;
 };
-export declare function PreviewShellLayout({ children, theme, surfaceId, siteId, dashboardBaseUrl, pageId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, apiClient, bearerToken, themeId, themeSelectionId, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, supabaseUrl, isSiteLaunched, maintenanceModeEnabled, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, useThemeScope, siteStyleAccess, }: PreviewShellLayoutProps): import("react/jsx-runtime").JSX.Element;
+export declare function PreviewShellLayout({ children, theme, surfaceId, siteId, dashboardBaseUrl, pageId, entryData, contentTypeSchema, referenceContentTypeKeys, draftContent, currentTemplate, apiClient, bearerToken, themeId, themeSelectionId, themeSelectionUpdatedAt, themeSelectionButtonPersonalityId, themeSelectionPaletteVariantId, themeSelectionPaletteOverrides, themeSelectionHeaderLookId, themeSelectionFooterLookId, themeSelectionHeaderContext, themeSelectionFooterContext, supabaseUrl, isSiteLaunched, maintenanceModeEnabled, entrySubrouteContext, assistantPanel, sdkConfig, mediaAssets, useThemeScope, siteStyleAccess, }: PreviewShellLayoutProps): import("react/jsx-runtime").JSX.Element;

package/dist/_dts/preview-next/src/client/preview/SiteChromeCustomizeButton.d.ts

@@ -0,0 +1,4 @@
+import type { SiteChromeEditableSurfaceKind } from './SiteChromeEditableSurface';
+export declare function SiteChromeCustomizeButton({ surface, }: {
+    surface: SiteChromeEditableSurfaceKind;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/_dts/preview-next/src/client/preview/SiteChromeCustomizeContext.d.ts

@@ -0,0 +1,49 @@
+import { type ReactNode } from 'react';
+import type { ApiClient } from '@riverbankcms/api/request';
+import type { Theme } from '@riverbankcms/blocks';
+import type { ButtonPersonalityId } from '@riverbankcms/theme-core/buttons';
+import type { PaletteOverrides, PaletteVariantId } from '@riverbankcms/theme-core/palette';
+import type { FooterLookId, FooterSelectionContext, HeaderLookId, HeaderSelectionContext } from '@riverbankcms/theme-core/site-styles';
+import type { SiteStyleAccess } from './siteStyleAccess';
+import { type SiteChromeLookOption } from './siteChromeLookRows';
+import type { SiteChromeEditableSurfaceKind } from './SiteChromeEditableSurface';
+type SiteChromeCustomizeSurfaceState = Readonly<{
+    kind: 'unavailable';
+}> | Readonly<{
+    kind: 'available';
+    label: string;
+    currentId: HeaderLookId | FooterLookId | null;
+    currentLabel: string;
+    options: readonly SiteChromeLookOption<HeaderLookId | FooterLookId | null>[];
+    diagnostics: readonly string[];
+    saving: boolean;
+    failure: string | null;
+    applyAllowed: boolean;
+}>;
+type SiteChromeCustomizeContextValue = Readonly<{
+    getSurfaceState: (surface: SiteChromeEditableSurfaceKind) => SiteChromeCustomizeSurfaceState;
+    cycleSurfaceLook: (surface: SiteChromeEditableSurfaceKind, direction: 'prev' | 'next') => void;
+}>;
+export type SiteChromeCustomizeProviderProps = Readonly<{
+    children: ReactNode;
+    siteId: string;
+    apiClient: ApiClient;
+    theme?: Theme | null;
+    themeId?: string | null;
+    selectionId?: string | null;
+    selectionUpdatedAt?: string | null;
+    initialSelections: Readonly<{
+        selectionUpdatedAt?: string | null;
+        buttonPersonalityId: ButtonPersonalityId | null;
+        paletteVariantId: PaletteVariantId | null;
+        paletteOverrides: PaletteOverrides | null;
+        headerLookId?: HeaderLookId | null;
+        footerLookId?: FooterLookId | null;
+    }>;
+    headerSelectionContext?: Partial<HeaderSelectionContext>;
+    footerSelectionContext?: Partial<FooterSelectionContext>;
+    siteStyleAccess?: SiteStyleAccess;
+}>;
+export declare function SiteChromeCustomizeProvider({ children, siteId, apiClient, theme, themeId, selectionId, selectionUpdatedAt, initialSelections, headerSelectionContext, footerSelectionContext, siteStyleAccess, }: SiteChromeCustomizeProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function useSiteChromeCustomizeOptional(): SiteChromeCustomizeContextValue | null;
+export {};

package/dist/_dts/preview-next/src/client/preview/SiteChromeEditableSurface.d.ts

@@ -0,0 +1,6 @@
+import { default as React, type ReactNode } from 'react';
+export type SiteChromeEditableSurfaceKind = 'header' | 'footer';
+export declare function SiteChromeEditableSurface({ surface, children, }: {
+    surface: SiteChromeEditableSurfaceKind;
+    children: ReactNode;
+}): React.ReactElement<unknown, string | React.JSXElementConstructor<any>>;

package/dist/_dts/preview-next/src/client/preview/StyleConfigurator.d.ts

@@ -11,8 +11,10 @@ export type StyleConfiguratorProps = Readonly<{
     theme?: Theme | null;
     themeId?: string | null;
     selectionId?: string | null;
+    selectionUpdatedAt?: string | null;
     /** Server-persisted design selections. */
     initialSelections: Readonly<{
+        selectionUpdatedAt?: string | null;
         buttonPersonalityId: ButtonPersonalityId | null;
         paletteVariantId: PaletteVariantId | null;
         paletteOverrides: PaletteOverrides | null;
@@ -28,4 +30,4 @@ export type StyleConfiguratorProps = Readonly<{
     }> | null;
     siteStyleAccess: VisibleSiteStyleAccess;
 }>;
-export declare function StyleConfigurator({ siteId, apiClient, theme, themeId, selectionId, initialSelections, headerSelectionContext, footerSelectionContext, expandedRowRequest, siteStyleAccess, }: StyleConfiguratorProps): import("react/jsx-runtime").JSX.Element;
+export declare function StyleConfigurator({ siteId, apiClient, theme, themeId, selectionId, selectionUpdatedAt, initialSelections, headerSelectionContext, footerSelectionContext, expandedRowRequest, siteStyleAccess, }: StyleConfiguratorProps): import("react/jsx-runtime").JSX.Element;

package/dist/_dts/preview-next/src/client/preview/StyleConfigurator.state.d.ts

@@ -38,6 +38,7 @@ export type StyleConfiguratorNotice = Readonly<{
 }>;
 export type SelectionSnapshot = Readonly<{
     siteStyleId: SiteStyleId;
+    selectionUpdatedAt?: string | null;
     headerLookId: HeaderLookId | null;
     footerLookId: FooterLookId | null;
     buttonPersonalityId: ButtonPersonalityId;

package/dist/_dts/preview-next/src/client/preview/styleConfiguratorSnapshot.d.ts

@@ -0,0 +1,18 @@
+import type { Theme } from '@riverbankcms/blocks';
+import type { ButtonPersonalityId } from '@riverbankcms/theme-core/buttons';
+import type { PaletteOverrides, PaletteVariantId } from '@riverbankcms/theme-core/palette';
+import type { FooterLookId, FooterSelectionContext, HeaderLookId, HeaderSelectionContext } from '@riverbankcms/theme-core/site-styles';
+import type { SelectionSnapshot } from './StyleConfigurator.state';
+export declare function resolveStyleConfiguratorInitialSnapshot(input: Readonly<{
+    theme?: Theme | null;
+    initialSelections: Readonly<{
+        selectionUpdatedAt?: string | null;
+        buttonPersonalityId: ButtonPersonalityId | null;
+        paletteVariantId: PaletteVariantId | null;
+        paletteOverrides: PaletteOverrides | null;
+        headerLookId?: HeaderLookId | null;
+        footerLookId?: FooterLookId | null;
+    }>;
+    headerSelectionContext?: Partial<HeaderSelectionContext>;
+    footerSelectionContext?: Partial<FooterSelectionContext>;
+}>): SelectionSnapshot | null;

package/dist/_dts/sdk/src/cli/commands/pull.d.ts

@@ -16,6 +16,11 @@
  */
 import { Command } from 'commander';
 import type { PulledContent } from '../../client/management';
+import type { EntryBaseSnapshotTarget } from '../merge-remote/entrySnapshots';
+export declare function entryBaseSnapshotTargetForPull(input: Readonly<{
+    isRemote: boolean;
+    siteId: string;
+}>): EntryBaseSnapshotTarget;
 export declare function createScopedPullContent(meta: PulledContent['meta'], overrides: Partial<Omit<PulledContent, 'meta'>>): PulledContent;
 /**
  * Determines whether the pull command should prompt for overwrite confirmation.

package/dist/_dts/sdk/src/cli/commands/push/execute/footer.d.ts

@@ -0,0 +1,33 @@
+import type { EnvTarget } from '../../../helpers';
+import type { OutputContext } from '../../../output';
+import { type FooterDiff } from '../../../sync/diff';
+import type { PushOptions } from '../options';
+export type FooterPushExecutionResult = Readonly<{
+    success: boolean;
+}>;
+type FooterPushDecision = Readonly<{
+    kind: 'unchanged';
+}> | Readonly<{
+    kind: 'dry-run';
+    diff: FooterDiff;
+}> | Readonly<{
+    kind: 'apply';
+    diff: FooterDiff;
+}>;
+export declare function footerPushDecision(diff: FooterDiff | null, dryRun: boolean): FooterPushDecision;
+export declare function footerDryRunPayload(diff: FooterDiff): Readonly<{
+    kind: 'push';
+    scope: 'footer';
+    dryRun: true;
+    changes: readonly string[];
+}>;
+export declare function executeFooterPush(input: Readonly<{
+    output: OutputContext;
+    target: EnvTarget;
+    options: PushOptions & {
+        dryRun: boolean;
+    };
+    jsonOutput: boolean;
+    skipMeta: boolean;
+}>): Promise<FooterPushExecutionResult>;
+export {};

package/dist/_dts/sdk/src/cli/commands/push/options.d.ts

@@ -16,6 +16,8 @@ export interface PushOptions {
     deleteOrphaned?: boolean;
     /** Automatically pull stale content and retry push instead of aborting */
     autoPullStale?: boolean;
+    /** Use three-way merge bases to preserve remote entry edits during entries pushes */
+    mergeRemote?: boolean;
     /** Skip writing .meta/*.json and media/.manifest.json (Commander --no-meta sets this to false) */
     meta?: boolean;
     /** Show human-readable field-level diff (requires --dry-run) */

package/dist/_dts/sdk/src/cli/commands/push-execute.d.ts

@@ -2,9 +2,26 @@ import { type EnvTarget } from '../helpers';
 import type { OutputContext } from '../output';
 import { type JsonDiffMode } from '../sync';
 import type { PushOptions } from './push/options';
+import { type PushScope } from './push/consts';
 export interface PushExecutionResult {
     success: boolean;
 }
+type MergeRemoteValidationInput = Readonly<{
+    target: EnvTarget;
+    pushScope: PushScope;
+    contentType?: string;
+    identifier?: string;
+    force: boolean;
+    deleteOrphaned: boolean;
+    autoPullStale: boolean;
+}>;
+type MergeRemoteValidationError = Readonly<{
+    message: string;
+    details: Readonly<{
+        suggestion: string;
+    }>;
+}>;
+export declare function validateMergeRemoteEntryPushOptions(input: MergeRemoteValidationInput): MergeRemoteValidationError | null;
 /**
  * Execute push for a single environment.
  * Extracted to support --env=both multi-environment operations.
@@ -15,3 +32,4 @@ export declare function executePushForEnv(output: OutputContext, target: EnvTarg
 }, globalOpts: {
     json?: boolean;
 }): Promise<PushExecutionResult>;
+export {};

package/dist/_dts/sdk/src/cli/content/entryPaths.d.ts

@@ -0,0 +1,6 @@
+export declare function entryTypeDirPath(contentDir: string, contentType: string): string;
+export declare function entryFilePath(input: Readonly<{
+    contentDir: string;
+    contentType: string;
+    identifier: string;
+}>): string;

package/dist/_dts/sdk/src/cli/content/writer.d.ts

@@ -5,9 +5,11 @@
  */
 import type { PulledEntries, PulledPages, PulledNavigation, PulledSettings, PulledForms, PulledTheme, PulledFooter, PulledVenues, PulledEventCategories, PulledEvents, PulledCourses } from '../../client/management/types';
 import type { Theme } from '../../contracts';
+import type { EntryBaseSnapshotTarget } from '../merge-remote/entrySnapshots';
 export interface WriterOptions {
     skipMeta?: boolean;
     cleanupMissing?: boolean;
+    entryBaseSnapshot?: EntryBaseSnapshotTarget;
 }
 /**
  * Write entries to content directory

package/dist/_dts/sdk/src/cli/env.d.ts

@@ -3,12 +3,13 @@
  *
  * Loads and validates environment variables for SDK CLI commands.
  */
+import { type SiteId } from '@riverbankcms/core';
 /**
  * SDK environment configuration
  */
 export interface SdkEnvironment {
     /** Site ID to operate on */
-    siteId: string;
+    siteId: SiteId;
     /** Dashboard URL (e.g., http://localhost:4000) */
     dashboardUrl: string;
     /** Management API key (bld_mgmt_sk_...) */

package/dist/_dts/sdk/src/cli/merge-remote/entryLocal.d.ts

@@ -0,0 +1,3 @@
+import type { PulledEntries } from '../../client/management/types';
+import type { LocalEntry } from '../content/reader';
+export declare function pulledEntryToLocalEntry(entry: PulledEntries['entries'][number]): LocalEntry;

package/dist/_dts/sdk/src/cli/merge-remote/entryMerge.d.ts

@@ -0,0 +1,77 @@
+import type { LocalEntry } from '../content/reader';
+export type EntryMergeSubject = Readonly<{
+    contentType: string;
+    identifier: string;
+}>;
+export type EntryMergeInputs = Readonly<{
+    subject: EntryMergeSubject;
+    base: LocalEntry | null;
+    local: LocalEntry | null;
+    remote: LocalEntry | null;
+}>;
+export type EntryMergeConflict = Readonly<{
+    code: 'missing_base';
+    subject: EntryMergeSubject;
+    message: string;
+}> | Readonly<{
+    code: 'same_field_changed';
+    subject: EntryMergeSubject;
+    fieldPath: string;
+    message: string;
+}> | Readonly<{
+    code: 'local_delete_remote_edit';
+    subject: EntryMergeSubject;
+    message: string;
+}> | Readonly<{
+    code: 'remote_delete_local_edit';
+    subject: EntryMergeSubject;
+    message: string;
+}> | Readonly<{
+    code: 'unsupported_nested_merge';
+    subject: EntryMergeSubject;
+    fieldPath: string;
+    message: string;
+}>;
+export type EntryMergeDecision = Readonly<{
+    kind: 'unchanged';
+    subject: EntryMergeSubject;
+    desired: LocalEntry | null;
+}> | Readonly<{
+    kind: 'bootstrap_base';
+    subject: EntryMergeSubject;
+    desired: LocalEntry;
+}> | Readonly<{
+    kind: 'preserve_remote';
+    subject: EntryMergeSubject;
+    desired: LocalEntry | null;
+}> | Readonly<{
+    kind: 'apply_local_create' | 'apply_local_update';
+    subject: EntryMergeSubject;
+    desired: LocalEntry;
+}> | Readonly<{
+    kind: 'apply_local_delete';
+    subject: EntryMergeSubject;
+    desired: null;
+}> | Readonly<{
+    kind: 'auto_merge';
+    subject: EntryMergeSubject;
+    desired: LocalEntry;
+    localFieldPaths: readonly string[];
+    remoteFieldPaths: readonly string[];
+}> | Readonly<{
+    kind: 'conflict';
+    subject: EntryMergeSubject;
+    conflict: EntryMergeConflict;
+}>;
+export type ComparableEntry = Readonly<{
+    identifier: string;
+    slug?: string;
+    status?: LocalEntry['status'];
+    hasUnpublishedChanges?: boolean;
+    data: Readonly<Record<string, unknown>>;
+}>;
+export type ComparableEntryContent = Pick<ComparableEntry, 'identifier' | 'slug' | 'data'>;
+export declare function planEntryMerge(input: EntryMergeInputs): EntryMergeDecision;
+export declare function comparableEntry(entry: LocalEntry | null): ComparableEntry | null;
+export declare function comparableEntryContent(entry: LocalEntry | null): ComparableEntryContent | null;
+export declare function entryContentsEqual(left: LocalEntry | null, right: LocalEntry | null): boolean;

package/dist/_dts/sdk/src/cli/merge-remote/entryMergePlan.d.ts

@@ -0,0 +1,45 @@
+import type { PulledEntries } from '../../client/management/types';
+import type { LocalEntry } from '../content/reader';
+import { type EntryBaseSnapshotTarget } from './entrySnapshots';
+import { type EntryMergeDecision } from './entryMerge';
+export type EntryMergePushScope = Readonly<{
+    kind: 'all_entries';
+}> | Readonly<{
+    kind: 'content_type';
+    contentType: string;
+}> | Readonly<{
+    kind: 'single_entry';
+    contentType: string;
+    identifier: string;
+}>;
+export type RemoteEntryMergePlan = Readonly<{
+    scope: EntryMergePushScope;
+    decisions: readonly EntryMergeDecision[];
+    summary: RemoteEntryMergePlanSummary;
+}>;
+export type RemoteEntryMergePlanSummary = Readonly<{
+    unchanged: number;
+    bootstrapBase: number;
+    preserveRemote: number;
+    applyLocalCreate: number;
+    applyLocalUpdate: number;
+    applyLocalDelete: number;
+    autoMerge: number;
+    conflicts: number;
+}>;
+export type RemoteEntryMergePlanInput = Readonly<{
+    contentDir: string;
+    target: EntryBaseSnapshotTarget;
+    scope: EntryMergePushScope;
+    localEntries: ReadonlyMap<string, readonly LocalEntry[]>;
+    remoteEntries: RemoteEntriesByType;
+}>;
+export type RemoteEntriesByType = ReadonlyMap<string, ReadonlyArray<PulledEntries['entries'][number]>>;
+export declare function buildRemoteEntryMergePlan(input: RemoteEntryMergePlanInput): Promise<RemoteEntryMergePlan>;
+export declare function summarizeEntryMergeDecisions(decisions: readonly EntryMergeDecision[]): RemoteEntryMergePlanSummary;
+export declare function entryMergePushScope(input: Readonly<{
+    contentType?: string;
+    identifier?: string;
+}>): EntryMergePushScope;
+export declare function remotePulledEntriesByType(entries: Readonly<Record<string, PulledEntries['entries']>>): RemoteEntriesByType;
+export declare function pulledEntriesToRemoteByType(contentType: string, entries: PulledEntries['entries']): RemoteEntriesByType;

package/dist/_dts/sdk/src/cli/merge-remote/entryMergePush.d.ts

@@ -0,0 +1,22 @@
+import { type SiteId } from '@riverbankcms/core';
+import type { ManagementClient } from '../../client/management/types';
+import type { LocalEntry } from '../content/reader';
+import type { EnvTarget } from '../helpers';
+import type { OutputContext } from '../output';
+export type RemoteEntryMergePushResult = Readonly<{
+    success: boolean;
+}>;
+export declare function planAndReportRemoteEntryMerge(input: Readonly<{
+    output: OutputContext;
+    client: Pick<ManagementClient, 'entries' | 'pull'>;
+    contentDir: string;
+    target: EnvTarget;
+    siteId: SiteId;
+    contentType?: string;
+    identifier?: string;
+    localEntries: ReadonlyMap<string, readonly LocalEntry[]>;
+    dryRun: boolean;
+    jsonOutput: boolean;
+    jsonDiff: boolean;
+    skipMeta: boolean;
+}>): Promise<RemoteEntryMergePushResult>;

package/dist/_dts/sdk/src/cli/merge-remote/entryMergeReport.d.ts

@@ -0,0 +1,30 @@
+import type { OutputContext } from '../output';
+import type { EntryMergeConflict, EntryMergeDecision } from './entryMerge';
+import type { RemoteEntryMergePlan } from './entryMergePlan';
+export type RemoteEntryMergeJsonReport = Readonly<{
+    kind: 'push';
+    scope: 'entries';
+    mergeRemote: true;
+    dryRun: boolean;
+    summary: RemoteEntryMergePlan['summary'];
+    decisions: readonly RemoteEntryMergeDecisionReport[];
+}>;
+export type RemoteEntryMergeDecisionReport = Readonly<{
+    kind: EntryMergeDecision['kind'];
+    contentType: string;
+    identifier: string;
+    localFieldPaths?: readonly string[];
+    remoteFieldPaths?: readonly string[];
+    conflict?: Readonly<{
+        code: EntryMergeConflict['code'];
+        fieldPath?: string;
+        message: string;
+    }>;
+}>;
+export declare function remoteEntryMergeJsonReport(input: Readonly<{
+    plan: RemoteEntryMergePlan;
+    dryRun: boolean;
+}>): RemoteEntryMergeJsonReport;
+export declare function writeRemoteEntryMergeHumanReport(output: Pick<OutputContext, 'info'>, plan: RemoteEntryMergePlan, options: Readonly<{
+    dryRun: boolean;
+}>): void;

package/dist/_dts/sdk/src/cli/merge-remote/entryRemote.d.ts

@@ -0,0 +1,9 @@
+import type { ManagementClient, PulledEntries } from '../../client/management/types';
+import type { OutputContext } from '../output';
+import { type EntryMergePushScope, type RemoteEntriesByType } from './entryMergePlan';
+export declare function fetchRemoteEntriesForMerge(input: Readonly<{
+    client: Pick<ManagementClient, 'pull'>;
+    scope: EntryMergePushScope;
+    output: Pick<OutputContext, 'info' | 'warn'>;
+}>): Promise<RemoteEntriesByType>;
+export declare function fetchRemotePulledEntriesForContentType(client: Pick<ManagementClient, 'pull'>, contentType: string, output: Pick<OutputContext, 'info'>): Promise<PulledEntries>;

package/dist/_dts/sdk/src/cli/merge-remote/entrySnapshots.d.ts

@@ -0,0 +1,50 @@
+import type { PulledEntries } from '../../client/management/types';
+import type { EnvTarget } from '../helpers';
+import type { LocalEntry } from '../content/reader';
+export type EntryBaseSnapshotTarget = Readonly<{
+    env: EnvTarget;
+    siteId: string;
+}>;
+export type EntryBaseSnapshotSubject = Readonly<{
+    contentType: string;
+    identifier: string;
+}>;
+export type EntryBaseSnapshot = Readonly<{
+    version: 'entry-base.v1';
+    target: Readonly<{
+        env: EnvTarget;
+        siteIdHash: string;
+    }>;
+    subject: EntryBaseSnapshotSubject;
+    pulledAt: string;
+    remoteVersion: Readonly<{
+        createdAt?: string;
+        updatedAt?: string;
+        publishedAt?: string | null;
+    }>;
+    entry: LocalEntry;
+}>;
+export type WriteEntryBaseSnapshotsInput = Readonly<{
+    contentDir: string;
+    target: EntryBaseSnapshotTarget;
+    contentType: string;
+    entries: PulledEntries['entries'];
+    meta: PulledEntries['meta'];
+    cleanupMissing?: boolean;
+}>;
+export type WriteEntryBaseSnapshotsResult = Readonly<{
+    rootDir: string;
+    count: number;
+}>;
+export declare function entryBaseSnapshotRoot(contentDir: string): string;
+export declare function entryBaseSnapshotPath(input: Readonly<{
+    contentDir: string;
+    target: EntryBaseSnapshotTarget;
+    subject: EntryBaseSnapshotSubject;
+}>): string;
+export declare function writeEntryBaseSnapshots(input: WriteEntryBaseSnapshotsInput): Promise<WriteEntryBaseSnapshotsResult>;
+export declare function readEntryBaseSnapshot(input: Readonly<{
+    contentDir: string;
+    target: EntryBaseSnapshotTarget;
+    subject: EntryBaseSnapshotSubject;
+}>): Promise<EntryBaseSnapshot | null>;

package/dist/_dts/sdk/src/cli/merge-remote/stableJson.d.ts

@@ -0,0 +1,3 @@
+export declare function stableStringify(value: unknown): string;
+export declare function sortValue(value: unknown): unknown;
+export declare function sortRecord(record: Record<string, unknown>): Record<string, unknown>;

package/dist/_dts/sdk/src/cli/site-commands/commandKeys.d.ts

@@ -0,0 +1,13 @@
+import type { Brand } from '@riverbankcms/core';
+export type CliContentTypeKey = Brand<string, 'SdkCliContentTypeKey'>;
+export type CliEntryIdentifier = Brand<string, 'SdkCliEntryIdentifier'>;
+export type CliPageIdentifier = Brand<string, 'SdkCliPageIdentifier'>;
+export type CliBlockIdentifier = Brand<string, 'SdkCliBlockIdentifier'>;
+export type CliFormSlug = Brand<string, 'SdkCliFormSlug'>;
+export type CliNavigationMenuName = Brand<string, 'SdkCliNavigationMenuName'>;
+export declare const asCliContentTypeKey: (value: string) => CliContentTypeKey;
+export declare const asCliEntryIdentifier: (value: string) => CliEntryIdentifier;
+export declare const asCliPageIdentifier: (value: string) => CliPageIdentifier;
+export declare const asCliBlockIdentifier: (value: string) => CliBlockIdentifier;
+export declare const asCliFormSlug: (value: string) => CliFormSlug;
+export declare const asCliNavigationMenuName: (value: string) => CliNavigationMenuName;