@fluidframework/container-runtime 2.40.0-336023 → 2.41.0-337492

package/dist/containerRuntime.js

@@ -12,9 +12,10 @@ const internal_2 = require("@fluidframework/core-utils/internal");
 const driver_definitions_1 = require("@fluidframework/driver-definitions");
 const internal_3 = require("@fluidframework/driver-definitions/internal");
 const internal_4 = require("@fluidframework/driver-utils/internal");
-const internal_5 = require("@fluidframework/runtime-definitions/internal");
-const internal_6 = require("@fluidframework/runtime-utils/internal");
-const internal_7 = require("@fluidframework/telemetry-utils/internal");
+const internal_5 = require("@fluidframework/id-compressor/internal");
+const internal_6 = require("@fluidframework/runtime-definitions/internal");
+const internal_7 = require("@fluidframework/runtime-utils/internal");
+const internal_8 = require("@fluidframework/telemetry-utils/internal");
 const uuid_1 = require("uuid");
 const batchTracker_js_1 = require("./batchTracker.js");
 const index_js_1 = require("./blobManager/index.js");
@@ -51,7 +52,7 @@ const throttler_js_1 = require("./throttler.js");
  *
  */
 function getUnknownMessageTypeError(unknownContainerRuntimeMessageType, codePath, sequencedMessage) {
-    return internal_7.DataProcessingError.create("Runtime message of unknown type", codePath, sequencedMessage, {
+    return internal_8.DataProcessingError.create("Runtime message of unknown type", codePath, sequencedMessage, {
         messageDetails: {
             type: unknownContainerRuntimeMessageType,
         },
@@ -85,6 +86,7 @@ exports.defaultRuntimeHeaderData = {
     viaHandle: false,
     allowTombstone: false,
 };
+const defaultStagingCommitOptions = { squash: false };
 const maxConsecutiveReconnectsKey = "Fluid.ContainerRuntime.MaxConsecutiveReconnects";
 // The actual limit is 1Mb (socket.io and Kafka limits)
 // We can't estimate it fully, as we
@@ -215,17 +217,18 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * - containerRuntimeCtor - Constructor to use to create the ContainerRuntime instance.
      * This allows mixin classes to leverage this method to define their own async initializer.
      * - provideEntryPoint - Promise that resolves to an object which will act as entryPoint for the Container.
+     * - minVersionForCollab - Minimum version of the FF runtime that this runtime supports collaboration with.
      * This object should provide all the functionality that the Container is expected to provide to the loader layer.
      */
     static async loadRuntime(params) {
-        const { context, registryEntries, existing, requestHandler, provideEntryPoint, runtimeOptions = {}, containerScope = {}, containerRuntimeCtor = ContainerRuntime, } = params;
+        const { context, registryEntries, existing, requestHandler, provideEntryPoint, runtimeOptions = {}, containerScope = {}, containerRuntimeCtor = ContainerRuntime, minVersionForCollab = compatUtils_js_1.defaultMinVersionForCollab, } = params;
         // If taggedLogger exists, use it. Otherwise, wrap the vanilla logger:
         // back-compat: Remove the TaggedLoggerAdapter fallback once all the host are using loader > 0.45
         const backCompatContext = context;
         const passLogger = backCompatContext.taggedLogger ??
             // eslint-disable-next-line import/no-deprecated
-            new internal_7.TaggedLoggerAdapter(backCompatContext.logger);
-        const logger = (0, internal_7.createChildLogger)({
+            new internal_8.TaggedLoggerAdapter(backCompatContext.logger);
+        const logger = (0, internal_8.createChildLogger)({
             logger: passLogger,
             properties: {
                 all: {
@@ -233,28 +236,26 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 },
             },
         });
-        const mc = (0, internal_7.loggerToMonitoringContext)(logger);
+        const mc = (0, internal_8.loggerToMonitoringContext)(logger);
         // Some options require a minimum version of the FF runtime to operate, so the default configs will be generated
-        // based on the compatibility mode.
-        // For example, if compatibility mode is set to "1.0.0", the default configs will ensure compatibility with FF runtime
-        // 1.0.0 or later. If the compatibility mode is set to "2.10.0", the default values will be generated to ensure compatibility
+        // based on the minVersionForCollab.
+        // For example, if minVersionForCollab is set to "1.0.0", the default configs will ensure compatibility with FF runtime
+        // 1.0.0 or later. If the minVersionForCollab is set to "2.10.0", the default values will be generated to ensure compatibility
         // with FF runtime 2.10.0 or later.
-        // TODO: We will add in a way for users to pass in compatibilityVersion in a follow up PR.
-        const compatibilityVersion = compatUtils_js_1.defaultCompatibilityVersion;
-        if (!(0, compatUtils_js_1.isValidCompatVersion)(compatibilityVersion)) {
-            throw new internal_7.UsageError(`Invalid compatibility version: ${compatibilityVersion}. It must be an existing FF version (i.e. 2.22.1).`);
+        if (!(0, compatUtils_js_1.isValidMinVersionForCollab)(minVersionForCollab)) {
+            throw new internal_8.UsageError(`Invalid minVersionForCollab: ${minVersionForCollab}. It must be an existing FF version (i.e. 2.22.1).`);
         }
-        const defaultVersionDependentConfigs = (0, compatUtils_js_1.getCompatibilityVersionDefaults)(compatibilityVersion);
+        const defaultsAffectingDocSchema = (0, compatUtils_js_1.getMinVersionForCollabDefaults)(minVersionForCollab);
         // The following are the default values for the options that do not affect the DocumentSchema.
-        const defaultConfigsNonVersionDependent = {
+        const defaultsNotAffectingDocSchema = {
             summaryOptions: {},
             loadSequenceNumberVerification: "close",
             maxBatchSizeInBytes: defaultMaxBatchSizeInBytes,
             chunkSizeInBytes: defaultChunkSizeInBytes,
         };
         const defaultConfigs = {
-            ...defaultVersionDependentConfigs,
-            ...defaultConfigsNonVersionDependent,
+            ...defaultsAffectingDocSchema,
+            ...defaultsNotAffectingDocSchema,
         };
         // Here we set each option to its corresponding default config value if it's not provided in runtimeOptions.
         // Note: We cannot do a simple object merge of defaultConfigs/runtimeOptions because in most cases we don't want
@@ -307,7 +308,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 // Older runtimes do not understand new schema, and thus could corrupt document if they proceed, thus we are using
                 // this poison pill to prevent them from proceeding.
                 // "Load from summary, runtime metadata sequenceNumber !== initialSequenceNumber"
-                const error = new internal_7.DataCorruptionError(
+                const error = new internal_8.DataCorruptionError(
                 // pre-0.58 error message: SummaryMetadataMismatch
                 "Summary metadata mismatch", { runtimeVersion: packageVersion_js_1.pkgVersion, runtimeSequenceNumber, protocolSequenceNumber });
                 if (loadSequenceNumberVerification === "log") {
@@ -365,8 +366,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         else {
             idCompressorMode = desiredIdCompressorMode;
         }
-        const createIdCompressorFn = async () => {
-            const { createIdCompressor, deserializeIdCompressor, createSessionId } = await import("@fluidframework/id-compressor/internal");
+        const createIdCompressorFn = () => {
             /**
              * Because the IdCompressor emits so much telemetry, this function is used to sample
              * approximately 5% of all clients. Only the given percentage of sessions will emit telemetry.
@@ -379,16 +379,16 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     },
                 };
             })();
-            const compressorLogger = (0, internal_7.createSampledLogger)(logger, idCompressorEventSampler);
+            const compressorLogger = (0, internal_8.createSampledLogger)(logger, idCompressorEventSampler);
             const pendingLocalState = context.pendingLocalState;
             if (pendingLocalState?.pendingIdCompressorState !== undefined) {
-                return deserializeIdCompressor(pendingLocalState.pendingIdCompressorState, compressorLogger);
+                return (0, internal_5.deserializeIdCompressor)(pendingLocalState.pendingIdCompressorState, compressorLogger);
             }
             else if (serializedIdCompressor === undefined) {
-                return createIdCompressor(compressorLogger);
+                return (0, internal_5.createIdCompressor)(compressorLogger);
             }
             else {
-                return deserializeIdCompressor(serializedIdCompressor, createSessionId(), compressorLogger);
+                return (0, internal_5.deserializeIdCompressor)(serializedIdCompressor, (0, internal_5.createSessionId)(), compressorLogger);
             }
         };
         const compressionLz4 = compressionOptions.minimumBatchSizeInBytes !== Number.POSITIVE_INFINITY &&
@@ -404,7 +404,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             runtime.onSchemaChange(schema);
         });
         if (compressionLz4 && !enableGroupedBatching) {
-            throw new internal_7.UsageError("If compression is enabled, op grouping must be enabled too");
+            throw new internal_8.UsageError("If compression is enabled, op grouping must be enabled too");
         }
         const featureGatesForTelemetry = {};
         // Make sure we've got all the options including internal ones
@@ -421,7 +421,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             explicitSchemaControl,
             createBlobPayloadPending,
         };
-        const runtime = new containerRuntimeCtor(context, registry, metadata, electedSummarizerData, chunks ?? [], aliases ?? [], internalRuntimeOptions, containerScope, logger, existing, blobManagerLoadInfo, context.storage, createIdCompressorFn, documentSchemaController, featureGatesForTelemetry, provideEntryPoint, requestHandler, undefined, // summaryConfiguration
+        const runtime = new containerRuntimeCtor(context, registry, metadata, electedSummarizerData, chunks ?? [], aliases ?? [], internalRuntimeOptions, containerScope, logger, existing, blobManagerLoadInfo, context.storage, createIdCompressorFn, documentSchemaController, featureGatesForTelemetry, provideEntryPoint, minVersionForCollab, requestHandler, undefined, // summaryConfiguration
         recentBatchInfo);
         runtime.blobManager.stashedBlobsUploadP.then(() => {
             // make sure we didn't reconnect before the promise resolved
@@ -548,7 +548,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     /***/
     constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, 
     // Create a custom ITelemetryBaseLogger to output telemetry events.
-    baseLogger, existing, blobManagerLoadInfo, _storage, createIdCompressor, documentsSchemaController, featureGatesForTelemetry, provideEntryPoint, requestHandler, 
+    baseLogger, existing, blobManagerLoadInfo, _storage, createIdCompressorFn, documentsSchemaController, featureGatesForTelemetry, provideEntryPoint, minVersionForCollab, requestHandler, 
     // // eslint-disable-next-line unicorn/no-object-as-default-parameter
     summaryConfiguration = {
         // the defaults
@@ -564,8 +564,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this.containerScope = containerScope;
         this.baseLogger = baseLogger;
         this._storage = _storage;
-        this.createIdCompressor = createIdCompressor;
+        this.createIdCompressorFn = createIdCompressorFn;
         this.documentsSchemaController = documentsSchemaController;
+        this.minVersionForCollab = minVersionForCollab;
         this.requestHandler = requestHandler;
         this.summaryConfiguration = summaryConfiguration;
         this.imminentClosure = false;
@@ -604,10 +605,12 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             this.outbox.flush();
             const exitStagingMode = (discardOrCommit) => () => {
                 // Final flush of any last staged changes
-                this.outbox.flush(undefined, true /* staged */);
+                this.outbox.flush();
                 this.stageControls = undefined;
                 discardOrCommit();
+                this.channelCollection.notifyStagingMode(false);
             };
+            // eslint-disable-next-line import/no-deprecated
             const stageControls = {
                 discardChanges: exitStagingMode(() => {
                     // Pop all staged batches from the PSM and roll them back in LIFO order
@@ -619,18 +622,19 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                         this.updateDocumentDirtyState(this.pendingMessagesCount !== 0);
                     }
                 }),
-                commitChanges: exitStagingMode(() => {
-                    // All staged changes are in the PSM, so just replay them (ignore pre-staging batches)
-                    // FUTURE: Have this do squash-rebase instead of resubmitting all intermediate changes
-                    if (this.connected) {
-                        this.pendingStateManager.replayPendingStates(true /* onlyStagedBatched */);
-                    }
-                    else {
-                        this.pendingStateManager.clearStagingFlags();
-                    }
-                }),
+                commitChanges: (optionsParam) => {
+                    const options = { ...defaultStagingCommitOptions, ...optionsParam };
+                    return exitStagingMode(() => {
+                        this.pendingStateManager.replayPendingStates({
+                            onlyStagedBatches: true,
+                            squash: options.squash ?? false,
+                        });
+                    })();
+                },
             };
-            return (this.stageControls = stageControls);
+            this.stageControls = stageControls;
+            this.channelCollection.notifyStagingMode(true);
+            return this.stageControls;
         };
         this.readAndParseBlob = async (id) => (0, internal_4.readAndParse)(this.storage, id);
         const { options, clientDetails, connected, baseSnapshot, submitFn, submitBatchFn, submitSummaryFn, submitSignalFn, disposeFn, closeFn, deltaManager, quorum, audience, pendingLocalState, supportedFeatures, snapshotWithContents, } = context;
@@ -639,7 +643,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // Validate that the Loader is compatible with this Runtime.
         const maybeloaderCompatDetailsForRuntime = context;
         (0, runtimeLayerCompatState_js_1.validateLoaderCompatibility)(maybeloaderCompatDetailsForRuntime.ILayerCompatDetails, this.disposeFn);
-        this.mc = (0, internal_7.createChildMonitoringContext)({
+        this.mc = (0, internal_8.createChildMonitoringContext)({
             logger: this.baseLogger,
             namespace: "ContainerRuntime",
         });
@@ -779,19 +783,19 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         const referenceSequenceNumbersSupported = maybeloaderCompatDetailsForRuntime.ILayerCompatDetails === undefined
             ? supportedFeatures?.get("referenceSequenceNumbers") === true
             : true;
-        if (runtimeOptions.flushMode === internal_5.FlushModeExperimental.Async &&
+        if (runtimeOptions.flushMode === internal_6.FlushModeExperimental.Async &&
             !referenceSequenceNumbersSupported) {
             // The loader does not support reference sequence numbers, falling back on FlushMode.TurnBased
             this.mc.logger.sendErrorEvent({ eventName: "FlushModeFallback" });
-            this._flushMode = internal_5.FlushMode.TurnBased;
+            this._flushMode = internal_6.FlushMode.TurnBased;
         }
         else {
             this._flushMode = runtimeOptions.flushMode;
         }
         this.offlineEnabled =
             this.mc.config.getBoolean("Fluid.Container.enableOfflineLoad") ?? false;
-        if (this.offlineEnabled && this._flushMode !== internal_5.FlushMode.TurnBased) {
-            const error = new internal_7.UsageError("Offline mode is only supported in turn-based mode");
+        if (this.offlineEnabled && this._flushMode !== internal_6.FlushMode.TurnBased) {
+            const error = new internal_8.UsageError("Offline mode is only supported in turn-based mode");
             this.closeFn(error);
             throw error;
         }
@@ -809,7 +813,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 // This is a runtime enforcement of what's already explicit in the policy's type itself,
                 // which dictates the value is either undefined or exactly 5 days in ms.
                 // As long as the actual value is less than 5 days, the assumptions GC makes here are valid.
-                throw new internal_7.UsageError("Driver's maximumCacheDurationMs policy cannot exceed 5 days");
+                throw new internal_8.UsageError("Driver's maximumCacheDurationMs policy cannot exceed 5 days");
             }
         }
         this.garbageCollector = index_js_2.GarbageCollector.create({
@@ -834,7 +838,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         const summaryReferenceSequenceNumber = baseSnapshot === undefined || metadata?.disableIsolatedChannels === true
             ? undefined
             : loadedFromSequenceNumber;
-        this.summarizerNode = (0, index_js_4.createRootSummarizerNodeWithGC)((0, internal_7.createChildLogger)({ logger: this.baseLogger, namespace: "SummarizerNode" }), 
+        this.summarizerNode = (0, index_js_4.createRootSummarizerNodeWithGC)((0, internal_8.createChildLogger)({ logger: this.baseLogger, namespace: "SummarizerNode" }), 
         // Summarize function to call when summarize is called. Summarizer node always tracks summary state.
         async (fullTree, trackState, telemetryContext) => this.summarizeInternal(fullTree, trackState, telemetryContext), 
         // Latest change sequence number, no changes since summary applied yet
@@ -900,8 +904,8 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             stashedBlobs: pendingRuntimeState?.pendingAttachmentBlobs,
             createBlobPayloadPending: this.sessionSchema.createBlobPayloadPending === true,
         });
-        this.deltaScheduler = new deltaScheduler_js_1.DeltaScheduler(this.innerDeltaManager, this, (0, internal_7.createChildLogger)({ logger: this.baseLogger, namespace: "DeltaScheduler" }));
-        this.inboundBatchAggregator = new inboundBatchAggregator_js_1.InboundBatchAggregator(this.innerDeltaManager, () => this.clientId, (0, internal_7.createChildLogger)({ logger: this.baseLogger, namespace: "InboundBatchAggregator" }));
+        this.deltaScheduler = new deltaScheduler_js_1.DeltaScheduler(this.innerDeltaManager, this, (0, internal_8.createChildLogger)({ logger: this.baseLogger, namespace: "DeltaScheduler" }));
+        this.inboundBatchAggregator = new inboundBatchAggregator_js_1.InboundBatchAggregator(this.innerDeltaManager, () => this.clientId, (0, internal_8.createChildLogger)({ logger: this.baseLogger, namespace: "InboundBatchAggregator" }));
         const legacySendBatchFn = (0, exports.makeLegacySendBatchFn)(submitFn, this.innerDeltaManager);
         this.skipSafetyFlushDuringProcessStack =
             // Keep the old flag name even though we renamed the class member (it shipped in 2.31.0)
@@ -994,6 +998,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             telemetryDocumentId: this.telemetryDocumentId,
             groupedBatchingEnabled: this.groupedBatchingEnabled,
             initialSequenceNumber: this.deltaManager.initialSequenceNumber,
+            minVersionForCollab: this.minVersionForCollab,
         });
         (0, connectionTelemetry_js_1.ReportOpPerfTelemetry)(this.clientId, this._deltaManager, this, this.baseLogger);
         (0, batchTracker_js_1.BindBatchTracker)(this, this.baseLogger);
@@ -1021,7 +1026,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // As it's implemented right now (with async initialization), this will only work for "off" -> "delayed" transitions.
         // Anything else is too risky, and requires ability to initialize ID compressor synchronously!
         if (schema.runtime.idCompressorMode !== undefined) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.loadIdCompressor();
         }
     }
@@ -1046,7 +1050,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         await this.initializeSummarizer(loader);
         if (this.sessionSchema.idCompressorMode === "on" ||
             (this.sessionSchema.idCompressorMode === "delayed" && this.connected)) {
-            this._idCompressor = await this.createIdCompressor();
+            this._idCompressor = this.createIdCompressorFn();
             // This is called from loadRuntime(), long before we process any ops, so there should be no ops accumulated yet.
             (0, internal_2.assert)(this.pendingIdCompressorOps.length === 0, 0x8ec /* no pending ops */);
         }
@@ -1068,7 +1072,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     this.summaryConfiguration.initialSummarizerDelayMs,
             };
         const summaryCollection = new index_js_4.SummaryCollection(this.deltaManager, this.baseLogger);
-        const orderedClientLogger = (0, internal_7.createChildLogger)({
+        const orderedClientLogger = (0, internal_8.createChildLogger)({
             logger: this.baseLogger,
             namespace: "OrderedClientElection",
         });
@@ -1193,7 +1197,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // Snapshots should only move forward. If we observe an older snapshot than the one we loaded from, then likely
         // the file has been overwritten or service lost data.
         if (snapshotSeqNumber < this.deltaManager.initialSequenceNumber) {
-            throw internal_7.DataProcessingError.create("Downloaded snapshot older than snapshot we loaded from", "getSnapshotForLoadingGroupId", undefined, {
+            throw internal_8.DataProcessingError.create("Downloaded snapshot older than snapshot we loaded from", "getSnapshotForLoadingGroupId", undefined, {
                 loadingGroupIds: sortedLoadingGroupIds.join(","),
                 snapshotSeqNumber,
                 initialSequenceNumber: this.deltaManager.initialSequenceNumber,
@@ -1216,7 +1220,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 targetSequenceNumber: snapshotSeqNumber, // This is so we reuse some columns in telemetry
                 sequenceNumber: this.deltaManager.lastSequenceNumber, // This is so we reuse some columns in telemetry
             };
-            const event = internal_7.PerformanceEvent.start(this.mc.logger, {
+            const event = internal_8.PerformanceEvent.start(this.mc.logger, {
                 ...props,
             });
             // If the inbound deltas queue is paused or disconnected, we expect a reconnect and unpause
@@ -1247,7 +1251,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         let childTree = snapshotTree;
         for (const part of pathParts) {
             if (hasIsolatedChannels) {
-                childTree = childTree?.trees[internal_5.channelsTreeName];
+                childTree = childTree?.trees[internal_6.channelsTreeName];
             }
             childTree = childTree?.trees[part];
         }
@@ -1261,7 +1265,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     // @ts-expect-error expected to be used by LTS Loaders and Containers
     async request(request) {
         try {
-            const parser = internal_6.RequestParser.create(request);
+            const parser = internal_7.RequestParser.create(request);
             const id = parser.pathParts[0];
             if (id === index_js_4.summarizerRequestUrl && parser.pathParts.length === 1) {
                 if (this._summarizer !== undefined) {
@@ -1271,16 +1275,16 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                         value: this._summarizer,
                     };
                 }
-                return (0, internal_6.create404Response)(request);
+                return (0, internal_7.create404Response)(request);
             }
             if (this.requestHandler !== undefined) {
                 // eslint-disable-next-line @typescript-eslint/return-await -- Adding an await here causes test failures
                 return this.requestHandler(parser, this);
             }
-            return (0, internal_6.create404Response)(request);
+            return (0, internal_7.create404Response)(request);
         }
         catch (error) {
-            return (0, internal_6.exceptionToResponse)(error);
+            return (0, internal_7.exceptionToResponse)(error);
         }
     }
     /**
@@ -1289,7 +1293,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      */
     async resolveHandle(request) {
         try {
-            const requestParser = internal_6.RequestParser.create(request);
+            const requestParser = internal_7.RequestParser.create(request);
             const id = requestParser.pathParts[0];
             if (id === "_channels") {
                 // eslint-disable-next-line @typescript-eslint/return-await -- Adding an await here causes test failures
@@ -1297,10 +1301,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             }
             if (id === index_js_1.blobManagerBasePath && requestParser.isLeaf(2)) {
                 const localId = requestParser.pathParts[1];
-                const payloadPending = requestParser.headers?.[internal_6.RuntimeHeaders.payloadPending] === true;
+                const payloadPending = requestParser.headers?.[internal_7.RuntimeHeaders.payloadPending] === true;
                 if (!this.blobManager.hasBlob(localId) &&
-                    requestParser.headers?.[internal_6.RuntimeHeaders.wait] === false) {
-                    return (0, internal_6.create404Response)(request);
+                    requestParser.headers?.[internal_7.RuntimeHeaders.wait] === false) {
+                    return (0, internal_7.create404Response)(request);
                 }
                 const blob = await this.blobManager.getBlob(localId, payloadPending);
                 return {
@@ -1312,10 +1316,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             else if (requestParser.pathParts.length > 0) {
                 return await this.channelCollection.request(request);
             }
-            return (0, internal_6.create404Response)(request);
+            return (0, internal_7.create404Response)(request);
         }
         catch (error) {
-            return (0, internal_6.exceptionToResponse)(error);
+            return (0, internal_7.exceptionToResponse)(error);
         }
     }
     /**
@@ -1356,39 +1360,39 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             lastMessage: explicitSchemaControl ? message : undefined,
             documentSchema,
         };
-        (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.metadataBlobName, JSON.stringify(metadata));
+        (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.metadataBlobName, JSON.stringify(metadata));
     }
     addContainerStateToSummary(summaryTree, fullTree, trackState, telemetryContext) {
         this.addMetadataToSummary(summaryTree);
         if (this._idCompressor) {
             const idCompressorState = JSON.stringify(this._idCompressor.serialize(false));
-            (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.idCompressorBlobName, idCompressorState);
+            (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.idCompressorBlobName, idCompressorState);
         }
         if (this.remoteMessageProcessor.partialMessages.size > 0) {
             const content = JSON.stringify([...this.remoteMessageProcessor.partialMessages]);
-            (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.chunksBlobName, content);
+            (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.chunksBlobName, content);
         }
         const recentBatchInfo = this.duplicateBatchDetector?.getRecentBatchInfoForSummary(telemetryContext);
         if (recentBatchInfo !== undefined) {
-            (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.recentBatchInfoBlobName, JSON.stringify(recentBatchInfo));
+            (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.recentBatchInfoBlobName, JSON.stringify(recentBatchInfo));
         }
         const dataStoreAliases = this.channelCollection.aliases;
         if (dataStoreAliases.size > 0) {
-            (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.aliasBlobName, JSON.stringify([...dataStoreAliases]));
+            (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.aliasBlobName, JSON.stringify([...dataStoreAliases]));
         }
         if (this.summarizerClientElection) {
             const electedSummarizerContent = JSON.stringify(this.summarizerClientElection?.serialize());
-            (0, internal_6.addBlobToSummary)(summaryTree, index_js_4.electedSummarizerBlobName, electedSummarizerContent);
+            (0, internal_7.addBlobToSummary)(summaryTree, index_js_4.electedSummarizerBlobName, electedSummarizerContent);
         }
         const blobManagerSummary = this.blobManager.summarize();
         // Some storage (like git) doesn't allow empty tree, so we can omit it.
         // and the blob manager can handle the tree not existing when loading
         if (Object.keys(blobManagerSummary.summary.tree).length > 0) {
-            (0, internal_6.addSummarizeResultToSummary)(summaryTree, index_js_1.blobsTreeName, blobManagerSummary);
+            (0, internal_7.addSummarizeResultToSummary)(summaryTree, index_js_1.blobsTreeName, blobManagerSummary);
         }
         const gcSummary = this.garbageCollector.summarize(fullTree, trackState, telemetryContext);
         if (gcSummary !== undefined) {
-            (0, internal_6.addSummarizeResultToSummary)(summaryTree, internal_5.gcTreeKey, gcSummary);
+            (0, internal_7.addSummarizeResultToSummary)(summaryTree, internal_6.gcTreeKey, gcSummary);
         }
     }
     // Track how many times the container tries to reconnect with pending messages.
@@ -1493,7 +1497,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             }
             case messageTypes_js_1.ContainerMessageType.GC: {
                 // GC op is only sent in summarizer which should never have stashed ops.
-                throw new internal_7.LoggingError("GC op not expected to be stashed in summarizer");
+                throw new internal_8.LoggingError("GC op not expected to be stashed in summarizer");
             }
             default: {
                 const error = getUnknownMessageTypeError(opContents.type, "applyStashedOp" /* codePath */);
@@ -1502,27 +1506,18 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             }
         }
     }
-    async loadIdCompressor() {
+    loadIdCompressor() {
         if (this._idCompressor === undefined &&
-            this.sessionSchema.idCompressorMode !== undefined &&
-            this._loadIdCompressor === undefined) {
-            this._loadIdCompressor = this.createIdCompressor()
-                .then((compressor) => {
-                // Finalize any ranges we received while the compressor was turned off.
-                const ops = this.pendingIdCompressorOps;
-                this.pendingIdCompressorOps = [];
-                for (const range of ops) {
-                    compressor.finalizeCreationRange(range);
-                }
-                (0, internal_2.assert)(this.pendingIdCompressorOps.length === 0, 0x976 /* No new ops added */);
-                this._idCompressor = compressor;
-            })
-                .catch((error) => {
-                this.mc.logger.sendErrorEvent({ eventName: "IdCompressorDelayedLoad" }, error);
-                throw error;
-            });
+            this.sessionSchema.idCompressorMode !== undefined) {
+            this._idCompressor = this.createIdCompressorFn();
+            // Finalize any ranges we received while the compressor was turned off.
+            const ops = this.pendingIdCompressorOps;
+            this.pendingIdCompressorOps = [];
+            for (const range of ops) {
+                this._idCompressor.finalizeCreationRange(range);
+            }
+            (0, internal_2.assert)(this.pendingIdCompressorOps.length === 0, 0x976 /* No new ops added */);
         }
-        return this._loadIdCompressor;
     }
     setConnectionState(connected, clientId) {
         // Validate we have consistent state
@@ -1530,7 +1525,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         (0, internal_2.assert)(clientId === currentClientId, 0x977 /* input clientId does not match Audience */);
         (0, internal_2.assert)(this.clientId === currentClientId, 0x978 /* this.clientId does not match Audience */);
         if (connected && this.sessionSchema.idCompressorMode === "delayed") {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.loadIdCompressor();
         }
         if (connected === false && this.delayConnectClientId !== undefined) {
@@ -1579,7 +1573,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         if (reconnection) {
             this.consecutiveReconnects++;
             if (!this.shouldContinueReconnecting()) {
-                this.closeFn(internal_7.DataProcessingError.create("Runtime detected too many reconnects with no progress syncing local ops.", "setConnectionState", undefined, {
+                this.closeFn(internal_8.DataProcessingError.create("Runtime detected too many reconnects with no progress syncing local ops.", "setConnectionState", undefined, {
                     dataLoss: 1,
                     attempts: this.consecutiveReconnects,
                     pendingMessages: this.pendingMessagesCount,
@@ -1592,7 +1586,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         }
         this.channelCollection.setConnectionState(connected, clientId);
         this.garbageCollector.setConnectionState(connected, clientId);
-        (0, internal_7.raiseConnectedEvent)(this.mc.logger, this, connected, clientId);
+        (0, internal_8.raiseConnectedEvent)(this.mc.logger, this, connected, clientId);
     }
     async notifyOpReplay(message) {
         await this.pendingStateManager.applyStashedOpsAt(message.sequenceNumber);
@@ -1645,7 +1639,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 const batchStart = inboundResult.batchStart;
                 const result = this.duplicateBatchDetector?.processInboundBatch(batchStart);
                 if (result?.duplicate) {
-                    const error = new internal_7.DataCorruptionError("Duplicate batch - The same batch was sequenced twice", { batchId: batchStart.batchId });
+                    const error = new internal_8.DataCorruptionError("Duplicate batch - The same batch was sequenced twice", { batchId: batchStart.batchId });
                     this.mc.logger.sendTelemetryEvent({
                         eventName: "DuplicateBatch",
                         details: {
@@ -1654,7 +1648,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                             batchStartCsn: batchStart.batchStartCsn,
                             size: inboundResult.length,
                             duplicateBatchSequenceNumber: result.otherSequenceNumber,
-                            ...(0, internal_7.extractSafePropertiesFromMessage)(batchStart.keyMessage),
+                            ...(0, internal_8.extractSafePropertiesFromMessage)(batchStart.keyMessage),
                         },
                     }, error);
                     throw error;
@@ -1936,23 +1930,20 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this.channelCollection.processSignal(transformed, local);
     }
     /**
-     * Flush the pending ops manually.
-     * This method is expected to be called at the end of a batch.
+     * Flush the current batch of ops to the ordering service for sequencing
+     * This method is not expected to be called in the middle of a batch.
      * @remarks - If it throws (e.g. if the batch is too large to send), the container will be closed.
      *
-     * @param resubmittingBatchId - If defined, indicates this is a resubmission of a batch
-     * with the given Batch ID, which must be preserved
-     * @param resubmittingStagedBatch - If defined, indicates this is a resubmission of a batch that is staged,
-     * meaning it should not be sent to the ordering service yet.
+     * @param resubmitInfo - If defined, indicates this is a resubmission of a batch with the given Batch info needed for resubmit.
      */
-    flush(resubmittingBatchId, resubmittingStagedBatch) {
+    flush(resubmitInfo) {
         try {
             (0, internal_2.assert)(!this.batchRunner.running, 0x24c /* "Cannot call `flush()` while manually accumulating a batch (e.g. under orderSequentially) */);
-            this.outbox.flush(resubmittingBatchId, resubmittingStagedBatch);
+            this.outbox.flush(resubmitInfo);
             (0, internal_2.assert)(this.outbox.isEmpty, 0x3cf /* reentrancy */);
         }
         catch (error) {
-            const error2 = (0, internal_7.normalizeError)(error, {
+            const error2 = (0, internal_8.normalizeError)(error, {
                 props: {
                     orderSequentiallyCalls: this.batchRunner.runs,
                 },
@@ -1995,24 +1986,24 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                         stageControls = undefined;
                     }
                     catch (error_) {
-                        const error2 = (0, internal_7.wrapError)(error_, (message) => {
-                            return internal_7.DataProcessingError.create(`RollbackError: ${message}`, "checkpointRollback", undefined);
+                        const error2 = (0, internal_8.wrapError)(error_, (message) => {
+                            return internal_8.DataProcessingError.create(`RollbackError: ${message}`, "checkpointRollback", undefined);
                         });
                         this.closeFn(error2);
                         throw error2;
                     }
                 }
                 else {
-                    this.closeFn((0, internal_7.wrapError)(error, (errorMessage) => new internal_7.GenericError(`orderSequentially callback exception: ${errorMessage}`, error, {
+                    this.closeFn((0, internal_8.wrapError)(error, (errorMessage) => new internal_8.GenericError(`orderSequentially callback exception: ${errorMessage}`, error, {
                         orderSequentiallyCalls: this.batchRunner.runs,
                     })));
                 }
                 throw error; // throw the original error for the consumer of the runtime
             }
         });
-        stageControls?.commitChanges();
+        stageControls?.commitChanges({ squash: false });
         // We don't flush on TurnBased since we expect all messages in the same JS turn to be part of the same batch
-        if (this.flushMode !== internal_5.FlushMode.TurnBased && !this.batchRunner.running) {
+        if (this.flushMode !== internal_6.FlushMode.TurnBased && !this.batchRunner.running) {
             this.flush();
         }
         return result;
@@ -2049,7 +2040,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         }
         const channel = await context.realize();
         if (channel.entryPoint === undefined) {
-            throw new internal_7.UsageError("entryPoint must be defined on data store runtime for using getAliasedDataStoreEntryPoint");
+            throw new internal_8.UsageError("entryPoint must be defined on data store runtime for using getAliasedDataStoreEntryPoint");
         }
         this.garbageCollector.nodeUpdated({
             node: { type: "DataStore", path: `/${internalId}` },
@@ -2075,7 +2066,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * Typically ops are batched and later flushed together, but in some cases we want to flush immediately.
      */
     currentlyBatching() {
-        return this.flushMode !== internal_5.FlushMode.Immediate || this.batchRunner.running;
+        return this.flushMode !== internal_6.FlushMode.Immediate || this.batchRunner.running;
     }
     getQuorum() {
         return this._quorum;
@@ -2186,9 +2177,8 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         const summarizeResult = await this.channelCollection.summarize(fullTree, trackState, telemetryContext);
         // Wrap data store summaries in .channels subtree.
         (0, index_js_4.wrapSummaryInChannelsTree)(summarizeResult);
-        const pathPartsForChildren = [internal_5.channelsTreeName];
-        // Ensure that ID compressor had a chance to load, if we are using delayed mode.
-        await this.loadIdCompressor();
+        const pathPartsForChildren = [internal_6.channelsTreeName];
+        this.loadIdCompressor();
         this.addContainerStateToSummary(summarizeResult, fullTree, trackState, telemetryContext);
         return {
             ...summarizeResult,
@@ -2202,7 +2192,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     async summarize(options) {
         this.verifyNotClosed();
         const { fullTree = false, trackState = true, summaryLogger = this.mc.logger, runGC = this.garbageCollector.shouldRunGC, runSweep, fullGC, } = options;
-        const telemetryContext = new internal_6.TelemetryContext();
+        const telemetryContext = new internal_7.TelemetryContext();
         // Add the options that are used to generate this summary to the telemetry context.
         telemetryContext.setMultiple("fluid_Summarize", "Options", {
             fullTree,
@@ -2235,7 +2225,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @see IGarbageCollectionRuntime.getGCData
      */
     async getGCData(fullGC) {
-        const builder = new internal_6.GCDataBuilder();
+        const builder = new internal_7.GCDataBuilder();
         const dsGCData = await this.summarizerNode.getGCData(fullGC);
         builder.addNodes(dsGCData.gcNodes);
         const blobsGCData = this.blobManager.getGCData(fullGC);
@@ -2362,7 +2352,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         if (timestampMs === undefined) {
             this.mc.logger.sendTelemetryEvent({
                 eventName: "NoTimestampInGCOutboundRoute",
-                ...(0, internal_7.tagCodeArtifacts)({
+                ...(0, internal_8.tagCodeArtifacts)({
                     id: toPath,
                     fromId: fromPath,
                 }),
@@ -2385,7 +2375,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // use it for all events logged during this summary.
         const summaryNumber = this.nextSummaryNumber;
         let summaryRefSeqNum;
-        const summaryNumberLogger = (0, internal_7.createChildLogger)({
+        const summaryNumberLogger = (0, internal_8.createChildLogger)({
             logger: summaryLogger,
             properties: {
                 all: {
@@ -2396,7 +2386,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         });
         // legacy: assert 0x3d1
         if (!this.outbox.isEmpty) {
-            throw internal_7.DataProcessingError.create("Can't trigger summary in the middle of a batch", "submitSummary", undefined, {
+            throw internal_8.DataProcessingError.create("Can't trigger summary in the middle of a batch", "submitSummary", undefined, {
                 summaryNumber,
                 pendingMessages: this.pendingMessagesCount,
                 outboxLength: this.outbox.messageCount,
@@ -2533,7 +2523,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     stage: "base",
                     referenceSequenceNumber: summaryRefSeqNum,
                     minimumSequenceNumber,
-                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
+                    error: (0, internal_8.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
                 };
             }
             // Validate that the summary generated by summarizer nodes is correct before uploading.
@@ -2560,11 +2550,11 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // Counting dataStores and handles
             // Because handles are unchanged dataStores in the current logic,
             // summarized dataStore count is total dataStore count minus handle count
-            const dataStoreTree = summaryTree.tree[internal_5.channelsTreeName];
+            const dataStoreTree = summaryTree.tree[internal_6.channelsTreeName];
             (0, internal_2.assert)(dataStoreTree.type === driver_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
             const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === driver_definitions_1.SummaryType.Handle).length;
-            const gcSummaryTreeStats = summaryTree.tree[internal_5.gcTreeKey]
-                ? (0, internal_6.calculateStats)(summaryTree.tree[internal_5.gcTreeKey])
+            const gcSummaryTreeStats = summaryTree.tree[internal_6.gcTreeKey]
+                ? (0, internal_7.calculateStats)(summaryTree.tree[internal_6.gcTreeKey])
                 : undefined;
             const summaryStats = {
                 dataStoreCount: this.channelCollection.size,
@@ -2603,7 +2593,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "generate",
                     ...generateSummaryData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
+                    error: (0, internal_8.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
                 };
             }
             const parent = summaryContext.ackHandle;
@@ -2635,7 +2625,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "upload",
                     ...uploadData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
+                    error: (0, internal_8.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
                 };
             }
             const submitData = {
@@ -2651,7 +2641,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "upload",
                     ...uploadData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
+                    error: (0, internal_8.wrapError)(error, (msg) => new index_js_4.RetriableSummaryError(msg)),
                 };
             }
             return submitData;
@@ -2687,7 +2677,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // the summarizer.
         if (finalAttempt &&
             this.mc.config.getBoolean("Fluid.Summarizer.SkipFailingIncorrectSummary")) {
-            const error = internal_7.DataProcessingError.create("Pending ops during summarization", "submitSummary", undefined, { pendingMessages: this.pendingMessagesCount });
+            const error = internal_8.DataProcessingError.create("Pending ops during summarization", "submitSummary", undefined, { pendingMessages: this.pendingMessagesCount });
             logger.sendErrorEvent({
                 eventName: "SkipFailingIncorrectSummary",
                 referenceSequenceNumber,
@@ -2834,7 +2824,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             }
         }
         catch (error) {
-            const dpe = internal_7.DataProcessingError.wrapIfUnrecognized(error, "ContainerRuntime.submit", {
+            const dpe = internal_8.DataProcessingError.wrapIfUnrecognized(error, "ContainerRuntime.submit", {
                 referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
             });
             this.closeFn(dpe);
@@ -2856,7 +2846,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             this.flush();
         };
         switch (this.flushMode) {
-            case internal_5.FlushMode.TurnBased: {
+            case internal_6.FlushMode.TurnBased: {
                 // When in TurnBased flush mode the runtime will buffer operations in the current turn and send them as a single
                 // batch at the end of the turn
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -2864,7 +2854,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 break;
             }
             // FlushModeExperimental is experimental and not exposed directly in the runtime APIs
-            case internal_5.FlushModeExperimental.Async: {
+            case internal_6.FlushModeExperimental.Async: {
                 // When in Async flush mode, the runtime will accumulate all operations across JS turns and send them as a single
                 // batch when all micro-tasks are complete.
                 // Compared to TurnBased, this flush mode will capture more ops into the same batch.
@@ -2899,18 +2889,18 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @remarks - If the "Offline Load" feature is enabled, the batchId is included in the resubmitted messages,
      * for correlation to detect container forking.
      */
-    reSubmitBatch(batch, batchId, staged) {
+    reSubmitBatch(batch, { batchId, staged, squash }) {
         this.batchRunner.run(() => {
             for (const message of batch) {
-                this.reSubmit(message);
+                this.reSubmit(message, squash);
             }
         });
         // Only include Batch ID if "Offline Load" feature is enabled
         // It's only needed to identify batches across container forks arising from misuse of offline load.
-        this.flush(this.offlineEnabled ? batchId : undefined, staged);
+        this.flush({ batchId: this.offlineEnabled ? batchId : undefined, staged });
     }
-    reSubmit(message) {
-        this.reSubmitCore(message.runtimeOp, message.localOpMetadata, message.opMetadata);
+    reSubmit(message, squash) {
+        this.reSubmitCore(message.runtimeOp, message.localOpMetadata, message.opMetadata, squash);
     }
     /**
      * Finds the right store and asks it to resubmit the message. This typically happens when we
@@ -2919,7 +2909,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @param message - The original LocalContainerRuntimeMessage.
      * @param localOpMetadata - The local metadata associated with the original message.
      */
-    reSubmitCore(message, localOpMetadata, opMetadata) {
+    reSubmitCore(message, localOpMetadata, opMetadata, squash) {
         (0, internal_2.assert)(this._summarizer === undefined, 0x8f2 /* Summarizer never reconnects so should never resubmit */);
         switch (message.type) {
             case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
@@ -2927,7 +2917,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             case messageTypes_js_1.ContainerMessageType.Alias: {
                 // For Operations, call resubmitDataStoreOp which will find the right store
                 // and trigger resubmission on it.
-                this.channelCollection.reSubmit(message.type, message.contents, localOpMetadata);
+                this.channelCollection.reSubmit(message.type, message.contents, localOpMetadata, squash);
                 break;
             }
             case messageTypes_js_1.ContainerMessageType.IdAllocation: {
@@ -3029,7 +3019,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * happen in scenarios where the snapshot for the ack was lost in storage in scenarios like DB rollback, etc.
      */
     async fetchLatestSnapshotAndMaybeClose(targetRefSeq, targetAckHandle, logger) {
-        const fetchedSnapshotRefSeq = await internal_7.PerformanceEvent.timedExecAsync(logger, { eventName: "RefreshLatestSummaryAckFetch" }, async (perfEvent) => {
+        const fetchedSnapshotRefSeq = await internal_8.PerformanceEvent.timedExecAsync(logger, { eventName: "RefreshLatestSummaryAckFetch" }, async (perfEvent) => {
             const props = { targetRefSeq, targetAckHandle };
             const trace = client_utils_1.Trace.start();
             let snapshotTree;
@@ -3060,7 +3050,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 props.snapshotVersion = versions[0].id;
             }
             props.getSnapshotDuration = trace.trace().duration;
-            const snapshotRefSeq = await (0, internal_6.seqFromTree)(snapshotTree, this.readAndParseBlob);
+            const snapshotRefSeq = await (0, internal_7.seqFromTree)(snapshotTree, this.readAndParseBlob);
             props.snapshotRefSeq = snapshotRefSeq;
             props.newerSnapshotPresent = snapshotRefSeq >= targetRefSeq;
             perfEvent.end({ details: props });
@@ -3079,7 +3069,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     getPendingLocalState(props) {
         this.verifyNotClosed();
         if (this.batchRunner.running) {
-            throw new internal_7.UsageError("can't get state while manually accumulating a batch");
+            throw new internal_8.UsageError("can't get state while manually accumulating a batch");
         }
         this.imminentClosure ||= props?.notifyImminentClosure ?? false;
         const getSyncState = (pendingAttachmentBlobs) => {
@@ -3109,8 +3099,8 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // to close current batch.
         this.flush();
         return props?.notifyImminentClosure === true
-            ? internal_7.PerformanceEvent.timedExecAsync(this.mc.logger, perfEvent, async (event) => logAndReturnPendingState(event, getSyncState(await this.blobManager.attachAndGetPendingBlobs(props?.stopBlobAttachingSignal))))
-            : internal_7.PerformanceEvent.timedExec(this.mc.logger, perfEvent, (event) => logAndReturnPendingState(event, getSyncState()));
+            ? internal_8.PerformanceEvent.timedExecAsync(this.mc.logger, perfEvent, async (event) => logAndReturnPendingState(event, getSyncState(await this.blobManager.attachAndGetPendingBlobs(props?.stopBlobAttachingSignal))))
+            : internal_8.PerformanceEvent.timedExec(this.mc.logger, perfEvent, (event) => logAndReturnPendingState(event, getSyncState()));
     }
     summarizeOnDemand(options) {
         if (this._summarizer !== undefined) {
@@ -3120,7 +3110,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // If we're not the summarizer, and we don't have a summaryManager, we expect that
             // disableSummaries is turned on. We are throwing instead of returning a failure here,
             // because it is a misuse of the API rather than an expected failure.
-            throw new internal_7.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
+            throw new internal_8.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
         }
         else {
             return this.summaryManager.summarizeOnDemand(options);
@@ -3134,7 +3124,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // If we're not the summarizer, and we don't have a summaryManager, we expect that
             // generateSummaries is turned off. We are throwing instead of returning a failure here,
             // because it is a misuse of the API rather than an expected failure.
-            throw new internal_7.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
+            throw new internal_8.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
         }
         else {
             return this.summaryManager.enqueueSummarize(options);