superdoc 2.0.0-next.51 → 2.0.0-next.53

package/dist/chunks/{create-super-doc-ui-CXCqHc2m.cjs → create-super-doc-ui-BWFYti_W.cjs}

@@ -1886,6 +1886,48 @@ function readEntityTarget(row) {
 	const target = row.target;
 	return target && typeof target === "object" ? target : null;
 }
+function isHostGeometryTarget(target) {
+	if (!target || typeof target !== "object") return false;
+	const record = target;
+	const isTextPoint = (point) => {
+		if (!point || typeof point !== "object") return false;
+		const candidate = point;
+		return candidate.kind === "text" && typeof candidate.blockId === "string" && typeof candidate.offset === "number";
+	};
+	const isTextSegment = (segment) => {
+		if (!segment || typeof segment !== "object") return false;
+		const candidate = segment;
+		const range$1 = candidate.range;
+		return typeof candidate.blockId === "string" && typeof range$1?.start === "number" && typeof range$1.end === "number";
+	};
+	if (Array.isArray(record.segments)) {
+		const first = record.segments[0];
+		const last = record.segments[record.segments.length - 1];
+		return isTextSegment(first) && isTextSegment(last);
+	}
+	if (record.kind === "selection") return isTextPoint(record.start) && isTextPoint(record.end);
+	if (record.kind !== "text" || typeof record.blockId !== "string") return false;
+	const range = record.range;
+	return typeof range?.start === "number" && typeof range.end === "number";
+}
+function readTrackedChangeNavigationTarget(row) {
+	if (!row || typeof row !== "object") return null;
+	const target = readEntityTarget(row);
+	if (isHostGeometryTarget(target)) return target;
+	const record = row;
+	const navigationTarget = record.navigationTarget && typeof record.navigationTarget === "object" ? record.navigationTarget : null;
+	if (navigationTarget?.kind === "block" && typeof navigationTarget.blockId === "string" && navigationTarget.blockId.length > 0) return {
+		kind: "text",
+		blockId: navigationTarget.blockId,
+		range: {
+			start: 0,
+			end: 0
+		},
+		...navigationTarget.story && typeof navigationTarget.story === "object" ? { story: navigationTarget.story } : {},
+		...record.address && typeof record.address === "object" ? { address: record.address } : {}
+	};
+	return target;
+}
 function storyLocatorSignature(story) {
 	if (!story || typeof story !== "object") return "story:body";
 	const record = story;
@@ -3082,11 +3124,14 @@ function createSuperDocUI(options) {
 	let explicitActiveChange = null;
 	let explicitActiveChangeRevision = 0;
 	let queuedTrackChangeNavigationInvalidation = 0;
+	let trackChangeRevealInvalidation = 0;
+	const pendingTrackChangeRevealFocuses = /* @__PURE__ */ new Set();
 	const explicitActiveChangesEqual = (left, right) => {
 		if (left === right) return true;
 		if (!left || !right) return false;
 		return left.id === right.id && left.paintedEntityId === right.paintedEntityId && storyLocatorSignature(left.story) === storyLocatorSignature(right.story);
 	};
+	const hasPendingTrackChangeRevealFocus = (focus) => Array.from(pendingTrackChangeRevealFocuses).some((pendingFocus) => explicitActiveChangesEqual(pendingFocus, focus));
 	const mirrorTrackedChangeFocusToHost = (next) => {
 		const host = getHost();
 		if (typeof host?.getHandles !== "function") return;
@@ -3115,6 +3160,7 @@ function createSuperDocUI(options) {
 	const setExplicitActiveChange = (next, options$1) => {
 		explicitActiveChange = next;
 		explicitActiveChangeRevision += 1;
+		trackChangeRevealInvalidation += 1;
 		if (options$1?.invalidateQueuedNavigation !== false) queuedTrackChangeNavigationInvalidation += 1;
 	};
 	const listeners = /* @__PURE__ */ new Set();
@@ -5852,6 +5898,7 @@ function createSuperDocUI(options) {
 				...typeof target.paintedEntityId === "string" && target.paintedEntityId.length > 0 ? { paintedEntityId: target.paintedEntityId } : {}
 			};
 		}
+		if (rawTarget == null && next == null && explicitActiveChange != null && hasPendingTrackChangeRevealFocus(explicitActiveChange)) return false;
 		if (explicitActiveChangesEqual(explicitActiveChange, next)) return false;
 		setExplicitActiveChange(next);
 		return true;
@@ -6122,8 +6169,9 @@ function createSuperDocUI(options) {
 		const story = selectionStoryLocator(state.selection);
 		const item = items.find((candidate) => entityRowMatchesRequest(candidate, activeId, story));
 		if (!item) return "unavailable";
-		const type = trackChangesItemPayload(item).type;
-		const grouping = trackChangesItemPayload(item).grouping;
+		const change = trackChangesItemPayload(item);
+		const type = change.type;
+		const grouping = change.grouping;
 		if (type === "replacement" && grouping === "replacement-pair") return "range";
 		return (type === "insertion" || type === "deletion" || type === "insert" || type === "delete") && grouping === "standalone" ? "range" : "id";
 	}
@@ -6176,6 +6224,15 @@ function createSuperDocUI(options) {
 					const target = trackDecisionRangeFromSelection(state.selection);
 					return target ? executeTrackDecisionTarget(command.kind, target, null) : false;
 				}
+				if (route === "id") {
+					const activeId = state.selection.activeChangeIds[0];
+					const selectedStory = selectionStoryLocator(state.selection);
+					const story = selectedStory && storyLocatorSignature(selectedStory) !== storyLocatorSignature(null) ? selectedStory : void 0;
+					return executeTrackDecision(command.kind, story ? {
+						id: activeId,
+						story
+					} : activeId);
+				}
 			}
 		}
 		const resolved = resolveTrackDecisionTarget(command, payload);
@@ -7700,11 +7757,12 @@ function createSuperDocUI(options) {
 			reason: SUPERDOC_UI_REASONS.hostCapabilityUnavailable
 		};
 		try {
-			const result = await Promise.resolve(scroll.call(host, {
+			const input = {
 				target,
 				block: options$1?.block ?? "center",
 				behavior: options$1?.behavior ?? "smooth"
-			}));
+			};
+			const result = await Promise.resolve(options$1?.shouldContinue ? scroll.call(host, input, options$1.shouldContinue) : scroll.call(host, input));
 			if (result && typeof result === "object" && result.success === false) return {
 				success: false,
 				ok: false,
@@ -7734,19 +7792,32 @@ function createSuperDocUI(options) {
 				story: requestedStory
 			};
 		};
-		const fromList = readEntityTarget(loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory)));
-		if (fromList) return withRequestedStory(fromList);
+		const readTarget = namespace === "trackChanges" ? readTrackedChangeNavigationTarget : readEntityTarget;
+		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory));
+		const loadedRecord = loadedRow && typeof loadedRow === "object" ? loadedRow : null;
+		const moveSide = namespace === "trackChanges" && loadedRecord?.type === "move" && (loadedRecord.subtype === "move-to" || loadedRecord.subtype === "move-from") ? loadedRecord.subtype : null;
+		const trackedChangeLookupId = moveSide && typeof loadedRecord?.trackedChangeCanonicalId === "string" ? loadedRecord.trackedChangeCanonicalId : id;
+		const readResolvedTarget = (row) => {
+			if (!moveSide) return readTarget(row);
+			const moveTarget = readEntityTarget(row);
+			if (moveTarget?.kind !== "move") return null;
+			const sideTarget = moveSide === "move-to" ? moveTarget.destination : moveTarget.source;
+			return isHostGeometryTarget(sideTarget) ? sideTarget : null;
+		};
+		const fromList = readTarget(loadedRow);
+		const listTargetIsAuthoritative = namespace !== "trackChanges" || !moveSide && isHostGeometryTarget(readEntityTarget(loadedRow));
+		if (fromList && listTargetIsAuthoritative) return withRequestedStory(fromList);
 		const api = getDoc()?.[namespace];
 		const input = namespace === "comments" ? { commentId: id } : {
-			id,
+			id: trackedChangeLookupId,
 			...requestedStory ? { story: requestedStory } : {}
 		};
 		const get = api?.get;
-		if (typeof get !== "function") return null;
+		if (typeof get !== "function") return withRequestedStory(fromList);
 		try {
-			return withRequestedStory(readEntityTarget(await Promise.resolve(get.call(api, input))));
+			return withRequestedStory(readResolvedTarget(await Promise.resolve(get.call(api, input))) ?? fromList);
 		} catch {
-			return null;
+			return withRequestedStory(fromList);
 		}
 	};
 	function patchCommentStatus(commentId, status) {
@@ -7908,33 +7979,41 @@ function createSuperDocUI(options) {
 		if (activeId == null) return { success: false };
 		const optimisticActiveChange = explicitActiveChange;
 		const optimisticRevision = explicitActiveChangeRevision;
-		const isCurrent = () => explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
+		const isCurrent = () => queuedTrackChangeNavigationInvalidation === requestedAtInvalidation && explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
 		const rollback = () => {
 			if (!isCurrent()) return;
 			setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
 			recompute();
 		};
-		const target = await resolveEntityTarget("trackChanges", activeId, trackChangesSub.get().items, optimisticActiveChange?.story ? { story: optimisticActiveChange.story } : void 0);
-		if (!isCurrent()) return { success: false };
-		if (!target) {
-			rollback();
-			return { success: false };
-		}
-		trackedChangeNavigationInFlight += 1;
+		if (optimisticActiveChange) pendingTrackChangeRevealFocuses.add(optimisticActiveChange);
 		try {
-			const result = await scrollTargetIntoView(target, { behavior: "auto" });
+			const target = await resolveEntityTarget("trackChanges", activeId, trackChangesSub.get().items, optimisticActiveChange?.story ? { story: optimisticActiveChange.story } : void 0);
 			if (!isCurrent()) return { success: false };
-			if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+			if (!target) {
 				rollback();
-				mirrorTrackedChangeFocusToHost(previousActiveChange);
-			} else mirrorTrackedChangeFocusToHost(optimisticActiveChange);
-			return { success: result.ok };
-		} finally {
-			trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
-			if (trackedChangeNavigationInFlight === 0) {
-				if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
-				else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				return { success: false };
+			}
+			trackedChangeNavigationInFlight += 1;
+			try {
+				const result = await scrollTargetIntoView(target, {
+					behavior: "auto",
+					shouldContinue: isCurrent
+				});
+				if (!isCurrent()) return { success: false };
+				if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+					rollback();
+					mirrorTrackedChangeFocusToHost(previousActiveChange);
+				} else mirrorTrackedChangeFocusToHost(optimisticActiveChange);
+				return { success: result.ok };
+			} finally {
+				trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
+				if (trackedChangeNavigationInFlight === 0) {
+					if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
+					else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				}
 			}
+		} finally {
+			if (optimisticActiveChange) pendingTrackChangeRevealFocuses.delete(optimisticActiveChange);
 		}
 	};
 	const navigateAndScroll = (step) => {
@@ -8036,47 +8115,65 @@ function createSuperDocUI(options) {
 				ok: false,
 				reason: getEditor() ? SUPERDOC_UI_REASONS.documentApiUnavailable : SUPERDOC_UI_REASONS.notReady
 			};
+			queuedTrackChangeNavigationInvalidation += 1;
+			trackChangeRevealInvalidation += 1;
+			const requestedAtInvalidation = trackChangeRevealInvalidation;
 			const loadedItems = trackChangesSub.get().items;
-			const story = readEntityRequestStory(loadedItems.find((item) => readEntityId(item) === changeId));
-			const target = await resolveEntityTarget("trackChanges", changeId, loadedItems, story ? { story } : void 0);
-			if (!target) return {
-				success: false,
-				ok: false,
-				reason: SUPERDOC_UI_REASONS.targetUnresolved
-			};
+			const publicId = buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
+			const story = readEntityRequestStory(loadedItems.find((item) => readEntityId(item) === publicId));
 			const previousActiveChange = explicitActiveChange;
-			const requestedActiveChange = story ? {
-				id: changeId,
-				story
-			} : { id: changeId };
-			setExplicitActiveChange(requestedActiveChange);
-			recompute();
-			const optimisticActiveChange = explicitActiveChange;
-			const optimisticRevision = explicitActiveChangeRevision;
-			const isCurrent = () => explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
-			const rollback = () => {
-				if (!isCurrent()) return;
-				setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
-				recompute();
+			const requestedActiveChange = {
+				id: publicId,
+				...story ? { story } : {},
+				...publicId !== changeId ? { paintedEntityId: changeId } : {}
 			};
-			trackedChangeNavigationInFlight += 1;
+			pendingTrackChangeRevealFocuses.add(requestedActiveChange);
 			try {
-				const result = await scrollTargetIntoView(target, { behavior: "auto" });
-				if (!isCurrent()) return {
+				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story ? { story } : void 0);
+				if (trackChangeRevealInvalidation !== requestedAtInvalidation) return {
 					success: false,
 					ok: false
 				};
-				if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
-					rollback();
-					mirrorTrackedChangeFocusToHost(previousActiveChange);
-				} else mirrorTrackedChangeFocusToHost(requestedActiveChange);
-				return result;
-			} finally {
-				trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
-				if (trackedChangeNavigationInFlight === 0) {
-					if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
-					else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				if (!target) return {
+					success: false,
+					ok: false,
+					reason: SUPERDOC_UI_REASONS.targetUnresolved
+				};
+				setExplicitActiveChange(requestedActiveChange);
+				const revealInvalidation = trackChangeRevealInvalidation;
+				const optimisticActiveChange = explicitActiveChange;
+				const optimisticRevision = explicitActiveChangeRevision;
+				const isCurrent = () => trackChangeRevealInvalidation === revealInvalidation && explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
+				const rollback = () => {
+					if (!isCurrent()) return;
+					setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
+					recompute();
+				};
+				recompute();
+				trackedChangeNavigationInFlight += 1;
+				try {
+					const result = await scrollTargetIntoView(target, {
+						behavior: "auto",
+						shouldContinue: isCurrent
+					});
+					if (!isCurrent()) return {
+						success: false,
+						ok: false
+					};
+					if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+						rollback();
+						mirrorTrackedChangeFocusToHost(previousActiveChange);
+					} else mirrorTrackedChangeFocusToHost(requestedActiveChange);
+					return result;
+				} finally {
+					trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
+					if (trackedChangeNavigationInFlight === 0) {
+						if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
+						else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+					}
 				}
+			} finally {
+				pendingTrackChangeRevealFocuses.delete(requestedActiveChange);
 			}
 		}
 	};

package/dist/chunks/{create-super-doc-ui-fxF2Q8Ib.es.js → create-super-doc-ui-Bqkk1Ios.es.js}

@@ -1664,6 +1664,48 @@ function readEntityTarget(row) {
 	const target = row.target;
 	return target && typeof target === "object" ? target : null;
 }
+function isHostGeometryTarget(target) {
+	if (!target || typeof target !== "object") return false;
+	const record = target;
+	const isTextPoint = (point) => {
+		if (!point || typeof point !== "object") return false;
+		const candidate = point;
+		return candidate.kind === "text" && typeof candidate.blockId === "string" && typeof candidate.offset === "number";
+	};
+	const isTextSegment = (segment) => {
+		if (!segment || typeof segment !== "object") return false;
+		const candidate = segment;
+		const range$1 = candidate.range;
+		return typeof candidate.blockId === "string" && typeof range$1?.start === "number" && typeof range$1.end === "number";
+	};
+	if (Array.isArray(record.segments)) {
+		const first = record.segments[0];
+		const last = record.segments[record.segments.length - 1];
+		return isTextSegment(first) && isTextSegment(last);
+	}
+	if (record.kind === "selection") return isTextPoint(record.start) && isTextPoint(record.end);
+	if (record.kind !== "text" || typeof record.blockId !== "string") return false;
+	const range = record.range;
+	return typeof range?.start === "number" && typeof range.end === "number";
+}
+function readTrackedChangeNavigationTarget(row) {
+	if (!row || typeof row !== "object") return null;
+	const target = readEntityTarget(row);
+	if (isHostGeometryTarget(target)) return target;
+	const record = row;
+	const navigationTarget = record.navigationTarget && typeof record.navigationTarget === "object" ? record.navigationTarget : null;
+	if (navigationTarget?.kind === "block" && typeof navigationTarget.blockId === "string" && navigationTarget.blockId.length > 0) return {
+		kind: "text",
+		blockId: navigationTarget.blockId,
+		range: {
+			start: 0,
+			end: 0
+		},
+		...navigationTarget.story && typeof navigationTarget.story === "object" ? { story: navigationTarget.story } : {},
+		...record.address && typeof record.address === "object" ? { address: record.address } : {}
+	};
+	return target;
+}
 function storyLocatorSignature(story) {
 	if (!story || typeof story !== "object") return "story:body";
 	const record = story;
@@ -2860,11 +2902,14 @@ function createSuperDocUI(options) {
 	let explicitActiveChange = null;
 	let explicitActiveChangeRevision = 0;
 	let queuedTrackChangeNavigationInvalidation = 0;
+	let trackChangeRevealInvalidation = 0;
+	const pendingTrackChangeRevealFocuses = /* @__PURE__ */ new Set();
 	const explicitActiveChangesEqual = (left, right) => {
 		if (left === right) return true;
 		if (!left || !right) return false;
 		return left.id === right.id && left.paintedEntityId === right.paintedEntityId && storyLocatorSignature(left.story) === storyLocatorSignature(right.story);
 	};
+	const hasPendingTrackChangeRevealFocus = (focus) => Array.from(pendingTrackChangeRevealFocuses).some((pendingFocus) => explicitActiveChangesEqual(pendingFocus, focus));
 	const mirrorTrackedChangeFocusToHost = (next) => {
 		const host = getHost();
 		if (typeof host?.getHandles !== "function") return;
@@ -2893,6 +2938,7 @@ function createSuperDocUI(options) {
 	const setExplicitActiveChange = (next, options$1) => {
 		explicitActiveChange = next;
 		explicitActiveChangeRevision += 1;
+		trackChangeRevealInvalidation += 1;
 		if (options$1?.invalidateQueuedNavigation !== false) queuedTrackChangeNavigationInvalidation += 1;
 	};
 	const listeners = /* @__PURE__ */ new Set();
@@ -5630,6 +5676,7 @@ function createSuperDocUI(options) {
 				...typeof target.paintedEntityId === "string" && target.paintedEntityId.length > 0 ? { paintedEntityId: target.paintedEntityId } : {}
 			};
 		}
+		if (rawTarget == null && next == null && explicitActiveChange != null && hasPendingTrackChangeRevealFocus(explicitActiveChange)) return false;
 		if (explicitActiveChangesEqual(explicitActiveChange, next)) return false;
 		setExplicitActiveChange(next);
 		return true;
@@ -5900,8 +5947,9 @@ function createSuperDocUI(options) {
 		const story = selectionStoryLocator(state.selection);
 		const item = items.find((candidate) => entityRowMatchesRequest(candidate, activeId, story));
 		if (!item) return "unavailable";
-		const type = trackChangesItemPayload(item).type;
-		const grouping = trackChangesItemPayload(item).grouping;
+		const change = trackChangesItemPayload(item);
+		const type = change.type;
+		const grouping = change.grouping;
 		if (type === "replacement" && grouping === "replacement-pair") return "range";
 		return (type === "insertion" || type === "deletion" || type === "insert" || type === "delete") && grouping === "standalone" ? "range" : "id";
 	}
@@ -5954,6 +6002,15 @@ function createSuperDocUI(options) {
 					const target = trackDecisionRangeFromSelection(state.selection);
 					return target ? executeTrackDecisionTarget(command.kind, target, null) : false;
 				}
+				if (route === "id") {
+					const activeId = state.selection.activeChangeIds[0];
+					const selectedStory = selectionStoryLocator(state.selection);
+					const story = selectedStory && storyLocatorSignature(selectedStory) !== storyLocatorSignature(null) ? selectedStory : void 0;
+					return executeTrackDecision(command.kind, story ? {
+						id: activeId,
+						story
+					} : activeId);
+				}
 			}
 		}
 		const resolved = resolveTrackDecisionTarget(command, payload);
@@ -7478,11 +7535,12 @@ function createSuperDocUI(options) {
 			reason: SUPERDOC_UI_REASONS.hostCapabilityUnavailable
 		};
 		try {
-			const result = await Promise.resolve(scroll.call(host, {
+			const input = {
 				target,
 				block: options$1?.block ?? "center",
 				behavior: options$1?.behavior ?? "smooth"
-			}));
+			};
+			const result = await Promise.resolve(options$1?.shouldContinue ? scroll.call(host, input, options$1.shouldContinue) : scroll.call(host, input));
 			if (result && typeof result === "object" && result.success === false) return {
 				success: false,
 				ok: false,
@@ -7512,19 +7570,32 @@ function createSuperDocUI(options) {
 				story: requestedStory
 			};
 		};
-		const fromList = readEntityTarget(loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory)));
-		if (fromList) return withRequestedStory(fromList);
+		const readTarget = namespace === "trackChanges" ? readTrackedChangeNavigationTarget : readEntityTarget;
+		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory));
+		const loadedRecord = loadedRow && typeof loadedRow === "object" ? loadedRow : null;
+		const moveSide = namespace === "trackChanges" && loadedRecord?.type === "move" && (loadedRecord.subtype === "move-to" || loadedRecord.subtype === "move-from") ? loadedRecord.subtype : null;
+		const trackedChangeLookupId = moveSide && typeof loadedRecord?.trackedChangeCanonicalId === "string" ? loadedRecord.trackedChangeCanonicalId : id;
+		const readResolvedTarget = (row) => {
+			if (!moveSide) return readTarget(row);
+			const moveTarget = readEntityTarget(row);
+			if (moveTarget?.kind !== "move") return null;
+			const sideTarget = moveSide === "move-to" ? moveTarget.destination : moveTarget.source;
+			return isHostGeometryTarget(sideTarget) ? sideTarget : null;
+		};
+		const fromList = readTarget(loadedRow);
+		const listTargetIsAuthoritative = namespace !== "trackChanges" || !moveSide && isHostGeometryTarget(readEntityTarget(loadedRow));
+		if (fromList && listTargetIsAuthoritative) return withRequestedStory(fromList);
 		const api = getDoc()?.[namespace];
 		const input = namespace === "comments" ? { commentId: id } : {
-			id,
+			id: trackedChangeLookupId,
 			...requestedStory ? { story: requestedStory } : {}
 		};
 		const get = api?.get;
-		if (typeof get !== "function") return null;
+		if (typeof get !== "function") return withRequestedStory(fromList);
 		try {
-			return withRequestedStory(readEntityTarget(await Promise.resolve(get.call(api, input))));
+			return withRequestedStory(readResolvedTarget(await Promise.resolve(get.call(api, input))) ?? fromList);
 		} catch {
-			return null;
+			return withRequestedStory(fromList);
 		}
 	};
 	function patchCommentStatus(commentId, status) {
@@ -7686,33 +7757,41 @@ function createSuperDocUI(options) {
 		if (activeId == null) return { success: false };
 		const optimisticActiveChange = explicitActiveChange;
 		const optimisticRevision = explicitActiveChangeRevision;
-		const isCurrent = () => explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
+		const isCurrent = () => queuedTrackChangeNavigationInvalidation === requestedAtInvalidation && explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
 		const rollback = () => {
 			if (!isCurrent()) return;
 			setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
 			recompute();
 		};
-		const target = await resolveEntityTarget("trackChanges", activeId, trackChangesSub.get().items, optimisticActiveChange?.story ? { story: optimisticActiveChange.story } : void 0);
-		if (!isCurrent()) return { success: false };
-		if (!target) {
-			rollback();
-			return { success: false };
-		}
-		trackedChangeNavigationInFlight += 1;
+		if (optimisticActiveChange) pendingTrackChangeRevealFocuses.add(optimisticActiveChange);
 		try {
-			const result = await scrollTargetIntoView(target, { behavior: "auto" });
+			const target = await resolveEntityTarget("trackChanges", activeId, trackChangesSub.get().items, optimisticActiveChange?.story ? { story: optimisticActiveChange.story } : void 0);
 			if (!isCurrent()) return { success: false };
-			if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+			if (!target) {
 				rollback();
-				mirrorTrackedChangeFocusToHost(previousActiveChange);
-			} else mirrorTrackedChangeFocusToHost(optimisticActiveChange);
-			return { success: result.ok };
-		} finally {
-			trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
-			if (trackedChangeNavigationInFlight === 0) {
-				if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
-				else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				return { success: false };
+			}
+			trackedChangeNavigationInFlight += 1;
+			try {
+				const result = await scrollTargetIntoView(target, {
+					behavior: "auto",
+					shouldContinue: isCurrent
+				});
+				if (!isCurrent()) return { success: false };
+				if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+					rollback();
+					mirrorTrackedChangeFocusToHost(previousActiveChange);
+				} else mirrorTrackedChangeFocusToHost(optimisticActiveChange);
+				return { success: result.ok };
+			} finally {
+				trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
+				if (trackedChangeNavigationInFlight === 0) {
+					if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
+					else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				}
 			}
+		} finally {
+			if (optimisticActiveChange) pendingTrackChangeRevealFocuses.delete(optimisticActiveChange);
 		}
 	};
 	const navigateAndScroll = (step) => {
@@ -7814,47 +7893,65 @@ function createSuperDocUI(options) {
 				ok: false,
 				reason: getEditor() ? SUPERDOC_UI_REASONS.documentApiUnavailable : SUPERDOC_UI_REASONS.notReady
 			};
+			queuedTrackChangeNavigationInvalidation += 1;
+			trackChangeRevealInvalidation += 1;
+			const requestedAtInvalidation = trackChangeRevealInvalidation;
 			const loadedItems = trackChangesSub.get().items;
-			const story = readEntityRequestStory(loadedItems.find((item) => readEntityId(item) === changeId));
-			const target = await resolveEntityTarget("trackChanges", changeId, loadedItems, story ? { story } : void 0);
-			if (!target) return {
-				success: false,
-				ok: false,
-				reason: SUPERDOC_UI_REASONS.targetUnresolved
-			};
+			const publicId = buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
+			const story = readEntityRequestStory(loadedItems.find((item) => readEntityId(item) === publicId));
 			const previousActiveChange = explicitActiveChange;
-			const requestedActiveChange = story ? {
-				id: changeId,
-				story
-			} : { id: changeId };
-			setExplicitActiveChange(requestedActiveChange);
-			recompute();
-			const optimisticActiveChange = explicitActiveChange;
-			const optimisticRevision = explicitActiveChangeRevision;
-			const isCurrent = () => explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
-			const rollback = () => {
-				if (!isCurrent()) return;
-				setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
-				recompute();
+			const requestedActiveChange = {
+				id: publicId,
+				...story ? { story } : {},
+				...publicId !== changeId ? { paintedEntityId: changeId } : {}
 			};
-			trackedChangeNavigationInFlight += 1;
+			pendingTrackChangeRevealFocuses.add(requestedActiveChange);
 			try {
-				const result = await scrollTargetIntoView(target, { behavior: "auto" });
-				if (!isCurrent()) return {
+				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story ? { story } : void 0);
+				if (trackChangeRevealInvalidation !== requestedAtInvalidation) return {
 					success: false,
 					ok: false
 				};
-				if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
-					rollback();
-					mirrorTrackedChangeFocusToHost(previousActiveChange);
-				} else mirrorTrackedChangeFocusToHost(requestedActiveChange);
-				return result;
-			} finally {
-				trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
-				if (trackedChangeNavigationInFlight === 0) {
-					if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
-					else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+				if (!target) return {
+					success: false,
+					ok: false,
+					reason: SUPERDOC_UI_REASONS.targetUnresolved
+				};
+				setExplicitActiveChange(requestedActiveChange);
+				const revealInvalidation = trackChangeRevealInvalidation;
+				const optimisticActiveChange = explicitActiveChange;
+				const optimisticRevision = explicitActiveChangeRevision;
+				const isCurrent = () => trackChangeRevealInvalidation === revealInvalidation && explicitActiveChange === optimisticActiveChange && explicitActiveChangeRevision === optimisticRevision;
+				const rollback = () => {
+					if (!isCurrent()) return;
+					setExplicitActiveChange(previousActiveChange, { invalidateQueuedNavigation: false });
+					recompute();
+				};
+				recompute();
+				trackedChangeNavigationInFlight += 1;
+				try {
+					const result = await scrollTargetIntoView(target, {
+						behavior: "auto",
+						shouldContinue: isCurrent
+					});
+					if (!isCurrent()) return {
+						success: false,
+						ok: false
+					};
+					if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) {
+						rollback();
+						mirrorTrackedChangeFocusToHost(previousActiveChange);
+					} else mirrorTrackedChangeFocusToHost(requestedActiveChange);
+					return result;
+				} finally {
+					trackedChangeNavigationInFlight = Math.max(0, trackedChangeNavigationInFlight - 1);
+					if (trackedChangeNavigationInFlight === 0) {
+						if (!isCurrent()) mirrorTrackedChangeFocusToHost(explicitActiveChange);
+						else if (currentHostReviewSource) syncTrackedChangeFocusFromHostReviewTarget(readHostActiveReviewTarget(currentHostReviewSource));
+					}
 				}
+			} finally {
+				pendingTrackChangeRevealFocuses.delete(requestedActiveChange);
 			}
 		}
 	};

package/dist/collaboration-upgrade-engine.cjs

@@ -7,7 +7,7 @@ const COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = (0, __superdoc_docx_engine_collaboration_upgrade_engine.getCollaborationUpgradeEngineInfo)();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.0.0-next.51",
+	superdocVersion: "2.0.0-next.53",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/collaboration-upgrade-engine.es.js

@@ -6,7 +6,7 @@ const COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = getCollaborationUpgradeEngineInfo$1();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.0.0-next.51",
+	superdocVersion: "2.0.0-next.53",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS