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

package/dist/superdoc.cjs

@@ -4,7 +4,7 @@ const require_blank_docx = require("./chunks/blank-docx-BuFAbRjs.cjs");
 const require_eventemitter3 = require("./chunks/eventemitter3-C_TAnXOl.cjs");
 const require_uuid = require("./chunks/uuid-BhG0ngwk.cjs");
 const require_jszip = require("./chunks/jszip-D8mAFF-r.cjs");
-const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-jSJQis_0.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-CqGmoMMA.cjs");
 const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-SDR04tiH.cjs");
 const require_constants = require("./chunks/constants-DpXuDx_g.cjs");
 let vue = require("vue");
@@ -6742,14 +6742,21 @@ function createStubGeometryPublisher() {
 		}
 	};
 }
-function createStubReviewHydrationController() {
+function createStubReviewWindowController() {
 	return {
 		setContext() {},
-		onRenderReadiness() {},
-		hydrateNow() {},
-		reconcileInBackground() {},
+		onCommittedPagePaint() {},
+		refreshCommittedWindow() {},
 		invalidate() {},
+		beginMutation() {},
+		settleMutation() {},
 		reset() {},
+		getSnapshot() {
+			return null;
+		},
+		subscribe() {
+			return () => void 0;
+		},
 		getDiagnostics() {
 			return null;
 		}
@@ -6778,7 +6785,7 @@ function createStubV2Integration() {
 		EditorComponent: StubV2EditorComponent,
 		RulerComponent: null,
 		createGeometryPublisher: createStubGeometryPublisher,
-		createReviewHydrationController: createStubReviewHydrationController,
+		createReviewWindowController: createStubReviewWindowController,
 		isSyntheticTrackedChangeCommentLaneItem,
 		isV2SyntheticTrackedChangeRow
 	};
@@ -6803,7 +6810,7 @@ function createDefaultV2Integration() {
 			EditorComponent: integration.EditorComponent,
 			RulerComponent: integration.RulerComponent ?? stub.RulerComponent,
 			createGeometryPublisher: integration.createGeometryPublisher ?? stub.createGeometryPublisher,
-			createReviewHydrationController: integration.createReviewHydrationController ?? stub.createReviewHydrationController,
+			createReviewWindowController: integration.createReviewWindowController ?? stub.createReviewWindowController,
 			isSyntheticTrackedChangeCommentLaneItem: integration.isSyntheticTrackedChangeCommentLaneItem ?? stub.isSyntheticTrackedChangeCommentLaneItem,
 			isV2SyntheticTrackedChangeRow: integration.isV2SyntheticTrackedChangeRow ?? stub.isV2SyntheticTrackedChangeRow
 		};
@@ -7052,8 +7059,6 @@ 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: "'",
@@ -7071,20 +7076,6 @@ var shallowEqual = (a, b) => {
 	return aKeys.every((key) => Object.prototype.hasOwnProperty.call(b, key) && Object.is(a[key], b[key]));
 };
 /**
-* Yield between bounded background reconciliation batches. A full tracked-
-* change catalog can contain thousands of rows; applying it in one Pinia/Vue
-* turn blocks painted-window review work. `requestIdleCallback` keeps the work
-* off the critical path when available, while the zero-delay fallback still
-* creates a task boundary in browsers without it.
-*/
-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);
-});
-/**
 * Normalize the optional signed tracked-change detail lines
 * (`[{ excerpt, label }]`, TCS-LIST-005) to a stable shape; absent, empty, or
 * malformed input reads as `null` so legacy rows stay untouched.
@@ -7255,6 +7246,7 @@ var useCommentsStore = defineStore("comments", () => {
 	const suppressInternalExternal = (0, vue.ref)(true);
 	const currentCommentText = (0, vue.ref)("");
 	const commentsList = (0, vue.ref)([]);
+	const reviewDirectoryList = (0, vue.shallowRef)([]);
 	let priorTrackedChangeThreadIndex = /* @__PURE__ */ new Map();
 	const trackedChangeThreadIndex = (0, vue.computed)(() => {
 		const next = buildTrackedChangeThreadIndex(commentsList.value, priorTrackedChangeThreadIndex);
@@ -7272,6 +7264,8 @@ var useCommentsStore = defineStore("comments", () => {
 		return next;
 	});
 	const isCommentsListVisible = (0, vue.ref)(false);
+	const isReviewDirectoryActive = (0, vue.ref)(false);
+	const isReviewDirectoryLoading = (0, vue.ref)(false);
 	const editorCommentIds = (0, vue.ref)([]);
 	const editorCommentPositions = (0, vue.ref)({});
 	const isCommentHighlighted = (0, vue.ref)(false);
@@ -7292,17 +7286,8 @@ var 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;
@@ -7311,27 +7296,14 @@ var 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)
-	});
 	/**
 	* Initialize the store
 	*
@@ -7352,37 +7324,6 @@ var useCommentsStore = defineStore("comments", () => {
 		if (!Array.isArray(aliases)) return [];
 		return [...new Set(aliases.map((id) => normalizeCommentId(id)).filter(Boolean))];
 	};
-	const trackedChangeItemId = (item) => normalizeCommentId(item?.id ?? item?.changeId ?? item?.address?.entityId);
-	const trackedChangeItemAliases = (item) => normalizeTrackedChangePositionAliases([
-		trackedChangeItemId(item),
-		item?.changeId,
-		item?.address?.entityId,
-		item?.trackedChangeAnchorKey,
-		item?.anchorKey,
-		item?.address?.anchorKey,
-		...Array.isArray(item?.trackedChangePositionAliases) ? item.trackedChangePositionAliases : [],
-		...Array.isArray(item?.sourceIds?.rsids) ? item.sourceIds.rsids : [],
-		item?.sourceIds?.wordIdDelete,
-		item?.sourceIds?.wordIdInsert,
-		...Array.isArray(item?.sourceIds?.wordIdOther) ? item.sourceIds.wordIdOther : []
-	]);
-	const trackedChangeItemIdentityIds = (item) => new Set(trackedChangeItemAliases(item).flatMap((id) => {
-		const parsedAnchor = parseTrackedChangeAnchorKey(id);
-		return parsedAnchor?.rawId ? [id, parsedAnchor.rawId] : [id];
-	}));
-	const dedupeTrackedChangeItems = (values) => {
-		const seen = /* @__PURE__ */ new Set();
-		const deduped = [];
-		for (const item of values) {
-			const id = trackedChangeItemId(item);
-			if (id) {
-				if (seen.has(id)) continue;
-				seen.add(id);
-			}
-			deduped.push(item);
-		}
-		return deduped;
-	};
 	const getTrackedChangeStoryKey = (comment) => {
 		if (!comment?.trackedChange) return null;
 		const anchorParts = parseTrackedChangeAnchorKey(comment.trackedChangeAnchorKey);
@@ -7493,7 +7434,9 @@ var useCommentsStore = defineStore("comments", () => {
 	*/
 	const getComment = (id) => {
 		if (id === void 0 || id === null) return null;
-		return commentsList.value.find((c) => c.commentId == id || c.importedId == id || c.trackedChangeAnchorKey == id || c?.trackedChange && buildTrackedChangeImportedPositionId(c.importedId) == id) || getTrackedChangeCommentByPositionAlias(id);
+		const directMatch = commentsList.value.find((c) => c.commentId == id || c.importedId == id || c.trackedChangeAnchorKey == id || c?.trackedChange && buildTrackedChangeImportedPositionId(c.importedId) == id);
+		if (directMatch) return directMatch;
+		return reviewDirectoryList.value.find((c) => c.commentId == id || c.importedId == id || c.trackedChangeAnchorKey == id || c?.trackedChange && buildTrackedChangeImportedPositionId(c.importedId) == id) || getTrackedChangeCommentByPositionAlias(id);
 	};
 	const getThreadParent = (comment) => {
 		if (!comment?.parentCommentId) return comment;
@@ -7970,8 +7913,8 @@ var useCommentsStore = defineStore("comments", () => {
 						...commentAliasIds
 					].filter(Boolean).some((id) => incomingAliasIds.has(id))) return true;
 					const hasSyntheticSideIdentity = normalizedTrackedChangeCanonicalId && normalizedTrackedChangeCanonicalId !== normalizedChangeId || commentCanonicalId && commentCanonicalId !== commentId;
-					if (commentId === normalizedChangeId) return true;
-					if (!hasSyntheticSideIdentity && (importedId === normalizedChangeId || normalizedImportedId !== void 0 && normalizedImportedId != null && importedId === normalizedImportedId)) return true;
+					if (hasCompatibleStory && commentId === normalizedChangeId) return true;
+					if (hasCompatibleStory && !hasSyntheticSideIdentity && (importedId === normalizedChangeId || normalizedImportedId !== void 0 && normalizedImportedId != null && importedId === normalizedImportedId)) return true;
 					if (hasSyntheticSideIdentity) return false;
 					if (normalizedAnchorKey && commentAnchorKey) return commentAnchorKey === normalizedAnchorKey;
 					return false;
@@ -8283,11 +8226,11 @@ var useCommentsStore = defineStore("comments", () => {
 	* @param {(a: Object, b: Object) => number} sorter - Comparator function for sorting comments
 	* @returns {{parentComments: Array, resolvedComments: Array}} Grouped and sorted comments
 	*/
-	const buildGroupedComments = (sorter) => {
+	const buildGroupedCommentsFrom = (source, sorter) => {
 		const parentComments = [];
 		const resolvedComments = [];
 		const childCommentMap = /* @__PURE__ */ new Map();
-		commentsList.value.forEach((comment) => {
+		source.forEach((comment) => {
 			if (!isThreadVisible(comment)) return;
 			const trackedChangeThreadParentId = shouldThreadWithTrackedChange(comment) ? trackedChangeThreadParentIdForComment$1(comment) : null;
 			const parentId = comment.trackedChange ? null : comment.parentCommentId || trackedChangeThreadParentId;
@@ -8303,8 +8246,10 @@ var useCommentsStore = defineStore("comments", () => {
 			resolvedComments: resolvedComments.sort(sorter)
 		};
 	};
+	const buildGroupedComments = (sorter) => buildGroupedCommentsFrom(commentsList.value, sorter);
 	/** @type {import('vue').ComputedRef<{parentComments: Array, resolvedComments: Array}>} Comments grouped and sorted by creation time */
 	const getGroupedComments = (0, vue.computed)(() => buildGroupedComments(compareByCreatedTime));
+	const getGroupedReviewDirectory = (0, vue.computed)(() => buildGroupedCommentsFrom(reviewDirectoryList.value, compareByCreatedTime));
 	const hasOpenTrackedChanges = (0, vue.computed)(() => getGroupedComments.value?.parentComments.some((comment) => comment.trackedChange && !comment.resolvedTime) ?? false);
 	/** @type {import('vue').ComputedRef<{parentComments: Array, resolvedComments: Array}>} Comments grouped and sorted by document position */
 	const getCommentsByPosition = (0, vue.computed)(() => buildGroupedComments(compareByPosition));
@@ -8524,11 +8469,32 @@ var useCommentsStore = defineStore("comments", () => {
 				});
 				return outcome;
 			}
-			reconcileCommentsFromV2({
+			const removedIds = new Set((Array.isArray(outcome.removedCommentIds) ? outcome.removedCommentIds : []).map(normalizeCommentId).filter(Boolean));
+			if (removedIds.has(normalizeCommentId(commentId))) {
+				if (importedId != null) removedIds.add(normalizeCommentId(importedId));
+				let addedChild = true;
+				while (addedChild) {
+					addedChild = false;
+					for (const row of commentsList.value) {
+						const parentId = normalizeCommentId(row?.parentCommentId);
+						if (!parentId || !removedIds.has(parentId)) continue;
+						for (const alias of [row?.commentId, row?.importedId].map(normalizeCommentId).filter(Boolean)) {
+							if (removedIds.has(alias)) continue;
+							removedIds.add(alias);
+							addedChild = true;
+						}
+					}
+				}
+				commentsList.value = commentsList.value.filter((row) => {
+					return ![row?.commentId, row?.importedId].map(normalizeCommentId).filter(Boolean).some((alias) => removedIds.has(alias));
+				});
+				if (removedIds.has(normalizeCommentId(activeComment.value))) clearActiveCommentSelection();
+			} else reconcileCommentsFromV2({
 				superdoc,
 				adapter: v2Adapter,
 				documentId: v2Adapter.documentId ?? fileId,
-				items: outcome.items
+				items: outcome.items ?? [],
+				pruneStale: outcome.complete !== false
 			});
 			superdoc.emit("comments-update", {
 				type: COMMENT_EVENTS.DELETED,
@@ -8699,6 +8665,78 @@ var useCommentsStore = defineStore("comments", () => {
 			fileType: null
 		})).filter(Boolean);
 	};
+	const isBlankDirectoryCommentText = (value) => typeof value !== "string" || value.replace(/<[^>]*>/g, "").replace(/&nbsp;/gi, " ").trim().length === 0;
+	const trackedChangeDirectoryComment = (params) => {
+		if (!params || params.event === "omit" || params.changeId == null) return null;
+		return getPendingComment({
+			documentId: params.documentId,
+			commentId: params.changeId,
+			trackedChange: true,
+			trackedChangeText: params.trackedChangeText,
+			trackedChangeType: params.trackedChangeType,
+			trackedChangeDisplayType: params.trackedChangeDisplayType,
+			semanticColorKey: params.semanticColorKey,
+			semanticColor: params.semanticColor,
+			deletedText: params.deletedText,
+			trackedChangeLabel: typeof params.trackedChangeLabel === "string" && params.trackedChangeLabel.length > 0 ? params.trackedChangeLabel : null,
+			trackedChangeDetailLines: normalizeTrackedChangeDetailLines(params.trackedChangeDetailLines),
+			trackedChangeImagePreview: normalizeTrackedChangeImagePreview(params.trackedChangeImagePreview),
+			createdTime: params.date,
+			creatorId: params.authorId ?? null,
+			creatorName: params.author,
+			creatorEmail: params.authorEmail,
+			creatorImage: params.authorImage,
+			isInternal: false,
+			importedAuthor: params.importedAuthor,
+			...Object.prototype.hasOwnProperty.call(params, "importedId") ? { importedId: params.importedId != null ? String(params.importedId) : null } : {},
+			trackedChangeStory: params.trackedChangeStory ?? null,
+			trackedChangeStoryKind: params.trackedChangeStoryKind ?? null,
+			trackedChangeStoryLabel: params.trackedChangeStoryLabel ?? "",
+			trackedChangeAnchorKey: params.trackedChangeAnchorKey ?? null,
+			trackedChangeCanonicalId: params.trackedChangeCanonicalId ?? null,
+			trackedChangePositionAliases: normalizeTrackedChangePositionAliases(params.trackedChangePositionAliases),
+			selection: {
+				source: DOCUMENT_EDITOR_SELECTION_SOURCE,
+				selectionBounds: params.coords ?? null
+			}
+		});
+	};
+	const setReviewDirectoryFromV2 = ({ superdoc, commentItems = [], trackedChangeItems = [] } = {}) => {
+		const commentsAdapter = getV2CommentsAdapter(superdoc);
+		const trackedChangesAdapter = getV2TrackedChangesAdapter(superdoc);
+		if (!commentsAdapter || !trackedChangesAdapter || typeof commentsAdapter.mapV2CommentToUseCommentInput !== "function" || typeof trackedChangesAdapter.mapV2TrackedChangeToCommentParams !== "function") {
+			reviewDirectoryList.value = [];
+			return {
+				ok: false,
+				reason: "adapter-unavailable"
+			};
+		}
+		const documentId = superdoc?.activeEditor?.documentId ?? superdoc?.activeEditor?.options?.documentId ?? commentsAdapter.documentId ?? trackedChangesAdapter.documentId ?? null;
+		const document = documentId != null ? superdocStore.getDocument(String(documentId)) : null;
+		const mappedCommentInputs = commentItems.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => commentsAdapter.mapV2CommentToUseCommentInput(item, {
+			fileId: documentId,
+			fileType: document?.type ?? null
+		})).filter(Boolean);
+		const trackedParentBySidecarId = /* @__PURE__ */ new Map();
+		for (const input of mappedCommentInputs) if (input.trackedChange !== true && input.trackedChangeThreadParentId && !input.parentCommentId && isBlankDirectoryCommentText(input.commentText)) trackedParentBySidecarId.set(String(input.commentId), String(input.trackedChangeThreadParentId));
+		const commentRows = mappedCommentInputs.filter((input) => !trackedParentBySidecarId.has(String(input.commentId))).map((input) => {
+			const trackedParent = input.parentCommentId ? trackedParentBySidecarId.get(String(input.parentCommentId)) : null;
+			if (trackedParent) {
+				input.threadingParentCommentId = trackedParent;
+				input.trackedChangeThreadParentId ??= trackedParent;
+			}
+			return useComment(input);
+		});
+		const trackedRows = trackedChangeItems.map((item) => trackedChangesAdapter.mapV2TrackedChangeToCommentParams(item)).map((params) => trackedChangeDirectoryComment(params)).filter(Boolean);
+		reviewDirectoryList.value = [...commentRows, ...trackedRows];
+		return {
+			ok: true,
+			count: reviewDirectoryList.value.length
+		};
+	};
+	const clearReviewDirectory = () => {
+		reviewDirectoryList.value = [];
+	};
 	const commentInputId = (input) => {
 		const id = input?.commentId ?? input?.importedId;
 		return id != null ? String(id) : null;
@@ -9000,12 +9038,54 @@ var useCommentsStore = defineStore("comments", () => {
 		if (!adapter) return false;
 		return v2TrackedChangesAdapter.value === adapter;
 	};
+	const reviewPresentationIdentityIds = (row) => new Set([
+		...getCommentAliasIds(row),
+		row?.commentId,
+		row?.importedId,
+		row?.trackedChangeCanonicalId,
+		row?.trackedChangeAnchorKey,
+		row?.parentCommentId,
+		row?.threadingParentCommentId,
+		row?.trackedChangeParentId,
+		row?.trackedChangeThreadParentId
+	].map((value) => normalizeCommentId(value)).filter(Boolean));
+	/** Keep one mounted review window plus rows whose interaction is still live. */
+	const boundReviewPresentationRows = ({ documentId, visibleIds }) => {
+		const retainedIds = new Set([
+			...visibleIds,
+			activeComment.value,
+			activeFloatingCommentInstanceId.value,
+			editingCommentId.value,
+			pendingComment.value?.commentId,
+			instantSidebarAlignmentThreadId.value,
+			instantSidebarAlignmentInstanceId.value
+		].map((value) => normalizeCommentId(value)).filter(Boolean));
+		let changed = true;
+		while (changed) {
+			changed = false;
+			for (const row of commentsList.value) {
+				if (!belongsToTrackedChangeSyncDocument(row, documentId)) continue;
+				const ids = reviewPresentationIdentityIds(row);
+				if (![...ids].some((id) => retainedIds.has(id))) continue;
+				for (const id of ids) {
+					if (retainedIds.has(id)) continue;
+					retainedIds.add(id);
+					changed = true;
+				}
+			}
+		}
+		commentsList.value = commentsList.value.filter((row) => {
+			if (!belongsToTrackedChangeSyncDocument(row, documentId)) return true;
+			if (row === pendingComment.value) return true;
+			return [...reviewPresentationIdentityIds(row)].some((id) => retainedIds.has(id));
+		});
+	};
 	/**
-	* Synchronously reconcile one host-validated review snapshot. The caller
+	* Synchronously reconcile one host-validated committed review window. The caller
 	* wraps this action in one Pinia `$patch`; all fallible mapping completes
 	* before either row family mutates.
 	*/
-	const applyReviewSnapshotFromV2 = ({ superdoc, commentsAdapter, trackedChangesAdapter, documentId, commentItems, trackedChangeItems, trackedList, sourceCoverageRevision, evaluatedRevision, patch } = {}) => withInteractionSpan("store.reviewSnapshot.apply", "store-reconciliation", {
+	const applyReviewWindowFromV2 = ({ superdoc, commentsAdapter, trackedChangesAdapter, documentId, commentItems, trackedChangeItems, requestedCommentIds, requestedTrackedChangeIds, unresolvedCommentIds, trackedList, sourceCoverageRevision, evaluatedRevision, patch } = {}) => withInteractionSpan("store.reviewWindow.apply", "store-reconciliation", {
 		commentItemCount: Array.isArray(commentItems) ? commentItems.length : null,
 		trackedItemCount: Array.isArray(trackedChangeItems) ? trackedChangeItems.length : null
 	}, () => {
@@ -9035,7 +9115,7 @@ var useCommentsStore = defineStore("comments", () => {
 			ok: false,
 			reason: "items-invalid"
 		};
-		if (trackedList?.complete !== false || !["review-snapshot", "visible-window"].includes(trackedList?.visibleWindowSource)) return {
+		if (trackedList?.complete !== false || trackedList?.visibleWindowSource !== "visible-window") return {
 			ok: false,
 			reason: "tracked-list-not-partial-visible-window"
 		};
@@ -9044,7 +9124,6 @@ var useCommentsStore = defineStore("comments", () => {
 			reason: "adapter-mapper-missing"
 		};
 		let effectiveCommentItems = commentItems;
-		let commentItemsArePartial = false;
 		if (typeof commentsAdapter.seedReviewCatalog === "function") {
 			const seeded = commentsAdapter.seedReviewCatalog(commentItems, {
 				sourceCoverageRevision,
@@ -9055,10 +9134,7 @@ var useCommentsStore = defineStore("comments", () => {
 				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;
-			}
+			if (selected?.ok === true && Array.isArray(selected.items) && (!Array.isArray(selected.unresolvedIds) || selected.unresolvedIds.length === 0)) effectiveCommentItems = selected.items;
 		}
 		const fileType = (normalizedDocumentId ? superdocStore.getDocument(normalizedDocumentId) : null)?.type ?? null;
 		let preparedInputs;
@@ -9080,6 +9156,28 @@ var useCommentsStore = defineStore("comments", () => {
 			ok: false,
 			reason: "patch-missing"
 		};
+		const visibleIds = new Set([
+			...Array.isArray(requestedCommentIds) ? requestedCommentIds : [],
+			...Array.isArray(requestedTrackedChangeIds) ? requestedTrackedChangeIds : [],
+			...Array.isArray(unresolvedCommentIds) ? unresolvedCommentIds : [],
+			...effectiveCommentItems.flatMap((item) => [
+				item?.id,
+				item?.commentId,
+				item?.importedId
+			]),
+			...trackedChangeItems.flatMap((item) => [item?.id, item?.changeId]),
+			...preparedInputs.flatMap((input) => [
+				input?.commentId,
+				input?.importedId,
+				input?.parentCommentId,
+				input?.trackedChangeThreadParentId
+			]),
+			...preparedParams.flatMap((params) => [
+				params?.changeId,
+				params?.trackedChangeCanonicalId,
+				params?.trackedChangeAnchorKey
+			])
+		].map((value) => normalizeCommentId(value)).filter(Boolean));
 		patch(() => {
 			reconcileTrackedChangesFromV2({
 				superdoc,
@@ -9095,7 +9193,11 @@ var useCommentsStore = defineStore("comments", () => {
 				documentId: normalizedDocumentId,
 				items: effectiveCommentItems,
 				preparedInputs,
-				pruneStale: !commentItemsArePartial
+				pruneStale: false
+			});
+			boundReviewPresentationRows({
+				documentId: normalizedDocumentId,
+				visibleIds
 			});
 		});
 		return {
@@ -9104,70 +9206,6 @@ var useCommentsStore = defineStore("comments", () => {
 			trackedItems: preparedParams.length
 		};
 	});
-	const hydrateCommentsFromV2 = async ({ superdoc, adapter, documentId, trackedChangesListMode = "all", commentIds, isCurrent, signal, hydrationGeneration } = {}) => withInteractionSpan("store.comments.hydrateFromV2", "comments-list", { documentId: documentId ?? null }, async () => {
-		const effectiveAdapter = adapter ?? getV2CommentsAdapter(superdoc);
-		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 {
-			const refreshOptions = {};
-			if (visibleWindow && Array.isArray(commentIds)) refreshOptions.targetIds = commentIds;
-			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,
-				reason: "adapter-threw",
-				detail: err?.message ?? String(err)
-			};
-		}
-		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 ?? [],
-			pruneStale: !visibleWindow || Array.isArray(commentIds) && (!Array.isArray(result.unresolvedIds) || result.unresolvedIds.length === 0),
-			hydrationGeneration
-		});
-		return {
-			ok: true,
-			items: result.items ?? [],
-			reconciled: true,
-			...typeof hydrationGeneration === "number" ? { hydrationGeneration } : {},
-			...result.visibleWindowSource != null ? { visibleWindowSource: result.visibleWindowSource } : {}
-		};
-	});
 	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,
@@ -9390,27 +9428,6 @@ var useCommentsStore = defineStore("comments", () => {
 			storySnapshots
 		};
 	};
-	const reconcileAuthoritativeV2TrackedChangeSidebar = ({ superdoc, editor, documentId, refreshReason = "tracked-change-sidebar-authoritative" } = {}) => {
-		const adapter = getV2TrackedChangesAdapter(superdoc) ?? editor?.v2TrackedChanges ?? null;
-		if (!adapter || typeof adapter.listTrackedChanges !== "function" || typeof adapter.mapV2TrackedChangeToCommentParams !== "function") return false;
-		const effectiveDocumentId = documentId ?? adapter.documentId ?? editor?.documentId ?? editor?.options?.documentId ?? superdoc?.activeEditor?.documentId ?? superdoc?.activeEditor?.options?.documentId ?? null;
-		if (effectiveDocumentId == null) return false;
-		const normalizedDocumentId = String(effectiveDocumentId);
-		hydrateTrackedChangesFromV2({
-			superdoc,
-			adapter,
-			documentId: normalizedDocumentId,
-			trackedChangesListMode: "background-reconcile",
-			refreshReason,
-			blocking: false,
-			isCurrent: () => {
-				const activeEditor = superdoc?.activeEditor ?? null;
-				const activeDocumentId = activeEditor?.documentId ?? activeEditor?.options?.documentId ?? null;
-				return activeDocumentId == null || String(activeDocumentId) === normalizedDocumentId;
-			}
-		});
-		return true;
-	};
 	/**
 	* Bootstrap tracked-change comment threads after a DOCX import finishes.
 	*
@@ -9448,12 +9465,6 @@ var useCommentsStore = defineStore("comments", () => {
 			editor,
 			structuralChanges: captured.structuralChanges
 		});
-		reconcileAuthoritativeV2TrackedChangeSidebar({
-			superdoc,
-			editor,
-			documentId: editor?.options?.documentId,
-			refreshReason: "import-bootstrap-authoritative"
-		});
 		return true;
 	};
 	const isCurrentImportedTrackedChangeBootstrap = (task) => {
@@ -10122,7 +10133,6 @@ var useCommentsStore = defineStore("comments", () => {
 			removed: 0,
 			removedIds: /* @__PURE__ */ new Set()
 		};
-		supersedeTrackedChangeSyncGeneration(adapter);
 		const removedIds = /* @__PURE__ */ new Set();
 		const activeId = normalizeCommentId(activeComment.value);
 		let activeWasRemoved = false;
@@ -10215,94 +10225,15 @@ var useCommentsStore = defineStore("comments", () => {
 						reason: outcome?.reason,
 						detail: outcome?.detail
 					};
-					const reliableDecidedIds = collectReliableDecidedTrackedChangeIds(outcome);
+					const receiptDecidedIds = collectReliableDecidedTrackedChangeIds(outcome);
+					const localDecidedIds = receiptDecidedIds.size ? receiptDecidedIds : collectTrackedChangeDecisionIds(comment);
 					const effectiveDocumentId = outcome?.documentId ?? v2Adapter.documentId ?? superdoc?.activeEditor?.documentId ?? superdoc?.activeEditor?.options?.documentId ?? null;
-					const runBlockingPostDecisionReconcile = async () => {
-						let listResult;
-						try {
-							listResult = await v2Adapter.listTrackedChanges({
-								mode: "all",
-								refreshReason: "post-decision-blocking",
-								blocking: true
-							});
-						} catch (err) {
-							return {
-								ok: false,
-								committed: true,
-								reason: "relist-after-commit-failed",
-								detail: err?.message ?? String(err)
-							};
-						}
-						if (!isCurrentV2TrackedChangesAdapter(v2Adapter)) return {
-							ok: false,
-							committed: true,
-							reason: "adapter-stale"
-						};
-						if (!listResult?.ok) return {
-							ok: false,
-							committed: true,
-							reason: "relist-after-commit-failed",
-							detail: listResult?.reason ?? listResult?.detail ?? null
-						};
-						resolveLinkedCommentsForTrackedChangeDecision({
-							superdoc,
-							comment,
-							decision
-						});
-						detachLinkedCommentsForTrackedChangeDecision({
-							comment,
-							decision
-						});
-						reconcileTrackedChangesFromV2({
-							superdoc,
-							adapter: v2Adapter,
-							documentId: effectiveDocumentId,
-							items: listResult.items ?? [],
-							pruneStale: listResult.complete === true && listResult.sourceCoverageComplete === true
-						});
-						const liveIds = new Set((listResult.items ?? []).map((item) => item && item.id != null ? String(item.id) : null).filter(Boolean));
-						if (!(decidedId != null && liveIds.has(decidedId))) {
-							if (wasActiveBeforeDecide) clearActiveCommentSelection();
-							clearV2ActiveTrackedChangeTarget(v2Adapter, decidedId);
-						}
-						const commentsAdapter = getV2CommentsAdapter(superdoc);
-						if (commentsAdapter && typeof commentsAdapter.refresh === "function" && isCurrentV2CommentsAdapter(commentsAdapter)) {
-							let commentsResult;
-							try {
-								commentsResult = await commentsAdapter.refresh();
-							} catch (err) {
-								return {
-									ok: false,
-									committed: true,
-									reason: "comments-relist-after-tracked-decision-failed",
-									detail: err?.message ?? String(err)
-								};
-							}
-							if (!isCurrentV2CommentsAdapter(commentsAdapter)) return {
-								ok: false,
-								committed: true,
-								reason: "comments-adapter-stale"
-							};
-							if (!commentsResult?.ok) return {
-								ok: false,
-								committed: true,
-								reason: "comments-relist-after-tracked-decision-failed",
-								detail: commentsResult?.reason ?? commentsResult?.detail ?? null
-							};
-							reconcileCommentsFromV2({
-								superdoc,
-								adapter: commentsAdapter,
-								documentId: commentsAdapter.documentId ?? effectiveDocumentId,
-								items: commentsResult.items ?? []
-							});
-						}
-						return {
-							ok: true,
-							success: true
-						};
+					if (!localDecidedIds.size || !effectiveDocumentId) return {
+						ok: false,
+						committed: true,
+						reason: "decision-scope-missing"
 					};
-					if (!reliableDecidedIds.size || !effectiveDocumentId) return runBlockingPostDecisionReconcile();
-					reliableDecidedIds.forEach((id) => clearV2ActiveTrackedChangeTarget(v2Adapter, id));
+					localDecidedIds.forEach((id) => clearV2ActiveTrackedChangeTarget(v2Adapter, id));
 					await waitForTrackedDecisionCanonicalPaint({
 						superdoc,
 						receipt: outcome.receipt
@@ -10319,7 +10250,7 @@ var useCommentsStore = defineStore("comments", () => {
 					pruneDecidedTrackedChangeRow({
 						superdoc,
 						comment,
-						decidedIds: reliableDecidedIds,
+						decidedIds: localDecidedIds,
 						documentId: effectiveDocumentId
 					});
 					if (wasActiveBeforeDecide) clearActiveCommentSelection();
@@ -10362,166 +10293,11 @@ var useCommentsStore = defineStore("comments", () => {
 			success: Boolean(command(id))
 		};
 	};
-	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,
-		blocking: blocking ?? null
-	}, async () => {
-		const effectiveAdapter = adapter ?? getV2TrackedChangesAdapter(superdoc);
-		if (!effectiveAdapter || typeof effectiveAdapter.listTrackedChanges !== "function") return {
-			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 {
-				ok: false,
-				reason: "adapter-threw",
-				detail: err?.message ?? String(err)
-			};
-		}
-		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 partialListMode = trackedChangesListMode === "startup-page" || trackedChangesListMode === "interaction-prime" || trackedChangesListMode === "visible-window";
-		const pruneStale = trackedChangesListMode === "visible-window" && Array.isArray(targetIds) && (!Array.isArray(result.visibleTrackedChangeFailedIds) || result.visibleTrackedChangeFailedIds.length === 0) || !partialListMode && result.visibleWindowSource == null && result.complete === true && result.sourceCoverageComplete === true;
-		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,
-			hydrationGeneration
-		});
-		const hydrationResult = {
-			ok: true,
-			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;
-		if (result.visibleWindowSource != null) hydrationResult.visibleWindowSource = result.visibleWindowSource;
-		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;
-	});
 	/**
-	* Reconcile receipt-addressed tracked-change identities without enumerating
-	* the full catalog. Removals converge synchronously; surviving/new identities
-	* use the adapter's narrow get and then flow through the ordinary row mapper.
-	* A later idle hydration remains the bounded completeness check.
+	* Apply only receipt-owned removals. Remaps are updated in place by the
+	* caller; surviving/new rows arrive with the next committed review window.
 	*/
-	const reconcileTrackedChangeMutationFromV2 = async ({ superdoc, adapter, documentId, upsertIds = [], removedIds = [], allResolved } = {}) => {
+	const reconcileTrackedChangeMutationFromV2 = async ({ superdoc, adapter, documentId, upsertIds = [], removedIds = [], remappedPairs = [], allResolved } = {}) => {
 		const effectiveAdapter = adapter ?? getV2TrackedChangesAdapter(superdoc);
 		if (!effectiveAdapter) return {
 			ok: false,
@@ -10551,73 +10327,21 @@ var useCommentsStore = defineStore("comments", () => {
 				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({
+		const remappedSourceIds = new Set((Array.isArray(remappedPairs) ? remappedPairs : []).map((pair) => normalizeCommentId(pair?.from)).filter(Boolean));
+		const locallyRemovedIds = new Set([...normalizedRemovedIds].filter((id) => !remappedSourceIds.has(id)));
+		if (locallyRemovedIds.size > 0 && effectiveDocumentId != null) pruneDecidedTrackedChangeRow({
 			superdoc,
-			decidedIds: normalizedRemovedIds,
+			decidedIds: locallyRemovedIds,
 			documentId: effectiveDocumentId
 		});
-		if (normalizedUpsertIds.length === 0) return {
+		return {
 			ok: true,
 			items: [],
 			resolvedIds: [],
-			unresolvedIds: []
-		};
-		if (typeof effectiveAdapter.getTrackedChange !== "function") return {
-			ok: false,
-			reason: "adapter-get-missing"
-		};
-		const reads = await Promise.all(normalizedUpsertIds.map(async (id) => {
-			try {
-				return {
-					id,
-					result: await effectiveAdapter.getTrackedChange(id)
-				};
-			} catch (err) {
-				return {
-					id,
-					result: {
-						ok: false,
-						reason: "adapter-threw",
-						detail: err?.message ?? String(err)
-					}
-				};
-			}
-		}));
-		if (!isCurrentV2TrackedChangesAdapter(effectiveAdapter)) return {
-			ok: false,
-			reason: "adapter-stale"
-		};
-		if (trackedChangeSyncGeneration(effectiveAdapter) !== syncGeneration) return {
-			ok: false,
-			reason: "generation-stale"
-		};
-		const resolvedIds = [];
-		const unresolvedIds = [];
-		const items = [];
-		for (const { id, result } of reads) {
-			const matchingItems = (result?.ok && Array.isArray(result.items) ? result.items : []).filter((item) => trackedChangeItemIdentityIds(item).has(id));
-			if (matchingItems.length > 0) {
-				resolvedIds.push(id);
-				items.push(...matchingItems);
-			} else unresolvedIds.push(id);
-		}
-		const dedupedItems = dedupeTrackedChangeItems(items);
-		if (items.length > 0) reconcileTrackedChangesFromV2({
-			superdoc,
-			adapter: effectiveAdapter,
-			documentId: effectiveDocumentId,
-			items: dedupedItems,
-			pruneStale: false
-		});
-		return {
-			ok: unresolvedIds.length === 0,
-			items: dedupedItems,
-			resolvedIds,
-			unresolvedIds,
-			failures: reads.map(({ result }) => result).filter((result) => !result?.ok)
+			unresolvedIds: normalizedUpsertIds,
+			removedIds: [...locallyRemovedIds]
 		};
 	};
 	const createTrackedChangeBatchIdentityIndex = (documentId) => {
@@ -10721,84 +10445,6 @@ var useCommentsStore = defineStore("comments", () => {
 			appliedCount
 		};
 	});
-	/**
-	* Cooperatively apply an authoritative background catalog. Each batch is a
-	* non-pruning merge, so interruption can only leave extra/stale rows in the
-	* sidebar; destructive pruning happens once, after every batch has applied
-	* and the caller's generation/revision guard is still current.
-	*/
-	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) => {
@@ -10844,12 +10490,6 @@ var useCommentsStore = defineStore("comments", () => {
 			broadcastChanges,
 			structuralChanges: captured.structuralChanges
 		});
-		reconcileAuthoritativeV2TrackedChangeSidebar({
-			superdoc,
-			editor,
-			documentId: activeDocumentId,
-			refreshReason: "sync-authoritative"
-		});
 	};
 	/**
 	* Surface decidable whole-table structural tracked changes (table insert /
@@ -11419,7 +11059,10 @@ var useCommentsStore = defineStore("comments", () => {
 		pendingComment,
 		currentCommentText,
 		commentsList,
+		reviewDirectoryList,
 		isCommentsListVisible,
+		isReviewDirectoryActive,
+		isReviewDirectoryLoading,
 		generalCommentIds,
 		editorCommentIds,
 		commentsParentElement,
@@ -11437,6 +11080,7 @@ var useCommentsStore = defineStore("comments", () => {
 		getConfig,
 		documentsWithConverations,
 		getGroupedComments,
+		getGroupedReviewDirectory,
 		hasOpenTrackedChanges,
 		getCommentsByPosition,
 		getFloatingComments,
@@ -11468,6 +11112,8 @@ var useCommentsStore = defineStore("comments", () => {
 		removePendingComment,
 		cancelImportedTrackedChangeBootstrap,
 		removeCommentsForDocument,
+		setReviewDirectoryFromV2,
+		clearReviewDirectory,
 		processLoadedDocxComments,
 		translateCommentsForExport,
 		handleEditorLocationsUpdate,
@@ -11485,9 +11131,7 @@ var useCommentsStore = defineStore("comments", () => {
 		v2CommentsAdapter,
 		setV2CommentsAdapter,
 		getV2CommentsAdapter,
-		hydrateCommentsFromV2,
-		applyReviewSnapshotFromV2,
-		supersedeV2ReviewHydration,
+		applyReviewWindowFromV2,
 		reconcileCommentsFromV2,
 		isV2EditorActive,
 		replyCommentV2,
@@ -11498,7 +11142,6 @@ var useCommentsStore = defineStore("comments", () => {
 		setV2TrackedChangesAdapter,
 		getV2TrackedChangesAdapter,
 		getV2TrackedChangeRowCount,
-		hydrateTrackedChangesFromV2,
 		reconcileTrackedChangeMutationFromV2,
 		reconcileTrackedChangesFromV2,
 		remapTrackedChangeIdentities
@@ -11637,15 +11280,15 @@ function useUiFontFamily() {
 }
 //#endregion
 //#region src/components/CommentsLayer/CommentsDropdown.vue
-var _hoisted_1$30 = { class: "comments-dropdown" };
+var _hoisted_1$31 = { class: "comments-dropdown" };
 var _hoisted_2$24 = ["onClick"];
 var _hoisted_3$20 = {
 	key: 0,
 	class: "comments-dropdown__option-icon"
 };
-var _hoisted_4$13 = ["innerHTML"];
+var _hoisted_4$12 = ["innerHTML"];
 var _hoisted_5$8 = { class: "comments-dropdown__option-label" };
-var _sfc_main$37 = {
+var _sfc_main$38 = {
 	__name: "CommentsDropdown",
 	props: {
 		options: {
@@ -11768,7 +11411,7 @@ var _sfc_main$37 = {
 			window.removeEventListener("scroll", updateMenuPosition, true);
 		});
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$30, [(0, vue.createElementVNode)("div", {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$31, [(0, vue.createElementVNode)("div", {
 				ref_key: "triggerRef",
 				ref: triggerRef,
 				class: "comments-dropdown__trigger",
@@ -11787,7 +11430,7 @@ var _sfc_main$37 = {
 				}, [hasIcon(option) ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_3$20, [option.iconString ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", {
 					key: 0,
 					innerHTML: option.iconString
-				}, null, 8, _hoisted_4$13)) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(OptionIcon), {
+				}, null, 8, _hoisted_4$12)) : ((0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(OptionIcon), {
 					key: 1,
 					option
 				}, null, 8, ["option"]))])) : (0, vue.createCommentVNode)("", true), (0, vue.createElementVNode)("span", _hoisted_5$8, (0, vue.toDisplayString)(option.label), 1)], 10, _hoisted_2$24);
@@ -11795,14 +11438,14 @@ var _sfc_main$37 = {
 		};
 	}
 };
-var CommentsDropdown_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$37, [["__scopeId", "data-v-7eced80a"]]);
+var CommentsDropdown_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$38, [["__scopeId", "data-v-7eced80a"]]);
 //#endregion
 //#region src/components/CommentsLayer/InternalDropdown.vue
-var _hoisted_1$29 = { class: "sd-comment-option" };
+var _hoisted_1$30 = { class: "sd-comment-option" };
 var _hoisted_2$23 = ["innerHTML"];
 var _hoisted_3$19 = { class: "sd-option-state" };
-var _hoisted_4$12 = ["innerHTML"];
-var _sfc_main$36 = {
+var _hoisted_4$11 = ["innerHTML"];
+var _sfc_main$37 = {
 	__name: "InternalDropdown",
 	props: {
 		state: {
@@ -11869,7 +11512,7 @@ var _sfc_main$36 = {
 				disabled: __props.isDisabled,
 				"content-style": { fontFamily: (0, vue.unref)(uiFontFamily) }
 			}, {
-				default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$29, [
+				default: (0, vue.withCtx)(() => [(0, vue.createElementVNode)("div", _hoisted_1$30, [
 					(0, vue.createElementVNode)("div", {
 						class: "sd-active-icon",
 						innerHTML: activeIcon.value
@@ -11878,14 +11521,14 @@ var _sfc_main$36 = {
 					(0, vue.createElementVNode)("div", {
 						class: "sd-dropdown-caret",
 						innerHTML: (0, vue.unref)(superdocIcons).caretDown
-					}, null, 8, _hoisted_4$12)
+					}, null, 8, _hoisted_4$11)
 				])]),
 				_: 1
 			}, 8, ["disabled", "content-style"])], 4);
 		};
 	}
 };
-var InternalDropdown_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$36, [["__scopeId", "data-v-138d641e"]]);
+var InternalDropdown_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$37, [["__scopeId", "data-v-138d641e"]]);
 //#endregion
 //#region src/components/CommentsLayer/helpers.js
 /**
@@ -12028,13 +11671,13 @@ var isAllowed = (permission, role, isInternal, context = {}) => {
 };
 //#endregion
 //#region src/components/general/Avatar.vue
-var _hoisted_1$28 = { class: "user-container" };
+var _hoisted_1$29 = { class: "user-container" };
 var _hoisted_2$22 = ["src"];
 var _hoisted_3$18 = {
 	key: 1,
 	class: "user-bg"
 };
-var _sfc_main$35 = {
+var _sfc_main$36 = {
 	__name: "Avatar",
 	props: { user: {
 		type: Object,
@@ -12051,7 +11694,7 @@ var _sfc_main$35 = {
 			return email?.substring(0, 1)?.toUpperCase() || null;
 		};
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$28, [__props.user.image ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("img", {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$29, [__props.user.image ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("img", {
 				key: 0,
 				class: "user-bg",
 				src: __props.user.image.startsWith("http") ? __props.user.image : `data:image/png;base64,${__props.user.image}`
@@ -12059,13 +11702,13 @@ var _sfc_main$35 = {
 		};
 	}
 };
-var Avatar_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$35, [["__scopeId", "data-v-c95b2073"]]);
+var Avatar_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$36, [["__scopeId", "data-v-c95b2073"]]);
 //#endregion
 //#region src/components/CommentsLayer/CommentHeader.vue
-var _hoisted_1$27 = { class: "card-section comment-header" };
+var _hoisted_1$28 = { class: "card-section comment-header" };
 var _hoisted_2$21 = { class: "comment-header-left" };
 var _hoisted_3$17 = { class: "user-info" };
-var _hoisted_4$11 = { class: "user-name" };
+var _hoisted_4$10 = { class: "user-name" };
 var _hoisted_5$7 = {
 	key: 0,
 	class: "imported-tag"
@@ -12091,7 +11734,7 @@ var _hoisted_9$3 = [
 ];
 var _hoisted_10$3 = { class: "overflow-menu__icon" };
 var _hoisted_11$3 = ["innerHTML"];
-var _sfc_main$34 = {
+var _sfc_main$35 = {
 	__name: "CommentHeader",
 	props: {
 		timestamp: {
@@ -12295,10 +11938,10 @@ var _sfc_main$34 = {
 			return user;
 		});
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$27, [(0, vue.createElementVNode)("div", _hoisted_2$21, [(0, vue.createVNode)(Avatar_default, {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$28, [(0, vue.createElementVNode)("div", _hoisted_2$21, [(0, vue.createVNode)(Avatar_default, {
 				user: getCurrentUser.value,
 				class: "avatar"
-			}, null, 8, ["user"]), (0, vue.createElementVNode)("div", _hoisted_3$17, [(0, vue.createElementVNode)("div", _hoisted_4$11, [(0, vue.createTextVNode)((0, vue.toDisplayString)(getCurrentUser.value.name), 1), isImported.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5$7, "IMPORTED")) : (0, vue.createCommentVNode)("", true)]), props.comment.createdTime ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_6$6, (0, vue.toDisplayString)((0, vue.unref)(formatDate)(props.comment.createdTime)), 1)) : (0, vue.createCommentVNode)("", true)])]), (0, vue.createElementVNode)("div", { class: (0, vue.normalizeClass)(["overflow-menu", { "is-visible": props.isActive }]) }, [
+			}, null, 8, ["user"]), (0, vue.createElementVNode)("div", _hoisted_3$17, [(0, vue.createElementVNode)("div", _hoisted_4$10, [(0, vue.createTextVNode)((0, vue.toDisplayString)(getCurrentUser.value.name), 1), isImported.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("span", _hoisted_5$7, "IMPORTED")) : (0, vue.createCommentVNode)("", true)]), props.comment.createdTime ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_6$6, (0, vue.toDisplayString)((0, vue.unref)(formatDate)(props.comment.createdTime)), 1)) : (0, vue.createCommentVNode)("", true)])]), (0, vue.createElementVNode)("div", { class: (0, vue.normalizeClass)(["overflow-menu", { "is-visible": props.isActive }]) }, [
 				allowResolve.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
 					key: 0,
 					class: (0, vue.normalizeClass)(["overflow-menu__icon", { "sd-is-disabled": Boolean(__props.resolveDisabledReason) }]),
@@ -12344,13 +11987,13 @@ var _sfc_main$34 = {
 		};
 	}
 };
-var CommentHeader_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$34, [["__scopeId", "data-v-ca6050aa"]]);
+var CommentHeader_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$35, [["__scopeId", "data-v-ca6050aa"]]);
 //#endregion
 //#region src/components/CommentsLayer/CommentInput.vue
-var _hoisted_1$26 = { class: "input-section" };
+var _hoisted_1$27 = { class: "input-section" };
 var TEXTAREA_MIN_HEIGHT = 28;
 var TEXTAREA_MAX_HEIGHT = 132;
-var _sfc_main$33 = {
+var _sfc_main$34 = {
 	__name: "CommentInput",
 	props: {
 		users: {
@@ -12420,7 +12063,7 @@ var _sfc_main$33 = {
 		(0, vue.watch)(currentCommentText, scheduleInputHeightSync);
 		__expose({ focus });
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$26, [__props.includeHeader ? ((0, vue.openBlock)(), (0, vue.createBlock)(CommentHeader_default, {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$27, [__props.includeHeader ? ((0, vue.openBlock)(), (0, vue.createBlock)(CommentHeader_default, {
 				key: 0,
 				config: __props.config,
 				comment: __props.comment,
@@ -12439,10 +12082,11 @@ var _sfc_main$33 = {
 		};
 	}
 };
-var CommentInput_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-cc54b489"]]);
+var CommentInput_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$34, [["__scopeId", "data-v-cc54b489"]]);
 //#endregion
 //#region src/components/CommentsLayer/CommentDialog.vue
-var _hoisted_1$25 = [
+var _hoisted_1$26 = [
+	"aria-label",
 	"data-comment-instance-id",
 	"data-comment-thread-id",
 	"data-comment-position-key",
@@ -12453,7 +12097,7 @@ var _hoisted_2$20 = {
 	class: "existing-internal-input"
 };
 var _hoisted_3$16 = { class: "new-comment-input-wrapper" };
-var _hoisted_4$10 = { class: "reply-actions" };
+var _hoisted_4$9 = { class: "reply-actions" };
 var _hoisted_5$6 = ["disabled"];
 var _hoisted_6$5 = {
 	key: 0,
@@ -12544,7 +12188,7 @@ var _hoisted_50 = { class: "reply-actions" };
 var _hoisted_51 = ["disabled", "data-disabled-reason"];
 var CLICK_OUTSIDE_HIT_TOLERANCE_PX = 3;
 var TRACKED_CHANGE_PREVIEW_MAX_PX = 90;
-var _sfc_main$32 = {
+var _sfc_main$33 = {
 	__name: "CommentDialog",
 	props: {
 		comment: {
@@ -12574,6 +12218,10 @@ var _sfc_main$32 = {
 		isFloatingInstanceActive: {
 			type: Boolean,
 			default: void 0
+		},
+		threadComments: {
+			type: Array,
+			default: null
 		}
 	},
 	emits: [
@@ -12776,6 +12424,11 @@ var _sfc_main$32 = {
 		};
 		const comments = (0, vue.computed)(() => {
 			const parentComment = props.comment;
+			if (Array.isArray(props.threadComments)) return [...props.threadComments].sort((a, b) => {
+				if (a.commentId === parentComment.commentId) return -1;
+				if (b.commentId === parentComment.commentId) return 1;
+				return a.createdTime - b.createdTime;
+			});
 			if (parentComment.trackedChange) return commentsStore.getTrackedChangeThread(parentComment);
 			return commentsStore.commentsList.filter((comment) => {
 				const isThreadedComment = comment.parentCommentId === parentComment.commentId;
@@ -12787,6 +12440,11 @@ var _sfc_main$32 = {
 				return a.createdTime - b.createdTime;
 			});
 		});
+		const dialogAccessibleLabel = (0, vue.computed)(() => {
+			if (props.comment.trackedChangeLabel) return props.comment.trackedChangeLabel;
+			if (props.comment.trackedChange) return "Tracked change discussion";
+			return props.comment.creatorName ? `Comment by ${props.comment.creatorName}` : "Comment thread";
+		});
 		const textExpanded = (0, vue.ref)(false);
 		const parentBodyRef = (0, vue.ref)(null);
 		const isTextOverflowing = (0, vue.ref)(false);
@@ -13385,6 +13043,7 @@ var _sfc_main$32 = {
 				ref_key: "commentDialogElement",
 				ref: commentDialogElement,
 				role: "dialog",
+				"aria-label": dialogAccessibleLabel.value,
 				"data-sd-part": "comment-thread",
 				"data-editor-ui-surface": "",
 				"data-comment-instance-id": props.floatingInstanceId ?? "",
@@ -13416,7 +13075,7 @@ var _sfc_main$32 = {
 					"config",
 					"comment"
 				])]),
-				(0, vue.createElementVNode)("div", _hoisted_4$10, [(0, vue.createElementVNode)("button", {
+				(0, vue.createElementVNode)("div", _hoisted_4$9, [(0, vue.createElementVNode)("button", {
 					class: "sd-button reply-btn-cancel",
 					onClick: (0, vue.withModifiers)(handleCancel, ["stop", "prevent"])
 				}, "Cancel"), (0, vue.createElementVNode)("button", {
@@ -13593,22 +13252,161 @@ var _sfc_main$32 = {
 					disabled: !hasTextContent.value || isV2WriteDisabled.value || isSubmittingReply.value,
 					"data-disabled-reason": v2ReplyDisabledReason.value
 				}, " Reply ", 10, _hoisted_51)])]))], 64)) : (0, vue.createCommentVNode)("", true)
-			], 64))], 14, _hoisted_1$25)), [[_directive_click_outside, handleClickOutside]]);
+			], 64))], 14, _hoisted_1$26)), [[_directive_click_outside, handleClickOutside]]);
 		};
 	}
 };
-var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$32, [["__scopeId", "data-v-f26decd0"]]);
+var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-0277e53b"]]);
 //#endregion
-//#region src/components/CommentsLayer/commentsList/commentsList.vue
-var _hoisted_1$24 = { class: "comments-list" };
-var _hoisted_2$19 = { key: 0 };
-var _hoisted_3$15 = [
+//#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
+var _hoisted_1$25 = [
+	"tabindex",
+	"aria-posinset",
+	"aria-setsize",
+	"aria-label",
 	"data-comment-instance-id",
 	"data-comment-thread-id",
 	"data-comment-position-key",
-	"data-comment-page-index"
+	"data-comment-page-index",
+	"data-review-directory-index"
 ];
-var _hoisted_4$9 = { key: 1 };
+var _sfc_main$32 = {
+	__name: "ReviewDirectoryListItem",
+	props: {
+		item: {
+			type: Object,
+			required: true
+		},
+		index: {
+			type: Number,
+			required: true
+		},
+		total: {
+			type: Number,
+			required: true
+		},
+		tabIndex: {
+			type: Number,
+			default: -1
+		}
+	},
+	emits: ["focus-item", "navigate"],
+	setup(__props, { emit: __emit }) {
+		const props = __props;
+		const emit = __emit;
+		const { activeComment, editingCommentId, pendingComment } = storeToRefs(useCommentsStore());
+		const shell = (0, vue.ref)(null);
+		const measuredHeight = (0, vue.ref)(112);
+		const intersects = (0, vue.ref)(typeof IntersectionObserver === "undefined");
+		const containsFocus = (0, vue.ref)(false);
+		let intersectionObserver = null;
+		let resizeObserver = null;
+		const threadIds = (0, vue.computed)(() => new Set((props.item.threadComments ?? []).flatMap((comment) => [
+			comment?.commentId,
+			comment?.importedId,
+			comment?.trackedChangeCanonicalId
+		]).filter((id) => id != null).map(String)));
+		const isPinned = (0, vue.computed)(() => {
+			const pendingId = pendingComment.value?.commentId;
+			return containsFocus.value || activeComment.value != null && threadIds.value.has(String(activeComment.value)) || editingCommentId.value != null && threadIds.value.has(String(editingCommentId.value)) || pendingId != null && threadIds.value.has(String(pendingId));
+		});
+		const materialized = (0, vue.computed)(() => intersects.value || isPinned.value);
+		const placeholderStyle = (0, vue.computed)(() => materialized.value ? void 0 : { minHeight: `${Math.max(1, measuredHeight.value)}px` });
+		const accessibleSummary = (0, vue.computed)(() => {
+			const comment = props.item.comment;
+			const text = comment?.trackedChangeLabel ?? comment?.commentText ?? comment?.trackedChangeText ?? "Review item";
+			return String(text).replace(/<[^>]*>/g, " ").replace(/\s+/g, " ").trim().slice(0, 160) || "Review item";
+		});
+		const measure = () => {
+			const height = shell.value?.getBoundingClientRect?.().height;
+			if (Number.isFinite(height) && height > 0) measuredHeight.value = height;
+		};
+		const onFocusIn = () => {
+			containsFocus.value = true;
+			emit("focus-item", props.index);
+		};
+		const onKeydown = (event) => {
+			if (![
+				"ArrowDown",
+				"ArrowUp",
+				"Home",
+				"End"
+			].includes(event.key)) return;
+			if (event.target?.closest?.("input, textarea, select, button, [contenteditable=\"true\"]")) return;
+			event.preventDefault();
+			emit("navigate", {
+				index: props.index,
+				key: event.key
+			});
+		};
+		(0, vue.onMounted)(() => {
+			if (typeof IntersectionObserver !== "undefined") {
+				intersectionObserver = new IntersectionObserver((entries) => {
+					const entry = entries[0];
+					if (!entry) return;
+					intersects.value = entry.isIntersecting;
+					if (entry.isIntersecting) (0, vue.nextTick)(measure);
+				}, {
+					root: null,
+					rootMargin: "600px 0px"
+				});
+				intersectionObserver.observe(shell.value);
+			}
+			if (typeof ResizeObserver !== "undefined") {
+				resizeObserver = new ResizeObserver(measure);
+				resizeObserver.observe(shell.value);
+			}
+			(0, vue.nextTick)(measure);
+		});
+		(0, vue.onBeforeUnmount)(() => {
+			intersectionObserver?.disconnect();
+			resizeObserver?.disconnect();
+		});
+		return (_ctx, _cache) => {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+				ref_key: "shell",
+				ref: shell,
+				class: "comment-item",
+				role: "listitem",
+				tabindex: __props.tabIndex,
+				"aria-posinset": __props.index + 1,
+				"aria-setsize": __props.total,
+				"aria-label": accessibleSummary.value,
+				style: (0, vue.normalizeStyle)(placeholderStyle.value),
+				"data-comment-instance-id": __props.item.floatingInstanceId ?? "",
+				"data-comment-thread-id": __props.item.comment.commentId ?? "",
+				"data-comment-position-key": __props.item.comment.trackedChangeAnchorKey ?? "",
+				"data-comment-page-index": Number.isFinite(__props.item.floatingPageIndex) ? __props.item.floatingPageIndex : "",
+				"data-review-directory-index": __props.index,
+				onFocusin: onFocusIn,
+				onFocusout: _cache[0] || (_cache[0] = ($event) => containsFocus.value = shell.value?.contains?.($event.relatedTarget) === true),
+				onKeydown
+			}, [materialized.value ? ((0, vue.openBlock)(), (0, vue.createBlock)(CommentDialog_default, {
+				key: 0,
+				comment: __props.item.comment,
+				"thread-comments": __props.item.threadComments,
+				"floating-instance-id": __props.item.floatingInstanceId,
+				"floating-page-index": __props.item.floatingPageIndex,
+				"floating-position-entry": __props.item.floatingPositionEntry,
+				"is-floating-instance-active": __props.item.isFloatingInstanceActive,
+				onResize: measure
+			}, null, 8, [
+				"comment",
+				"thread-comments",
+				"floating-instance-id",
+				"floating-page-index",
+				"floating-position-entry",
+				"is-floating-instance-active"
+			])) : (0, vue.createCommentVNode)("", true)], 44, _hoisted_1$25);
+		};
+	}
+};
+var ReviewDirectoryListItem_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$32, [["__scopeId", "data-v-29650a06"]]);
+//#endregion
+//#region src/components/CommentsLayer/commentsList/commentsList.vue
+var _hoisted_1$24 = ["aria-busy"];
+var _hoisted_2$19 = { key: 0 };
+var _hoisted_3$15 = { key: 1 };
 var REPEATED_HEADER_FOOTER_STORY_TYPE = "headerFooterPart";
 var _sfc_main$31 = {
 	__name: "commentsList",
@@ -13625,10 +13423,41 @@ var _sfc_main$31 = {
 	setup(__props) {
 		const props = __props;
 		const commentsStore = useCommentsStore();
+		const listRoot = (0, vue.ref)(null);
+		const rovingIndex = (0, vue.ref)(0);
 		const isCommentsListVisible = (0, vue.toRef)(commentsStore, "isCommentsListVisible");
-		const groupedComments = (0, vue.computed)(() => commentsStore.getGroupedComments);
 		const floatingCommentInstances = (0, vue.computed)(() => commentsStore.getFloatingCommentInstances);
-		const { activeComment, activeFloatingCommentInstanceId } = storeToRefs(commentsStore);
+		const { activeComment, activeFloatingCommentInstanceId, commentsList, reviewDirectoryList, isReviewDirectoryActive, isReviewDirectoryLoading } = storeToRefs(commentsStore);
+		const groupedComments = (0, vue.computed)(() => isReviewDirectoryActive.value ? commentsStore.getGroupedReviewDirectory : commentsStore.getGroupedComments);
+		const reviewRows = (0, vue.computed)(() => isReviewDirectoryActive.value ? reviewDirectoryList.value : commentsList.value);
+		const commentAliases = (comment) => [
+			comment?.commentId,
+			comment?.importedId,
+			comment?.trackedChangeCanonicalId
+		].filter((id) => id != null).map(String);
+		const directoryThreads = (0, vue.computed)(() => {
+			const threadsByAlias = /* @__PURE__ */ new Map();
+			for (const comment of reviewRows.value) {
+				const thread = [comment];
+				for (const alias of commentAliases(comment)) threadsByAlias.set(alias, thread);
+			}
+			for (const comment of reviewRows.value) {
+				const parentThread = [
+					comment?.parentCommentId,
+					comment?.threadingParentCommentId,
+					comment?.trackedChangeThreadParentId
+				].filter((id) => id != null).map(String).map((alias) => threadsByAlias.get(alias)).find(Boolean);
+				if (parentThread && !parentThread.includes(comment)) parentThread.push(comment);
+			}
+			return threadsByAlias;
+		});
+		const threadCommentsFor = (parentComment) => {
+			for (const alias of commentAliases(parentComment)) {
+				const thread = directoryThreads.value.get(alias);
+				if (thread) return thread;
+			}
+			return [parentComment];
+		};
 		const getRepeatedHeaderFooterInstances = (comment) => {
 			const matchingInstances = floatingCommentInstances.value.filter((instance) => instance?.comment?.commentId === comment?.commentId);
 			if (matchingInstances.length < 2) return [];
@@ -13650,7 +13479,8 @@ var _sfc_main$31 = {
 				floatingInstanceId: null,
 				floatingPageIndex: null,
 				floatingPositionEntry: null,
-				isFloatingInstanceActive: void 0
+				isFloatingInstanceActive: void 0,
+				threadComments: threadCommentsFor(comment)
 			}];
 			return repeatedInstances.map((instance) => ({
 				id: instance.id,
@@ -13658,7 +13488,8 @@ var _sfc_main$31 = {
 				floatingInstanceId: String(instance.id),
 				floatingPageIndex: instance.pageIndex,
 				floatingPositionEntry: instance.positionEntry ?? null,
-				isFloatingInstanceActive: isRepeatedInstanceActive(instance)
+				isFloatingInstanceActive: isRepeatedInstanceActive(instance),
+				threadComments: threadCommentsFor(comment)
 			}));
 		};
 		const parentCommentDisplayItems = (0, vue.computed)(() => {
@@ -13667,6 +13498,30 @@ var _sfc_main$31 = {
 		const shouldShowResolvedComments = (0, vue.computed)(() => {
 			return props.showResolvedComments && groupedComments.value?.resolvedComments?.length > 0;
 		});
+		const resolvedCommentDisplayItems = (0, vue.computed)(() => groupedComments.value.resolvedComments.map((comment) => ({
+			id: comment.commentId,
+			comment,
+			floatingInstanceId: null,
+			floatingPageIndex: null,
+			floatingPositionEntry: null,
+			isFloatingInstanceActive: void 0,
+			threadComments: threadCommentsFor(comment)
+		})));
+		const displayedMainCount = (0, vue.computed)(() => props.showMainComments ? parentCommentDisplayItems.value.length : 0);
+		const totalDisplayItems = (0, vue.computed)(() => displayedMainCount.value + (shouldShowResolvedComments.value ? resolvedCommentDisplayItems.value.length : 0));
+		(0, vue.watch)(totalDisplayItems, (total) => {
+			rovingIndex.value = Math.max(0, Math.min(rovingIndex.value, total - 1));
+		});
+		const focusDirectoryItem = async ({ index, key }) => {
+			const lastIndex = totalDisplayItems.value - 1;
+			if (lastIndex < 0) return;
+			const nextIndex = key === "Home" ? 0 : key === "End" ? lastIndex : key === "ArrowUp" ? Math.max(0, index - 1) : Math.min(lastIndex, index + 1);
+			rovingIndex.value = nextIndex;
+			await (0, vue.nextTick)();
+			const target = listRoot.value?.querySelector?.(`[data-review-directory-index="${nextIndex}"]`);
+			target?.scrollIntoView?.({ block: "nearest" });
+			target?.focus?.({ preventScroll: true });
+		};
 		(0, vue.onMounted)(() => {
 			isCommentsListVisible.value = true;
 		});
@@ -13674,37 +13529,47 @@ var _sfc_main$31 = {
 			isCommentsListVisible.value = false;
 		});
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1$24, [__props.showMainComments ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$19, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(parentCommentDisplayItems.value, (item) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+			return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
+				ref_key: "listRoot",
+				ref: listRoot,
+				class: "comments-list",
+				role: "list",
+				"aria-busy": (0, vue.unref)(isReviewDirectoryActive) && (0, vue.unref)(isReviewDirectoryLoading) ? "true" : "false"
+			}, [__props.showMainComments ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_2$19, [((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(parentCommentDisplayItems.value, (item, index) => {
+				return (0, vue.openBlock)(), (0, vue.createBlock)(ReviewDirectoryListItem_default, {
 					key: item.id,
-					class: "comment-item",
-					"data-comment-instance-id": item.floatingInstanceId ?? "",
-					"data-comment-thread-id": item.comment.commentId ?? "",
-					"data-comment-position-key": item.comment.trackedChangeAnchorKey ?? "",
-					"data-comment-page-index": Number.isFinite(item.floatingPageIndex) ? item.floatingPageIndex : ""
-				}, [(0, vue.createVNode)(CommentDialog_default, {
-					comment: item.comment,
-					"floating-instance-id": item.floatingInstanceId,
-					"floating-page-index": item.floatingPageIndex,
-					"floating-position-entry": item.floatingPositionEntry,
-					"is-floating-instance-active": item.isFloatingInstanceActive
+					item,
+					index,
+					total: totalDisplayItems.value,
+					"tab-index": index === rovingIndex.value ? 0 : -1,
+					onFocusItem: _cache[0] || (_cache[0] = ($event) => rovingIndex.value = $event),
+					onNavigate: focusDirectoryItem
 				}, null, 8, [
-					"comment",
-					"floating-instance-id",
-					"floating-page-index",
-					"floating-position-entry",
-					"is-floating-instance-active"
-				])], 8, _hoisted_3$15);
-			}), 128))])) : (0, vue.createCommentVNode)("", true), shouldShowResolvedComments.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_4$9, [_cache[0] || (_cache[0] = (0, vue.createElementVNode)("div", { class: "comment-title" }, "Resolved", -1)), ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(groupedComments.value.resolvedComments, (comment) => {
-				return (0, vue.openBlock)(), (0, vue.createElementBlock)("div", {
-					key: comment.commentId,
-					class: "comment-item"
-				}, [(0, vue.createVNode)(CommentDialog_default, { comment }, null, 8, ["comment"])]);
-			}), 128))])) : (0, vue.createCommentVNode)("", true)]);
+					"item",
+					"index",
+					"total",
+					"tab-index"
+				]);
+			}), 128))])) : (0, vue.createCommentVNode)("", true), shouldShowResolvedComments.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_3$15, [_cache[2] || (_cache[2] = (0, vue.createElementVNode)("div", { class: "comment-title" }, "Resolved", -1)), ((0, vue.openBlock)(true), (0, vue.createElementBlock)(vue.Fragment, null, (0, vue.renderList)(resolvedCommentDisplayItems.value, (item, index) => {
+				return (0, vue.openBlock)(), (0, vue.createBlock)(ReviewDirectoryListItem_default, {
+					key: item.id,
+					item,
+					index: displayedMainCount.value + index,
+					total: totalDisplayItems.value,
+					"tab-index": displayedMainCount.value + index === rovingIndex.value ? 0 : -1,
+					onFocusItem: _cache[1] || (_cache[1] = ($event) => rovingIndex.value = $event),
+					onNavigate: focusDirectoryItem
+				}, null, 8, [
+					"item",
+					"index",
+					"total",
+					"tab-index"
+				]);
+			}), 128))])) : (0, vue.createCommentVNode)("", true)], 8, _hoisted_1$24);
 		};
 	}
 };
-var commentsList_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$31, [["__scopeId", "data-v-e89dbc33"]]);
+var commentsList_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$31, [["__scopeId", "data-v-89244745"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/super-comments-list.js
 /**
@@ -13728,8 +13593,65 @@ var SuperComments = class extends require_eventemitter3.import_eventemitter3.def
 		this.element = this.config.element;
 		this.app = null;
 		this.superdoc = superdoc;
+		this.stopDirectoryObservers = [];
+		this.directorySnapshots = {
+			comments: null,
+			trackChanges: null
+		};
+		this.directoryItemRefs = {
+			comments: null,
+			trackChanges: null
+		};
+		this.directoryGeneration = 0;
 		this.open();
 	}
+	syncDirectory() {
+		const store = this.superdoc?.commentsStore;
+		if (!store) return;
+		const comments = this.directorySnapshots.comments;
+		const trackChanges = this.directorySnapshots.trackChanges;
+		store.isReviewDirectoryLoading = comments == null || trackChanges == null;
+		if (comments == null && trackChanges == null) return;
+		store.setReviewDirectoryFromV2({
+			superdoc: this.superdoc,
+			commentItems: comments ?? [],
+			trackedChangeItems: trackChanges ?? []
+		});
+	}
+	startDirectoryObservers() {
+		const generation = ++this.directoryGeneration;
+		const subscribe = (handle, family) => {
+			const acceptDirectorySnapshot = (snapshot) => {
+				if (generation !== this.directoryGeneration) return;
+				if ((snapshot?.listStatus ?? snapshot?.status) !== "ready") {
+					if (this.superdoc?.commentsStore) this.superdoc.commentsStore.isReviewDirectoryLoading = true;
+					return;
+				}
+				const items = Array.isArray(snapshot.items) ? snapshot.items : [];
+				if (this.directoryItemRefs[family] === items) {
+					if (this.superdoc?.commentsStore) this.superdoc.commentsStore.isReviewDirectoryLoading = this.directorySnapshots.comments == null || this.directorySnapshots.trackChanges == null;
+					return;
+				}
+				this.directoryItemRefs[family] = items;
+				this.directorySnapshots[family] = items;
+				this.syncDirectory();
+			};
+			const stop = handle.observe((snapshot) => {
+				acceptDirectorySnapshot(snapshot);
+			});
+			const readAfterLeaseAcquisition = () => acceptDirectorySnapshot(handle.getSnapshot());
+			if (typeof globalThis.queueMicrotask === "function") globalThis.queueMicrotask(readAfterLeaseAcquisition);
+			else Promise.resolve().then(readAfterLeaseAcquisition);
+			return stop;
+		};
+		const ui = this.superdoc?.ui;
+		if (!ui) return;
+		if (this.superdoc?.commentsStore) {
+			this.superdoc.commentsStore.isReviewDirectoryActive = true;
+			this.superdoc.commentsStore.isReviewDirectoryLoading = true;
+		}
+		this.stopDirectoryObservers = [subscribe(ui.comments, "comments"), subscribe(ui.trackChanges, "trackChanges")];
+	}
 	createVueApp() {
 		this.app = (0, vue.createApp)(commentsList_default);
 		const parentProvides = this.superdoc?.app?._context?.provides;
@@ -13743,8 +13665,24 @@ var SuperComments = class extends require_eventemitter3.import_eventemitter3.def
 		this.app.config.globalProperties.$superdoc = this.superdoc;
 		if (!this.element && this.config.selector) this.element = document.getElementById(this.config.selector);
 		this.container = this.app.mount(this.element);
+		this.startDirectoryObservers();
 	}
 	close() {
+		this.directoryGeneration += 1;
+		for (const stop of this.stopDirectoryObservers.splice(0)) stop?.();
+		this.directorySnapshots = {
+			comments: null,
+			trackChanges: null
+		};
+		this.directoryItemRefs = {
+			comments: null,
+			trackChanges: null
+		};
+		if (this.superdoc?.commentsStore) {
+			this.superdoc.commentsStore.clearReviewDirectory();
+			this.superdoc.commentsStore.isReviewDirectoryActive = false;
+			this.superdoc.commentsStore.isReviewDirectoryLoading = false;
+		}
 		if (this.app) {
 			this.app.unmount();
 			this.app = null;
@@ -20632,27 +20570,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				editor: proxy.$superdoc?.activeEditor
 			});
 		};
-		const reconcileAuthoritativeV2TrackedChangeSidebar = ({ adapter, documentId, refreshReason = "startup-authoritative" } = {}) => {
-			if (!adapter || typeof adapter.listTrackedChanges !== "function") return false;
-			const normalizedDocumentId = documentId == null ? null : String(documentId);
-			if (!normalizedDocumentId) return false;
-			commentsStore.hydrateTrackedChangesFromV2?.({
-				superdoc: proxy.$superdoc,
-				adapter,
-				documentId: normalizedDocumentId,
-				trackedChangesListMode: "background-reconcile",
-				refreshReason,
-				blocking: false,
-				isCurrent: () => {
-					const activeEditor = proxy.$superdoc?.activeEditor ?? null;
-					const activeDocumentId = activeEditor?.documentId ?? activeEditor?.options?.documentId ?? null;
-					if (activeDocumentId != null && String(activeDocumentId) !== normalizedDocumentId) return false;
-					const activeAdapter = activeEditor?.v2TrackedChanges ?? commentsStore.getV2TrackedChangesAdapter?.(proxy.$superdoc);
-					return !activeAdapter || activeAdapter === adapter;
-				}
-			});
-			return true;
-		};
 		const scheduleReplayTrackedChangeSync = () => {
 			pendingReplayTrackedChangeSync.value = true;
 			(0, vue.nextTick)(() => {
@@ -20810,31 +20727,25 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			proxy.$superdoc.setActiveRuntime(runtimeId, "v2-editor-ready");
 			return true;
 		};
-		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,
-				reason: "validator-missing"
+		const v2ReviewWindowController = resolvedEditorIntegration.createReviewWindowController({ applyReviewWindow: (ctx, result) => commentsStore.applyReviewWindowFromV2?.({
+			superdoc: ctx?.superdoc,
+			commentsAdapter: ctx?.commentsAdapter,
+			trackedChangesAdapter: ctx?.trackedChangesAdapter,
+			documentId: ctx?.documentId,
+			commentItems: result?.comments?.items,
+			trackedChangeItems: result?.trackedChanges?.items,
+			requestedCommentIds: result?.comments?.requestedIds,
+			requestedTrackedChangeIds: result?.trackedChanges?.requestedIds,
+			unresolvedCommentIds: result?.comments?.unresolvedCommentIds,
+			trackedList: {
+				complete: false,
+				visibleWindowSource: "visible-window"
 			},
-			applyReviewSnapshot: (ctx, result) => commentsStore.applyReviewSnapshotFromV2?.({
-				superdoc: ctx.superdoc,
-				commentsAdapter: ctx.commentsAdapter,
-				trackedChangesAdapter: ctx.trackedChangesAdapter,
-				documentId: ctx.documentId,
-				commentItems: result.comments?.items,
-				trackedChangeItems: result.trackedChanges?.items,
-				trackedList: result.trackedChanges,
-				sourceCoverageRevision: result.sourceCoverageRevision,
-				evaluatedRevision: result.evaluatedRevision,
-				patch: (callback) => commentsStore.$patch(callback)
-			}) ?? {
-				ok: false,
-				reason: "store-action-missing"
-			}
-		});
+			patch: (callback) => commentsStore.$patch(callback)
+		}) ?? {
+			ok: false,
+			reason: "store-action-missing"
+		} });
 		const v2EditorFailures = (0, vue.ref)({});
 		const v2AuthorRequiredGate = createV2AuthorRequiredNotificationGate();
 		const v2AuthorRequiredMessages = (0, vue.ref)({});
@@ -20928,7 +20839,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			if (!payload) return;
 			clearV2EditorFailure(payload.documentId ?? null);
 			clearV2AuthorRequired(payload.documentId ?? null);
-			const { host, mount, documentId, capabilities, editCommands, bindEditShortcuts, bindSessionShortcuts, commentsAdapter, trackedChangesAdapter, documentApi, documentMutationReadiness, documentApiUnavailableReason, pageMetrics, pageLayout, pageFurniture, presence, lock, fonts, replaceFile } = payload;
+			const { host, mount, documentId, capabilities, editCommands, bindEditShortcuts, bindSessionShortcuts, commentsAdapter, trackedChangesAdapter, documentApi, documentMutationReadiness, documentApiUnavailableReason, pageMetrics, pageLayout, pageFurniture, presence, lock, fonts, replaceFile, upgradeToCollaboration } = payload;
 			const saveV2Bytes = async (saveOptions = {}) => {
 				if (!host || typeof host.save !== "function") throw new Error("v2-editor: save unavailable");
 				return host.save(saveOptions);
@@ -20945,6 +20856,10 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				if (typeof replaceFile !== "function") throw new Error("v2-editor: replaceFile unavailable");
 				return replaceFile(source);
 			};
+			const upgradeV2ToCollaboration = async (source, collaboration) => {
+				if (typeof upgradeToCollaboration !== "function") throw new Error("v2-editor: upgradeToCollaboration unavailable");
+				return upgradeToCollaboration(source, collaboration);
+			};
 			const focusV2Editable = (options = {}) => {
 				if (mount?.focus && typeof mount.focus.focus === "function") return mount.focus.focus(options);
 				return false;
@@ -21183,6 +21098,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				save: saveV2Bytes,
 				exportDocx: exportV2Docx,
 				replaceFile: replaceV2File,
+				upgradeToCollaboration: upgradeV2ToCollaboration,
 				doc: documentApi ?? null,
 				documentMutationReadiness: documentMutationReadiness ?? null,
 				documentApiUnavailableReason: documentApiUnavailableReason ?? null,
@@ -21196,10 +21112,10 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				pageFurniture: pageFurniture ?? null,
 				presence: presence ?? null,
 				lock: lock ?? null,
-				reviewHydration: {
-					getDiagnostics: () => v2ReviewHydrationController.getDiagnostics(),
-					getSnapshot: () => v2ReviewHydrationController.getSnapshot?.() ?? null,
-					subscribe: (listener) => v2ReviewHydrationController.subscribe?.(listener) ?? (() => void 0)
+				reviewWindow: {
+					getDiagnostics: () => v2ReviewWindowController.getDiagnostics(),
+					getSnapshot: () => v2ReviewWindowController.getSnapshot?.() ?? null,
+					subscribe: (listener) => v2ReviewWindowController.subscribe?.(listener) ?? (() => void 0)
 				},
 				extensions: createV2ExtensionsFacet(host),
 				fonts: fonts ?? host?.getFontRuntime?.() ?? null,
@@ -21242,24 +21158,12 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			const commentsModuleEnabled = proxy.$superdoc.config.modules?.comments !== false;
 			if (commentsAdapter && commentsModuleEnabled) commentsStore.setV2CommentsAdapter?.(commentsAdapter);
 			if (trackedChangesAdapter && commentsModuleEnabled) commentsStore.setV2TrackedChangesAdapter?.(trackedChangesAdapter);
-			if (commentsModuleEnabled && (commentsAdapter || trackedChangesAdapter)) {
-				v2ReviewHydrationController.setContext({
-					superdoc: proxy.$superdoc,
-					documentId,
-					commentsAdapter: commentsAdapter ?? null,
-					trackedChangesAdapter: trackedChangesAdapter ?? null
-				});
-				try {
-					const snapshot = host?.getRenderReadinessSnapshot?.();
-					if (snapshot) v2ReviewHydrationController.onRenderReadiness(snapshot);
-				} catch (err) {
-					console.warn("[SuperDoc][v2] initial render-readiness snapshot failed", err);
-				}
-			}
-			if (commentsModuleEnabled && trackedChangesAdapter) reconcileAuthoritativeV2TrackedChangeSidebar({
-				adapter: trackedChangesAdapter,
+			if (commentsAdapter || trackedChangesAdapter) v2ReviewWindowController.setContext({
+				superdoc: proxy.$superdoc,
 				documentId,
-				refreshReason: "startup-authoritative"
+				commentsAdapter: commentsAdapter ?? null,
+				trackedChangesAdapter: trackedChangesAdapter ?? null,
+				resolveReviewWindow: (input) => host.resolveReviewWindow(input)
 			});
 			if (areDocumentsReady.value && !proxy.$superdoc.config.collaboration) isReady.value = true;
 			isFloatingCommentsReady.value = true;
@@ -21527,12 +21431,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 					v2ReviewSidebarUnlocked.value = true;
 					v2GeometryEpoch.value = v2GeometryPublisher.getLastEpoch();
 				}
-			},
-			onCommittedPagePaint: (commit) => {
-				v2ReviewHydrationController.onCommittedPagePaint?.({
-					...commit,
-					documentId: commit?.payload?.documentId ?? null
-				});
 			}
 		});
 		const armV2TrackedChangeRestampGeometryRetention = (reason = "tracked-change-restamp") => {
@@ -21570,17 +21468,11 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			scheduleV2GeometryPublish(payload, () => takeV2TrackedChangeRestampGeometryRetention());
 			if (v2HasRangeSelection.value) scheduleV2SelectionToolbarStateSync();
 		};
-		const onV2RenderReadiness = (payload) => {
-			const snapshot = payload?.snapshot ?? payload ?? null;
-			if (!snapshot) return;
-			v2ReviewHydrationController.onRenderReadiness(snapshot);
-		};
 		const v2PageMetricsSnapshot = (0, vue.shallowRef)(null);
 		const v2MountStagesByDocumentId = /* @__PURE__ */ new Map();
 		let latestV2MountStage = null;
 		const onV2PageMetrics = (payload) => {
 			if (!payload?.snapshot) return;
-			v2ReviewMutationReconciler.onRender();
 			const snapshot = payload.snapshot;
 			const metricStage = payload.stage;
 			if (typeof HTMLElement !== "undefined" && metricStage instanceof HTMLElement) {
@@ -21620,8 +21512,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			commentsStore.cancelImportedTrackedChangeBootstrap?.(clearedDocumentId ?? void 0);
 			if (clearedDocumentId) v2MountStagesByDocumentId.delete(clearedDocumentId);
 			if (latestV2MountStage && (clearedDocumentId == null || latestV2MountStage.dataset?.superdocV2DocumentId === clearedDocumentId)) latestV2MountStage = null;
-			v2ReviewHydrationController.reset("render-cleared");
-			v2ReviewMutationReconciler.reset();
+			v2ReviewWindowController.reset("render-cleared");
 			commentsStore.setV2CommentsAdapter?.(null);
 			commentsStore.setV2TrackedChangesAdapter?.(null);
 			commentsStore.clearEditorCommentPositions?.();
@@ -21630,49 +21521,15 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			v2RulerHostStyle.value = {};
 			v2RulerReady.value = false;
 		};
-		const v2ReviewMutationReconciler = require_create_super_doc_ui.createV2ReviewMutationReconciler({
-			getContext: () => {
-				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
-				const adapter = activeEditor?.v2TrackedChanges ?? null;
-				if (!adapter) return null;
-				return {
-					superdoc: proxy.$superdoc,
-					adapter,
-					documentId: activeEditor.documentId ?? null
-				};
-			},
-			reconcile: (context, impact) => commentsStore.reconcileTrackedChangeMutationFromV2?.({
-				superdoc: context.superdoc,
-				adapter: context.adapter,
-				documentId: context.documentId,
-				...impact
-			}),
-			hydrate: (context, options) => commentsStore.hydrateTrackedChangesFromV2?.({
-				superdoc: context.superdoc,
-				adapter: context.adapter,
-				documentId: context.documentId,
-				...options
-			}),
-			onReconciled: (_context, ids) => v2GeometryPublisher.recollect({
-				retainMissingTrackedChangeGeometry: true,
-				retainedTrackedChangeIds: ids,
-				reason: "review-reconcile"
-			})
-		});
 		const onV2HostEvent = (document, event) => {
 			if (!event) return;
 			const documentId = document?.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);
+				v2ReviewWindowController.beginMutation(event.reviewMutation);
 				return;
 			}
 			if (event.type === "review-mutation:aborted") {
-				v2ReviewHydrationController.settleMutation(event.reviewMutation?.token, {
+				v2ReviewWindowController.settleMutation(event.reviewMutation?.token, {
 					outcome: "aborted",
 					resumeDomains: ["comments", "trackedChanges"],
 					trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
@@ -21684,7 +21541,10 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				return;
 			}
 			if (event.type === "collaboration:remote-changed") {
-				if (event.reviewChanged !== false) v2ReviewHydrationController.invalidate("collaboration:remote-review-changed");
+				if (event.reviewChanged !== false) {
+					v2ReviewWindowController.invalidate("collaboration:remote-review-changed");
+					v2ReviewWindowController.refreshCommittedWindow("collaboration:remote-review-changed");
+				}
 				return;
 			}
 			if (event.type === "source:complete") {
@@ -21696,7 +21556,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				return;
 			}
 			if (event.type === "mutation:rejected") {
-				if (event.reviewMutation?.token) v2ReviewHydrationController.settleMutation(event.reviewMutation.token, {
+				if (event.reviewMutation?.token) v2ReviewWindowController.settleMutation(event.reviewMutation.token, {
 					outcome: "rejected",
 					resumeDomains: ["comments", "trackedChanges"],
 					trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
@@ -21709,37 +21569,34 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				emitV2EditorUpdate();
 			}
 			if (event.type !== "mutation:committed") return;
-			if (event.reviewSidecarOnly === true) v2ReviewHydrationController.hydrateNow("review-sidecar-committed");
+			if (event.origin === "history") v2ReviewWindowController.refreshCommittedWindow(`history-${event.direction}`);
+			else if (event.reviewSidecarOnly === true) v2ReviewWindowController.refreshCommittedWindow("review-sidecar-committed");
 			const reviewImpact = require_create_super_doc_ui.getV2TrackedChangeMutationImpact(event);
 			if (Array.isArray(reviewImpact?.remappedPairs) && reviewImpact.remappedPairs.length > 0) commentsStore.remapTrackedChangeIdentities?.(reviewImpact.remappedPairs, { documentId });
 			if (reviewImpact) armV2TrackedChangeRestampGeometryRetention("tracked-change-mutation");
 			const activeEditor = proxy.$superdoc?.activeEditor ?? null;
-			const readiness = activeEditor?.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";
-			const reconciliation = v2ReviewMutationReconciler.enqueueAfterPaint(reviewImpact, canWaitForExactPaint ? () => readiness.whenPainted.call(readiness, receipt) : null);
+			const reconciliation = reviewImpact ? commentsStore.reconcileTrackedChangeMutationFromV2?.({
+				superdoc: proxy.$superdoc,
+				adapter: activeEditor?.v2TrackedChanges ?? null,
+				documentId,
+				...reviewImpact
+			}) : Promise.resolve({ ok: true });
 			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, {
+				const settleReviewMutation = (result) => {
+					const reconciledAllResolved = allResolved && result?.ok === true && result?.allResolved === true;
+					v2ReviewWindowController.settleMutation(reviewMutation.token, {
 						outcome: "committed",
 						allResolved: reconciledAllResolved,
 						resumeDomains: reconciledAllResolved ? ["comments"] : ["comments", "trackedChanges"],
 						trackedRowCount: commentsStore.getV2TrackedChangeRowCount?.(documentId) ?? null
 					});
-					if (!reconciledAllResolved) reconcileAuthoritativeV2TrackedChangeSidebar({
-						adapter: activeEditor?.v2TrackedChanges ?? null,
-						documentId,
-						refreshReason: "mutation-authoritative"
-					});
 				};
-				Promise.resolve(reconciliation).then(settleReviewMutation, () => settleReviewMutation(false));
+				Promise.resolve(reconciliation).then(settleReviewMutation, () => settleReviewMutation(null));
 				return;
 			}
-			if (reviewImpact?.reconcileMode === "authoritative" && reviewImpact.upsertIds.size > 0) return;
-			if (reviewImpact?.removedIds.size > 0 && reviewImpact.upsertIds.size === 0) return;
+			Promise.resolve(reconciliation).catch(() => void 0);
 		};
 		const onV2LinkClick = (payload) => {
 			linkPopover.handleLinkClick(payload);
@@ -21760,9 +21617,9 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		const handleV2DocumentModeChange = () => {
 			if (!isV2Mode.value) return;
 			try {
-				v2ReviewHydrationController.hydrateNow("document-mode-change");
+				v2ReviewWindowController.refreshCommittedWindow("document-mode-change");
 			} catch (err) {
-				console.warn("[SuperDoc][v2] document-mode-change rehydrate failed", err);
+				console.warn("[SuperDoc][v2] document-mode review-window refresh failed", err);
 			}
 			const republishGeometry = () => {
 				if (!isV2Mode.value) return;
@@ -21904,19 +21761,14 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				onCommentsUpdate: onEditorCommentsUpdate,
 				onFontsResolved: onFontsResolvedFn,
 				onPageCountKnown: proxy.$superdoc.config.onPageCountKnown ?? null,
-				onReviewWindowPlanned: (payload) => {
-					v2ReviewHydrationController.onReviewWindowPlanned?.({
-						...payload,
-						documentId: doc.id
-					});
-				},
 				onReviewWindowCommitted: (payload) => {
-					v2ReviewHydrationController.onCommittedPagePaint?.({
+					v2ReviewWindowController.onCommittedPagePaint?.({
 						...payload,
 						documentId: doc.id
 					});
 				},
 				fontAssets: proxy.$superdoc.config.fonts,
+				workerUrls: proxy.$superdoc.config.workerUrls,
 				proofing: resolvedProofingConfig.value,
 				isNewFile,
 				password: getDocumentLoadPassword(doc),
@@ -22845,7 +22697,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 								onV2EditorFailed,
 								onV2Render,
 								onV2RenderCleared,
-								onV2RenderReadiness,
 								onV2SelectionChanged,
 								onV2HostEvent: (event) => onV2HostEvent(doc, event),
 								onV2LinkClick,
@@ -22913,7 +22764,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 38);
 		};
 	}
-}, [["__scopeId", "data-v-6833a014"]]);
+}, [["__scopeId", "data-v-7770edae"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -43417,7 +43268,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.21";
+		this.version = "2.4.0-next.22";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];
@@ -43834,44 +43685,34 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		user.color = palette[Math.abs(hash) % palette.length];
 	}
 	/**
-	* Upgrade a local SuperDoc instance into collaboration by overwriting
-	* the supplied room with the current local document and comment state,
-	* then attaching collaboration to the live editor instance in place.
+	* Upgrade a local SuperDoc instance into collaboration by creating the
+	* supplied room from the current local document and comment state, then
+	* attaching collaboration to the live editor instance in place.
 	*
-	* This is a **destructive promotion**: the target room is authoritatively
-	* overwritten with the caller's current local state. It is NOT the API
-	* for joining an existing room without changing its content.
+	* The target room must not already exist. This is not the API for joining
+	* an existing room or merging its content.
 	*
 	* Currently limited to:
 	* - A single DOCX document
 	* - A supported v2 single-doc `v2Collaboration` target
-	* - Overwrite-and-upgrade only (no merge semantics)
+	* - Create-and-upgrade only (no merge semantics)
 	*
 	* @returns Resolves once the collaborative runtime is ready
 	*/
 	async upgradeToCollaboration(options) {
-		const { target, mountedDocumentId } = this.#validateUpgradePrerequisites(options);
+		const { target } = this.#validateUpgradePrerequisites(options);
 		this.#isUpgrading = true;
 		try {
 			const localSource = await this.#captureCurrentDocxSourceForUpgrade();
 			const rollback = this.#snapshotV2UpgradeState();
 			const lockSeed = this.#snapshotV2LockSeed();
 			this.#assertNotDestroyed();
-			let ready = null;
 			try {
 				this.#pendingV2LockSeed = lockSeed;
-				ready = this.#waitForV2CollaborationReady(mountedDocumentId);
-				const promotion = this.#promoteSingleDocumentToV2Collaboration(target, localSource);
-				await ready;
+				const promotion = await this.#promoteSingleDocumentToV2Collaboration(target, localSource);
 				this.#finalizeSingleDocumentV2Collaboration(promotion, target);
 				this.#pendingV2LockSeed = null;
 			} catch (err) {
-				if (ready && this.#abortUpgrade) {
-					const abortUpgrade = this.#abortUpgrade;
-					this.#abortUpgrade = null;
-					abortUpgrade();
-					await ready.catch(() => void 0);
-				}
 				this.#rollbackV2UpgradeState(rollback);
 				throw err;
 			}
@@ -43908,7 +43749,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		if (rollback.storeDoc) {
 			rollback.storeDoc.data = rollback.storeData;
 			this.#writeStoreDocV2Collaboration(rollback.storeDoc, rollback.storeV2Collaboration);
-			this.#bumpStoreDocumentMountNonce(rollback.storeDoc);
 		}
 	}
 	/**
@@ -43990,15 +43830,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		storeDoc.v2Collaboration = value;
 	}
-	#bumpStoreDocumentMountNonce(storeDoc) {
-		const nonce = (0, vue.toRaw)(storeDoc).editorMountNonce;
-		if (nonce && typeof nonce === "object" && "value" in nonce && typeof nonce.value === "number") {
-			nonce.value += 1;
-			return;
-		}
-		const writable = storeDoc;
-		writable.editorMountNonce = (typeof writable.editorMountNonce === "number" ? writable.editorMountNonce : 0) + 1;
-	}
 	#toV2CollaborationConfig(target) {
 		if (target.providerFamily === "liveblocks") return {
 			providerType: "liveblocks",
@@ -44023,21 +43854,22 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			...target.params ? { params: target.params } : {}
 		};
 	}
-	#promoteSingleDocumentToV2Collaboration(target, localSource) {
+	async #promoteSingleDocumentToV2Collaboration(target, localSource) {
 		const configDoc = this.config.documents.find((d) => d.type === DOCX);
 		const storeDoc = this.#requireSuperdocStore("upgradeToCollaboration").documents.find((d) => d.id === configDoc.id);
 		if (!storeDoc) throw new Error("SuperDoc: source document store entry is not available for upgrade");
+		const editor = storeDoc.getEditor?.();
+		if (!isV2ActiveEditorFacade(editor) || typeof editor.upgradeToCollaboration !== "function") throw new Error("SuperDoc: live v2 editor cannot attach collaboration in place");
 		const v2Collaboration = this.#toV2CollaborationConfig({
 			...target,
 			roomMode: "create"
 		});
-		configDoc.data = localSource;
 		configDoc.v2Collaboration = v2Collaboration;
-		storeDoc.data = localSource;
 		this.#writeStoreDocV2Collaboration(storeDoc, v2Collaboration);
 		this.isCollaborative = true;
-		this.readyEditors = 0;
-		this.#bumpStoreDocumentMountNonce(storeDoc);
+		await editor.upgradeToCollaboration(localSource, v2Collaboration);
+		configDoc.data = localSource;
+		storeDoc.data = localSource;
 		return {
 			configDoc,
 			storeDoc
@@ -44153,35 +43985,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			}
 		});
 	}
-	#waitForV2CollaborationReady(mountedDocumentId) {
-		const TIMEOUT_MS = 2e4;
-		return new Promise((resolve, reject) => {
-			let settled = false;
-			const cleanup = () => {
-				if (settled) return;
-				settled = true;
-				clearTimeout(timer);
-				this.off("collaboration-ready", onReady);
-			};
-			const onReady = (payload) => {
-				const editor = payload?.editor;
-				if (!isV2ActiveEditorFacade(editor)) return;
-				if (getActiveEditorDocumentId(editor) !== mountedDocumentId) return;
-				if (!editor.presence && !editor.lock) return;
-				cleanup();
-				resolve();
-			};
-			const timer = setTimeout(() => {
-				cleanup();
-				reject(/* @__PURE__ */ new Error(`SuperDoc: v2 collaboration runtime did not become ready within ${TIMEOUT_MS} ms for mounted document "${mountedDocumentId}".`));
-			}, TIMEOUT_MS);
-			this.on("collaboration-ready", onReady);
-			this.#abortUpgrade = () => {
-				cleanup();
-				reject(/* @__PURE__ */ new Error("SuperDoc: instance was destroyed during upgrade"));
-			};
-		});
-	}
 	/**
 	* Wait for the provider to report synced, with a timeout.
 	*
@@ -44249,10 +44052,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			...typeof window !== "undefined" ? { authEndpointBaseUrl: window.location.href } : {}
 		});
 		if (!resolution.ok) throw new Error(`SuperDoc: upgradeToCollaboration() ${resolution.reason}: ${resolution.message}`);
-		return {
-			target: resolution.target,
-			mountedDocumentId
-		};
+		return { target: resolution.target };
 	}
 	#unwrapMaybeRef(value) {
 		if (value && typeof value === "object" && "value" in value) return value.value;
@@ -44836,6 +44636,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 	*/
 	addCommentsList(element) {
 		if (!this.config?.modules?.comments || this.config.role === "viewer") return;
+		this.commentsList?.close();
 		if (element) this.config.modules.comments.element = element;
 		this.commentsList = new SuperComments(this.config.modules?.comments, this);
 		if (this.config.onCommentsListChange) this.config.onCommentsListChange({ isRendered: true });
@@ -45555,6 +45356,8 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		if (this.#surfaceManager) this.#surfaceManager.destroy();
 		this.toolbar?.destroy?.();
+		this.commentsList?.close();
+		this.commentsList = null;
 		if (this.app) {
 			this.#log("[superdoc] Unmounting app");
 			this.superdocStore?.reset();