superdoc 2.4.0-next.1 → 2.4.0-next.10

package/dist/superdoc.cjs

@@ -4,9 +4,9 @@ const require_blank_docx = require("./chunks/blank-docx-DP8RUPW-.cjs");
 const require_eventemitter3 = require("./chunks/eventemitter3-DqY4aSMf.cjs");
 const require_uuid = require("./chunks/uuid-CFp0WGVU.cjs");
 const require_jszip = require("./chunks/jszip-Cs9JBLlJ.cjs");
-const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-BTwbGDKw.cjs");
-const require_constants = require("./chunks/constants-sbCZ2O_A.cjs");
-const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-DXdWuTzm.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-ByvmsAAG.cjs");
+const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-CZ1Nl59K.cjs");
+const require_constants = require("./chunks/constants-D7TNtyJd.cjs");
 let vue = require("vue");
 vue = require_rolldown_runtime.__toESM(vue);
 require("y-websocket");
@@ -6327,6 +6327,7 @@ function createStubReviewHydrationController() {
 		setContext() {},
 		onRenderReadiness() {},
 		hydrateNow() {},
+		reconcileInBackground() {},
 		invalidate() {},
 		reset() {},
 		getDiagnostics() {
@@ -6526,6 +6527,8 @@ var COMMENT_DRAFT_BLOCK_OPEN_TAG = /<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]
 var COMMENT_DRAFT_BLOCK_CLOSE_TAG = /<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>/gi;
 var COMMENT_DRAFT_ANY_TAG = /<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s[^>]*)?\s*\/?>/g;
 var COMMENT_DRAFT_ENTITY = /&(#x[0-9a-fA-F]+|#\d+|[a-zA-Z][a-zA-Z0-9]+);/g;
+var TRACKED_CHANGE_BACKGROUND_RECONCILE_BATCH_SIZE = 50;
+var TRACKED_CHANGE_BACKGROUND_RECONCILE_YIELD_TIMEOUT_MS = 50;
 var COMMENT_DRAFT_NAMED_ENTITIES = {
 	amp: "&",
 	apos: "'",
@@ -6542,6 +6545,13 @@ var shallowEqual = (a, b) => {
 	if (aKeys.length !== bKeys.length) return false;
 	return aKeys.every((key) => Object.prototype.hasOwnProperty.call(b, key) && Object.is(a[key], b[key]));
 };
+var yieldForTrackedChangeBackgroundReconcile = () => new Promise((resolve) => {
+	if (typeof globalThis.requestIdleCallback === "function") {
+		globalThis.requestIdleCallback(resolve, { timeout: TRACKED_CHANGE_BACKGROUND_RECONCILE_YIELD_TIMEOUT_MS });
+		return;
+	}
+	setTimeout(resolve, 0);
+});
 var normalizeTrackedChangeDetailLines = (lines) => {
 	if (!Array.isArray(lines)) return null;
 	const normalized = lines.filter((line) => line && typeof line === "object").map((line) => ({
@@ -6728,8 +6738,17 @@ const useCommentsStore = defineStore("comments", () => {
 		return viewingVisibility.commentsVisible || viewingVisibility.trackChangesVisible;
 	});
 	const v2CommentsAdapter = (0, vue.shallowRef)(null);
+	const v2CommentSyncGenerations = /* @__PURE__ */ new WeakMap();
+	const commentSyncGeneration = (adapter) => v2CommentSyncGenerations.get(adapter) ?? 0;
+	const supersedeCommentSyncGeneration = (adapter) => {
+		if (!adapter || typeof adapter !== "object" && typeof adapter !== "function") return 0;
+		const next = commentSyncGeneration(adapter) + 1;
+		v2CommentSyncGenerations.set(adapter, next);
+		return next;
+	};
 	const setV2CommentsAdapter = (adapter) => {
 		v2CommentsAdapter.value = adapter ?? null;
+		if (adapter && !v2CommentSyncGenerations.has(adapter)) v2CommentSyncGenerations.set(adapter, 0);
 	};
 	const getV2CommentsAdapter = (superdoc) => {
 		const fromFacade = superdoc?.activeEditor?.v2Comments ?? null;
@@ -6738,14 +6757,27 @@ const useCommentsStore = defineStore("comments", () => {
 	};
 	const isV2EditorActive = (superdoc) => superdoc?.activeEditor?.editorVersion === 2 || v2CommentsAdapter.value !== null;
 	const v2TrackedChangesAdapter = (0, vue.shallowRef)(null);
+	const v2TrackedChangeSyncGenerations = /* @__PURE__ */ new WeakMap();
+	const trackedChangeSyncGeneration = (adapter) => v2TrackedChangeSyncGenerations.get(adapter) ?? 0;
+	const supersedeTrackedChangeSyncGeneration = (adapter) => {
+		if (!adapter || typeof adapter !== "object" && typeof adapter !== "function") return 0;
+		const next = trackedChangeSyncGeneration(adapter) + 1;
+		v2TrackedChangeSyncGenerations.set(adapter, next);
+		return next;
+	};
 	const setV2TrackedChangesAdapter = (adapter) => {
 		v2TrackedChangesAdapter.value = adapter ?? null;
+		if (adapter && !v2TrackedChangeSyncGenerations.has(adapter)) v2TrackedChangeSyncGenerations.set(adapter, 0);
 	};
 	const getV2TrackedChangesAdapter = (superdoc) => {
 		const fromFacade = superdoc?.activeEditor?.v2TrackedChanges ?? null;
 		if (fromFacade) return fromFacade;
 		return v2TrackedChangesAdapter.value;
 	};
+	const supersedeV2ReviewHydration = ({ commentsAdapter, trackedChangesAdapter } = {}) => ({
+		commentsGeneration: supersedeCommentSyncGeneration(commentsAdapter ?? v2CommentsAdapter.value),
+		trackedChangesGeneration: supersedeTrackedChangeSyncGeneration(trackedChangesAdapter ?? v2TrackedChangesAdapter.value)
+	});
 	const init = (config = {}) => {
 		const updatedConfig = {
 			...commentsConfig,
@@ -7201,7 +7233,7 @@ const useCommentsStore = defineStore("comments", () => {
 		}
 		activeEditor?.commands?.setActiveComment({ commentId: activeComment.value });
 	};
-	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, documentState = void 0 }) => {
+	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, documentState = void 0, trackedChangeIdentityIndex = null }) => {
 		const span = startInteractionSpan("store.trackedChanges.handleUpdate", "store-reconciliation", {
 			event: params?.event ?? null,
 			changeId: params?.changeId ?? null,
@@ -7304,6 +7336,17 @@ const useCommentsStore = defineStore("comments", () => {
 					if (normalizedAnchorKey && commentAnchorKey) return commentAnchorKey === normalizedAnchorKey;
 					return false;
 				};
+				if (trackedChangeIdentityIndex) {
+					const candidates = trackedChangeIdentityIndex.candidates({
+						changeId: normalizedChangeId,
+						importedId: normalizedImportedId,
+						anchorKey: normalizedAnchorKey,
+						canonicalId: normalizedTrackedChangeCanonicalId,
+						positionAliases: normalizedTrackedChangePositionAliases
+					});
+					for (const trackedComment of candidates) if (matchesId(trackedComment) && (!normalizedDocumentId || belongsToTrackedChangeSyncDocument(trackedComment, normalizedDocumentId))) return trackedComment;
+					return null;
+				}
 				if (normalizedDocumentId) return commentsList.value.find((trackedComment) => matchesId(trackedComment) && belongsToTrackedChangeSyncDocument(trackedComment, normalizedDocumentId));
 				return commentsList.value.find(matchesId);
 			};
@@ -7372,6 +7415,7 @@ const useCommentsStore = defineStore("comments", () => {
 				const existing = findTrackedChangeById();
 				if (existing) {
 					if (!updateExistingTrackedChange(existing)) return;
+					trackedChangeIdentityIndex?.add(existing);
 					emitTrackedChangeEvent({
 						type: COMMENT_EVENTS.UPDATE,
 						comment: getCommentEventPayload(existing)
@@ -7383,10 +7427,12 @@ const useCommentsStore = defineStore("comments", () => {
 					comment,
 					broadcastChanges
 				});
+				trackedChangeIdentityIndex?.add(comment);
 			} else if (event === "update") {
 				const existingTrackedChange = findTrackedChangeById();
 				if (!existingTrackedChange) return;
 				if (!updateExistingTrackedChange(existingTrackedChange)) return;
+				trackedChangeIdentityIndex?.add(existingTrackedChange);
 				emitTrackedChangeEvent({
 					type: COMMENT_EVENTS.UPDATE,
 					comment: getCommentEventPayload(existingTrackedChange)
@@ -8119,7 +8165,7 @@ const useCommentsStore = defineStore("comments", () => {
 		if (!adapter) return false;
 		return v2TrackedChangesAdapter.value === adapter;
 	};
-	const applyReviewSnapshotFromV2 = ({ superdoc, commentsAdapter, trackedChangesAdapter, documentId, commentItems, trackedChangeItems, trackedList, patch } = {}) => withInteractionSpan("store.reviewSnapshot.apply", "store-reconciliation", {
+	const applyReviewSnapshotFromV2 = ({ superdoc, commentsAdapter, trackedChangesAdapter, documentId, commentItems, trackedChangeItems, trackedList, sourceCoverageRevision, evaluatedRevision, patch } = {}) => withInteractionSpan("store.reviewSnapshot.apply", "store-reconciliation", {
 		commentItemCount: Array.isArray(commentItems) ? commentItems.length : null,
 		trackedItemCount: Array.isArray(trackedChangeItems) ? trackedChangeItems.length : null
 	}, () => {
@@ -8157,11 +8203,28 @@ const useCommentsStore = defineStore("comments", () => {
 			ok: false,
 			reason: "adapter-mapper-missing"
 		};
+		let effectiveCommentItems = commentItems;
+		let commentItemsArePartial = false;
+		if (typeof commentsAdapter.seedReviewCatalog === "function") {
+			const seeded = commentsAdapter.seedReviewCatalog(commentItems, {
+				sourceCoverageRevision,
+				evaluatedRevision
+			});
+			if (seeded?.ok !== true) return {
+				ok: false,
+				reason: seeded?.reason ?? "comment-catalog-seed-failed"
+			};
+			const selected = commentsAdapter.selectVisibleReviewComments?.();
+			if (selected?.ok === true && Array.isArray(selected.items) && (!Array.isArray(selected.unresolvedIds) || selected.unresolvedIds.length === 0)) {
+				effectiveCommentItems = selected.items;
+				commentItemsArePartial = true;
+			}
+		}
 		const fileType = (normalizedDocumentId ? superdocStore.getDocument(normalizedDocumentId) : null)?.type ?? null;
 		let preparedInputs;
 		let preparedParams;
 		try {
-			preparedInputs = commentItems.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => commentsAdapter.mapV2CommentToUseCommentInput(item, {
+			preparedInputs = effectiveCommentItems.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => commentsAdapter.mapV2CommentToUseCommentInput(item, {
 				fileId: normalizedDocumentId,
 				fileType
 			})).filter(Boolean);
@@ -8190,8 +8253,9 @@ const useCommentsStore = defineStore("comments", () => {
 				superdoc,
 				adapter: commentsAdapter,
 				documentId: normalizedDocumentId,
-				items: commentItems,
-				preparedInputs
+				items: effectiveCommentItems,
+				preparedInputs,
+				pruneStale: !commentItemsArePartial
 			});
 		});
 		return {
@@ -8200,15 +8264,31 @@ const useCommentsStore = defineStore("comments", () => {
 			trackedItems: preparedParams.length
 		};
 	});
-	const hydrateCommentsFromV2 = async ({ superdoc, adapter, documentId } = {}) => withInteractionSpan("store.comments.hydrateFromV2", "comments-list", { documentId: documentId ?? null }, async () => {
+	const hydrateCommentsFromV2 = async ({ superdoc, adapter, documentId, trackedChangesListMode = "all", isCurrent, signal, hydrationGeneration } = {}) => withInteractionSpan("store.comments.hydrateFromV2", "comments-list", { documentId: documentId ?? null }, async () => {
 		const effectiveAdapter = adapter ?? getV2CommentsAdapter(superdoc);
-		if (!effectiveAdapter || typeof effectiveAdapter.refresh !== "function") return {
+		const visibleWindow = trackedChangesListMode === "visible-window";
+		const read = visibleWindow ? effectiveAdapter?.selectVisibleReviewComments : effectiveAdapter?.refresh;
+		if (!effectiveAdapter || typeof read !== "function") return {
 			ok: false,
 			reason: "adapter-missing"
 		};
+		const hydrationIsCurrent = () => isCurrent?.() !== false && isCurrentV2CommentsAdapter(effectiveAdapter);
+		if (!hydrationIsCurrent()) return {
+			ok: false,
+			reason: "adapter-stale"
+		};
+		if (signal?.aborted) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: false
+		};
+		const syncGeneration = commentSyncGeneration(effectiveAdapter);
 		let result;
 		try {
-			result = await effectiveAdapter.refresh();
+			const refreshOptions = {};
+			if (signal) refreshOptions.signal = signal;
+			if (typeof hydrationGeneration === "number") refreshOptions.hydrationGeneration = hydrationGeneration;
+			result = Object.keys(refreshOptions).length > 0 ? await read.call(effectiveAdapter, refreshOptions) : await read.call(effectiveAdapter);
 		} catch (err) {
 			return {
 				ok: false,
@@ -8216,25 +8296,41 @@ const useCommentsStore = defineStore("comments", () => {
 				detail: err?.message ?? String(err)
 			};
 		}
-		if (!isCurrentV2CommentsAdapter(effectiveAdapter)) return {
+		if (!hydrationIsCurrent()) return {
 			ok: false,
 			reason: "adapter-stale"
 		};
+		if (signal?.aborted || commentSyncGeneration(effectiveAdapter) !== syncGeneration) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: true
+		};
 		if (!result?.ok) return result;
+		if (signal?.aborted || commentSyncGeneration(effectiveAdapter) !== syncGeneration) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: true
+		};
 		reconcileCommentsFromV2({
 			superdoc,
 			adapter: effectiveAdapter,
 			documentId,
-			items: result.items ?? []
+			items: result.items ?? [],
+			pruneStale: !visibleWindow,
+			hydrationGeneration
 		});
 		return {
 			ok: true,
-			items: result.items ?? []
+			items: result.items ?? [],
+			reconciled: true,
+			...typeof hydrationGeneration === "number" ? { hydrationGeneration } : {},
+			...result.visibleWindowSource != null ? { visibleWindowSource: result.visibleWindowSource } : {}
 		};
 	});
-	const reconcileCommentsFromV2 = ({ superdoc, adapter, documentId, items, preparedInputs = null } = {}) => withInteractionSpan("store.comments.reconcile", "store-reconciliation", {
+	const reconcileCommentsFromV2 = ({ superdoc, adapter, documentId, items, preparedInputs = null, pruneStale = true, hydrationGeneration } = {}) => withInteractionSpan("store.comments.reconcile", "store-reconciliation", {
 		documentId: documentId ?? null,
-		itemCount: Array.isArray(items) ? items.length : null
+		itemCount: Array.isArray(items) ? items.length : null,
+		hydrationGeneration: hydrationGeneration ?? null
 	}, () => {
 		if (!adapter || !Array.isArray(items)) return { added: null };
 		if (!isCurrentV2CommentsAdapter(adapter)) return {
@@ -8349,6 +8445,7 @@ const useCommentsStore = defineStore("comments", () => {
 				seenIncoming.add(cid);
 				nextList.push(existing);
 			}
+			if (!input && !pruneStale) nextList.push(existing);
 		}
 		for (const [cid, input] of incomingByCommentId.entries()) {
 			if (seenIncoming.has(cid)) continue;
@@ -9008,7 +9105,7 @@ const useCommentsStore = defineStore("comments", () => {
 		let removed = false;
 		const targetIndex = targetComment ? commentsList.value.indexOf(targetComment) : -1;
 		const targetIds = targetComment?.trackedChange ? collectTrackedChangeDecisionIds(targetComment) : /* @__PURE__ */ new Set();
-		if (targetIndex >= 0 && belongsToTrackedChangeSyncDocument(targetComment, normalizedDocumentId) && Array.from(normalizedDecidedIds).some((id) => targetIds.has(id))) {
+		if (targetIndex >= 0 && belongsToTrackedChangeSyncDocument(targetComment, normalizedDocumentId) && Array.from(targetIds).some((id) => normalizedDecidedIds.has(id))) {
 			targetIds.forEach((id) => removedIds.add(id));
 			commentsList.value.splice(targetIndex, 1);
 			removed = true;
@@ -9016,7 +9113,7 @@ const useCommentsStore = defineStore("comments", () => {
 			if (!comment?.trackedChange) return true;
 			if (!belongsToTrackedChangeSyncDocument(comment, normalizedDocumentId)) return true;
 			const ids = collectTrackedChangeDecisionIds(comment);
-			if (!Array.from(normalizedDecidedIds).some((id) => ids.has(id))) return true;
+			if (!Array.from(ids).some((id) => normalizedDecidedIds.has(id))) return true;
 			removed = true;
 			ids.forEach((id) => removedIds.add(id));
 			return false;
@@ -9032,6 +9129,31 @@ const useCommentsStore = defineStore("comments", () => {
 			removedIds
 		};
 	};
+	const clearAllResolvedTrackedChangeRows = ({ adapter, documentId } = {}) => {
+		const normalizedDocumentId = normalizeCommentId(documentId);
+		if (!adapter || !normalizedDocumentId) return {
+			removed: 0,
+			removedIds: /* @__PURE__ */ new Set()
+		};
+		supersedeTrackedChangeSyncGeneration(adapter);
+		const removedIds = /* @__PURE__ */ new Set();
+		const activeId = normalizeCommentId(activeComment.value);
+		let activeWasRemoved = false;
+		const next = commentsList.value.filter((comment) => {
+			if (!comment?.trackedChange || !belongsToTrackedChangeSyncDocument(comment, normalizedDocumentId)) return true;
+			const aliases = collectTrackedChangeDecisionIds(comment);
+			aliases.forEach((id) => removedIds.add(id));
+			if (activeId && aliases.has(activeId)) activeWasRemoved = true;
+			return false;
+		});
+		const removed = commentsList.value.length - next.length;
+		if (removed > 0) commentsList.value = next;
+		if (activeWasRemoved) clearActiveCommentSelection();
+		return {
+			removed,
+			removedIds
+		};
+	};
 	const clearV2ActiveTrackedChangeTarget = (adapter, decidedId) => {
 		if (!decidedId || typeof adapter?.clearActiveTrackedChangeTargetIfMatches !== "function") return;
 		try {
@@ -9242,7 +9364,7 @@ const useCommentsStore = defineStore("comments", () => {
 			success: Boolean(command(id))
 		};
 	};
-	const hydrateTrackedChangesFromV2 = async ({ superdoc, adapter, documentId, trackedChangesListMode = "all", refreshReason, blocking } = {}) => withInteractionSpan("store.trackedChanges.hydrateFromV2", "tracked-change-list", {
+	const hydrateTrackedChangesFromV2 = async ({ superdoc, adapter, documentId, trackedChangesListMode = "all", refreshReason, blocking, isCurrent, targetIds, reconciliationBatchSize = TRACKED_CHANGE_BACKGROUND_RECONCILE_BATCH_SIZE, signal, hydrationGeneration } = {}) => withInteractionSpan("store.trackedChanges.hydrateFromV2", "tracked-change-list", {
 		documentId: documentId ?? null,
 		trackedChangesListMode,
 		refreshReason: refreshReason ?? null,
@@ -9253,11 +9375,49 @@ const useCommentsStore = defineStore("comments", () => {
 			ok: false,
 			reason: "adapter-missing"
 		};
+		const hydrationIsCurrent = () => isCurrent?.() !== false && isCurrentV2TrackedChangesAdapter(effectiveAdapter);
+		if (!hydrationIsCurrent()) return {
+			ok: false,
+			reason: "adapter-stale"
+		};
+		const syncGeneration = trackedChangeSyncGeneration(effectiveAdapter);
+		const hydrationCanContinue = () => hydrationIsCurrent() && !signal?.aborted && trackedChangeSyncGeneration(effectiveAdapter) === syncGeneration;
+		if (signal?.aborted) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: false
+		};
+		const incrementalLiveIds = /* @__PURE__ */ new Set();
+		const incrementalLiveAnchorKeys = /* @__PURE__ */ new Set();
+		let incrementalPagesApplied = 0;
+		let incrementalItemsApplied = 0;
 		let result;
 		try {
 			const listOptions = { mode: trackedChangesListMode };
+			if (Array.isArray(targetIds)) listOptions.targetIds = targetIds;
 			if (refreshReason != null) listOptions.refreshReason = refreshReason;
 			if (typeof blocking === "boolean") listOptions.blocking = blocking;
+			if (signal) listOptions.signal = signal;
+			if (typeof hydrationGeneration === "number") listOptions.hydrationGeneration = hydrationGeneration;
+			if (trackedChangesListMode === "background-reconcile") {
+				listOptions.shouldContinue = hydrationCanContinue;
+				listOptions.onPage = async (page) => {
+					if (!hydrationCanContinue()) return;
+					const pageItems = Array.isArray(page?.items) ? page.items : [];
+					if (!reconcileTrackedChangesFromV2({
+						superdoc,
+						adapter: effectiveAdapter,
+						documentId,
+						items: pageItems,
+						pruneStale: false,
+						liveIds: incrementalLiveIds,
+						liveAnchorKeys: incrementalLiveAnchorKeys,
+						hydrationGeneration
+					}) || !hydrationCanContinue()) return;
+					incrementalPagesApplied += 1;
+					incrementalItemsApplied += pageItems.length;
+				};
+			}
 			result = await effectiveAdapter.listTrackedChanges(listOptions);
 		} catch (err) {
 			return {
@@ -9266,22 +9426,68 @@ const useCommentsStore = defineStore("comments", () => {
 				detail: err?.message ?? String(err)
 			};
 		}
-		if (!isCurrentV2TrackedChangesAdapter(effectiveAdapter)) return {
+		if (!hydrationIsCurrent()) return {
 			ok: false,
 			reason: "adapter-stale"
 		};
+		if (trackedChangeSyncGeneration(effectiveAdapter) !== syncGeneration) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: true
+		};
+		if (signal?.aborted) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: true
+		};
 		if (!result?.ok) return result;
 		const pruneStale = !(trackedChangesListMode === "startup-page" || trackedChangesListMode === "interaction-prime" || trackedChangesListMode === "visible-window") && result.visibleWindowSource == null && result.complete === true && result.sourceCoverageComplete === true;
-		reconcileTrackedChangesFromV2({
+		if (signal?.aborted || trackedChangeSyncGeneration(effectiveAdapter) !== syncGeneration) return {
+			ok: false,
+			reason: "review-hydration-superseded",
+			lateResultDropped: true
+		};
+		if (trackedChangesListMode === "background-reconcile") if (incrementalPagesApplied > 0) {
+			if (!hydrationCanContinue()) return {
+				ok: false,
+				reason: "reconciliation-stale"
+			};
+			const effectiveDocumentId = documentId ?? effectiveAdapter.documentId ?? superdoc?.activeEditor?.documentId ?? null;
+			if (pruneStale && effectiveDocumentId) withInteractionSpan("store.trackedChanges.reconcile.finalPrune", "store-reconciliation", {
+				documentId: effectiveDocumentId,
+				liveIds: incrementalLiveIds.size,
+				liveAnchorKeys: incrementalLiveAnchorKeys.size
+			}, () => {
+				if (!hydrationCanContinue()) return;
+				pruneStaleTrackedChangeComments(incrementalLiveIds, incrementalLiveAnchorKeys, String(effectiveDocumentId), superdoc, { broadcastChanges: false });
+			});
+		} else {
+			const reconcileResult = await reconcileTrackedChangesFromV2Incrementally({
+				superdoc,
+				adapter: effectiveAdapter,
+				documentId,
+				items: result.items ?? [],
+				pruneStale,
+				isCurrent: hydrationIsCurrent,
+				batchSize: reconciliationBatchSize,
+				hydrationGeneration
+			});
+			if (!reconcileResult.ok) return reconcileResult;
+			incrementalItemsApplied = reconcileResult.appliedItems;
+		}
+		else reconcileTrackedChangesFromV2({
 			superdoc,
 			adapter: effectiveAdapter,
 			documentId,
 			items: result.items ?? [],
-			pruneStale
+			pruneStale,
+			hydrationGeneration
 		});
 		const hydrationResult = {
 			ok: true,
-			items: result.items ?? []
+			items: result.items ?? [],
+			reconciled: true,
+			...typeof hydrationGeneration === "number" ? { hydrationGeneration } : {}
 		};
 		if (typeof result.complete === "boolean") hydrationResult.complete = result.complete;
 		if (typeof result.sourceCoverageComplete === "boolean") hydrationResult.sourceCoverageComplete = result.sourceCoverageComplete;
@@ -9289,14 +9495,28 @@ const useCommentsStore = defineStore("comments", () => {
 		if (result.visibleWindowFallbackReason != null) hydrationResult.visibleWindowFallbackReason = result.visibleWindowFallbackReason;
 		if (typeof result.visibleTrackedChangeExpectedRows === "number") hydrationResult.visibleTrackedChangeExpectedRows = result.visibleTrackedChangeExpectedRows;
 		if (typeof result.visibleTrackedChangeObservedRows === "number") hydrationResult.visibleTrackedChangeObservedRows = result.visibleTrackedChangeObservedRows;
+		for (const key of [
+			"visibleTrackedChangeRequestedIds",
+			"visibleTrackedChangeSucceededIds",
+			"visibleTrackedChangeFailedIds"
+		]) if (Array.isArray(result[key])) hydrationResult[key] = [...result[key]];
+		if (Array.isArray(result.visibleWindowGetFailures)) hydrationResult.visibleWindowGetFailures = result.visibleWindowGetFailures.map((failure) => ({ ...failure }));
 		if (typeof result.refreshReason === "string") hydrationResult.refreshReason = result.refreshReason;
 		if (typeof result.blocking === "boolean") hydrationResult.blocking = result.blocking;
 		if (typeof result.pageCount === "number") hydrationResult.pageCount = result.pageCount;
+		if (typeof result.pagesStarted === "number") hydrationResult.pagesStarted = result.pagesStarted;
+		if (typeof result.pagesCompleted === "number") hydrationResult.pagesCompleted = result.pagesCompleted;
+		if (typeof result.pagesSkippedAfterAbort === "number") hydrationResult.pagesSkippedAfterAbort = result.pagesSkippedAfterAbort;
 		if (typeof result.totalItems === "number") hydrationResult.totalItems = result.totalItems;
 		if (typeof result.coalesced === "boolean") hydrationResult.coalesced = result.coalesced;
+		if (typeof result.evaluatedRevision === "string") hydrationResult.evaluatedRevision = result.evaluatedRevision;
+		if (trackedChangesListMode === "background-reconcile") {
+			hydrationResult.incrementalPagesApplied = incrementalPagesApplied;
+			hydrationResult.incrementalItemsApplied = incrementalItemsApplied;
+		}
 		return hydrationResult;
 	});
-	const reconcileTrackedChangeMutationFromV2 = async ({ superdoc, adapter, documentId, upsertIds = [], removedIds = [] } = {}) => {
+	const reconcileTrackedChangeMutationFromV2 = async ({ superdoc, adapter, documentId, upsertIds = [], removedIds = [], allResolved } = {}) => {
 		const effectiveAdapter = adapter ?? getV2TrackedChangesAdapter(superdoc);
 		if (!effectiveAdapter) return {
 			ok: false,
@@ -9307,6 +9527,26 @@ const useCommentsStore = defineStore("comments", () => {
 			reason: "adapter-stale"
 		};
 		const effectiveDocumentId = documentId ?? effectiveAdapter.documentId ?? superdoc?.activeEditor?.documentId ?? null;
+		if (allResolved && effectiveDocumentId == null) return {
+			ok: false,
+			reason: "document-id-missing"
+		};
+		if (allResolved) return {
+			ok: true,
+			items: [],
+			resolvedIds: [],
+			unresolvedIds: [],
+			allResolved: true,
+			removedRows: withInteractionSpan("store.trackedChanges.allResolved", "store-reconciliation", {
+				documentId: String(effectiveDocumentId),
+				logicalTargetCount: allResolved.logicalTargetCount ?? null,
+				physicalCarrierCount: allResolved.physicalCarrierCount ?? null
+			}, () => clearAllResolvedTrackedChangeRows({
+				adapter: effectiveAdapter,
+				documentId: effectiveDocumentId
+			})).removed
+		};
+		const syncGeneration = trackedChangeSyncGeneration(effectiveAdapter);
 		const normalizedRemovedIds = new Set(Array.from(removedIds ?? []).map((id) => normalizeCommentId(id)).filter(Boolean));
 		const normalizedUpsertIds = [...new Set(Array.from(upsertIds ?? []).map((id) => normalizeCommentId(id)).filter(Boolean))];
 		if (normalizedRemovedIds.size > 0 && normalizedUpsertIds.length === 0 && effectiveDocumentId != null) pruneDecidedTrackedChangeRow({
@@ -9345,6 +9585,10 @@ const useCommentsStore = defineStore("comments", () => {
 			ok: false,
 			reason: "adapter-stale"
 		};
+		if (trackedChangeSyncGeneration(effectiveAdapter) !== syncGeneration) return {
+			ok: false,
+			reason: "generation-stale"
+		};
 		const resolvedIds = [];
 		const unresolvedIds = [];
 		const items = [];
@@ -9371,35 +9615,188 @@ const useCommentsStore = defineStore("comments", () => {
 			failures: reads.map(({ result }) => result).filter((result) => !result?.ok)
 		};
 	};
-	const reconcileTrackedChangesFromV2 = ({ superdoc, adapter, documentId, items, pruneStale = true, preparedParams = null } = {}) => withInteractionSpan("store.trackedChanges.reconcile", "store-reconciliation", {
+	const createTrackedChangeBatchIdentityIndex = (documentId) => {
+		const byIdentityAlias = /* @__PURE__ */ new Map();
+		const indexedRows = /* @__PURE__ */ new Set();
+		let aliasLookups = 0;
+		let candidateVisits = 0;
+		const addAlias = (index, value, comment) => {
+			const alias = normalizeCommentId(value);
+			if (!alias) return;
+			const bucket = index.get(alias) ?? /* @__PURE__ */ new Set();
+			bucket.add(comment);
+			index.set(alias, bucket);
+		};
+		const add = (comment) => {
+			if (!comment?.trackedChange) return;
+			if (documentId && !belongsToTrackedChangeSyncDocument(comment, documentId)) return;
+			indexedRows.add(comment);
+			addAlias(byIdentityAlias, comment.commentId, comment);
+			addAlias(byIdentityAlias, comment.importedId, comment);
+			addAlias(byIdentityAlias, comment.trackedChangeCanonicalId, comment);
+			addAlias(byIdentityAlias, comment.trackedChangeAnchorKey, comment);
+			getCommentAliasIds(comment).forEach((alias) => addAlias(byIdentityAlias, alias, comment));
+		};
+		commentsList.value.forEach(add);
+		return {
+			add,
+			work: () => ({
+				trackedRowsIndexed: indexedRows.size,
+				invalidatedIdMembershipChecks: 0,
+				incomingAliasLookups: aliasLookups,
+				candidateVisits
+			}),
+			candidates({ changeId, importedId, anchorKey, canonicalId, positionAliases = [] } = {}) {
+				const out = /* @__PURE__ */ new Set();
+				const include = (value) => {
+					const alias = normalizeCommentId(value);
+					if (!alias) return;
+					aliasLookups += 1;
+					const bucket = byIdentityAlias.get(alias);
+					if (!bucket) return;
+					candidateVisits += bucket.size;
+					bucket.forEach((comment) => out.add(comment));
+				};
+				new Set([
+					changeId,
+					importedId,
+					canonicalId,
+					anchorKey,
+					...positionAliases
+				]).forEach(include);
+				return out;
+			}
+		};
+	};
+	const reconcileTrackedChangesFromV2 = ({ superdoc, adapter, documentId, items, pruneStale = true, preparedParams = null, liveIds: suppliedLiveIds = null, liveAnchorKeys: suppliedLiveAnchorKeys = null, hydrationGeneration } = {}) => withInteractionSpan("store.trackedChanges.reconcile", "store-reconciliation", {
 		documentId: documentId ?? null,
 		itemCount: Array.isArray(items) ? items.length : null,
-		pruneStale
+		pruneStale,
+		hydrationGeneration: hydrationGeneration ?? null
 	}, () => {
 		if (!adapter || !Array.isArray(items)) return;
 		if (!isCurrentV2TrackedChangesAdapter(adapter)) return;
 		const effectiveDocumentId = documentId ?? adapter.documentId ?? superdoc?.activeEditor?.documentId ?? null;
-		const liveAnchorKeys = /* @__PURE__ */ new Set();
-		const liveIds = /* @__PURE__ */ new Set();
+		const liveAnchorKeys = suppliedLiveAnchorKeys instanceof Set ? suppliedLiveAnchorKeys : /* @__PURE__ */ new Set();
+		const liveIds = suppliedLiveIds instanceof Set ? suppliedLiveIds : /* @__PURE__ */ new Set();
+		let appliedCount = 0;
+		const trackedChangeIdentityIndex = createTrackedChangeBatchIdentityIndex(effectiveDocumentId == null ? null : String(effectiveDocumentId));
+		const identitySpan = startInteractionSpan("store.trackedChanges.batchIdentity", "store-reconciliation", { itemCount: items.length });
 		const paramsList = Array.isArray(preparedParams) ? preparedParams : items.map((item) => adapter.mapV2TrackedChangeToCommentParams(item));
-		for (const params of paramsList) {
-			if (!params) continue;
-			if (params.event === "omit") {
+		try {
+			for (const params of paramsList) {
+				if (!params) continue;
+				if (params.event === "omit") {
+					if (params.changeId != null) liveIds.add(String(params.changeId));
+					continue;
+				}
+				if (effectiveDocumentId && params.documentId == null) params.documentId = effectiveDocumentId;
 				if (params.changeId != null) liveIds.add(String(params.changeId));
-				continue;
+				if (params.trackedChangeAnchorKey != null) liveAnchorKeys.add(String(params.trackedChangeAnchorKey));
+				handleTrackedChangeUpdate({
+					superdoc,
+					params,
+					broadcastChanges: false,
+					trackedChangeIdentityIndex
+				});
+				appliedCount += 1;
 			}
-			if (effectiveDocumentId && params.documentId == null) params.documentId = effectiveDocumentId;
-			if (params.changeId != null) liveIds.add(String(params.changeId));
-			if (params.trackedChangeAnchorKey != null) liveAnchorKeys.add(String(params.trackedChangeAnchorKey));
-			handleTrackedChangeUpdate({
-				superdoc,
-				params,
-				broadcastChanges: false
-			});
+		} finally {
+			endInteractionSpan(identitySpan, trackedChangeIdentityIndex.work());
 		}
-		if (!effectiveDocumentId || !pruneStale) return;
+		if (!effectiveDocumentId || !pruneStale) return {
+			liveIds,
+			liveAnchorKeys,
+			appliedCount
+		};
 		pruneStaleTrackedChangeComments(liveIds, liveAnchorKeys, String(effectiveDocumentId), superdoc, { broadcastChanges: false });
+		return {
+			liveIds,
+			liveAnchorKeys,
+			appliedCount
+		};
 	});
+	const reconcileTrackedChangesFromV2Incrementally = async ({ superdoc, adapter, documentId, items, pruneStale, isCurrent, batchSize = TRACKED_CHANGE_BACKGROUND_RECONCILE_BATCH_SIZE, hydrationGeneration } = {}) => {
+		if (!adapter || !Array.isArray(items)) return {
+			ok: false,
+			reason: "reconcile-input-invalid"
+		};
+		const current = () => isCurrent?.() !== false && isCurrentV2TrackedChangesAdapter(adapter);
+		if (!current()) return {
+			ok: false,
+			reason: "reconciliation-stale"
+		};
+		const effectiveBatchSize = Math.max(1, Math.floor(Number(batchSize) || TRACKED_CHANGE_BACKGROUND_RECONCILE_BATCH_SIZE));
+		const effectiveDocumentId = documentId ?? adapter.documentId ?? superdoc?.activeEditor?.documentId ?? null;
+		const liveIds = /* @__PURE__ */ new Set();
+		const liveAnchorKeys = /* @__PURE__ */ new Set();
+		let appliedItems = 0;
+		let batchCount = 0;
+		for (let offset = 0; offset < items.length; offset += effectiveBatchSize) {
+			if (!current()) return {
+				ok: false,
+				reason: "reconciliation-stale",
+				appliedItems,
+				batchCount
+			};
+			const batch = items.slice(offset, offset + effectiveBatchSize);
+			if (!reconcileTrackedChangesFromV2({
+				superdoc,
+				adapter,
+				documentId: effectiveDocumentId,
+				items: batch,
+				pruneStale: false,
+				liveIds,
+				liveAnchorKeys,
+				hydrationGeneration
+			}) || !current()) return {
+				ok: false,
+				reason: "reconciliation-stale",
+				appliedItems,
+				batchCount
+			};
+			appliedItems += batch.length;
+			batchCount += 1;
+			if (offset + effectiveBatchSize < items.length) await yieldForTrackedChangeBackgroundReconcile();
+		}
+		if (!current()) return {
+			ok: false,
+			reason: "reconciliation-stale",
+			appliedItems,
+			batchCount
+		};
+		if (pruneStale && effectiveDocumentId) {
+			withInteractionSpan("store.trackedChanges.reconcile.finalPrune", "store-reconciliation", {
+				documentId: effectiveDocumentId,
+				liveIds: liveIds.size,
+				liveAnchorKeys: liveAnchorKeys.size
+			}, () => {
+				if (!current()) return;
+				pruneStaleTrackedChangeComments(liveIds, liveAnchorKeys, String(effectiveDocumentId), superdoc, { broadcastChanges: false });
+			});
+			if (!current()) return {
+				ok: false,
+				reason: "reconciliation-stale",
+				appliedItems,
+				batchCount
+			};
+		}
+		return {
+			ok: true,
+			appliedItems,
+			batchCount,
+			pruned: Boolean(pruneStale && effectiveDocumentId)
+		};
+	};
+	const getV2TrackedChangeRowCount = (documentId = null) => {
+		const normalizedDocumentId = documentId == null ? null : String(documentId);
+		return commentsList.value.filter((comment) => {
+			if (comment?.trackedChange !== true) return false;
+			if (normalizedDocumentId == null) return true;
+			const rowDocumentId = comment?.documentId ?? comment?.fileId ?? null;
+			return rowDocumentId != null && String(rowDocumentId) === normalizedDocumentId;
+		}).length;
+	};
 	const syncTrackedChangeComments = ({ superdoc, editor, broadcastChanges = true }) => {
 		if (!superdoc || !editor) return;
 		const activeDocumentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
@@ -9966,6 +10363,7 @@ const useCommentsStore = defineStore("comments", () => {
 		getV2CommentsAdapter,
 		hydrateCommentsFromV2,
 		applyReviewSnapshotFromV2,
+		supersedeV2ReviewHydration,
 		reconcileCommentsFromV2,
 		isV2EditorActive,
 		replyCommentV2,
@@ -9975,6 +10373,7 @@ const useCommentsStore = defineStore("comments", () => {
 		v2TrackedChangesAdapter,
 		setV2TrackedChangesAdapter,
 		getV2TrackedChangesAdapter,
+		getV2TrackedChangeRowCount,
 		hydrateTrackedChangesFromV2,
 		reconcileTrackedChangeMutationFromV2,
 		reconcileTrackedChangesFromV2,
@@ -11304,7 +11703,7 @@ var _sfc_main$32 = {
 			const willChangeActiveDialog = !props.comment.resolvedTime && (activeComment.value !== props.comment.commentId || isInstanceScopedDialog && currentFloatingInstanceId.value !== activeFloatingCommentInstanceId.value);
 			let instantAlignmentTargetY = targetClientY;
 			if (v2Adapter) {
-				const linkedTrackedChangeId = !isTrackedChange && String(props.comment?.trackedChangeParentId ?? "").trim() ? props.comment.trackedChangeParentId : null;
+				const linkedTrackedChangeId = !isTrackedChange && !props.comment.resolvedTime && String(props.comment?.trackedChangeParentId ?? "").trim() ? props.comment.trackedChangeParentId : null;
 				const trackedChangeAdapter = editor?.editorVersion === 2 && (isTrackedChange || linkedTrackedChangeId != null) ? editor?.v2TrackedChanges ?? null : null;
 				const linkedTrackedChange = linkedTrackedChangeId != null ? commentsStore.getComment(linkedTrackedChangeId) : null;
 				const trackedChangeTarget = isTrackedChange ? props.comment : linkedTrackedChange?.trackedChange ? linkedTrackedChange : linkedTrackedChangeId;
@@ -11990,7 +12389,7 @@ var _sfc_main$32 = {
 		};
 	}
 };
-var CommentDialog_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$32, [["__scopeId", "data-v-05d69162"]]);
+var CommentDialog_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$32, [["__scopeId", "data-v-f26decd0"]]);
 var _hoisted_1$24 = { class: "comments-list" };
 var _hoisted_2$19 = { key: 0 };
 var _hoisted_3$15 = [
@@ -14361,7 +14760,7 @@ function usePasswordPrompt({ getSurfaceManager, getPasswordPromptConfig, onUnhan
 				})
 			});
 		} else {
-			const PasswordPromptSurface = (await Promise.resolve().then(() => require("./chunks/PasswordPromptSurface-BUUVC2ee.cjs"))).default;
+			const PasswordPromptSurface = (await Promise.resolve().then(() => require("./chunks/PasswordPromptSurface-Bu5xHm91.cjs"))).default;
 			const surfaceId = `password-prompt-${doc.id}`;
 			handle = manager.open({
 				id: surfaceId,
@@ -15010,7 +15409,7 @@ function useFindReplace({ getSurfaceManager, getActiveEditor, activeEditorRef, g
 			} else {
 				let FindReplaceSurface;
 				try {
-					FindReplaceSurface = (await Promise.resolve().then(() => require("./chunks/FindReplaceSurface-Dx0llWqP.cjs"))).default;
+					FindReplaceSurface = (await Promise.resolve().then(() => require("./chunks/FindReplaceSurface-9VkPw_-X.cjs"))).default;
 				} catch {
 					opening = false;
 					return;
@@ -17706,7 +18105,7 @@ var _sfc_main$20 = {
 	__name: "SuperDoc",
 	emits: ["selection-update"],
 	setup(__props, { emit: __emit }) {
-		const PdfViewer = (0, vue.defineAsyncComponent)(() => Promise.resolve().then(() => require("./chunks/PdfViewer-qpvzwYMz.cjs")));
+		const PdfViewer = (0, vue.defineAsyncComponent)(() => Promise.resolve().then(() => require("./chunks/PdfViewer-D4eD2dV1.cjs")));
 		const getDocumentLoadPassword = (doc) => doc.password ?? proxy.$superdoc.config.password;
 		const resolveDocumentV2Collaboration = (doc) => {
 			const rawConfig = doc?.v2Collaboration;
@@ -17846,7 +18245,7 @@ var _sfc_main$20 = {
 			getSurfaceManager: getLinkPopoverSurfaceManager,
 			getActiveEditor: () => proxy.$superdoc?.activeEditor,
 			getUi: getSuperDocUI,
-			getResolver: () => proxy.$superdoc?.uiConfig?.linkPopover?.suppressed ? () => ({ type: "none" }) : proxy.$superdoc?.config?.modules?.links?.popoverResolver,
+			getResolver: () => proxy.$superdoc?.uiConfig?.linkPopover?.suppressed ? () => ({ type: "none" }) : proxy.$superdoc?.uiConfig?.linkPopover?.options?.popoverResolver,
 			getLayerElement: () => layers.value,
 			emitException: (payload) => {
 				proxy.$superdoc?.emit("exception", {
@@ -18018,6 +18417,7 @@ var _sfc_main$20 = {
 		const v2ReviewHydrationController = resolvedEditorIntegration.createReviewHydrationController({
 			hydrateComments: (ctx) => commentsStore.hydrateCommentsFromV2?.(ctx),
 			hydrateTrackedChanges: (ctx) => commentsStore.hydrateTrackedChangesFromV2?.(ctx),
+			primeTrackedChanges: (ctx) => ctx.trackedChangesAdapter?.primeVisibleTrackedChanges?.(ctx.targetIds, ctx.plan),
 			readReviewSnapshot: (ctx) => ctx.trackedChangesAdapter?.readReviewSnapshot?.(ctx.snapshot),
 			validateReviewSnapshot: (_ctx, result) => result?.validate?.() ?? {
 				ok: false,
@@ -18031,6 +18431,8 @@ var _sfc_main$20 = {
 				commentItems: result.comments?.items,
 				trackedChangeItems: result.trackedChanges?.items,
 				trackedList: result.trackedChanges,
+				sourceCoverageRevision: result.sourceCoverageRevision,
+				evaluatedRevision: result.evaluatedRevision,
 				patch: (callback) => commentsStore.$patch(callback)
 			}) ?? {
 				ok: false,
@@ -18708,6 +19110,12 @@ var _sfc_main$20 = {
 					v2ReviewSidebarUnlocked.value = true;
 					v2GeometryEpoch.value = v2GeometryPublisher.getLastEpoch();
 				}
+			},
+			onCommittedPagePaint: (commit) => {
+				v2ReviewHydrationController.onCommittedPagePaint?.({
+					...commit,
+					documentId: commit?.payload?.documentId ?? null
+				});
 			}
 		});
 		const collectV2TrackedChangeRestampIds = (impactOrIds) => {
@@ -18931,7 +19339,7 @@ var _sfc_main$20 = {
 			v2TypingReviewHydrationTimer = setTimeout(attempt, Math.min(V2_TYPING_REVIEW_HYDRATION_IDLE_MS, ceilingRemainingMs));
 		};
 		const v2RemoteReviewHydrationScheduler = createV2RemoteReviewHydrationScheduler({
-			hydrate: () => hydrateV2ReviewRowsFromHost(),
+			hydrate: () => v2ReviewHydrationController.reconcileInBackground?.("remote-review-change"),
 			getActiveDocumentId: () => {
 				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
 				return activeEditor?.documentId ?? activeEditor?.options?.documentId ?? null;
@@ -18940,6 +19348,23 @@ var _sfc_main$20 = {
 		const onV2HostEvent = (document$1, event) => {
 			if (!event) return;
 			const documentId = document$1?.id ?? null;
+			if (event.type === "review-mutation:started") {
+				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
+				commentsStore.supersedeV2ReviewHydration?.({
+					commentsAdapter: activeEditor?.v2Comments ?? null,
+					trackedChangesAdapter: activeEditor?.v2TrackedChanges ?? null
+				});
+				v2ReviewHydrationController.beginMutation(event.reviewMutation);
+				return;
+			}
+			if (event.type === "review-mutation:aborted") {
+				v2ReviewHydrationController.settleMutation(event.reviewMutation?.token, {
+					outcome: "aborted",
+					resumeDomains: ["comments", "trackedChanges"],
+					trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
+				});
+				return;
+			}
 			if (event.type === "reviewTarget:changed") {
 				syncSidebarActiveCommentFromV2ReviewTarget(event.next);
 				return;
@@ -18958,6 +19383,11 @@ var _sfc_main$20 = {
 				return;
 			}
 			if (event.type === "mutation:rejected") {
+				if (event.reviewMutation?.token) v2ReviewHydrationController.settleMutation(event.reviewMutation.token, {
+					outcome: "rejected",
+					resumeDomains: ["comments", "trackedChanges"],
+					trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
+				});
 				maybeNotifyV2AuthorRequired(documentId, event);
 				return;
 			}
@@ -18973,7 +19403,22 @@ var _sfc_main$20 = {
 			const readiness = (proxy.$superdoc?.activeEditor ?? null)?.documentMutationReadiness ?? null;
 			const receipt = event.origin === "history" ? null : event.receipt;
 			const canWaitForExactPaint = reviewImpact && typeof receipt?.txId === "string" && receipt.txId.length > 0 && typeof readiness?.whenPainted === "function";
-			v2ReviewMutationReconciler.enqueueAfterPaint(reviewImpact, canWaitForExactPaint ? () => readiness.whenPainted.call(readiness, receipt) : null);
+			const reconciliation = v2ReviewMutationReconciler.enqueueAfterPaint(reviewImpact, canWaitForExactPaint ? () => readiness.whenPainted.call(readiness, receipt) : null);
+			if (event.reviewMutation?.token) {
+				const reviewMutation = event.reviewMutation;
+				const allResolved = Boolean(reviewImpact?.allResolved ?? event.trackedChangeAllResolved);
+				const settleReviewMutation = (reconciled) => {
+					const reconciledAllResolved = allResolved && reconciled === true;
+					v2ReviewHydrationController.settleMutation(reviewMutation.token, {
+						outcome: "committed",
+						allResolved: reconciledAllResolved,
+						resumeDomains: reconciledAllResolved ? ["comments"] : ["comments", "trackedChanges"],
+						trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
+					});
+				};
+				Promise.resolve(reconciliation).then(settleReviewMutation, () => settleReviewMutation(false));
+				return;
+			}
 			if (reviewImpact?.reconcileMode === "authoritative" && reviewImpact.upsertIds.size > 0) {
 				hydrateV2CommentRowsFromHost();
 				return;
@@ -19147,6 +19592,12 @@ var _sfc_main$20 = {
 				onCommentsUpdate: onEditorCommentsUpdate,
 				onFontsResolved: onFontsResolvedFn,
 				onPageCountKnown: proxy.$superdoc.config.onPageCountKnown ?? null,
+				onReviewWindowPlanned: (payload) => {
+					v2ReviewHydrationController.onReviewWindowPlanned?.({
+						...payload,
+						documentId: doc.id
+					});
+				},
 				fontAssets: proxy.$superdoc.config.fonts,
 				proofing: resolvedProofingConfig.value,
 				isNewFile,
@@ -19159,7 +19610,7 @@ var _sfc_main$20 = {
 				jsonOverride: proxy.$superdoc.config.jsonOverride,
 				viewOptions: proxy.$superdoc.config.viewOptions,
 				contained: proxy.$superdoc.config.contained,
-				linkPopoverResolver: proxy.$superdoc.uiConfig.linkPopover.enabled ? proxy.$superdoc.config.modules?.links?.popoverResolver : void 0,
+				linkPopoverResolver: proxy.$superdoc.uiConfig.linkPopover.options.popoverResolver,
 				layoutEngineOptions: useLayoutEngine ? {
 					...proxy.$superdoc.config.layoutEngineOptions || {},
 					proofing: resolvedProofingConfig.value,
@@ -19167,7 +19618,7 @@ var _sfc_main$20 = {
 					zoom: (activeZoom.value ?? 100) / 100,
 					emitCommentPositionsInViewing: isViewingMode() && shouldRenderCommentsInViewing.value,
 					enableCommentsInViewing: isViewingCommentsVisible.value,
-					contentControlsChrome: !proxy.$superdoc.uiConfig.contentControls.enabled ? "none" : proxy.$superdoc.uiConfig.contentControls.options.chrome ?? (proxy.$superdoc.config.modules?.contentControls?.chrome === "none" ? void 0 : proxy.$superdoc.config.modules?.contentControls?.chrome),
+					contentControlsChrome: proxy.$superdoc.uiConfig.contentControls.options.chrome,
 					resolveTrackedChangeColor: require_create_super_doc_ui.composeAuthorColorResolver(proxy.$superdoc.config.modules?.trackChanges?.authorColors)
 				} : void 0,
 				permissionResolver: (payload = {}) => proxy.$superdoc.canPerformPermission({
@@ -20109,7 +20560,7 @@ var _sfc_main$20 = {
 		};
 	}
 };
-var SuperDoc_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$20, [["__scopeId", "data-v-d75089d2"]]);
+var SuperDoc_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$20, [["__scopeId", "data-v-62293b70"]]);
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
 var PINIA_DEVTOOLS_PLUGIN_ID = "dev.esm.pinia";
 var piniaDevtoolsSuppressionState = {
@@ -32544,6 +32995,10 @@ function normalizeUiConfig(config = {}) {
 	};
 	const options = (key) => allDisabled ? {} : resolveOptions(ui, key);
 	const rulerSuppressed = allDisabled || explicit("ruler") === false;
+	const linkPopoverSuppressed = allDisabled || explicit("linkPopover") === false;
+	const linkPopoverResolver = linkPopoverSuppressed ? void 0 : firstDefined(options("linkPopover").popoverResolver, config.modules?.links?.popoverResolver);
+	const contentControlsEnabled = explicit("contentControls") ?? (!allDisabled && config.modules?.contentControls?.chrome !== "none");
+	const legacyContentControlsChrome = config.modules?.contentControls?.chrome === "none" ? void 0 : config.modules?.contentControls?.chrome;
 	const toolbarOptions = options("toolbar");
 	const legacyToolbar = config.modules?.toolbar;
 	const legacyToolbarOptions = isPlainObject$2(legacyToolbar) ? legacyToolbar : {};
@@ -32584,9 +33039,9 @@ function normalizeUiConfig(config = {}) {
 			options: allDisabled ? {} : mergeDefined(legacySearch, options("search"))
 		},
 		linkPopover: {
-			enabled: explicit("linkPopover") ?? (!allDisabled && Boolean(config.modules?.links?.popoverResolver)),
-			suppressed: allDisabled || explicit("linkPopover") === false,
-			options: options("linkPopover")
+			enabled: typeof linkPopoverResolver === "function",
+			suppressed: linkPopoverSuppressed,
+			options: mergeDefined(options("linkPopover"), { popoverResolver: linkPopoverResolver })
 		},
 		ruler: {
 			enabled: explicit("ruler") ?? (!allDisabled && Boolean(config.rulers)),
@@ -32594,8 +33049,8 @@ function normalizeUiConfig(config = {}) {
 			container: rulerSuppressed ? null : options("ruler").container ?? config.rulerContainer ?? null
 		},
 		contentControls: {
-			enabled: explicit("contentControls") ?? (!allDisabled && config.modules?.contentControls?.chrome !== "none"),
-			options: options("contentControls")
+			enabled: contentControlsEnabled,
+			options: contentControlsEnabled ? mergeDefined({ chrome: legacyContentControlsChrome }, options("contentControls")) : { chrome: "none" }
 		}
 	};
 }
@@ -34734,6 +35189,19 @@ var _sfc_main$11 = /* @__PURE__ */ Object.assign({ inheritAttrs: false }, {
 	}
 });
 var SdTooltip_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$11, [["__scopeId", "data-v-2a872eae"]]);
+const refocusEditorSurface = (superToolbar, preferredEditor = null) => {
+	if (typeof preferredEditor?.focus === "function") {
+		preferredEditor.focus();
+		return;
+	}
+	const focusHandle = superToolbar?.superdoc?.focus ?? superToolbar?.activeEditor?.focus;
+	if (typeof focusHandle === "function") {
+		focusHandle.call(superToolbar?.superdoc ?? superToolbar?.activeEditor, { preventScroll: true });
+		return;
+	}
+	const editor = document.querySelector("[role=\"textbox\"][aria-label*=\"SuperDoc body\"], .ProseMirror");
+	if (editor instanceof HTMLElement) editor.focus({ preventScroll: true });
+};
 var _hoisted_1$9 = [
 	"onKeydown",
 	"tabindex",
@@ -34876,6 +35344,7 @@ var _sfc_main$10 = {
 				option
 			});
 			item.selectedValue.value = option.key;
+			if (item.restoreEditorFocus) refocusEditorSurface(proxy?.$toolbar);
 		};
 		const handleComboboxCommand = (payload) => {
 			emit("command", payload);
@@ -35223,7 +35692,7 @@ var _sfc_main$10 = {
 		};
 	}
 };
-var ButtonGroup_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$10, [["__scopeId", "data-v-590293ab"]]);
+var ButtonGroup_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$10, [["__scopeId", "data-v-2bc00f65"]]);
 var DEFAULT_TOOLBAR_FONT_FAMILIES = [
 	["Arial", "sans-serif"],
 	["Arial Black", "sans-serif"],
@@ -36465,19 +36934,6 @@ var _sfc_main$2 = {
 	}
 };
 var IconGrid_default = /* @__PURE__ */ require__plugin_vue_export_helper.__plugin_vue_export_helper_default(_sfc_main$2, [["__scopeId", "data-v-52b0283a"]]);
-const refocusEditorSurface = (superToolbar, preferredEditor = null) => {
-	if (typeof preferredEditor?.focus === "function") {
-		preferredEditor.focus();
-		return;
-	}
-	const focusHandle = superToolbar?.superdoc?.focus ?? superToolbar?.activeEditor?.focus;
-	if (typeof focusHandle === "function") {
-		focusHandle.call(superToolbar?.superdoc ?? superToolbar?.activeEditor, { preventScroll: true });
-		return;
-	}
-	const editor = document.querySelector("[role=\"textbox\"][aria-label*=\"SuperDoc body\"], .ProseMirror");
-	if (editor instanceof HTMLElement) editor.focus({ preventScroll: true });
-};
 var closeDropdown$1 = (dropdown) => {
 	dropdown.expand.value = false;
 };
@@ -37046,7 +37502,10 @@ const makeDefaultItems = ({ superToolbar, toolbarIcons: toolbarIcons$1, toolbarT
 			linkItem: link$1,
 			textTarget: selectionTarget,
 			restoreSelection,
-			closePopover: () => closeDropdown(link$1),
+			closePopover: () => {
+				closeDropdown(link$1);
+				refocusEditorSurface(superToolbar);
+			},
 			goToAnchor: () => {
 				closeDropdown(link$1);
 				const href = link$1.attributes.value?.href;
@@ -37269,6 +37728,7 @@ const makeDefaultItems = ({ superToolbar, toolbarIcons: toolbarIcons$1, toolbarT
 						argument: e
 					});
 					setAlignmentIcon(alignment, e);
+					refocusEditorSurface(superToolbar);
 				};
 				return (0, vue.h)("div", {}, [(0, vue.h)(AlignmentButtons_default, { onSelect: handleSelect })]);
 			},
@@ -37720,6 +38180,7 @@ const makeDefaultItems = ({ superToolbar, toolbarIcons: toolbarIcons$1, toolbarT
 		hideLabel: true,
 		inlineTextInputVisible: false,
 		suppressActiveHighlight: true,
+		restoreEditorFocus: true,
 		isWide: false,
 		command: "setLineHeight",
 		dropdownValueKey: "key",
@@ -38575,6 +39036,11 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 function createBuiltInToolbar(config) {
 	return new BuiltInToolbar(config);
 }
+var STRUCTURED_CONTENT_FRAME_SELECTOR = [
+	"[data-sdt-type=\"structuredContent\"][data-sdt-id]",
+	"[data-sdt-type=\"structuredContent\"][data-sdt-container-id]",
+	"[data-sdt-container-type=\"structuredContent\"][data-sdt-container-id]"
+].join(", ");
 var DEFAULT_AWARENESS_PALETTE = Object.freeze([
 	"#FF6B6B",
 	"#4ECDC4",
@@ -38662,6 +39128,33 @@ function onCollaborationProviderSynced(provider, onSynced) {
 	if (isCollaborationProviderSynced(provider)) finish();
 	return cleanup;
 }
+function getClickedContentControlId(event, root) {
+	const path = event.composedPath();
+	if (!path.includes(root)) return null;
+	const control = path.find((target$1) => target$1 instanceof HTMLElement && target$1.matches(STRUCTURED_CONTENT_FRAME_SELECTOR));
+	if (!control) return null;
+	const onBlockLabel = path.some((target$1) => target$1 instanceof HTMLElement && target$1.classList.contains(require_create_super_doc_ui.DOM_CLASS_NAMES.BLOCK_SDT_LABEL));
+	const containerId = control.getAttribute("data-sdt-container-id")?.trim() || null;
+	const sdtId = control.getAttribute("data-sdt-id")?.trim() || null;
+	return onBlockLabel ? containerId ?? sdtId : sdtId ?? containerId;
+}
+function getContentControlItems(result) {
+	if (!result || typeof result !== "object") return [];
+	const items = result.items;
+	return Array.isArray(items) ? items : [];
+}
+function toSdtRef(item) {
+	if (!item || typeof item.id !== "string" || item.kind !== "inline" && item.kind !== "block" || typeof item.controlType !== "string") return null;
+	const tag = item.properties?.tag;
+	const alias = item.properties?.alias;
+	return {
+		id: item.id,
+		controlType: item.controlType,
+		scope: item.kind,
+		...typeof tag === "string" && tag ? { tag } : {},
+		...typeof alias === "string" && alias ? { alias } : {}
+	};
+}
 function isV2ActiveEditorFacade(editor) {
 	return Boolean(editor && typeof editor === "object" && editor.editorVersion === 2);
 }
@@ -38715,6 +39208,10 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 	#v2LockUnsub = null;
 	#pendingV2LockSeed = null;
 	#mountWrapper = null;
+	#contentControlClickRoot = null;
+	#handleContentControlClick = (event) => {
+		this.#emitContentControlClick(event);
+	};
 	#ui = null;
 	#uiConfig = normalizeUiConfig({});
 	get uiConfig() {
@@ -38798,8 +39295,28 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		const container = typeof config.selector === "string" ? document.querySelector(config.selector) : config.selector;
 		if (!(container instanceof HTMLElement)) throw new Error("SuperDoc: selector must be a valid CSS selector string or DOM element");
 		this.#surfaceManager = new SurfaceManager({ getModuleConfig: () => this.#surfacesConfig });
+		this.#contentControlClickRoot = container;
+		container.addEventListener("click", this.#handleContentControlClick, true);
 		this.#init(config, container);
 	}
+	async #emitContentControlClick(event) {
+		const root = this.#contentControlClickRoot;
+		if (!root) return;
+		const id = getClickedContentControlId(event, root);
+		const list = this.activeEditor?.doc?.contentControls?.list;
+		if (!id || typeof list !== "function") return;
+		try {
+			const result = await list();
+			if (this.#destroyed) return;
+			const target$1 = toSdtRef(getContentControlItems(result).find((item) => item.id === id));
+			if (target$1) this.emit("content-control:click", {
+				target: target$1,
+				source: "pointer"
+			});
+		} catch {
+			return;
+		}
+	}
 	async #init(config, container) {
 		this.config = {
 			...this.config,
@@ -38846,7 +39363,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.4.0-next.1";
+		this.version = "2.4.0-next.10";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4_default();
 		this.colors = this.config.colors ?? [];
@@ -39728,8 +40245,8 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			},
 			{
 				feature: "shell.tracked-change-sidebar.bulk",
-				status: "not-shipped",
-				reason: "bulk-tracked-change-decisions-omitted: acceptAll/rejectAll are matrix-disabled by default in the v2 host"
+				status: "supported",
+				reason: "SD-4039/SD-4040: the shipped v2 command posture exposes all-story Accept All and Reject All through the canonical doc.trackChanges.decide({ target: { kind: 'all' } }) mutation"
 			},
 			{
 				feature: "shell.tracked-change-sidebar.non-body",
@@ -40374,6 +40891,8 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 	}
 	destroy() {
 		this.#destroyed = true;
+		this.#contentControlClickRoot?.removeEventListener("click", this.#handleContentControlClick, true);
+		this.#contentControlClickRoot = null;
 		if (this.#abortUpgrade) {
 			this.#abortUpgrade();
 			this.#abortUpgrade = null;