@fluidframework/tree 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0

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

@@ -4,32 +4,70 @@
  */
 
 import {
+	type ICodecFamily,
 	ICodecOptions,
 	IJsonCodec,
 	IMultiFormatCodec,
-	makeVersionedValidatedCodec,
+	makeCodecFamily,
+	withSchemaValidation,
 } from "../codec/index.js";
-import { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
+import { makeVersionDispatchingCodec } from "../codec/index.js";
+import {
+	ChangeEncodingContext,
+	EncodedRevisionTag,
+	RevisionTag,
+	SchemaAndPolicy,
+} from "../core/index.js";
 import {
 	JsonCompatibleReadOnly,
 	JsonCompatibleReadOnlySchema,
 	mapIterable,
 } from "../util/index.js";
+
 import { SummaryData } from "./editManager.js";
-import {
-	Commit,
-	EncodedCommit,
-	EncodedEditManager,
-	SequencedCommit,
-	version,
-} from "./editManagerFormat.js";
+import { Commit, EncodedCommit, EncodedEditManager, SequencedCommit } from "./editManagerFormat.js";
 
 export interface EditManagerEncodingContext {
 	readonly schema?: SchemaAndPolicy;
 }
 
 export function makeEditManagerCodec<TChangeset>(
+	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
+	revisionTagCodec: IJsonCodec<
+		RevisionTag,
+		EncodedRevisionTag,
+		EncodedRevisionTag,
+		ChangeEncodingContext
+	>,
+	options: ICodecOptions,
+	writeVersion: number,
+): IJsonCodec<
+	SummaryData<TChangeset>,
+	JsonCompatibleReadOnly,
+	JsonCompatibleReadOnly,
+	EditManagerEncodingContext
+> {
+	const family = makeEditManagerCodecs(changeCodecs, revisionTagCodec, options);
+	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
+}
+
+export function makeEditManagerCodecs<TChangeset>(
+	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
+	revisionTagCodec: IJsonCodec<
+		RevisionTag,
+		EncodedRevisionTag,
+		EncodedRevisionTag,
+		ChangeEncodingContext
+	>,
+	options: ICodecOptions,
+): ICodecFamily<SummaryData<TChangeset>, EditManagerEncodingContext> {
+	return makeCodecFamily([
+		[1, makeV1CodecWithVersion(changeCodecs.resolve(1), revisionTagCodec, options, 1)],
+		[2, makeV1CodecWithVersion(changeCodecs.resolve(2), revisionTagCodec, options, 2)],
+	]);
+}
+
+function makeV1CodecWithVersion<TChangeset>(
 	changeCodec: IMultiFormatCodec<
 		TChangeset,
 		JsonCompatibleReadOnly,
@@ -43,11 +81,12 @@ export function makeEditManagerCodec<TChangeset>(
 		ChangeEncodingContext
 	>,
 	options: ICodecOptions,
+	version: EncodedEditManager<TChangeset>["version"],
 ): IJsonCodec<
 	SummaryData<TChangeset>,
 	JsonCompatibleReadOnly,
 	JsonCompatibleReadOnly,
-	ChangeEncodingContext
+	EditManagerEncodingContext
 > {
 	const format = EncodedEditManager(
 		changeCodec.json.encodedSchema ?? JsonCompatibleReadOnlySchema,
@@ -76,62 +115,71 @@ export function makeEditManagerCodec<TChangeset>(
 		EncodedEditManager<TChangeset>,
 		EncodedEditManager<TChangeset>,
 		EditManagerEncodingContext
-	> = makeVersionedValidatedCodec(options, new Set([version]), format, {
-		encode: (data, context: EditManagerEncodingContext) => {
-			const json: EncodedEditManager<TChangeset> = {
-				trunk: data.trunk.map((commit) =>
-					encodeCommit(commit, {
-						originatorId: commit.sessionId,
-						schema: context.schema,
-					}),
-				),
-				branches: Array.from(data.peerLocalBranches.entries(), ([sessionId, branch]) => [
-					sessionId,
-					{
-						base: revisionTagCodec.encode(branch.base, {
-							originatorId: sessionId,
+	> = withSchemaValidation(
+		format,
+		{
+			encode: (data, context: EditManagerEncodingContext) => {
+				const json: EncodedEditManager<TChangeset> = {
+					trunk: data.trunk.map((commit) =>
+						encodeCommit(commit, {
+							originatorId: commit.sessionId,
+							schema: context.schema,
 						}),
-						commits: branch.commits.map((commit) =>
-							encodeCommit(commit, {
+					),
+					branches: Array.from(
+						data.peerLocalBranches.entries(),
+						([sessionId, branch]) => [
+							sessionId,
+							{
+								base: revisionTagCodec.encode(branch.base, {
+									originatorId: sessionId,
+								}),
+								commits: branch.commits.map((commit) =>
+									encodeCommit(commit, {
+										originatorId: commit.sessionId,
+										schema: context.schema,
+									}),
+								),
+							},
+						],
+					),
+					version,
+				};
+				return json;
+			},
+			decode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {
+				// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.
+				const trunk: readonly any[] = json.trunk;
+				return {
+					trunk: trunk.map(
+						(commit): SequencedCommit<TChangeset> =>
+							// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+							decodeCommit(commit, {
 								originatorId: commit.sessionId,
-								schema: context.schema,
 							}),
-						),
-					},
-				]),
-				version,
-			};
-			return json;
-		},
-		decode: (json: EncodedEditManager<TChangeset>): SummaryData<TChangeset> => {
-			// TODO: sort out EncodedCommit vs Commit, and make this type check without `any`.
-			const trunk: readonly any[] = json.trunk;
-			return {
-				trunk: trunk.map(
-					(commit): SequencedCommit<TChangeset> =>
-						// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-						decodeCommit(commit, {
-							originatorId: commit.sessionId,
-						}),
-				),
-				peerLocalBranches: new Map(
-					mapIterable(json.branches, ([sessionId, branch]) => [
-						sessionId,
-						{
-							base: revisionTagCodec.decode(branch.base, { originatorId: sessionId }),
-							commits: branch.commits.map((commit) =>
-								// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
-								decodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {
-									originatorId: commit.sessionId,
+					),
+					peerLocalBranches: new Map(
+						mapIterable(json.branches, ([sessionId, branch]) => [
+							sessionId,
+							{
+								base: revisionTagCodec.decode(branch.base, {
+									originatorId: sessionId,
 								}),
-							),
-						},
-					]),
-				),
-			};
+								commits: branch.commits.map((commit) =>
+									// TODO: sort out EncodedCommit vs Commit, and make this type check without `as`.
+									decodeCommit(commit as EncodedCommit<JsonCompatibleReadOnly>, {
+										originatorId: commit.sessionId,
+									}),
+								),
+							},
+						]),
+					),
+				};
+			},
 		},
-	});
+		options.jsonValidator,
+	);
 	// TODO: makeVersionedValidatedCodec and withSchemaValidation should allow the codec to decode JsonCompatibleReadOnly, or Versioned or something like that,
 	// and not leak the internal encoded format in the API surface.
 	// Fixing that would remove the need for this cast.
@@ -139,6 +187,6 @@ export function makeEditManagerCodec<TChangeset>(
 		SummaryData<TChangeset>,
 		JsonCompatibleReadOnly,
 		JsonCompatibleReadOnly,
-		ChangeEncodingContext
+		EditManagerEncodingContext
 	>;
 }

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

@@ -3,15 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { TSchema, Type, ObjectOptions, Static } from "@sinclair/typebox";
 import { SessionId } from "@fluidframework/id-compressor";
-import { Brand, brandedNumberType } from "../util/index.js";
+import { ObjectOptions, Static, TSchema, Type } from "@sinclair/typebox";
+
 import {
-	SessionIdSchema,
+	EncodedRevisionTag,
 	RevisionTag,
 	RevisionTagSchema,
-	EncodedRevisionTag,
+	SessionIdSchema,
 } from "../core/index.js";
+import { Brand, brandedNumberType } from "../util/index.js";
 
 /**
  * Contains a single change to the `SharedTree` and associated metadata.
@@ -93,15 +94,13 @@ const SummarySessionBranch = <ChangeSchema extends TSchema>(tChange: ChangeSchem
 export interface EncodedEditManager<TChangeset> {
 	readonly trunk: readonly Readonly<SequencedCommit<TChangeset>>[];
 	readonly branches: readonly [SessionId, Readonly<EncodedSummarySessionBranch<TChangeset>>][];
-	readonly version: typeof version;
+	readonly version: 1 | 2;
 }
 
-export const version = 1.0;
-
 export const EncodedEditManager = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
 	Type.Object(
 		{
-			version: Type.Literal(version),
+			version: Type.Union([Type.Literal(1), Type.Literal(2)]),
 			trunk: Type.Array(SequencedCommit(tChange)),
 			branches: Type.Array(Type.Tuple([SessionIdSchema, SummarySessionBranch(tChange)])),
 		},

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

@@ -4,67 +4,45 @@
  */
 
 import { bufferToString } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import {
 	IGarbageCollectionData,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { createSingleBlobSummary } from "@fluidframework/shared-object-base";
-import { ICodecOptions, IJsonCodec } from "../codec/index.js";
-import {
-	ChangeEncodingContext,
-	ChangeFamily,
-	ChangeFamilyEditor,
-	EncodedRevisionTag,
-	RevisionTag,
-} from "../core/index.js";
+import { createSingleBlobSummary } from "@fluidframework/shared-object-base/internal";
+
+import { IJsonCodec } from "../codec/index.js";
+import { ChangeFamily, ChangeFamilyEditor, SchemaAndPolicy } from "../core/index.js";
 import { JsonCompatibleReadOnly } from "../util/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
-import { Summarizable, SummaryElementParser, SummaryElementStringifier } from "./sharedTreeCore.js";
+
 import { EditManager, SummaryData } from "./editManager.js";
-import { EditManagerEncodingContext, makeEditManagerCodec } from "./editManagerCodecs.js";
+import { EditManagerEncodingContext } from "./editManagerCodecs.js";
+import { Summarizable, SummaryElementParser, SummaryElementStringifier } from "./sharedTreeCore.js";
 
 const stringKey = "String";
 
-const formatVersion = 0;
-
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
 export class EditManagerSummarizer<TChangeset> implements Summarizable {
 	public readonly key = "EditManager";
 
-	// Note: since there is only one format, this can just be cached on the class.
-	// With more write formats active, it may make sense to keep around the "usual" format codec
-	// (the one for the current persisted configuration) and resolve codecs for different versions
-	// as necessary (e.g. an upgrade op came in, or the configuration changed within the collab window
-	// and an op needs to be interpreted which isn't written with the current configuration).
-	private readonly codec: IJsonCodec<
-		SummaryData<TChangeset>,
-		JsonCompatibleReadOnly,
-		JsonCompatibleReadOnly,
-		EditManagerEncodingContext
-	>;
 	public constructor(
 		private readonly editManager: EditManager<
 			ChangeFamilyEditor,
 			TChangeset,
 			ChangeFamily<ChangeFamilyEditor, TChangeset>
 		>,
-		revisionTagCodec: IJsonCodec<
-			RevisionTag,
-			EncodedRevisionTag,
-			EncodedRevisionTag,
-			ChangeEncodingContext
+		private readonly codec: IJsonCodec<
+			SummaryData<TChangeset>,
+			JsonCompatibleReadOnly,
+			JsonCompatibleReadOnly,
+			EditManagerEncodingContext
 		>,
-		options: ICodecOptions,
 		private readonly schemaAndPolicy?: SchemaAndPolicy,
-	) {
-		const changesetCodec = this.editManager.changeFamily.codecs.resolve(formatVersion);
-		this.codec = makeEditManagerCodec(changesetCodec, revisionTagCodec, options);
-	}
+	) {}
 
 	public getAttachSummary(
 		stringify: SummaryElementStringifier,

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

@@ -2,6 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+
 export {
 	onForkTransitive,
 	SharedTreeBranch,
@@ -11,6 +12,7 @@ export {
 } from "./branch.js";
 
 export {
+	ExplicitCoreCodecVersions,
 	SharedTreeCore,
 	Summarizable,
 	SummaryElementParser,

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

@@ -4,23 +4,79 @@
  */
 
 import { TAnySchema, Type } from "@sinclair/typebox";
-import { JsonCompatibleReadOnly } from "../util/index.js";
-import { ICodecOptions, IJsonCodec, withSchemaValidation } from "../codec/index.js";
+
+import {
+	type ICodecFamily,
+	ICodecOptions,
+	IJsonCodec,
+	makeCodecFamily,
+	makeVersionDispatchingCodec,
+	withSchemaValidation,
+} from "../codec/index.js";
 import {
 	ChangeEncodingContext,
 	ChangeFamilyCodec,
 	EncodedRevisionTag,
 	RevisionTag,
+	SchemaAndPolicy,
 } from "../core/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
-import { DecodedMessage } from "./messageTypes.js";
+import { JsonCompatibleReadOnly } from "../util/index.js";
+
 import { Message } from "./messageFormat.js";
+import { DecodedMessage } from "./messageTypes.js";
 
 export interface MessageEncodingContext {
 	schema?: SchemaAndPolicy;
 }
 
 export function makeMessageCodec<TChangeset>(
+	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
+	revisionTagCodec: IJsonCodec<
+		RevisionTag,
+		EncodedRevisionTag,
+		EncodedRevisionTag,
+		ChangeEncodingContext
+	>,
+	options: ICodecOptions,
+	writeVersion: number,
+): IJsonCodec<
+	DecodedMessage<TChangeset>,
+	JsonCompatibleReadOnly,
+	JsonCompatibleReadOnly,
+	MessageEncodingContext
+> {
+	const family = makeMessageCodecs(changeCodecs, revisionTagCodec, options);
+	return makeVersionDispatchingCodec(family, { ...options, writeVersion });
+}
+
+/**
+ * @privateRemarks - Exported for testing.
+ */
+export function makeMessageCodecs<TChangeset>(
+	changeCodecs: ICodecFamily<TChangeset, ChangeEncodingContext>,
+	revisionTagCodec: IJsonCodec<
+		RevisionTag,
+		EncodedRevisionTag,
+		EncodedRevisionTag,
+		ChangeEncodingContext
+	>,
+	options: ICodecOptions,
+): ICodecFamily<DecodedMessage<TChangeset>, MessageEncodingContext> {
+	const v1Codec = makeV1CodecWithVersion(
+		changeCodecs.resolve(1).json,
+		revisionTagCodec,
+		options,
+		1,
+	);
+	return makeCodecFamily([
+		// Back-compat: messages weren't always written with an explicit version field.
+		[undefined, v1Codec],
+		[1, v1Codec],
+		[2, makeV1CodecWithVersion(changeCodecs.resolve(2).json, revisionTagCodec, options, 2)],
+	]);
+}
+
+function makeV1CodecWithVersion<TChangeset>(
 	changeCodec: ChangeFamilyCodec<TChangeset>,
 	revisionTagCodec: IJsonCodec<
 		RevisionTag,
@@ -29,13 +85,13 @@ export function makeMessageCodec<TChangeset>(
 		ChangeEncodingContext
 	>,
 	options: ICodecOptions,
+	version: 1 | 2,
 ): IJsonCodec<
 	DecodedMessage<TChangeset>,
 	JsonCompatibleReadOnly,
 	JsonCompatibleReadOnly,
 	MessageEncodingContext
 > {
-	// TODO: consider adding version and using makeVersionedValidatedCodec
 	return withSchemaValidation<
 		DecodedMessage<TChangeset>,
 		TAnySchema,
@@ -56,6 +112,7 @@ export function makeMessageCodec<TChangeset>(
 						originatorId,
 						schema: context.schema,
 					}),
+					version,
 				};
 				return message as unknown as JsonCompatibleReadOnly;
 			},

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

@@ -3,10 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { Type, TSchema } from "@sinclair/typebox";
 import { SessionId } from "@fluidframework/id-compressor";
-import { JsonCompatibleReadOnly } from "../util/index.js";
+import { TSchema, Type } from "@sinclair/typebox";
+
 import { EncodedRevisionTag, RevisionTagSchema, SessionIdSchema } from "../core/index.js";
+import { JsonCompatibleReadOnly } from "../util/index.js";
 
 /**
  * The format of messages that SharedTree sends and receives.
@@ -24,6 +25,14 @@ export interface Message {
 	 * The changeset to be applied.
 	 */
 	readonly changeset: JsonCompatibleReadOnly;
+
+	/**
+	 * The version of the message. This controls how the message is encoded.
+	 *
+	 * This was not set historically and was added before making any breaking changes to the format.
+	 * For that reason, absence of a 'version' field is synonymous with version 1.
+	 */
+	readonly version?: number;
 }
 
 export const Message = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
@@ -31,4 +40,5 @@ export const Message = <ChangeSchema extends TSchema>(tChange: ChangeSchema) =>
 		revision: RevisionTagSchema,
 		originatorId: SessionIdSchema,
 		changeset: tChange,
+		version: Type.Optional(Type.Number()),
 	});

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

@@ -4,6 +4,7 @@
  */
 
 import { SessionId } from "@fluidframework/id-compressor";
+
 import { GraphCommit } from "../core/index.js";
 
 export interface DecodedMessage<TChange> {

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

@@ -4,6 +4,7 @@
  */
 
 import { brand } from "../util/index.js";
+
 import { SequenceId } from "./editManagerFormat.js";
 
 export const sequenceIdComparator = (a: SequenceId, b: SequenceId) =>

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
 	IChannelAttributes,
 	IChannelStorageService,
@@ -12,29 +12,42 @@ import {
 import { IIdCompressor } from "@fluidframework/id-compressor";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
-	ITelemetryContext,
-	ISummaryTreeWithStats,
-	IGarbageCollectionData,
 	IExperimentalIncrementalSummaryContext,
+	IGarbageCollectionData,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
-import { IFluidSerializer, SharedObject } from "@fluidframework/shared-object-base";
+import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
+import { IFluidSerializer } from "@fluidframework/shared-object-base";
+import { SharedObject } from "@fluidframework/shared-object-base/internal";
+
 import { ICodecOptions, IJsonCodec } from "../codec/index.js";
-import { ChangeFamily, ChangeFamilyEditor, GraphCommit, RevisionTagCodec } from "../core/index.js";
-import { brand, JsonCompatibleReadOnly } from "../util/index.js";
-import { SchemaAndPolicy } from "../feature-libraries/index.js";
+import {
+	ChangeFamily,
+	ChangeFamilyEditor,
+	GraphCommit,
+	RevisionTag,
+	RevisionTagCodec,
+	SchemaAndPolicy,
+} from "../core/index.js";
+import { JsonCompatibleReadOnly, brand } from "../util/index.js";
+
 import { SharedTreeBranch, getChangeReplaceType } from "./branch.js";
-import { EditManagerSummarizer } from "./editManagerSummarizer.js";
 import { EditManager, minimumPossibleSequenceNumber } from "./editManager.js";
+import { makeEditManagerCodec } from "./editManagerCodecs.js";
 import { SeqNumber } from "./editManagerFormat.js";
-import { DecodedMessage } from "./messageTypes.js";
+import { EditManagerSummarizer } from "./editManagerSummarizer.js";
 import { MessageEncodingContext, makeMessageCodec } from "./messageCodecs.js";
+import { DecodedMessage } from "./messageTypes.js";
 
-// TODO: How should the format version be determined?
-const formatVersion = 0;
 // TODO: Organize this to be adjacent to persisted types.
 const summarizablesTreeKey = "indexes";
 
+export interface ExplicitCoreCodecVersions {
+	editManager: number;
+	message: number;
+}
+
 /**
  * Generic shared tree, which needs to be configured with indexes, field kinds and a history policy to be used.
  *
@@ -80,6 +93,8 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange> extends
 
 	private readonly schemaAndPolicy: SchemaAndPolicy;
 
+	protected readonly mintRevisionTag: () => RevisionTag;
+
 	/**
 	 * @param summarizables - Summarizers for all indexes used by this tree
 	 * @param changeFamily - The change family
@@ -93,6 +108,7 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange> extends
 		summarizables: readonly Summarizable[],
 		changeFamily: ChangeFamily<TEditor, TChange>,
 		options: ICodecOptions,
+		formatOptions: ExplicitCoreCodecVersions,
 		// Base class arguments
 		id: string,
 		runtime: IFluidDataStoreRuntime,
@@ -109,14 +125,14 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange> extends
 			0x886 /* IdCompressor must be enabled to use SharedTree */,
 		);
 		this.idCompressor = runtime.idCompressor;
-		const mintRevisionTag = () => this.idCompressor.generateCompressedId();
+		this.mintRevisionTag = () => this.idCompressor.generateCompressedId();
 		/**
 		 * A random ID that uniquely identifies this client in the collab session.
 		 * This is sent alongside every op to identify which client the op originated from.
 		 * This is used rather than the Fluid client ID because the Fluid client ID is not stable across reconnections.
 		 */
 		const localSessionId = runtime.idCompressor.localSessionId;
-		this.editManager = new EditManager(changeFamily, localSessionId, mintRevisionTag);
+		this.editManager = new EditManager(changeFamily, localSessionId, this.mintRevisionTag);
 		this.editManager.localBranch.on("afterChange", (args) => {
 			if (this.getLocalBranch().isTransacting()) {
 				// Avoid submitting ops for changes that are part of a transaction.
@@ -139,13 +155,14 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange> extends
 		});
 
 		const revisionTagCodec = new RevisionTagCodec(runtime.idCompressor);
+		const editManagerCodec = makeEditManagerCodec(
+			this.editManager.changeFamily.codecs,
+			revisionTagCodec,
+			options,
+			formatOptions.editManager,
+		);
 		this.summarizables = [
-			new EditManagerSummarizer(
-				this.editManager,
-				revisionTagCodec,
-				options,
-				this.schemaAndPolicy,
-			),
+			new EditManagerSummarizer(this.editManager, editManagerCodec, this.schemaAndPolicy),
 			...summarizables,
 		];
 		assert(
@@ -154,9 +171,10 @@ export class SharedTreeCore<TEditor extends ChangeFamilyEditor, TChange> extends
 		);
 
 		this.messageCodec = makeMessageCodec(
-			changeFamily.codecs.resolve(formatVersion).json,
+			changeFamily.codecs,
 			new RevisionTagCodec(runtime.idCompressor),
 			options,
+			formatOptions.message,
 		);
 	}