@fluidframework/container-runtime 2.0.0-dev-rc.3.0.0.250606 → 2.0.0-dev-rc.3.0.0.254274

package/src/gc/gcHelpers.ts

@@ -3,16 +3,25 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { ISnapshotTree } from "@fluidframework/protocol-definitions";
+import { IGarbageCollectionData } from "@fluidframework/runtime-definitions";
 import {
-	IGarbageCollectionData,
 	IGarbageCollectionDetailsBase,
 	gcBlobPrefix,
 	gcDeletedBlobKey,
 	gcTombstoneBlobKey,
-} from "@fluidframework/runtime-definitions";
-import { GCFeatureMatrix, GCVersion, IGCMetadata } from "./gcDefinitions.js";
+} from "@fluidframework/runtime-definitions/internal";
+import type { IConfigProvider } from "@fluidframework/telemetry-utils/internal";
+
+import {
+	GCFeatureMatrix,
+	GCVersion,
+	IGCMetadata,
+	gcVersionUpgradeToV4Key,
+	nextGCVersion,
+	stableGCVersion,
+} from "./gcDefinitions.js";
 import {
 	IGarbageCollectionNodeData,
 	IGarbageCollectionSnapshotData,
@@ -27,6 +36,14 @@ export function getGCVersion(metadata?: IGCMetadata): GCVersion {
 	return metadata.gcFeature ?? 0;
 }
 
+/** Indicates what GC version is in effect for new GC data being written in this session */
+export function getGCVersionInEffect(configProvider: IConfigProvider): number {
+	// If version upgrade is not enabled, fall back to the stable GC version.
+	return configProvider.getBoolean(gcVersionUpgradeToV4Key) === true
+		? nextGCVersion
+		: stableGCVersion;
+}
+
 /**
  * Indicates whether Sweep is allowed for this document based on the persisted GC Feature Matrix and current gcGeneration.
  * This applies to the entire Sweep Phase the same - both Tombstone Enforcement (i.e. should loading a Tombstone fail?) and Deletion.

package/src/gc/gcSummaryStateTracker.ts

@@ -4,16 +4,18 @@
  */
 
 import { SummaryType } from "@fluidframework/protocol-definitions";
+import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
 import {
 	ISummarizeResult,
-	ISummaryTreeWithStats,
 	gcBlobPrefix,
 	gcDeletedBlobKey,
 	gcTombstoneBlobKey,
 	gcTreeKey,
-} from "@fluidframework/runtime-definitions";
-import { SummaryTreeBuilder, mergeStats } from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { SummaryTreeBuilder, mergeStats } from "@fluidframework/runtime-utils/internal";
+
 import { IRefreshSummaryResult } from "../summary/index.js";
+
 import { GCVersion, IGCStats, IGarbageCollectorConfigs } from "./gcDefinitions.js";
 import { generateSortedGCState } from "./gcHelpers.js";
 import { IGarbageCollectionSnapshotData, IGarbageCollectionState } from "./gcSummaryDefinitions.js";

package/src/gc/gcTelemetry.ts

@@ -7,12 +7,16 @@ import { IGarbageCollectionData } from "@fluidframework/runtime-definitions";
 import {
 	type ITelemetryGenericEventExt,
 	ITelemetryLoggerExt,
+} from "@fluidframework/telemetry-utils";
+import {
 	MonitoringContext,
 	generateStack,
 	tagCodeArtifacts,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { RuntimeHeaderData } from "../containerRuntime.js";
 import { ICreateContainerMetadata } from "../summary/index.js";
+
 import {
 	GCFeatureMatrix,
 	GCNodeType,
@@ -23,6 +27,7 @@ import {
 	throwOnTombstoneLoadOverrideKey,
 	throwOnTombstoneUsageKey,
 } from "./gcDefinitions.js";
+import { getGCVersionInEffect } from "./gcHelpers.js";
 import { UnreferencedStateTracker } from "./gcUnreferencedStateTracker.js";
 
 type NodeUsageType = "Changed" | "Loaded" | "Revived";
@@ -429,6 +434,7 @@ export function sendGCUnexpectedUsageEvent(
 	event.sweepFlags = JSON.stringify({
 		EnableSweepFlag: mc.config.getBoolean(runSweepKey),
 	});
+	event.gcVersion = getGCVersionInEffect(mc.config);
 
 	mc.logger.sendTelemetryEvent(event, error);
 }

package/src/gc/gcUnreferencedStateTracker.ts

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Timer } from "@fluidframework/core-utils";
-import { validatePrecondition } from "@fluidframework/telemetry-utils";
+import { assert, Timer } from "@fluidframework/core-utils/internal";
+import { validatePrecondition } from "@fluidframework/telemetry-utils/internal";
+
 import { UnreferencedState } from "./gcDefinitions.js";
 
 /** A wrapper around common-utils Timer that requires the timeout when calling start/restart */

package/src/gc/index.ts

@@ -45,6 +45,7 @@ export {
 export {
 	cloneGCData,
 	concatGarbageCollectionStates,
+	getGCVersionInEffect,
 	trimLeadingAndTrailingSlashes,
 	unpackChildNodesGCDetails,
 } from "./gcHelpers.js";

package/src/messageTypes.ts

@@ -3,13 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import type { IdCreationRange } from "@fluidframework/id-compressor";
+import type { IdCreationRange } from "@fluidframework/id-compressor/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
 	IAttachMessage,
 	IEnvelope,
 	InboundAttachMessage,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/runtime-definitions/internal";
+
 import { IDataStoreAliasMessage } from "./dataStore.js";
 import { GarbageCollectionMessage } from "./gc/index.js";
 import { IChunkedOp } from "./opLifecycle/index.js";

package/src/opLifecycle/batchManager.ts

@@ -4,6 +4,7 @@
  */
 
 import { ICompressionRuntimeOptions } from "../containerRuntime.js";
+
 import { BatchMessage, IBatch, IBatchCheckpoint } from "./definitions.js";
 
 export interface IBatchManagerOptions {

package/src/opLifecycle/definitions.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { IBatchMessage } from "@fluidframework/container-definitions";
+import { IBatchMessage } from "@fluidframework/container-definitions/internal";
+
 import { CompressionAlgorithms } from "../containerRuntime.js";
 
 /**

package/src/opLifecycle/opCompressor.ts

@@ -5,10 +5,12 @@
 
 import { IsoBuffer } from "@fluid-internal/client-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
-import { UsageError, createChildLogger } from "@fluidframework/telemetry-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+import { UsageError, createChildLogger } from "@fluidframework/telemetry-utils/internal";
 import { compress } from "lz4js";
+
 import { CompressionAlgorithms } from "../containerRuntime.js";
+
 import { estimateSocketSize } from "./batchManager.js";
 import { BatchMessage, IBatch } from "./definitions.js";
 

package/src/opLifecycle/opDecompressor.ts

@@ -5,10 +5,11 @@
 
 import { IsoBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { createChildLogger } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
 import { decompress } from "lz4js";
+
 import { CompressionAlgorithms } from "../containerRuntime.js";
 import { IBatchMetadata } from "../metadata.js";
 

package/src/opLifecycle/opGroupingManager.ts

@@ -4,9 +4,10 @@
  */
 
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { createChildLogger } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 import { IBatch } from "./definitions.js";
 
 /**

package/src/opLifecycle/opSplitter.ts

@@ -3,16 +3,18 @@
  * Licensed under the MIT License.
  */
 
-import { IBatchMessage } from "@fluidframework/container-definitions";
+import { IBatchMessage } from "@fluidframework/container-definitions/internal";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
 	DataCorruptionError,
 	createChildLogger,
 	extractSafePropertiesFromMessage,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { ContainerMessageType, ContainerRuntimeChunkedOpMessage } from "../messageTypes.js";
+
 import { estimateSocketSize } from "./batchManager.js";
 import { BatchMessage, IBatch, IChunkedOp } from "./definitions.js";
 

package/src/opLifecycle/outbox.ts

@@ -3,17 +3,20 @@
  * Licensed under the MIT License.
  */
 
-import { IBatchMessage, ICriticalContainerError } from "@fluidframework/container-definitions";
+import { ICriticalContainerError } from "@fluidframework/container-definitions";
+import { IBatchMessage } from "@fluidframework/container-definitions/internal";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
 	GenericError,
 	MonitoringContext,
 	UsageError,
 	createChildMonitoringContext,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { ICompressionRuntimeOptions } from "../containerRuntime.js";
 import { IPendingBatchMessage, PendingStateManager } from "../pendingStateManager.js";
+
 import {
 	BatchManager,
 	BatchSequenceNumbers,

package/src/opLifecycle/remoteMessageProcessor.ts

@@ -4,6 +4,7 @@
  */
 
 import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions";
+
 import {
 	ContainerMessageType,
 	type InboundContainerRuntimeMessage,
@@ -11,6 +12,7 @@ import {
 	type InboundSequencedContainerRuntimeMessageOrSystemMessage,
 	type InboundSequencedRecentlyAddedContainerRuntimeMessage,
 } from "../messageTypes.js";
+
 import { OpDecompressor } from "./opDecompressor.js";
 import { OpGroupingManager, isGroupedBatch } from "./opGroupingManager.js";
 import { OpSplitter, isChunkedMessage } from "./opSplitter.js";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-dev-rc.3.0.0.250606";
+export const pkgVersion = "2.0.0-dev-rc.3.0.0.254274";

package/src/pendingStateManager.ts

@@ -3,13 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import Deque from "double-ended-queue";
-
 import { ICriticalContainerError } from "@fluidframework/container-definitions";
 import { IDisposable } from "@fluidframework/core-interfaces";
-import { assert, Lazy } from "@fluidframework/core-utils";
+import { assert, Lazy } from "@fluidframework/core-utils/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { DataProcessingError, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { DataProcessingError } from "@fluidframework/telemetry-utils/internal";
+import Deque from "double-ended-queue";
 
 import { InboundSequencedContainerRuntimeMessage } from "./messageTypes.js";
 import { IBatchMetadata } from "./metadata.js";

package/src/scheduleManager.ts

@@ -6,16 +6,17 @@
 import type { EventEmitter } from "@fluid-internal/client-utils";
 import { performance } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
-import { assert } from "@fluidframework/core-utils";
-import { isRuntimeMessage } from "@fluidframework/driver-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+import { isRuntimeMessage } from "@fluidframework/driver-utils/internal";
 import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	DataCorruptionError,
 	DataProcessingError,
-	ITelemetryLoggerExt,
 	createChildLogger,
 	extractSafePropertiesFromMessage,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { DeltaScheduler } from "./deltaScheduler.js";
 import { IBatchMetadata } from "./metadata.js";
 import { pkgVersion } from "./packageVersion.js";

package/src/storageServiceWithAttachBlobs.ts

@@ -6,8 +6,8 @@
 import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
-} from "@fluidframework/driver-definitions";
-import { DocumentStorageServiceProxy } from "@fluidframework/driver-utils";
+} from "@fluidframework/driver-definitions/internal";
+import { DocumentStorageServiceProxy } from "@fluidframework/driver-utils/internal";
 
 /**
  * IDocumentStorageService proxy which intercepts requests if they can be satisfied by the blobs received in the

package/src/summary/documentSchema.ts

@@ -2,8 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert } from "@fluidframework/core-utils";
-import { DataProcessingError } from "@fluidframework/telemetry-utils";
+
+import { assert } from "@fluidframework/core-utils/internal";
+import { DataProcessingError } from "@fluidframework/telemetry-utils/internal";
+
+import { pkgVersion } from "../packageVersion.js";
 
 /**
  * Descripe allowed type for properties in document schema.
@@ -12,7 +15,7 @@ import { DataProcessingError } from "@fluidframework/telemetry-utils";
  * we want them to continue to collaborate alongside clients who support that capability, but such capability is shipping dark for now.
  * @alpha
  */
-export type DocumentSchemaValueType = string | true | number | undefined;
+export type DocumentSchemaValueType = string | string[] | true | number | undefined;
 
 /**
  * ID Compressor mode.
@@ -92,6 +95,18 @@ export interface IDocumentSchemaFeatures {
 	compressionLz4: boolean;
 	idCompressorMode: IdCompressorMode;
 	opGroupingEnabled: boolean;
+
+	/**
+	 * List of disallowed versions of the runtime.
+	 * This option is sticky. Once a version of runtime is added to this list (when supplied to DocumentsSchemaController's constructor)
+	 * it will be added to the list of disallowed versions and stored in document metadata.
+	 * Each runtime checks if its version is in this list on container open. If it is, it immediately exits with error message
+	 * indicating to the user that this version is no longer supported.
+	 * Currently there is no mechanism to remove version from this list. I.e. If it was once added to the list,
+	 * it gets added to any document metadata (documents that gets open by this runtime) and there is no way to clear it from document's
+	 * metadata.
+	 */
+	disallowedVersions: string[];
 }
 
 /**
@@ -181,6 +196,22 @@ class IdCompressorProperty extends MultiChoice {
 	}
 }
 
+class CheckVersions implements IProperty<string[] | undefined> {
+	public or(currentDocSchema: string[] = [], desiredDocSchema: string[] = []) {
+		const set = new Set<string>([...currentDocSchema, ...desiredDocSchema]);
+		return arrayToProp([...set.values()]);
+	}
+
+	// Once version is there, it stays there forever.
+	public and(currentDocSchema: string[] = [], desiredDocSchema: string[] = []) {
+		return this.or(currentDocSchema, desiredDocSchema);
+	}
+
+	public validate(t: unknown) {
+		return t === undefined || (Array.isArray(t) && !t.includes(pkgVersion));
+	}
+}
+
 /**
  * Helper structure to valida if a schema is compatible with existing code.
  */
@@ -189,6 +220,7 @@ const documentSchemaSupportedConfigs = {
 	idCompressorMode: new IdCompressorProperty(["delayed", "on"]),
 	opGroupingEnabled: new TrueOrUndefined(),
 	compressionLz4: new TrueOrUndefined(),
+	disallowedVersions: new CheckVersions(),
 };
 
 /**
@@ -208,7 +240,7 @@ function checkRuntimeCompatibility(documentSchema?: IDocumentSchema) {
 	if (documentSchema.version !== currentDocumentVersionSchema) {
 		throw DataProcessingError.create(
 			msg,
-			"checkRuntimeCompat",
+			"checkRuntimeCompat1",
 			undefined, // message
 			{
 				runtimeSchemaVersion: documentSchema.version,
@@ -238,7 +270,7 @@ function checkRuntimeCompatibility(documentSchema?: IDocumentSchema) {
 		const value = documentSchema[unknownProperty];
 		throw DataProcessingError.create(
 			msg,
-			"checkRuntimeCompat",
+			"checkRuntimeCompat2",
 			undefined, // message
 			{
 				codeVersion: currentDocumentVersionSchema,
@@ -314,6 +346,10 @@ function boolToProp(b: boolean) {
 	return b ? true : undefined;
 }
 
+function arrayToProp(arr: string[]) {
+	return arr.length === 0 ? undefined : arr;
+}
+
 /* eslint-disable jsdoc/check-indentation */
 
 /**
@@ -345,6 +381,18 @@ function boolToProp(b: boolean) {
  * clients who do not understand such feature will continue to fail to open such documents, as such documents very
  * likely contain data in a new format.
  *
+ * Controller operates with 4 schemas:
+ * - document schema: whatever we loaded from summary metadata + ops. It follows eventuall consistency rules (i.e. like DDS).
+ * - desired schema - what client is asking for to have (i.e. all the desired settings, based on runtime options / feature gates).
+ * - session schema - current session schema. It's "and" of the above two schemas.
+ * - future schema - "or" of document and desires schemas.
+ *
+ * "or" & "and" operators are defined individually for each property. For Boolean properties it's literally &&, || operators.
+ * But for other properties it's more nuanced.
+ *
+ * Whenver document schema does not match future schema, controller will send an op that attempts to changs documents schema to
+ * future schema.
+ *
  * Users of this class need to use DocumentsSchemaController.sessionSchema to determine what features can be used.
  *
  * There are two modes this class can operate:
@@ -392,12 +440,10 @@ export class DocumentsSchemaController {
 
 	/**
 	 * Constructs DocumentsSchemaController that controls current schema and processes around it, including changes in schema.
-	 * @param explicitSchemaControl - Tells if schema changes are done implicitly (without ops - legacy behavior), or go through formal schema change ops process.
 	 * @param existing - Is the document existing document, or a new doc.
 	 * @param documentMetadataSchema - current document's schema, if present.
-	 * @param compressionAlgorithm - desired compression algorith to use
-	 * @param idCompressorModeArg - desired ID compressor mode to use
-	 * @param opGroupingEnabled - true if it's desired to use op grouping.
+	 * @param features - features of the document schema that current session wants to see enabled.
+	 * @param onSchemaChange - callback that is called whenever schema is changed (not called on creation / load, only when processing document schema change ops)
 	 */
 	constructor(
 		existing: boolean,
@@ -407,6 +453,12 @@ export class DocumentsSchemaController {
 	) {
 		checkRuntimeCompatibility(documentMetadataSchema);
 
+		// For simplicity, let's only support new schema features for explicit schema control mode
+		assert(
+			features.disallowedVersions.length === 0 || features.explicitSchemaControl,
+			"not supported",
+		);
+
 		this.documentSchema =
 			(documentMetadataSchema as IDocumentSchemaCurrent) ??
 			({
@@ -434,6 +486,7 @@ export class DocumentsSchemaController {
 				compressionLz4: boolToProp(features.compressionLz4),
 				idCompressorMode: features.idCompressorMode,
 				opGroupingEnabled: boolToProp(features.opGroupingEnabled),
+				disallowedVersions: arrayToProp(features.disallowedVersions),
 			},
 		};
 
@@ -479,23 +532,29 @@ export class DocumentsSchemaController {
 		return schema;
 	}
 
-	public onMessageSent(send: (content: IDocumentSchemaChangeMessage) => void) {
+	/**
+	 * Called by Container runtime whenever it is about to send some op.
+	 * It gives opportunity for controller to issue its own ops - we do not want to send ops if there are no local changes in document.
+	 * @returns Optional message to send.
+	 */
+	public maybeSendSchemaMessage(): IDocumentSchemaChangeMessage | undefined {
 		if (this.sendOp && this.futureSchema !== undefined) {
 			assert(
 				this.explicitSchemaControl &&
 					this.futureSchema.runtime.explicitSchemaControl === true,
 				"not legacy",
 			);
-			send({
+			return {
 				...this.futureSchema,
 				refSeq: this.documentSchema.refSeq,
-			});
+			};
 		}
 		this.sendOp = false;
 	}
 
 	/**
 	 * Process document schema change message
+	 * Called by ContainerRuntime whenever it sees document schema messages.
 	 * @param content - content of the message
 	 * @param local - whether op is local
 	 * @param sequenceNumber - sequence number of the op

package/src/summary/orderedClientElection.ts

@@ -8,13 +8,11 @@
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { IEvent, IEventProvider, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { IClient, IQuorumClients, ISequencedClient } from "@fluidframework/protocol-definitions";
-import {
-	ITelemetryLoggerExt,
-	UsageError,
-	createChildLogger,
-} from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { UsageError, createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 import { summarizerClientType } from "./summarizerClientElection.js";
 
 // helper types for recursive readonly.

package/src/summary/runWhileConnectedCoordinator.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Deferred } from "@fluidframework/core-utils";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
+
 import {
 	IConnectableRuntime,
 	ISummaryCancellationToken,

package/src/summary/runningSummarizer.ts

@@ -5,7 +5,7 @@
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IDisposable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { assert, Deferred, PromiseTimer, delay } from "@fluidframework/core-utils";
+import { assert, Deferred, PromiseTimer, delay } from "@fluidframework/core-utils/internal";
 import { DriverErrorTypes } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions";
 import {
@@ -14,9 +14,11 @@ import {
 	createChildLogger,
 	createChildMonitoringContext,
 	isFluidError,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { ISummaryConfiguration } from "../containerRuntime.js";
 import { opSize } from "../opProperties.js";
+
 import { SummarizeHeuristicRunner } from "./summarizerHeuristics.js";
 import {
 	EnqueueSummarizeResult,

package/src/summary/summarizer.ts

@@ -5,16 +5,18 @@
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IFluidHandleContext } from "@fluidframework/core-interfaces";
-import { Deferred } from "@fluidframework/core-utils";
+import { Deferred } from "@fluidframework/core-utils/internal";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	IFluidErrorBase,
-	ITelemetryLoggerExt,
 	LoggingError,
 	UsageError,
 	createChildLogger,
 	wrapErrorAndLog,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
+
 import { ISummaryConfiguration } from "../containerRuntime.js";
+
 import { ICancellableSummarizerController } from "./runWhileConnectedCoordinator.js";
 import { RunningSummarizer } from "./runningSummarizer.js";
 import { SummarizeHeuristicData } from "./summarizerHeuristics.js";

package/src/summary/summarizerClientElection.ts

@@ -7,6 +7,7 @@ import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IEvent, IEventProvider } from "@fluidframework/core-interfaces";
 import { IClientDetails, MessageType } from "@fluidframework/protocol-definitions";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+
 import {
 	IOrderedClientElection,
 	ISerializedElection,

package/src/summary/summarizerHeuristics.ts

@@ -3,9 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { Timer } from "@fluidframework/core-utils";
+import { Timer } from "@fluidframework/core-utils/internal";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+
 import { ISummaryConfigurationHeuristics } from "../containerRuntime.js";
+
 import {
 	ISummarizeAttempt,
 	ISummarizeHeuristicData,