@fluidframework/container-runtime 2.0.0-internal.6.1.1 → 2.0.0-internal.6.3.0

package/src/id-compressor/idCompressor.ts

@@ -3,218 +3,145 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-
-import { assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
+import { bufferToString, stringToBuffer } from "@fluid-internal/client-utils";
 import {
+	IdCreationRange,
 	IIdCompressor,
 	IIdCompressorCore,
-	LocalCompressedId,
-	FinalCompressedId,
-	SessionSpaceCompressedId,
-	StableId,
 	OpSpaceCompressedId,
-	SessionId,
-	CompressedId,
-} from "@fluidframework/runtime-definitions";
-import type {
-	IdCreationRange,
-	SerializedCluster,
-	SerializedClusterOverrides,
 	SerializedIdCompressor,
 	SerializedIdCompressorWithNoSession,
 	SerializedIdCompressorWithOngoingSession,
-	SerializedLocalState,
-	SerializedSessionData,
-	UnackedLocalId,
-	VersionedSerializedIdCompressor,
+	SessionId,
+	SessionSpaceCompressedId,
+	StableId,
+	initialClusterCapacity,
 } from "@fluidframework/runtime-definitions";
-import BTree from "sorted-btree";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils";
+import { FinalCompressedId, isFinalId, LocalCompressedId, NumericUuid } from "./identifiers";
 import {
-	hasAtLeastLength,
-	compareFiniteNumbers,
-	compareFiniteNumbersReversed,
-	compareMaps,
-	compareStrings,
-	fail,
-	Mutable,
-	setPropertyIfDefined,
-} from "./utils";
-import { assertIsStableId, isStableId } from "./uuidUtilities";
-import { AppendOnlySortedMap } from "./appendOnlySortedMap";
-import { getIds } from "./idRange";
-import {
-	numericUuidEquals,
-	getPositiveDelta,
-	incrementUuid,
+	createSessionId,
+	localIdFromGenCount,
+	genCountFromLocalId,
 	numericUuidFromStableId,
-	NumericUuid,
+	offsetNumericUuid,
 	stableIdFromNumericUuid,
-	ensureSessionUuid,
-} from "./numericUuid";
-import { SessionIdNormalizer } from "./sessionIdNormalizer";
+	subtractNumericUuids,
+} from "./utilities";
+import {
+	Index,
+	readBoolean,
+	readNumber,
+	readNumericUuid,
+	writeBoolean,
+	writeNumber,
+	writeNumericUuid,
+} from "./persistanceUtilities";
+import {
+	getAlignedLocal,
+	getAlignedFinal,
+	IdCluster,
+	lastFinalizedLocal,
+	Session,
+	Sessions,
+} from "./sessions";
+import { SessionSpaceNormalizer } from "./sessionSpaceNormalizer";
+import { FinalSpace } from "./finalSpace";
 
 /**
- * A cluster of final (sequenced via consensus), sequentially allocated compressed IDs.
- * A final ID in a cluster decompresses to a UUID that is one of the following:
- * 1. A sequentially allocated UUID that is the result of adding its offset within the cluster to `baseUuid`.
- * 2. An override string (stored in `overrides`) specified at allocation time.
+ * The version of IdCompressor that is currently persisted.
+ * This should not be changed without careful consideration to compatibility.
  */
-interface IdCluster {
-	/**
-	 * The UUID corresponding to the first final ID in the cluster.
-	 */
-	readonly baseUuid: NumericUuid;
-
-	/**
-	 * The total number of final IDs reserved for allocation in the cluster.
-	 * Clusters are reserved in blocks as a performance optimization.
-	 */
-	capacity: number;
-
-	/**
-	 * The number of final IDs currently allocated in the cluster.
-	 */
-	count: number;
-
-	/**
-	 * The session in which this cluster was created
-	 */
-	readonly session: Session;
-
-	/**
-	 * Final IDs assigned override strings within this cluster.
-	 * These are one of the following:
-	 *
-	 * 1. The override string
-	 *
-	 * 2. The override string and external override details. This occurs when local IDs corresponding to the same
-	 * override string are created by different sessions before any have been finalized. This can occur due to
-	 * concurrency or offline. In this case, the string is stored for the final ID that got sequenced first, and that
-	 * final ID is stored associated with all subsequent final IDs with the same override.
-	 *
-	 * When a final ID which is safely reserved via consensus as part of a cluster (but is not yet sequenced) is
-	 * allocated with an override, this collection will be temporarily inaccurate as it will not contain an entry for
-	 * that final ID. This absence indicates the uncertainty about what the final ID associated with that override will
-	 * be after finalizing the range (which could change due to unification of a concurrent duplicate override).
-	 * This table will be adjusted to reflect the override when that final ID is finalized via consensus, and
-	 * decompression will use `clustersAndOverridesInversion` until that point.
-	 */
-	overrides?: Map<FinalCompressedId, string | UnifiedOverride>;
-}
-
-type UnifiedOverride = OverrideCompressionDetails & {
-	override: string;
-};
+const currentWrittenVersion = 1;
 
 /**
- * Data about a SharedTree session.
- * Used to track and allocate identity clusters associated with a particular session ID.
+ * See {@link IIdCompressor} and {@link IIdCompressorCore}
  */
-interface Session {
-	readonly sessionUuid: NumericUuid;
-
-	/**
-	 * `cluster` is undefined if a new cluster must be allocated when the session requests the next final ID allocation.
-	 */
-	currentClusterDetails:
-		| { readonly clusterBase: FinalCompressedId; readonly cluster: IdCluster }
-		| undefined;
-
+export class IdCompressor implements IIdCompressor, IIdCompressorCore {
 	/**
-	 * The last local ID known to be finalized for this session.
+	 * Max allowed initial cluster size.
 	 */
-	lastFinalizedLocalId: LocalCompressedId | undefined;
-}
-
-/**
- * Roughly equates to a minimum of 1M sessions before we start allocating 64 bit IDs.
- * This value must *NOT* change without careful consideration to compatibility.
- */
-export const defaultClusterCapacity = 512;
-
-/**
- * The base UUID for the reserved id cluster.
- * This should not be changed without consideration to compatibility.
- */
-const reservedSessionId = ensureSessionUuid(
-	assertIsStableId("decaf40b-3c1a-47f8-a7a1-e8461ddb69ce"),
-);
-
-/**
- * @returns true if the supplied ID is a final ID.
- */
-export function isFinalId(id: CompressedId): id is FinalCompressedId {
-	return id >= 0;
-}
+	public static readonly maxClusterSize = 2 ** 20;
 
-/**
- * @returns true if the supplied ID is a local ID.
- */
-export function isLocalId(id: CompressedId): id is LocalCompressedId {
-	return id < 0;
-}
+	// ----- Local state -----
 
-/**
- * A cluster in `clustersAndOverridesInversion`, which is mapped from the first stable ID in a cluster.
- */
-interface ClusterInfo {
-	readonly clusterBase: FinalCompressedId;
-	readonly cluster: IdCluster;
-}
+	public readonly localSessionId: SessionId;
+	private readonly localSession: Session;
+	private readonly normalizer = new SessionSpaceNormalizer();
+	// The number of IDs generated by the local session
+	private localGenCount = 0;
 
-interface OverrideCompressionDetails {
-	readonly originalOverridingFinal: FinalCompressedId;
-	readonly associatedLocalId?: LocalCompressedId;
-}
+	// -----------------------
 
-/**
- * An override with a final ID associated with it.
- *
- * `associatedLocalId` is present on this type when a local ID in this session is associated with the override.
- *
- * It may be present even when `overriddenFinalId` was created by another session. This occurs when local IDs corresponding to the
- * same override string are created by different sessions before any have been finalized. `overriddenFinalId` will be set to
- * the *first* finalized ID with that string, but `associatedLocal` will be set to the local session's local ID for that string. This is
- * done to preserve the invariant that an override will always compress into the same session-space ID for the lifetime of the session.
- */
-interface FinalizedOverride extends OverrideCompressionDetails {
-	readonly cluster: IdCluster;
-}
+	// ----- Final state -----
 
-/**
- * The value of a mapping in `clustersAndOverridesInversion`, which maps an override to the cluster containing it (if finalized) or the
- * local ID corresponding to it (if unfinalized).
- *
- * Override strings associated with local IDs stored in `clustersAndOverridesInversion` are *always* replaced immediately upon finalizing,
- * and thus it is typed as op-space (unacked local).
- */
-type Override = UnackedLocalId | FinalizedOverride;
+	// The gen count to be annotated on the range returned by the next call to `takeNextCreationRange`.
+	// This is updated to be equal to `generatedIdCount` + 1 each time it is called.
+	private nextRangeBaseGenCount = 1;
+	// The capacity of the next cluster to be created
+	private newClusterCapacity = initialClusterCapacity;
+	private readonly sessions = new Sessions();
+	private readonly finalSpace = new FinalSpace();
 
-type CompressionMapping = ClusterInfo | Override;
+	// -----------------------
 
-/** Prepended to all keys in {@link IdCompressor.clustersAndOverridesInversion} that are override strings and not valid `StableIds` */
-const nonStableOverridePrefix = "\ue15e"; // A character in the Private Use Area of the BMP (https://en.wikipedia.org/wiki/Private_Use_Areas)
+	// ----- Telemetry state -----
 
-/** Keys of {@link IdCompressor.clustersAndOverridesInversion} */
-type InversionKey = `${typeof nonStableOverridePrefix}${string}` | StableId;
+	// The number of local IDs generated since the last telemetry was sent.
+	private telemetryLocalIdCount = 0;
+	// The number of eager final IDs generated since the last telemetry was sent.
+	private telemetryEagerFinalIdCount = 0;
 
-/**
- * See {@link IIdCompressor}
- */
-export class IdCompressor implements IIdCompressorCore, IIdCompressor {
-	/**
-	 * Max allowed cluster size
-	 */
-	public static maxClusterSize = 2 ** 20;
+	// -----------------------
 
-	/**
-	 * Trivially reach consensus on default cluster size and reserved IDs.
-	 * These initial values must *NOT* change without careful consideration to compatibility.
-	 */
-	private newClusterCapacity = defaultClusterCapacity;
+	private constructor(
+		localSessionIdOrDeserialized: SessionId | Sessions,
+		private readonly logger?: ITelemetryLoggerExt,
+	) {
+		if (typeof localSessionIdOrDeserialized === "string") {
+			this.localSessionId = localSessionIdOrDeserialized;
+			this.localSession = this.sessions.getOrCreate(localSessionIdOrDeserialized);
+		} else {
+			// Deserialize case
+			this.sessions = localSessionIdOrDeserialized;
+			// As policy, the first session is always the local session. Preserve this invariant
+			// during deserialization.
+			const firstSession = localSessionIdOrDeserialized.sessions().next();
+			assert(!firstSession.done, 0x754 /* First session must be present. */);
+			this.localSession = firstSession.value;
+			this.localSessionId = stableIdFromNumericUuid(
+				this.localSession.sessionUuid,
+			) as SessionId;
+		}
+	}
+
+	public static create(logger?: ITelemetryBaseLogger): IdCompressor;
+	public static create(sessionId: SessionId, logger?: ITelemetryBaseLogger): IdCompressor;
+	public static create(
+		sessionIdOrLogger?: SessionId | ITelemetryBaseLogger,
+		loggerOrUndefined?: ITelemetryBaseLogger,
+	): IdCompressor {
+		let localSessionId: SessionId;
+		let logger: ITelemetryBaseLogger | undefined;
+		if (sessionIdOrLogger === undefined) {
+			localSessionId = createSessionId();
+		} else {
+			if (typeof sessionIdOrLogger === "string") {
+				localSessionId = sessionIdOrLogger;
+				logger = loggerOrUndefined;
+			} else {
+				localSessionId = createSessionId();
+				logger = loggerOrUndefined;
+			}
+		}
+		const compressor = new IdCompressor(
+			localSessionId,
+			logger === undefined ? undefined : createChildLogger({ logger }),
+		);
+		return compressor;
+	}
 
 	/**
 	 * The size of each newly created ID cluster.
@@ -228,315 +155,83 @@ export class IdCompressor implements IIdCompressorCore, IIdCompressor {
 	 * `IdCompressor.maxClusterSize`.
 	 */
 	public set clusterCapacity(value: number) {
-		assert(value > 0, 0x481 /* Clusters must have a positive capacity */);
-		assert(
-			value <= IdCompressor.maxClusterSize,
-			0x482 /* Clusters must not exceed max cluster size */,
-		);
+		if (value <= 0) {
+			throw new Error("Clusters must have a positive capacity.");
+		}
+		if (value > IdCompressor.maxClusterSize) {
+			throw new Error("Clusters must not exceed max cluster size.");
+		}
 		this.newClusterCapacity = value;
 	}
 
-	/**
-	 * Session ID -\> data about the session's current cluster.
-	 * Sessions are mutable, and thus should only be created via `createSession`.
-	 */
-	private readonly sessions = new Map<SessionId, Session>();
-
-	/**
-	 * The `IdCompressor`'s current local session.
-	 */
-	private readonly localSession: Session;
-
-	/**
-	 * The base final ID of the next cluster to be created.
-	 */
-	private nextClusterBaseFinalId: FinalCompressedId = 0 as FinalCompressedId;
-
-	/**
-	 * Total number of IDs created locally during the current session.
-	 */
-	private localIdCount = 0;
-
-	/**
-	 * The most recent (i.e. smallest, due to being negative) local ID in a range returned by `takeNextCreationRange`.
-	 * Undefined if no non-empty ranges have ever been returned by this compressor.
-	 */
-	private lastTakenLocalId: LocalCompressedId | undefined;
-
-	/**
-	 * Maps local IDs to override strings. This will contain an entry for every override assigned to a local ID generated during
-	 * the current session, and retains entries for the lifetime of this compressor.
-	 */
-	private readonly localOverrides = new AppendOnlySortedMap<LocalCompressedId, string>(
-		compareFiniteNumbersReversed,
-	);
-
-	/**
-	 * Maps local IDs to the final ID they are associated with (if any), and maps final IDs to the corresponding local ID (if any).
-	 * This is used to efficiently compute normalization. This map can be thought of as mapping ranges of "optimistic uncertainty"
-	 * (local IDs) to the result of consensus (reserved ranges of final IDs, a.k.a. clusters). Any given range of local IDs
-	 * does not necessarily span an entire cluster, as some session-space IDs may be allocated *after* a cluster has been allocated
-	 * but before it is full. In this case, there is no uncertainty, as the range of final IDs was reserved when the cluster was created.
-	 * However, there is always a range of local IDs with size \>= 1 associated with the beginning of every cluster, as clusters are only
-	 * created *after* they are needed and thus there is some period of uncertainty after local IDs have been handed out but before the
-	 * range containing them has been finalized. There may also be ranges of local IDs that do not start at the beginning of a
-	 * cluster; this happens when a cluster is expanded instead of allocating a new one.
-	 * Additionally, session space IDs associated with an override string will also always be local IDs, because there is uncertainty as
-	 * to whether another client simultaneously allocated the same override and could get sequenced first (a.k.a. unification) and its
-	 * final ID would be associated with that override.
-	 * See `SessionIdNormalizer` for more.
-	 */
-	private sessionIdNormalizer = new SessionIdNormalizer<IdCluster>();
-
-	/**
-	 * Contains entries for cluster base UUIDs and override strings (both local and final).
-	 * As a performance optimization, entries for finalized strings also include the containing cluster object.
-	 * This can be viewed as three separate tables: the inverse table for `localOverrides`, the inverse table for the union of all
-	 * the overrides of the clusters in `finalIdToCluster`, and the inverse lookup of cluster base UUIDs to their clusters.
-	 * This is unified as a performance optimization, as the common case does not have overridden IDs. It is a btree due to the need
-	 * to make range queries.
-	 */
-	private readonly clustersAndOverridesInversion: BTree<InversionKey, CompressionMapping> =
-		new BTree(undefined, compareStrings);
-
-	/**
-	 * Maps the first final ID in a cluster to its owning cluster.
-	 * Can be searched in O(log n) to determine clusters for any final ID.
-	 */
-	private readonly finalIdToCluster: AppendOnlySortedMap<FinalCompressedId, IdCluster> =
-		new AppendOnlySortedMap(compareFiniteNumbers);
-
-	private readonly logger: ITelemetryLoggerExt;
+	public generateCompressedId(): SessionSpaceCompressedId {
+		this.localGenCount++;
+		const lastCluster = this.localSession.getLastCluster();
+		if (lastCluster === undefined) {
+			this.telemetryLocalIdCount++;
+			return this.generateNextLocalId();
+		}
 
-	/**
-	 * @param localSessionId - the `IdCompressor`'s current local session ID.
-	 * {@link generateStableId}.
-	 */
-	public constructor(public readonly localSessionId: SessionId, logger?: ITelemetryBaseLogger) {
-		this.localSession = this.createSession(localSessionId);
-		this.logger = createChildLogger({ logger });
+		// If there exists a cluster of final IDs already claimed by the local session that still has room in it,
+		// it is known prior to range sequencing what a local ID's corresponding final ID will be.
+		// In this case, it is safe to return the final ID immediately. This is guaranteed to be safe because
+		// any op that the local session sends that contains one of those final IDs are guaranteed to arrive to
+		// collaborators *after* the one containing the creation range.
+		const clusterOffset = this.localGenCount - genCountFromLocalId(lastCluster.baseLocalId);
+		if (lastCluster.capacity > clusterOffset) {
+			this.telemetryEagerFinalIdCount++;
+			// Space in the cluster: eager final
+			return ((lastCluster.baseFinalId as number) +
+				clusterOffset) as SessionSpaceCompressedId;
+		}
+		// No space in the cluster, return next local
+		this.telemetryLocalIdCount++;
+		return this.generateNextLocalId();
 	}
 
-	/**
-	 * Creates a session object for the supplied ID.
-	 * Must only be called once per ID.
-	 * @param sessionId - the ID for the session
-	 * @returns the session object for the supplied ID
-	 */
-	private createSession(sessionId: SessionId): Session {
-		assert(
-			!this.clustersAndOverridesInversion.has(sessionId),
-			0x484 /* Attempted to create duplicate session */,
-		);
-		const existingSession = this.sessions.get(sessionId);
-		if (existingSession !== undefined) {
-			fail("createSession must only be called once for each session ID.");
-		}
-		const sessionUuid = numericUuidFromStableId(sessionId);
-		const session: Session = {
-			sessionUuid,
-			currentClusterDetails: undefined,
-			lastFinalizedLocalId: undefined,
-		};
-		this.sessions.set(sessionId, session);
-		return session;
+	private generateNextLocalId(): LocalCompressedId {
+		// Must tell the normalizer that we generated a local ID
+		this.normalizer.addLocalRange(this.localGenCount, 1);
+		return localIdFromGenCount(this.localGenCount);
 	}
 
-	/**
-	 * Returns a range of local IDs created by this session in a format for sending to the server for finalizing.
-	 * The range will include all local IDs generated via calls to `generateCompressedId` since the last time this method was called.
-	 * @returns the range of session-local IDs, which may be empty. This range must be sent to the server for ordering before
-	 * it is finalized. Ranges must be sent to the server in the order that they are taken via calls to this method.
-	 */
 	public takeNextCreationRange(): IdCreationRange {
-		const lastLocalInRange = -this.localIdCount as UnackedLocalId;
-		const lastTakenNormalized = this.lastTakenLocalId ?? 0;
-		assert(lastLocalInRange <= lastTakenNormalized, 0x485 /* Inconsistent local ID state */);
-
-		let ids: IdCreationRange.Ids | undefined;
-		if (lastLocalInRange !== lastTakenNormalized) {
-			const firstLocalInRange = (lastTakenNormalized - 1) as UnackedLocalId;
-			const overrides = [
-				...this.localOverrides.getRange(
-					(lastTakenNormalized - 1) as LocalCompressedId,
-					lastLocalInRange as LocalCompressedId,
-				),
-			] as (readonly [UnackedLocalId, string])[];
-			if (hasAtLeastLength(overrides, 1)) {
-				assert(
-					overrides[0][0] <= firstLocalInRange,
-					0x486 /* Inconsistent override state */,
-				);
-				assert(
-					overrides[overrides.length - 1][0] >= lastLocalInRange,
-					0x487 /* Inconsistent override state */,
-				);
-				ids = {
-					overrides,
-				};
-				const first = firstLocalInRange === overrides[0][0] ? undefined : firstLocalInRange;
-				const last =
-					lastLocalInRange === overrides[overrides.length - 1][0]
-						? undefined
-						: lastLocalInRange;
-				setPropertyIfDefined(first, ids, "first");
-				setPropertyIfDefined(last, ids, "last");
-			} else {
-				ids = {
-					first: firstLocalInRange,
-					last: lastLocalInRange,
-				};
-			}
-			this.lastTakenLocalId = lastLocalInRange;
-		}
-
-		const range: Mutable<IdCreationRange> = { sessionId: this.localSessionId };
-
-		if (ids === undefined) {
-			return range;
+		const count = this.localGenCount - (this.nextRangeBaseGenCount - 1);
+		if (count === 0) {
+			return {
+				sessionId: this.localSessionId,
+			};
 		}
-
-		assert(
-			this.lastTakenLocalId === -this.localIdCount &&
-				this.lastTakenLocalId !== lastTakenNormalized,
-			0x488 /* Non-empty range must properly consume local IDs */,
-		);
-
-		range.ids = ids;
+		const range: IdCreationRange = {
+			sessionId: this.localSessionId,
+			ids: {
+				firstGenCount: this.nextRangeBaseGenCount,
+				count,
+			},
+		};
+		this.nextRangeBaseGenCount = this.localGenCount + 1;
 		return range;
 	}
 
-	/**
-	 * Finalizes the supplied range of IDs (which may be from either a remote or local session).
-	 * @param range - the range of session-local IDs to finalize.
-	 */
 	public finalizeCreationRange(range: IdCreationRange): void {
-		const { sessionId } = range;
-
-		const isLocal = sessionId === this.localSessionId;
-		const session = this.sessions.get(sessionId) ?? this.createSession(sessionId);
-
-		const ids = getIds(range);
-		if (ids === undefined) {
+		// Check if the range has IDs
+		if (range.ids === undefined) {
 			return;
 		}
 
-		const { currentClusterDetails } = session;
-		const { cluster: currentCluster, clusterBase: currentBaseFinalId } =
-			currentClusterDetails ?? {
-				cluster: undefined,
-				clusterBase: undefined,
-			};
-		const currentClusterExists =
-			currentCluster !== undefined && currentBaseFinalId !== undefined;
-
-		const normalizedLastFinalizedLocal = session.lastFinalizedLocalId ?? 0;
-		const { first: newFirstFinalizedLocal, last: newLastFinalizedLocal } = ids;
-		assert(
-			newFirstFinalizedLocal === normalizedLastFinalizedLocal - 1,
-			0x489 /* Ranges finalized out of order. */,
-		);
-
-		// The total number of session-local IDs to finalize
-		const finalizeCount = normalizedLastFinalizedLocal - newLastFinalizedLocal;
-		assert(finalizeCount >= 1, 0x48a /* Cannot finalize an empty range. */);
-
-		let eagerFinalIdCount = 0;
-		let initialClusterCount = 0;
-		let remainingCount = finalizeCount;
-		let newBaseUuid: NumericUuid | undefined;
-		if (currentClusterExists) {
-			if (isLocal) {
-				const lastKnownFinal =
-					this.sessionIdNormalizer.getLastFinalId() ??
-					fail("Cluster exists but normalizer does not have an entry for it.");
-				const lastAlignedFinalInCluster = (currentBaseFinalId +
-					Math.min(currentCluster.count + finalizeCount, currentCluster.capacity) -
-					1) as FinalCompressedId;
-				if (lastAlignedFinalInCluster > lastKnownFinal) {
-					this.sessionIdNormalizer.addFinalIds(
-						(lastKnownFinal + 1) as FinalCompressedId,
-						lastAlignedFinalInCluster,
-						currentCluster,
-					);
-				}
-			}
-			initialClusterCount = currentCluster.count;
-			const remainingCapacity = currentCluster.capacity - initialClusterCount;
-			const overflow = remainingCount - remainingCapacity;
-			const hasRoom = overflow <= 0;
-			if (hasRoom || currentBaseFinalId === this.finalIdToCluster.maxKey()) {
-				currentCluster.count += remainingCount;
-				eagerFinalIdCount = remainingCount;
-				remainingCount = 0;
-				// The common case is that there is room in the cluster, and the new final IDs can simply be added to it
-				if (!hasRoom) {
-					// The cluster is full but is the last in the list of clusters.
-					// This allows it to be expanded instead of allocating a new one.
-					const expansionAmount = this.newClusterCapacity + overflow;
-					const previousCapacity = currentCluster.capacity;
-					currentCluster.capacity += expansionAmount;
-					this.nextClusterBaseFinalId = (this.nextClusterBaseFinalId +
-						expansionAmount) as FinalCompressedId;
-					assert(
-						this.nextClusterBaseFinalId < Number.MAX_SAFE_INTEGER,
-						0x48b /* The number of allocated final IDs must not exceed the JS maximum safe integer. */,
-					);
-					this.checkClusterForCollision(currentCluster);
-					if (isLocal) {
-						// Example with cluster size of 3:
-						// Ids generated so far:   -1  1  2 -4 -5  <-- note positive numbers are eager finals
-						//         Cluster:      [  0  1  2 ]
-						// ~ finalizing happens, causing expansion of 2 (overflow) + 3 (cluster capacity) ~
-						//        Cluster:       [  0  1  2  3  4  _  _  _ ]
-						// corresponding locals:   -1       -4 -5
-						//      lastFinalizedLocalId^           ^newLastFinalizedLocalId = -5
-						//                  overflow = 2:    ----
-						//                       localIdPivot^
-						//                    lastFinalizedFinal^
-						const newLastFinalizedFinal = (currentBaseFinalId +
-							currentCluster.count -
-							1) as FinalCompressedId;
-						assert(
-							session.lastFinalizedLocalId !== undefined,
-							0x48c /* Cluster already exists for session but there is no finalized local ID */,
-						);
-						const finalPivot = (newLastFinalizedFinal -
-							overflow +
-							1) as FinalCompressedId;
-						// Inform the normalizer of all IDs that we now know will end up being finalized into this cluster, including the ones
-						// that were given out as locals (non-eager) because they exceeded the bounds of the current cluster before it was expanded.
-						// It is safe to associate the unfinalized locals with their future final IDs even before the ranges for those locals are
-						// actually finalized, because total order broadcast guarantees that any usage of those final IDs will be observed after
-						// the finalization of the ranges.
-						this.sessionIdNormalizer.registerFinalIdBlock(
-							finalPivot,
-							expansionAmount,
-							currentCluster,
-						);
-						this.logger?.sendTelemetryEvent({
-							eventName: "RuntimeIdCompressor:ClusterExpansion",
-							sessionId: this.localSessionId,
-							previousCapacity,
-							newCapacity: currentCluster.capacity,
-							overflow,
-						});
-					}
-				}
-			} else {
-				// The range cannot be fully allocated in the existing cluster, so allocate any space left in it and
-				// form a new one by incrementing the previous baseUuid
-				newBaseUuid = incrementUuid(currentCluster.baseUuid, currentCluster.capacity);
-				currentCluster.count += remainingCapacity;
-				remainingCount -= remainingCapacity;
-				this.logger?.sendTelemetryEvent({
-					eventName: "RuntimeIdCompressor:OverfilledCluster",
-					sessionId: this.localSessionId,
-				});
+		assert(range.ids.count > 0, 0x755 /* Malformed ID Range. */);
+		const { sessionId, ids } = range;
+		const { count, firstGenCount } = ids;
+		const session = this.sessions.getOrCreate(sessionId);
+		const isLocal = session === this.localSession;
+		const rangeBaseLocal = localIdFromGenCount(firstGenCount);
+		let lastCluster = session.getLastCluster();
+		if (lastCluster === undefined) {
+			// This is the first cluster in the session space
+			if (rangeBaseLocal !== -1) {
+				throw new Error("Ranges finalized out of order.");
 			}
-		} else {
-			// Session has never made a cluster, form a new one with the session UUID as the baseUuid
-			newBaseUuid = session.sessionUuid;
+			lastCluster = this.addEmptyCluster(session, this.clusterCapacity + count);
 			if (isLocal) {
 				this.logger?.sendTelemetryEvent({
 					eventName: "RuntimeIdCompressor:FirstCluster",
@@ -545,177 +240,44 @@ export class IdCompressor implements IIdCompressorCore, IIdCompressor {
 			}
 		}
 
-		// Finalizing a range results in one of three cases:
-		// 1. All local IDs are finalized into a new cluster (because there was either never a cluster for that session, or the current
-		//		cluster for the session was full).
-		// 2. All local IDs are finalized into the existing (current) cluster for the session.
-		// 3. Local IDs are finalized into both the current cluster and a new one, as the current cluster did not have enough room.
-		let newCluster: IdCluster | undefined;
-		let newBaseFinalId: FinalCompressedId | undefined;
-		// The first local ID that will be finalized into a new cluster, if there is one.
-		// This lets us quickly compare which cluster an override string will go into.
-		let localIdPivot: LocalCompressedId | undefined;
-
-		// Need to make a new cluster
-		if (newBaseUuid !== undefined) {
-			if (remainingCount <= 0) {
-				fail("Should not create an empty cluster.");
-			}
-			if (currentCluster !== undefined && currentCluster.capacity !== currentCluster.count) {
-				fail("Cluster must be filled before another is allocated.");
-			}
-
-			newBaseFinalId = this.nextClusterBaseFinalId;
-			const newCapacity = Math.max(this.newClusterCapacity, remainingCount);
-			newCluster = {
-				baseUuid: newBaseUuid,
-				capacity: newCapacity,
-				count: remainingCount,
-				session,
-			};
-
-			const usedCapacity = finalizeCount - remainingCount;
-			localIdPivot = (newFirstFinalizedLocal - usedCapacity) as LocalCompressedId;
-
-			if (isLocal) {
-				this.logger?.sendTelemetryEvent({
-					eventName: "RuntimeIdCompressor:NewCluster",
-					sessionId: this.localSessionId,
-					clusterCapacity: newCapacity,
-					clusterCount: remainingCount,
-				});
-				this.sessionIdNormalizer.registerFinalIdBlock(
-					newBaseFinalId,
-					newCluster.capacity,
-					newCluster,
-				);
-			}
-
-			this.checkClusterForCollision(newCluster);
-			this.clustersAndOverridesInversion.set(stableIdFromNumericUuid(newCluster.baseUuid), {
-				clusterBase: newBaseFinalId,
-				cluster: newCluster,
-			});
-			session.currentClusterDetails = { cluster: newCluster, clusterBase: newBaseFinalId };
-			this.nextClusterBaseFinalId = (this.nextClusterBaseFinalId +
-				newCluster.capacity) as FinalCompressedId;
-			assert(
-				this.nextClusterBaseFinalId < Number.MAX_SAFE_INTEGER,
-				0x48e /* The number of allocated final IDs must not exceed the JS maximum safe integer. */,
-			);
-			this.finalIdToCluster.append(newBaseFinalId, newCluster);
+		const remainingCapacity = lastCluster.capacity - lastCluster.count;
+		if (lastCluster.baseLocalId - lastCluster.count !== rangeBaseLocal) {
+			throw new Error("Ranges finalized out of order.");
 		}
 
-		// If there are overrides, we must determine which cluster object (current or overflow) each belongs to and add it.
-		const overrides = ids.overrides;
-		if (overrides !== undefined) {
-			for (let i = 0; i < overrides.length; i++) {
-				const [overriddenLocal, override] = overrides[i];
-				// Note: recall that local IDs are negative
-				assert(
-					i === 0 || overriddenLocal < overrides[i - 1][0],
-					0x48f /* Override IDs must be in sorted order. */,
-				);
-				assert(
-					overriddenLocal < normalizedLastFinalizedLocal,
-					0x490 /* Ranges finalized out of order. */,
-				);
-				assert(
-					overriddenLocal >= newLastFinalizedLocal,
-					0x491 /* Malformed range: override ID ahead of range start. */,
-				);
-				let cluster: IdCluster;
-				let overriddenFinal: FinalCompressedId;
-				if (localIdPivot !== undefined && overriddenLocal <= localIdPivot) {
-					// Override is at or past the pivot, so it is in a new cluster.
-					assert(
-						newCluster !== undefined && newBaseFinalId !== undefined,
-						0x492 /* No cluster was created when overflow occurred. */,
-					);
-					cluster = newCluster;
-					overriddenFinal = (newBaseFinalId +
-						(localIdPivot - overriddenLocal)) as FinalCompressedId;
-				} else {
-					// Override was finalized into an existing cluster
-					assert(
-						currentCluster !== undefined && currentBaseFinalId !== undefined,
-						0x493 /* No cluster exists but IDs were finalized. */,
-					);
-					cluster = currentCluster;
-					overriddenFinal = (currentBaseFinalId +
-						initialClusterCount +
-						(normalizedLastFinalizedLocal - overriddenLocal) -
-						1) as FinalCompressedId;
-				}
-				cluster.overrides ??= new Map();
-
-				const inversionKey = IdCompressor.createInversionKey(override);
-				const existingIds = this.getExistingIdsForNewOverride(inversionKey, true);
-				let overrideForCluster: string | FinalCompressedId;
-				let associatedLocal: LocalCompressedId | undefined;
-				if (existingIds !== undefined) {
-					let mostFinalExistingOverride: CompressedId;
-					if (typeof existingIds === "number") {
-						mostFinalExistingOverride = existingIds;
-						if (isLocalId(mostFinalExistingOverride)) {
-							associatedLocal = mostFinalExistingOverride;
-						}
-					} else {
-						[associatedLocal, mostFinalExistingOverride] = existingIds;
-					}
-					if (isFinalId(mostFinalExistingOverride)) {
-						// A previous range already finalized an ID with this override. See `IdCluster` for more.
-						overrideForCluster = mostFinalExistingOverride;
-					} else {
-						assert(
-							!isLocal || mostFinalExistingOverride === overriddenLocal,
-							0x494 /* Cannot have multiple local IDs with identical overrides. */,
-						);
-						// This session has created an ID with this override before, but has not finalized it yet. The incoming
-						// range "wins" and will contain the final ID associated with that override, regardless of if that range was
-						// made by this session or not.
-						overrideForCluster = override;
-					}
-				} else {
-					// This is the first time this override has been associated with any ID
-					overrideForCluster = override;
-				}
-
+		if (remainingCapacity >= count) {
+			// The current range fits in the existing cluster
+			lastCluster.count += count;
+		} else {
+			const overflow = count - remainingCapacity;
+			const newClaimedFinalCount = overflow + this.clusterCapacity;
+			if (lastCluster === this.finalSpace.getLastCluster()) {
+				// The last cluster in the sessions chain is the last cluster globally, so it can be expanded.
+				lastCluster.capacity += newClaimedFinalCount;
+				lastCluster.count += count;
 				assert(
-					!cluster.overrides.has(overriddenFinal),
-					0x495 /* Cannot add a second override for final id */,
+					!this.sessions.clusterCollides(lastCluster),
+					0x756 /* Cluster collision detected. */,
 				);
-				if (typeof overrideForCluster === "string") {
-					if (isLocal || associatedLocal === undefined) {
-						cluster.overrides.set(overriddenFinal, override);
-					} else {
-						cluster.overrides.set(overriddenFinal, {
-							override,
-							originalOverridingFinal: overriddenFinal,
-							associatedLocalId: associatedLocal,
-						});
-					}
-				} else {
-					const unifiedOverride: UnifiedOverride = {
-						override,
-						originalOverridingFinal: overrideForCluster,
-					};
-					setPropertyIfDefined(associatedLocal, unifiedOverride, "associatedLocalId");
-					cluster.overrides.set(overriddenFinal, unifiedOverride);
+				if (isLocal) {
+					this.logger?.sendTelemetryEvent({
+						eventName: "RuntimeIdCompressor:ClusterExpansion",
+						sessionId: this.localSessionId,
+						previousCapacity: lastCluster.capacity - newClaimedFinalCount,
+						newCapacity: lastCluster.capacity,
+						overflow,
+					});
 				}
-				const finalizedOverride: Mutable<FinalizedOverride> = {
-					cluster,
-					originalOverridingFinal: overriddenFinal,
-				};
-				setPropertyIfDefined(associatedLocal, finalizedOverride, "associatedLocalId");
-				const currentOverride = this.clustersAndOverridesInversion.get(inversionKey);
-				if (
-					currentOverride === undefined ||
-					IdCompressor.isUnfinalizedOverride(currentOverride)
-				) {
-					// Update the map to contain a finalized override, but never update it with future finalized overrides with
-					// the same string; those should decompress to the first final ID with that override.
-					this.clustersAndOverridesInversion.set(inversionKey, finalizedOverride);
+			} else {
+				// The last cluster in the sessions chain is *not* the last cluster globally. Fill and overflow to new.
+				lastCluster.count = lastCluster.capacity;
+				const newCluster = this.addEmptyCluster(session, newClaimedFinalCount);
+				newCluster.count += overflow;
+				if (isLocal) {
+					this.logger?.sendTelemetryEvent({
+						eventName: "RuntimeIdCompressor:NewCluster",
+						sessionId: this.localSessionId,
+					});
 				}
 			}
 		}
@@ -723,1133 +285,346 @@ export class IdCompressor implements IIdCompressorCore, IIdCompressor {
 		if (isLocal) {
 			this.logger?.sendTelemetryEvent({
 				eventName: "RuntimeIdCompressor:IdCompressorStatus",
-				eagerFinalIdCount: eagerFinalIdCount - (overrides?.length ?? 0),
-				localIdCount: remainingCount + (overrides?.length ?? 0),
-				overridesCount: overrides?.length ?? 0,
+				eagerFinalIdCount: this.telemetryEagerFinalIdCount,
+				localIdCount: this.telemetryLocalIdCount,
 				sessionId: this.localSessionId,
 			});
+			this.telemetryEagerFinalIdCount = 0;
+			this.telemetryLocalIdCount = 0;
 		}
 
-		session.lastFinalizedLocalId = newLastFinalizedLocal;
-	}
-
-	private checkClusterForCollision(cluster: IdCluster): void {
-		const maxClusterUuid = incrementUuid(cluster.baseUuid, cluster.capacity - 1);
-		const maxClusterStableId = stableIdFromNumericUuid(maxClusterUuid);
-		const closestMatch =
-			this.clustersAndOverridesInversion.getPairOrNextLower(maxClusterStableId);
-		if (closestMatch !== undefined) {
-			const [inversionKey, compressionMapping] = closestMatch;
-			if (!IdCompressor.isClusterInfo(compressionMapping)) {
-				if (
-					isStableId(inversionKey) &&
-					IdCompressor.uuidsMightCollide(
-						inversionKey,
-						maxClusterStableId,
-						cluster.capacity,
-					)
-				) {
-					const numericOverride = numericUuidFromStableId(inversionKey);
-					const delta = getPositiveDelta(
-						maxClusterUuid,
-						numericOverride,
-						cluster.capacity - 1,
-					);
-					if (delta !== undefined) {
-						IdCompressor.failWithCollidingOverride(inversionKey);
-					}
-				}
-			}
-		}
-	}
-
-	private static failWithCollidingOverride(override: string): void {
-		fail(`Override '${override}' collides with another allocated UUID.`);
-	}
-
-	private static isClusterInfo(
-		compressionMapping: CompressionMapping,
-	): compressionMapping is ClusterInfo {
-		return (compressionMapping as ClusterInfo).clusterBase !== undefined;
-	}
-
-	private static isUnfinalizedOverride(
-		compressionMapping: CompressionMapping,
-	): compressionMapping is UnackedLocalId {
-		return typeof compressionMapping === "number";
-	}
-
-	private static createInversionKey(inversionKey: string): InversionKey {
-		return isStableId(inversionKey)
-			? inversionKey
-			: `${nonStableOverridePrefix}${inversionKey}`;
-	}
-
-	private static isStableInversionKey(inversionKey: InversionKey): inversionKey is StableId {
-		return inversionKey.charAt(0) !== nonStableOverridePrefix;
+		assert(!session.isEmpty(), 0x757 /* Empty sessions should not be created. */);
 	}
 
-	/**
-	 * Returns an existing ID associated with an override, or undefined if none exists.
-	 */
-	private getExistingIdsForNewOverride(
-		inversionKey: InversionKey,
-		isFinalOverride: boolean,
-	): SessionSpaceCompressedId | [LocalCompressedId, FinalCompressedId] | undefined {
-		const closestMatch = this.clustersAndOverridesInversion.getPairOrNextLower(
-			inversionKey,
-			reusedArray,
+	private addEmptyCluster(session: Session, capacity: number): IdCluster {
+		const newCluster = session.addNewCluster(
+			this.finalSpace.getAllocatedIdLimit(),
+			capacity,
+			0,
 		);
-		let numericOverride: NumericUuid | undefined;
-		let stableOverride: StableId | undefined;
-		if (closestMatch !== undefined) {
-			const [key, compressionMapping] = closestMatch;
-			if (!IdCompressor.isClusterInfo(compressionMapping)) {
-				if (key === inversionKey) {
-					if (IdCompressor.isUnfinalizedOverride(compressionMapping)) {
-						return compressionMapping;
-					}
-					const finalizedOverride = compressionMapping;
-					return finalizedOverride.associatedLocalId !== undefined
-						? [
-								finalizedOverride.associatedLocalId,
-								finalizedOverride.originalOverridingFinal,
-						  ]
-						: (finalizedOverride.originalOverridingFinal as SessionSpaceCompressedId);
-				}
-			} else if (IdCompressor.isStableInversionKey(inversionKey)) {
-				stableOverride = inversionKey;
-				const cluster = compressionMapping.cluster;
-				if (
-					IdCompressor.uuidsMightCollide(inversionKey, key as StableId, cluster.capacity)
-				) {
-					numericOverride = numericUuidFromStableId(stableOverride);
-					const delta = getPositiveDelta(
-						numericOverride,
-						cluster.baseUuid,
-						cluster.capacity - 1,
-					);
-					if (delta !== undefined) {
-						if (!isFinalOverride) {
-							if (delta >= cluster.count) {
-								// TODO:#283: Properly implement unification
-								return undefined;
-							}
-							return this.normalizeToSessionSpace(
-								(compressionMapping.clusterBase + delta) as FinalCompressedId,
-							);
-						}
-					}
-				}
-			}
-		}
-
-		const override =
-			numericOverride ??
-			stableOverride ??
-			(IdCompressor.isStableInversionKey(inversionKey) ? inversionKey : undefined);
-
-		if (override !== undefined) {
-			const sessionSpaceId = this.getCompressedIdForStableId(override);
-			if (sessionSpaceId !== undefined) {
-				return sessionSpaceId;
-			}
-		}
-
-		return undefined;
-	}
-
-	/**
-	 * Check if `a` might be within `range` of `b`, where both are treated as hex numbers.
-	 * @param range - an integer
-	 */
-	private static uuidsMightCollide(a: StableId, b: StableId, range: number): boolean {
-		// Check if any of the UUIDs in the cluster collide (i.e. any in [base, base + capacity)).
-		// Optimization: All UUIDs in a cluster are the same string up until the last few characters which encode the offset from
-		// the cluster base. So, first compute the length of that shared string, and early out if it is different from the override
-		// UUID. This way we usually need not do the more expensive check below.
-		const hexDigitsToCheck = 32 - Math.ceil(Math.log2(range) / 2);
-		if (a.startsWith(b.slice(0, hexDigitsToCheck))) {
-			return true;
-		}
-
-		return false;
+		assert(!this.sessions.clusterCollides(newCluster), 0x758 /* Cluster collision detected. */);
+		this.finalSpace.addCluster(newCluster);
+		return newCluster;
 	}
 
-	/**
-	 * Helper for retrieving an override.
-	 */
-	private static tryGetOverride(
-		cluster: IdCluster,
-		finalId: FinalCompressedId,
-	): string | undefined {
-		const override = cluster.overrides?.get(finalId);
-		if (override === undefined) {
-			return undefined;
-		}
-		if (typeof override === "string") {
-			return override;
-		}
-		return override.override;
-	}
-
-	/**
-	 * Generates a new compressed ID or returns an existing one.
-	 * This should ONLY be called to generate IDs for local operations.
-	 * @param override - Specifies a specific string to be associated with the returned compressed ID.
-	 * Performance note: assigning override strings incurs a performance overhead.
-	 * @returns an existing ID if one already exists for `override`, and a new local ID otherwise. The returned ID is in session space.
-	 */
-	public generateCompressedId(override?: string): SessionSpaceCompressedId {
-		let overrideInversionKey: InversionKey | undefined;
-		if (override !== undefined) {
-			overrideInversionKey = IdCompressor.createInversionKey(override);
-			const existingIds = this.getExistingIdsForNewOverride(overrideInversionKey, false);
-			if (existingIds !== undefined) {
-				return typeof existingIds === "number" ? existingIds : existingIds[0];
-			}
-		}
-
-		// Bump local counter regardless, then attempt to optimistically return a final ID.
-		// If the local session has reserved a cluster range via consensus, it is safe to hand out final IDs prior to
-		// finalizing the range that includes these locals.
-		const newLocalId = -++this.localIdCount as LocalCompressedId;
-		const { currentClusterDetails } = this.localSession;
-		const { sessionIdNormalizer } = this;
-		let eagerFinalId: (FinalCompressedId & SessionSpaceCompressedId) | undefined;
-		let cluster: IdCluster | undefined;
-		if (currentClusterDetails !== undefined) {
-			cluster = currentClusterDetails.cluster;
-			const lastFinalKnown = sessionIdNormalizer.getLastFinalId();
-			if (
-				lastFinalKnown !== undefined &&
-				lastFinalKnown - currentClusterDetails.clusterBase + 1 < cluster.capacity
-			) {
-				eagerFinalId = (lastFinalKnown + 1) as FinalCompressedId & SessionSpaceCompressedId;
-			}
-		}
-
-		if (overrideInversionKey !== undefined) {
-			const registeredLocal = sessionIdNormalizer.addLocalId();
-			assert(
-				registeredLocal === newLocalId,
-				0x496 /* Session ID Normalizer produced unexpected local ID */,
-			);
-			if (eagerFinalId !== undefined) {
-				sessionIdNormalizer.addFinalIds(
-					eagerFinalId,
-					eagerFinalId,
-					cluster ?? fail("No cluster when generating compressed ID"),
-				);
-			}
-			this.localOverrides.append(newLocalId, override ?? fail("Override must be defined"));
-			// Since the local ID was just created, it is in both session and op space
-			const compressionMapping = newLocalId as UnackedLocalId;
-			this.clustersAndOverridesInversion.set(overrideInversionKey, compressionMapping);
-		} else if (eagerFinalId !== undefined) {
-			sessionIdNormalizer.addFinalIds(
-				eagerFinalId,
-				eagerFinalId,
-				cluster ?? fail("No cluster when generating compressed ID"),
-			);
-			return eagerFinalId;
+	public normalizeToOpSpace(id: SessionSpaceCompressedId): OpSpaceCompressedId {
+		if (isFinalId(id)) {
+			return id;
 		} else {
-			const registeredLocal = sessionIdNormalizer.addLocalId();
-			assert(
-				registeredLocal === newLocalId,
-				0x497 /* Session ID Normalizer produced unexpected local ID */,
-			);
+			const local = id as unknown as LocalCompressedId;
+			if (!this.normalizer.contains(local)) {
+				throw new Error("Invalid ID to normalize.");
+			}
+			const finalForm = this.localSession.tryConvertToFinal(local, true);
+			return finalForm === undefined
+				? (local as unknown as OpSpaceCompressedId)
+				: (finalForm as OpSpaceCompressedId);
 		}
-
-		return newLocalId;
-	}
-
-	/**
-	 * Decompresses a previously compressed ID into a UUID or override string.
-	 * @param id - the compressed ID to be decompressed.
-	 * @returns the UUID or override string associated with the compressed ID. Fails if the ID was not generated by this compressor.
-	 */
-	public decompress(id: SessionSpaceCompressedId | FinalCompressedId): StableId | string {
-		return this.tryDecompress(id) ?? fail("Compressed ID was not generated by this compressor");
 	}
 
-	/**
-	 * Attempts to decompress a previously compressed ID into a UUID or override string.
-	 * @param id - the compressed ID to be decompressed.
-	 * @returns the UUID or override string associated with the compressed ID, or undefined if the ID was not generated by this compressor.
-	 */
-	public tryDecompress(
-		id: SessionSpaceCompressedId | FinalCompressedId,
-	): StableId | string | undefined {
+	public normalizeToSessionSpace(
+		id: OpSpaceCompressedId,
+		originSessionId: SessionId,
+	): SessionSpaceCompressedId {
 		if (isFinalId(id)) {
-			const possibleCluster = this.getClusterForFinalId(id);
-			if (possibleCluster === undefined) {
-				// It may be an unfinalized eager final ID, so check with normalizer to get the offset from the session UUID
-				const creationIndex = this.sessionIdNormalizer.getCreationIndex(id);
-				if (creationIndex !== undefined) {
-					return stableIdFromNumericUuid(this.localSession.sessionUuid, creationIndex);
+			const containingCluster = this.localSession.getClusterByAllocatedFinal(id);
+			if (containingCluster === undefined) {
+				// Does not exist in local cluster chain
+				if (id >= this.finalSpace.getFinalizedIdLimit()) {
+					throw new Error("Unknown op space ID.");
 				}
-				return undefined;
+				return id as unknown as SessionSpaceCompressedId;
 			} else {
-				const [baseFinalId, cluster] = possibleCluster;
-				const override = IdCompressor.tryGetOverride(cluster, id);
-				if (override !== undefined) {
-					return override;
+				const alignedLocal = getAlignedLocal(containingCluster, id);
+				if (this.normalizer.contains(alignedLocal)) {
+					return alignedLocal;
 				} else {
-					const offsetInCluster = id - baseFinalId;
-					return stableIdFromNumericUuid(cluster.baseUuid, offsetInCluster);
+					if (genCountFromLocalId(alignedLocal) > this.localGenCount) {
+						throw new Error("Unknown op space ID.");
+					}
+					return id as unknown as SessionSpaceCompressedId;
 				}
 			}
 		} else {
-			const idOffset = -id; // Convert to a positive number
-			if (idOffset > this.localIdCount) {
-				// This local ID was never allocated.
-				return undefined;
-			}
-
-			// If this is a local ID with an override, then it must have been allocated on this machine and will be contained in
-			// `localOverrides`s. Otherwise, it is a sequential allocation from the session UUID and can simply be negated and
-			// added to that UUID to obtain the stable ID associated with it.
-			const localOverride = this.localOverrides?.get(id);
-			return localOverride !== undefined
-				? localOverride
-				: stableIdFromNumericUuid(this.localSession.sessionUuid, idOffset - 1);
-		}
-	}
-
-	/**
-	 * Recompresses a decompressed ID, which could be a UUID or an override string.
-	 * @param uncompressed - the UUID or override string to recompress.
-	 * @returns the `CompressedId` associated with `uncompressed`. Fails if it has not been previously compressed by this compressor.
-	 */
-	public recompress(uncompressed: string): SessionSpaceCompressedId {
-		return this.tryRecompress(uncompressed) ?? fail("No such string has ever been compressed");
-	}
-
-	/**
-	 * Attempts to recompresses a decompressed ID, which could be a UUID or an override string.
-	 * @param uncompressed - the UUID or override string to recompress,
-	 * @returns the `CompressedId` associated with `uncompressed` or undefined if it has not been previously compressed by this compressor.
-	 */
-	public tryRecompress(uncompressed: string): SessionSpaceCompressedId | undefined {
-		return this.recompressInternal(uncompressed);
-	}
-
-	/**
-	 * Helper to compress an uncompressed UUID. It can optionally be supplied with the numeric form of `uncompressedUuid` as a
-	 * performance optimization.
-	 */
-	private recompressInternal(
-		uncompressed: string,
-		uncompressedUuidNumeric?: NumericUuid,
-	): SessionSpaceCompressedId | undefined {
-		let numericUuid = uncompressedUuidNumeric;
-		const inversionKey = IdCompressor.createInversionKey(uncompressed);
-		const isStable = IdCompressor.isStableInversionKey(inversionKey);
-		const closestMatch = this.clustersAndOverridesInversion.getPairOrNextLower(
-			inversionKey,
-			reusedArray,
-		);
-		if (closestMatch !== undefined) {
-			const [key, compressionMapping] = closestMatch;
-			if (!IdCompressor.isClusterInfo(compressionMapping)) {
-				if (key === inversionKey) {
-					return IdCompressor.isUnfinalizedOverride(compressionMapping)
-						? compressionMapping
-						: compressionMapping.associatedLocalId ??
-								(compressionMapping.originalOverridingFinal as SessionSpaceCompressedId);
+			const localToNormalize = id as unknown as LocalCompressedId;
+			if (originSessionId === this.localSessionId) {
+				if (this.normalizer.contains(localToNormalize)) {
+					return localToNormalize;
+				} else {
+					// We never generated this local ID, so fail
+					throw new Error("Unknown op space ID.");
 				}
 			} else {
-				if (!isStable) {
-					return undefined;
+				// LocalId from a remote session
+				const remoteSession = this.sessions.get(originSessionId);
+				if (remoteSession === undefined) {
+					throw new Error("No IDs have ever been finalized by the supplied session.");
 				}
-				const { clusterBase: closestBaseFinalId, cluster: closestCluster } =
-					compressionMapping;
-				numericUuid ??= numericUuidFromStableId(inversionKey);
-				const uuidOffset = getPositiveDelta(
-					numericUuid,
-					closestCluster.baseUuid,
-					closestCluster.count - 1,
-				);
-				if (uuidOffset !== undefined) {
-					let targetFinalId = (closestBaseFinalId + uuidOffset) as FinalCompressedId;
-					const override = closestCluster.overrides?.get(targetFinalId);
-					if (typeof override === "object") {
-						if (override.associatedLocalId !== undefined) {
-							return override.associatedLocalId;
-						}
-						// This may be a UUID that should actually compress into a different final ID that it aligns with, due to
-						// another session having an identical override (see `IdCluster` for more).
-						targetFinalId = override.originalOverridingFinal;
-					}
-					return this.normalizeToSessionSpace(targetFinalId);
+				const correspondingFinal = remoteSession.tryConvertToFinal(localToNormalize, false);
+				if (correspondingFinal === undefined) {
+					throw new Error("Unknown op space ID.");
 				}
+				return correspondingFinal as unknown as SessionSpaceCompressedId;
 			}
 		}
-
-		if (isStable) {
-			// May have already computed the numeric UUID, so avoid recomputing if possible
-			const sessionSpaceId = this.getCompressedIdForStableId(numericUuid ?? inversionKey);
-			if (sessionSpaceId !== undefined) {
-				return sessionSpaceId;
-			}
-		}
-		return undefined;
 	}
 
-	/**
-	 * Normalizes a session space ID into op space.
-	 * @param id - the local ID to normalize.
-	 * @returns the ID in op space.
-	 */
-	public normalizeToOpSpace(id: SessionSpaceCompressedId): OpSpaceCompressedId {
+	public decompress(id: SessionSpaceCompressedId): StableId {
 		if (isFinalId(id)) {
-			return id;
-		}
-
-		// Check if this local ID has not been allocated yet
-		if (-id > this.localIdCount) {
-			fail("Supplied local ID was not created by this compressor.");
-		}
-
-		// Check if this local ID has not been finalized yet.
-		// Comparing lastFinalizedLocalId is a safe check for eager final IDs because the local IDs corresponding to them
-		// are never handed out to a consumer, and thus could not be passed into this method.
-		const { lastFinalizedLocalId } = this.localSession;
-		if (lastFinalizedLocalId === undefined || id < lastFinalizedLocalId) {
-			// Eager final IDs do not have overrides in the cluster until finalizing
-			// This means that using the normalizer to get the final/cluster associated would succeed but would not have the override,
-			// so checking localOverrides first is necessary.
-			const override = this.localOverrides.get(id);
-			if (override !== undefined) {
-				const inversionKey = IdCompressor.createInversionKey(override);
-				const compressionMapping =
-					this.clustersAndOverridesInversion.get(inversionKey) ??
-					fail("Bimap is malformed.");
-				return !IdCompressor.isClusterInfo(compressionMapping) &&
-					!IdCompressor.isUnfinalizedOverride(compressionMapping) &&
-					compressionMapping.associatedLocalId === id
-					? compressionMapping.originalOverridingFinal
-					: (id as OpSpaceCompressedId);
-			}
-			const possibleFinal = this.sessionIdNormalizer.getFinalId(id);
-			return possibleFinal?.[0] ?? (id as OpSpaceCompressedId);
-		}
-		const [correspondingFinal, cluster] =
-			this.sessionIdNormalizer.getFinalId(id) ??
-			fail("Locally created cluster should be added to the map when allocated");
-		if (cluster.overrides) {
-			const override = cluster.overrides.get(correspondingFinal);
-			if (typeof override === "object" && override.originalOverridingFinal !== undefined) {
-				// Rare case of two local IDs with same overrides are created concurrently. See `IdCluster` for more.
-				return override.originalOverridingFinal;
-			}
-		}
-		return correspondingFinal;
-	}
-
-	/**
-	 * Normalizes an ID into session space.
-	 * @param id - the ID to normalize. If it is a local ID, it is assumed to have been created by the session corresponding
-	 * to `sessionId`.
-	 * @param originSessionId - the session from which `id` originated
-	 * @returns the session-space ID corresponding to `id`, which might not have been a final ID if the client that created it had not yet
-	 * finalized it. This can occur when a client references an ID during the window of time in which it is waiting to receive the ordered
-	 * range that contained it from the server.
-	 */
-	public normalizeToSessionSpace(
-		id: OpSpaceCompressedId,
-		originSessionId: SessionId,
-	): SessionSpaceCompressedId;
-
-	/**
-	 * Normalizes a final ID into session space.
-	 * @param id - the final ID to normalize.
-	 * @returns the session-space ID corresponding to `id`.
-	 */
-	public normalizeToSessionSpace(id: FinalCompressedId): SessionSpaceCompressedId;
-
-	public normalizeToSessionSpace(
-		id: OpSpaceCompressedId,
-		sessionIdIfLocal?: SessionId,
-	): SessionSpaceCompressedId {
-		if (isLocalId(id)) {
-			if (sessionIdIfLocal === undefined || sessionIdIfLocal === this.localSessionId) {
-				const localIndex = -id;
-				if (localIndex > this.localIdCount) {
-					fail("Supplied local ID was not created by this compressor.");
+			const containingCluster = Session.getContainingCluster(id, this.finalSpace.clusters);
+			if (containingCluster === undefined) {
+				throw new Error("Unknown ID");
+			}
+			const alignedLocal = getAlignedLocal(containingCluster, id);
+			const alignedGenCount = genCountFromLocalId(alignedLocal);
+			const lastFinalizedGenCount = genCountFromLocalId(
+				lastFinalizedLocal(containingCluster),
+			);
+			if (alignedGenCount > lastFinalizedGenCount) {
+				// should be an eager final id generated by the local session
+				if (containingCluster.session === this.localSession) {
+					assert(
+						!this.normalizer.contains(alignedLocal),
+						0x759 /* Normalizer out of sync. */,
+					);
+				} else {
+					throw new Error("Unknown ID");
 				}
-				return id;
-			} else {
-				const session =
-					this.sessions.get(sessionIdIfLocal) ??
-					fail("No IDs have ever been finalized by the supplied session.");
-				const localCount = -id;
-				const numericUuid = incrementUuid(session.sessionUuid, localCount - 1);
-				return (
-					this.compressNumericUuid(numericUuid) ??
-					fail("ID is not known to this compressor.")
-				);
 			}
-		}
-
-		const normalizedId = this.sessionIdNormalizer.getSessionSpaceId(id);
-		if (normalizedId !== undefined) {
-			return normalizedId;
-		}
 
-		// Check for a unified override finalized first by another session but to which the local session
-		// still has an associated local ID.
-		const [_, cluster] =
-			this.getClusterForFinalId(id) ??
-			fail("Supplied final ID was not finalized by this compressor.");
-		const override = cluster.overrides?.get(id);
-		if (typeof override === "object" && override.associatedLocalId !== undefined) {
-			return override.associatedLocalId;
+			return stableIdFromNumericUuid(
+				offsetNumericUuid(containingCluster.session.sessionUuid, alignedGenCount - 1),
+			);
+		} else {
+			const localToDecompress = id as unknown as LocalCompressedId;
+			if (!this.normalizer.contains(localToDecompress)) {
+				throw new Error("Unknown ID");
+			}
+			return stableIdFromNumericUuid(
+				offsetNumericUuid(
+					this.localSession.sessionUuid,
+					genCountFromLocalId(localToDecompress) - 1,
+				),
+			);
 		}
-		return id as SessionSpaceCompressedId;
 	}
 
-	/**
-	 * Returns the session-space compressed ID corresponding to the numeric UUID, or undefined if it is not known to this compressor.
-	 * Typically, it will return the session-space ID sequentially aligned with it (which will be local if `numericUuid` was made by
-	 * the local session, or final otherwise). However, in the event that the aligned session-space ID was overridden with a UUID
-	 * *and* that override UUID was concurrently used in an older ID (earlier, w.r.t. sequencing), this method can return the first
-	 * ID to correspond to that override.
-	 *
-	 * As an example, consider the following two clients:
-	 * ClientA, session UUID: A0000000-0000-0000-0000-000000000000
-	 * ClientB, session UUID: B0000000-0000-0000-0000-000000000000
-	 *
-	 * If concurrently, two clients performed:
-	 * ClientA: generateCompressedId(override: 'X0000000-0000-0000-0000-000000000000') // aligned with A0000000-0000-0000-0000-000000000000
-	 *
-	 * ClientB: generateCompressedId() // aligned with B0000000-0000-0000-0000-000000000000
-	 * ClientB: generateCompressedId(override: 'X0000000-0000-0000-0000-000000000000') // aligned with B0000000-0000-0000-0000-000000000001
-	 *
-	 * After sequencing, calling this method and passing the numeric UUID for B0000000-0000-0000-0000-000000000001 would return the
-	 * session-space ID corresponding to A0000000-0000-0000-0000-000000000000 (with override X0000000-0000-0000-0000-000000000000).
-	 */
-	private compressNumericUuid(numericUuid: NumericUuid): SessionSpaceCompressedId | undefined {
-		const stableId = stableIdFromNumericUuid(numericUuid);
-		const sessionSpaceId = this.recompressInternal(stableId, numericUuid);
-		if (sessionSpaceId === undefined) {
-			return undefined;
+	public recompress(uncompressed: StableId): SessionSpaceCompressedId {
+		const recompressed = this.tryRecompress(uncompressed);
+		if (recompressed === undefined) {
+			throw new Error("Could not recompress.");
 		}
-		return sessionSpaceId;
+		return recompressed;
 	}
 
-	/**
-	 * Returns a compressed ID for the supplied stable ID if it was created by the local session, and undefined otherwise.
-	 */
-	private getCompressedIdForStableId(
-		stableId: StableId | NumericUuid,
-	): SessionSpaceCompressedId | undefined {
-		const numericUuid =
-			typeof stableId === "string" ? numericUuidFromStableId(stableId) : stableId;
-		const creationIndex = getPositiveDelta(
-			numericUuid,
-			this.localSession.sessionUuid,
-			this.localIdCount - 1,
-		);
-		if (creationIndex !== undefined) {
-			const sessionSpaceId = this.sessionIdNormalizer.getIdByCreationIndex(creationIndex);
-			if (sessionSpaceId !== undefined) {
-				return sessionSpaceId;
+	public tryRecompress(uncompressed: StableId): SessionSpaceCompressedId | undefined {
+		const match = this.sessions.getContainingCluster(uncompressed);
+		if (match === undefined) {
+			const numericUncompressed = numericUuidFromStableId(uncompressed);
+			const offset = subtractNumericUuids(numericUncompressed, this.localSession.sessionUuid);
+			if (offset < Number.MAX_SAFE_INTEGER) {
+				const genCountEquivalent = Number(offset) + 1;
+				const localEquivalent = localIdFromGenCount(genCountEquivalent);
+				if (this.normalizer.contains(localEquivalent)) {
+					return localEquivalent;
+				}
 			}
-		}
-		return undefined;
-	}
-
-	private getClusterForFinalId(
-		finalId: FinalCompressedId,
-	): readonly [baseFinalId: FinalCompressedId, cluster: IdCluster] | undefined {
-		const possibleCluster = this.finalIdToCluster.getPairOrNextLower(finalId);
-		if (possibleCluster === undefined) {
-			return undefined;
-		}
-		const [clusterBase, cluster] = possibleCluster;
-		if (finalId - clusterBase >= cluster.count) {
 			return undefined;
-		}
-		return possibleCluster;
-	}
-
-	/**
-	 * @returns if `other` is equal to this `IdCompressor`. The equality check includes local session state only if specified.
-	 * \@testOnly
-	 */
-	public equals(other: IdCompressor, compareLocalState: boolean): boolean {
-		if (compareLocalState) {
-			if (
-				this.localIdCount !== other.localIdCount ||
-				this.localSessionId !== other.localSessionId ||
-				this.lastTakenLocalId !== other.lastTakenLocalId
-			) {
-				return false;
-			}
-			if (!this.localOverrides.equals(other.localOverrides, (a, b) => a === b)) {
-				return false;
-			}
-			if (
-				!compareMaps(this.sessions, other.sessions, (a, b) =>
-					IdCompressor.sessionDataEqual(a, b, true, compareLocalState),
-				)
-			) {
-				return false;
-			}
-			if (
-				!this.sessionIdNormalizer.equals(other.sessionIdNormalizer, (a, b) =>
-					IdCompressor.idClustersEqual(a, b, false, compareLocalState),
-				)
-			) {
-				return false;
-			}
 		} else {
-			for (const [keyA, valueA] of this.sessions) {
-				const valueB = other.sessions.get(keyA);
-				if (valueB === undefined) {
-					if (valueA.lastFinalizedLocalId !== undefined) {
-						return false;
-					}
-				} else if (
-					!IdCompressor.sessionDataEqual(valueA, valueB, true, compareLocalState)
-				) {
-					return false;
-				}
-			}
-
-			for (const [keyB, valueB] of other.sessions) {
-				const valueA = this.sessions.get(keyB);
-				if (valueA === undefined) {
-					if (valueB.lastFinalizedLocalId !== undefined) {
-						return false;
-					}
-				}
-			}
-		}
-		if (
-			this.nextClusterBaseFinalId !== other.nextClusterBaseFinalId ||
-			this.newClusterCapacity !== other.newClusterCapacity
-		) {
-			return false;
-		}
-		if (
-			!this.finalIdToCluster.equals(other.finalIdToCluster, (a, b) =>
-				IdCompressor.idClustersEqual(a, b, true, compareLocalState),
-			)
-		) {
-			return false;
-		}
-
-		const missingInOne = (
-			_: string,
-			value: CompressionMapping,
-		): { break: boolean } | undefined => {
-			if (!compareLocalState && IdCompressor.isUnfinalizedOverride(value)) {
-				return undefined;
-			}
-			return { break: true };
-		};
-
-		const compareCompressionMappings = (a: CompressionMapping, b: CompressionMapping) => {
-			const unfinalizedA = IdCompressor.isUnfinalizedOverride(a);
-			const unfinalizedB = IdCompressor.isUnfinalizedOverride(b);
-			if (unfinalizedA) {
-				if (unfinalizedB) {
-					return a === b;
-				}
-				return false;
-			} else if (unfinalizedB) {
-				return false;
-			}
-
-			if (IdCompressor.isClusterInfo(a)) {
-				if (!IdCompressor.isClusterInfo(b) || a.clusterBase !== b.clusterBase) {
-					return false;
+			const [containingCluster, alignedLocal] = match;
+			if (containingCluster.session === this.localSession) {
+				// Local session
+				if (this.normalizer.contains(alignedLocal)) {
+					return alignedLocal;
+				} else {
+					assert(
+						genCountFromLocalId(alignedLocal) <= this.localGenCount,
+						0x75a /* Clusters out of sync. */,
+					);
+					// Id is an eager final
+					return getAlignedFinal(containingCluster, alignedLocal) as
+						| SessionSpaceCompressedId
+						| undefined;
 				}
 			} else {
-				if (
-					IdCompressor.isClusterInfo(b) ||
-					(compareLocalState && a.associatedLocalId !== b.associatedLocalId) ||
-					a.originalOverridingFinal !== b.originalOverridingFinal
-				) {
-					return false;
-				}
+				// Not the local session
+				return genCountFromLocalId(alignedLocal) >= lastFinalizedLocal(containingCluster)
+					? (getAlignedFinal(containingCluster, alignedLocal) as
+							| SessionSpaceCompressedId
+							| undefined)
+					: undefined;
 			}
-			if (!IdCompressor.idClustersEqual(a.cluster, b.cluster, true, compareLocalState)) {
-				return false;
-			}
-			return true;
-		};
-
-		const diff = this.clustersAndOverridesInversion.diffAgainst(
-			other.clustersAndOverridesInversion,
-			missingInOne,
-			missingInOne,
-			(_, valA, valB) => {
-				if (!compareCompressionMappings(valA, valB)) {
-					return { break: true };
-				}
-				return undefined;
-			},
-		);
-
-		return diff === undefined;
-	}
-
-	private static sessionDataEqual(
-		a: Session,
-		b: Session,
-		checkCluster = true,
-		compareLocalState = true,
-	): boolean {
-		if (
-			!numericUuidEquals(a.sessionUuid, b.sessionUuid) ||
-			a.lastFinalizedLocalId !== b.lastFinalizedLocalId
-		) {
-			return false;
-		}
-		if (a.currentClusterDetails === undefined || b.currentClusterDetails === undefined) {
-			if (a.currentClusterDetails !== b.currentClusterDetails) {
-				return false;
-			}
-			return true;
-		}
-		if (
-			checkCluster &&
-			!IdCompressor.idClustersEqual(
-				a.currentClusterDetails.cluster,
-				b.currentClusterDetails.cluster,
-				false,
-				compareLocalState,
-			)
-		) {
-			return false;
 		}
-		return true;
-	}
-
-	private static idClustersEqual(
-		a: IdCluster,
-		b: IdCluster,
-		checkSessionData = true,
-		compareLocalState = true,
-	): boolean {
-		const areEqual =
-			numericUuidEquals(a.baseUuid, b.baseUuid) &&
-			a.capacity === b.capacity &&
-			a.count === b.count &&
-			(!checkSessionData ||
-				IdCompressor.sessionDataEqual(a.session, b.session, false, compareLocalState)) &&
-			(a.overrides === undefined) === (b.overrides === undefined) &&
-			(a.overrides === undefined ||
-				compareMaps(
-					a.overrides ?? fail("Overrides must be defined"),
-					b.overrides ?? fail("Overrides must be defined"),
-					(overrideA, overrideB) => {
-						if (compareLocalState) {
-							if (typeof overrideA === "string" || typeof overrideB === "string") {
-								return overrideA === overrideB;
-							}
-							const overridesEqual =
-								overrideA.override === overrideB.override &&
-								overrideA.originalOverridingFinal ===
-									overrideB.originalOverridingFinal &&
-								(!compareLocalState ||
-									overrideA.associatedLocalId === overrideB.associatedLocalId);
-							return overridesEqual;
-						}
-
-						const uuidA =
-							typeof overrideA === "string" ? overrideA : overrideA.override;
-						const uuidB =
-							typeof overrideB === "string" ? overrideB : overrideB.override;
-						if (
-							typeof overrideA !== "string" &&
-							typeof overrideB !== "string" &&
-							overrideA.originalOverridingFinal !== overrideB.originalOverridingFinal
-						) {
-							return false;
-						}
-						return uuidA === uuidB;
-					},
-				));
-		return areEqual;
 	}
 
-	/**
-	 * Returns a persistable form of the current state of this `IdCompressor` which can be rehydrated via `IdCompressor.deserialize()`.
-	 * This includes finalized state as well as un-finalized state and is therefore suitable for use in offline scenarios.
-	 */
-	public serialize(
-		withSession: boolean,
-	): SerializedIdCompressorWithOngoingSession | SerializedIdCompressorWithNoSession;
-
-	/**
-	 * Returns a persistable form of the current state of this `IdCompressor` which can be rehydrated via `IdCompressor.deserialize()`.
-	 * This includes finalized state as well as un-finalized state and is therefore suitable for use in offline scenarios.
-	 */
 	public serialize(withSession: true): SerializedIdCompressorWithOngoingSession;
-
-	/**
-	 * Returns a persistable form of the current state of this `IdCompressor` which can be rehydrated via `IdCompressor.deserialize()`.
-	 * This only includes finalized state and is therefore suitable for use in summaries.
-	 */
 	public serialize(withSession: false): SerializedIdCompressorWithNoSession;
-
-	public serialize(withSession: boolean): SerializedIdCompressor {
-		const serializedSessions: SerializedSessionData[] = [];
-		const sessionIdToSessionIndex = new Map<SessionId, number>();
-
-		for (const [sessionId, session] of this.sessions) {
-			const isLocalSession = sessionId === this.localSessionId;
-			const includeSession =
-				sessionId !== reservedSessionId && // Ignore reserved clusters, but
-				(session.lastFinalizedLocalId !== undefined || // always serialize sessions that made final IDs,
-					(isLocalSession && withSession)); // include the un-acked local session if requested
-
-			if (includeSession) {
-				const sessionData: Mutable<SerializedSessionData> = [sessionId];
-				sessionIdToSessionIndex.set(sessionId, serializedSessions.length);
-				serializedSessions.push(sessionData);
-			}
-		}
-
-		const serializedClusters: SerializedCluster[] = [];
-		for (const [baseFinalId, cluster] of this.finalIdToCluster.entries()) {
-			const sessionId = stableIdFromNumericUuid(cluster.session.sessionUuid) as SessionId;
-			if (sessionId !== reservedSessionId) {
-				const sessionIndex =
-					sessionIdToSessionIndex.get(sessionId) ??
-					fail("Session object contains wrong session numeric UUID");
-
-				const serializedCluster: Mutable<SerializedCluster> = [
-					sessionIndex,
-					cluster.capacity,
-				];
-				if (cluster.count !== cluster.capacity) {
-					serializedCluster.push(cluster.count);
-				}
-
-				if (cluster.overrides !== undefined) {
-					const serializedOverrides: Mutable<SerializedClusterOverrides> = [];
-					for (const [finalId, override] of cluster.overrides) {
-						const finalIdIndex = finalId - baseFinalId;
-						if (typeof override === "string") {
-							serializedOverrides.push([finalIdIndex, override]);
-						} else if (override.originalOverridingFinal === finalId) {
-							serializedOverrides.push([finalIdIndex, override.override]);
-						} else {
-							serializedOverrides.push([
-								finalIdIndex,
-								override.override,
-								override.originalOverridingFinal,
-							]);
-						}
-					}
-					serializedCluster.push(serializedOverrides);
-				}
-
-				serializedClusters.push(serializedCluster);
-			}
-		}
-
-		// Reserved session not serialized, and local session is present but may not make IDs
-		assert(
-			serializedSessions.length - this.sessions.size <= 2,
-			0x498 /* session not serialized */,
-		);
-
-		const serializedIdCompressor: Omit<
-			SerializedIdCompressor,
-			"_versionedSerializedIdCompressor"
-		> = {
-			version: currentWrittenVersion,
-			clusterCapacity: this.clusterCapacity,
-			sessions: serializedSessions,
-			clusters: serializedClusters,
-		};
-
-		if (withSession) {
-			const serializedWithSession =
-				serializedIdCompressor as Mutable<SerializedIdCompressorWithOngoingSession>;
-			serializedWithSession.localSessionIndex = serializedWithSession.sessions.findIndex(
-				([sessionId]) => sessionId === this.localSessionId,
+	public serialize(hasLocalState: boolean): SerializedIdCompressor {
+		const { normalizer, finalSpace, sessions } = this;
+		const sessionIndexMap = new Map<Session, number>();
+		let sessionIndex = 0;
+		for (const session of sessions.sessions()) {
+			// Filter empty sessions to prevent them accumulating in the serialized state
+			if (!session.isEmpty() || hasLocalState) {
+				sessionIndexMap.set(session, sessionIndex);
+				sessionIndex++;
+			}
+		}
+		const localStateSize = hasLocalState
+			? 1 + // generated ID count
+			  1 + // next range base genCount
+			  1 + // count of normalizer pairs
+			  this.normalizer.idRanges.size * 2 // pairs
+			: 0;
+		// Layout size, in 8 byte increments
+		const totalSize =
+			1 + // version
+			1 + // hasLocalState
+			1 + // cluster capacity
+			1 + // session count
+			1 + // cluster count
+			sessionIndexMap.size * 2 + // session IDs
+			finalSpace.clusters.length * 3 + // clusters: (sessionIndex, capacity, count)[]
+			localStateSize; // local state, if present
+
+		const serializedFloat = new Float64Array(totalSize);
+		const serializedUint = new BigUint64Array(serializedFloat.buffer);
+		let index = 0;
+		index = writeNumber(serializedFloat, index, currentWrittenVersion);
+		index = writeBoolean(serializedFloat, index, hasLocalState);
+		index = writeNumber(serializedFloat, index, this.clusterCapacity);
+		index = writeNumber(serializedFloat, index, sessionIndexMap.size);
+		index = writeNumber(serializedFloat, index, finalSpace.clusters.length);
+
+		for (const [session] of sessionIndexMap.entries()) {
+			index = writeNumericUuid(serializedUint, index, session.sessionUuid);
+		}
+
+		finalSpace.clusters.forEach((cluster) => {
+			index = writeNumber(
+				serializedFloat,
+				index,
+				sessionIndexMap.get(cluster.session) as number,
 			);
-			if (this.localIdCount > 0) {
-				serializedWithSession.localState = {
-					localIdCount: this.localIdCount,
-					overrides: [...this.localOverrides.entries()].map((entry) => [...entry]),
-					lastTakenLocalId: this.lastTakenLocalId,
-					sessionNormalizer: this.sessionIdNormalizer.serialize(),
-				};
-			}
+			index = writeNumber(serializedFloat, index, cluster.capacity);
+			index = writeNumber(serializedFloat, index, cluster.count);
+		});
 
-			return serializedWithSession;
+		if (hasLocalState) {
+			index = writeNumber(serializedFloat, index, this.localGenCount);
+			index = writeNumber(serializedFloat, index, this.nextRangeBaseGenCount);
+			index = writeNumber(serializedFloat, index, normalizer.idRanges.size);
+			for (const [leadingGenCount, count] of normalizer.idRanges.entries()) {
+				index = writeNumber(serializedFloat, index, leadingGenCount);
+				index = writeNumber(serializedFloat, index, count);
+			}
 		}
 
+		assert(index === totalSize, 0x75b /* Serialized size was incorrectly calculated. */);
 		this.logger?.sendTelemetryEvent({
 			eventName: "RuntimeIdCompressor:SerializedIdCompressorSize",
-			size: JSON.stringify(serializedIdCompressor).length,
-			clusterCount: serializedIdCompressor.clusters.length,
-			sessionCount: serializedIdCompressor.sessions.length,
+			size: serializedFloat.byteLength,
+			clusterCount: finalSpace.clusters.length,
+			sessionCount: sessionIndexMap.size,
 		});
 
-		return serializedIdCompressor as SerializedIdCompressor;
+		return bufferToString(serializedFloat.buffer, "base64") as SerializedIdCompressor;
 	}
 
-	/**
-	 * Deserialize an serialized IdCompressor that is part of an ongoing session, thereby resuming that session.
-	 */
 	public static deserialize(serialized: SerializedIdCompressorWithOngoingSession): IdCompressor;
-
-	/**
-	 * Deserialize a serialized IdCompressor with a new session.
-	 * @param serialized - the serialized compressor state
-	 * @param newSessionId - the session ID for the new compressor.
-	 */
 	public static deserialize(
 		serialized: SerializedIdCompressorWithNoSession,
 		newSessionId: SessionId,
 	): IdCompressor;
-
 	public static deserialize(
-		...args:
-			| [serialized: SerializedIdCompressorWithNoSession, newSessionIdMaybe: SessionId]
-			| [serialized: SerializedIdCompressorWithOngoingSession, newSessionIdMaybe?: undefined]
+		serialized: SerializedIdCompressor,
+		sessionId?: SessionId,
 	): IdCompressor {
-		const [serialized, newSessionIdMaybe] = args;
-
-		const {
-			clusterCapacity,
-			sessions: serializedSessions,
-			clusters: serializedClusters,
-		} = serialized;
-
-		let localSessionId: SessionId;
-		let serializedLocalState: SerializedLocalState | undefined;
-		if (newSessionIdMaybe === undefined) {
-			// Alias of serialized, but known to be a SerializedIdCompressorWithOngoingSession
-			const [serializedWithSession] = args;
-			const serializedSessionData =
-				serializedSessions[serializedWithSession.localSessionIndex];
-			localSessionId = serializedSessionData[0];
-			serializedLocalState = serializedWithSession.localState;
+		const buffer = stringToBuffer(serialized, "base64");
+		const index: Index = {
+			index: 0,
+			bufferFloat: new Float64Array(buffer),
+			bufferUint: new BigUint64Array(buffer),
+		};
+		const version = readNumber(index);
+		assert(version === currentWrittenVersion, 0x75c /* Unknown serialized version. */);
+		const hasLocalState = readBoolean(index);
+		const clusterCapacity = readNumber(index);
+		const sessionCount = readNumber(index);
+		const clusterCount = readNumber(index);
+
+		// Sessions
+		let sessionOffset = 0;
+		const sessions: [NumericUuid, Session][] = [];
+		if (!hasLocalState) {
+			// If !hasLocalState, there won't be a serialized local session ID so insert one at the beginning
+			assert(sessionId !== undefined, 0x75d /* Local session ID is undefined. */);
+			const localSessionNumeric = numericUuidFromStableId(sessionId);
+			sessions.push([localSessionNumeric, new Session(localSessionNumeric)]);
+			sessionOffset = 1;
 		} else {
-			localSessionId = newSessionIdMaybe;
-		}
-
-		const compressor = new IdCompressor(localSessionId);
-		compressor.clusterCapacity = clusterCapacity;
-
-		const localOverridesInverse = new Map<string, LocalCompressedId>();
-		if (serializedLocalState !== undefined) {
-			// Do this part of local rehydration first since the cluster map population needs to query to local overrides
-			compressor.localIdCount = serializedLocalState.localIdCount;
-			compressor.lastTakenLocalId = serializedLocalState.lastTakenLocalId;
-			if (serializedLocalState.overrides !== undefined) {
-				for (const [localId, override] of serializedLocalState.overrides) {
-					compressor.localOverrides.append(localId, override);
-					localOverridesInverse.set(override, localId);
-					compressor.clustersAndOverridesInversion.set(
-						IdCompressor.createInversionKey(override),
-						localId as UnackedLocalId,
-					);
-				}
-			}
+			assert(
+				sessionId === undefined,
+				0x75e /* Local state should not exist in serialized form. */,
+			);
 		}
 
-		const sessionInfos: {
-			readonly session: Session;
-			readonly sessionId: SessionId;
-		}[] = [];
-		for (const serializedSession of serializedSessions) {
-			const [sessionId] = serializedSession;
-			if (sessionId === localSessionId) {
-				assert(hasOngoingSession(serialized), 0x499 /* Cannot resume existing session. */);
-				sessionInfos.push({ session: compressor.localSession, sessionId });
-			} else {
-				const session = compressor.createSession(sessionId);
-				sessionInfos.push({ session, sessionId });
-			}
+		for (let i = 0; i < sessionCount; i++) {
+			const numeric = readNumericUuid(index);
+			sessions.push([numeric, new Session(numeric)]);
 		}
 
-		for (const serializedCluster of serializedClusters) {
-			const { sessionIndex, capacity, count, overrides } =
-				deserializeCluster(serializedCluster);
-			const { session, sessionId } = sessionInfos[sessionIndex];
-			const { lastFinalizedLocalId, sessionUuid } = session;
-			const currentIdCount = lastFinalizedLocalId === undefined ? 0 : -lastFinalizedLocalId;
+		const compressor = new IdCompressor(new Sessions(sessions));
+		compressor.clusterCapacity = clusterCapacity;
 
-			const cluster: Mutable<IdCluster> = {
+		// Clusters
+		let baseFinalId = 0;
+		for (let i = 0; i < clusterCount; i++) {
+			const sessionIndex = readNumber(index);
+			const session = sessions[sessionIndex + sessionOffset][1];
+			const capacity = readNumber(index);
+			const count = readNumber(index);
+			const cluster = session.addNewCluster(
+				baseFinalId as FinalCompressedId,
 				capacity,
 				count,
-				baseUuid: incrementUuid(sessionUuid, currentIdCount),
-				session,
-			};
-
-			const lastFinalizedNormalized = lastFinalizedLocalId ?? 0;
-			const clusterBase = compressor.nextClusterBaseFinalId;
-
-			session.lastFinalizedLocalId = (lastFinalizedNormalized - count) as LocalCompressedId;
-			session.currentClusterDetails = { clusterBase, cluster };
-			compressor.nextClusterBaseFinalId = (compressor.nextClusterBaseFinalId +
-				capacity) as FinalCompressedId;
-			compressor.finalIdToCluster.append(clusterBase, cluster);
-			compressor.clustersAndOverridesInversion.set(
-				stableIdFromNumericUuid(cluster.baseUuid),
-				{
-					clusterBase,
-					cluster,
-				},
 			);
-
-			if (overrides !== undefined) {
-				cluster.overrides = new Map();
-				for (const [finalIdIndex, override, originalOverridingFinal] of overrides) {
-					const finalId = (clusterBase + finalIdIndex) as FinalCompressedId;
-					if (originalOverridingFinal !== undefined) {
-						const unifiedOverride: Mutable<UnifiedOverride> = {
-							override,
-							originalOverridingFinal,
-						};
-						if (serializedLocalState !== undefined) {
-							setPropertyIfDefined(
-								localOverridesInverse.get(override),
-								unifiedOverride,
-								"associatedLocalId",
-							);
-						}
-						cluster.overrides.set(finalId, unifiedOverride);
-					} else {
-						const associatedLocal = localOverridesInverse.get(override);
-						if (associatedLocal !== undefined && sessionId !== localSessionId) {
-							// In this case, there is a local ID associated with this override, but this is the first cluster to contain
-							// that override (because only the first cluster will have the string serialized). In this case, the override
-							// needs to hold that local value.
-							cluster.overrides.set(finalId, {
-								override,
-								originalOverridingFinal: finalId,
-								associatedLocalId: associatedLocal,
-							});
-						} else {
-							cluster.overrides.set(finalId, override);
-						}
-						const finalizedOverride: Mutable<FinalizedOverride> = {
-							cluster,
-							originalOverridingFinal: finalId,
-						};
-						if (serializedLocalState !== undefined) {
-							setPropertyIfDefined(
-								associatedLocal,
-								finalizedOverride,
-								"associatedLocalId",
-							);
-						}
-						compressor.clustersAndOverridesInversion.set(
-							IdCompressor.createInversionKey(override),
-							finalizedOverride,
-						);
-					}
-				}
-			}
+			compressor.finalSpace.addCluster(cluster);
+			baseFinalId += capacity;
 		}
 
-		if (serializedLocalState !== undefined) {
-			compressor.sessionIdNormalizer = SessionIdNormalizer.deserialize(
-				serializedLocalState.sessionNormalizer,
-				(finalId) => {
-					const [_, cluster] =
-						compressor.finalIdToCluster.getPairOrNextLower(finalId) ??
-						fail("Final in serialized normalizer was never created.");
-					return cluster;
-				},
-			);
+		// Local state
+		if (hasLocalState) {
+			compressor.localGenCount = readNumber(index);
+			compressor.nextRangeBaseGenCount = readNumber(index);
+			const normalizerCount = readNumber(index);
+			for (let i = 0; i < normalizerCount; i++) {
+				compressor.normalizer.addLocalRange(readNumber(index), readNumber(index));
+			}
 		}
 
 		assert(
-			compressor.localSession.lastFinalizedLocalId === undefined ||
-				compressor.localIdCount >= -compressor.localSession.lastFinalizedLocalId,
-			0x49a /* Inconsistent last finalized state when deserializing */,
+			index.index === index.bufferFloat.length,
+			0x75f /* Failed to read entire serialized compressor. */,
 		);
-
 		return compressor;
 	}
 
-	/**
-	 * Converts the given serialized compressor to the current version.
-	 * @param serializedCompressor - the serialized compressor to convert. Must not have been serialized with an ongoing session.
-	 * @returns a serialized compressor with no ongoing session.
-	 */
-	public static convertToCurrentVersion(
-		serializedCompressor: VersionedSerializedIdCompressor,
-		hasSession: false,
-	): SerializedIdCompressorWithNoSession;
-
-	/**
-	 * Converts the given serialized compressor to the current version.
-	 * @param serializedCompressor - the serialized compressor to convert. Must have been serialized with an ongoing session.
-	 * @returns a serialized compressor with the same ongoing session.
-	 */
-	public static convertToCurrentVersion(
-		serializedCompressor: VersionedSerializedIdCompressor,
-		hasSession: true,
-	): SerializedIdCompressorWithOngoingSession;
-
-	public static convertToCurrentVersion(
-		serializedCompressor: VersionedSerializedIdCompressor,
-		hasSession: boolean,
-	): SerializedIdCompressor | undefined {
-		if (serializedCompressor.version !== currentWrittenVersion) {
-			fail("Unknown SerializedIdCompressor version number");
-		}
-		const serialized = serializedCompressor as SerializedIdCompressorWithOngoingSession;
-		if (hasSession !== hasOngoingSession(serialized)) {
-			return undefined;
+	public equals(other: IdCompressor, includeLocalState: boolean): boolean {
+		if (
+			includeLocalState &&
+			(this.localSessionId !== other.localSessionId ||
+				!this.localSession.equals(other.localSession) ||
+				!this.normalizer.equals(other.normalizer) ||
+				this.nextRangeBaseGenCount !== other.nextRangeBaseGenCount ||
+				this.localGenCount !== other.localGenCount)
+		) {
+			return false;
 		}
-		return serialized;
+		return (
+			this.newClusterCapacity === other.newClusterCapacity &&
+			this.sessions.equals(other.sessions, includeLocalState) &&
+			this.finalSpace.equals(other.finalSpace)
+		);
 	}
 }
-
-/**
- * The version of `IdCompressor` that is currently persisted.
- */
-const currentWrittenVersion = "0.0.1";
-
-/**
- * @returns whether or not the given serialized ID compressor has an ongoing session.
- */
-export function hasOngoingSession(
-	serialized: SerializedIdCompressorWithNoSession | SerializedIdCompressorWithOngoingSession,
-): serialized is SerializedIdCompressorWithOngoingSession {
-	return (
-		(serialized as Partial<SerializedIdCompressorWithOngoingSession>).localSessionIndex !==
-		undefined
-	);
-}
-
-function deserializeCluster(serializedCluster: SerializedCluster): {
-	sessionIndex: number;
-	capacity: number;
-	count: number;
-	overrides?: SerializedClusterOverrides;
-} {
-	const [sessionIndex, capacity, countOrOverrides, overrides] = serializedCluster;
-	const hasCount = typeof countOrOverrides === "number";
-
-	return {
-		sessionIndex,
-		capacity,
-		count: hasCount ? countOrOverrides : capacity,
-		overrides: hasCount ? overrides : countOrOverrides,
-	};
-}
-
-/**
- * Optimization used by the sorted-btree library to avoid allocating tuples every time a lookup method is called.
- * Lookup methods on BTree accept a pre-allocated array that it populates with the result of the lookup and retains no ownership
- * of after the call, so this array may be supplied to any of them. References to this array should not be retained elsewhere and
- * lookup results should be extracted from the tuple immediately after invocation.
- */
-const reusedArray: [any, any] = [] as unknown as [any, any];