@fluidframework/tree 2.0.0-dev-rc.5.0.0.271262 → 2.0.0-dev-rc.5.0.0.272251

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.0.0-dev-rc.5.0.0.271262",
+  "version": "2.0.0-dev-rc.5.0.0.272251",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -67,17 +67,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/container-runtime": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/shared-object-base": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.271262",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/container-runtime": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/shared-object-base": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.272251",
     "@sinclair/typebox": "^0.32.29",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "@ungap/structured-clone": "^1.2.0",
@@ -86,19 +86,19 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "^1.7.3",
-    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluid-private/test-dds-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluid-private/test-drivers": "2.0.0-dev-rc.5.0.0.271262",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluid-private/test-dds-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluid-private/test-drivers": "2.0.0-dev-rc.5.0.0.272251",
     "@fluid-tools/benchmark": "^0.48.0",
     "@fluid-tools/build-cli": "^0.39.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.39.0",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/container-loader": "2.0.0-dev-rc.5.0.0.271262",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/container-loader": "2.0.0-dev-rc.5.0.0.272251",
     "@fluidframework/eslint-config-fluid": "^5.3.0",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.271262",
-    "@fluidframework/test-utils": "2.0.0-dev-rc.5.0.0.271262",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.272251",
+    "@fluidframework/test-utils": "2.0.0-dev-rc.5.0.0.272251",
     "@microsoft/api-extractor": "^7.45.1",
     "@types/diff": "^3.5.1",
     "@types/easy-table": "^0.0.32",
@@ -109,6 +109,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "c8": "^8.0.1",
+    "concurrently": "^8.2.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "dependency-cruiser": "^14.1.0",
@@ -134,9 +135,6 @@
         "...",
         "@fluidframework/id-compressor#build:test:esm"
       ],
-      "check:release-tags": [
-        "build:esnext"
-      ],
       "ci:build:docs": [
         "build:esnext"
       ]
@@ -163,9 +161,14 @@
     "build:test:esm": "tsc --project ./src/test/tsconfig.json",
     "check:are-the-types-wrong": "attw --pack .",
     "check:biome": "biome check . --formatter-enabled=true",
+    "check:exports": "concurrently \"npm:check:exports:*\"",
+    "check:exports:bundle-release-tags": "api-extractor run --config api-extractor/api-extractor-lint-bundle.json",
+    "check:exports:cjs:beta": "api-extractor run --config api-extractor/api-extractor-lint-beta.cjs.json",
+    "check:exports:cjs:public": "api-extractor run --config api-extractor/api-extractor-lint-public.cjs.json",
+    "check:exports:esm:beta": "api-extractor run --config api-extractor/api-extractor-lint-beta.esm.json",
+    "check:exports:esm:public": "api-extractor run --config api-extractor/api-extractor-lint-public.esm.json",
     "check:format": "npm run check:prettier",
     "check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
-    "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
     "clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
     "depcruise": "depcruise src/ --ignore-known",

package/src/feature-libraries/chunked-forest/codec/chunkDecoding.ts

@@ -38,15 +38,25 @@ import {
 	type EncodedValueShape,
 	SpecialField,
 } from "./format.js";
-import type { IIdCompressor, SessionSpaceCompressedId } from "@fluidframework/id-compressor";
+import type { IIdCompressor, OpSpaceCompressedId, SessionId } from "@fluidframework/id-compressor";
 
+export interface IdDecodingContext {
+	idCompressor: IIdCompressor;
+	/**
+	 * The creator of any local Ids to be decoded.
+	 */
+	originatorId: SessionId;
+}
 /**
  * Decode `chunk` into a TreeChunk.
  */
-export function decode(chunk: EncodedFieldBatch, idCompressor: IIdCompressor): TreeChunk[] {
+export function decode(
+	chunk: EncodedFieldBatch,
+	idDecodingContext: { idCompressor: IIdCompressor; originatorId: SessionId },
+): TreeChunk[] {
 	return genericDecode(
 		decoderLibrary,
-		new DecoderContext(chunk.identifiers, chunk.shapes, idCompressor),
+		new DecoderContext(chunk.identifiers, chunk.shapes, idDecodingContext),
 		chunk,
 		anyDecoder,
 	);
@@ -77,7 +87,7 @@ const decoderLibrary = new DiscriminatedUnionDispatcher<
 export function readValue(
 	stream: StreamCursor,
 	shape: EncodedValueShape,
-	idCompressor: IIdCompressor,
+	idDecodingContext: IdDecodingContext,
 ): Value {
 	if (shape === undefined) {
 		return readStreamBoolean(stream) ? readStreamValue(stream) : undefined;
@@ -96,8 +106,14 @@ export function readValue(
 				typeof streamValue === "number" || typeof streamValue === "string",
 				"identifier must be string or number.",
 			);
+			const idCompressor = idDecodingContext.idCompressor;
 			return typeof streamValue === "number"
-				? idCompressor.decompress(streamValue as SessionSpaceCompressedId)
+				? idCompressor.decompress(
+						idCompressor.normalizeToSessionSpace(
+							streamValue as OpSpaceCompressedId,
+							idDecodingContext.originatorId,
+						),
+				  )
 				: streamValue;
 		} else {
 			// EncodedCounter case:
@@ -259,7 +275,7 @@ export class TreeDecoder implements ChunkDecoder {
 			this.type ?? readStreamIdentifier(stream, this.cache);
 		// TODO: Consider typechecking against stored schema in here somewhere.
 
-		const value = readValue(stream, this.shape.value, this.cache.idCompressor);
+		const value = readValue(stream, this.shape.value, this.cache.idDecodingContext);
 		const fields: Map<FieldKey, TreeChunk[]> = new Map();
 
 		// Helper to add fields, but with unneeded array chunks removed.

package/src/feature-libraries/chunked-forest/codec/chunkDecodingGeneric.ts

@@ -16,7 +16,7 @@ import {
 	readStream,
 } from "./chunkCodecUtilities.js";
 import type { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IdDecodingContext } from "./chunkDecoding.js";
 
 /**
  * General purpose shape based tree decoder which gets its support for specific shapes from the caller.
@@ -52,7 +52,7 @@ export class DecoderContext<TEncodedShape = unknown> {
 	public constructor(
 		public readonly identifiers: readonly string[],
 		public readonly shapes: readonly TEncodedShape[],
-		public readonly idCompressor: IIdCompressor,
+		public readonly idDecodingContext: IdDecodingContext,
 	) {}
 
 	public identifier<T extends string & BrandedType<string, string>>(

package/src/feature-libraries/chunked-forest/codec/codecs.ts

@@ -19,11 +19,12 @@ import type { FieldBatch } from "./fieldBatch.js";
 import { EncodedFieldBatch, validVersions } from "./format.js";
 import { schemaCompressedEncode } from "./schemaBasedEncoding.js";
 import { uncompressedEncode } from "./uncompressedEncode.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 export interface FieldBatchEncodingContext {
 	readonly encodeType: TreeCompressionStrategy;
 	readonly idCompressor: IIdCompressor;
+	readonly originatorId: SessionId;
 	readonly schema?: SchemaAndPolicy;
 }
 /**
@@ -81,7 +82,10 @@ export function makeFieldBatchCodec(options: ICodecOptions, writeVersion: number
 		},
 		decode: (data: EncodedFieldBatch, context: FieldBatchEncodingContext): FieldBatch => {
 			// TODO: consider checking data is in schema.
-			return decode(data, context.idCompressor).map((chunk) => chunk.cursor());
+			return decode(data, {
+				idCompressor: context.idCompressor,
+				originatorId: context.originatorId,
+			}).map((chunk) => chunk.cursor());
 		},
 	});
 }

package/src/feature-libraries/chunked-forest/codec/nodeShape.ts

@@ -51,9 +51,14 @@ export class NodeShape extends Shape<EncodedChunkShape> implements NodeEncoder {
 		}
 
 		if (this.value === 0) {
-			const compressedId =
-				cache.idCompressor.tryRecompress(cursor.value as StableId) ?? cursor.value;
-			encodeValue(compressedId, this.value, outputBuffer);
+			const sessionSpaceCompressedId = cache.idCompressor.tryRecompress(
+				cursor.value as StableId,
+			);
+			const opSpaceCompressedId =
+				sessionSpaceCompressedId !== undefined
+					? cache.idCompressor.normalizeToOpSpace(sessionSpaceCompressedId)
+					: cursor.value;
+			encodeValue(opSpaceCompressedId, this.value, outputBuffer);
 		} else {
 			encodeValue(cursor.value, this.value, outputBuffer);
 		}

package/src/feature-libraries/index.ts

@@ -117,7 +117,6 @@ export {
 	genericFieldKind,
 	type HasFieldChanges,
 	type NodeExistsConstraint,
-	NodeExistenceState,
 	FieldKindWithEditor,
 	ModularChangeFamily,
 	type RelevantRemovedRootsFromChild,

package/src/feature-libraries/modular-schema/fieldChangeHandler.ts

@@ -124,7 +124,6 @@ export interface FieldChangeRebaser<TChangeset> {
 		genId: IdAllocator,
 		crossFieldManager: CrossFieldManager,
 		revisionMetadata: RebaseRevisionMetadata,
-		existenceState?: NodeExistenceState,
 	): TChangeset;
 
 	/**
@@ -189,9 +188,9 @@ export type NodeChangeInverter = (change: NodeId) => NodeId;
 /**
  * @internal
  */
-export enum NodeExistenceState {
-	Alive,
-	Dead,
+export enum NodeAttachState {
+	Attached,
+	Detached,
 }
 
 /**
@@ -201,10 +200,10 @@ export type NodeChangeRebaser = (
 	change: NodeId | undefined,
 	baseChange: NodeId | undefined,
 	/**
-	 * Whether or not the node is alive or dead in the input context of change.
-	 * Defaults to Alive if undefined.
+	 * Whether the node is attached to this field in the output context of the base change.
+	 * Defaults to attached if undefined.
 	 */
-	state?: NodeExistenceState,
+	state?: NodeAttachState,
 ) => NodeId | undefined;
 
 /**

package/src/feature-libraries/modular-schema/index.ts

@@ -39,7 +39,7 @@ export {
 	type RebaseRevisionMetadata,
 	type RelevantRemovedRootsFromChild,
 	type ToDelta,
-	NodeExistenceState,
+	NodeAttachState,
 	type FieldChangeEncodingContext,
 } from "./fieldChangeHandler.js";
 export type {

package/src/feature-libraries/modular-schema/modularChangeCodecs.ts

@@ -326,6 +326,7 @@ function makeModularChangeCodec(
 					trees: fieldsCodec.encode(treesToEncode, {
 						encodeType: chunkCompressionStrategy,
 						schema: context.schema,
+						originatorId: context.originatorId,
 						idCompressor: context.idCompressor,
 					}),
 			  };
@@ -341,6 +342,7 @@ function makeModularChangeCodec(
 
 		const chunks = fieldsCodec.decode(encoded.trees, {
 			encodeType: chunkCompressionStrategy,
+			originatorId: context.originatorId,
 			idCompressor: context.idCompressor,
 		});
 		const getChunk = (index: number): TreeChunk => {

package/src/feature-libraries/modular-schema/modularChangeFamily.ts

@@ -77,7 +77,7 @@ import {
 } from "./crossFieldQueries.js";
 import {
 	type FieldChangeHandler,
-	NodeExistenceState,
+	NodeAttachState,
 	type RebaseRevisionMetadata,
 } from "./fieldChangeHandler.js";
 import { type FieldKindWithEditor, withEditor } from "./fieldKindWithEditor.js";
@@ -639,7 +639,7 @@ export class ModularChangeFamily
 		);
 
 		const rebasedNodes: ChangeAtomIdMap<NodeChangeset> = new Map();
-		for (const [newId, baseId, existenceState] of crossFieldTable.nodeIdPairs) {
+		for (const [newId, baseId] of crossFieldTable.nodeIdPairs) {
 			const newNodeChange =
 				newId !== undefined
 					? tryGetFromNestedMap(change.nodeChanges, newId.revision, newId.localId)
@@ -660,8 +660,6 @@ export class ModularChangeFamily
 				genId,
 				crossFieldTable,
 				rebaseMetadata,
-				constraintState,
-				existenceState,
 			);
 
 			if (rebasedNode !== undefined) {
@@ -700,6 +698,13 @@ export class ModularChangeFamily
 			}
 		}
 
+		this.updateConstraintsForFields(
+			rebasedFields,
+			NodeAttachState.Attached,
+			constraintState,
+			rebasedNodes,
+		);
+
 		return makeModularChangeset(
 			this.pruneFieldMap(rebasedFields, rebasedNodes),
 			rebasedNodes,
@@ -718,7 +723,6 @@ export class ModularChangeFamily
 		genId: IdAllocator,
 		crossFieldTable: RebaseTable,
 		revisionMetadata: RebaseRevisionMetadata,
-		existenceState: NodeExistenceState = NodeExistenceState.Alive,
 	): FieldChangeMap {
 		const rebasedFields: FieldChangeMap = new Map();
 
@@ -739,9 +743,9 @@ export class ModularChangeFamily
 			const rebaseChild = (
 				child: NodeId | undefined,
 				baseChild: NodeId | undefined,
-				stateChange: NodeExistenceState | undefined,
+				_attachState: NodeAttachState | undefined,
 			): ChangeAtomId => {
-				crossFieldTable.nodeIdPairs.push([child, baseChild, stateChange]);
+				crossFieldTable.nodeIdPairs.push([child, baseChild]);
 				return (
 					child ??
 					// The fact `child` is undefined means that the changeset to rebase does not include changes for
@@ -801,13 +805,13 @@ export class ModularChangeFamily
 							0x5b6 /* This field should not have any base changes */,
 						);
 
-						crossFieldTable.nodeIdPairs.push([child, undefined, existenceState]);
+						crossFieldTable.nodeIdPairs.push([child, undefined]);
+
 						return child;
 					},
 					genId,
 					manager,
 					revisionMetadata,
-					existenceState,
 				);
 				const rebasedFieldChange: FieldChange = {
 					fieldKind: fieldKind.identifier,
@@ -826,8 +830,6 @@ export class ModularChangeFamily
 		genId: IdAllocator,
 		crossFieldTable: RebaseTable,
 		revisionMetadata: RebaseRevisionMetadata,
-		constraintState: ConstraintState,
-		existenceState: NodeExistenceState = NodeExistenceState.Alive,
 	): NodeChangeset | undefined {
 		const key = change ?? over;
 		if (key === undefined) {
@@ -842,7 +844,6 @@ export class ModularChangeFamily
 			genId,
 			crossFieldTable,
 			revisionMetadata,
-			existenceState,
 		);
 
 		const rebasedChange: NodeChangeset = {};
@@ -855,21 +856,52 @@ export class ModularChangeFamily
 			rebasedChange.nodeExistsConstraint = change.nodeExistsConstraint;
 		}
 
-		// If there's a node exists constraint and we removed or revived the node, update constraint state
-		if (rebasedChange.nodeExistsConstraint !== undefined) {
-			const violatedAfter = existenceState === NodeExistenceState.Dead;
+		crossFieldTable.rebasedNodeCache.set(key, rebasedChange);
+		return rebasedChange;
+	}
+
+	private updateConstraintsForFields(
+		fields: FieldChangeMap,
+		parentAttachState: NodeAttachState,
+		constraintState: ConstraintState,
+		nodes: ChangeAtomIdMap<NodeChangeset>,
+	): void {
+		for (const field of fields.values()) {
+			const handler = getChangeHandler(this.fieldKinds, field.fieldKind);
+			for (const [nodeId, index] of handler.getNestedChanges(field.change)) {
+				const isDetached = index === undefined;
+				const attachState =
+					parentAttachState === NodeAttachState.Detached || isDetached
+						? NodeAttachState.Detached
+						: NodeAttachState.Attached;
+				this.updateConstraintsForNode(nodeId, attachState, constraintState, nodes);
+			}
+		}
+	}
 
-			if (rebasedChange.nodeExistsConstraint.violated !== violatedAfter) {
-				rebasedChange.nodeExistsConstraint = {
-					...rebasedChange.nodeExistsConstraint,
-					violated: violatedAfter,
+	private updateConstraintsForNode(
+		nodeId: NodeId,
+		attachState: NodeAttachState,
+		constraintState: ConstraintState,
+		nodes: ChangeAtomIdMap<NodeChangeset>,
+	): void {
+		const node =
+			tryGetFromNestedMap(nodes, nodeId.revision, nodeId.localId) ?? fail("Unknown node ID");
+
+		if (node.nodeExistsConstraint !== undefined) {
+			const isNowViolated = attachState === NodeAttachState.Detached;
+			if (node.nodeExistsConstraint.violated !== isNowViolated) {
+				node.nodeExistsConstraint = {
+					...node.nodeExistsConstraint,
+					violated: isNowViolated,
 				};
-				constraintState.violationCount += violatedAfter ? 1 : -1;
+				constraintState.violationCount += isNowViolated ? 1 : -1;
 			}
 		}
 
-		crossFieldTable.rebasedNodeCache.set(key, rebasedChange);
-		return rebasedChange;
+		if (node.fieldChanges !== undefined) {
+			this.updateConstraintsForFields(node.fieldChanges, attachState, constraintState, nodes);
+		}
 	}
 
 	private pruneFieldMap(
@@ -1475,7 +1507,7 @@ interface RebaseTable extends CrossFieldTable<FieldChange> {
 	/**
 	 * List of (newId, baseId) pairs encountered so far.
 	 */
-	nodeIdPairs: [NodeId | undefined, NodeId | undefined, NodeExistenceState | undefined][];
+	nodeIdPairs: [NodeId | undefined, NodeId | undefined][];
 }
 
 interface RebaseFieldContext {

package/src/feature-libraries/optional-field/optionalField.ts

@@ -35,7 +35,7 @@ import {
 	type NodeChangeComposer,
 	type NodeChangePruner,
 	type NodeChangeRebaser,
-	NodeExistenceState,
+	NodeAttachState,
 	type NodeId,
 	type RelevantRemovedRootsFromChild,
 	type ToDelta,
@@ -373,7 +373,7 @@ export const optionalChangeRebaser: FieldChangeRebaser<OptionalChangeset> = {
 			const rebasedChildChange = rebaseChild(
 				childChange,
 				overChildChange,
-				rebasedId === "self" ? NodeExistenceState.Alive : NodeExistenceState.Dead,
+				rebasedId === "self" ? NodeAttachState.Attached : NodeAttachState.Detached,
 			);
 			if (rebasedChildChange !== undefined) {
 				rebasedChildChanges.push([rebasedId, rebasedChildChange]);
@@ -385,7 +385,7 @@ export const optionalChangeRebaser: FieldChangeRebaser<OptionalChangeset> = {
 			const rebasedChildChange = rebaseChild(
 				undefined,
 				overChildChange,
-				rebasedId === "self" ? NodeExistenceState.Alive : NodeExistenceState.Dead,
+				rebasedId === "self" ? NodeAttachState.Attached : NodeAttachState.Detached,
 			);
 			if (rebasedChildChange !== undefined) {
 				rebasedChildChanges.push([rebasedId, rebasedChildChange]);

package/src/feature-libraries/sequence-field/rebase.ts

@@ -11,7 +11,7 @@ import {
 	type CrossFieldManager,
 	CrossFieldTarget,
 	type NodeChangeRebaser,
-	NodeExistenceState,
+	NodeAttachState,
 	type NodeId,
 	type RebaseRevisionMetadata,
 } from "../modular-schema/index.js";
@@ -74,7 +74,6 @@ export function rebase(
 	genId: IdAllocator,
 	manager: CrossFieldManager,
 	revisionMetadata: RebaseRevisionMetadata,
-	nodeExistenceState: NodeExistenceState = NodeExistenceState.Alive,
 ): Changeset {
 	return rebaseMarkList(
 		change,
@@ -83,7 +82,6 @@ export function rebase(
 		rebaseChild,
 		genId,
 		manager as MoveEffectTable,
-		nodeExistenceState,
 	);
 }
 
@@ -94,20 +92,13 @@ function rebaseMarkList(
 	rebaseChild: NodeChangeRebaser,
 	genId: IdAllocator,
 	moveEffects: CrossFieldManager<MoveEffect>,
-	nodeExistenceState: NodeExistenceState,
 ): MarkList {
 	const factory = new MarkListFactory();
 	const queue = new RebaseQueue(baseMarkList, currMarkList, metadata, moveEffects);
 
 	while (!queue.isEmpty()) {
 		const { baseMark, newMark: currMark } = queue.pop();
-		const rebasedMark = rebaseMark(
-			currMark,
-			baseMark,
-			rebaseChild,
-			moveEffects,
-			nodeExistenceState,
-		);
+		const rebasedMark = rebaseMark(currMark, baseMark, rebaseChild, moveEffects);
 		factory.push(rebasedMark);
 	}
 
@@ -272,7 +263,6 @@ function rebaseMark(
 	baseMark: Mark,
 	rebaseChild: NodeChangeRebaser,
 	moveEffects: MoveEffectTable,
-	nodeExistenceState: NodeExistenceState,
 ): Mark {
 	const rebasedMark = rebaseNodeChange(cloneMark(currMark), baseMark, rebaseChild);
 	const movedNodeChanges = getMovedChangesFromBaseMark(moveEffects, baseMark);
@@ -284,15 +274,10 @@ function rebaseMark(
 		rebasedMark.changes = movedNodeChanges;
 	}
 
-	return rebaseMarkIgnoreChild(rebasedMark, baseMark, moveEffects, nodeExistenceState);
+	return rebaseMarkIgnoreChild(rebasedMark, baseMark, moveEffects);
 }
 
-function rebaseMarkIgnoreChild(
-	currMark: Mark,
-	baseMark: Mark,
-	moveEffects: MoveEffectTable,
-	nodeExistenceState: NodeExistenceState,
-): Mark {
+function rebaseMarkIgnoreChild(currMark: Mark, baseMark: Mark, moveEffects: MoveEffectTable): Mark {
 	let rebasedMark: Mark;
 	if (isDetach(baseMark)) {
 		if (baseMark.cellId !== undefined) {
@@ -341,13 +326,11 @@ function rebaseMarkIgnoreChild(
 			currMark,
 			{ ...baseMark.attach, cellId: cloneCellId(baseMark.cellId), count: baseMark.count },
 			moveEffects,
-			nodeExistenceState,
 		);
 		rebasedMark = rebaseMarkIgnoreChild(
 			halfRebasedMark,
 			{ ...baseMark.detach, count: baseMark.count },
 			moveEffects,
-			nodeExistenceState,
 		);
 	} else {
 		rebasedMark = currMark;
@@ -465,19 +448,18 @@ function rebaseNodeChange(currMark: Mark, baseMark: Mark, nodeRebaser: NodeChang
 		return currMark;
 	}
 
-	if (markEmptiesCells(baseMark) && !isMoveMark(baseMark)) {
-		return withNodeChange(
-			currMark,
-			nodeRebaser(currChange, baseChange, NodeExistenceState.Dead),
-		);
-	} else if (markFillsCells(baseMark) && !isMoveMark(baseMark)) {
-		return withNodeChange(
-			currMark,
-			nodeRebaser(currChange, baseChange, NodeExistenceState.Alive),
-		);
-	}
+	const nodeState = nodeStateAfterMark(baseMark);
+	return withNodeChange(currMark, nodeRebaser(currChange, baseChange, nodeState));
+}
 
-	return withNodeChange(currMark, nodeRebaser(currChange, baseChange));
+function nodeStateAfterMark(mark: Mark): NodeAttachState {
+	if (markEmptiesCells(mark)) {
+		return NodeAttachState.Detached;
+	} else if (markFillsCells(mark)) {
+		return NodeAttachState.Attached;
+	} else {
+		return mark.cellId === undefined ? NodeAttachState.Attached : NodeAttachState.Detached;
+	}
 }
 
 function makeDetachedMark(mark: Mark, cellId: ChangeAtomId): Mark {

package/src/index.ts

@@ -272,7 +272,6 @@ export {
 	type TreeArrayNodeBase,
 	type ITree,
 	type TreeNodeSchema,
-	TreeConfiguration,
 	TreeViewConfiguration,
 	type ITreeViewConfiguration,
 	type ITreeConfigurationOptions,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/tree";
-export const pkgVersion = "2.0.0-dev-rc.5.0.0.271262";
+export const pkgVersion = "2.0.0-dev-rc.5.0.0.272251";

package/src/shared-tree/schematizingTreeView.ts

@@ -233,8 +233,6 @@ export class SchematizingSimpleTreeView<in out TRootSchema extends ImplicitField
 					lastRoot = this.root;
 					this.events.emit("rootChanged");
 				}
-
-				this.events.emit("afterBatch");
 			});
 
 			const onViewDispose = (): void => {

package/src/shared-tree/sharedTree.ts

@@ -142,6 +142,7 @@ interface ExplicitCodecVersions extends ExplicitCoreCodecVersions {
 const formatVersionToTopLevelCodecVersions = new Map<number, ExplicitCodecVersions>([
 	[1, { forest: 1, schema: 1, detachedFieldIndex: 1, editManager: 1, message: 1, fieldBatch: 1 }],
 	[2, { forest: 1, schema: 1, detachedFieldIndex: 1, editManager: 2, message: 2, fieldBatch: 1 }],
+	[3, { forest: 1, schema: 1, detachedFieldIndex: 1, editManager: 3, message: 3, fieldBatch: 1 }],
 ]);
 
 function getCodecVersions(formatVersion: number): ExplicitCodecVersions {
@@ -203,6 +204,7 @@ export class SharedTree
 				policy: defaultSchemaPolicy,
 			},
 			encodeType: options.treeEncodeType,
+			originatorId: runtime.idCompressor.localSessionId,
 			idCompressor: runtime.idCompressor,
 		};
 		const forestSummarizer = new ForestSummarizer(
@@ -361,6 +363,11 @@ export const SharedTreeFormatVersion = {
 	 * Requires \@fluidframework/tree \>= 2.0.0.
 	 */
 	v2: 2,
+
+	/**
+	 * Requires \@fluidframework/tree \>= 2.0.0.
+	 */
+	v3: 3,
 } as const;
 
 /**
@@ -427,7 +434,7 @@ export const defaultSharedTreeOptions: Required<SharedTreeOptions> = {
 	jsonValidator: noopValidator,
 	forest: ForestType.Reference,
 	treeEncodeType: TreeCompressionStrategy.Compressed,
-	formatVersion: SharedTreeFormatVersion.v2,
+	formatVersion: SharedTreeFormatVersion.v3,
 };
 
 /**