@fluidframework/tree 2.81.0-374083 → 2.81.1

package/src/shared-tree-core/defaultResubmitMachine.ts

@@ -3,12 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { assert, fail, oob } from "@fluidframework/core-utils/internal";
+import { assert, fail } from "@fluidframework/core-utils/internal";
 
-import type { GraphCommit, RevisionTag, TaggedChange } from "../core/index.js";
-import { disposeSymbol } from "../util/index.js";
+import type { GraphCommit, RevisionTag } from "../core/index.js";
+import { hasSome } from "../util/index.js";
 
-import type { ChangeEnricherReadonlyCheckout } from "./changeEnricher.js";
+import type { ChangeEnricher } from "./changeEnricher.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
 
 interface PendingChange<TChange> {
@@ -32,15 +32,11 @@ export class DefaultResubmitMachine<TChange> implements ResubmitMachine<TChange>
 	private currentEnrichment: number = 0;
 
 	public constructor(
-		/**
-		 * A function that can create a rollback for a given change.
-		 */
-		private readonly makeRollback: (change: TaggedChange<TChange>) => TChange,
 		/**
 		 * Change enricher that represent the tip of the top-level local branch (i.e., the branch on which in-flight
 		 * commits are applied and automatically rebased).
 		 */
-		private readonly tip: ChangeEnricherReadonlyCheckout<TChange>,
+		private readonly enricher: ChangeEnricher<TChange>,
 	) {}
 
 	public onCommitSubmitted(commit: GraphCommit<TChange>): void {
@@ -67,54 +63,46 @@ export class DefaultResubmitMachine<TChange> implements ResubmitMachine<TChange>
 			return;
 		}
 
-		const localCommits = getLocalCommits();
-		assert(
-			localCommits[0]?.revision === revision,
-			0xc79 /* Expected local commits to start with specified revision */,
-		);
+		const newCommits = getLocalCommits();
 
-		// Some in-flight commits have stale enrichments, so we recompute them.
-		const checkout = this.tip.fork();
-
-		// Roll back the checkout to the state before the oldest commit
-		for (let iCommit = localCommits.length - 1; iCommit >= 0; iCommit -= 1) {
-			const commit = localCommits[iCommit] ?? oob();
-			const rollback = this.makeRollback(commit);
-			// WARNING: it's not currently possible to roll back past a schema change (see AB#7265).
-			// Either we have to make it possible to do so, or this logic will have to change to work
-			// forwards from an earlier fork instead of backwards.
-			checkout.applyTipChange(rollback);
-		}
-
-		// Update the enrichments of the stale commits.
-		for (const [iCommit, commit] of localCommits.entries()) {
-			const current = this.getPendingChange(commit.revision);
+		const staleChanges: {
+			readonly pending: PendingChange<TChange>;
+			readonly newCommit: GraphCommit<TChange>;
+		}[] = [];
+		for (const newCommit of newCommits) {
+			const pending = this.getPendingChange(newCommit.revision);
 			assert(
-				current !== undefined,
+				pending !== undefined,
 				0xbda /* there must be an inflight commit for each resubmit commit */,
 			);
-
-			if (current.lastEnrichment < this.currentEnrichment) {
-				const enrichedChange = checkout.updateChangeEnrichments(
-					commit.change,
-					commit.revision,
-				);
-				const enrichedCommit = { ...commit, change: enrichedChange };
-
-				// Optimization: only apply the enriched change if the next commit also needs enrichment.
-				const nextCommit = localCommits[iCommit + 1];
-				if (
-					nextCommit !== undefined &&
-					this.getPendingChange(nextCommit.revision).lastEnrichment < this.currentEnrichment
-				) {
-					checkout.applyTipChange(enrichedChange, commit.revision);
-				}
-
-				current.commit = enrichedCommit;
-				current.lastEnrichment = this.currentEnrichment;
+			const isStale = pending.lastEnrichment < this.currentEnrichment;
+			if (isStale) {
+				staleChanges.push({ pending, newCommit });
+			} else {
+				// We have reached a commit with a valid enrichment. Later commits must also be valid.
+				break;
 			}
 		}
-		checkout[disposeSymbol]();
+
+		assert(
+			hasSome(staleChanges) && staleChanges[0].newCommit.revision === revision,
+			0xc79 /* Expected local commits to start with specified revision */,
+		);
+
+		const startingState = staleChanges[0].newCommit.parent;
+		assert(startingState !== undefined, 0xcc3 /* New commits must have a parent. */);
+		// Some in-flight commits have stale enrichments, so we recompute them.
+		const enriched = this.enricher.enrich(
+			startingState,
+			newCommits.slice(0, staleChanges.length),
+		);
+		for (const [index, { pending, newCommit }] of staleChanges.entries()) {
+			const enrichedChange = enriched[index];
+			assert(enrichedChange !== undefined, 0xcc4 /* Missing enriched commit. */);
+			const enrichedCommit = { ...newCommit, change: enrichedChange };
+			pending.commit = enrichedCommit;
+			pending.lastEnrichment = this.currentEnrichment;
+		}
 	}
 
 	public getEnrichedCommit(

package/src/shared-tree-core/editManager.ts

@@ -3,9 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import { assert, fail } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
+import type { Listenable } from "@fluidframework/core-interfaces";
+import { assert, fail } from "@fluidframework/core-utils/internal";
 import type { SessionId } from "@fluidframework/id-compressor";
+import {
+	TelemetryEventBatcher,
+	type ITelemetryLoggerExt,
+} from "@fluidframework/telemetry-utils/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 
 import {
@@ -18,7 +23,6 @@ import {
 	mintCommit,
 	type RebaseStatsWithDuration,
 	tagChange,
-	type EditorOptions,
 } from "../core/index.js";
 import { type Mutable, brand, getOrCreate, mapIterable } from "../util/index.js";
 
@@ -42,11 +46,6 @@ import {
 	minSequenceId,
 	sequenceIdComparator,
 } from "./sequenceIdUtils.js";
-import {
-	TelemetryEventBatcher,
-	type ITelemetryLoggerExt,
-} from "@fluidframework/telemetry-utils/internal";
-import type { Listenable } from "@fluidframework/core-interfaces";
 
 export const minimumPossibleSequenceNumber: SeqNumber = brand(Number.MIN_SAFE_INTEGER);
 const minimumPossibleSequenceId: SequenceId = {
@@ -124,7 +123,6 @@ export class EditManager<
 		public readonly localSessionId: SessionId,
 		private readonly mintRevisionTag: () => RevisionTag,
 		private readonly onSharedBranchCreated?: (branchId: BranchId) => void,
-		editorOptions?: EditorOptions,
 		logger?: ITelemetryLoggerExt,
 	) {
 		this.trunkBase = {
@@ -149,10 +147,9 @@ export class EditManager<
 			mintRevisionTag,
 			this._events,
 			this.telemetryEventBatcher,
-			editorOptions,
 		);
 
-		this.createAndAddSharedBranch("main", undefined, undefined, mainTrunk, editorOptions);
+		this.createAndAddSharedBranch("main", undefined, undefined, mainTrunk);
 	}
 
 	public getLocalBranch(branchId: BranchId): SharedTreeBranch<TEditor, TChangeset> {
@@ -483,15 +480,8 @@ export class EditManager<
 		sessionId: SessionId | undefined,
 		parent: SharedBranch<TEditor, TChangeset> | undefined,
 		branch: SharedTreeBranch<TEditor, TChangeset>,
-		editorOptions?: EditorOptions,
 	): SharedBranch<TEditor, TChangeset> {
-		const sharedBranch = this.createSharedBranch(
-			branchId,
-			sessionId,
-			parent,
-			branch,
-			editorOptions,
-		);
+		const sharedBranch = this.createSharedBranch(branchId, sessionId, parent, branch);
 		this.addSharedBranch(branchId, sharedBranch);
 		return sharedBranch;
 	}
@@ -522,7 +512,6 @@ export class EditManager<
 		sessionId: SessionId | undefined,
 		parent: SharedBranch<TEditor, TChangeset> | undefined,
 		branch: SharedTreeBranch<TEditor, TChangeset>,
-		editorOptions?: EditorOptions,
 	): SharedBranch<TEditor, TChangeset> {
 		const sharedBranch = new SharedBranch(
 			parent,
@@ -534,7 +523,6 @@ export class EditManager<
 			this.mintRevisionTag,
 			this._events,
 			this.telemetryEventBatcher,
-			editorOptions,
 		);
 
 		return sharedBranch;
@@ -707,7 +695,6 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 		private readonly mintRevisionTag: () => RevisionTag,
 		branchTrimmer: Listenable<BranchTrimmingEvents>,
 		telemetryEventBatcher: TelemetryEventBatcher<keyof RebaseStatsWithDuration> | undefined,
-		editorOptions?: EditorOptions,
 	) {
 		this.localBranch = new SharedTreeBranch(
 			this.trunk.getHead(),
@@ -715,7 +702,6 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 			mintRevisionTag,
 			branchTrimmer,
 			telemetryEventBatcher,
-			editorOptions,
 		);
 
 		this.sequenceIdToCommit.set(baseCommitSequenceId, this.trunk.getHead());

package/src/shared-tree-core/editManagerCodecs.ts

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
+import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	getConfigForMinVersionForCollab,
 	lowestMinVersionForCollab,
@@ -34,7 +35,6 @@ import { brand, unbrand, type JsonCompatibleReadOnly } from "../util/index.js";
 import type { SummaryData } from "./editManager.js";
 import { makeV1CodecWithVersion } from "./editManagerCodecsV1toV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./editManagerCodecsVSharedBranches.js";
-import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	EditManagerFormatVersion,
 	editManagerFormatVersions,
@@ -74,15 +74,6 @@ export function editManagerFormatVersionSelectorForSharedBranches(
 	return brand(EditManagerFormatVersion.vSharedBranches);
 }
 
-/**
- * Returns the version that should be used for testing shared branches.
- */
-export function editManagerFormatVersionSelectorForDetachedRootEditing(
-	clientVersion: MinimumVersionForCollab,
-): EditManagerFormatVersion {
-	return brand(EditManagerFormatVersion.vDetachedRoots);
-}
-
 export interface EditManagerCodecOptions {
 	readonly editManagerFormatSelector?: (
 		minVersionForCollab: MinimumVersionForCollab,
@@ -150,8 +141,7 @@ export function makeEditManagerCodecs<TChangeset>(
 			}
 			case unbrand(EditManagerFormatVersion.v3):
 			case unbrand(EditManagerFormatVersion.v4):
-			case unbrand(EditManagerFormatVersion.v6):
-			case unbrand(EditManagerFormatVersion.vDetachedRoots): {
+			case unbrand(EditManagerFormatVersion.v6): {
 				const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
 				return [
 					version,

package/src/shared-tree-core/editManagerCodecsCommons.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 import type { IJsonCodec, IMultiFormatCodec } from "../codec/index.js";
 import type {
@@ -14,14 +14,16 @@ import type {
 	SchemaAndPolicy,
 } from "../core/index.js";
 import { mapIterable, type JsonCompatibleReadOnly, type Mutable } from "../util/index.js";
+
+import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
+import type { SharedBranchSummaryData } from "./editManager.js";
 import type {
 	Commit,
 	EncodedCommit,
 	EncodedSharedBranch,
+	SequenceId,
 	SequencedCommit,
 } from "./editManagerFormatCommons.js";
-import type { SharedBranchSummaryData } from "./editManager.js";
-import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;
@@ -174,9 +176,8 @@ export function decodeSharedBranch<TChangeset>(
 	context: EditManagerEncodingContext,
 	originatorId: SessionId | undefined,
 ): SharedBranchSummaryData<TChangeset> {
-	// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	const trunk: readonly any[] = json.trunk;
+	// TODO: sort out EncodedCommit vs Commit, and make this type check without type assertion.
+	const trunk = json.trunk as readonly (EncodedCommit<JsonCompatibleReadOnly> & SequenceId)[];
 	const data: Mutable<SharedBranchSummaryData<TChangeset>> = {
 		trunk: trunk.map(
 			(commit): SequencedCommit<TChangeset> =>

package/src/shared-tree-core/editManagerCodecsV1toV4.ts

@@ -20,8 +20,8 @@ import type {
 import { type JsonCompatibleReadOnly, JsonCompatibleReadOnlySchema } from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
-import { EncodedEditManager } from "./editManagerFormatV1toV4.js";
 import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
+import { EncodedEditManager } from "./editManagerFormatV1toV4.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;

package/src/shared-tree-core/editManagerCodecsVSharedBranches.ts

@@ -24,11 +24,11 @@ import {
 	type Mutable,
 } from "../util/index.js";
 
+import type { BranchId } from "./branch.js";
 import type { SharedBranchSummaryData, SummaryData } from "./editManager.js";
-import { EncodedEditManager } from "./editManagerFormatVSharedBranches.js";
 import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
 import type { EncodedSharedBranch } from "./editManagerFormatCommons.js";
-import type { BranchId } from "./branch.js";
+import { EncodedEditManager } from "./editManagerFormatVSharedBranches.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;

package/src/shared-tree-core/editManagerFormatCommons.ts

@@ -13,6 +13,7 @@ import {
 	SessionIdSchema,
 } from "../core/index.js";
 import { type Brand, brandedNumberType, strictEnum, type Values } from "../util/index.js";
+
 import type { EncodedBranchId } from "./branch.js";
 
 /**
@@ -166,11 +167,6 @@ export const EditManagerFormatVersion = strictEnum("editManager.FormatVersion",
 	 * Only used for testing shared branches.
 	 */
 	vSharedBranches: "shared-branches|v0.1",
-	/**
-	 * Not yet released.
-	 * Only used for testing detached roots.
-	 */
-	vDetachedRoots: "detached-roots|v0.1",
 });
 export type EditManagerFormatVersion = Values<typeof EditManagerFormatVersion>;
 export const supportedEditManagerFormatVersions: ReadonlySet<EditManagerFormatVersion> =
@@ -179,7 +175,6 @@ export const supportedEditManagerFormatVersions: ReadonlySet<EditManagerFormatVe
 		EditManagerFormatVersion.v4,
 		EditManagerFormatVersion.v6,
 		EditManagerFormatVersion.vSharedBranches,
-		EditManagerFormatVersion.vDetachedRoots,
 	]);
 export const editManagerFormatVersions: ReadonlySet<EditManagerFormatVersion> = new Set(
 	Object.values(EditManagerFormatVersion),

package/src/shared-tree-core/editManagerFormatV1toV4.ts

@@ -7,6 +7,7 @@ import type { SessionId } from "@fluidframework/id-compressor";
 import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 
 import { SessionIdSchema } from "../core/index.js";
+
 import {
 	EditManagerFormatVersion,
 	type EncodedSummarySessionBranch,
@@ -27,8 +28,7 @@ export interface EncodedEditManager<TChangeset> {
 		| typeof EditManagerFormatVersion.v2
 		| typeof EditManagerFormatVersion.v3
 		| typeof EditManagerFormatVersion.v4
-		| typeof EditManagerFormatVersion.v6
-		| typeof EditManagerFormatVersion.vDetachedRoots;
+		| typeof EditManagerFormatVersion.v6;
 }
 
 export const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
@@ -40,7 +40,6 @@ export const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: Change
 				Type.Literal(EditManagerFormatVersion.v3),
 				Type.Literal(EditManagerFormatVersion.v4),
 				Type.Literal(EditManagerFormatVersion.v6),
-				Type.Literal(EditManagerFormatVersion.vDetachedRoots),
 			]),
 			trunk: Type.Array(SequencedCommit(tChange)),
 			branches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),

package/src/shared-tree-core/editManagerFormatVSharedBranches.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 import type { SessionId } from "@fluidframework/id-compressor";
+import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 
-import { EncodedSharedBranch, EditManagerFormatVersion } from "./editManagerFormatCommons.js";
 import { SessionIdSchema } from "../core/index.js";
 
+import { EncodedSharedBranch, EditManagerFormatVersion } from "./editManagerFormatCommons.js";
+
 const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 
 // Many of the return types in this module are intentionally derived, rather than explicitly specified.

package/src/shared-tree-core/index.ts

@@ -25,6 +25,7 @@ export {
 	SharedTreeCore,
 	type ClonableSchemaAndPolicy,
 	type SharedTreeCoreOptionsInternal,
+	type EnrichmentConfig,
 } from "./sharedTreeCore.js";
 export {
 	SharedTreeSummaryFormatVersion,
@@ -39,11 +40,7 @@ export { VersionedSummarizer } from "./versionedSummarizer.js";
 export type { ResubmitMachine } from "./resubmitMachine.js";
 export { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 
-export {
-	type ChangeEnricherReadonlyCheckout,
-	type ChangeEnricherMutableCheckout,
-	NoOpChangeEnricher,
-} from "./changeEnricher.js";
+export { type ChangeEnricher } from "./changeEnricher.js";
 
 export {
 	makeEditManagerCodec,
@@ -51,7 +48,6 @@ export {
 	type EditManagerCodecOptions,
 	clientVersionToEditManagerFormatVersion,
 	editManagerFormatVersionSelectorForSharedBranches,
-	editManagerFormatVersionSelectorForDetachedRootEditing,
 } from "./editManagerCodecs.js";
 export {
 	EditManagerFormatVersion,
@@ -77,7 +73,6 @@ export {
 	getCodecTreeForMessageFormatWithChange,
 	clientVersionToMessageFormatVersion,
 	messageFormatVersionSelectorForSharedBranches,
-	messageFormatVersionSelectorForDetachedRootEditing,
 	makeMessageCodec,
 	type MessageEncodingContext,
 } from "./messageCodecs.js";

package/src/shared-tree-core/messageCodecV1ToV4.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { type TAnySchema, Type } from "@sinclair/typebox";
 import { assert } from "@fluidframework/core-utils/internal";
+import { type TAnySchema, Type } from "@sinclair/typebox";
 
 import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
 import type {
@@ -15,10 +15,10 @@ import type {
 } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
 
-import { Message } from "./messageFormatV1ToV4.js";
-import type { DecodedMessage } from "./messageTypes.js";
 import type { MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
+import { Message } from "./messageFormatV1ToV4.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export function makeV1ToV4CodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,
@@ -34,8 +34,7 @@ export function makeV1ToV4CodecWithVersion<TChangeset>(
 		| typeof MessageFormatVersion.v2
 		| typeof MessageFormatVersion.v3
 		| typeof MessageFormatVersion.v4
-		| typeof MessageFormatVersion.v6
-		| typeof MessageFormatVersion.vDetachedRoots,
+		| typeof MessageFormatVersion.v6,
 ): IJsonCodec<
 	DecodedMessage<TChangeset>,
 	JsonCompatibleReadOnly,

package/src/shared-tree-core/messageCodecVSharedBranches.ts

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 import { type TAnySchema, Type } from "@sinclair/typebox";
 
 import { type ICodecOptions, type IJsonCodec, withSchemaValidation } from "../codec/index.js";
@@ -14,12 +15,11 @@ import type {
 } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
 
-import { Message } from "./messageFormatVSharedBranches.js";
-import type { DecodedMessage } from "./messageTypes.js";
-import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
-import type { MessageEncodingContext } from "./messageCodecs.js";
 import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
+import type { MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
+import { Message } from "./messageFormatVSharedBranches.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export function makeSharedBranchesCodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,

package/src/shared-tree-core/messageCodecs.ts

@@ -4,6 +4,7 @@
  */
 
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import {
 	getConfigForMinVersionForCollab,
@@ -31,11 +32,10 @@ import type {
 } from "../core/index.js";
 import { brand, unbrand, type JsonCompatibleReadOnly } from "../util/index.js";
 
-import type { DecodedMessage } from "./messageTypes.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 import { makeV1ToV4CodecWithVersion } from "./messageCodecV1ToV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./messageCodecVSharedBranches.js";
 import { MessageFormatVersion, messageFormatVersions } from "./messageFormat.js";
+import type { DecodedMessage } from "./messageTypes.js";
 
 export interface MessageEncodingContext {
 	idCompressor: IIdCompressor;
@@ -83,15 +83,6 @@ export function messageFormatVersionSelectorForSharedBranches(
 	return brand(MessageFormatVersion.vSharedBranches);
 }
 
-/**
- * Returns the version that should be used for testing detached root editing.
- */
-export function messageFormatVersionSelectorForDetachedRootEditing(
-	clientVersion: MinimumVersionForCollab,
-): MessageFormatVersion {
-	return brand(MessageFormatVersion.vDetachedRoots);
-}
-
 export function makeMessageCodec<TChangeset>(
 	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
 	dependentChangeFormatVersion: DependentFormatVersion<MessageFormatVersion>,
@@ -154,8 +145,7 @@ export function makeMessageCodecs<TChangeset>(
 			}
 			case unbrand(MessageFormatVersion.v3):
 			case unbrand(MessageFormatVersion.v4):
-			case unbrand(MessageFormatVersion.v6):
-			case unbrand(MessageFormatVersion.vDetachedRoots): {
+			case unbrand(MessageFormatVersion.v6): {
 				const changeCodec = changeCodecs.resolve(
 					dependentChangeFormatVersion.lookup(version),
 				).json;

package/src/shared-tree-core/messageFormat.ts

@@ -57,11 +57,6 @@ export const MessageFormatVersion = strictEnum("MessageFormatVersion", {
 	 * Only used for testing shared branches.
 	 */
 	vSharedBranches: "shared-branches|v0.1",
-	/**
-	 * Not yet released.
-	 * Only used for testing detached roots.
-	 */
-	vDetachedRoots: "detached-roots|v0.1",
 });
 export type MessageFormatVersion = Values<typeof MessageFormatVersion>;
 export const supportedMessageFormatVersions: ReadonlySet<MessageFormatVersion> = new Set([
@@ -69,7 +64,6 @@ export const supportedMessageFormatVersions: ReadonlySet<MessageFormatVersion> =
 	MessageFormatVersion.v4,
 	MessageFormatVersion.v6,
 	MessageFormatVersion.vSharedBranches,
-	MessageFormatVersion.vDetachedRoots,
 ]);
 export const messageFormatVersions: ReadonlySet<MessageFormatVersion> = new Set(
 	Object.values(MessageFormatVersion),

package/src/shared-tree-core/messageFormatV1ToV4.ts

@@ -8,6 +8,7 @@ import { type TSchema, Type } from "@sinclair/typebox";
 
 import { type EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
+
 import { MessageFormatVersion } from "./messageFormat.js";
 
 /**
@@ -38,8 +39,7 @@ export interface Message {
 		| typeof MessageFormatVersion.v2
 		| typeof MessageFormatVersion.v3
 		| typeof MessageFormatVersion.v4
-		| typeof MessageFormatVersion.v6
-		| typeof MessageFormatVersion.vDetachedRoots;
+		| typeof MessageFormatVersion.v6;
 }
 
 // Return type is intentionally derived.
@@ -56,7 +56,6 @@ export const Message = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
 				Type.Literal(MessageFormatVersion.v3),
 				Type.Literal(MessageFormatVersion.v4),
 				Type.Literal(MessageFormatVersion.v6),
-				Type.Literal(MessageFormatVersion.vDetachedRoots),
 			]),
 		),
 	});

package/src/shared-tree-core/messageFormatVSharedBranches.ts

@@ -8,6 +8,7 @@ import { type TSchema, Type } from "@sinclair/typebox";
 
 import { type EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from "../core/index.js";
 import type { JsonCompatibleReadOnly } from "../util/index.js";
+
 import type { EncodedBranchId } from "./branch.js";
 import { MessageFormatVersion } from "./messageFormat.js";
 

package/src/shared-tree-core/messageTypes.ts

@@ -6,6 +6,7 @@
 import type { SessionId } from "@fluidframework/id-compressor";
 
 import type { GraphCommit } from "../core/index.js";
+
 import type { BranchId } from "./branch.js";
 
 export type DecodedMessage<TChange> = CommitMessage<TChange> | BranchMessage;