@riverbankcms/sdk 0.67.0 → 0.68.0

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

@@ -0,0 +1,21 @@
+import { type SyncResult } from '../sync';
+import { type CliCommandExecutionReport } from './commandRuntime';
+export declare function commandReportToSyncResult<TSubject>(input: Readonly<{
+    report: CliCommandExecutionReport<TSubject>;
+    incrementSuccess: (result: SyncResult, subject: TSubject) => void;
+    recordFailure: (result: SyncResult, identifier: string, message: string, subject: TSubject | undefined) => void;
+}>): SyncResult;
+export declare function executeCompiledCliCommandPlanAsSyncResult<TCompiledPlan extends Readonly<{
+    plan: Readonly<{
+        commands: readonly unknown[];
+    }>;
+}>, TExecutionResult, TSubject>(input: Readonly<{
+    compiledPlan: TCompiledPlan;
+    onBeforeExecute?: (commandCount: number) => void;
+    executePlan: (plan: TCompiledPlan['plan']) => Promise<TExecutionResult>;
+    executionToReport: (input: Readonly<{
+        execution: TExecutionResult;
+        compiledPlan: TCompiledPlan;
+    }>) => CliCommandExecutionReport<TSubject>;
+    reportToSyncResult: (report: CliCommandExecutionReport<TSubject>) => SyncResult;
+}>): Promise<SyncResult>;

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

@@ -0,0 +1,27 @@
+import { type Result, type SiteId } from '@riverbankcms/core';
+import type { ManagementClient } from '../../client/management/types';
+import type { LocalContent } from '../content/reader';
+import type { EnvTarget } from '../helpers';
+import type { ContentDiff, SyncResult } from '../sync';
+import { compilePagePushCommands } from './pageCommands';
+import type { CommandSurface, CommandSurfaceCompileResult, CommandSurfaceCompileSuccess, CommandSurfaceExecutionReport, CompiledContentPushExecutionPlan, CompiledContentPushExecutionStep, ContentPushExecutionPlan, ContentPushExecutionReport } from './pushExecutionTypes';
+export type CommandSurfaceDispatchInput = Readonly<{
+    siteId: SiteId;
+    target: EnvTarget;
+    diff: ContentDiff;
+    local: LocalContent;
+    client: ManagementClient;
+    blockFieldExtensions: Parameters<typeof compilePagePushCommands>[0]['blockFieldExtensions'];
+    onEntryCommandCount?: (commandCount: number) => void;
+    onFormCommandCount?: (commandCount: number) => void;
+    onNavigationCommandCount?: (commandCount: number) => void;
+    onPageCommandCount?: (commandCount: number) => void;
+}>;
+export type CommandSurfaceDispatchDependencies = Readonly<{
+    compileCommandSurface?: (surface: CommandSurface, input: CommandSurfaceDispatchInput) => CommandSurfaceCompileResult;
+    executeCommandSurfaceAsReport?: (surface: CommandSurfaceCompileSuccess, input: CommandSurfaceDispatchInput) => Promise<CommandSurfaceExecutionReport>;
+}>;
+export declare function compileContentPushExecutionPlan(plan: ContentPushExecutionPlan, input: CommandSurfaceDispatchInput, dependencies?: CommandSurfaceDispatchDependencies): Result<CompiledContentPushExecutionPlan, ContentPushExecutionReport>;
+export declare function executeCommandSurfaceAsReport(surface: CommandSurfaceCompileSuccess, input: CommandSurfaceDispatchInput): Promise<CommandSurfaceExecutionReport>;
+export declare function skippedRemainingCommandReports(steps: readonly CompiledContentPushExecutionStep[]): CommandSurfaceExecutionReport[];
+export declare function commandSurfaceReportToSyncResult(report: CommandSurfaceExecutionReport): SyncResult;

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

@@ -0,0 +1,56 @@
+import { type Result, type SiteId } from '@riverbankcms/core';
+import type { ManagementClient } from '../../client/management/types';
+import type { LocalCourse, LocalEvent, LocalEventCategory, LocalVenue } from '../content/reader';
+import type { EnvTarget } from '../helpers';
+import type { PushScopeResult } from '../commands/push/scopes/types';
+import { type CliCommandCompileBatchSuccessWithReports, type CliCommandValidationCompileError } from './commandRuntime';
+export type CliDatedOfferingCommandBatchSource = 'push_venues' | 'push_event_categories' | 'push_events' | 'push_courses' | 'push_all_dated_offerings';
+export type DatedOfferingSiteCommandType = 'upsertVenue' | 'deleteVenue' | 'upsertEventCategory' | 'deleteEventCategory' | 'upsertEventSeries' | 'deleteEventSeries' | 'upsertCourse' | 'deleteCourse';
+type DatedOfferingCounter = 'created' | 'updated' | 'deleted';
+export type DatedOfferingReportSubject = Readonly<{
+    scopeCommand: 'venues' | 'event-categories' | 'events' | 'courses';
+    scopeName: string;
+    itemLabelSingular: string;
+    identifier: string;
+    counter: DatedOfferingCounter;
+}>;
+export type CliDatedOfferingCommandCompileError = Readonly<{
+    code: 'unsupported_local_shape';
+    identifier: string;
+    message: string;
+}> | CliCommandValidationCompileError;
+export type CliDatedOfferingCommandCompileInput = Readonly<{
+    source: CliDatedOfferingCommandBatchSource;
+    siteId: SiteId;
+    targetEnv: EnvTarget;
+    venues?: DatedOfferingUpsertInput<LocalVenue>;
+    eventCategories?: DatedOfferingUpsertInput<LocalEventCategory>;
+    events?: DatedOfferingUpsertInput<LocalEvent>;
+    courses?: DatedOfferingUpsertInput<LocalCourse>;
+    delete?: DatedOfferingDeleteInput;
+}>;
+export type DatedOfferingUpsertInput<TItem> = Readonly<{
+    items: readonly DatedOfferingUpsertItem<TItem>[];
+}>;
+export type DatedOfferingUpsertItem<TItem> = Readonly<{
+    item: TItem;
+    exists: boolean;
+}>;
+export type DatedOfferingDeleteInput = Readonly<{
+    venues?: readonly string[];
+    eventCategories?: readonly string[];
+    events?: readonly string[];
+    courses?: readonly string[];
+}>;
+export type CliDatedOfferingCommandCompileSuccess = CliCommandCompileBatchSuccessWithReports<DatedOfferingSiteCommandType, DatedOfferingReportSubject>;
+export declare const datedOfferingSiteCommandTypes: readonly ["upsertVenue", "deleteVenue", "upsertEventCategory", "deleteEventCategory", "upsertEventSeries", "deleteEventSeries", "upsertCourse", "deleteCourse"];
+export declare function compileDatedOfferingPushCommands(input: CliDatedOfferingCommandCompileInput): Result<CliDatedOfferingCommandCompileSuccess, CliDatedOfferingCommandCompileError>;
+export declare function executeDatedOfferingCommandPlanAsPushScopeResult(input: Readonly<{
+    client: Pick<ManagementClient, 'venues' | 'eventCategories' | 'events' | 'courses'>;
+    compiledPlan: CliDatedOfferingCommandCompileSuccess;
+    scopeCommand: DatedOfferingReportSubject['scopeCommand'];
+    scopeName: string;
+}>): Promise<PushScopeResult>;
+export declare function syncResultForDatedOfferingCommandCompileError(error: CliDatedOfferingCommandCompileError, scopeCommand: DatedOfferingReportSubject['scopeCommand'], scopeName: string): PushScopeResult;
+export declare function courseSessionConflictMessage(error: unknown): string;
+export {};

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

@@ -4,7 +4,7 @@ import type { ManagementClient } from '../../client/management/types';
 import type { LocalContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { ContentDiff } from '../sync/diff';
-import { type SyncResult } from '../sync';
+import type { SyncResult } from '../sync';
 import { type CliContentTypeKey, type CliEntryIdentifier } from './commandKeys';
 import { type CliCommandCompileBatchSuccessWithReports, type CliCommandValidationCompileError, type CliCommandExecutionError, type CliCommandExecutionReport, type CliCommandExecutionResult } from './commandRuntime';
 export type CliEntryCommandBatchSource = 'push_entries' | 'merge_remote_entries';
@@ -49,7 +49,9 @@ export declare function executeEntryCommandPlan(input: Readonly<{
     plan: Pick<EntrySiteCommandPlan, 'commands'>;
 }>): Promise<CliEntryCommandExecutionResult>;
 export declare function executeEntryCommandPlanAsSyncResult(input: CliEntryCommandSyncInput): Promise<SyncResult>;
+export declare function executeEntryCommandPlanAsReport(input: CliEntryCommandSyncInput): Promise<EntryCommandExecutionReport>;
 export declare function syncResultForEntryCommandCompileError(error: CliCommandCompileError): SyncResult;
+export declare function entryCommandCompileErrorToReport(error: CliCommandCompileError): EntryCommandExecutionReport;
 export declare function entryCommandExecutionToSyncResult(input: Readonly<{
     execution: CliEntryCommandExecutionResult;
     compiledPlan: EntryCommandCompiledPlan;

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

@@ -4,7 +4,7 @@ import type { ManagementClient } from '../../client/management/types';
 import type { LocalFooterContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { FooterDiff } from '../sync/diff';
-import { type SyncResult } from '../sync';
+import type { SyncResult } from '../sync';
 import { type CliCommandCompileBatchSuccessWithReports, type CliCommandExecutionError, type CliCommandExecutionReport, type CliCommandExecutionResult, type CliCommandValidationCompileError } from './commandRuntime';
 export type CliFooterCommandBatchSource = 'push_footer';
 export type CliFooterCommandCompileError = CliCommandValidationCompileError;
@@ -37,7 +37,13 @@ export declare function executeFooterCommandPlanAsSyncResult(input: Readonly<{
     compiledPlan: FooterCommandCompiledPlan;
     onBeforeExecute?: (commandCount: number) => void;
 }>): Promise<SyncResult>;
+export declare function executeFooterCommandPlanAsReport(input: Readonly<{
+    client: Pick<ManagementClient, 'footer'>;
+    compiledPlan: FooterCommandCompiledPlan;
+    onBeforeExecute?: (commandCount: number) => void;
+}>): Promise<FooterCommandExecutionReport>;
 export declare function syncResultForFooterCommandCompileError(error: CliFooterCommandCompileError): SyncResult;
+export declare function footerCommandCompileErrorToReport(error: CliFooterCommandCompileError): FooterCommandExecutionReport;
 export declare function footerCommandExecutionToSyncResult(input: Readonly<{
     execution: CliFooterCommandExecutionResult;
     compiledPlan: FooterCommandCompiledPlan;

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

@@ -4,7 +4,7 @@ import type { ManagementClient } from '../../client/management/types';
 import type { LocalContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { ContentDiff } from '../sync/diff';
-import { type SyncResult } from '../sync';
+import type { SyncResult } from '../sync';
 import { type CliFormSlug } from './commandKeys';
 import { type CliCommandCompileBatchSuccessWithReports, type CliCommandExecutionError, type CliCommandExecutionReport, type CliCommandExecutionResult, type CliCommandValidationCompileError } from './commandRuntime';
 export type CliFormCommandBatchSource = 'push_forms';
@@ -39,16 +39,12 @@ export declare function executeFormCommandPlan(input: Readonly<{
     client: Pick<ManagementClient, 'forms'>;
     plan: Pick<FormSiteCommandPlan, 'commands'>;
 }>): Promise<CliFormCommandExecutionResult>;
-export declare function executeFormCommandPlanAsSyncResult(input: Readonly<{
+export declare function executeFormCommandPlanAsReport(input: Readonly<{
     client: Pick<ManagementClient, 'forms'>;
     compiledPlan: FormCommandCompiledPlan;
     onBeforeExecute?: (commandCount: number) => void;
-}>): Promise<SyncResult>;
-export declare function syncResultForFormCommandCompileError(error: CliFormCommandCompileError): SyncResult;
-export declare function formCommandExecutionToSyncResult(input: Readonly<{
-    execution: CliFormCommandExecutionResult;
-    compiledPlan: FormCommandCompiledPlan;
-}>): SyncResult;
+}>): Promise<FormCommandExecutionReport>;
+export declare function formCommandCompileErrorToReport(error: CliFormCommandCompileError): FormCommandExecutionReport;
 export declare function formCommandExecutionToReport(input: Readonly<{
     execution: CliFormCommandExecutionResult;
     compiledPlan: FormCommandCompiledPlan;

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

@@ -1,4 +1,5 @@
 export * from './commandRuntime';
+export * from './datedOfferingCommands';
 export * from './entryCommands';
 export * from './formCommands';
 export * from './footerCommands';

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

@@ -4,7 +4,7 @@ import type { ManagementClient } from '../../client/management/types';
 import type { LocalContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { NavigationDiff } from '../sync/diff';
-import { type SyncResult } from '../sync';
+import type { SyncResult } from '../sync';
 import { type CliNavigationMenuName } from './commandKeys';
 import { type CliCommandCompileBatchSuccessWithReports, type CliCommandExecutionError, type CliCommandExecutionReport, type CliCommandExecutionResult, type CliCommandValidationCompileError } from './commandRuntime';
 export type CliNavigationCommandBatchSource = 'push_navigation';
@@ -39,16 +39,12 @@ export declare function executeNavigationCommandPlan(input: Readonly<{
     client: Pick<ManagementClient, 'navigation'>;
     plan: Pick<NavigationSiteCommandPlan, 'commands'>;
 }>): Promise<CliNavigationCommandExecutionResult>;
-export declare function executeNavigationCommandPlanAsSyncResult(input: Readonly<{
+export declare function executeNavigationCommandPlanAsReport(input: Readonly<{
     client: Pick<ManagementClient, 'navigation'>;
     compiledPlan: NavigationCommandCompiledPlan;
     onBeforeExecute?: (commandCount: number) => void;
-}>): Promise<SyncResult>;
-export declare function syncResultForNavigationCommandCompileError(error: CliNavigationCommandCompileError): SyncResult;
-export declare function navigationCommandExecutionToSyncResult(input: Readonly<{
-    execution: CliNavigationCommandExecutionResult;
-    compiledPlan: NavigationCommandCompiledPlan;
-}>): SyncResult;
+}>): Promise<NavigationCommandExecutionReport>;
+export declare function navigationCommandCompileErrorToReport(error: CliNavigationCommandCompileError): NavigationCommandExecutionReport;
 export declare function navigationCommandExecutionToReport(input: Readonly<{
     execution: CliNavigationCommandExecutionResult;
     compiledPlan: NavigationCommandCompiledPlan;

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

@@ -5,7 +5,7 @@ import type { LocalContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { BlockFieldExtensionsMap } from '../../config/types';
 import type { ContentDiff } from '../sync/diff';
-import { type SyncResult } from '../sync';
+import type { SyncResult } from '../sync';
 import { type CliBlockIdentifier, type CliPageIdentifier } from './commandKeys';
 import { type CliCommandCompileBatchSuccessWithReports, type CliCommandExecutionError, type CliCommandExecutionReport, type CliCommandExecutionResult, type CliCommandValidationCompileError } from './commandRuntime';
 export type CliPageCommandBatchSource = 'push_pages';
@@ -65,16 +65,12 @@ export declare function executePageCommandPlan(input: Readonly<{
     client: Pick<ManagementClient, 'pages' | 'blocks'>;
     plan: Pick<PageSiteCommandPlan, 'commands'>;
 }>): Promise<CliPageCommandExecutionResult>;
-export declare function executePageCommandPlanAsSyncResult(input: Readonly<{
+export declare function executePageCommandPlanAsReport(input: Readonly<{
     client: Pick<ManagementClient, 'pages' | 'blocks'>;
     compiledPlan: PageCommandCompiledPlan;
     onBeforeExecute?: (commandCount: number) => void;
-}>): Promise<SyncResult>;
-export declare function syncResultForPageCommandCompileError(error: CliPageCommandCompileError): SyncResult;
-export declare function pageCommandExecutionToSyncResult(input: Readonly<{
-    execution: CliPageCommandExecutionResult;
-    compiledPlan: PageCommandCompiledPlan;
-}>): SyncResult;
+}>): Promise<PageCommandExecutionReport>;
+export declare function pageCommandCompileErrorToReport(error: CliPageCommandCompileError): PageCommandExecutionReport;
 export declare function pageCommandExecutionToReport(input: Readonly<{
     execution: CliPageCommandExecutionResult;
     compiledPlan: PageCommandCompiledPlan;

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

@@ -1,65 +1,17 @@
-import { type Result, type SiteId } from '@riverbankcms/core';
-import { compileEntryPushCommands } from './entryCommands';
-import { compileFormPushCommands } from './formCommands';
-import { compileNavigationPushCommands } from './navigationCommands';
-import { compilePagePushCommands } from './pageCommands';
+import { type SiteId } from '@riverbankcms/core';
 import type { ManagementClient } from '../../client/management/types';
-import type { PushScope } from '../commands/push/consts';
 import type { LocalContent } from '../content/reader';
 import type { EnvTarget } from '../helpers';
 import type { OutputContext } from '../output';
-import { type ContentDiff, type ResidualSettingsDiff, type ResidualSettingsLocalContent, type SyncResult } from '../sync';
-export type CommandSurface = 'entry' | 'page' | 'form' | 'navigation';
-type ResidualSettingsPushPlan = Readonly<{
-    diff: ResidualSettingsDiff;
-    local: ResidualSettingsLocalContent;
-}>;
-type CommandSurfaceFailurePolicy = 'continue' | 'stop';
-export type CommandSurfaceCompileResult = Readonly<{
-    surface: 'entry';
-    compileResult: ReturnType<typeof compileEntryPushCommands>;
-}> | Readonly<{
-    surface: 'page';
-    compileResult: ReturnType<typeof compilePagePushCommands>;
-}> | Readonly<{
-    surface: 'form';
-    compileResult: ReturnType<typeof compileFormPushCommands>;
-}> | Readonly<{
-    surface: 'navigation';
-    compileResult: ReturnType<typeof compileNavigationPushCommands>;
-}>;
-export type CommandSurfaceCompileSuccess = Readonly<{
-    surface: 'entry';
-    compileValue: OkValue<ReturnType<typeof compileEntryPushCommands>>;
-}> | Readonly<{
-    surface: 'page';
-    compileValue: OkValue<ReturnType<typeof compilePagePushCommands>>;
-}> | Readonly<{
-    surface: 'form';
-    compileValue: OkValue<ReturnType<typeof compileFormPushCommands>>;
-}> | Readonly<{
-    surface: 'navigation';
-    compileValue: OkValue<ReturnType<typeof compileNavigationPushCommands>>;
-}>;
-type OkValue<T> = T extends Readonly<{
-    ok: true;
-    value: infer TValue;
-}> ? TValue : never;
-export type ContentPushExecutionStep = Readonly<{
-    kind: 'residual-settings-sync';
-    residual: ResidualSettingsPushPlan;
-    onFailure: CommandSurfaceFailurePolicy;
-}> | Readonly<{
-    kind: 'command-surface';
-    surface: CommandSurfaceCompileSuccess;
-    onFailure: CommandSurfaceFailurePolicy;
-}>;
-export type ContentPushExecutionPlan = Readonly<{
-    kind: 'sync-steps';
-    steps: readonly ContentPushExecutionStep[];
-}>;
-export declare function executeContentPushPlan(input: Readonly<{
-    pushScope: PushScope;
+import { type ContentDiff, type SyncResult } from '../sync';
+import { type CommandSurfaceDispatchDependencies } from './commandSurfaceDispatch';
+import { planContentPushExecution } from './pushExecutionPlan';
+import type { CommandSurface, CommandSurfaceCompileResult, CommandSurfaceCompileSuccess, CommandSurfaceExecutionReport, ContentPushScope, ContentPushExecutionPlan, ContentPushExecutionReport, ContentPushExecutionStep } from './pushExecutionTypes';
+import type { compilePagePushCommands } from './pageCommands';
+export { planContentPushExecution };
+export type { CommandSurface, CommandSurfaceCompileResult, CommandSurfaceCompileSuccess, CommandSurfaceExecutionReport, ContentPushScope, ContentPushExecutionPlan, ContentPushExecutionReport, ContentPushExecutionStep, };
+export type ContentPushExecutionInput = Readonly<{
+    pushScope: ContentPushScope;
     siteId: SiteId;
     target: EnvTarget;
     diff: ContentDiff;
@@ -71,13 +23,7 @@ export declare function executeContentPushPlan(input: Readonly<{
     onFormCommandCount?: (commandCount: number) => void;
     onNavigationCommandCount?: (commandCount: number) => void;
     onPageCommandCount?: (commandCount: number) => void;
-}>): Promise<SyncResult>;
-export declare function planContentPushExecution(input: Readonly<{
-    pushScope: PushScope;
-    siteId: SiteId;
-    target: EnvTarget;
-    diff: ContentDiff;
-    local: LocalContent;
-    blockFieldExtensions?: Parameters<typeof compilePagePushCommands>[0]['blockFieldExtensions'];
-}>): Result<ContentPushExecutionPlan, SyncResult>;
-export {};
+}>;
+export declare function executeContentPushPlan(input: ContentPushExecutionInput): Promise<SyncResult>;
+export declare function executeContentPushPlanAsCommandReport(input: ContentPushExecutionInput, dependencies?: CommandSurfaceDispatchDependencies): Promise<ContentPushExecutionReport>;
+export declare function contentPushExecutionReportToSyncResult(report: ContentPushExecutionReport): SyncResult;

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

@@ -0,0 +1,8 @@
+import type { LocalContent } from '../content/reader';
+import type { ContentDiff } from '../sync';
+import type { ContentPushScope, ContentPushExecutionPlan } from './pushExecutionTypes';
+export declare function planContentPushExecution(input: Readonly<{
+    pushScope: ContentPushScope;
+    diff: ContentDiff;
+    local: LocalContent;
+}>): ContentPushExecutionPlan;

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

@@ -0,0 +1,97 @@
+import type { SiteCommandRef, SiteCommandType } from '@riverbankcms/site-commands';
+import type { SyncResult, ResidualSettingsDiff, ResidualSettingsLocalContent } from '../sync';
+import type { PushScope } from '../commands/push/consts';
+import type { compileEntryPushCommands, EntryCommandExecutionReport } from './entryCommands';
+import type { compileFormPushCommands, FormCommandExecutionReport } from './formCommands';
+import type { compileNavigationPushCommands, NavigationCommandExecutionReport } from './navigationCommands';
+import type { compilePagePushCommands, PageCommandExecutionReport } from './pageCommands';
+export type CommandSurface = 'entry' | 'page' | 'form' | 'navigation';
+export type CommandSurfaceFailurePolicy = 'continue' | 'stop';
+export type ContentPushScope = Extract<PushScope, 'entries' | 'pages' | 'navigation' | 'forms' | 'all'>;
+export type ResidualSettingsPushPlan = Readonly<{
+    diff: ResidualSettingsDiff;
+    local: ResidualSettingsLocalContent;
+}>;
+export type CommandSurfaceCompileResult = Readonly<{
+    surface: 'entry';
+    compileResult: ReturnType<typeof compileEntryPushCommands>;
+}> | Readonly<{
+    surface: 'page';
+    compileResult: ReturnType<typeof compilePagePushCommands>;
+}> | Readonly<{
+    surface: 'form';
+    compileResult: ReturnType<typeof compileFormPushCommands>;
+}> | Readonly<{
+    surface: 'navigation';
+    compileResult: ReturnType<typeof compileNavigationPushCommands>;
+}>;
+export type CommandSurfaceCompileSuccess = Readonly<{
+    surface: 'entry';
+    compileValue: OkValue<ReturnType<typeof compileEntryPushCommands>>;
+}> | Readonly<{
+    surface: 'page';
+    compileValue: OkValue<ReturnType<typeof compilePagePushCommands>>;
+}> | Readonly<{
+    surface: 'form';
+    compileValue: OkValue<ReturnType<typeof compileFormPushCommands>>;
+}> | Readonly<{
+    surface: 'navigation';
+    compileValue: OkValue<ReturnType<typeof compileNavigationPushCommands>>;
+}>;
+type OkValue<T> = T extends Readonly<{
+    ok: true;
+    value: infer TValue;
+}> ? TValue : never;
+export type ContentPushExecutionStep = Readonly<{
+    kind: 'residual-settings-sync';
+    residual: ResidualSettingsPushPlan;
+    onFailure: CommandSurfaceFailurePolicy;
+}> | Readonly<{
+    kind: 'command-surface';
+    surface: CommandSurface;
+    onFailure: CommandSurfaceFailurePolicy;
+}>;
+export type CompiledContentPushExecutionStep = Readonly<{
+    kind: 'residual-settings-sync';
+    residual: ResidualSettingsPushPlan;
+    onFailure: CommandSurfaceFailurePolicy;
+}> | Readonly<{
+    kind: 'command-surface';
+    surface: CommandSurfaceCompileSuccess;
+    onFailure: CommandSurfaceFailurePolicy;
+}>;
+export type ContentPushExecutionPlan = Readonly<{
+    kind: 'sync-steps';
+    steps: readonly ContentPushExecutionStep[];
+}>;
+export type CompiledContentPushExecutionPlan = Readonly<{
+    kind: 'compiled-sync-steps';
+    steps: readonly CompiledContentPushExecutionStep[];
+}>;
+export type CommandSurfaceExecutionReport = Readonly<{
+    surface: 'entry';
+    report: EntryCommandExecutionReport;
+}> | Readonly<{
+    surface: 'page';
+    report: PageCommandExecutionReport;
+}> | Readonly<{
+    surface: 'form';
+    report: FormCommandExecutionReport;
+}> | Readonly<{
+    surface: 'navigation';
+    report: NavigationCommandExecutionReport;
+}>;
+export type ContentPushExecutionReport = Readonly<{
+    commandReports: readonly CommandSurfaceExecutionReport[];
+    residualSyncResults: readonly SyncResult[];
+}>;
+export type ReportedCommandWithSubject<TSubject> = Readonly<{
+    plannedCommand: Readonly<{
+        command: Readonly<{
+            ref: SiteCommandRef;
+            type: SiteCommandType;
+        }>;
+    }>;
+    reportSubject: TSubject;
+}>;
+export {};

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

@@ -0,0 +1,15 @@
+import type { LocalContent } from '../content/reader';
+import type { ContentDiff } from '../sync';
+import type { CommandSurface, ResidualSettingsPushPlan } from './pushExecutionTypes';
+export declare const baselineResidualOmittedCommandSurfaces: readonly ["navigation"];
+export declare const baselineResidualOmittedCommandSurfaceSet: ReadonlySet<CommandSurface>;
+export declare function syncPlanResidual(input: Readonly<{
+    diff: ContentDiff;
+    local: LocalContent;
+    omitSurfaces: ReadonlySet<CommandSurface>;
+}>): ResidualSettingsPushPlan;
+export declare function residualSettingsPlan(input: Readonly<{
+    diff: ContentDiff;
+    local: LocalContent;
+    commandSurfaces: readonly CommandSurface[];
+}>): ResidualSettingsPushPlan | null;

package/dist/_dts/sdk/src/cli/sync/index.d.ts

@@ -5,4 +5,5 @@
  */
 export { calculateDiff, calculatePullDiff, hasPendingChanges, formatDiffSummary, formatDiffDetail, buildJsonDiff, type ContentDiff, type EntryDiff, type PageDiff, type BlockDiff, type NavigationDiff, type DiffType, type DiffOptions, type JsonDiff, type JsonDiffMode, type JsonDiffChange, type JsonDiffChangeType, type JsonDiffOperation, type PullJsonDiff, type PullJsonDiffChange, type FieldChange, findChangedFieldsWithValues, formatValue, formatHumanDiff, } from './diff';
 export { executeResidualSettingsSyncPlan, createEmptySyncResult, formatSyncResult, type SyncOptions, type SyncResult, type ResidualSettingsDiff, type ResidualSettingsLocalContent, } from './executor';
+export { addCounters, mergeManySyncResults, mergeSyncResults, } from './syncResultAggregation';
 export { extractMediaPaths, buildStorageUrl, downloadMedia, syncMedia, type MediaSyncResult, type MediaSyncSummary, type MediaSyncOptions, type MediaUploadClient, } from './media';

package/dist/_dts/sdk/src/cli/sync/syncResultAggregation.d.ts

@@ -0,0 +1,4 @@
+import { type SyncResult } from './executor';
+export declare function mergeManySyncResults(results: readonly SyncResult[]): SyncResult;
+export declare function mergeSyncResults(first: SyncResult, second: SyncResult): SyncResult;
+export declare function addCounters<TCounters extends Record<string, number>>(first: TCounters, second: TCounters, keys: readonly (keyof TCounters)[]): TCounters;

package/dist/_dts/sdk/src/rendering/overrides.d.ts

@@ -13,6 +13,8 @@ export type BlockOverrideProps<TContent = Record<string, unknown>, TData = Recor
     themeConfig?: Theme;
     data?: TData;
     siteId?: string;
+    apiBaseUrl?: string;
+    portalToken?: string | null;
     supabaseUrl?: string;
     imageResolveContext?: ResolveImageUrlContext;
     blockId: string | null;

package/dist/_dts/sdk/src/theme-bridge/ThemeBridgeProvider.d.ts

@@ -34,7 +34,7 @@
  *     tokens: {
  *       primary: '#6d28d9',
  *       secondary: '#4c1d95',
- *       white: '#ffffff',
+ *       primaryForeground: '#ffffff',
  *       surface: '#f8fafc',
  *       text: '#1e293b',
  *       border: '#e2e8f0',
@@ -60,8 +60,8 @@
  *       primary: 'var(--brand-purple)',
  *       secondary: 'var(--brand-navy)',
  *       background: 'var(--ds-bg)',
+ *       foreground: 'var(--ds-text)',
  *     },
- *     components: { buttons: true },
  *   }}
  * >
  *   {children}
@@ -88,8 +88,8 @@ export interface ThemeBridgeProviderProps {
  * Uses ThemeScopeCore from @riverbankcms/blocks for consistent DOM structure
  * with the full CMS theme system.
  *
- * Optionally generates component CSS for buttons, cards, and inputs when
- * `config.components` is specified.
+ * Optionally generates component CSS for buttons, cards, and inputs when those
+ * component buckets are explicitly enabled.
  */
 export declare function ThemeBridgeProvider({ config, children, className, }: ThemeBridgeProviderProps): import("react/jsx-runtime").JSX.Element;
 /**

package/dist/_dts/sdk/src/theme-bridge/generateCssVars.d.ts

@@ -1,17 +1,9 @@
 /**
- * CSS Variable Generator for Theme Bridge
+ * CSS generator for SDK ThemeBridge manual injection.
  *
- * Generates the CSS variables that Builder blocks expect,
- * from a simplified ThemeBridgeConfig.
- *
- * Key differences from the full CMS theme system:
- * - No shade generation (SDK sites define their own tokens)
- * - Supports arbitrary token names
- * - Supports pass-through of CSS variable references
- * - Opt-in component CSS generation using core generators from @riverbankcms/blocks
+ * React consumers should prefer ThemeBridgeProvider. This helper remains useful
+ * for SDK sites that manually inject a style tag; it delegates to the shared
+ * theme-core bridge runtime so there is one runtime contract.
  */
 import type { ThemeBridgeConfig, ThemeBridgeOutput } from './types';
-/**
- * Generate CSS variables from a ThemeBridgeConfig.
- */
 export declare function generateThemeBridgeCss(config: ThemeBridgeConfig): ThemeBridgeOutput;

package/dist/_dts/sdk/src/theme-bridge/index.d.ts

@@ -29,7 +29,7 @@
  *     tokens: {
  *       primary: '#6d28d9',
  *       secondary: '#4c1d95',
- *       white: '#ffffff',
+ *       primaryForeground: '#ffffff',
  *       surface: '#f8fafc',
  *       text: '#1e293b',
  *       border: '#e2e8f0',

package/dist/_dts/sdk/src/theme-bridge/types.d.ts

@@ -87,7 +87,7 @@ export interface ThemeBridgeComponents {
  *     tokens: {
  *       primary: '#6d28d9',
  *       secondary: '#4c1d95',
- *       white: '#ffffff',
+ *       primaryForeground: '#ffffff',
  *       surface: '#f8fafc',
  *       text: '#1e293b',
  *       border: '#e2e8f0',
@@ -112,8 +112,8 @@ export interface ThemeBridgeComponents {
  *       primary: 'var(--brand-purple)',
  *       secondary: 'var(--brand-navy)',
  *       background: 'var(--ds-bg)',
+ *       foreground: 'var(--ds-text)',
  *     },
- *     components: { buttons: true },
  *   }}
  * >
  *   {children}
@@ -124,7 +124,7 @@ export interface ThemeBridgeConfig {
     /**
      * Color tokens as key-value pairs.
      *
-     * Keys become CSS variable names: `--color-{key}`
+     * Keys become runtime CSS variables such as `--tb-primary`.
      *
      * Values can be:
      * - Hex colors: `'#6d28d9'` (converted to RGB: `109 40 217`)
@@ -134,10 +134,16 @@ export interface ThemeBridgeConfig {
      * Common token names used by blocks:
      * - `primary`, `secondary` - Brand colors
      * - `background`, `surface` - Background colors
-     * - `text`, `mutedText` - Text colors
+     * - `foreground`, `mutedForeground` - Preferred text colors
+     * - `text`, `mutedText` - Accepted aliases for text colors
      * - `border` - Border color
-     * - `white` - For button text on dark backgrounds
-     * - `success`, `warning`, `danger`, `info` - Status colors
+     * - `primaryForeground` - Preferred text color on primary backgrounds
+     * - `white` - Accepted alias for `primaryForeground`
+     * - `success`, `warning`, `destructive`, `info` - Status colors
+     * - `danger` - Accepted alias for `destructive`
+     *
+     * Canonical token names win over aliases when both are present. Empty
+     * canonical values are treated as missing, so aliases or defaults can fill in.
      */
     tokens: Record<string, string>;
     /** Typography settings */
@@ -151,8 +157,10 @@ export interface ThemeBridgeConfig {
     /**
      * Opt-in component CSS generation.
      *
-     * By default, only CSS variables are generated.
-     * Enable components to generate `.button-*`, `.card-*`, `.form-*` classes.
+     * By default, ThemeBridgeProvider generates the structural runtime CSS used
+     * by system blocks, including status, progress, and block-specific vars.
+     * Enable components only when you also want generated visual skins for
+     * `.button-*`, `.card-*`, or `.form-*` classes.
      */
     components?: ThemeBridgeComponents;
     /**
@@ -176,7 +184,7 @@ export interface ThemeBridgeConfig {
  */
 export interface ThemeBridgeOutput {
     /** CSS variables as inline style object */
-    cssVars: Record<string, string>;
+    cssVars: Record<string, string | number>;
     /** Complete CSS string for injection */
     css: string;
 }

package/dist/_dts/sdk/src/version.d.ts

@@ -8,4 +8,4 @@
  * 1. This constant
  * 2. The "version" field in package.json
  */
-export declare const SDK_VERSION = "0.67.0";
+export declare const SDK_VERSION = "0.68.0";