@fluidframework/container-runtime 2.53.1 → 2.61.0-355054

package/src/blobManager/blobManagerSnapSum.ts

@@ -3,11 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import {
-	AttachState,
-	type IContainerContext,
-} from "@fluidframework/container-definitions/internal";
-import { assert } from "@fluidframework/core-utils/internal";
+import type { IContainerContext } from "@fluidframework/container-definitions/internal";
 import { readAndParse } from "@fluidframework/driver-utils/internal";
 import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
@@ -60,72 +56,54 @@ const loadV1 = async (
 export const toRedirectTable = (
 	blobManagerLoadInfo: IBlobManagerLoadInfo,
 	logger: ITelemetryLoggerExt,
-	attachState: AttachState,
-): Map<string, string | undefined> => {
+): Map<string, string> => {
 	logger.sendTelemetryEvent({
 		eventName: "AttachmentBlobsLoaded",
 		count: blobManagerLoadInfo.ids?.length ?? 0,
 		redirectTable: blobManagerLoadInfo.redirectTable?.length,
 	});
-	const redirectTable = new Map<string, string | undefined>(blobManagerLoadInfo.redirectTable);
-	const detached = attachState !== AttachState.Attached;
-	if (blobManagerLoadInfo.ids) {
-		// If we are detached, we don't have storage IDs yet, so set to undefined
-		// Otherwise, set identity (id -> id) entries.
-		for (const entry of blobManagerLoadInfo.ids) {
-			redirectTable.set(entry, detached ? undefined : entry);
+	const redirectTable = new Map<string, string>(blobManagerLoadInfo.redirectTable);
+	if (blobManagerLoadInfo.ids !== undefined) {
+		for (const storageId of blobManagerLoadInfo.ids) {
+			// Older versions of the runtime used the storage ID directly in the handle,
+			// rather than routing through the redirectTable. To support old handles that
+			// were created in this way but unify handling through the redirectTable, we
+			// add identity mappings to the redirect table at load. These identity entries
+			// will be excluded during summarization.
+			redirectTable.set(storageId, storageId);
 		}
 	}
 	return redirectTable;
 };
 
 export const summarizeBlobManagerState = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): ISummaryTreeWithStats => summarizeV1(redirectTable, attachState);
+	redirectTable: Map<string, string>,
+): ISummaryTreeWithStats => summarizeV1(redirectTable);
 
-const summarizeV1 = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): ISummaryTreeWithStats => {
-	const storageIds = getStorageIds(redirectTable, attachState);
-
-	// if storageIds is empty, it means we are detached and have only local IDs, or that there are no blobs attached
-	const blobIds = storageIds.size > 0 ? [...storageIds] : [...redirectTable.keys()];
+const summarizeV1 = (redirectTable: Map<string, string>): ISummaryTreeWithStats => {
 	const builder = new SummaryTreeBuilder();
-	for (const blobId of blobIds) {
-		builder.addAttachment(blobId);
+	const storageIds = getStorageIds(redirectTable);
+	for (const storageId of storageIds) {
+		// The Attachment is inspectable by storage, which lets it detect that the blob is referenced
+		// and therefore should not be GC'd.
+		builder.addAttachment(storageId);
 	}
 
-	// Any non-identity entries in the table need to be saved in the summary
-	if (redirectTable.size > blobIds.length) {
-		builder.addBlob(
-			redirectTableBlobName,
-			// filter out identity entries
-			JSON.stringify(
-				[...redirectTable.entries()].filter(([localId, storageId]) => localId !== storageId),
-			),
-		);
+	// Exclude identity mappings from the redirectTable summary. Note that
+	// the storageIds of the identity mappings are still included in the Attachments
+	// above, so we expect these identity mappings will be recreated at load
+	// time in toRedirectTable even if there is no non-identity mapping in
+	// the redirectTable.
+	const nonIdentityRedirectTableEntries = [...redirectTable.entries()].filter(
+		([localId, storageId]) => localId !== storageId,
+	);
+	if (nonIdentityRedirectTableEntries.length > 0) {
+		builder.addBlob(redirectTableBlobName, JSON.stringify(nonIdentityRedirectTableEntries));
 	}
 
 	return builder.getSummaryTree();
 };
 
-export const getStorageIds = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): Set<string> => {
-	const ids = new Set<string | undefined>(redirectTable.values());
-
-	// If we are detached, we will not have storage IDs, only undefined
-	const undefinedValueInTable = ids.delete(undefined);
-
-	// For a detached container, entries are inserted into the redirect table with an undefined storage ID.
-	// For an attached container, entries are inserted w/storage ID after the BlobAttach op round-trips.
-	assert(
-		!undefinedValueInTable || (attachState === AttachState.Detached && ids.size === 0),
-		0x382 /* 'redirectTable' must contain only undefined while detached / defined values while attached */,
-	);
-
-	return ids as Set<string>;
+export const getStorageIds = (redirectTable: Map<string, string>): Set<string> => {
+	return new Set<string>(redirectTable.values());
 };

package/src/blobManager/index.ts

@@ -5,15 +5,15 @@
 
 export {
 	BlobManager,
-	IPendingBlobs,
-	IBlobManagerRuntime,
-	IBlobManagerEvents,
+	type IPendingBlobs,
+	type IBlobManagerRuntime,
+	type IBlobManagerEvents,
 	blobManagerBasePath,
 	isBlobPath,
 } from "./blobManager.js";
 export {
 	loadBlobManagerLoadInfo,
-	IBlobManagerLoadInfo,
+	type IBlobManagerLoadInfo,
 	blobsTreeName,
 	redirectTableBlobName,
 } from "./blobManagerSnapSum.js";

package/src/channelCollection.ts

@@ -4,7 +4,7 @@
  */
 
 import { AttachState } from "@fluidframework/container-definitions";
-import {
+import type {
 	FluidObject,
 	IDisposable,
 	IRequest,
@@ -14,8 +14,8 @@ import {
 import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
 import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils/internal";
 import { FluidObjectHandle } from "@fluidframework/datastore/internal";
-import type { ISnapshot } from "@fluidframework/driver-definitions/internal";
-import {
+import type {
+	ISnapshot,
 	ISnapshotTree,
 	ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
@@ -25,23 +25,23 @@ import {
 	isInstanceOfISnapshot,
 } from "@fluidframework/driver-utils/internal";
 import {
-	ISummaryTreeWithStats,
-	ITelemetryContext,
-	IGarbageCollectionData,
-	AliasResult,
+	type ISummaryTreeWithStats,
+	type ITelemetryContext,
+	type IGarbageCollectionData,
+	type AliasResult,
 	CreateSummarizerNodeSource,
-	IAttachMessage,
-	IEnvelope,
-	IFluidDataStoreChannel,
-	IFluidDataStoreContext,
-	IFluidDataStoreContextDetached,
-	IFluidDataStoreFactory,
-	IFluidDataStoreRegistry,
-	IFluidParentContext,
-	ISummarizeResult,
-	NamedFluidDataStoreRegistryEntries,
+	type IAttachMessage,
+	type IEnvelope,
+	type IFluidDataStoreChannel,
+	type IFluidDataStoreContext,
+	type IFluidDataStoreContextDetached,
+	type IFluidDataStoreFactory,
+	type IFluidDataStoreRegistry,
+	type IFluidParentContext,
+	type ISummarizeResult,
+	type NamedFluidDataStoreRegistryEntries,
 	channelsTreeName,
-	IInboundSignalMessage,
+	type IInboundSignalMessage,
 	gcDataBlobKey,
 	type IRuntimeMessagesContent,
 	type InboundAttachMessage,
@@ -67,7 +67,7 @@ import {
 	DataCorruptionError,
 	DataProcessingError,
 	LoggingError,
-	MonitoringContext,
+	type MonitoringContext,
 	createChildLogger,
 	createChildMonitoringContext,
 	extractSafePropertiesFromMessage,
@@ -78,18 +78,18 @@ import { v4 as uuid } from "uuid";
 
 import {
 	DeletedResponseHeaderKey,
-	RuntimeHeaderData,
+	type RuntimeHeaderData,
 	defaultRuntimeHeaderData,
 } from "./containerRuntime.js";
 import {
-	IDataStoreAliasMessage,
+	type IDataStoreAliasMessage,
 	channelToDataStore,
 	isDataStoreAliasMessage,
 } from "./dataStore.js";
 import {
 	FluidDataStoreContext,
-	IFluidDataStoreContextInternal,
-	ILocalDetachedFluidDataStoreContextProps,
+	type IFluidDataStoreContextInternal,
+	type ILocalDetachedFluidDataStoreContextProps,
 	LocalDetachedFluidDataStoreContext,
 	LocalFluidDataStoreContext,
 	RemoteFluidDataStoreContext,
@@ -97,19 +97,18 @@ import {
 } from "./dataStoreContext.js";
 import { DataStoreContexts } from "./dataStoreContexts.js";
 import { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
-import { GCNodeType, IGCNodeUpdatedProps, urlToGCNodePath } from "./gc/index.js";
-import { ContainerMessageType, LocalContainerRuntimeMessage } from "./messageTypes.js";
+import { GCNodeType, type IGCNodeUpdatedProps, urlToGCNodePath } from "./gc/index.js";
+import { ContainerMessageType, type LocalContainerRuntimeMessage } from "./messageTypes.js";
 import { StorageServiceWithAttachBlobs } from "./storageServiceWithAttachBlobs.js";
 import {
-	IContainerRuntimeMetadata,
+	type IContainerRuntimeMetadata,
 	nonDataStorePaths,
 	rootHasIsolatedChannels,
 } from "./summary/index.js";
 
 /**
  * True if a tombstoned object should be returned without erroring
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export const AllowTombstoneRequestHeaderKey = "allowTombstone"; // Belongs in the enum above, but avoiding the breaking change
 
@@ -402,7 +401,7 @@ export class ChannelCollection implements IFluidDataStoreChannel, IDisposable {
 			const attachMessage = contents as InboundAttachMessage;
 			// We need to process the GC Data for both local and remote attach messages
 			const foundGCData = processAttachMessageGCData(
-				attachMessage.snapshot,
+				attachMessage.snapshot ?? undefined,
 				(nodeId, toPath) => {
 					// nodeId is the relative path under the node being attached. Always starts with "/", but no trailing "/" after an id
 					const fromPath = `/${attachMessage.id}${nodeId === "/" ? "" : nodeId}`;

package/src/compressionDefinitions.ts

@@ -5,8 +5,7 @@
 
 /**
  * Available compression algorithms for op compression.
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export enum CompressionAlgorithms {
 	lz4 = "lz4",
@@ -14,8 +13,7 @@ export enum CompressionAlgorithms {
 
 /**
  * Options for op compression.
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export interface ICompressionRuntimeOptions {
 	/**
@@ -32,8 +30,7 @@ export interface ICompressionRuntimeOptions {
 }
 
 /**
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export const disabledCompressionConfig: ICompressionRuntimeOptions = {
 	minimumBatchSizeInBytes: Number.POSITIVE_INFINITY,

package/src/connectionTelemetry.ts

@@ -4,21 +4,20 @@
  */
 
 import { performanceNow } from "@fluid-internal/client-utils";
-import { IDeltaManagerFull } from "@fluidframework/container-definitions/internal";
-import { IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions/internal";
-import type { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { IEventProvider } from "@fluidframework/core-interfaces";
+import type { IDeltaManagerFull } from "@fluidframework/container-definitions/internal";
+import type { IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions/internal";
+import type { ITelemetryBaseLogger, IEventProvider } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import {
-	IDocumentMessage,
+	type IDocumentMessage,
 	MessageType,
-	ISequencedDocumentMessage,
+	type ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
 import { isRuntimeMessage } from "@fluidframework/driver-utils/internal";
 import {
-	IEventSampler,
-	ITelemetryLoggerExt,
-	ISampledTelemetryLogger,
+	type IEventSampler,
+	type ITelemetryLoggerExt,
+	type ISampledTelemetryLogger,
 	createChildLogger,
 	createSampledLogger,
 	formatTick,

package/src/containerHandleContext.ts

@@ -4,8 +4,8 @@
  */
 
 import { AttachState } from "@fluidframework/container-definitions";
-import { IRequest, IResponse } from "@fluidframework/core-interfaces";
-import { IFluidHandleContext } from "@fluidframework/core-interfaces/internal";
+import type { IRequest, IResponse } from "@fluidframework/core-interfaces";
+import type { IFluidHandleContext } from "@fluidframework/core-interfaces/internal";
 import { generateHandleContextPath } from "@fluidframework/runtime-utils/internal";
 
 export interface IContainerHandleContextRuntime {

package/src/containerRuntime.ts

@@ -98,6 +98,12 @@ import {
 	createSessionId,
 	deserializeIdCompressor,
 } from "@fluidframework/id-compressor/internal";
+import {
+	FlushMode,
+	FlushModeExperimental,
+	channelsTreeName,
+	gcTreeKey,
+} from "@fluidframework/runtime-definitions/internal";
 import type {
 	ISummaryTreeWithStats,
 	ITelemetryContext,
@@ -119,13 +125,7 @@ import type {
 	// eslint-disable-next-line import/no-deprecated
 	IContainerRuntimeBaseExperimental,
 	IFluidParentContext,
-} from "@fluidframework/runtime-definitions/internal";
-import {
-	FlushMode,
-	FlushModeExperimental,
-	channelsTreeName,
-	gcTreeKey,
-	type MinimumVersionForCollab,
+	MinimumVersionForCollab,
 } from "@fluidframework/runtime-definitions/internal";
 import {
 	defaultMinVersionForCollab,
@@ -176,7 +176,7 @@ import { v4 as uuid } from "uuid";
 import { BindBatchTracker } from "./batchTracker.js";
 import {
 	BlobManager,
-	IPendingBlobs,
+	type IPendingBlobs,
 	blobManagerBasePath,
 	blobsTreeName,
 	isBlobPath,
@@ -208,9 +208,9 @@ import { DeltaScheduler } from "./deltaScheduler.js";
 import {
 	GCNodeType,
 	GarbageCollector,
-	IGCRuntimeOptions,
-	IGCStats,
-	IGarbageCollector,
+	type IGCRuntimeOptions,
+	type IGCStats,
+	type IGarbageCollector,
 	gcGenerationOptionName,
 	type GarbageCollectionMessage,
 	type IGarbageCollectionRuntime,
@@ -219,19 +219,19 @@ import { InboundBatchAggregator } from "./inboundBatchAggregator.js";
 import {
 	ContainerMessageType,
 	type OutboundContainerRuntimeDocumentSchemaMessage,
-	ContainerRuntimeGCMessage,
+	type ContainerRuntimeGCMessage,
 	type ContainerRuntimeIdAllocationMessage,
 	type InboundSequencedContainerRuntimeMessage,
 	type LocalContainerRuntimeMessage,
 	type UnknownContainerRuntimeMessage,
 } from "./messageTypes.js";
-import { ISavedOpMetadata } from "./metadata.js";
+import type { ISavedOpMetadata } from "./metadata.js";
 import {
-	LocalBatchMessage,
-	BatchStartInfo,
+	type LocalBatchMessage,
+	type BatchStartInfo,
 	DuplicateBatchDetector,
 	ensureContentsDeserialized,
-	IBatchCheckpoint,
+	type IBatchCheckpoint,
 	OpCompressor,
 	OpDecompressor,
 	OpGroupingManager,
@@ -243,8 +243,8 @@ import {
 } from "./opLifecycle/index.js";
 import { pkgVersion } from "./packageVersion.js";
 import {
-	PendingMessageResubmitData,
-	IPendingLocalState,
+	type PendingMessageResubmitData,
+	type IPendingLocalState,
 	PendingStateManager,
 	type PendingBatchResubmitMetadata,
 } from "./pendingStateManager.js";
@@ -266,24 +266,24 @@ import type {
 } from "./summary/index.js";
 import {
 	DocumentsSchemaController,
-	IBaseSummarizeResult,
-	IConnectableRuntime,
-	IContainerRuntimeMetadata,
-	ICreateContainerMetadata,
-	IEnqueueSummarizeOptions,
-	IGenerateSummaryTreeResult,
-	IGeneratedSummaryStats,
-	IOnDemandSummarizeOptions,
-	IRefreshSummaryAckOptions,
-	IRootSummarizerNodeWithGC,
-	ISubmitSummaryOptions,
-	ISummarizerInternalsProvider,
-	ISummarizerRuntime,
-	ISummaryMetadataMessage,
-	IdCompressorMode,
+	type IBaseSummarizeResult,
+	type IConnectableRuntime,
+	type IContainerRuntimeMetadata,
+	type ICreateContainerMetadata,
+	type IEnqueueSummarizeOptions,
+	type IGenerateSummaryTreeResult,
+	type IGeneratedSummaryStats,
+	type IOnDemandSummarizeOptions,
+	type IRefreshSummaryAckOptions,
+	type IRootSummarizerNodeWithGC,
+	type ISubmitSummaryOptions,
+	type ISummarizerInternalsProvider,
+	type ISummarizerRuntime,
+	type ISummaryMetadataMessage,
+	type IdCompressorMode,
 	OrderedClientElection,
 	RetriableSummaryError,
-	SubmitSummaryResult,
+	type SubmitSummaryResult,
 	aliasBlobName,
 	chunksBlobName,
 	recentBatchInfoBlobName,
@@ -301,7 +301,7 @@ import {
 	SummaryCollection,
 	OrderedClientCollection,
 	validateSummaryHeuristicConfiguration,
-	ISummaryConfiguration,
+	type ISummaryConfiguration,
 	DefaultSummaryConfiguration,
 	isSummariesDisabled,
 	summarizerClientType,
@@ -348,8 +348,7 @@ function getUnknownMessageTypeError(
 }
 
 /**
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export interface ISummaryRuntimeOptions {
 	/**
@@ -382,8 +381,7 @@ export interface ISummaryRuntimeOptions {
  * compat configuration info.
  * If neither of the above is done, then the build will fail to compile.
  *
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export interface ContainerRuntimeOptions {
 	readonly summaryOptions: ISummaryRuntimeOptions;
@@ -463,8 +461,7 @@ export interface ContainerRuntimeOptions {
 /**
  * Options for container runtime.
  *
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export type IContainerRuntimeOptions = Partial<ContainerRuntimeOptions>;
 
@@ -512,14 +509,12 @@ export type IContainerRuntimeOptionsInternal = Partial<ContainerRuntimeOptionsIn
 export const DeletedResponseHeaderKey = "wasDeleted";
 /**
  * Tombstone error responses will have this header set to true
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export const TombstoneResponseHeaderKey = "isTombstoned";
 /**
  * Inactive error responses will have this header set to true
- * @legacy
- * @alpha
+ * @legacy @beta
  *
  * @deprecated this header is deprecated and will be removed in the future. The functionality corresponding
  * to this was experimental and is no longer supported.
@@ -727,8 +722,7 @@ type UnsequencedSignalEnvelope = Omit<ISignalEnvelope, "clientBroadcastSignalSeq
 
 /**
  * This object holds the parameters necessary for the {@link loadContainerRuntime} function.
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export interface LoadContainerRuntimeParams {
 	/**
@@ -788,8 +782,7 @@ export interface LoadContainerRuntimeParams {
  * This is meant to be used by a {@link @fluidframework/container-definitions#IRuntimeFactory} to instantiate a container runtime.
  * @param params - An object which specifies all required and optional params necessary to instantiate a runtime.
  * @returns A runtime which provides all the functionality necessary to bind with the loader layer via the {@link @fluidframework/container-definitions#IRuntime} interface and provide a runtime environment via the {@link @fluidframework/container-runtime-definitions#IContainerRuntime} interface.
- * @legacy
- * @alpha
+ * @legacy @beta
  */
 export async function loadContainerRuntime(
 	params: LoadContainerRuntimeParams,
@@ -3715,7 +3708,7 @@ export class ContainerRuntime
 		telemetryContext?: ITelemetryContext,
 	): ISummaryTree {
 		if (blobRedirectTable) {
-			this.blobManager.setRedirectTable(blobRedirectTable);
+			this.blobManager.patchRedirectTable(blobRedirectTable);
 		}
 
 		// We can finalize any allocated IDs since we're the only client

package/src/dataStore.ts

@@ -4,23 +4,23 @@
  */
 
 import { AttachState } from "@fluidframework/container-definitions";
-import { FluidObject } from "@fluidframework/core-interfaces";
-import { type IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
+import type { FluidObject } from "@fluidframework/core-interfaces";
+import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
-import {
+import type {
 	AliasResult,
 	IDataStore,
 	IFluidDataStoreChannel,
 	// eslint-disable-next-line import/no-deprecated
-	type IContainerRuntimeBaseExperimental,
+	IContainerRuntimeBaseExperimental,
 } from "@fluidframework/runtime-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	TelemetryDataTag,
 	UsageError,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { ChannelCollection } from "./channelCollection.js";
+import type { ChannelCollection } from "./channelCollection.js";
 import { ContainerMessageType } from "./messageTypes.js";
 
 /**

package/src/dataStoreContext.ts

@@ -8,28 +8,28 @@ import {
 	type ILayerCompatDetails,
 	type IProvideLayerCompatDetails,
 } from "@fluid-internal/client-utils";
-import { AttachState, IAudience } from "@fluidframework/container-definitions";
+import { AttachState, type IAudience } from "@fluidframework/container-definitions";
 import {
-	IDeltaManager,
+	type IDeltaManager,
 	isIDeltaManagerFull,
 	type IDeltaManagerFull,
 	type ReadOnlyInfo,
 } from "@fluidframework/container-definitions/internal";
-import {
+import type {
 	FluidObject,
 	IDisposable,
 	ITelemetryBaseProperties,
-	type IEvent,
+	IEvent,
 } from "@fluidframework/core-interfaces";
-import {
-	type IFluidHandleContext,
-	type IFluidHandleInternal,
-	type ITelemetryBaseLogger,
+import type {
+	IFluidHandleContext,
+	IFluidHandleInternal,
+	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces/internal";
 import { assert, LazyPromise, unreachableCase } from "@fluidframework/core-utils/internal";
-import { IClientDetails, IQuorumClients } from "@fluidframework/driver-definitions";
-import {
-	type ISnapshot,
+import type { IClientDetails, IQuorumClients } from "@fluidframework/driver-definitions";
+import type {
+	ISnapshot,
 	IDocumentMessage,
 	ISnapshotTree,
 	ITreeEntry,
@@ -42,26 +42,26 @@ import {
 } from "@fluidframework/driver-utils/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 import {
-	ISummaryTreeWithStats,
-	ITelemetryContext,
-	IGarbageCollectionData,
-	CreateChildSummarizerNodeFn,
-	CreateChildSummarizerNodeParam,
-	FluidDataStoreRegistryEntry,
-	IContainerRuntimeBase,
-	IDataStore,
-	IFluidDataStoreChannel,
-	IFluidDataStoreContext,
-	IFluidDataStoreContextDetached,
-	IFluidDataStoreRegistry,
-	IGarbageCollectionDetailsBase,
-	IProvideFluidDataStoreFactory,
-	ISummarizeInternalResult,
-	ISummarizeResult,
-	ISummarizerNodeWithGC,
-	SummarizeInternalFn,
+	type ISummaryTreeWithStats,
+	type ITelemetryContext,
+	type IGarbageCollectionData,
+	type CreateChildSummarizerNodeFn,
+	type CreateChildSummarizerNodeParam,
+	type FluidDataStoreRegistryEntry,
+	type IContainerRuntimeBase,
+	type IDataStore,
+	type IFluidDataStoreChannel,
+	type IFluidDataStoreContext,
+	type IFluidDataStoreContextDetached,
+	type IFluidDataStoreRegistry,
+	type IGarbageCollectionDetailsBase,
+	type IProvideFluidDataStoreFactory,
+	type ISummarizeInternalResult,
+	type ISummarizeResult,
+	type ISummarizerNodeWithGC,
+	type SummarizeInternalFn,
 	channelsTreeName,
-	IInboundSignalMessage,
+	type IInboundSignalMessage,
 	type IPendingMessagesState,
 	type IRuntimeMessageCollection,
 	type IFluidDataStoreFactory,
@@ -75,7 +75,7 @@ import {
 import {
 	DataProcessingError,
 	LoggingError,
-	MonitoringContext,
+	type MonitoringContext,
 	ThresholdCounter,
 	UsageError,
 	createChildMonitoringContext,
@@ -92,8 +92,8 @@ import {
 } from "./runtimeLayerCompatState.js";
 import {
 	// eslint-disable-next-line import/no-deprecated
-	ReadFluidDataStoreAttributes,
-	WriteFluidDataStoreAttributes,
+	type ReadFluidDataStoreAttributes,
+	type WriteFluidDataStoreAttributes,
 	dataStoreAttributesBlobName,
 	getAttributesFormatVersion,
 	getFluidDataStoreAttributes,