superdoc 2.4.0-next.16 → 2.4.0-next.17

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-CTe12b19.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-CPuOlTWb.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");
@@ -7762,6 +7762,7 @@ var useCommentsStore = defineStore("comments", () => {
 		syncResolvedCommentsWithDocument();
 	});
 	(0, vue.watch)(commentsList, () => {
+		canonicalizeActiveCommentAlias();
 		syncResolvedCommentsWithDocument();
 	}, { deep: false });
 	/**
@@ -8614,7 +8615,8 @@ var useCommentsStore = defineStore("comments", () => {
 			superdoc,
 			adapter,
 			documentId: adapter.documentId ?? fileId,
-			items: outcome.items ?? []
+			items: outcome.items ?? [],
+			pruneStale: outcome.complete !== false
 		});
 		const successEvent = successEventBuilder?.({
 			outcome,
@@ -9020,7 +9022,7 @@ var useCommentsStore = defineStore("comments", () => {
 			trackedItems: preparedParams.length
 		};
 	});
-	const hydrateCommentsFromV2 = async ({ superdoc, adapter, documentId, trackedChangesListMode = "all", isCurrent, signal, hydrationGeneration } = {}) => withInteractionSpan("store.comments.hydrateFromV2", "comments-list", { documentId: documentId ?? null }, async () => {
+	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;
@@ -9042,6 +9044,7 @@ var useCommentsStore = defineStore("comments", () => {
 		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);
@@ -9072,7 +9075,7 @@ var useCommentsStore = defineStore("comments", () => {
 			adapter: effectiveAdapter,
 			documentId,
 			items: result.items ?? [],
-			pruneStale: !visibleWindow,
+			pruneStale: !visibleWindow || Array.isArray(commentIds) && (!Array.isArray(result.unresolvedIds) || result.unresolvedIds.length === 0),
 			hydrationGeneration
 		});
 		return {
@@ -9305,6 +9308,27 @@ 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.
 	*
@@ -9342,6 +9366,12 @@ var useCommentsStore = defineStore("comments", () => {
 			editor,
 			structuralChanges: captured.structuralChanges
 		});
+		reconcileAuthoritativeV2TrackedChangeSidebar({
+			superdoc,
+			editor,
+			documentId: editor?.options?.documentId,
+			refreshReason: "import-bootstrap-authoritative"
+		});
 		return true;
 	};
 	const isCurrentImportedTrackedChangeBootstrap = (task) => {
@@ -10327,7 +10357,8 @@ var useCommentsStore = defineStore("comments", () => {
 			lateResultDropped: true
 		};
 		if (!result?.ok) return result;
-		const pruneStale = !(trackedChangesListMode === "startup-page" || trackedChangesListMode === "interaction-prime" || trackedChangesListMode === "visible-window") && result.visibleWindowSource == null && result.complete === true && result.sourceCoverageComplete === true;
+		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",
@@ -10731,6 +10762,12 @@ 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 /
@@ -11201,6 +11238,16 @@ var useCommentsStore = defineStore("comments", () => {
 	const syncActiveFloatingInstanceWithComment = (commentId) => {
 		if (!doesFloatingInstanceBelongToComment(activeFloatingCommentInstanceId.value, commentId)) setActiveFloatingCommentInstance(null);
 	};
+	function canonicalizeActiveCommentAlias() {
+		const activeId = normalizeCommentId(activeComment.value);
+		if (!activeId) return false;
+		const comment = getComment(activeId);
+		const canonicalId = normalizeCommentId(comment?.commentId);
+		if (!canonicalId || canonicalId === activeId) return false;
+		activeComment.value = canonicalId;
+		syncActiveFloatingInstanceWithComment(canonicalId);
+		return true;
+	}
 	const setViewingVisibility = ({ documentMode, commentsVisible, trackChangesVisible } = {}) => {
 		if (typeof documentMode === "string") viewingVisibility.documentMode = documentMode;
 		if (typeof commentsVisible === "boolean") viewingVisibility.commentsVisible = commentsVisible;
@@ -13904,6 +13951,12 @@ var _sfc_main$30 = {
 	setup(__props) {
 		const ESTIMATED_HEIGHT = 110;
 		const OBSERVER_MARGIN = 600;
+		const SCROLL_OWNER_OVERFLOW_VALUES = /* @__PURE__ */ new Set([
+			"auto",
+			"scroll",
+			"hidden",
+			"clip"
+		]);
 		const resolveCollisions = (positions, activeIndex, gap) => {
 			if (activeIndex >= 0) {
 				positions[activeIndex].top = positions[activeIndex].anchorTop;
@@ -14308,6 +14361,8 @@ var _sfc_main$30 = {
 		let activeLayoutContinuityFrame = null;
 		let directDecisionContinuity = null;
 		let directDecisionSourceId = null;
+		let ownerScrollContinuityResetFrame = null;
+		const ownerScrollTargets = /* @__PURE__ */ new Set();
 		const releaseDirectDecisionContinuity = () => {
 			directDecisionContinuity = null;
 			directDecisionSourceId = null;
@@ -14371,6 +14426,36 @@ var _sfc_main$30 = {
 			}
 			setInstantLayoutTransitionsDisabled(false);
 		};
+		const releaseDecisionContinuityForOwnerScroll = () => {
+			if (!directDecisionContinuity && !sidebarContinuityAnchor) return;
+			releaseDirectDecisionContinuity();
+			clearSidebarContinuityAnchor();
+			setInstantLayoutTransitionsDisabled(true);
+			sidebarOffsetY.value = 0;
+			if (ownerScrollContinuityResetFrame != null) cancelAnimationFrame(ownerScrollContinuityResetFrame);
+			ownerScrollContinuityResetFrame = requestAnimationFrame(() => {
+				ownerScrollContinuityResetFrame = null;
+				if (!directDecisionContinuity && !sidebarContinuityAnchor) setInstantLayoutTransitionsDisabled(false);
+			});
+		};
+		const handleOwnerScroll = () => {
+			releaseDecisionContinuityForOwnerScroll();
+			refreshViewportWindow();
+		};
+		const registerOwnerScrollListeners = () => {
+			const addTarget = (target) => {
+				if (!target?.addEventListener || ownerScrollTargets.has(target)) return;
+				target.addEventListener("scroll", handleOwnerScroll, { passive: true });
+				ownerScrollTargets.add(target);
+			};
+			addTarget(props.parent);
+			for (let ancestor = floatingCommentsContainer.value?.parentElement; ancestor; ancestor = ancestor.parentElement) if (SCROLL_OWNER_OVERFLOW_VALUES.has(window.getComputedStyle(ancestor).overflowY)) addTarget(ancestor);
+			addTarget(window);
+		};
+		const unregisterOwnerScrollListeners = () => {
+			for (const target of ownerScrollTargets) target.removeEventListener?.("scroll", handleOwnerScroll);
+			ownerScrollTargets.clear();
+		};
 		const scheduleSidebarContinuityAlignment = () => {
 			if (!sidebarContinuityAnchor || continuityAlignmentScheduled) return;
 			continuityAlignmentScheduled = true;
@@ -14623,7 +14708,7 @@ var _sfc_main$30 = {
 		});
 		(0, vue.onMounted)(() => {
 			setupObserver();
-			props.parent?.addEventListener?.("scroll", refreshViewportWindow, { passive: true });
+			registerOwnerScrollListeners();
 			window.addEventListener("resize", refreshViewportWindow, { passive: true });
 			document.addEventListener("pointerdown", releaseDirectDecisionContinuityForUnrelatedPointer, true);
 			(0, vue.nextTick)(observePlaceholders);
@@ -14637,7 +14722,11 @@ var _sfc_main$30 = {
 				cancelAnimationFrame(activeLayoutContinuityFrame);
 				activeLayoutContinuityFrame = null;
 			}
-			props.parent?.removeEventListener?.("scroll", refreshViewportWindow);
+			if (ownerScrollContinuityResetFrame != null) {
+				cancelAnimationFrame(ownerScrollContinuityResetFrame);
+				ownerScrollContinuityResetFrame = null;
+			}
+			unregisterOwnerScrollListeners();
 			window.removeEventListener("resize", refreshViewportWindow);
 			document.removeEventListener("pointerdown", releaseDirectDecisionContinuityForUnrelatedPointer, true);
 			if (viewportFrame != null) {
@@ -14706,7 +14795,7 @@ var _sfc_main$30 = {
 		};
 	}
 };
-var FloatingComments_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$30, [["__scopeId", "data-v-a0a841ce"]]);
+var FloatingComments_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$30, [["__scopeId", "data-v-d8d03209"]]);
 //#endregion
 //#region src/components/CommentsLayer/PdfCommentsLayer.vue
 var _hoisted_1$22 = {
@@ -15387,6 +15476,19 @@ var VALID_COMMENTS_DISPLAY_MODES = /* @__PURE__ */ new Set([
 	"inline"
 ]);
 /**
+* Whether a context-menu event landed inside the tracked-change carrier that
+* is already visually active. The review visual owner maintains this marker,
+* so the right-click path can stay synchronous and avoid a catalog lookup or
+* document-wide DOM query.
+*
+* @param {EventTarget | null} target
+* @returns {boolean}
+*/
+function isActiveTrackedChangeContextMenuTarget(target) {
+	const element = target;
+	return typeof element?.closest === "function" && element.closest(".track-change-focused") != null;
+}
+/**
 * Normalize adaptive comments UI policy fields.
 *
 * @param {false | Record<string, unknown> | undefined} commentsConfig
@@ -15822,74 +15924,6 @@ function resolveV2ReviewTargetCommentId(target, getComment) {
 	return commentId != null ? String(commentId) : null;
 }
 //#endregion
-//#region src/helpers/v2-remote-review-hydration.js
-function normalizeDocumentId(value) {
-	return value == null ? null : String(value);
-}
-function createV2RemoteReviewHydrationScheduler({ hydrate, getActiveDocumentId, debounceMs = 250, ceilingMs = 1e3, now = () => Date.now(), setTimer = (callback, delay) => setTimeout(callback, delay), clearTimer = (timer) => clearTimeout(timer) }) {
-	let timer = null;
-	let heldSinceMs = null;
-	let pendingDocumentId = null;
-	const matchesActiveDocument = (documentId) => {
-		return normalizeDocumentId(getActiveDocumentId()) === documentId;
-	};
-	const clear = () => {
-		if (timer != null) clearTimer(timer);
-		timer = null;
-		heldSinceMs = null;
-		pendingDocumentId = null;
-	};
-	const schedule = (documentId) => {
-		const normalizedDocumentId = normalizeDocumentId(documentId);
-		if (!matchesActiveDocument(normalizedDocumentId)) return false;
-		if (pendingDocumentId !== normalizedDocumentId) clear();
-		const scheduledAtMs = now();
-		pendingDocumentId = normalizedDocumentId;
-		heldSinceMs ??= scheduledAtMs;
-		if (timer != null) clearTimer(timer);
-		const ceilingRemainingMs = Math.max(0, ceilingMs - (scheduledAtMs - heldSinceMs));
-		timer = setTimer(() => {
-			const deliveredDocumentId = pendingDocumentId;
-			timer = null;
-			heldSinceMs = null;
-			pendingDocumentId = null;
-			if (matchesActiveDocument(deliveredDocumentId)) hydrate();
-		}, Math.min(debounceMs, ceilingRemainingMs));
-		return true;
-	};
-	return {
-		schedule,
-		clear
-	};
-}
-//#endregion
-//#region src/helpers/v2-typing-review-hydration.js
-/**
-* Coalesce automatic review-catalog reconciliation behind a genuine typing
-* quiet period. Every typing signal restarts the trailing timer; there is no
-* maximum-wait escape hatch because that would deliberately run the expensive
-* catalog reads in the middle of a sustained input burst.
-*/
-function createV2TypingReviewHydrationScheduler({ hydrate, idleMs = 6500, setTimer = (callback, delay) => setTimeout(callback, delay), clearTimer = (timer) => clearTimeout(timer) }) {
-	let timer = null;
-	const clear = () => {
-		if (timer != null) clearTimer(timer);
-		timer = null;
-	};
-	const schedule = () => {
-		clear();
-		timer = setTimer(() => {
-			timer = null;
-			hydrate();
-		}, idleMs);
-	};
-	return {
-		schedule,
-		clear,
-		isPending: () => timer != null
-	};
-}
-//#endregion
 //#region src/helpers/v2-author-required-rejection.js
 var NO_AUTHOR_SIGNAL = "no-author-configured";
 /** Stable, non-terminal exception code surfaced to consumers. */
@@ -20351,9 +20385,9 @@ var _hoisted_1$16 = {
 var _hoisted_2$13 = ["innerHTML"];
 var _hoisted_3$10 = { class: "superdoc__document document" };
 var _hoisted_4$7 = { class: "floating-comments" };
+var TRACKED_CHANGE_CARRIERS_RESTAMPED_EVENT = "superdoc:v2-tracked-change-carriers-restamped";
 var UNAVAILABLE_COMMAND_RESULT = false;
 var V2_SELECTION_TOOLBAR_SYNC_RETRY_FRAMES = 3;
-var V2_TYPING_REVIEW_HYDRATION_IDLE_MS = 6500;
 var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default({
 	__name: "SuperDoc",
 	emits: ["selection-update"],
@@ -20516,6 +20550,27 @@ 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)(() => {
@@ -21059,7 +21114,11 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				pageFurniture: pageFurniture ?? null,
 				presence: presence ?? null,
 				lock: lock ?? null,
-				reviewHydration: { getDiagnostics: () => v2ReviewHydrationController.getDiagnostics() },
+				reviewHydration: {
+					getDiagnostics: () => v2ReviewHydrationController.getDiagnostics(),
+					getSnapshot: () => v2ReviewHydrationController.getSnapshot?.() ?? null,
+					subscribe: (listener) => v2ReviewHydrationController.subscribe?.(listener) ?? (() => void 0)
+				},
 				extensions: createV2ExtensionsFacet(host),
 				fonts: fonts ?? host?.getFontRuntime?.() ?? null,
 				/**
@@ -21115,6 +21174,11 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 					console.warn("[SuperDoc][v2] initial render-readiness snapshot failed", err);
 				}
 			}
+			if (commentsModuleEnabled && trackedChangesAdapter) reconcileAuthoritativeV2TrackedChangeSidebar({
+				adapter: trackedChangesAdapter,
+				documentId,
+				refreshReason: "startup-authoritative"
+			});
 			if (areDocumentsReady.value && !proxy.$superdoc.config.collaboration) isReady.value = true;
 			isFloatingCommentsReady.value = true;
 			hasInitializedLocations.value = true;
@@ -21383,7 +21447,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				}
 			},
 			onCommittedPagePaint: (commit) => {
-				if (commit?.routeLane === "canonical.typing-mutation" || v2TypingReviewHydrationScheduler.isPending()) return;
 				v2ReviewHydrationController.onCommittedPagePaint?.({
 					...commit,
 					documentId: commit?.payload?.documentId ?? null
@@ -21428,7 +21491,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		const onV2RenderReadiness = (payload) => {
 			const snapshot = payload?.snapshot ?? payload ?? null;
 			if (!snapshot) return;
-			if (v2TypingReviewHydrationScheduler.isPending()) return;
 			v2ReviewHydrationController.onRenderReadiness(snapshot);
 		};
 		const v2PageMetricsSnapshot = (0, vue.shallowRef)(null);
@@ -21478,8 +21540,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			if (latestV2MountStage && (clearedDocumentId == null || latestV2MountStage.dataset?.superdocV2DocumentId === clearedDocumentId)) latestV2MountStage = null;
 			v2ReviewHydrationController.reset("render-cleared");
 			v2ReviewMutationReconciler.reset();
-			clearV2TypingReviewHydrationTimer();
-			v2RemoteReviewHydrationScheduler.clear();
 			commentsStore.setV2CommentsAdapter?.(null);
 			commentsStore.setV2TrackedChangesAdapter?.(null);
 			commentsStore.clearEditorCommentPositions?.();
@@ -21488,26 +21548,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			v2RulerHostStyle.value = {};
 			v2RulerReady.value = false;
 		};
-		const hydrateV2CommentRowsFromHost = () => {
-			const commentsAdapter = proxy.$superdoc?.activeEditor?.v2Comments ?? null;
-			if (!commentsAdapter) return;
-			commentsStore.hydrateCommentsFromV2?.({
-				superdoc: proxy.$superdoc,
-				adapter: commentsAdapter,
-				documentId: proxy.$superdoc?.activeEditor?.documentId ?? null
-			});
-		};
-		const hydrateV2ReviewRowsFromHost = (options = {}) => {
-			hydrateV2CommentRowsFromHost();
-			const trackedChangesAdapter = proxy.$superdoc?.activeEditor?.v2TrackedChanges ?? null;
-			if (!trackedChangesAdapter) return;
-			commentsStore.hydrateTrackedChangesFromV2?.({
-				superdoc: proxy.$superdoc,
-				adapter: trackedChangesAdapter,
-				documentId: proxy.$superdoc?.activeEditor?.documentId ?? null,
-				...options
-			});
-		};
 		const v2ReviewMutationReconciler = require_create_super_doc_ui.createV2ReviewMutationReconciler({
 			getContext: () => {
 				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
@@ -21537,31 +21577,10 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				reason: "review-reconcile"
 			})
 		});
-		const v2TypingReviewHydrationScheduler = createV2TypingReviewHydrationScheduler({
-			idleMs: V2_TYPING_REVIEW_HYDRATION_IDLE_MS,
-			hydrate: () => v2ReviewHydrationController.reconcileInBackground?.("typing-idle")
-		});
-		const clearV2TypingReviewHydrationTimer = () => {
-			v2TypingReviewHydrationScheduler.clear();
-		};
-		const scheduleV2TypingReviewHydration = () => {
-			v2TypingReviewHydrationScheduler.schedule();
-		};
-		const v2RemoteReviewHydrationScheduler = createV2RemoteReviewHydrationScheduler({
-			hydrate: () => {
-				if (v2TypingReviewHydrationScheduler.isPending()) return false;
-				return v2ReviewHydrationController.reconcileInBackground?.("remote-review-change");
-			},
-			getActiveDocumentId: () => {
-				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
-				return activeEditor?.documentId ?? activeEditor?.options?.documentId ?? null;
-			}
-		});
 		const onV2HostEvent = (document, event) => {
 			if (!event) return;
 			const documentId = document?.id ?? null;
 			if (event.type === "review-mutation:started") {
-				clearV2TypingReviewHydrationTimer();
 				const activeEditor = proxy.$superdoc?.activeEditor ?? null;
 				commentsStore.supersedeV2ReviewHydration?.({
 					commentsAdapter: activeEditor?.v2Comments ?? null,
@@ -21583,8 +21602,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				return;
 			}
 			if (event.type === "collaboration:remote-changed") {
-				v2ReviewHydrationController.invalidate("collaboration:remote-changed");
-				v2RemoteReviewHydrationScheduler.schedule(documentId);
+				if (event.reviewChanged !== false) v2ReviewHydrationController.invalidate("collaboration:remote-review-changed");
 				return;
 			}
 			if (event.type === "source:complete") {
@@ -21609,11 +21627,12 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				emitV2EditorUpdate();
 			}
 			if (event.type !== "mutation:committed") return;
-			v2ReviewHydrationController.invalidate("mutation-committed");
+			if (event.reviewSidecarOnly === true) v2ReviewHydrationController.hydrateNow("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 readiness = (proxy.$superdoc?.activeEditor ?? null)?.documentMutationReadiness ?? null;
+			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);
@@ -21628,43 +21647,37 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 						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));
 				return;
 			}
-			const isTypingMutation = require_create_super_doc_ui.isV2EditableTextMutationEvent(event);
-			if (!isTypingMutation) clearV2TypingReviewHydrationTimer();
-			if (reviewImpact?.reconcileMode === "authoritative" && reviewImpact.upsertIds.size > 0) {
-				hydrateV2CommentRowsFromHost();
-				return;
-			}
-			if (isTypingMutation) {
-				scheduleV2TypingReviewHydration();
-				return;
-			}
+			if (reviewImpact?.reconcileMode === "authoritative" && reviewImpact.upsertIds.size > 0) return;
 			if (reviewImpact?.removedIds.size > 0 && reviewImpact.upsertIds.size === 0) return;
-			hydrateV2ReviewRowsFromHost();
 		};
 		const onV2LinkClick = (payload) => {
 			linkPopover.handleLinkClick(payload);
 		};
-		const recollectV2GeometryIfActive = () => {
+		const recollectV2GeometryIfActive = (options = void 0) => {
 			if (!isV2Mode.value) return;
 			if (!v2GeometryPublisher.getLastPayload()) return;
 			if (v2GeometryRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryRafHandle);
 			if (typeof requestAnimationFrame !== "function") {
-				v2GeometryPublisher.recollect();
+				v2GeometryPublisher.recollect(resolveV2GeometryPublishOptions(options));
 				return;
 			}
 			v2GeometryRafHandle = requestAnimationFrame(() => {
 				v2GeometryRafHandle = 0;
-				v2GeometryPublisher.recollect();
+				v2GeometryPublisher.recollect(resolveV2GeometryPublishOptions(options));
 			});
 		};
 		const handleV2DocumentModeChange = () => {
 			if (!isV2Mode.value) return;
 			try {
-				clearV2TypingReviewHydrationTimer();
 				v2ReviewHydrationController.hydrateNow("document-mode-change");
 			} catch (err) {
 				console.warn("[SuperDoc][v2] document-mode-change rehydrate failed", err);
@@ -21683,22 +21696,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				else republishGeometry();
 			});
 		};
-		let v2BuiltInReviewSurfaceOpen = false;
-		let v2ExternalReviewSurfaceOpen = false;
-		const syncV2ReviewCatalogDemand = () => {
-			if (!isV2Mode.value) return;
-			if (!v2BuiltInReviewSurfaceOpen && !v2ExternalReviewSurfaceOpen) {
-				v2ReviewHydrationController.releaseCatalogDemand();
-				return;
-			}
-			clearV2TypingReviewHydrationTimer();
-			v2ReviewHydrationController.demandCatalog("review-sidebar-visible");
-		};
-		const handleV2CommentsListChange = ({ isRendered } = {}) => {
-			v2ExternalReviewSurfaceOpen = isRendered === true;
-			syncV2ReviewCatalogDemand();
-		};
-		proxy.$superdoc?.on?.("comments-list-change", handleV2CommentsListChange);
 		const getV2EditorFailureMessage = (reason) => {
 			switch (reason) {
 				case "editing-mount-required": return "SuperDoc could not load the document editor because the page did not provide a mount container.";
@@ -21773,7 +21770,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			if (!root) return;
 			if (!(event.target instanceof Node) || !root.contains(event.target)) return;
 			if (layers.value?.contains(event.target)) {
-				commentsStore.setActiveComment(proxy.$superdoc, null);
+				if (!isActiveTrackedChangeContextMenuTarget(event.target)) commentsStore.setActiveComment(proxy.$superdoc, null);
 				commentsStore.removePendingComment(proxy.$superdoc);
 				resetClickAnchor();
 			}
@@ -21826,16 +21823,17 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				onFontsResolved: onFontsResolvedFn,
 				onPageCountKnown: proxy.$superdoc.config.onPageCountKnown ?? null,
 				onReviewWindowPlanned: (payload) => {
-					if (payload?.routeLane === "canonical.typing-mutation") {
-						v2TypingReviewHydrationScheduler.schedule();
-						return;
-					}
-					if (v2TypingReviewHydrationScheduler.isPending()) return;
 					v2ReviewHydrationController.onReviewWindowPlanned?.({
 						...payload,
 						documentId: doc.id
 					});
 				},
+				onReviewWindowCommitted: (payload) => {
+					v2ReviewHydrationController.onCommittedPagePaint?.({
+						...payload,
+						documentId: doc.id
+					});
+				},
 				fontAssets: proxy.$superdoc.config.fonts,
 				proofing: resolvedProofingConfig.value,
 				isNewFile,
@@ -22163,8 +22161,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		});
 		(0, vue.watch)(showCommentsSidebar, (value) => {
 			proxy.$superdoc.broadcastSidebarToggle(value);
-			v2BuiltInReviewSurfaceOpen = value === true;
-			syncV2ReviewCatalogDemand();
 		});
 		useViewportFit({
 			getSuperdoc: () => proxy.$superdoc,
@@ -22189,6 +22185,16 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		const handleViewportScrollOrResize = () => {
 			recollectV2GeometryIfActive();
 		};
+		const handleV2TrackedChangeCarriersRestamped = (event) => {
+			if (!isV2Mode.value) return;
+			const itemIds = Array.isArray(event?.detail?.itemIds) ? event.detail.itemIds.map((id) => id == null ? "" : String(id)).filter(Boolean) : [];
+			armV2TrackedChangeRestampGeometryRetention(event?.detail?.refreshReason ?? "tracked-change-restamp");
+			recollectV2GeometryIfActive({
+				retainMissingTrackedChangeGeometry: true,
+				...itemIds.length > 0 ? { retainedTrackedChangeIds: itemIds } : {},
+				reason: "tracked-change-restamp"
+			});
+		};
 		(0, vue.onMounted)(() => {
 			document.addEventListener("contextmenu", handleDocumentContextMenu, true);
 			document.addEventListener("keydown", handleDocumentShortcut, true);
@@ -22196,6 +22202,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			claimFindShortcut(findShortcutOwner);
 			superdocRoot.value?.addEventListener("pointerdown", handleFindOwnershipInteraction, true);
 			superdocRoot.value?.addEventListener("focusin", handleFindOwnershipInteraction, true);
+			superdocRoot.value?.addEventListener(TRACKED_CHANGE_CARRIERS_RESTAMPED_EVENT, handleV2TrackedChangeCarriersRestamped);
 			if (typeof window !== "undefined") {
 				window.addEventListener("scroll", handleViewportScrollOrResize, true);
 				window.addEventListener("resize", handleViewportScrollOrResize, true);
@@ -22312,6 +22319,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			proxy.$superdoc?.off?.("search:open", handleOpenFindRequest);
 			superdocRoot.value?.removeEventListener("pointerdown", handleFindOwnershipInteraction, true);
 			superdocRoot.value?.removeEventListener("focusin", handleFindOwnershipInteraction, true);
+			superdocRoot.value?.removeEventListener(TRACKED_CHANGE_CARRIERS_RESTAMPED_EVENT, handleV2TrackedChangeCarriersRestamped);
 			releaseFindShortcut(findShortcutOwner);
 			if (typeof window !== "undefined") {
 				window.removeEventListener("scroll", handleViewportScrollOrResize, true);
@@ -22321,8 +22329,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				cancelAnimationFrame(v2GeometryRafHandle);
 				v2GeometryRafHandle = 0;
 			}
-			clearV2TypingReviewHydrationTimer();
-			v2RemoteReviewHydrationScheduler.clear();
 			document.removeEventListener("focusin", handleRuntimeFocusIn, true);
 			document.removeEventListener("pointerdown", handleRuntimePointerDown, true);
 			document.removeEventListener("mousedown", handleRuntimeMouseDown, true);
@@ -22330,7 +22336,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			document.removeEventListener("mouseup", handleDocumentSelectionChange, true);
 			document.removeEventListener("selectionchange", handleDocumentSelectionChange);
 			proxy.$superdoc?.off?.("document-mode-change", handleV2DocumentModeChange);
-			proxy.$superdoc?.off?.("comments-list-change", handleV2CommentsListChange);
 		});
 		const selectionLayer = (0, vue.ref)(null);
 		const isDragging = (0, vue.ref)(false);
@@ -22826,7 +22831,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 38);
 		};
 	}
-}, [["__scopeId", "data-v-25570fd2"]]);
+}, [["__scopeId", "data-v-6833a014"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -43330,7 +43335,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.16";
+		this.version = "2.4.0-next.17";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];