@spine-event-engine/server 2.0.0-snapshot.26 → 2.0.0-snapshot.29

package/dist/context/bounded-context.js

@@ -24,6 +24,7 @@ import { DeliveryReadiness } from "./local-inbox-handoff.js";
 import { LocalEntityInbox } from "./entity-inbox.js";
 import { LocalProjectionInbox } from "./projection-handoff.js";
 import { TenantAdmissions } from "./tenant-unknown-error.js";
+import { SINGLE_TENANT } from "./tenant-index.js";
 import { AgentExecutionCapacity, } from "../agent/agent-execution-capacity.js";
 import { AgentAcceptanceReceipts, agentAcceptanceReceiptGroup, agentAcceptanceReceiptSpec, } from "../agent/agent-acceptance-receipts.js";
 import { Repository, repositoryAccess, } from "../repository/repository.js";
@@ -152,7 +153,7 @@ export class BoundedContext {
     #agentReceipts;
     #agentController = new AbortController();
     #agentReservations = new Set();
-    #activeReplays = new Set();
+    #activeDeliveries = new Set();
     #activePreparations = new Set();
     #tenantPreparations = new Map();
     #preparationController = new AbortController();
@@ -226,7 +227,7 @@ export class BoundedContext {
         eventBusAccess.bindEnvironment(this.#eventBus, this.#environment);
         eventBusAccess.bindEnvironment(this.#systemEventBus, this.#environment);
         commandBusAccess.setAdmission(this.#commandBus, (command) => this.#admitTenant(command.context?.actorContext?.tenantId));
-        eventBusAccess.setAdmission(this.#eventBus, (event) => this.#admitTenant(ContextParts.readReplayTenant(event)));
+        eventBusAccess.setAdmission(this.#eventBus, (event) => this.#admitTenant(ContextParts.readCatchUpTenant(event)));
         standAccess.setAdmission(this.#stand, (tenantId) => this.#admitTenant(tenantId));
         standAccess.setPublicAdmission(this.#stand, () => {
             if (closingContexts.has(this) && !runtimeAccess.isRunningAdmittedWork(this.#environment))
@@ -374,10 +375,13 @@ export class BoundedContext {
     async #prepareCurrentTenants(mode) {
         if (!this.isMultitenant)
             return this.#requiredPrepare(() => this.#prepareTenant(undefined, mode));
+        const index = this.tenantIndex;
+        if (index === SINGLE_TENANT)
+            throw new Error("Multitenant preparation requires a tenant index.");
         let after;
         do {
             serverEnvironmentAccess.requireAvailable(this.#environment);
-            const page = await this.tenantIndex.page({
+            const page = await index.page({
                 count: 64,
                 signal: this.#preparationController.signal,
                 ...(after === undefined ? {} : { after }),
@@ -385,7 +389,7 @@ export class BoundedContext {
             serverEnvironmentAccess.requireAvailable(this.#environment);
             for (const id of page.ids) {
                 serverEnvironmentAccess.requireAvailable(this.#environment);
-                await TenantAdmissions.require(this.tenantIndex, this.name.value, true, id);
+                await TenantAdmissions.require(index, this.name.value, true, id);
                 serverEnvironmentAccess.requireAvailable(this.#environment);
                 await this.#requiredPrepare(() => this.#prepareTenant(id, mode));
             }
@@ -468,17 +472,17 @@ export class BoundedContext {
     /**
      * Creates tenant-aware Inboxes and their shared readiness signal.
      *
-     * @param tenantIndex Effective membership index for this context.
-     * @returns Inboxes, tenant index, and readiness signal.
+     * @param tenantIndex Captured marker or directory for this Bounded Context.
+     * @returns Inboxes, tenant setting, and readiness signal.
      */
     #createDelivery(tenantIndex) {
         const deliveryReadiness = this.#createReadiness();
         const onAdmit = (tenantId) => this.#admitTenant(tenantId);
         const entityInbox = new LocalEntityInbox(this.#snapshot.name.value, deliveryReadiness, onAdmit, this.#environment.delivery.strategy);
-        const projectionInbox = new LocalProjectionInbox(this.#snapshot.name.value, deliveryReadiness, onAdmit);
+        const projectionInbox = new LocalProjectionInbox(this.#snapshot.name.value, deliveryReadiness, onAdmit, this.#environment.delivery.strategy);
         deliveryReadiness.configureDirect((message, tenantId) => message.label === "UPDATE_SUBSCRIBER"
-            ? projectionInbox.replay(message, tenantId)
-            : entityInbox.replay(message, tenantId));
+            ? projectionInbox.deliver(message, tenantId)
+            : entityInbox.deliver(message, tenantId));
         return { deliveryReadiness, tenantIndex, entityInbox, projectionInbox };
     }
     /**
@@ -518,7 +522,7 @@ export class BoundedContext {
                 this.#beginClose();
             },
             drain: () => this.#drainWork(),
-            trackReplay: (onReplay) => this.#trackReplay(onReplay),
+            trackDelivery: (onDelivery) => this.#trackDelivery(onDelivery),
         });
         contextDeliveryDescriptors.set(this, ContextParts.createDeliveryDescriptor(this.#entityInbox, this.#projectionInbox));
     }
@@ -699,9 +703,10 @@ export class BoundedContext {
         return this.#snapshot.tenantMode === "multitenant";
     }
     /**
-     * Returns the live index configured for this Bounded Context.
+     * Returns the captured tenant setting for this Bounded Context.
      *
-     * @returns The effective configured index.
+     * @returns SINGLE_TENANT in single mode, even when the environment has an index;
+     * otherwise the effective directory. Narrow before calling index methods.
      */
     get tenantIndex() {
         return ContextParts.requireTenantIndex(this);
@@ -781,17 +786,16 @@ export class BoundedContext {
         throw new Error("Entity constructor is not registered in this Bounded Context.");
     }
     /**
-     * Clears and locally replays every registered Projection from already-stored events.
+     * Clears registered Projection state and processes already-stored Events locally.
      *
-     * Despite its legacy name, this method is not Projection catch-up. It is a
-     * process-local maintenance helper and provides no Projection targeting,
+     * This process-local maintenance helper provides no Projection targeting,
      * historical starting point, durable operation identity, progress,
      * historical/live coordination, restart, resumption, or multi-node work.
      *
      * Supported boundary:
      * - projection subscribers only;
      * - already-stored events only;
-     * - clear then replay, with no event re-append;
+     * - clear then dispatch stored Events, with no event re-append;
      * - single-tenant contexts reject `tenantId`;
      * - multitenant contexts require the exact non-blank `tenantId`;
      * - process-local sequential execution on the same EventBus runtime queue as
@@ -803,14 +807,14 @@ export class BoundedContext {
      * - durable live-traffic catch-up orchestration across processes.
      *
      * @param options Selects the tenant slice to rebuild.
-     * @returns Resolves to replay and clear counts for the selected slice.
+     * @returns Dispatch and clear counts for the selected slice.
      */
     async catchUpReadSide(options = {}) {
         return eventBusAccess.runExclusive(this.#eventBus, () => this.#catchUpReadSideOnce(options));
     }
     /**
      * Clears registered Projection state for the selected tenant slice, reads stored events,
-     * validates each event’s tenant, and dispatches replay sequentially.
+     * validates each Event’s tenant, and dispatches stored Events sequentially.
      */
     async #catchUpReadSideOnce(options) {
         const storageContext = ContextParts.catchUpStorageContext(this.#snapshot.spec, options);
@@ -819,7 +823,7 @@ export class BoundedContext {
         const clearTargets = ContextParts.projectionStateClearTargets(projections);
         const clearedStateTypes = [];
         let clearedEntityCount = 0;
-        let replayedEventCount = 0;
+        let processedEventCount = 0;
         for (const target of clearTargets) {
             clearedEntityCount += await this.#stand.clear(target.schema, tenantOptions);
             clearedStateTypes.push(target.typeUrl);
@@ -827,15 +831,15 @@ export class BoundedContext {
         const events = await ContextParts.readStoredEvents(storageContext, this.#storageFactory);
         for (const event of events) {
             try {
-                ContextParts.validateReplayTenant(storageContext, event);
-                replayedEventCount += await ContextParts.dispatchStoredProjectionEvent(projections, event, true);
+                ContextParts.validateCatchUpTenant(storageContext, event);
+                processedEventCount += await ContextParts.dispatchStoredProjectionEvent(projections, event, true);
             }
             catch (error) {
-                throw ContextParts.catchUpReplayError(event, error);
+                throw ContextParts.catchUpDispatchError(event, error);
             }
         }
         return Object.freeze({
-            replayedEventCount,
+            processedEventCount,
             clearedEntityCount,
             clearedStateTypes: Object.freeze(clearedStateTypes),
         });
@@ -902,13 +906,12 @@ export class BoundedContext {
         ContextParts.clearContextMetadata(this);
     }
     /**
-     * Settles entered replay, local follow-ups, and reserved Agent turns.
+     * Settles entered deliveries, outgoing handoffs, and reserved Agent turns.
      * @param errors Collects independent close failures.
      */
     async #drainAdmittedContextWork(errors) {
         await this.#closePart(() => Promise.allSettled([...this.#activePreparations]).then(() => undefined), errors);
-        await this.#closePart(() => Promise.allSettled([...this.#activeReplays]).then(() => undefined), errors);
-        await this.#closePart(() => this.#entityInbox.whenFollowUpsIdle(), errors);
+        await this.#closePart(() => Promise.allSettled([...this.#activeDeliveries]).then(() => undefined), errors);
         await this.#closePart(() => Promise.allSettled([...this.#agentReservations]).then(() => undefined), errors);
     }
     /**
@@ -943,15 +946,15 @@ export class BoundedContext {
         }
     }
     /**
-     * Registers an entered shared replay through its complete follow-up callback.
-     * @param onReplay Complete replay callback.
-     * @returns Completion of the captured callback.
+     * Registers an entered Inbox delivery through recipient processing and outgoing handoff.
+     * @param onDelivery Delivers the stored message.
+     * @returns Completion after the delivery callback returns.
      */
-    #trackReplay(onReplay) {
-        const replay = Promise.resolve().then(onReplay);
-        this.#activeReplays.add(replay);
-        void replay.then(() => this.#activeReplays.delete(replay), () => this.#activeReplays.delete(replay));
-        return replay;
+    #trackDelivery(onDelivery) {
+        const delivery = Promise.resolve().then(onDelivery);
+        this.#activeDeliveries.add(delivery);
+        void delivery.then(() => this.#activeDeliveries.delete(delivery), () => this.#activeDeliveries.delete(delivery));
+        return delivery;
     }
     /**
      * Calls a close action and collects its failure before later cleanup.
@@ -1003,7 +1006,7 @@ export const boundedContextAccess = Object.freeze({
         const phase = contextClosePhases.get(context);
         if (prepare === undefined || phase === undefined)
             return Promise.reject(new TypeError("Service input requires a built context."));
-        return phase.trackReplay(async () => {
+        return phase.trackDelivery(async () => {
             await onMembership();
             await prepare(tenantId);
             await onReady?.();
@@ -1022,16 +1025,16 @@ export const boundedContextAccess = Object.freeze({
         const phase = contextClosePhases.get(context);
         if (phase === undefined)
             return Promise.reject(new TypeError("Service registry requires a built context."));
-        return phase.trackReplay(onOperation);
+        return phase.trackDelivery(onOperation);
     },
     /**
-     * Registers replay work with the context close lifecycle so shutdown waits for it.
+     * Registers entered delivery work with the context close lifecycle.
      */
-    trackReplay(context, onReplay) {
+    trackDelivery(context, onDelivery) {
         const phase = contextClosePhases.get(context);
         if (phase === undefined)
-            return Promise.reject(new TypeError("Replay requires a built context."));
-        return phase.trackReplay(onReplay);
+            return Promise.reject(new TypeError("Delivery requires a built context."));
+        return phase.trackDelivery(onDelivery);
     },
     /**
      * Resolves a view only within the Bounded Context that issued it.
@@ -1059,7 +1062,7 @@ export const boundedContextAccess = Object.freeze({
         phase.begin();
     },
     /**
-     * Waits for accepted runtime work and replay operations to finish.
+     * Waits for accepted runtime work and entered delivery operations to finish.
      */
     drainWork(context) {
         const phase = contextClosePhases.get(context);
@@ -1165,7 +1168,7 @@ export const boundedContextAccess = Object.freeze({
         return ContextParts.cloneSystemPairing(ContextParts.requireSystemPairing(context));
     },
     /**
-     * Returns the live tenant membership index configured for this context.
+     * Returns the captured marker or directory for this Bounded Context.
      */
     tenantIndex(context) {
         return ContextParts.requireTenantIndex(context);
@@ -1397,7 +1400,9 @@ export class BoundedContextBuilder {
         return this;
     }
     /**
-     * Sets a live tenant index for this Bounded Context.
+     * Sets a directory that overrides the environment index for this multitenant Bounded Context.
+     * The environment must already have a real index at build time; an override
+     * cannot enable multitenancy in a SINGLE_TENANT environment.
      *
      * @param tenantIndex Application membership index.
      * @returns This builder.
@@ -1485,10 +1490,11 @@ export class BoundedContextBuilder {
      * @returns The integrated context.
      */
     async #buildAsyncReady(options, environment) {
+        const tenantIndex = this.#selectTenantIndex(environment);
         const generated = this.#loadGeneratedArtifacts([...this.#entityTypes]);
         serverEnvironmentAccess.requireAvailable(environment);
         const repositories = [...this.#repositories, ...generated.repositories];
-        const context = await this.#buildWithResources(repositories, environment.storageFactory, generated.standalone, this.#aiRegistry ?? environment.ai);
+        const context = await this.#buildWithResources(repositories, environment.storageFactory, generated.standalone, this.#aiRegistry ?? environment.ai, tenantIndex);
         try {
             await this.#integrateBuiltContext(context, options, environment);
         }
@@ -1497,6 +1503,20 @@ export class BoundedContextBuilder {
         }
         return context;
     }
+    /**
+     * Captures tenant selection before acquiring business storage.
+     *
+     * @param environment Process facilities selected for this build.
+     * @returns Marker for single mode or the effective directory for multi mode.
+     */
+    #selectTenantIndex(environment) {
+        if (!this.#specSnapshot.multitenant)
+            return SINGLE_TENANT;
+        const configured = environment.tenantIndex;
+        if (configured === SINGLE_TENANT)
+            throw new Error("Multitenant Bounded Context requires an environment tenant index.");
+        return this.#tenantIndex ?? configured;
+    }
     /**
      * Completes required integration and requested initialization before publication.
      * @param context Constructed context.
@@ -1545,14 +1565,15 @@ export class BoundedContextBuilder {
      * @param storageFactory Storage factory for the context.
      * @param standalone Generated standalone handler groups.
      * @param ai Optional AI registry.
+     * @param tenantIndex Captured marker or directory for admission.
      * @returns The assembled context.
      */
-    async #buildWithResources(repositories, storageFactory, standalone, ai) {
+    async #buildWithResources(repositories, storageFactory, standalone, ai, tenantIndex) {
         const resources = this.#subscriptionRegistry === undefined ? {} : { registry: this.#subscriptionRegistry };
         this.#subscriptionRegistry = undefined;
         const registeredRepositories = [...repositories];
         try {
-            return this.#assembleContext(registeredRepositories, storageFactory, standalone, resources, ai);
+            return this.#assembleContext(registeredRepositories, storageFactory, standalone, resources, ai, tenantIndex);
         }
         catch (error) {
             return await this.#failBuild(resources, error);
@@ -1561,8 +1582,16 @@ export class BoundedContextBuilder {
     /**
      * Assembles dispatchers, buses, Stand, subscription runtime, and integration hooks, registering
      * the completed context with its environment.
-     */
-    #assembleContext(repositories, storageFactory, standalone, resources, ai) {
+     *
+     * @param repositories Registered repository views.
+     * @param storageFactory Provider for business records.
+     * @param standalone Generated standalone handlers.
+     * @param resources Partial resources to close if assembly fails.
+     * @param ai Selected AI registry, when configured.
+     * @param tenantIndex Captured marker or directory.
+     * @returns Assembled Bounded Context.
+     */
+    #assembleContext(repositories, storageFactory, standalone, resources, ai, tenantIndex) {
         ContextParts.preflightRepositories(repositories);
         this.#preflightAgents(repositories, storageFactory, ai);
         if (ai !== undefined)
@@ -1576,17 +1605,28 @@ export class BoundedContextBuilder {
             ...ContextParts.repositoryProducedEventSchemas(repositories),
             ...ContextParts.standaloneProducedEventSchemas(standalone),
         ]);
-        const running = this.#buildRuntime(storageFactory, buses, resources);
-        const context = this.#createContext(repositories, storageFactory, buses, running, ai);
+        const running = this.#buildRuntime(storageFactory, buses, resources, tenantIndex);
+        const context = this.#createContext(repositories, storageFactory, buses, running, tenantIndex, ai);
         resources.context = context;
         if (registerBoundedContext === undefined)
             throw new Error("Context registration is unavailable.");
         registerBoundedContext(context, repositories);
+        this.#attachIntegration(context, buses, dispatchers, standaloneEvent);
+        return context;
+    }
+    /**
+     * Registers external Event routes after Bounded Context construction.
+     *
+     * @param context Completed Bounded Context.
+     * @param buses Signal buses and System metadata.
+     * @param dispatchers Repository dispatchers.
+     * @param standaloneEvent Generated standalone Event dispatcher, when present.
+     */
+    #attachIntegration(context, buses, dispatchers, standaloneEvent) {
         ContextParts.attachIntegration(context, buses.eventBus, buses.systemSpec, ContextParts.externalEventSchemas([
             ...dispatchers.domain,
             ...(standaloneEvent === undefined ? [] : [standaloneEvent]),
         ]));
-        return context;
     }
     /**
      * Rejects missing Agent prerequisites before repository intake is installed.
@@ -1705,9 +1745,15 @@ export class BoundedContextBuilder {
     }
     /**
      * Creates the context Stand, subscription registry, and runtime that observes domain and System events.
+     *
+     * @param storageFactory Provider for business records.
+     * @param buses Assembled signal buses.
+     * @param resources Partial resources to close if assembly fails.
+     * @param tenantIndex Captured marker or directory.
+     * @returns Assembled Stand and subscription runtime.
      */
-    #buildRuntime(storageFactory, buses, resources) {
-        const stand = this.#buildStand(storageFactory);
+    #buildRuntime(storageFactory, buses, resources, tenantIndex) {
+        const stand = this.#buildStand(storageFactory, tenantIndex);
         resources.stand = stand;
         const registry = resources.registry ??
             new StorageSubscriptionRegistry(ContextParts.createSubscriptionStorageContext(this.#specSnapshot), storageFactory, subscriptionRecordGroup(this.#specSnapshot.name.value));
@@ -1717,13 +1763,13 @@ export class BoundedContextBuilder {
         return { stand, registry, runtime };
     }
     /**
-     * Builds the context Stand with a captured live membership directory.
+     * Builds the Bounded Context Stand with captured tenant admission.
      *
      * @param storageFactory Provider used for Entity records.
+     * @param tenantIndex Captured marker or directory.
      * @returns Direct read-side Stand.
      */
-    #buildStand(storageFactory) {
-        const tenantIndex = this.#tenantIndex ?? ServerEnvironment.instance().tenantIndex;
+    #buildStand(storageFactory, tenantIndex) {
         const stand = new Stand({
             context: ContextParts.createStorageMode(this.#specSnapshot),
             storageFactory,
@@ -1735,10 +1781,18 @@ export class BoundedContextBuilder {
     }
     /**
      * Constructs the immutable BoundedContext using assembled buses, runtime parts, environment
-     * delivery strategy, and tenant index.
+     * delivery strategy, and tenant setting.
+     *
+     * @param repositories Registered repository views.
+     * @param storageFactory Provider for business records.
+     * @param buses Assembled signal buses.
+     * @param running Prepared Stand and subscription runtime.
+     * @param tenantIndex Captured marker or directory.
+     * @param ai Selected AI registry, when configured.
+     * @returns Immutable Bounded Context.
      */
-    #createContext(repositories, storageFactory, buses, running, ai) {
-        return ContextParts.createBoundedContext(this.#specSnapshot, storageFactory, repositories, ServerEnvironment.instance().delivery.strategy, buses, running, ai, this.#tenantIndex ?? ServerEnvironment.instance().tenantIndex);
+    #createContext(repositories, storageFactory, buses, running, tenantIndex, ai) {
+        return ContextParts.createBoundedContext(this.#specSnapshot, storageFactory, repositories, ServerEnvironment.instance().delivery.strategy, buses, running, ai, tenantIndex);
     }
     /**
      * Closes partial context resources after assembly fails and aggregates cleanup errors with the original failure.
@@ -1873,28 +1927,28 @@ export class ContextSpec {
 }
 const registeredRepositories = new WeakMap();
 /**
- * Reports failure while redispatching a stored event during read-side replay.
+ * Reports failure while dispatching a stored Event during read-side catch-up.
  */
-class CatchUpReplayError extends Error {
-    code = "READ_SIDE_CATCH_UP_REPLAY_FAILED";
+class CatchUpDispatchError extends Error {
+    code = "READ_SIDE_CATCH_UP_DISPATCH_FAILED";
     eventId;
     detail;
     /**
-     * Creates a replay error tied to the stored event that failed.
+     * Creates a catch-up error tied to the stored Event that failed.
      *
      * @param eventId Identifies the stored event.
      * @param detail Contains the bounded cause name and message.
      */
     constructor(eventId, detail) {
         super(`Read-side catch-up failed for stored event "${eventId}".`);
-        this.name = "ReadCatchUpReplayError";
+        this.name = "ReadSideCatchUpDispatchError";
         this.eventId = eventId;
         this.detail = detail;
         Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 /**
- * Assembles private bounded-context lifecycle and replay details.
+ * Assembles private bounded-context lifecycle and catch-up details.
  */
 const ContextParts = Object.freeze({
     /**
@@ -2039,7 +2093,7 @@ const ContextParts = Object.freeze({
      * @param buses Prepared domain and System buses.
      * @param running Prepared Stand and subscription runtime.
      * @param ai Effective AI registry when Agent repositories are present.
-     * @param tenantIndex Effective live membership index.
+     * @param tenantIndex Captured marker or directory.
      * @returns Constructed bounded context.
      */
     createBoundedContext(specSnapshot, storageFactory, repositories, deliveryStrategy, buses, running, ai, tenantIndex) {
@@ -2054,7 +2108,7 @@ const ContextParts = Object.freeze({
             subscriptionRuntime: running.runtime,
             systemSpec: buses.systemSpec,
             storageFactory,
-            tenantIndex: tenantIndex ?? ServerEnvironment.instance().tenantIndex,
+            tenantIndex,
             repositories,
             deliveryStrategy,
             ...(ai === undefined ? {} : { ai }),
@@ -2329,7 +2383,7 @@ const ContextParts = Object.freeze({
      * @param event Imported event to validate.
      */
     validateImportedTenant(context, event) {
-        const tenantId = ContextParts.readReplayTenant(event);
+        const tenantId = ContextParts.readCatchUpTenant(event);
         if (!context.isMultitenant) {
             if (tenantId !== undefined) {
                 throw new Error(`Single-tenant context "${context.name.value}" does not accept tenantId.`);
@@ -2384,10 +2438,10 @@ const ContextParts = Object.freeze({
         return pairing;
     },
     /**
-     * Reads the tenant index recorded for a built context.
+     * Reads the marker or directory recorded for a built Bounded Context.
      *
-     * @param context Context to inspect.
-     * @returns Tenant index; throws if unavailable.
+     * @param context Bounded Context to inspect.
+     * @returns Captured marker or directory; throws if unavailable.
      */
     requireTenantIndex(context) {
         const tenantIndex = contextTenantIndexes.get(context);
@@ -2713,9 +2767,9 @@ const ContextParts = Object.freeze({
     createDeliveryDescriptor(entityInbox, projections) {
         return Object.freeze({
             endpoints: () => Object.freeze([...entityInbox.endpoints(), ...projections.endpoints()]),
-            replay: (message, tenantId) => message.label === "UPDATE_SUBSCRIBER"
-                ? projections.replay(message, tenantId)
-                : entityInbox.replay(message, tenantId),
+            deliver: (message, tenantId) => message.label === "UPDATE_SUBSCRIBER"
+                ? projections.deliver(message, tenantId)
+                : entityInbox.deliver(message, tenantId),
         });
     },
     /**
@@ -2986,12 +3040,12 @@ const ContextParts = Object.freeze({
      * @param context Catch-up storage context.
      * @param event Stored event to validate.
      */
-    validateReplayTenant(context, event) {
+    validateCatchUpTenant(context, event) {
         if (!context.multitenant) {
             return;
         }
         const expectedTenantId = context.tenantId;
-        const envelopeTenantId = ContextParts.readReplayTenant(event);
+        const envelopeTenantId = ContextParts.readCatchUpTenant(event);
         if (envelopeTenantId === undefined) {
             throw new Error("Read-side catch-up requires stored event envelope tenant.");
         }
@@ -3005,7 +3059,7 @@ const ContextParts = Object.freeze({
      * @param event Event whose origin is inspected.
      * @returns Cloned tenant ID when present.
      */
-    readReplayTenant(event) {
+    readCatchUpTenant(event) {
         switch (event.context?.origin.case) {
             case "importContext":
                 return ContextParts.tenantIdValue(event.context.origin.value.tenantId);
@@ -3047,14 +3101,14 @@ const ContextParts = Object.freeze({
         return matching.length > 0 ? 1 : 0;
     },
     /**
-     * Creates a replay error with the event ID and bounded cause details.
+     * Creates a catch-up error with the Event ID and bounded cause details.
      *
      * @param event Event that failed.
-     * @param cause Thrown replay cause.
-     * @returns Replay error.
+     * @param cause Thrown catch-up cause.
+     * @returns Catch-up error.
      */
-    catchUpReplayError(event, cause) {
-        return new CatchUpReplayError(event.id?.value ?? "(missing)", ContextParts.catchUpReplayDetail(cause));
+    catchUpDispatchError(event, cause) {
+        return new CatchUpDispatchError(event.id?.value ?? "(missing)", ContextParts.catchUpDispatchDetail(cause));
     },
     /**
      * Returns an error string truncated to a maximum length.
@@ -3072,7 +3126,7 @@ const ContextParts = Object.freeze({
      * @param error Thrown value.
      * @returns Immutable bounded details.
      */
-    catchUpReplayDetail(error) {
+    catchUpDispatchDetail(error) {
         if (error instanceof Error) {
             return Object.freeze({
                 name: ContextParts.boundedErrorString(error.name, errorDetailLimit) || "Error",