@fluidframework/tree 2.113.1 → 2.115.0

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

@@ -61,8 +61,11 @@ export type SharedTreeBranchChange<TChange> =
 /**
  * The events emitted by a `SharedTreeBranch`
  */
-export interface SharedTreeBranchEvents<TEditor extends ChangeFamilyEditor, TChange>
-	extends BranchTrimmingEvents {
+export interface SharedTreeBranchEvents<
+	TEditor extends ChangeFamilyEditor,
+	TChange,
+	TChangeProcessingContext,
+> extends BranchTrimmingEvents {
 	/**
 	 * Fired just before the head of this branch changes.
 	 * @param change - the change to this branch's state and commits
@@ -79,7 +82,18 @@ export interface SharedTreeBranchEvents<TEditor extends ChangeFamilyEditor, TCha
 	 * Fired when this branch forks
 	 * @param fork - the new branch that forked off of this branch
 	 */
-	fork(fork: SharedTreeBranch<TEditor, TChange>): void;
+	fork(fork: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>): void;
+
+	/**
+	 * Fired when a commit is ordered by the sequencing service.
+	 * @param commit - The commit that was sequenced
+	 *
+	 * @remarks
+	 * Once a commit is sequenced, the following guarantees hold:
+	 * 1. The changes carried by the commit have been persisted and other peers are able to see them.
+	 * 2. There can be no more concurrent changes sequenced before this commit, which means this commit has reached its settled form.
+	 */
+	commitSequenced(commit: GraphCommit<TChange>): void;
 
 	/**
 	 * Fired after this branch is disposed
@@ -107,9 +121,16 @@ export interface BranchTrimmingEvents {
 /**
  * A branch of changes that can be applied to a SharedTree.
  */
-export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
-	readonly #events = createEmitter<SharedTreeBranchEvents<TEditor, TChange>>();
-	public readonly events: Listenable<SharedTreeBranchEvents<TEditor, TChange>> = this.#events;
+export class SharedTreeBranch<
+	TEditor extends ChangeFamilyEditor,
+	TChange,
+	TChangeProcessingContext,
+> {
+	readonly #events =
+		createEmitter<SharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>>();
+	public readonly events: Listenable<
+		SharedTreeBranchEvents<TEditor, TChange, TChangeProcessingContext>
+	> = this.#events;
 	public readonly editor: TEditor;
 	private disposed = false;
 	private readonly unsubscribeBranchTrimmer?: () => void;
@@ -123,7 +144,7 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 	 */
 	public constructor(
 		private head: GraphCommit<TChange>,
-		public readonly changeFamily: ChangeFamily<TEditor, TChange>,
+		public readonly changeFamily: ChangeFamily<TEditor, TChange, TChangeProcessingContext>,
 		private readonly mintRevisionTag: () => RevisionTag,
 		private readonly branchTrimmer?: Listenable<BranchTrimmingEvents>,
 		private readonly telemetryEventBatcher?: TelemetryEventBatcher<
@@ -177,6 +198,14 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 		this.#events.emit("afterChange", changeEvent);
 	}
 
+	/**
+	 * Notifies the branch that a commit has been sequenced by the sequencing service.
+	 * @param commit - The commit that was sequenced
+	 */
+	public commitWasSequenced(commit: GraphCommit<TChange>): void {
+		this.#events.emit("commitSequenced", commit);
+	}
+
 	/**
 	 * Gets the commit at the head of this branch.
 	 */
@@ -194,7 +223,7 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 	public fork(
 		commit: GraphCommit<TChange> = this.head,
 		mintRevisionTag: () => RevisionTag = this.mintRevisionTag,
-	): SharedTreeBranch<TEditor, TChange> {
+	): SharedTreeBranch<TEditor, TChange, TChangeProcessingContext> {
 		this.assertNotDisposed();
 		const fork = new SharedTreeBranch(
 			commit,
@@ -215,7 +244,7 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 	 * @returns the result of the rebase or undefined if nothing changed
 	 */
 	public rebaseOnto(
-		branch: SharedTreeBranch<TEditor, TChange>,
+		branch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,
 		upTo = branch.getHead(),
 	): void {
 		this.assertNotDisposed();
@@ -291,7 +320,7 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 	 * @returns the commits that were added to this branch by the merge, or undefined if nothing changed
 	 */
 	public merge(
-		branch: SharedTreeBranch<TEditor, TChange>,
+		branch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,
 	): { sourceCommits: GraphCommit<TChange>[] } | undefined {
 		this.assertNotDisposed();
 		branch.assertNotDisposed();
@@ -328,8 +357,8 @@ export class SharedTreeBranch<TEditor extends ChangeFamilyEditor, TChange> {
 
 	/** Rebase `branchHead` onto `onto`, but return undefined if nothing changed */
 	private rebaseBranch(
-		branch: SharedTreeBranch<TEditor, TChange>,
-		onto: SharedTreeBranch<TEditor, TChange>,
+		branch: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,
+		onto: SharedTreeBranch<TEditor, TChange, TChangeProcessingContext>,
 		upTo = onto.getHead(),
 	): BranchRebaseResult<TChange> | undefined {
 		const { head } = branch;

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

@@ -74,11 +74,14 @@ const maxRebaseStatsAggregationCount = 1000;
 export class EditManager<
 	TEditor extends ChangeFamilyEditor,
 	TChangeset,
-	TChangeFamily extends ChangeFamily<TEditor, TChangeset>,
+	TChangeProcessingContext = never,
 > {
 	private readonly _events = createEmitter<BranchTrimmingEvents>();
 
-	private readonly sharedBranches = new Map<BranchId, SharedBranch<TEditor, TChangeset>>();
+	private readonly sharedBranches = new Map<
+		BranchId,
+		SharedBranch<TEditor, TChangeset, TChangeProcessingContext>
+	>();
 
 	/**
 	 * Tracks where on the trunk of the main branch all registered branches are based.
@@ -90,7 +93,7 @@ export class EditManager<
 	 */
 	private readonly trunkBranches = new BTree<
 		SequenceId,
-		Set<SharedTreeBranch<TEditor, TChangeset>>
+		Set<SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>>
 	>(undefined, sequenceIdComparator);
 
 	/**
@@ -121,7 +124,7 @@ export class EditManager<
 	 * @param retainHistory - when `true`, trunk commits are never trimmed/evicted.
 	 */
 	public constructor(
-		public readonly changeFamily: TChangeFamily,
+		public readonly changeFamily: ChangeFamily<TEditor, TChangeset, TChangeProcessingContext>,
 		public readonly localSessionId: SessionId,
 		private readonly mintRevisionTag: () => RevisionTag,
 		private readonly onSharedBranchCreated?: (branchId: BranchId) => void,
@@ -155,7 +158,9 @@ export class EditManager<
 		this.createAndAddSharedBranch("main", "main", undefined, undefined, mainTrunk);
 	}
 
-	public getLocalBranch(branchId: BranchId): SharedTreeBranch<TEditor, TChangeset> {
+	public getLocalBranch(
+		branchId: BranchId,
+	): SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		return this.getSharedBranch(branchId).localBranch;
 	}
 
@@ -163,7 +168,9 @@ export class EditManager<
 		return this.getSharedBranch(branchId).branchName;
 	}
 
-	private getSharedBranch(branchId: BranchId): SharedBranch<TEditor, TChangeset> {
+	private getSharedBranch(
+		branchId: BranchId,
+	): SharedBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		const branch = this.sharedBranches.get(branchId);
 		if (branch === undefined) {
 			throw new UsageError("No shared branch with such ID");
@@ -180,7 +187,9 @@ export class EditManager<
 	 * TODO#AB6925: Maintain the divergence point between each branch and the trunk so that we don't have to recompute
 	 * it so often.
 	 */
-	private registerBranch(branch: SharedTreeBranch<TEditor, TChangeset>): void {
+	private registerBranch(
+		branch: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
+	): void {
 		this.trackBranch(branch);
 		// Whenever the branch is rebased, update our record of its base trunk commit
 		const offBeforeRebase = branch.events.on("beforeChange", (args) => {
@@ -204,7 +213,9 @@ export class EditManager<
 		});
 	}
 
-	private trackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {
+	private trackBranch(
+		b: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
+	): void {
 		const main = this.getSharedBranch("main");
 		const trunkCommit =
 			findCommonAncestor(main.trunk.getHead(), b.getHead()) ??
@@ -216,7 +227,9 @@ export class EditManager<
 		branches.add(b);
 	}
 
-	private untrackBranch(b: SharedTreeBranch<TEditor, TChangeset>): void {
+	private untrackBranch(
+		b: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
+	): void {
 		const main = this.getSharedBranch("main");
 		const trunkCommit =
 			findCommonAncestor(main.trunk.getHead(), b.getHead()) ??
@@ -498,9 +511,9 @@ export class EditManager<
 		branchId: BranchId,
 		branchName: string | undefined,
 		sessionId: SessionId | undefined,
-		parent: SharedBranch<TEditor, TChangeset> | undefined,
-		branch: SharedTreeBranch<TEditor, TChangeset>,
-	): SharedBranch<TEditor, TChangeset> {
+		parent: SharedBranch<TEditor, TChangeset, TChangeProcessingContext> | undefined,
+		branch: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
+	): SharedBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		const sharedBranch = this.createSharedBranch(
 			branchId,
 			branchName,
@@ -514,7 +527,7 @@ export class EditManager<
 
 	private addSharedBranch(
 		branchId: BranchId,
-		branch: SharedBranch<TEditor, TChangeset>,
+		branch: SharedBranch<TEditor, TChangeset, TChangeProcessingContext>,
 	): void {
 		assert(
 			!this.sharedBranches.has(branchId),
@@ -537,9 +550,9 @@ export class EditManager<
 		branchId: BranchId,
 		branchName: string | undefined,
 		sessionId: SessionId | undefined,
-		parent: SharedBranch<TEditor, TChangeset> | undefined,
-		branch: SharedTreeBranch<TEditor, TChangeset>,
-	): SharedBranch<TEditor, TChangeset> {
+		parent: SharedBranch<TEditor, TChangeset, TChangeProcessingContext> | undefined,
+		branch: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
+	): SharedBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		const sharedBranch = new SharedBranch(
 			parent,
 			branch,
@@ -587,6 +600,7 @@ export class EditManager<
 			sequenceId: SequenceId,
 			previousSequenceId: SequenceId,
 		): void => {
+			branch.localBranch.commitWasSequenced(commit);
 			// Next, we need to update the sequence IDs that our local branches (user's branches, not peer branches) are associated with.
 			// In particular, if a local branch is based on the previous trunk head (the branch's first ancestor in the trunk is the commit that was the head before we pushed the new commit)
 			// and also branches off of the local branch (it has an ancestor that is part of the local branch), it needs to have its sequence number advanced to be that of the new trunk head.
@@ -604,6 +618,7 @@ export class EditManager<
 					if (findAncestor(forkedBranch.getHead(), (c) => c === commit) !== undefined) {
 						newBranches.add(forkedBranch);
 						currentBranches.delete(forkedBranch);
+						forkedBranch.commitWasSequenced(commit);
 					}
 				}
 				// Clean up our trunk branches map by removing any empty sets.
@@ -675,19 +690,21 @@ function getPathFromBase<TCommit extends { parent?: TCommit }>(
 	return path;
 }
 
-class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
+class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset, TChangeProcessingContext> {
 	/**
 	 * This branch holds the changes made by this client which have not yet been confirmed as sequenced changes.
 	 */
-	public readonly localBranch: SharedTreeBranch<TEditor, TChangeset>;
+	public readonly localBranch: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>;
 
 	/**
 	 * Branches are maintained to represent the local change list that the issuing client had
 	 * at the time of submitting the latest known edit on the branch.
 	 * This means the head commit of each branch is always in its original (non-rebased) form.
 	 */
-	private readonly peerLocalBranches: Map<SessionId, SharedTreeBranch<TEditor, TChangeset>> =
-		new Map();
+	private readonly peerLocalBranches: Map<
+		SessionId,
+		SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>
+	> = new Map();
 
 	/**
 	 * A map from a sequence id to the commit which has that sequence id.
@@ -714,13 +731,15 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 	>();
 
 	public constructor(
-		public readonly parentBranch: SharedBranch<TEditor, TChangeset> | undefined,
-		public readonly trunk: SharedTreeBranch<TEditor, TChangeset>,
+		public readonly parentBranch:
+			| SharedBranch<TEditor, TChangeset, TChangeProcessingContext>
+			| undefined,
+		public readonly trunk: SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext>,
 		private readonly id: BranchId,
 		public readonly branchName: string | undefined,
 		private readonly sessionId: SessionId | undefined,
 		baseCommitSequenceId: SequenceId,
-		private readonly changeFamily: ChangeFamily<TEditor, TChangeset>,
+		private readonly changeFamily: ChangeFamily<TEditor, TChangeset, TChangeProcessingContext>,
 		private readonly mintRevisionTag: () => RevisionTag,
 		branchTrimmer: Listenable<BranchTrimmingEvents>,
 		telemetryEventBatcher: TelemetryEventBatcher<keyof RebaseStatsWithDuration> | undefined,
@@ -837,7 +856,7 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 	public rebasePeer(
 		sessionId: SessionId,
 		referenceSequenceNumber: SeqNumber,
-	): SharedTreeBranch<TEditor, TChangeset> {
+	): SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		const [, baseRevisionInTrunk] = this.getClosestTrunkCommit(referenceSequenceNumber);
 		const peerLocalBranch = getOrCreate(
 			this.peerLocalBranches,
@@ -848,7 +867,9 @@ class SharedBranch<TEditor extends ChangeFamilyEditor, TChangeset> {
 		return peerLocalBranch;
 	}
 
-	public getPeerBranchOrTrunk(sessionId: SessionId): SharedTreeBranch<TEditor, TChangeset> {
+	public getPeerBranchOrTrunk(
+		sessionId: SessionId,
+	): SharedTreeBranch<TEditor, TChangeset, TChangeProcessingContext> {
 		return this.peerLocalBranches.get(sessionId) ?? this.trunk;
 	}
 

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

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 import type { MinimumVersionForCollab } from "@fluidframework/runtime-definitions/internal";
 import { lowestMinVersionForCollab } from "@fluidframework/runtime-utils/internal";
 
@@ -18,30 +17,17 @@ import {
 	type IJsonCodec,
 	makeDiscontinuedCodecAndSchema,
 } from "../codec/index.js";
-import type {
-	ChangeEncodingContext,
-	EncodedRevisionTag,
-	RevisionTag,
-	SchemaAndPolicy,
-} from "../core/index.js";
-import type { IdentifierHealingConfig } from "../util/index.js";
+import type { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../core/index.js";
 
 import type { SummaryData } from "./editManager.js";
+import type {
+	EditManagerDecodingContext,
+	EditManagerEncodingContext,
+} from "./editManagerCodecsCommons.js";
 import { makeV1toV4andV6CodecWithVersion } from "./editManagerCodecsV1toV4.js";
 import { makeSharedBranchesCodecWithVersion } from "./editManagerCodecsVSharedBranches.js";
 import { EditManagerFormatVersion } from "./editManagerFormatCommons.js";
 
-/**
- * Context required for encoding/decoding the {@link EditManager}'s {@link SummaryData}.
- */
-export interface EditManagerEncodingContext {
-	idCompressor: IIdCompressor;
-	readonly schema?: SchemaAndPolicy;
-	readonly isSummary: boolean;
-	/** See {@link IdentifierHealingConfig}. */
-	readonly healing?: IdentifierHealingConfig;
-}
-
 /**
  * Codec name used to identify the {@link EditManager} codec, see {@link makeEditManagerCodecBuilder}.
  */
@@ -72,14 +58,16 @@ export function makeEditManagerCodecBuilder<TChangeset>(): VersionDispatchingCod
 	SummaryData<TChangeset>,
 	EditManagerEncodingContext,
 	EditManagerFormatVersion,
-	typeof editManagerCodecName
+	typeof editManagerCodecName,
+	EditManagerDecodingContext
 > {
 	// See EditManagerFormatVersion and its members for documentation on what changed in each version.
 	const versions: CodecVersion<
 		SummaryData<TChangeset>,
 		EditManagerEncodingContext,
 		EditManagerFormatVersion,
-		EditManagerCodecOptions<TChangeset>
+		EditManagerCodecOptions<TChangeset>,
+		EditManagerDecodingContext
 	>[] = [
 		makeDiscontinuedCodecAndSchema(EditManagerFormatVersion.v1, "2.73.0"),
 		makeDiscontinuedCodecAndSchema(EditManagerFormatVersion.v2, "2.73.0"),

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

@@ -9,6 +9,7 @@ import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 import type { IJsonCodec } from "../codec/index.js";
 import type {
 	ChangeEncodingContext,
+	ChangeDecodingContext,
 	EncodedRevisionTag,
 	RevisionTag,
 	SchemaAndPolicy,
@@ -39,6 +40,17 @@ export interface EditManagerEncodingContext {
 	 * but it is carried explicitly so downstream codecs can read it.
 	 */
 	readonly isSummary: boolean;
+}
+
+/**
+ * Context required for decoding the {@link EditManager}'s {@link SummaryData}.
+ * @remarks
+ * Unlike {@link EditManagerEncodingContext}, this carries {@link IdentifierHealingConfig} (used only
+ * on decode) and omits `schema` (only consulted when encoding).
+ */
+export interface EditManagerDecodingContext {
+	readonly idCompressor: IIdCompressor;
+	readonly isSummary: boolean;
 	/** See {@link IdentifierHealingConfig}. */
 	readonly healing?: IdentifierHealingConfig;
 }
@@ -87,7 +99,7 @@ function decodeCommit<TChangeset, T extends EncodedCommit<JsonCompatibleReadOnly
 		ChangeEncodingContext
 	>,
 	commit: T,
-	context: ChangeEncodingContext,
+	context: ChangeDecodingContext,
 ) {
 	const revision = revisionTagCodec.decode(commit.revision, {
 		originatorId: commit.sessionId,
@@ -192,7 +204,7 @@ export function decodeSharedBranch<TChangeset>(
 		ChangeEncodingContext
 	>,
 	json: EncodedSharedBranch<TChangeset>,
-	context: EditManagerEncodingContext,
+	context: EditManagerDecodingContext,
 	originatorId: SessionId | undefined,
 ): SharedBranchSummaryData<TChangeset> {
 	// TODO: sort out EncodedCommit vs Commit, and make this type check without type assertion.

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

@@ -3,34 +3,23 @@
  * Licensed under the MIT License.
  */
 
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-
 import type { CodecAndSchema, IJsonCodec, Versioned } from "../codec/index.js";
-import type {
-	ChangeEncodingContext,
-	EncodedRevisionTag,
-	RevisionTag,
-	SchemaAndPolicy,
-} from "../core/index.js";
+import type { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../core/index.js";
 import {
-	type IdentifierHealingConfig,
 	type JsonCompatibleReadOnly,
 	type JsonCompatibleReadOnlyObject,
 	JsonCompatibleReadOnlySchema,
 } from "../util/index.js";
 
 import type { SummaryData } from "./editManager.js";
-import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
+import {
+	decodeSharedBranch,
+	encodeSharedBranch,
+	type EditManagerDecodingContext,
+	type EditManagerEncodingContext,
+} from "./editManagerCodecsCommons.js";
 import { EncodedEditManager } from "./editManagerFormatV1toV4.js";
 
-export interface EditManagerEncodingContext {
-	idCompressor: IIdCompressor;
-	readonly schema?: SchemaAndPolicy;
-	readonly isSummary: boolean;
-	/** See {@link IdentifierHealingConfig}. */
-	readonly healing?: IdentifierHealingConfig;
-}
-
 /**
  * Create the provided version of the {@link EditManager} codec (which encodes it's {@link SummaryData}).
  * @remarks
@@ -53,10 +42,18 @@ export function makeV1toV4andV6CodecWithVersion<TChangeset>(
 		ChangeEncodingContext
 	>,
 	version: EncodedEditManager<TChangeset>["version"],
-): CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> {
+): CodecAndSchema<
+	SummaryData<TChangeset>,
+	EditManagerEncodingContext,
+	EditManagerDecodingContext
+> {
 	const schema = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
 
-	const codec: CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> = {
+	const codec: CodecAndSchema<
+		SummaryData<TChangeset>,
+		EditManagerEncodingContext,
+		EditManagerDecodingContext
+	> = {
 		schema,
 		encode: (
 			data: SummaryData<TChangeset>,
@@ -80,7 +77,7 @@ export function makeV1toV4andV6CodecWithVersion<TChangeset>(
 		},
 		decode: (
 			json: EncodedEditManager<TChangeset> & JsonCompatibleReadOnly,
-			context: EditManagerEncodingContext,
+			context: EditManagerDecodingContext,
 		): SummaryData<TChangeset> => {
 			return {
 				main: decodeSharedBranch(

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

@@ -4,17 +4,10 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import type { CodecAndSchema, IJsonCodec } from "../codec/index.js";
-import type {
-	ChangeEncodingContext,
-	EncodedRevisionTag,
-	RevisionTag,
-	SchemaAndPolicy,
-} from "../core/index.js";
+import type { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../core/index.js";
 import {
-	type IdentifierHealingConfig,
 	type JsonCompatibleReadOnly,
 	type JsonCompatibleReadOnlyObject,
 	JsonCompatibleReadOnlySchema,
@@ -23,18 +16,15 @@ import {
 
 import type { BranchId } from "./branch.js";
 import type { SharedBranchSummaryData, SummaryData } from "./editManager.js";
-import { decodeSharedBranch, encodeSharedBranch } from "./editManagerCodecsCommons.js";
+import {
+	decodeSharedBranch,
+	encodeSharedBranch,
+	type EditManagerDecodingContext,
+	type EditManagerEncodingContext,
+} from "./editManagerCodecsCommons.js";
 import type { EncodedSharedBranch } from "./editManagerFormatCommons.js";
 import { EncodedEditManager } from "./editManagerFormatVSharedBranches.js";
 
-export interface EditManagerEncodingContext {
-	idCompressor: IIdCompressor;
-	readonly schema?: SchemaAndPolicy;
-	readonly isSummary: boolean;
-	/** See {@link IdentifierHealingConfig}. */
-	readonly healing?: IdentifierHealingConfig;
-}
-
 export function makeSharedBranchesCodecWithVersion<TChangeset>(
 	changeCodec: IJsonCodec<
 		TChangeset,
@@ -49,10 +39,18 @@ export function makeSharedBranchesCodecWithVersion<TChangeset>(
 		ChangeEncodingContext
 	>,
 	version: EncodedEditManager<TChangeset>["version"],
-): CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> {
+): CodecAndSchema<
+	SummaryData<TChangeset>,
+	EditManagerEncodingContext,
+	EditManagerDecodingContext
+> {
 	const schema = EncodedEditManager(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
 
-	const codec: CodecAndSchema<SummaryData<TChangeset>, EditManagerEncodingContext> = {
+	const codec: CodecAndSchema<
+		SummaryData<TChangeset>,
+		EditManagerEncodingContext,
+		EditManagerDecodingContext
+	> = {
 		schema,
 		encode: (data: SummaryData<TChangeset>, context: EditManagerEncodingContext) => {
 			const mainBranch = encodeSharedBranch(
@@ -90,7 +88,7 @@ export function makeSharedBranchesCodecWithVersion<TChangeset>(
 		},
 		decode: (
 			json: EncodedEditManager<TChangeset> & JsonCompatibleReadOnlyObject,
-			context: EditManagerEncodingContext,
+			context: EditManagerDecodingContext,
 		): SummaryData<TChangeset> => {
 			const mainBranch = decodeSharedBranch(
 				changeCodec,

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

@@ -15,11 +15,14 @@ import type {
 import type { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 
 import type { IJsonCodec } from "../codec/index.js";
-import type { ChangeFamily, ChangeFamilyEditor, SchemaAndPolicy } from "../core/index.js";
+import type { ChangeFamilyEditor, SchemaAndPolicy } from "../core/index.js";
 import type { IdentifierHealingConfig, JsonCompatibleReadOnly } from "../util/index.js";
 
 import type { EditManager, SummaryData } from "./editManager.js";
-import type { EditManagerEncodingContext } from "./editManagerCodecs.js";
+import type {
+	EditManagerDecodingContext,
+	EditManagerEncodingContext,
+} from "./editManagerCodecsCommons.js";
 import type {
 	Summarizable,
 	SummaryElementParser,
@@ -65,7 +68,7 @@ function minVersionToEditManagerSummaryFormatVersion(
 /**
  * Provides methods for summarizing and loading an `EditManager`
  */
-export class EditManagerSummarizer<TChangeset>
+export class EditManagerSummarizer<TChangeset, TChangeProcessingContext>
 	extends VersionedSummarizer<EditManagerSummaryFormatVersion>
 	implements Summarizable
 {
@@ -74,13 +77,14 @@ export class EditManagerSummarizer<TChangeset>
 		private readonly editManager: EditManager<
 			ChangeFamilyEditor,
 			TChangeset,
-			ChangeFamily<ChangeFamilyEditor, TChangeset>
+			TChangeProcessingContext
 		>,
 		private readonly codec: IJsonCodec<
 			SummaryData<TChangeset>,
 			JsonCompatibleReadOnly,
 			JsonCompatibleReadOnly,
-			EditManagerEncodingContext
+			EditManagerEncodingContext,
+			EditManagerDecodingContext
 		>,
 		private readonly idCompressor: IIdCompressor,
 		minVersionForCollab: MinimumVersionForCollab,
@@ -109,7 +113,6 @@ export class EditManagerSummarizer<TChangeset>
 			idCompressor: this.idCompressor,
 			schema: this.schemaAndPolicy,
 			isSummary: true,
-			healing: this.healing,
 		};
 		const jsonCompatible = this.codec.encode(this.editManager.getSummaryData(), context);
 		const dataString = stringify(jsonCompatible);

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

@@ -17,7 +17,7 @@ import {
 	JsonCompatibleReadOnlySchema,
 } from "../util/index.js";
 
-import type { MessageEncodingContext } from "./messageCodecs.js";
+import type { MessageDecodingContext, MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
 import { Message } from "./messageFormatV1ToV4.js";
 import type { DecodedMessage } from "./messageTypes.js";
@@ -36,7 +36,7 @@ export function makeV1ToV4CodecWithVersion<TChangeset>(
 		| typeof MessageFormatVersion.v3
 		| typeof MessageFormatVersion.v4
 		| typeof MessageFormatVersion.v6,
-): CodecAndSchema<DecodedMessage<TChangeset>, MessageEncodingContext> {
+): CodecAndSchema<DecodedMessage<TChangeset>, MessageEncodingContext, MessageDecodingContext> {
 	const schema = Message(changeCodec.encodedSchema ?? JsonCompatibleReadOnlySchema);
 	return {
 		schema,
@@ -70,7 +70,7 @@ export function makeV1ToV4CodecWithVersion<TChangeset>(
 		},
 		decode: (
 			encoded: Message & JsonCompatibleReadOnlyObject & Versioned,
-			context: MessageEncodingContext,
+			context: MessageDecodingContext,
 		): DecodedMessage<TChangeset> => {
 			const { revision: encodedRevision, originatorId, changeset } = encoded;
 

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

@@ -17,7 +17,7 @@ import type {
 import type { JsonCompatibleReadOnlyObject } from "../util/index.js";
 
 import { decodeBranchId, encodeBranchId } from "./branchIdCodec.js";
-import type { MessageEncodingContext } from "./messageCodecs.js";
+import type { MessageDecodingContext, MessageEncodingContext } from "./messageCodecs.js";
 import type { MessageFormatVersion } from "./messageFormat.js";
 import { Message } from "./messageFormatVSharedBranches.js";
 import type { DecodedMessage } from "./messageTypes.js";
@@ -79,7 +79,7 @@ export function makeSharedBranchesCodecWithVersion<TChangeset>(
 		},
 		decode: (
 			encoded: Message & JsonCompatibleReadOnlyObject & Versioned,
-			context: MessageEncodingContext,
+			context: MessageDecodingContext,
 		): DecodedMessage<TChangeset> => {
 			const {
 				revision: encodedRevision,