@fluidframework/tree 2.71.0 → 2.73.0

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

@@ -5,15 +5,22 @@
 
 import type { IIdCompressor } from "@fluidframework/id-compressor";
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import {
+	getConfigForMinVersionForCollab,
+	lowestMinVersionForCollab,
+} from "@fluidframework/runtime-utils/internal";
 
 import {
 	type CodecTree,
+	type CodecWriteOptions,
 	type DependentFormatVersion,
+	FluidClientVersion,
 	type FormatVersion,
 	type ICodecFamily,
 	type ICodecOptions,
 	type IJsonCodec,
 	makeCodecFamily,
+	makeDiscontinuedCodecVersion,
 } from "../codec/index.js";
 import { makeVersionDispatchingCodec } from "../codec/index.js";
 import type {
@@ -22,17 +29,64 @@ import type {
 	RevisionTag,
 	SchemaAndPolicy,
 } from "../core/index.js";
-import { brand, type Brand, type JsonCompatibleReadOnly } from "../util/index.js";
+import { brand, type JsonCompatibleReadOnly } from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
 import { makeV1CodecWithVersion } from "./editManagerCodecsV1toV4.js";
 import { makeV5CodecWithVersion } from "./editManagerCodecsV5.js";
+import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
+import {
+	EditManagerFormatVersion,
+	editManagerFormatVersions,
+} from "./editManagerFormatCommons.js";
 
 export interface EditManagerEncodingContext {
 	idCompressor: IIdCompressor;
 	readonly schema?: SchemaAndPolicy;
 }
 
+/**
+ * Convert a MinimumVersionForCollab to an EditManagerFormatVersion.
+ * @param clientVersion - The MinimumVersionForCollab to convert.
+ * @returns The EditManagerFormatVersion that corresponds to the provided MinimumVersionForCollab.
+ */
+export function clientVersionToEditManagerFormatVersion(
+	clientVersion: MinimumVersionForCollab,
+	writeVersionOverride?: EditManagerFormatVersion,
+): EditManagerFormatVersion {
+	const compatibleVersion: EditManagerFormatVersion = brand(
+		getConfigForMinVersionForCollab(clientVersion, {
+			[lowestMinVersionForCollab]: EditManagerFormatVersion.v3,
+			[FluidClientVersion.v2_43]: EditManagerFormatVersion.v4,
+		}),
+	);
+
+	return writeVersionOverride ?? compatibleVersion;
+}
+
+/**
+ * Returns the version that should be used for testing shared branches.
+ */
+export function editManagerFormatVersionSelectorForSharedBranches(
+	clientVersion: MinimumVersionForCollab,
+): EditManagerFormatVersion {
+	return brand(EditManagerFormatVersion.v5);
+}
+
+export interface EditManagerCodecOptions {
+	readonly editManagerFormatSelector?: (
+		minVersionForCollab: MinimumVersionForCollab,
+	) => EditManagerFormatVersion;
+}
+
+function editManagerFormatVersionFromOptions(
+	options: EditManagerCodecOptions & CodecWriteOptions,
+): EditManagerFormatVersion {
+	const selector =
+		options.editManagerFormatSelector ?? clientVersionToEditManagerFormatVersion;
+	return selector(options.minVersionForCollab);
+}
+
 export function makeEditManagerCodec<TChangeset>(
 	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
 	dependentChangeFormatVersion: DependentFormatVersion<EditManagerFormatVersion>,
@@ -42,8 +96,7 @@ export function makeEditManagerCodec<TChangeset>(
 		EncodedRevisionTag,
 		ChangeEncodingContext
 	>,
-	options: ICodecOptions,
-	writeVersion: number,
+	options: EditManagerCodecOptions & CodecWriteOptions,
 ): IJsonCodec<
 	SummaryData<TChangeset>,
 	JsonCompatibleReadOnly,
@@ -56,6 +109,7 @@ export function makeEditManagerCodec<TChangeset>(
 		revisionTagCodec,
 		options,
 	);
+	const writeVersion = editManagerFormatVersionFromOptions(options);
 	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
 }
 
@@ -79,21 +133,25 @@ export function makeEditManagerCodecs<TChangeset>(
 			EditManagerEncodingContext
 		>,
 	][] = Array.from(editManagerFormatVersions, (version) => {
-		const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
 		switch (version) {
-			case 1:
-			case 2:
-			case 3:
-			case 4:
+			case EditManagerFormatVersion.v1:
+			case EditManagerFormatVersion.v2:
+				return [version, makeDiscontinuedCodecVersion(options, version, "2.73.0")];
+			case EditManagerFormatVersion.v3:
+			case EditManagerFormatVersion.v4: {
+				const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
 				return [
 					version,
 					makeV1CodecWithVersion(changeCodec, revisionTagCodec, options, version),
 				];
-			case 5:
+			}
+			case EditManagerFormatVersion.v5: {
+				const changeCodec = changeCodecs.resolve(dependentChangeFormatVersion.lookup(version));
 				return [
 					version,
 					makeV5CodecWithVersion(changeCodec, revisionTagCodec, options, version),
 				];
+			}
 			default:
 				unreachableCase(version);
 		}
@@ -101,22 +159,13 @@ export function makeEditManagerCodecs<TChangeset>(
 	return makeCodecFamily(registry);
 }
 
-export type EditManagerFormatVersion = Brand<1 | 2 | 3 | 4 | 5, "EditManagerFormatVersion">;
-export const editManagerFormatVersions: ReadonlySet<EditManagerFormatVersion> = new Set([
-	brand(1),
-	brand(2),
-	brand(3),
-	brand(4),
-	brand(5),
-]);
-
 export function getCodecTreeForEditManagerFormatWithChange(
-	version: EditManagerFormatVersion,
+	clientVersion: MinimumVersionForCollab,
 	changeFormat: CodecTree,
 ): CodecTree {
 	return {
 		name: "EditManager",
-		version,
+		version: clientVersionToEditManagerFormatVersion(clientVersion),
 		children: [changeFormat],
 	};
 }

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

@@ -120,4 +120,50 @@ export const EncodedSharedBranch = <ChangeSchema extends TSchema>(tChange: Chang
 		noAdditionalProps,
 	);
 
+/**
+ * The format version for the EditManager.
+ */
+export const EditManagerFormatVersion = {
+	/**
+	 * Introduced and retired prior to 2.0.
+	 * Reading and writing capability removed in 2.73.0.
+	 */
+	v1: 1,
+	/**
+	 * Introduced and retired prior to 2.0.
+	 * Reading and writing capability removed in 2.73.0.
+	 */
+	v2: 2,
+	/**
+	 * Introduced prior to 2.0 and used beyond.
+	 * Reading capability is currently maintained for backwards compatibility, but it could be removed in the future.
+	 * Writing capability needs to be maintained.
+	 */
+	v3: 3,
+	/**
+	 * Was inadvertently released in 2.43.0 (through usages of configuredSharedTree) and remains available.
+	 * Reading capability must be maintained for backwards compatibility.
+	 * Writing capability needs to be maintained.
+	 * @privateRemarks TODO: stop writing this version.
+	 */
+	v4: 4,
+	/**
+	 * Not yet released.
+	 * Only used for testing shared branches.
+	 */
+	v5: 5,
+} as const;
+export type EditManagerFormatVersion = Brand<
+	(typeof EditManagerFormatVersion)[keyof typeof EditManagerFormatVersion],
+	"EditManagerFormatVersion"
+>;
+export const supportedEditManagerFormatVersions: ReadonlySet<EditManagerFormatVersion> =
+	new Set([
+		EditManagerFormatVersion.v3,
+		EditManagerFormatVersion.v4,
+		EditManagerFormatVersion.v5,
+	] as EditManagerFormatVersion[]);
+export const editManagerFormatVersions: ReadonlySet<EditManagerFormatVersion> = new Set(
+	Object.values(EditManagerFormatVersion) as EditManagerFormatVersion[],
+);
 /* eslint-enable @typescript-eslint/explicit-function-return-type */

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

@@ -8,6 +8,7 @@ import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 
 import { SessionIdSchema } from "../core/index.js";
 import {
+	EditManagerFormatVersion,
 	type EncodedSummarySessionBranch,
 	SequencedCommit,
 	SummarySessionBranch,
@@ -21,17 +22,21 @@ const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 export interface EncodedEditManager<TChangeset> {
 	readonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];
 	readonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];
-	readonly version: 1 | 2 | 3 | 4;
+	readonly version:
+		| typeof EditManagerFormatVersion.v1
+		| typeof EditManagerFormatVersion.v2
+		| typeof EditManagerFormatVersion.v3
+		| typeof EditManagerFormatVersion.v4;
 }
 
 export const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
 	Type.Object(
 		{
 			version: Type.Union([
-				Type.Literal(1),
-				Type.Literal(2),
-				Type.Literal(3),
-				Type.Literal(4),
+				Type.Literal(EditManagerFormatVersion.v1),
+				Type.Literal(EditManagerFormatVersion.v2),
+				Type.Literal(EditManagerFormatVersion.v3),
+				Type.Literal(EditManagerFormatVersion.v4),
 			]),
 			trunk: Type.Array(SequencedCommit(tChange)),
 			branches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),

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

@@ -6,7 +6,7 @@
 import { type ObjectOptions, type TSchema, Type } from "@sinclair/typebox";
 import type { SessionId } from "@fluidframework/id-compressor";
 
-import { EncodedSharedBranch } from "./editManagerFormatCommons.js";
+import { EncodedSharedBranch, EditManagerFormatVersion } from "./editManagerFormatCommons.js";
 import { SessionIdSchema } from "../core/index.js";
 
 const noAdditionalProps: ObjectOptions = { additionalProperties: false };
@@ -15,7 +15,7 @@ const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 
 export interface EncodedEditManager<TChangeset> {
-	readonly version: 5;
+	readonly version: typeof EditManagerFormatVersion.v5;
 	readonly originator: SessionId;
 	readonly main: EncodedSharedBranch<TChangeset>;
 	readonly branches?: readonly EncodedSharedBranch<TChangeset>[];
@@ -24,7 +24,7 @@ export interface EncodedEditManager<TChangeset> {
 export const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
 	Type.Object(
 		{
-			version: Type.Union([Type.Literal(5)]),
+			version: Type.Union([Type.Literal(EditManagerFormatVersion.v5)]),
 			originator: SessionIdSchema,
 			main: EncodedSharedBranch(tChange),
 			branches: Type.Optional(Type.Array(EncodedSharedBranch(tChange))),

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

@@ -22,12 +22,12 @@ export {
 } from "./transaction.js";
 
 export {
-	type ExplicitCoreCodecVersions,
 	SharedTreeCore,
 	type Summarizable,
 	type SummaryElementParser,
 	type SummaryElementStringifier,
 	type ClonableSchemaAndPolicy,
+	type SharedTreeCoreOptionsInternal as SharedTreCoreOptionsInternal,
 } from "./sharedTreeCore.js";
 
 export type { ResubmitMachine } from "./resubmitMachine.js";
@@ -42,9 +42,14 @@ export {
 export {
 	makeEditManagerCodec,
 	getCodecTreeForEditManagerFormatWithChange,
-	type EditManagerFormatVersion,
-	editManagerFormatVersions,
+	type EditManagerCodecOptions,
+	clientVersionToEditManagerFormatVersion,
+	editManagerFormatVersionSelectorForSharedBranches,
 } from "./editManagerCodecs.js";
+export {
+	EditManagerFormatVersion,
+	supportedEditManagerFormatVersions,
+} from "./editManagerFormatCommons.js";
 export { EditManagerSummarizer } from "./editManagerSummarizer.js";
 export {
 	EditManager,
@@ -61,7 +66,12 @@ export type {
 } from "./editManagerFormatCommons.js";
 
 export {
-	type MessageFormatVersion,
-	messageFormatVersions,
 	getCodecTreeForMessageFormatWithChange,
+	clientVersionToMessageFormatVersion,
+	messageFormatVersionSelectorForSharedBranches,
 } from "./messageCodecs.js";
+export {
+	MessageFormatVersion,
+	messageFormatVersions,
+	supportedMessageFormatVersions,
+} from "./messageFormat.js";

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

@@ -18,6 +18,7 @@ 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";
 
 export function makeV1ToV4CodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,
@@ -28,7 +29,11 @@ export function makeV1ToV4CodecWithVersion<TChangeset>(
 		ChangeEncodingContext
 	>,
 	options: ICodecOptions,
-	version: 1 | 2 | 3 | 4,
+	version:
+		| typeof MessageFormatVersion.v1
+		| typeof MessageFormatVersion.v2
+		| typeof MessageFormatVersion.v3
+		| typeof MessageFormatVersion.v4,
 ): IJsonCodec<
 	DecodedMessage<TChangeset>,
 	JsonCompatibleReadOnly,

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

@@ -19,6 +19,7 @@ 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 { MessageFormatVersion } from "./messageFormat.js";
 
 export function makeV5CodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,
@@ -29,7 +30,7 @@ export function makeV5CodecWithVersion<TChangeset>(
 		ChangeEncodingContext
 	>,
 	options: ICodecOptions,
-	version: 5,
+	version: typeof MessageFormatVersion.v5,
 ): IJsonCodec<
 	DecodedMessage<TChangeset>,
 	JsonCompatibleReadOnly,

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

@@ -4,14 +4,23 @@
  */
 
 import { unreachableCase } from "@fluidframework/core-utils/internal";
+import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
+import {
+	getConfigForMinVersionForCollab,
+	lowestMinVersionForCollab,
+} from "@fluidframework/runtime-utils/internal";
+
 import {
 	type CodecTree,
+	type CodecWriteOptions,
 	type DependentFormatVersion,
+	FluidClientVersion,
 	type FormatVersion,
 	type ICodecFamily,
 	type ICodecOptions,
 	type IJsonCodec,
 	makeCodecFamily,
+	makeDiscontinuedCodecVersion,
 	makeVersionDispatchingCodec,
 } from "../codec/index.js";
 import type {
@@ -20,18 +29,59 @@ import type {
 	RevisionTag,
 	SchemaAndPolicy,
 } from "../core/index.js";
-import { brand, type Brand, type JsonCompatibleReadOnly } from "../util/index.js";
+import { brand, 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 { makeV5CodecWithVersion } from "./messageCodecV5.js";
+import { MessageFormatVersion, messageFormatVersions } from "./messageFormat.js";
 
 export interface MessageEncodingContext {
 	idCompressor: IIdCompressor;
 	schema?: SchemaAndPolicy;
 }
 
+/**
+ * Convert a MinimumVersionForCollab to a MessageFormatVersion.
+ * @param clientVersion - The MinimumVersionForCollab to convert.
+ * @returns The MessageFormatVersion that corresponds to the provided MinimumVersionForCollab.
+ */
+export function clientVersionToMessageFormatVersion(
+	clientVersion: MinimumVersionForCollab,
+	writeVersionOverride?: MessageFormatVersion,
+): MessageFormatVersion {
+	const compatibleVersion: MessageFormatVersion = brand(
+		getConfigForMinVersionForCollab(clientVersion, {
+			[lowestMinVersionForCollab]: MessageFormatVersion.v3,
+			[FluidClientVersion.v2_43]: MessageFormatVersion.v4,
+		}),
+	);
+	return writeVersionOverride ?? compatibleVersion;
+}
+
+export interface MessageCodecOptions {
+	readonly messageFormatSelector?: (
+		minVersionForCollab: MinimumVersionForCollab,
+	) => MessageFormatVersion;
+}
+
+function messageFormatVersionFromOptions(
+	options: MessageCodecOptions & CodecWriteOptions,
+): MessageFormatVersion {
+	const selector = options.messageFormatSelector ?? clientVersionToMessageFormatVersion;
+	return selector(options.minVersionForCollab);
+}
+
+/**
+ * Returns the version that should be used for testing shared branches.
+ */
+export function messageFormatVersionSelectorForSharedBranches(
+	clientVersion: MinimumVersionForCollab,
+): MessageFormatVersion {
+	return brand(MessageFormatVersion.v5);
+}
+
 export function makeMessageCodec<TChangeset>(
 	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
 	dependentChangeFormatVersion: DependentFormatVersion<MessageFormatVersion>,
@@ -41,8 +91,7 @@ export function makeMessageCodec<TChangeset>(
 		EncodedRevisionTag,
 		ChangeEncodingContext
 	>,
-	options: ICodecOptions,
-	writeVersion: MessageFormatVersion = brand(1),
+	options: MessageCodecOptions & CodecWriteOptions,
 ): IJsonCodec<
 	DecodedMessage<TChangeset>,
 	JsonCompatibleReadOnly,
@@ -55,6 +104,7 @@ export function makeMessageCodec<TChangeset>(
 		revisionTagCodec,
 		options,
 	);
+	const writeVersion = messageFormatVersionFromOptions(options);
 	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
 }
 
@@ -81,24 +131,36 @@ export function makeMessageCodecs<TChangeset>(
 			MessageEncodingContext
 		>,
 	][] = Array.from(messageFormatVersions).map((version) => {
-		const changeCodec = changeCodecs.resolve(
-			dependentChangeFormatVersion.lookup(version),
-		).json;
 		switch (version) {
-			case undefined:
-			case 1:
-			case 2:
-			case 3:
-			case 4:
+			case MessageFormatVersion.undefined:
+			case MessageFormatVersion.v1:
+			case MessageFormatVersion.v2: {
+				const versionOrUndefined =
+					version === MessageFormatVersion.undefined ? undefined : version;
+				return [
+					versionOrUndefined,
+					makeDiscontinuedCodecVersion(options, versionOrUndefined, "2.73.0"),
+				];
+			}
+			case MessageFormatVersion.v3:
+			case MessageFormatVersion.v4: {
+				const changeCodec = changeCodecs.resolve(
+					dependentChangeFormatVersion.lookup(version),
+				).json;
 				return [
 					version,
-					makeV1ToV4CodecWithVersion(changeCodec, revisionTagCodec, options, version ?? 1),
+					makeV1ToV4CodecWithVersion(changeCodec, revisionTagCodec, options, version),
 				];
-			case 5:
+			}
+			case MessageFormatVersion.v5: {
+				const changeCodec = changeCodecs.resolve(
+					dependentChangeFormatVersion.lookup(version),
+				).json;
 				return [
 					version,
 					makeV5CodecWithVersion(changeCodec, revisionTagCodec, options, version),
 				];
+			}
 			default:
 				unreachableCase(version);
 		}
@@ -106,26 +168,13 @@ export function makeMessageCodecs<TChangeset>(
 	return makeCodecFamily(registry);
 }
 
-export type MessageFormatVersion = Brand<
-	undefined | 1 | 2 | 3 | 4 | 5,
-	"MessageFormatVersion"
->;
-export const messageFormatVersions: ReadonlySet<MessageFormatVersion> = new Set([
-	brand(undefined),
-	brand(1),
-	brand(2),
-	brand(3),
-	brand(4),
-	brand(5),
-]);
-
 export function getCodecTreeForMessageFormatWithChange(
-	version: MessageFormatVersion,
+	clientVersion: MinimumVersionForCollab,
 	changeFormat: CodecTree,
 ): CodecTree {
 	return {
 		name: "Message",
-		version,
+		version: clientVersionToMessageFormatVersion(clientVersion),
 		children: [changeFormat],
 	};
 }

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

@@ -0,0 +1,58 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { Brand } from "../util/index.js";
+
+/**
+ * The format version for the message.
+ */
+export const MessageFormatVersion = {
+	/**
+	 * NOTE: this is written as `undefined` rather than `0` in the wire format.
+	 * Introduced and retired prior to 2.0.
+	 * Reading and writing capability removed in 2.73.0.
+	 */
+	undefined: 0,
+	/**
+	 * Introduced and retired prior to 2.0.
+	 * Reading and writing capability removed in 2.73.0.
+	 */
+	v1: 1,
+	/**
+	 * Introduced and retired prior to 2.0.
+	 * Reading and writing capability removed in 2.73.0.
+	 */
+	v2: 2,
+	/**
+	 * Introduced prior to 2.0 and used beyond.
+	 * Reading capability is currently maintained for backwards compatibility, but it could be removed in the future.
+	 * Writing capability needs to be maintained.
+	 */
+	v3: 3,
+	/**
+	 * Was inadvertently released in 2.43.0 (through usages of configuredSharedTree) and remains available.
+	 * Reading capability must be maintained for backwards compatibility.
+	 * Writing capability needs to be maintained.
+	 * @privateRemarks TODO: stop writing this version.
+	 */
+	v4: 4,
+	/**
+	 * Not yet released.
+	 * Only used for testing shared branches.
+	 */
+	v5: 5,
+} as const;
+export type MessageFormatVersion = Brand<
+	(typeof MessageFormatVersion)[keyof typeof MessageFormatVersion],
+	"MessageFormatVersion"
+>;
+export const supportedMessageFormatVersions: ReadonlySet<MessageFormatVersion> = new Set([
+	MessageFormatVersion.v3,
+	MessageFormatVersion.v4,
+	MessageFormatVersion.v5,
+] as MessageFormatVersion[]);
+export const messageFormatVersions: ReadonlySet<MessageFormatVersion> = new Set(
+	Object.values(MessageFormatVersion) as MessageFormatVersion[],
+);

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

@@ -25,7 +25,7 @@ import type {
 } from "@fluidframework/shared-object-base/internal";
 import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
 
-import type { DependentFormatVersion, ICodecOptions, IJsonCodec } from "../codec/index.js";
+import type { CodecWriteOptions, DependentFormatVersion, IJsonCodec } from "../codec/index.js";
 import {
 	type ChangeFamily,
 	type ChangeFamilyEditor,
@@ -51,29 +51,30 @@ import { BranchCommitEnricher } from "./branchCommitEnricher.js";
 import { type ChangeEnricherReadonlyCheckout, NoOpChangeEnricher } from "./changeEnricher.js";
 import { DefaultResubmitMachine } from "./defaultResubmitMachine.js";
 import { EditManager, minimumPossibleSequenceNumber } from "./editManager.js";
-import { makeEditManagerCodec, type EditManagerFormatVersion } from "./editManagerCodecs.js";
-import type { SeqNumber } from "./editManagerFormatCommons.js";
+import { makeEditManagerCodec, type EditManagerCodecOptions } from "./editManagerCodecs.js";
+import type { EditManagerFormatVersion, SeqNumber } from "./editManagerFormatCommons.js";
 import { EditManagerSummarizer } from "./editManagerSummarizer.js";
 import {
+	type MessageCodecOptions,
 	type MessageEncodingContext,
-	type MessageFormatVersion,
 	makeMessageCodec,
 } from "./messageCodecs.js";
 import type { DecodedMessage } from "./messageTypes.js";
 import type { ResubmitMachine } from "./resubmitMachine.js";
+import type { MessageFormatVersion } from "./messageFormat.js";
 
 // TODO: Organize this to be adjacent to persisted types.
 const summarizablesTreeKey = "indexes";
 
-export interface ExplicitCoreCodecVersions {
-	editManager: EditManagerFormatVersion;
-	message: MessageFormatVersion;
-}
-
 export interface ClonableSchemaAndPolicy extends SchemaAndPolicy {
 	schema: TreeStoredSchemaRepository;
 }
 
+export interface SharedTreeCoreOptionsInternal
+	extends CodecWriteOptions,
+		EditManagerCodecOptions,
+		MessageCodecOptions {}
+
 /**
  * Generic shared tree, which needs to be configured with indexes, field kinds and other configuration.
  */
@@ -128,8 +129,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 		logger: ITelemetryBaseLogger | undefined,
 		summarizables: readonly Summarizable[],
 		protected readonly changeFamily: ChangeFamily<TEditor, TChange>,
-		options: ICodecOptions,
-		formatOptions: ExplicitCoreCodecVersions,
+		options: SharedTreeCoreOptionsInternal,
 		changeFormatVersionForEditManager: DependentFormatVersion<EditManagerFormatVersion>,
 		changeFormatVersionForMessage: DependentFormatVersion<MessageFormatVersion>,
 		protected readonly idCompressor: IIdCompressor,
@@ -172,7 +172,6 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			changeFormatVersionForEditManager,
 			revisionTagCodec,
 			options,
-			formatOptions.editManager,
 		);
 		this.summarizables = [
 			new EditManagerSummarizer(
@@ -193,7 +192,6 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange>
 			changeFormatVersionForMessage,
 			new RevisionTagCodec(idCompressor),
 			options,
-			formatOptions.message,
 		);
 
 		this.registerSharedBranchForEditing(