superdoc 2.4.0-next.21 → 2.4.0-next.22

package/dist/chunks/{create-super-doc-ui-CFsY0uxw.es.js → create-super-doc-ui-CmOSA_lN.es.js}

@@ -436,11 +436,9 @@ Object.freeze([
 * Classify the tracked-change identities carried by a v2 mutation event.
 *
 * Receipt entities are the durable invalidation contract between the document
-* kernel and derived review UI. Consumers can refresh `upsertIds` narrowly via
-* `trackChanges.get(...)`, drop `removedIds` immediately, and leave a bounded
-* full-list reconciliation as background verification. History results are
-* different: undo/redo can restore many identities at once, so consumers use
-* one authoritative catalog after render instead of issuing one read per id.
+* kernel and derived review UI. Consumers apply removals/remaps locally; the
+* next committed window supplies surviving or restored rows. History follows
+* the same bounded path and never enumerates invisible review identities.
 */
 function getV2TrackedChangeMutationImpact(event) {
 	if (event?.type !== "mutation:committed") return null;
@@ -480,7 +478,7 @@ function getV2TrackedChangeMutationImpact(event) {
 		upsertIds,
 		removedIds,
 		remappedPairs,
-		reconcileMode: event.origin === "history" ? "authoritative" : "targeted",
+		reconcileMode: "targeted",
 		...allResolved ? { allResolved } : {}
 	};
 }
@@ -490,280 +488,6 @@ function readAllResolvedFact(event, receipt) {
 	return fact;
 }
 //#endregion
-//#region src/helpers/v2-review-mutation-reconciler.js
-var normalizeIds = (values) => new Set(Array.from(values ?? []).filter((value) => typeof value === "string" && value.length > 0));
-var itemId = (item) => {
-	if (typeof item?.id === "string" && item.id.length > 0) return item.id;
-	if (typeof item?.changeId === "string" && item.changeId.length > 0) return item.changeId;
-	if (typeof item?.address?.entityId === "string" && item.address.entityId.length > 0) return item.address.entityId;
-	return null;
-};
-var contextMatches = (left, right) => left?.adapter === right?.adapter && left?.documentId === right?.documentId && left?.editor === right?.editor && left?.reconcileToken === right?.reconcileToken;
-/**
-* Reconcile tracked changes only after their canonical render has made the
-* read model observable. Command receipts use narrow reads; history results
-* use one authoritative catalog because undo/redo can restore hundreds of
-* identities in one transaction. An absent history identity only converges
-* when both catalog and source coverage are explicitly complete.
-*/
-function createV2ReviewMutationReconciler({ getContext, reconcile, hydrate, onReconciled }) {
-	const pendingUpserts = /* @__PURE__ */ new Map();
-	let pendingAllResolved = null;
-	let sequence = 0;
-	let generation = 0;
-	let flushInFlight = null;
-	let flushRequested = false;
-	const settlementWaiters = [];
-	const resolveSettlementsThrough = (version, value) => {
-		for (let index = settlementWaiters.length - 1; index >= 0; index -= 1) {
-			const waiter = settlementWaiters[index];
-			if (waiter.generation !== generation || waiter.version > version) continue;
-			settlementWaiters.splice(index, 1);
-			waiter.resolve(value === true && waiter.requiresAllResolved ? pendingAllResolved == null : value);
-		}
-	};
-	const isCurrent = (capturedGeneration, context) => generation === capturedGeneration && contextMatches(context, getContext());
-	const clearResolved = (ids, snapshot) => {
-		const clearedIds = /* @__PURE__ */ new Set();
-		for (const id of ids) {
-			if (pendingUpserts.get(id) !== snapshot.get(id)) continue;
-			pendingUpserts.delete(id);
-			clearedIds.add(id);
-		}
-		return clearedIds;
-	};
-	const readySnapshot = (reconcileMode) => new Map([...pendingUpserts].filter(([, entry]) => entry.ready === true && entry.reconcileMode === reconcileMode));
-	const markRenderGatedReady = () => {
-		let changed = false;
-		if (pendingAllResolved?.gate === "render" && !pendingAllResolved.ready) {
-			pendingAllResolved.ready = true;
-			changed = true;
-		}
-		for (const entry of pendingUpserts.values()) {
-			if (entry.gate !== "render" || entry.ready) continue;
-			entry.ready = true;
-			changed = true;
-		}
-		return changed;
-	};
-	const markEntriesReadyThrough = (maxVersion) => {
-		let changed = false;
-		if (pendingAllResolved && pendingAllResolved.version <= maxVersion && !pendingAllResolved.ready) {
-			pendingAllResolved.ready = true;
-			changed = true;
-		}
-		for (const entry of pendingUpserts.values()) {
-			if (entry.version > maxVersion || entry.ready) continue;
-			entry.ready = true;
-			changed = true;
-		}
-		return changed;
-	};
-	const notifyReconciled = async (context, ids, result, allowEmpty = false) => {
-		if (!allowEmpty && ids.size === 0 || typeof onReconciled !== "function") return;
-		try {
-			await onReconciled(context, ids, result);
-		} catch {}
-	};
-	const idsFromResult = (result) => normalizeIds(result?.resolvedIds ?? (result?.items ?? []).map(itemId).filter(Boolean));
-	const reconcileTargetedSnapshot = async (context, snapshot, capturedGeneration) => {
-		const result = await reconcile(context, {
-			upsertIds: new Set(snapshot.keys()),
-			removedIds: /* @__PURE__ */ new Set(),
-			reconcileMode: "targeted"
-		});
-		if (!isCurrent(capturedGeneration, context)) return;
-		const resolvedIds = idsFromResult(result);
-		const clearedIds = clearResolved(resolvedIds, snapshot);
-		await notifyReconciled(context, clearedIds, result);
-		if (new Set([...snapshot].filter(([id, version]) => pendingUpserts.get(id) === version).map(([id]) => id)).size === 0) return;
-		const fallback = await hydrate(context, {
-			trackedChangesListMode: "interaction-prime",
-			refreshReason: "mutation-render-reconcile",
-			blocking: false
-		});
-		if (!isCurrent(capturedGeneration, context)) return;
-		const fallbackResolvedIds = idsFromResult(fallback);
-		const fallbackClearedIds = clearResolved(fallbackResolvedIds, snapshot);
-		await notifyReconciled(context, fallbackClearedIds, fallback);
-	};
-	const reconcileAuthoritativeSnapshot = async (context, snapshot, capturedGeneration) => {
-		const result = await hydrate(context, {
-			trackedChangesListMode: "all",
-			refreshReason: "mutation-history-render-reconcile",
-			blocking: true
-		});
-		if (!isCurrent(capturedGeneration, context)) return;
-		if (![...snapshot].some(([id, entry]) => pendingUpserts.get(id) === entry)) return;
-		const transportSucceeded = result?.ok === true;
-		const catalogIsAuthoritative = transportSucceeded && result?.complete === true && result?.sourceCoverageComplete === true;
-		const returnedIds = transportSucceeded ? idsFromResult(result) : /* @__PURE__ */ new Set();
-		const clearedIds = catalogIsAuthoritative ? clearResolved(new Set(snapshot.keys()), snapshot) : /* @__PURE__ */ new Set();
-		await notifyReconciled(context, catalogIsAuthoritative ? clearedIds : returnedIds, {
-			...result,
-			reconcileMode: "authoritative"
-		}, true);
-	};
-	const flush = () => {
-		if (flushInFlight) return flushInFlight;
-		const allResolvedSnapshot = pendingAllResolved?.ready ? pendingAllResolved : null;
-		const targetedSnapshot = readySnapshot("targeted");
-		const authoritativeSnapshot = readySnapshot("authoritative");
-		if (!allResolvedSnapshot && targetedSnapshot.size === 0 && authoritativeSnapshot.size === 0) return null;
-		const context = getContext();
-		if (!context?.adapter) return null;
-		flushRequested = false;
-		const capturedGeneration = generation;
-		flushInFlight = Promise.resolve().then(async () => {
-			if (allResolvedSnapshot) {
-				let result = null;
-				try {
-					result = await reconcile(context, {
-						upsertIds: /* @__PURE__ */ new Set(),
-						removedIds: /* @__PURE__ */ new Set(),
-						allResolved: allResolvedSnapshot.fact,
-						reconcileMode: "targeted"
-					});
-				} catch {}
-				if (!isCurrent(capturedGeneration, context)) return;
-				if (result?.ok === true) {
-					if (pendingAllResolved === allResolvedSnapshot) pendingAllResolved = null;
-					await notifyReconciled(context, /* @__PURE__ */ new Set(), result, true);
-				}
-			}
-			if (authoritativeSnapshot.size > 0) await reconcileAuthoritativeSnapshot(context, authoritativeSnapshot, capturedGeneration).catch(() => void 0);
-			if (targetedSnapshot.size > 0) await reconcileTargetedSnapshot(context, targetedSnapshot, capturedGeneration).catch(() => void 0);
-		}).catch(() => {}).finally(() => {
-			flushInFlight = null;
-			if (flushRequested) flush();
-		});
-		return flushInFlight;
-	};
-	const enqueueWithGate = (impact, gate) => {
-		if (!impact) return;
-		if (impact.allResolved) {
-			pendingUpserts.clear();
-			pendingAllResolved = {
-				fact: impact.allResolved,
-				version: ++sequence,
-				gate,
-				ready: false
-			};
-		}
-		const reconcileMode = impact.reconcileMode === "authoritative" ? "authoritative" : "targeted";
-		const removedIds = normalizeIds(impact.removedIds);
-		const upsertIds = normalizeIds(impact.upsertIds);
-		for (const id of removedIds) {
-			const existing = pendingUpserts.get(id);
-			if (existing?.reconcileMode === "authoritative") pendingUpserts.set(id, {
-				...existing,
-				version: ++sequence,
-				gate,
-				ready: false
-			});
-			else pendingUpserts.delete(id);
-		}
-		const context = getContext();
-		if (removedIds.size > 0 && upsertIds.size === 0 && context?.adapter && !impact.allResolved) try {
-			Promise.resolve(reconcile(context, {
-				upsertIds: /* @__PURE__ */ new Set(),
-				removedIds
-			})).catch(() => void 0);
-		} catch {}
-		for (const id of upsertIds) if (!removedIds.has(id)) {
-			const existing = pendingUpserts.get(id);
-			pendingUpserts.set(id, {
-				version: ++sequence,
-				gate,
-				ready: false,
-				reconcileMode: reconcileMode === "authoritative" || existing?.reconcileMode === "authoritative" ? "authoritative" : "targeted"
-			});
-		}
-	};
-	const enqueue = (impact) => enqueueWithGate(impact, "render");
-	const onRender = (supersedesInFlight = false) => {
-		const madeReady = markRenderGatedReady();
-		if (flushInFlight && (madeReady || supersedesInFlight)) flushRequested = true;
-		flush();
-	};
-	return {
-		enqueue,
-		enqueueAfterPaint(impact, waitForPaint) {
-			if (!impact || typeof waitForPaint !== "function") {
-				enqueue(impact);
-				return Promise.resolve(false);
-			}
-			enqueueWithGate(impact, "exact-paint");
-			const context = getContext();
-			const capturedGeneration = generation;
-			const capturedSequence = sequence;
-			if (!context?.adapter) {
-				markEntriesReadyThrough(capturedSequence);
-				return Promise.resolve(false);
-			}
-			const completion = new Promise((resolve) => {
-				settlementWaiters.push({
-					generation: capturedGeneration,
-					version: capturedSequence,
-					requiresAllResolved: Boolean(impact.allResolved),
-					resolve
-				});
-			});
-			const impactedIds = /* @__PURE__ */ new Set([...normalizeIds(impact.upsertIds), ...normalizeIds(impact.removedIds)]);
-			const capturedEntries = new Map([...impactedIds].flatMap((id) => {
-				const entry = pendingUpserts.get(id);
-				return entry ? [[id, entry]] : [];
-			}));
-			Promise.resolve().then(() => waitForPaint()).then(async () => {
-				if (!isCurrent(capturedGeneration, context)) {
-					resolveSettlementsThrough(capturedSequence, false);
-					return;
-				}
-				let madeReady = markRenderGatedReady();
-				if (markEntriesReadyThrough(capturedSequence)) madeReady = true;
-				for (const [id, entry] of capturedEntries) {
-					if (pendingUpserts.get(id) !== entry) continue;
-					if (!entry.ready) madeReady = true;
-					entry.ready = true;
-				}
-				if (flushInFlight && (madeReady || capturedSequence > 0)) flushRequested = true;
-				const preceding = flushInFlight;
-				const pending = flush();
-				if (pending) await pending;
-				if (preceding) {
-					const followUp = flushInFlight;
-					if (followUp && followUp !== preceding) await followUp;
-				}
-				if (!isCurrent(capturedGeneration, context)) {
-					resolveSettlementsThrough(capturedSequence, false);
-					return;
-				}
-				resolveSettlementsThrough(capturedSequence, true);
-			}).catch(() => {
-				if (!isCurrent(capturedGeneration, context)) {
-					resolveSettlementsThrough(capturedSequence, false);
-					return;
-				}
-				for (const [id, entry] of capturedEntries) if (pendingUpserts.get(id) === entry) entry.gate = "render";
-				if (pendingAllResolved?.gate === "exact-paint") pendingAllResolved.gate = "render";
-				resolveSettlementsThrough(capturedSequence, false);
-			});
-			return completion;
-		},
-		onRender,
-		reset() {
-			for (const waiter of settlementWaiters.splice(0)) waiter.resolve(false);
-			generation += 1;
-			pendingUpserts.clear();
-			pendingAllResolved = null;
-			flushRequested = false;
-		},
-		getPendingIds() {
-			return new Set(pendingUpserts.keys());
-		}
-	};
-}
-//#endregion
 //#region src/public/ui/reasons.ts
 /**
 * Stable public reason taxonomy for the v2-native `superdoc/ui` controller.
@@ -1837,6 +1561,17 @@ function collectEntityHitsFromChain(start, stopAt) {
 			for (const hit of pendingStory) hit.story = layoutStory;
 			pendingStory = [];
 		}
+		const citationId = node.getAttribute("data-citation-id");
+		if (citationId) {
+			const key = `citation:${citationId}`;
+			if (!seen.has(key)) {
+				seen.add(key);
+				hits.push({
+					type: "citation",
+					id: citationId
+				});
+			}
+		}
 		const commentIds = node.getAttribute("data-comment-ids");
 		if (commentIds) for (const id of parseCommaSeparatedIds(commentIds)) {
 			const key = `comment:${id}`;
@@ -2402,22 +2137,24 @@ function isHostGeometryTarget(target) {
 * address lets the host prefer the exact painted review carrier after the
 * containing block has been materialized.
 */
-function readTrackedChangeNavigationTarget(row) {
+function readTrackedChangeNavigationTarget(row, options) {
 	if (!row || typeof row !== "object") return null;
 	const target = readEntityTarget(row);
-	if (isHostGeometryTarget(target)) return target;
 	const record = row;
 	const navigationTarget = record.navigationTarget && typeof record.navigationTarget === "object" ? record.navigationTarget : null;
-	if (navigationTarget?.kind === "block" && typeof navigationTarget.blockId === "string" && navigationTarget.blockId.length > 0) return {
-		kind: "text",
-		blockId: navigationTarget.blockId,
-		range: {
-			start: 0,
-			end: 0
-		},
-		...navigationTarget.story && typeof navigationTarget.story === "object" ? { story: navigationTarget.story } : {},
-		...record.address && typeof record.address === "object" ? { address: record.address } : {}
-	};
+	if (navigationTarget?.kind === "block" && typeof navigationTarget.blockId === "string" && navigationTarget.blockId.length > 0) {
+		const stableBlockTarget = {
+			kind: "text",
+			blockId: navigationTarget.blockId,
+			range: {
+				start: 0,
+				end: 0
+			},
+			...navigationTarget.story && typeof navigationTarget.story === "object" ? { story: navigationTarget.story } : {},
+			...record.address && typeof record.address === "object" ? { address: record.address } : {}
+		};
+		if (options?.preferStableBlock || !isHostGeometryTarget(target)) return stableBlockTarget;
+	}
 	return target;
 }
 function storyLocatorSignature(story) {
@@ -3732,8 +3469,8 @@ function createSuperDocUI(options) {
 	const getV2ReviewWindowSource = () => {
 		const editor = getEditor();
 		if (editor?.editorVersion !== 2) return null;
-		const reviewHydration = editor.reviewHydration;
-		return reviewHydration && typeof reviewHydration === "object" ? reviewHydration : null;
+		const reviewWindow = editor.reviewWindow;
+		return reviewWindow && typeof reviewWindow === "object" ? reviewWindow : null;
 	};
 	const getV2ReviewWindowSnapshot = () => {
 		const source = getV2ReviewWindowSource();
@@ -4012,7 +3749,6 @@ function createSuperDocUI(options) {
 		return `e${id}`;
 	};
 	let documentMutationRevision = 0;
-	let reviewMutationToken = {};
 	const uiTrackedChangesCatalogHost = options.superdoc;
 	const uiTrackedChangesCatalogState = acquireSharedUiTrackedChangesCatalog(uiTrackedChangesCatalogHost);
 	const supersedeUiTrackedChangesCatalogRead = () => {
@@ -4044,7 +3780,6 @@ function createSuperDocUI(options) {
 			return fallback();
 		}
 		if (uiTrackedChangesCatalogState.activeMutationTokens.size > 0) return Promise.reject(/* @__PURE__ */ new Error("ui-review-catalog-superseded"));
-		if ((getEditor()?.reviewHydration?.getDiagnostics?.())?.inFlight === true) return Promise.reject(/* @__PURE__ */ new Error("shell-review-hydration-in-flight"));
 		const generation = uiTrackedChangesCatalogState.generation;
 		const existing = uiTrackedChangesCatalogState.inFlight;
 		if (existing?.generation === generation) return existing.promise;
@@ -4070,15 +3805,6 @@ function createSuperDocUI(options) {
 		});
 		return promise;
 	};
-	let authoritativeTrackChangesPendingToken = null;
-	let authoritativeTrackChangesRetryTimer = null;
-	let authoritativeTrackChangesFailureCount = 0;
-	const clearAuthoritativeTrackChangesRetry = () => {
-		if (authoritativeTrackChangesRetryTimer) clearTimeout(authoritativeTrackChangesRetryTimer);
-		authoritativeTrackChangesRetryTimer = null;
-		authoritativeTrackChangesFailureCount = 0;
-	};
-	let scheduleAuthoritativeTrackChangesRetry = (_reconcileToken) => void 0;
 	let postDecisionTrackChangesToken = null;
 	let postDecisionTrackChangeIds = /* @__PURE__ */ new Set();
 	let allTrackedChangesResolvedToken = null;
@@ -4198,65 +3924,6 @@ function createSuperDocUI(options) {
 		publishPostDecisionTrackChanges(newlyRemoved, receipt);
 	};
 	const postDecisionTrackChangeIdsForToken = (token) => postDecisionTrackChangesToken === token && postDecisionTrackChangeIds.size > 0 ? postDecisionTrackChangeIds : null;
-	/**
-	* Merge a narrow tracked-change read into the two settled review caches.
-	* Existing enriched adapter fields are retained while the fresh Document
-	* API fields win. The entry keeps its original content token, so a row that
-	* settles after the typing invalidation is truthfully served as stale rather
-	* than discarded or mislabeled as a complete current-token catalog.
-	*/
-	const mergeTrackedChangeItemsIntoCache = (items, orderedItems = []) => {
-		const projected = items.map(projectTrackChangesItem).filter((item) => item != null && readEntityId(item) != null);
-		if (projected.length === 0) return;
-		const orderedIds = orderedItems.map(projectTrackChangesItem).map((item) => item == null ? null : readEntityId(item)).filter((id) => id != null);
-		for (const key of ["trackChanges", "trackChanges:all"]) {
-			const entry = asyncReads.get(key);
-			const nextValue = entry?.hasSettled && Array.isArray(entry.value) ? [...entry.value] : [];
-			const insertedIds = /* @__PURE__ */ new Set();
-			let changed = false;
-			for (const fresh of projected) {
-				const id = readEntityId(fresh);
-				if (!id) continue;
-				const index = nextValue.findIndex((candidate) => readEntityId(candidate) === id);
-				if (index < 0) {
-					nextValue.push(fresh);
-					insertedIds.add(id);
-				} else {
-					const previous = nextValue[index];
-					nextValue[index] = isLooseObject(previous) ? {
-						...previous,
-						...fresh
-					} : fresh;
-				}
-				changed = true;
-			}
-			if (key === "trackChanges" && insertedIds.size > 0 && orderedIds.length > 0) {
-				const placeableIds = new Set(orderedIds.filter((id) => insertedIds.has(id)));
-				const insertedRows = new Map(nextValue.filter((item) => placeableIds.has(readEntityId(item) ?? "")).map((item) => [readEntityId(item), item]));
-				const placedValue = nextValue.filter((item) => !placeableIds.has(readEntityId(item) ?? ""));
-				for (const [orderIndex, id] of orderedIds.entries()) {
-					if (!placeableIds.has(id)) continue;
-					const item = insertedRows.get(id);
-					if (!item) continue;
-					const followingAnchor = orderedIds.slice(orderIndex + 1).map((candidateId) => placedValue.findIndex((candidate) => readEntityId(candidate) === candidateId)).find((index) => index >= 0);
-					if (followingAnchor != null) {
-						placedValue.splice(followingAnchor, 0, item);
-						continue;
-					}
-					const precedingAnchor = orderedIds.slice(0, orderIndex).reverse().map((candidateId) => placedValue.findIndex((candidate) => readEntityId(candidate) === candidateId)).find((index) => index >= 0);
-					placedValue.splice(precedingAnchor == null ? placedValue.length : precedingAnchor + 1, 0, item);
-				}
-				nextValue.splice(0, nextValue.length, ...placedValue);
-			}
-			if (!changed) continue;
-			asyncReads.set(key, {
-				token: entry?.token ?? null,
-				value: nextValue,
-				hasSettled: true,
-				inflightToken: null
-			});
-		}
-	};
 	const replaceTrackedChangeItemsInCache = (items) => {
 		const token = contentToken();
 		const suppressedIds = postDecisionTrackChangeIdsForToken(token);
@@ -4272,183 +3939,6 @@ function createSuperDocUI(options) {
 			inflightToken: null
 		});
 	};
-	const hydrateTrackedChanges = async (context, options) => {
-		try {
-			const listTrackedChanges = context.v2TrackedChanges?.listTrackedChanges;
-			if (typeof listTrackedChanges === "function") {
-				const result = await Promise.resolve(listTrackedChanges.call(context.v2TrackedChanges, {
-					mode: options.trackedChangesListMode,
-					refreshReason: options.refreshReason,
-					blocking: options.blocking,
-					...options.targetIds?.length ? { targetIds: options.targetIds } : {}
-				}));
-				const ok = options.trackedChangesListMode === "all" && options.refreshReason === "mutation-history-render-reconcile" ? result?.ok === true : result?.ok !== false;
-				return {
-					ok,
-					items: ok && Array.isArray(result?.items) ? result.items : [],
-					...typeof result?.complete === "boolean" ? { complete: result.complete } : {},
-					...typeof result?.sourceCoverageComplete === "boolean" ? { sourceCoverageComplete: result.sourceCoverageComplete } : {}
-				};
-			}
-			const list = context.docTrackChanges?.list;
-			if (typeof list !== "function") return {
-				ok: false,
-				items: []
-			};
-			const result = await Promise.resolve(list.call(context.docTrackChanges));
-			return {
-				ok: true,
-				items: Array.isArray(result?.items) ? result.items : []
-			};
-		} catch (error) {
-			return {
-				ok: false,
-				items: [],
-				failures: [error]
-			};
-		}
-	};
-	/**
-	* Read receipt-addressed review effects after their exact canonical paint.
-	* The adapter's narrow get preserves its enriched row projection; the public
-	* Document API is the fallback for hosts without that bridge method. Empty
-	* successful reads remain unresolved and immediately use one bounded
-	* interaction-prime list instead of waiting for the typing-idle catalog.
-	*/
-	const reviewMutationReconciler = createV2ReviewMutationReconciler({
-		getContext: () => {
-			const editor = getEditor();
-			if (!editor) return null;
-			const v2TrackedChanges = getV2TrackedChanges();
-			const docTrackChanges = getDoc()?.trackChanges ?? null;
-			const adapter = v2TrackedChanges ?? docTrackChanges;
-			if (!adapter) return null;
-			const rawDocumentId = editor.documentId ?? v2TrackedChanges?.documentId;
-			return {
-				editor,
-				adapter,
-				documentId: rawDocumentId == null ? null : String(rawDocumentId),
-				reconcileToken: reviewMutationToken,
-				v2TrackedChanges,
-				docTrackChanges
-			};
-		},
-		reconcile: async (context, impact) => {
-			if (impact.removedIds.size > 0) markPostDecisionTrackChanges(new Set(impact.removedIds));
-			const requestedIds = [...new Set(impact.upsertIds)];
-			if (requestedIds.length === 0) return {
-				ok: true,
-				items: [],
-				resolvedIds: [],
-				unresolvedIds: []
-			};
-			const settledTrackChanges = asyncReads.get("trackChanges");
-			const settledTrackChangeItems = settledTrackChanges?.hasSettled && Array.isArray(settledTrackChanges.value) ? settledTrackChanges.value : null;
-			const cachedIds = new Set(settledTrackChangeItems ? settledTrackChangeItems.map(readEntityId).filter((id) => id != null) : []);
-			const settledCatalogIsProvenEmpty = settledTrackChangeItems?.length === 0 && hostSourceLoadPhase() === "complete";
-			const idsNeedingPlacement = new Set(requestedIds.filter((id) => !cachedIds.has(id)));
-			const getTrackedChange = context.v2TrackedChanges?.getTrackedChange;
-			const getRawTrackedChange = context.docTrackChanges?.get;
-			if (typeof getTrackedChange !== "function" && typeof getRawTrackedChange !== "function") return {
-				ok: false,
-				items: [],
-				resolvedIds: [],
-				unresolvedIds: requestedIds
-			};
-			const reads = await Promise.all(requestedIds.map(async (id) => {
-				try {
-					if (typeof getTrackedChange === "function") {
-						const result = await Promise.resolve(getTrackedChange.call(context.v2TrackedChanges, id));
-						return {
-							id,
-							ok: result?.ok !== false,
-							items: result?.ok !== false && Array.isArray(result?.items) ? result.items : [],
-							result
-						};
-					}
-					const result = await Promise.resolve(getRawTrackedChange.call(context.docTrackChanges, { id }));
-					return {
-						id,
-						ok: true,
-						items: result && typeof result === "object" ? [result] : [],
-						result
-					};
-				} catch (error) {
-					return {
-						id,
-						ok: false,
-						items: [],
-						result: error
-					};
-				}
-			}));
-			const items = [];
-			const resolvedIds = [];
-			const unresolvedIds = [];
-			for (const read of reads) {
-				const matchingItems = read.items.filter((item) => {
-					const projected = projectTrackChangesItem(item);
-					return projected != null && readEntityId(projected) === read.id;
-				});
-				if (read.ok && matchingItems.length > 0) {
-					items.push(...matchingItems);
-					resolvedIds.push(read.id);
-				} else unresolvedIds.push(read.id);
-			}
-			let orderedItems;
-			const placementIds = resolvedIds.filter((id) => idsNeedingPlacement.has(id));
-			if (placementIds.length > 0 && !settledCatalogIsProvenEmpty) {
-				const orderResult = await hydrateTrackedChanges(context, {
-					trackedChangesListMode: "interaction-prime",
-					refreshReason: "mutation-render-reconcile",
-					blocking: false,
-					targetIds: placementIds
-				});
-				if (orderResult.ok) orderedItems = orderResult.items;
-			}
-			return {
-				ok: unresolvedIds.length === 0,
-				items,
-				orderedItems,
-				resolvedIds,
-				unresolvedIds,
-				failures: reads.filter((read) => !read.ok).map((read) => read.result)
-			};
-		},
-		hydrate: hydrateTrackedChanges,
-		onReconciled: (context, ids, result) => {
-			if (result?.reconcileMode === "authoritative") {
-				if (context.reconcileToken !== reviewMutationToken) return;
-				if (result.ok === true && result.complete === true && result.sourceCoverageComplete === true) {
-					clearAuthoritativeTrackChangesRetry();
-					replaceTrackedChangeItemsInCache(result.items ?? []);
-					authoritativeTrackChangesPendingToken = null;
-				} else if (result.ok === true) {
-					clearAuthoritativeTrackChangesRetry();
-					mergeTrackedChangeItemsIntoCache(result.items ?? []);
-				} else scheduleAuthoritativeTrackChangesRetry(context.reconcileToken);
-				recompute();
-				return;
-			}
-			const items = (result?.items ?? []).filter((item) => {
-				const projected = projectTrackChangesItem(item);
-				const id = projected == null ? null : readEntityId(projected);
-				return id != null && ids.has(id);
-			});
-			mergeTrackedChangeItemsIntoCache(items, result?.orderedItems ?? result?.items ?? []);
-			recompute();
-		}
-	});
-	scheduleAuthoritativeTrackChangesRetry = (reconcileToken) => {
-		if (disposed || authoritativeTrackChangesRetryTimer) return;
-		const delayMs = Math.min(ASYNC_READ_FAILURE_RETRY_BASE_MS * 2 ** authoritativeTrackChangesFailureCount, ASYNC_READ_FAILURE_RETRY_MAX_MS);
-		authoritativeTrackChangesFailureCount += 1;
-		authoritativeTrackChangesRetryTimer = setTimeout(() => {
-			authoritativeTrackChangesRetryTimer = null;
-			if (disposed || authoritativeTrackChangesPendingToken === null || reconcileToken !== reviewMutationToken) return;
-			reviewMutationReconciler.onRender(true);
-		}, delayMs);
-	};
 	/** Token for the live selection read, including the mode that controls its public projection. */
 	const selectionReadToken = () => `${contentToken()}|m${readDocumentMode()}|s${selectionEpoch}`;
 	/** Stable signature of a settled selection, used to key selection-scoped reads. */
@@ -4474,6 +3964,11 @@ function createSuperDocUI(options) {
 		return "unknown";
 	};
 	const demandedHeavyReads = /* @__PURE__ */ new Map();
+	const incompleteTrackChangesDirectoryReadTokens = /* @__PURE__ */ new Map();
+	const postSourceCompletionRefreshTokens = /* @__PURE__ */ new Map();
+	let sourceCompletionObservedToken = null;
+	let commentsDirectoryLeaseCount = 0;
+	let trackChangesDirectoryLeaseCount = 0;
 	const demandHeavyDocRead = (key) => {
 		const token = contentToken();
 		if (demandedHeavyReads.get(key) === token) return;
@@ -4486,6 +3981,41 @@ function createSuperDocUI(options) {
 		return Array.isArray(entry.value) && entry.value.length > 0;
 	};
 	const heavyReadDemandActive = (key, token) => demandedHeavyReads.get(key) === token;
+	const refreshIncompleteTrackChangesDirectories = () => {
+		const token = contentToken();
+		let invalidated = false;
+		for (const [key, incompleteToken] of incompleteTrackChangesDirectoryReadTokens) {
+			if (incompleteToken !== token) {
+				incompleteTrackChangesDirectoryReadTokens.delete(key);
+				continue;
+			}
+			if (postSourceCompletionRefreshTokens.get(key) === token) continue;
+			const entry = asyncReads.get(key);
+			if (!entry?.hasSettled || entry.token !== token || entry.inflightToken != null) continue;
+			asyncReads.set(key, {
+				...entry,
+				token: null,
+				inflightToken: null
+			});
+			postSourceCompletionRefreshTokens.set(key, token);
+			invalidated = true;
+		}
+		if (invalidated) scheduleAsyncRefresh();
+	};
+	const acquireDirectoryLease = (family) => {
+		if (family === "comments") commentsDirectoryLeaseCount += 1;
+		else trackChangesDirectoryLeaseCount += 1;
+		demandHeavyDocRead(family);
+		let released = false;
+		return () => {
+			if (released) return;
+			released = true;
+			if (family === "comments") commentsDirectoryLeaseCount = Math.max(0, commentsDirectoryLeaseCount - 1);
+			else trackChangesDirectoryLeaseCount = Math.max(0, trackChangesDirectoryLeaseCount - 1);
+			if ((family === "comments" ? commentsDirectoryLeaseCount : trackChangesDirectoryLeaseCount) === 0 && demandedHeavyReads.get(family) === contentToken()) demandedHeavyReads.delete(family);
+			scheduleAsyncRefresh();
+		};
+	};
 	/**
 	* Demand-driven route for the content-controls catalog (panel / API use).
 	* Explicit demand bypasses both active-loading and post-complete idle holds.
@@ -4556,6 +4086,8 @@ function createSuperDocUI(options) {
 			const handleLoadingSnapshot = (snapshot) => {
 				const stage = snapshot?.sourceStage;
 				if (stage === "source-complete" || stage === "source-failed" || stage === "source-cancelled") {
+					sourceCompletionObservedToken = contentToken();
+					refreshIncompleteTrackChangesDirectories();
 					lastEditableMutationAtMs = Math.max(lastEditableMutationAtMs, Date.now());
 					scheduleHeavyReadCompletionRecompute();
 				}
@@ -4880,12 +4412,8 @@ function createSuperDocUI(options) {
 		const editor = getEditor();
 		if (editor === lastCoordinatorEditor) return;
 		resetPostPaintContentRefresh();
-		reviewMutationReconciler.reset();
-		reviewMutationToken = {};
 		lastCoordinatorEditor = editor;
 		asyncReads.clear();
-		authoritativeTrackChangesPendingToken = null;
-		clearAuthoritativeTrackChangesRetry();
 		if (asyncReadFailureRetryTimer) clearTimeout(asyncReadFailureRetryTimer);
 		asyncReadFailureRetryTimer = null;
 		asyncReadFailureRetryAtMs = 0;
@@ -4897,6 +4425,9 @@ function createSuperDocUI(options) {
 		pendingSelectionSeedValidationToken = null;
 		coldAsyncReadDeferrals.clear();
 		demandedHeavyReads.clear();
+		incompleteTrackChangesDirectoryReadTokens.clear();
+		postSourceCompletionRefreshTokens.clear();
+		sourceCompletionObservedToken = null;
 		heavyReadsHeldUntilIdle = false;
 		if (detachSourceLoading) detachSourceLoading();
 		detachSourceLoading = null;
@@ -4906,9 +4437,10 @@ function createSuperDocUI(options) {
 	};
 	/** Bump the document-mutation revision so content reads re-fetch on the next compute. */
 	const invalidateDocumentContent = () => {
-		const carryAuthoritativeTrackChangesHold = authoritativeTrackChangesPendingToken !== null;
 		documentMutationRevision += 1;
-		if (carryAuthoritativeTrackChangesHold) authoritativeTrackChangesPendingToken = contentToken();
+		incompleteTrackChangesDirectoryReadTokens.clear();
+		postSourceCompletionRefreshTokens.clear();
+		sourceCompletionObservedToken = null;
 		clearPostDecisionTrackChanges();
 	};
 	/**
@@ -5136,17 +4668,51 @@ function createSuperDocUI(options) {
 		recompute();
 		return state.selection;
 	};
-	const computeComments = (selection) => {
+	const readCommentsDirectory = () => {
 		const commentsApi = getDoc()?.comments;
+		return readAsync("comments", contentToken(), () => commentsApi?.list ? commentsApi.list() : void 0, (raw) => raw && Array.isArray(raw.items) ? raw.items : []);
+	};
+	const readTrackChangesDirectory = (key = "trackChanges") => {
+		const token = contentToken();
+		const tcApi = getDoc()?.trackChanges;
+		const v2TrackedChanges = getV2TrackedChanges();
+		const listTrackedChanges = typeof v2TrackedChanges?.listTrackedChanges === "function" ? v2TrackedChanges.listTrackedChanges : null;
+		const read = readAsync(key, token, () => {
+			if (listTrackedChanges) return runUiTrackedChangesCatalogRead(() => tcApi?.list?.({ in: "all" }));
+			return tcApi?.list ? tcApi.list({ in: "all" }) : void 0;
+		}, (raw) => {
+			const result = raw && typeof raw === "object" ? raw : null;
+			if (result?.complete === false || result?.sourceCoverageComplete === false) {
+				incompleteTrackChangesDirectoryReadTokens.set(key, token);
+				armSourceLoadCompletionRecompute();
+				if (sourceCompletionObservedToken === token || hostSourceLoadPhase() === "complete") {
+					const refresh = () => {
+						if (!disposed) refreshIncompleteTrackChangesDirectories();
+					};
+					if (typeof queueMicrotask === "function") queueMicrotask(refresh);
+					else Promise.resolve().then(refresh);
+				}
+			} else if (incompleteTrackChangesDirectoryReadTokens.get(key) === token) incompleteTrackChangesDirectoryReadTokens.delete(key);
+			return result && Array.isArray(result.items) ? result.items : [];
+		});
+		return incompleteTrackChangesDirectoryReadTokens.get(key) === token && read.status === "ready" ? {
+			...read,
+			status: "stale"
+		} : read;
+	};
+	const computeComments = (selection) => {
 		const reviewWindow = getV2ReviewWindowSnapshot();
-		const catalog = readAsync("comments", contentToken(), () => commentsApi?.list ? commentsApi.list() : void 0, (raw) => raw && Array.isArray(raw.items) ? raw.items : []);
-		const windowItems = hasV2ReviewWindowFeed() && Array.isArray(reviewWindow?.commentItems) ? reviewWindow.commentItems : null;
-		const useWindowSlice = catalog.status === "pending" && windowItems != null;
-		const value = useWindowSlice ? windowItems : catalog.value;
-		const listStatus = useWindowSlice ? reviewWindowSliceStatus(reviewWindow) : catalog.status;
+		const hasWindowFeed = hasV2ReviewWindowFeed();
+		const catalog = !hasWindowFeed ? readCommentsDirectory() : null;
+		const windowItems = hasWindowFeed && Array.isArray(reviewWindow?.commentItems) ? reviewWindow.commentItems : null;
+		const value = hasWindowFeed ? windowItems : catalog.value;
+		const listStatus = hasWindowFeed ? reviewWindowSliceStatus(reviewWindow) : catalog.status;
 		const items = value ?? [];
 		const activeIds = selection.activeCommentIds;
-		if (explicitActiveCommentId && !items.some((item) => readEntityId(item) === explicitActiveCommentId)) explicitActiveCommentId = null;
+		const directory = asyncReads.get("comments");
+		const directoryItems = directory?.token === contentToken() && directory.hasSettled && Array.isArray(directory.value) ? directory.value : null;
+		const activeValidationItems = commentsDirectoryLeaseCount > 0 ? directoryItems : items;
+		if (explicitActiveCommentId && activeValidationItems && !activeValidationItems.some((item) => readEntityId(item) === explicitActiveCommentId)) explicitActiveCommentId = null;
 		const activeId = explicitActiveCommentId ?? activeIds[0] ?? null;
 		return {
 			status: combineStatus(listStatus, selection.status),
@@ -5157,51 +4723,32 @@ function createSuperDocUI(options) {
 			activeId
 		};
 	};
-	const readAllStoryTrackChanges = () => {
-		const tcApi = getDoc()?.trackChanges;
-		const token = contentToken();
-		const heldEntry = asyncReads.get("trackChanges:all");
-		const { value, status } = authoritativeTrackChangesPendingToken === token ? {
-			value: heldEntry?.hasSettled ? heldEntry.value : null,
-			status: heldEntry?.hasSettled ? "stale" : "pending"
-		} : readAsync("trackChanges:all", token, () => {
-			if (!tcApi?.list) return void 0;
-			const fallback = () => tcApi.list({ in: "all" });
-			const bridgeOwnsCatalog = typeof getV2TrackedChanges()?.listTrackedChanges === "function";
-			const shared = runUiTrackedChangesCatalogRead(fallback);
-			if (!bridgeOwnsCatalog) return shared;
-			return Promise.resolve(shared).then((raw) => {
-				const record = isLooseObject(raw) ? raw : null;
-				return (Array.isArray(record?.items) ? record.items : []).some((item) => readEntityStory(item) == null) ? fallback() : raw;
-			});
-		}, (raw) => {
-			return (raw && Array.isArray(raw.items) ? raw.items : []).map(projectTrackChangesItem).filter((item) => item != null);
-		});
-		return status === "ready" ? value : null;
+	const projectedTrackChangesCache = /* @__PURE__ */ new WeakMap();
+	const projectTrackChangesItems = (source) => {
+		const cached = projectedTrackChangesCache.get(source);
+		if (cached) return cached;
+		const projected = source.map(projectTrackChangesItem).filter((item) => item != null);
+		projectedTrackChangesCache.set(source, projected);
+		return projected;
 	};
-	const computeTrackChanges = (selection) => {
-		const tcApi = getDoc()?.trackChanges;
-		const v2TrackedChanges = getV2TrackedChanges();
-		const listTrackedChanges = typeof v2TrackedChanges?.listTrackedChanges === "function" ? v2TrackedChanges.listTrackedChanges : null;
-		const token = contentToken();
-		const postDecisionIds = postDecisionTrackChangeIdsForToken(token);
-		const heldEntry = asyncReads.get("trackChanges");
-		const reviewWindow = getV2ReviewWindowSnapshot();
-		const catalog = authoritativeTrackChangesPendingToken === token ? {
-			value: heldEntry?.hasSettled ? heldEntry.value : null,
-			status: heldEntry?.hasSettled ? "stale" : "pending"
-		} : readAsync("trackChanges", token, () => {
-			if (listTrackedChanges) return runUiTrackedChangesCatalogRead(() => tcApi?.list?.());
-			return tcApi?.list ? tcApi.list({ in: "all" }) : void 0;
-		}, (raw) => raw && Array.isArray(raw.items) ? raw.items : []);
-		const windowItems = hasV2ReviewWindowFeed() && Array.isArray(reviewWindow?.trackedChangeItems) ? reviewWindow.trackedChangeItems : null;
-		const useWindowSlice = catalog.status === "pending" && windowItems != null;
-		const value = useWindowSlice ? windowItems : catalog.value;
-		const listStatus = useWindowSlice ? reviewWindowSliceStatus(reviewWindow) : catalog.status;
-		const items = (value ?? []).map(projectTrackChangesItem).filter((item) => item != null).filter((item) => {
+	const filteredTrackChangesCache = /* @__PURE__ */ new WeakMap();
+	const filterPostDecisionTrackChanges = (source, suppressedIds) => {
+		const cached = filteredTrackChangesCache.get(source);
+		if (cached?.suppressedIds === suppressedIds) return cached.value;
+		const filtered = suppressedIds ? source.filter((item) => {
 			const id = readEntityId(item);
-			return !id || !postDecisionIds?.has(id);
+			return !id || !suppressedIds.has(id);
+		}) : source;
+		filteredTrackChangesCache.set(source, {
+			suppressedIds,
+			value: filtered
 		});
+		return filtered;
+	};
+	const trackChangeAuthorsCache = /* @__PURE__ */ new WeakMap();
+	const trackChangeAuthors = (items) => {
+		const cached = trackChangeAuthorsCache.get(items);
+		if (cached) return cached;
 		const authors = /* @__PURE__ */ new Set();
 		for (const item of items) {
 			const change = trackChangesItemPayload(item);
@@ -5209,12 +4756,38 @@ function createSuperDocUI(options) {
 			const author = change.author ?? change.authorEmail ?? row.author ?? row.authorEmail;
 			if (typeof author === "string") authors.add(author);
 		}
-		const allStoryItems = tcApi?.list ? readAllStoryTrackChanges() : null;
+		const value = [...authors];
+		trackChangeAuthorsCache.set(items, value);
+		return value;
+	};
+	const readAllStoryTrackChanges = () => {
+		const token = contentToken();
+		if (hasV2ReviewWindowFeed()) {
+			const directory = asyncReads.get("trackChanges");
+			const source = directory?.token === token && directory.hasSettled && Array.isArray(directory.value) ? directory.value : getV2ReviewWindowSnapshot()?.trackedChangeItems;
+			if (!Array.isArray(source)) return null;
+			return projectTrackChangesItems(source);
+		}
+		const { value, status } = readTrackChangesDirectory("trackChanges:all");
+		return status === "ready" ? projectTrackChangesItems(value ?? []) : null;
+	};
+	const computeTrackChanges = (selection) => {
+		const token = contentToken();
+		const postDecisionIds = postDecisionTrackChangeIdsForToken(token);
+		const reviewWindow = getV2ReviewWindowSnapshot();
+		const hasWindowFeed = hasV2ReviewWindowFeed();
+		const catalog = !hasWindowFeed ? readTrackChangesDirectory() : null;
+		const windowItems = hasWindowFeed && Array.isArray(reviewWindow?.trackedChangeItems) ? reviewWindow.trackedChangeItems : null;
+		const value = hasWindowFeed ? windowItems : catalog.value;
+		const listStatus = hasWindowFeed ? reviewWindowSliceStatus(reviewWindow) : catalog.status;
+		const items = filterPostDecisionTrackChanges(projectTrackChangesItems(value ?? []), postDecisionIds);
+		const allStoryItems = readAllStoryTrackChanges();
 		const active = explicitActiveChange;
-		if (active) {
-			if (active.story) {
-				if (allStoryItems && !allStoryItems.some((row) => entityRowMatchesRequest(row, active.id, active.story))) setExplicitActiveChange(null);
-			} else if (!items.some((item) => readEntityId(item) === active.id)) setExplicitActiveChange(null);
+		if (active && !pendingTrackChangeRevealFocuses.has(active)) {
+			const directory = asyncReads.get("trackChanges");
+			const directoryItems = directory?.token === token && directory.hasSettled && Array.isArray(directory.value) ? filterPostDecisionTrackChanges(projectTrackChangesItems(directory.value), postDecisionIds) : null;
+			const activeValidationItems = trackChangesDirectoryLeaseCount > 0 ? directoryItems : active.story ? allStoryItems : items;
+			if (activeValidationItems && !activeValidationItems.some((row) => entityRowMatchesRequest(row, active.id, active.story))) setExplicitActiveChange(null);
 		}
 		const publicIdItems = allStoryItems ?? items;
 		const selectionIdContext = buildStoryScopedTrackedChangeIdContext(publicIdItems, selectionStory(selection));
@@ -5235,7 +4808,37 @@ function createSuperDocUI(options) {
 			items,
 			total: items.length,
 			activeId,
-			authors: [...authors]
+			authors: trackChangeAuthors(items)
+		};
+	};
+	const computeCommentsDirectorySnapshot = (selection, windowSnapshot) => {
+		if (!hasV2ReviewWindowFeed()) return windowSnapshot;
+		demandHeavyDocRead("comments");
+		const directory = readCommentsDirectory();
+		const items = directory.value ?? windowSnapshot.items;
+		return {
+			status: combineStatus(directory.status, selection.status),
+			listStatus: directory.status,
+			items,
+			total: items.length,
+			activeIds: selection.activeCommentIds,
+			activeId: explicitActiveCommentId ?? selection.activeCommentIds[0] ?? null
+		};
+	};
+	const computeTrackChangesDirectorySnapshot = (selection, windowSnapshot) => {
+		if (!hasV2ReviewWindowFeed()) return windowSnapshot;
+		demandHeavyDocRead("trackChanges");
+		const directory = readTrackChangesDirectory();
+		const postDecisionIds = postDecisionTrackChangeIdsForToken(contentToken());
+		const items = filterPostDecisionTrackChanges(projectTrackChangesItems(directory.value ?? windowSnapshot.items), postDecisionIds);
+		const explicitIdContext = explicitActiveChange?.story ? buildStoryScopedTrackedChangeIdContext(items, explicitActiveChange.story) : buildTrackedChangeIdContext(items);
+		const activeId = explicitActiveChange ? explicitIdContext.toPublicId(explicitActiveChange.id) ?? explicitActiveChange.id : windowSnapshot.activeId;
+		return {
+			status: combineStatus(directory.status, selection.status),
+			items,
+			total: items.length,
+			activeId,
+			authors: trackChangeAuthors(items)
 		};
 	};
 	const computeContentControls = (selection) => {
@@ -7168,54 +6771,19 @@ function createSuperDocUI(options) {
 				}
 				if (type === "mutation:committed" && event.reviewMutation) settleUiReviewMutation(event.reviewMutation.token);
 				if (type === "source:complete" || type === "source:signals-complete") {
-					if (authoritativeTrackChangesPendingToken !== null) {
-						clearAuthoritativeTrackChangesRetry();
-						reviewMutationReconciler.onRender(true);
-					}
+					sourceCompletionObservedToken = contentToken();
+					refreshIncompleteTrackChangesDirectories();
 					return;
 				}
 				if (type === "mutation:committed" || type === "collaboration:remote-changed") lastEditableMutationAtMs = Date.now();
-				if (type === "mutation:committed") {
-					clearAuthoritativeTrackChangesRetry();
-					reviewMutationToken = {};
-				}
 				if (type === "mutation:committed" || type === "save:completed" || type === "collaboration:remote-changed") {
 					const impact = type === "mutation:committed" ? getV2TrackedChangeMutationImpact(event) : null;
-					const supersedesPendingReviewReconcile = type === "mutation:committed" && reviewMutationReconciler.getPendingIds().size > 0;
 					if (impact?.allResolved) {
-						reviewMutationReconciler.reset();
 						replaceTrackedChangeItemsInCache([]);
-						authoritativeTrackChangesPendingToken = null;
 						publishAllTrackedChangesResolved(event.receipt);
 						return;
 					}
 					if (impact?.removedIds.size) markPostDecisionTrackChanges(new Set(impact.removedIds), event.receipt);
-					const authoritativeHistoryImpact = impact?.reconcileMode === "authoritative" && impact.upsertIds.size > 0;
-					if (authoritativeHistoryImpact) {
-						invalidateDocumentContent();
-						clearAuthoritativeTrackChangesRetry();
-						authoritativeTrackChangesPendingToken = contentToken();
-						recompute();
-					}
-					if (impact?.upsertIds.size || supersedesPendingReviewReconcile) {
-						const receipt = event.origin === "history" ? null : event.receipt;
-						const readiness = getEditor()?.documentMutationReadiness;
-						const canWaitForReceiptPaint = typeof receipt?.txId === "string" && receipt.txId.length > 0 && typeof readiness?.whenPainted === "function";
-						const historyRenderEpoch = event.origin === "history" && typeof readiness?.getRenderEpoch === "function" ? safeCall(() => readiness.getRenderEpoch.call(readiness), null) : null;
-						const canWaitForHistoryPaint = event.origin === "history" && typeof readiness?.whenPainted === "function";
-						const upsertImpact = {
-							upsertIds: impact?.upsertIds ?? /* @__PURE__ */ new Set(),
-							removedIds: /* @__PURE__ */ new Set(),
-							reconcileMode: impact?.reconcileMode === "authoritative" ? "authoritative" : "targeted"
-						};
-						if (canWaitForReceiptPaint) reviewMutationReconciler.enqueueAfterPaint(upsertImpact, () => readiness.whenPainted.call(readiness, receipt));
-						else if (canWaitForHistoryPaint) reviewMutationReconciler.enqueueAfterPaint(upsertImpact, () => readiness.whenPainted.call(readiness, typeof historyRenderEpoch === "number" ? { afterEpoch: historyRenderEpoch } : void 0));
-						else {
-							reviewMutationReconciler.enqueue(upsertImpact);
-							reviewMutationReconciler.onRender(supersedesPendingReviewReconcile);
-						}
-					}
-					if (authoritativeHistoryImpact) return;
 					const isTypingBurst = type === "mutation:committed" && isEditableTextMutationEvent(event) || type === "collaboration:remote-changed" && Array.isArray(event.changedStoryIds) && event.changedStoryIds.length > 0;
 					if (isTypingBurst) lastTypingMutationAtMs = Date.now();
 					if (type === "mutation:committed" && isTypingBurst) {
@@ -7374,6 +6942,25 @@ function createSuperDocUI(options) {
 			subscribe: (listener) => observe((snapshot) => listener({ snapshot }))
 		};
 	};
+	const directorySnapshotHandle = (passiveSub, directorySub, family) => {
+		const passive = snapshotHandle(passiveSub);
+		const directory = snapshotHandle(directorySub);
+		const observe = (listener) => {
+			const release = acquireDirectoryLease(family);
+			recompute();
+			const unsubscribe = directory.observe(listener);
+			return () => {
+				unsubscribe();
+				release();
+			};
+		};
+		return {
+			get: passive.get,
+			getSnapshot: passive.getSnapshot,
+			observe,
+			subscribe: (listener) => observe((snapshot) => listener({ snapshot }))
+		};
+	};
 	function readTrackDecisionTargetId(target) {
 		return target && typeof target === "object" && typeof target.id === "string" ? String(target.id) : null;
 	}
@@ -9178,7 +8765,7 @@ function createSuperDocUI(options) {
 		const moveSide = namespace === "trackChanges" && loadedRecord?.type === "move" && (loadedRecord.subtype === "move-to" || loadedRecord.subtype === "move-from") ? loadedRecord.subtype : null;
 		const trackedChangeLookupId = moveSide && typeof loadedRecord?.trackedChangeCanonicalId === "string" ? loadedRecord.trackedChangeCanonicalId : id;
 		const readResolvedTarget = (row) => {
-			if (!moveSide) return readTarget(row);
+			if (!moveSide) return namespace === "trackChanges" ? readTrackedChangeNavigationTarget(row, { preferStableBlock: true }) : readTarget(row);
 			const moveTarget = readEntityTarget(row);
 			if (moveTarget?.kind !== "move") return null;
 			const sideTarget = moveSide === "move-to" ? moveTarget.destination : moveTarget.source;
@@ -9236,7 +8823,7 @@ function createSuperDocUI(options) {
 		return filtered.slice(offset, end);
 	};
 	const commentsSub = sliceHandle((s) => s.comments);
-	const commentsSnap = snapshotHandle(commentsSub);
+	const commentsSnap = directorySnapshotHandle(commentsSub, select((s) => computeCommentsDirectorySnapshot(s.selection, s.comments)), "comments");
 	const comments = {
 		get: commentsSnap.get,
 		getSnapshot: commentsSnap.getSnapshot,
@@ -9244,12 +8831,8 @@ function createSuperDocUI(options) {
 		observe: commentsSnap.observe,
 		list: (query) => {
 			ensureCommentsCatalog();
-			const snapshot = commentsSub.get();
-			if (snapshot.status !== "pending") return filterCommentsSnapshot(snapshot.items, query);
-			const commentsApi = getDoc()?.comments;
-			const result = safeCall(commentsApi?.list ? () => commentsApi.list(query) : void 0, null);
-			if (isPromiseLike(result)) return [];
-			return filterCommentsSnapshot(Array.isArray(result?.items) ? result.items : [], query);
+			const directory = readCommentsDirectory();
+			return filterCommentsSnapshot(directory.value ?? commentsSub.get().items, query);
 		},
 		getById: (commentId) => {
 			const fromSnapshot = commentsSub.get().items.find((item) => readEntityId(item) === commentId) ?? null;
@@ -9335,10 +8918,13 @@ function createSuperDocUI(options) {
 			}
 			if (!getEditor()) return false;
 			const snapshot = commentsSub.get();
-			if (snapshot.listStatus !== "ready") return false;
-			const resolvedId = resolveActiveCommentId(snapshot.items, commentId);
+			const directory = asyncReads.get("comments");
+			const directoryItems = directory?.token === contentToken() && directory.hasSettled && Array.isArray(directory.value) ? directory.value : null;
+			const items = directoryItems ?? snapshot.items;
+			if (!directoryItems && snapshot.listStatus !== "ready") return false;
+			const resolvedId = resolveActiveCommentId(items, commentId);
 			if (!resolvedId) return false;
-			if (!snapshot.items.some((entry) => readEntityId(entry) === resolvedId)) return false;
+			if (!items.some((entry) => readEntityId(entry) === resolvedId)) return false;
 			explicitActiveCommentId = resolvedId;
 			recompute();
 			return true;
@@ -9360,7 +8946,8 @@ function createSuperDocUI(options) {
 	};
 	const trackChangesSub = sliceHandle((s) => s.trackChanges);
 	const navigateTrackChange = (step, options) => {
-		const allRows = trackChangesSub.get().items.filter((item) => readEntityId(item) !== null);
+		ensureTrackChangesCatalog();
+		const allRows = (readTrackChangesDirectory().value ?? trackChangesSub.get().items).map(projectTrackChangesItem).filter((item) => item != null && readEntityId(item) !== null);
 		if (allRows.length === 0) return null;
 		const currentId = state.trackChanges.activeId;
 		const currentStory = explicitActiveChange?.id === currentId ? explicitActiveChange.story : void 0;
@@ -9449,7 +9036,7 @@ function createSuperDocUI(options) {
 		trackChangeNavigationTail = run.then(() => void 0, () => void 0);
 		return run;
 	};
-	const trackChangesSnap = snapshotHandle(trackChangesSub);
+	const trackChangesSnap = directorySnapshotHandle(trackChangesSub, select((s) => computeTrackChangesDirectorySnapshot(s.selection, s.trackChanges)), "trackChanges");
 	const trackChanges = {
 		get: trackChangesSnap.get,
 		getSnapshot: trackChangesSnap.getSnapshot,
@@ -9457,7 +9044,12 @@ function createSuperDocUI(options) {
 		observe: trackChangesSnap.observe,
 		list: () => {
 			ensureTrackChangesCatalog();
-			return trackChangesSub.get().items;
+			const source = readTrackChangesDirectory().value ?? trackChangesSub.get().items;
+			const suppressed = postDecisionTrackChangeIdsForToken(contentToken());
+			return source.map(projectTrackChangesItem).filter((item) => item != null).filter((item) => {
+				const id = readEntityId(item);
+				return !id || !suppressed?.has(id);
+			});
 		},
 		accept: (changeId) => executeTrackDecision("accept", changeId),
 		reject: (changeId) => executeTrackDecision("reject", changeId),
@@ -9514,7 +9106,7 @@ function createSuperDocUI(options) {
 				if (!allStoryItems.some((row) => entityRowMatchesRequest(row, publicId, requested.story))) return false;
 				requested.id = publicId;
 			} else {
-				const items = trackChangesSub.get().items;
+				const items = readAllStoryTrackChanges() ?? trackChangesSub.get().items;
 				const publicId = buildTrackedChangeIdContext(items).toPublicId(requested.id) ?? requested.id;
 				const item = items.find((candidate) => readEntityId(candidate) === publicId);
 				if (!item) return false;
@@ -10724,8 +10316,6 @@ function createSuperDocUI(options) {
 		if (disposed) return;
 		disposed = true;
 		releaseSharedUiTrackedChangesCatalog(uiTrackedChangesCatalogHost, uiTrackedChangesCatalogState);
-		reviewMutationReconciler.reset();
-		clearAuthoritativeTrackChangesRetry();
 		if (foregroundAsyncRetryTimer) {
 			clearTimeout(foregroundAsyncRetryTimer);
 			foregroundAsyncRetryTimer = null;
@@ -10751,7 +10341,12 @@ function createSuperDocUI(options) {
 		if (detachSourceLoading) detachSourceLoading();
 		detachSourceLoading = null;
 		sourceLoadingSubscriptionHost = null;
+		commentsDirectoryLeaseCount = 0;
+		trackChangesDirectoryLeaseCount = 0;
 		demandedHeavyReads.clear();
+		incompleteTrackChangesDirectoryReadTokens.clear();
+		postSourceCompletionRefreshTokens.clear();
+		sourceCompletionObservedToken = null;
 		coldAsyncReadDeferrals.clear();
 		for (const detach of detachers.splice(0)) detach();
 		if (detachHostSelection) detachHostSelection();
@@ -11010,4 +10605,4 @@ function commandIsActive(descriptor, selection) {
 	return descriptor.activeMark ? selection.activeMarks.includes(descriptor.activeMark) : false;
 }
 //#endregion
-export { getV2TrackedChangeMutationImpact as a, createV2ReviewMutationReconciler as i, shallowEqual as n, DOM_CLASS_NAMES as o, BUILT_IN_COMMAND_IDS as r, createSuperDocUI as t };
+export { DOM_CLASS_NAMES as a, getV2TrackedChangeMutationImpact as i, shallowEqual as n, BUILT_IN_COMMAND_IDS as r, createSuperDocUI as t };