@fluidframework/container-runtime 2.70.0-361788 → 2.71.0

package/.eslintrc.cjs

@@ -8,7 +8,11 @@ module.exports = {
 	parserOptions: {
 		project: ["./tsconfig.json", "./src/test/tsconfig.json"],
 	},
-	rules: {},
+	rules: {
+		// FIXME: temporarily disabled because of crashes in typescript-eslint on destructuring in promise chains.
+		// See: channelCollection.ts:1070
+		"@typescript-eslint/unbound-method": "off",
+	},
 	overrides: [
 		{
 			// Rules only for test files

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fluidframework/container-runtime
 
+## 2.71.0
+
+Dependency updates only.
+
+## 2.70.0
+
+### Minor Changes
+
+- Removed deprecated export of MinimumVersionForCollab from @fluidframework/container-runtime ([#25309](https://github.com/microsoft/FluidFramework/pull/25309)) [776cb1ce31](https://github.com/microsoft/FluidFramework/commit/776cb1ce31176e1eb07ba2723c2d51e6f4cc379f)
+
+  Removed the deprecated re-export of MinimumVersionForCollab from @fluidframework/container-runtime.
+  This type should now be imported from @fluidframework/runtime-definitions.
+  See the [Fluid Framework 2.52.0 release notes](https://github.com/microsoft/FluidFramework/releases/tag/client_v2.52.0) for details.
+
 ## 2.63.0
 
 Dependency updates only.

package/dist/channelCollection.d.ts

@@ -4,20 +4,31 @@
  */
 import { AttachState } from "@fluidframework/container-definitions";
 import type { FluidObject, IDisposable, IRequest, IResponse, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
+import type { IFluidHandleInternal, ISignalEnvelope } from "@fluidframework/core-interfaces/internal";
 import type { ISnapshot, ISnapshotTree } from "@fluidframework/driver-definitions/internal";
-import { type ISummaryTreeWithStats, type ITelemetryContext, type IGarbageCollectionData, type AliasResult, type IEnvelope, type IFluidDataStoreChannel, type IFluidDataStoreContext, type IFluidDataStoreContextDetached, type IFluidDataStoreFactory, type IFluidDataStoreRegistry, type IFluidParentContext, type NamedFluidDataStoreRegistryEntries, type IInboundSignalMessage, type IRuntimeMessageCollection, type MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
+import type { AliasResult, ContainerExtensionProvider, FluidDataStoreMessage, IEnvelope, IFluidDataStoreChannel, IFluidDataStoreContext, IFluidDataStoreContextDetached, IFluidDataStoreFactory, IFluidDataStoreRegistry, IFluidParentContext, IGarbageCollectionData, IInboundSignalMessage, IRuntimeMessageCollection, ISummaryTreeWithStats, ITelemetryContext, MinimumVersionForCollab, NamedFluidDataStoreRegistryEntries } from "@fluidframework/runtime-definitions/internal";
 import { type MonitoringContext } from "@fluidframework/telemetry-utils/internal";
 import { type RuntimeHeaderData } from "./containerRuntime.js";
-import { type IFluidDataStoreContextInternal, type ILocalDetachedFluidDataStoreContextProps, LocalFluidDataStoreContext } from "./dataStoreContext.js";
+import { type IFluidDataStoreContextPrivate, type ILocalDetachedFluidDataStoreContextProps, LocalFluidDataStoreContext } from "./dataStoreContext.js";
 import { DataStoreContexts } from "./dataStoreContexts.js";
 import { GCNodeType, type IGCNodeUpdatedProps } from "./gc/index.js";
+import type { ContainerRuntimeAliasMessage, ContainerRuntimeDataStoreOpMessage, OutboundContainerRuntimeAttachMessage } from "./messageTypes.js";
 import { type IContainerRuntimeMetadata } from "./summary/index.js";
 /**
  * True if a tombstoned object should be returned without erroring
  * @legacy @beta
  */
 export declare const AllowTombstoneRequestHeaderKey = "allowTombstone";
+/**
+ * Envelope for signals not intended for the container.
+ *
+ * @privateRemarks
+ * `clientBroadcastSignalSequenceNumber` might be added to the envelope by the container runtime.
+ * But it should not be provided to start with.
+ *
+ * Equivalent to `Required<Omit<ISignalEnvelope, "clientBroadcastSignalSequenceNumber">>`.
+ */
+export type AddressedUnsequencedSignalEnvelope = IEnvelope<ISignalEnvelope["contents"]>;
 /**
  * This version of the interface is private to this the package. It should never be exported under any tag.
  * It is used to manage interactions within the container-runtime package. If something is needed
@@ -26,17 +37,44 @@ export declare const AllowTombstoneRequestHeaderKey = "allowTombstone";
  * being staged on IFluidParentContext can be added here as well, likely with optionality removed,
  * to ease interactions within this package.
  */
-export interface IFluidParentContextPrivate extends Omit<IFluidParentContext, "isReadOnly" | "minVersionForCollab"> {
+export interface IFluidParentContextPrivate extends IFluidParentContext, ContainerExtensionProvider {
     readonly isReadOnly: () => boolean;
+    readonly minVersionForCollab: MinimumVersionForCollab;
+}
+/**
+ * Kin of {@link @fluidframework/runtime-definitions#IFluidParentContext} with alternate
+ * `submitMessage` and `submitSignal` methods that are typed specifically for the
+ * root context (aka {@link ContainerRuntime} provided context).
+ *
+ * @privateRemarks
+ * These replacements might be able to get cleaned up if the future suggestions
+ * found in {@link @fluidframework/runtime-definitions#FluidDataStoreMessage}
+ * `@privateRemarks` section are implemented.
+ */
+export interface IFluidRootParentContextPrivate extends Omit<IFluidParentContextPrivate, "submitMessage" | "submitSignal"> {
     /**
-     * {@inheritdoc IFluidParentContext.minVersionForCollab}
+     * Submits the message to be sent to other clients.
+     * @param containerRuntimeMessage - The message.
+     * @param localOpMetadata - The local metadata associated with the message.
+     * This is kept locally and not sent to the server. This will be sent back
+     * when this message is received back from the server. This is also sent if
+     * we are asked to resubmit the message.
      */
-    readonly minVersionForCollab: MinimumVersionForCollab;
+    readonly submitMessage: (containerRuntimeMessage: ContainerRuntimeDataStoreOpMessage | OutboundContainerRuntimeAttachMessage | ContainerRuntimeAliasMessage, localOpMetadata: unknown) => void;
+    /**
+     * Submits the signal to be sent to other clients.
+     * @param envelope - {@link IEnvelope} containing the signal address and contents.
+     * @param targetClientId - When specified, the signal is only sent to the provided client id.
+     */
+    readonly submitSignal: (envelope: AddressedUnsequencedSignalEnvelope, targetClientId?: string) => void;
 }
+type SubmitKeys = "submitMessage" | "submitSignal";
 /**
- * Creates a shallow wrapper of {@link IFluidParentContext}. The wrapper can then have its methods overwritten as needed
+ * Creates a shallow wrapper of {@link IFluidParentContextPrivate} or
+ * {@link IFluidRootParentContextPrivate} with `submitMessage` and `submitSignal`
+ * methods replaced with the provided overrides.
  */
-export declare function wrapContext(context: IFluidParentContextPrivate): IFluidParentContextPrivate;
+export declare function formParentContext<T extends IFluidParentContextPrivate | IFluidRootParentContextPrivate>(context: Omit<IFluidParentContextPrivate & IFluidRootParentContextPrivate, SubmitKeys>, overrides: Pick<T, SubmitKeys>): Omit<IFluidParentContextPrivate & IFluidRootParentContextPrivate, SubmitKeys> & Pick<T, SubmitKeys>;
 /**
  * Returns the type of the given local data store from its package path.
  */
@@ -46,9 +84,9 @@ export declare function getLocalDataStoreType(localDataStore: LocalFluidDataStor
  * but eventually could be hosted on any channel once we formalize the channel api boundary.
  * @internal
  */
-export declare class ChannelCollection implements IFluidDataStoreChannel, IDisposable {
+export declare class ChannelCollection implements Omit<IFluidDataStoreChannel, "entryPoint" | "reSubmit" | "rollback">, IDisposable {
     protected readonly baseSnapshot: ISnapshotTree | ISnapshot | undefined;
-    readonly parentContext: IFluidParentContextPrivate;
+    readonly parentContext: IFluidRootParentContextPrivate;
     private readonly gcNodeUpdated;
     private readonly isDataStoreDeleted;
     private readonly aliasMap;
@@ -56,7 +94,6 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     readonly attachOpFiredForDataStore: Set<string>;
     protected readonly mc: MonitoringContext;
     private readonly disposeOnce;
-    readonly entryPoint: IFluidHandleInternal<FluidObject>;
     readonly containerLoadStats: {
         readonly containerLoadDataStoreCount: number;
         readonly referencedDataStoreCount: number;
@@ -64,7 +101,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     private readonly pendingAliasMap;
     protected readonly contexts: DataStoreContexts;
     private readonly aliasedDataStores;
-    constructor(baseSnapshot: ISnapshotTree | ISnapshot | undefined, parentContext: IFluidParentContextPrivate, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (props: IGCNodeUpdatedProps) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>, provideEntryPoint: (runtime: ChannelCollection) => Promise<FluidObject>);
+    constructor(baseSnapshot: ISnapshotTree | ISnapshot | undefined, parentContext: IFluidRootParentContextPrivate, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (props: IGCNodeUpdatedProps) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>);
     get aliases(): ReadonlyMap<string, string>;
     get pendingAliases(): Map<string, Promise<AliasResult>>;
     waitIfPendingAlias(maybeAlias: string): Promise<AliasResult>;
@@ -112,13 +149,13 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      */
     protected createDataStoreId(): string;
     createDetachedDataStore(pkg: readonly string[], loadingGroupId?: string): IFluidDataStoreContextDetached;
-    createDataStoreContext(pkg: readonly string[], loadingGroupId?: string): IFluidDataStoreContextInternal;
+    createDataStoreContext(pkg: readonly string[], loadingGroupId?: string): IFluidDataStoreContextPrivate;
     protected createContext<T extends LocalFluidDataStoreContext>(id: string, pkg: readonly string[], contextCtor: new (props: ILocalDetachedFluidDataStoreContextProps) => T, loadingGroupId?: string): T;
     get disposed(): boolean;
     dispose(): void;
-    reSubmit(type: string, content: unknown, localOpMetadata: unknown, squash: boolean): void;
-    protected reSubmitChannelOp(type: string, content: unknown, localOpMetadata: unknown, squash: boolean): void;
-    rollback(type: string, content: unknown, localOpMetadata: unknown): void;
+    readonly reSubmitContainerMessage: (message: ContainerRuntimeDataStoreOpMessage | OutboundContainerRuntimeAttachMessage | ContainerRuntimeAliasMessage, localOpMetadata: unknown, squash: boolean | undefined) => void;
+    protected readonly resubmitDataStoreOp: (envelope: IEnvelope<FluidDataStoreMessage>, localOpMetadata: unknown, squash: boolean | undefined) => void;
+    readonly rollbackDataStoreOp: (envelope: IEnvelope<FluidDataStoreMessage>, localOpMetadata: unknown) => void;
     applyStashedOp(content: unknown): Promise<unknown>;
     protected applyStashedChannelChannelOp(envelope: IEnvelope): Promise<unknown>;
     private applyStashedAttachOp;
@@ -137,7 +174,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     /**
      * Returns the data store requested with the given id if available. Otherwise, returns undefined.
      */
-    getDataStoreIfAvailable(id: string, requestHeaderData: RuntimeHeaderData): Promise<IFluidDataStoreContextInternal | undefined>;
+    getDataStoreIfAvailable(id: string, requestHeaderData: RuntimeHeaderData): Promise<IFluidDataStoreContextPrivate | undefined>;
     /**
      * Checks if the data store has been deleted by GC. If so, log an error.
      * @param id - The data store's id.
@@ -243,6 +280,17 @@ export declare function getSummaryForDatastores(snapshot: ISnapshotTree | undefi
  */
 export declare function detectOutboundReferences(address: string, contents: unknown, addedOutboundReference: (fromNodePath: string, toNodePath: string) => void): void;
 /**
+ * @privateRemarks This class is only used for experimentation/testing.
+ */
+export declare class ComposableChannelCollection extends ChannelCollection implements IFluidDataStoreChannel {
+    readonly entryPoint: IFluidHandleInternal<FluidObject>;
+    constructor(baseSnapshot: ISnapshotTree | ISnapshot | undefined, parentContext: IFluidParentContextPrivate, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (props: IGCNodeUpdatedProps) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>, provideEntryPoint: (runtime: ComposableChannelCollection) => Promise<FluidObject>);
+    reSubmit(type: string, content: unknown, localOpMetadata: unknown, squash?: boolean): void;
+    rollback(type: string, content: unknown, localOpMetadata: unknown): void;
+}
+/**
+ * @privateRemarks This factory is only used for experimentation/testing.
+ *
  * @internal
  */
 export declare class ChannelCollectionFactory implements IFluidDataStoreFactory {
@@ -253,4 +301,5 @@ export declare class ChannelCollectionFactory implements IFluidDataStoreFactory
     get IFluidDataStoreFactory(): ChannelCollectionFactory;
     instantiateDataStore(context: IFluidDataStoreContext, _existing: boolean): Promise<IFluidDataStoreChannel>;
 }
+export {};
 //# sourceMappingURL=channelCollection.d.ts.map

package/dist/channelCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channelCollection.d.ts","sourceRoot":"","sources":["../src/channelCollection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channelCollection.d.ts","sourceRoot":"","sources":["../src/channelCollection.ts"],"names":[],"mappings":"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"}

package/dist/channelCollection.js

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChannelCollectionFactory = exports.detectOutboundReferences = exports.getSummaryForDatastores = exports.ChannelCollection = exports.getLocalDataStoreType = exports.wrapContext = exports.AllowTombstoneRequestHeaderKey = void 0;
+exports.ChannelCollectionFactory = exports.ComposableChannelCollection = exports.detectOutboundReferences = exports.getSummaryForDatastores = exports.ChannelCollection = exports.getLocalDataStoreType = exports.formParentContext = exports.AllowTombstoneRequestHeaderKey = void 0;
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const internal_1 = require("@fluidframework/core-utils/internal");
 const internal_2 = require("@fluidframework/datastore/internal");
@@ -28,9 +28,11 @@ const index_js_2 = require("./summary/index.js");
  */
 exports.AllowTombstoneRequestHeaderKey = "allowTombstone"; // Belongs in the enum above, but avoiding the breaking change
 /**
- * Creates a shallow wrapper of {@link IFluidParentContext}. The wrapper can then have its methods overwritten as needed
+ * Creates a shallow wrapper of {@link IFluidParentContextPrivate} or
+ * {@link IFluidRootParentContextPrivate} with `submitMessage` and `submitSignal`
+ * methods replaced with the provided overrides.
  */
-function wrapContext(context) {
+function formParentContext(context, overrides) {
     return {
         get IFluidDataStoreRegistry() {
             return context.IFluidDataStoreRegistry;
@@ -70,12 +72,8 @@ function wrapContext(context) {
         getAudience: (...args) => {
             return context.getAudience(...args);
         },
-        submitMessage: (...args) => {
-            return context.submitMessage(...args);
-        },
-        submitSignal: (...args) => {
-            return context.submitSignal(...args);
-        },
+        submitMessage: overrides.submitMessage.bind(overrides),
+        submitSignal: overrides.submitSignal,
         makeLocallyVisible: (...args) => {
             return context.makeLocallyVisible(...args);
         },
@@ -95,37 +93,35 @@ function wrapContext(context) {
             return context.setChannelDirty(address);
         },
         minVersionForCollab: context.minVersionForCollab,
+        getExtension: context.getExtension.bind(context),
     };
 }
-exports.wrapContext = wrapContext;
+exports.formParentContext = formParentContext;
 /**
- * Creates a wrapper of a {@link IFluidParentContext} to be provided to the inner datastore channels.
+ * Creates a wrapper of a {@link IFluidRootParentContextPrivate} to be provided to the inner datastore channels.
  * The wrapper will have the submit methods overwritten with the appropriate id as the destination address.
  *
  * @param id - the id of the channel
- * @param parentContext - the {@link IFluidParentContext} to wrap
+ * @param parentContext - the {@link IFluidRootParentContextPrivate} to wrap
  * @returns A wrapped {@link IFluidParentContext}
  */
 function wrapContextForInnerChannel(id, parentContext) {
-    const context = wrapContext(parentContext);
-    context.submitMessage = (type, content, localOpMetadata) => {
-        const fluidDataStoreContent = {
-            content,
-            type,
-        };
-        const envelope = {
-            address: id,
-            contents: fluidDataStoreContent,
-        };
-        parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, envelope, localOpMetadata);
-    };
-    context.submitSignal = (type, contents, targetClientId) => {
-        const envelope = {
-            address: id,
-            contents,
-        };
-        parentContext.submitSignal(type, envelope, targetClientId);
-    };
+    const context = formParentContext(parentContext, {
+        submitMessage: (type, content, localOpMetadata) => {
+            const fluidDataStoreContent = {
+                content,
+                type,
+            };
+            const envelope = {
+                address: id,
+                contents: fluidDataStoreContent,
+            };
+            parentContext.submitMessage({ type: messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, contents: envelope }, localOpMetadata);
+        },
+        submitSignal: (type, content, targetClientId) => {
+            parentContext.submitSignal({ address: id, contents: { type, content } }, targetClientId);
+        },
+    });
     return context;
 }
 /**
@@ -141,7 +137,7 @@ exports.getLocalDataStoreType = getLocalDataStoreType;
  * @internal
  */
 class ChannelCollection {
-    constructor(baseSnapshot, parentContext, baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap, provideEntryPoint) {
+    constructor(baseSnapshot, parentContext, baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap) {
         this.baseSnapshot = baseSnapshot;
         this.parentContext = parentContext;
         this.gcNodeUpdated = gcNodeUpdated;
@@ -158,9 +154,49 @@ class ChannelCollection {
          * For sampling. Only log once per container
          */
         this.shouldSendAttachLog = true;
+        this.reSubmitContainerMessage = (message, localOpMetadata, squash) => {
+            switch (message.type) {
+                case messageTypes_js_1.ContainerMessageType.Attach:
+                case messageTypes_js_1.ContainerMessageType.Alias: {
+                    this.parentContext.submitMessage(message, localOpMetadata);
+                    return;
+                }
+                case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp: {
+                    return this.resubmitDataStoreOp(message.contents, localOpMetadata, squash);
+                }
+                default: {
+                    (0, internal_1.assert)(false, 0x907 /* unknown op type */);
+                }
+            }
+        };
+        this.resubmitDataStoreOp = (envelope, localOpMetadata, squash) => {
+            const context = this.contexts.get(envelope.address);
+            // If the data store has been deleted, log an error and throw an error. If there are local changes for a
+            // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
+            if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "resubmitDataStoreOp")) {
+                throw new internal_6.DataCorruptionError("Context is deleted!", {
+                    callSite: "resubmitDataStoreOp",
+                    ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
+                });
+            }
+            (0, internal_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
+            context.reSubmit(envelope.contents, localOpMetadata, squash);
+        };
+        this.rollbackDataStoreOp = (envelope, localOpMetadata) => {
+            const context = this.contexts.get(envelope.address);
+            // If the data store has been deleted, log an error and throw an error. If there are local changes for a
+            // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
+            if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "rollbackDataStoreOp")) {
+                throw new internal_6.DataCorruptionError("Context is deleted!", {
+                    callSite: "rollbackDataStoreOp",
+                    ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
+                });
+            }
+            (0, internal_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
+            context.rollback(envelope.contents, localOpMetadata);
+        };
         this.mc = (0, internal_6.createChildMonitoringContext)({ logger: baseLogger });
         this.contexts = new dataStoreContexts_js_1.DataStoreContexts(baseLogger);
-        this.entryPoint = new internal_2.FluidObjectHandle(new internal_1.LazyPromise(async () => provideEntryPoint(this)), "", this.parentContext.IFluidHandleContext);
         this.aliasedDataStores = new Set(aliasMap.values());
         // Extract stores stored inside the snapshot
         const fluidDataStores = new Map();
@@ -403,7 +439,7 @@ class ChannelCollection {
     submitAttachChannelOp(localContext) {
         const message = this.generateAttachMessage(localContext);
         this.pendingAttach.set(localContext.id, message);
-        this.parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.Attach, message, undefined);
+        this.parentContext.submitMessage({ type: messageTypes_js_1.ContainerMessageType.Attach, contents: message }, undefined);
         this.attachOpFiredForDataStore.add(localContext.id);
     }
     /**
@@ -477,52 +513,6 @@ class ChannelCollection {
     dispose() {
         return this.disposeOnce.value;
     }
-    reSubmit(type, content, localOpMetadata, squash) {
-        switch (type) {
-            case messageTypes_js_1.ContainerMessageType.Attach:
-            case messageTypes_js_1.ContainerMessageType.Alias: {
-                this.parentContext.submitMessage(type, content, localOpMetadata);
-                return;
-            }
-            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp: {
-                return this.reSubmitChannelOp(type, content, localOpMetadata, squash);
-            }
-            default: {
-                (0, internal_1.assert)(false, 0x907 /* unknown op type */);
-            }
-        }
-    }
-    reSubmitChannelOp(type, content, localOpMetadata, squash) {
-        const envelope = content;
-        const context = this.contexts.get(envelope.address);
-        // If the data store has been deleted, log an error and throw an error. If there are local changes for a
-        // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
-        if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "resubmitDataStoreOp")) {
-            throw new internal_6.DataCorruptionError("Context is deleted!", {
-                callSite: "resubmitDataStoreOp",
-                ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
-            });
-        }
-        (0, internal_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
-        const innerContents = envelope.contents;
-        context.reSubmit(innerContents.type, innerContents.content, localOpMetadata, squash);
-    }
-    rollback(type, content, localOpMetadata) {
-        (0, internal_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e8 /* type */);
-        const envelope = content;
-        const context = this.contexts.get(envelope.address);
-        // If the data store has been deleted, log an error and throw an error. If there are local changes for a
-        // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
-        if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "rollbackDataStoreOp")) {
-            throw new internal_6.DataCorruptionError("Context is deleted!", {
-                callSite: "rollbackDataStoreOp",
-                ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
-            });
-        }
-        (0, internal_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
-        const innerContents = envelope.contents;
-        context.rollback(innerContents.type, innerContents.content, localOpMetadata);
-    }
     async applyStashedOp(content) {
         const opContents = content;
         switch (opContents.type) {
@@ -1237,7 +1227,51 @@ function detectOutboundReferences(address, contents, addedOutboundReference) {
     }
 }
 exports.detectOutboundReferences = detectOutboundReferences;
+// #region Experimentation
+// The code below here is for experimentation (and one test) only.
 /**
+ * @privateRemarks This class is only used for experimentation/testing.
+ */
+class ComposableChannelCollection extends ChannelCollection {
+    constructor(baseSnapshot, parentContext, baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap, provideEntryPoint) {
+        super(baseSnapshot, 
+        /* [root] parentContext */
+        formParentContext(parentContext, {
+            submitMessage: (containerRuntimeMessage, localOpMetadata) => {
+                // Note that here our message format is reconfigured.
+                // While `ContainerRuntime*Message`s use `contents`
+                // as `FluidDataStoreMessage`s, the content is
+                // stored in `content`.
+                parentContext.submitMessage(containerRuntimeMessage.type, containerRuntimeMessage.contents, localOpMetadata);
+            },
+            submitSignal: (envelope, targetClientId) => {
+                parentContext.submitSignal(envelope.contents.type, {
+                    address: envelope.address,
+                    contents: envelope.contents.content,
+                }, targetClientId);
+            },
+        }), baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap);
+        this.entryPoint = new internal_2.FluidObjectHandle(new internal_1.LazyPromise(async () => provideEntryPoint(this)), "", this.parentContext.IFluidHandleContext);
+    }
+    reSubmit(type, content, localOpMetadata, squash) {
+        // If the cast is incorrect and type is not one of the three supported,
+        // reSubmitContainerMessage will assert.
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Need to force conversion
+        const message = {
+            type,
+            contents: content,
+        };
+        this.reSubmitContainerMessage(message, localOpMetadata, squash);
+    }
+    rollback(type, content, localOpMetadata) {
+        (0, internal_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e8 /* type */);
+        this.rollbackDataStoreOp(content, localOpMetadata);
+    }
+}
+exports.ComposableChannelCollection = ComposableChannelCollection;
+/**
+ * @privateRemarks This factory is only used for experimentation/testing.
+ *
  * @internal
  */
 class ChannelCollectionFactory {
@@ -1262,10 +1296,10 @@ class ChannelCollectionFactory {
         // this factory and the container runtime are
         // from the same package.
         (0, internal_1.assert)(context instanceof dataStoreContext_js_1.FluidDataStoreContext, 0xb8f /* we don't support the layer boundary here today */);
-        const runtime = new ChannelCollection(context.baseSnapshot, context, // parentContext
-        context.baseLogger, () => { }, // gcNodeUpdated
-        (_nodePath) => false, // isDataStoreDeleted
-        new Map(), // aliasMap
+        const runtime = new ComposableChannelCollection(context.baseSnapshot, 
+        /* parentContext */ context, context.baseLogger, 
+        /* gcNodeUpdated */ () => { }, 
+        /* isDataStoreDeleted */ (_nodePath) => false, new Map(), // aliasMap
         this.provideEntryPoint);
         return runtime;
     }