superdoc 2.3.0 → 2.4.0-next.2

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

@@ -309,24 +309,36 @@ function getV2TrackedChangeMutationImpact(event) {
 	if (!payload || typeof payload !== "object") return null;
 	const upsertIds = /* @__PURE__ */ new Set();
 	const removedIds = /* @__PURE__ */ new Set();
+	const remappedPairs = [];
 	const collectEntity = (entry, into) => {
 		if (entry?.kind !== "entity" || entry.entityType !== "trackedChange") return;
 		if (typeof entry.entityId === "string" && entry.entityId.length > 0) into.add(entry.entityId);
 	};
+	const readEntityId$1 = (entry) => {
+		if (entry?.kind !== "entity" || entry.entityType !== "trackedChange") return null;
+		return typeof entry.entityId === "string" && entry.entityId.length > 0 ? entry.entityId : null;
+	};
 	if (Array.isArray(payload.inserted)) payload.inserted.forEach((entry) => collectEntity(entry, upsertIds));
 	if (Array.isArray(payload.updated)) payload.updated.forEach((entry) => collectEntity(entry, upsertIds));
 	if (Array.isArray(payload.trackedChangeRefs)) payload.trackedChangeRefs.forEach((entry) => collectEntity(entry, upsertIds));
 	if (Array.isArray(payload.removed)) payload.removed.forEach((entry) => collectEntity(entry, removedIds));
 	if (Array.isArray(payload.invalidatedRefs)) payload.invalidatedRefs.forEach((entry) => collectEntity(entry, removedIds));
 	if (Array.isArray(payload.remappedRefs)) for (const mapping of payload.remappedRefs) {
-		collectEntity(mapping?.from, removedIds);
-		collectEntity(mapping?.to, upsertIds);
+		const fromId = readEntityId$1(mapping?.from);
+		const toId = readEntityId$1(mapping?.to);
+		if (fromId) removedIds.add(fromId);
+		if (toId) upsertIds.add(toId);
+		if (fromId && toId && fromId !== toId) remappedPairs.push({
+			from: fromId,
+			to: toId
+		});
 	}
 	for (const id of removedIds) upsertIds.delete(id);
 	if (upsertIds.size === 0 && removedIds.size === 0) return null;
 	return {
 		upsertIds,
 		removedIds,
+		remappedPairs,
 		reconcileMode: event.origin === "history" ? "authoritative" : "targeted"
 	};
 }
@@ -436,6 +448,7 @@ function createV2ReviewMutationReconciler({ getContext, reconcile, hydrate, onRe
 		if (!impact) return;
 		const reconcileMode = impact.reconcileMode === "authoritative" ? "authoritative" : "targeted";
 		const removedIds = normalizeIds(impact.removedIds);
+		const upsertIds = normalizeIds(impact.upsertIds);
 		for (const id of removedIds) {
 			const existing = pendingUpserts.get(id);
 			if (existing?.reconcileMode === "authoritative") pendingUpserts.set(id, {
@@ -447,13 +460,13 @@ function createV2ReviewMutationReconciler({ getContext, reconcile, hydrate, onRe
 			else pendingUpserts.delete(id);
 		}
 		const context = getContext();
-		if (removedIds.size > 0 && context?.adapter) try {
+		if (removedIds.size > 0 && upsertIds.size === 0 && context?.adapter) try {
 			Promise.resolve(reconcile(context, {
 				upsertIds: /* @__PURE__ */ new Set(),
 				removedIds
 			})).catch(() => void 0);
 		} catch {}
-		for (const id of normalizeIds(impact.upsertIds)) if (!removedIds.has(id)) {
+		for (const id of upsertIds) if (!removedIds.has(id)) {
 			const existing = pendingUpserts.get(id);
 			pendingUpserts.set(id, {
 				version: ++sequence,
@@ -1799,7 +1812,7 @@ const HEAVY_DOC_READ_POLICY = [
 	{
 		key: "trackChanges",
 		match: "exact",
-		note: "audited: body tracked-changes list; stale-served during load"
+		note: "audited: all-story tracked-changes list; stale-served during load"
 	},
 	{
 		key: "trackChanges:all",
@@ -1886,6 +1899,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;
@@ -2092,6 +2147,7 @@ function buildTrackedChangeIdContext(items) {
 	return context;
 }
 var storyScopedTrackedChangeIdContextCache = /* @__PURE__ */ new WeakMap();
+var declaredBodyItemsCache = /* @__PURE__ */ new WeakMap();
 function buildStoryScopedTrackedChangeIdContext(items, story) {
 	const signature = storyLocatorSignature(story);
 	let byStory = storyScopedTrackedChangeIdContextCache.get(items);
@@ -2105,6 +2161,56 @@ function buildStoryScopedTrackedChangeIdContext(items, story) {
 	byStory.set(signature, context);
 	return context;
 }
+function isTextboxStory(story) {
+	return !!story && typeof story === "object" && story.storyType === "textbox";
+}
+function resolveStorylessCanonicalTrackedChangeId(items, selectionIds) {
+	const storyless = selectionIds.filter((id) => items.some((item) => readEntityId(item) === id && readEntityStory(item) == null));
+	if (storyless.length === 0) return null;
+	if (storyless.length === 1) return storyless[0];
+	const seen = /* @__PURE__ */ new Set();
+	for (const id of storyless) {
+		const row = items.find((item) => readEntityId(item) === id);
+		if (!row) continue;
+		for (const raw of readTrackChangeProvenanceIds(row)) {
+			if (seen.has(raw)) return null;
+			seen.add(raw);
+		}
+	}
+	return storyless[0];
+}
+function declaredBodyItems(items) {
+	const cached = declaredBodyItemsCache.get(items);
+	if (cached) return cached;
+	const declared = items.filter((item) => readEntityStory(item) != null);
+	const result = declared.length === items.length ? items : declared;
+	declaredBodyItemsCache.set(items, result);
+	return result;
+}
+function resolveSelectionActiveChangeId(options) {
+	const { selectionIds, publicIds, selection, bodyItems, allStoryItems } = options;
+	if (selectionIds.length === 0) return null;
+	const mapIds = (context) => {
+		for (const id of selectionIds) {
+			const publicId = context.toPublicId(id);
+			if (publicId) return publicId;
+		}
+		return null;
+	};
+	const story = selectionStory(selection);
+	const isBodySelection = storyLocatorSignature(story) === storyLocatorSignature(null);
+	if (allStoryItems) {
+		const scopedItems = isBodySelection ? declaredBodyItems(allStoryItems) : allStoryItems;
+		const fromStory = mapIds(buildStoryScopedTrackedChangeIdContext(scopedItems, story));
+		if (fromStory) return fromStory;
+		const fromPublic = publicIds?.find((id) => scopedItems.some((item) => entityRowMatchesRequest(item, id, story)));
+		if (fromPublic) return fromPublic;
+		if (!isBodySelection) return isTextboxStory(story) ? resolveStorylessCanonicalTrackedChangeId(allStoryItems, selectionIds) : null;
+		return mapIds(buildTrackedChangeIdContext(bodyItems));
+	}
+	if (isBodySelection) return mapIds(buildTrackedChangeIdContext(bodyItems)) ?? selectionIds[0] ?? null;
+	return null;
+}
 function resolveActiveCommentId(items, commentId) {
 	const item = items.find((candidate) => readEntityId(candidate) === commentId || candidate.importedId === commentId);
 	if (!item) return null;
@@ -3082,11 +3188,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 +3224,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();
@@ -3520,7 +3630,7 @@ function createSuperDocUI(options) {
 		const read = host?.getDocumentLoadingSnapshot;
 		if (typeof read !== "function") return "unknown";
 		const stage = safeCall(() => read.call(host), null)?.sourceStage;
-		if (stage === "opening" || stage === "ready-window" || stage === "source-loading") return "loading";
+		if (stage === "opening" || stage === "bootstrap-ready" || stage === "source-loading") return "loading";
 		if (stage === "source-complete" || stage === "source-failed" || stage === "source-cancelled") return "complete";
 		return "unknown";
 	};
@@ -4160,8 +4270,8 @@ function createSuperDocUI(options) {
 			status: heldEntry?.hasSettled ? "stale" : "pending"
 		} : readAsync("trackChanges", token, () => {
 			if (listTrackedChanges) return listTrackedChanges.call(v2TrackedChanges);
-			return tcApi?.list ? tcApi.list() : void 0;
-		}, (raw) => raw && Array.isArray(raw.items) ? raw.items.filter((item) => !listTrackedChanges || storyLocatorSignature(readEntityStory(item)) === "story:body") : []);
+			return tcApi?.list ? tcApi.list({ in: "all" }) : void 0;
+		}, (raw) => raw && Array.isArray(raw.items) ? raw.items : []);
 		const items = (value ?? []).map(projectTrackChangesItem).filter((item) => item != null).filter((item) => {
 			const id = readEntityId(item);
 			return !id || !postDecisionIds?.has(id);
@@ -4180,8 +4290,20 @@ function createSuperDocUI(options) {
 				if (allStoryItems && !allStoryItems.some((row) => entityRowMatchesRequest(row, active.id, active.story))) setExplicitActiveChange(null);
 			} else if (!items.some((item) => readEntityId(item) === active.id)) setExplicitActiveChange(null);
 		}
+		const publicIdItems = allStoryItems ?? items;
+		const selectionIdContext = buildStoryScopedTrackedChangeIdContext(publicIdItems, selectionStory(selection$1));
 		const selectionActiveChangeIds = postDecisionIds ? selection$1.activeChangeIds.filter((id) => !postDecisionIds.has(id)) : selection$1.activeChangeIds;
-		const activeId = explicitActiveChange?.id ?? selectionActiveChangeIds[0] ?? null;
+		const selectionPublicChangeIds = selectionActiveChangeIds.map((id) => selectionIdContext.toPublicId(id) ?? id);
+		const explicitActiveIdContext = explicitActiveChange?.story ? buildStoryScopedTrackedChangeIdContext(publicIdItems, explicitActiveChange.story) : buildTrackedChangeIdContext(publicIdItems);
+		const explicitActiveId = explicitActiveChange ? explicitActiveIdContext.toPublicId(explicitActiveChange.id) ?? explicitActiveChange.id : null;
+		const selectionActiveId = resolveSelectionActiveChangeId({
+			selectionIds: selectionActiveChangeIds,
+			publicIds: selectionPublicChangeIds,
+			selection: selection$1,
+			bodyItems: items,
+			allStoryItems
+		});
+		const activeId = explicitActiveId ?? selectionActiveId;
 		return {
 			status: combineStatus(listStatus, selection$1.status),
 			items,
@@ -5845,13 +5967,18 @@ function createSuperDocUI(options) {
 		const target = rawTarget && typeof rawTarget === "object" ? rawTarget : null;
 		let next = null;
 		if (target?.entityType === "trackedChange" && typeof target.entityId === "string" && target.entityId.length > 0) {
-			const story = target.story && storyLocatorSignature(target.story) !== storyLocatorSignature(null) ? target.story : void 0;
+			const paintedEntityId = target.entityId;
+			const targetStory = target.story && typeof target.story === "object" ? target.story : void 0;
+			const allStoryItems = readAllStoryTrackChanges();
+			const entityId = (allStoryItems ? targetStory ? buildStoryScopedTrackedChangeIdContext(allStoryItems, targetStory).toPublicId(paintedEntityId) : buildTrackedChangeIdContext(allStoryItems).toPublicId(paintedEntityId) : null) ?? paintedEntityId;
+			const story = targetStory && storyLocatorSignature(targetStory) !== storyLocatorSignature(null) ? targetStory : void 0;
 			next = {
-				id: target.entityId,
+				id: entityId,
 				...story ? { story } : {},
-				...typeof target.paintedEntityId === "string" && target.paintedEntityId.length > 0 ? { paintedEntityId: target.paintedEntityId } : {}
+				...typeof target.paintedEntityId === "string" && target.paintedEntityId.length > 0 ? { paintedEntityId: target.paintedEntityId } : entityId !== paintedEntityId ? { paintedEntityId } : {}
 			};
 		}
+		if (rawTarget == null && next == null && explicitActiveChange != null && hasPendingTrackChangeRevealFocus(explicitActiveChange)) return false;
 		if (explicitActiveChangesEqual(explicitActiveChange, next)) return false;
 		setExplicitActiveChange(next);
 		return true;
@@ -6089,6 +6216,17 @@ function createSuperDocUI(options) {
 	function readTrackDecisionTargetId(target) {
 		return target && typeof target === "object" && typeof target.id === "string" ? String(target.id) : null;
 	}
+	function nonBodySelectionStoryLocator(selection$1) {
+		const story = selectionStoryLocator(selection$1);
+		return story && storyLocatorSignature(story) !== storyLocatorSignature(null) ? story : void 0;
+	}
+	function trackDecisionIdTarget(changeId, story) {
+		return {
+			kind: "id",
+			id: changeId,
+			...story ? { story } : {}
+		};
+	}
 	function trackDecisionRangeFromSelection(selection$1) {
 		if (selection$1.empty) return null;
 		const explicit = selection$1.selectionTarget;
@@ -6114,19 +6252,55 @@ function createSuperDocUI(options) {
 			}
 		};
 	}
+	function readBodyTrackChangeForDecision(activeId, story) {
+		if (storyLocatorSignature(story) !== storyLocatorSignature(null)) return void 0;
+		const trackChanges$1 = getDoc()?.trackChanges;
+		const list = trackChanges$1?.list;
+		if (typeof list !== "function") return void 0;
+		const raw = safeCall(() => list.call(trackChanges$1), null);
+		if (isPromiseLike(raw) || !raw || typeof raw !== "object") return void 0;
+		const items = raw.items;
+		if (!Array.isArray(items)) return void 0;
+		return items.map(projectTrackChangesItem).find((item) => item != null && entityRowMatchesRequest(item, activeId, story));
+	}
+	function selectedTextCoversTrackChangeText(selection$1, item) {
+		const selected = normalizeTrackDecisionText(selection$1.quotedText);
+		if (!selected) return false;
+		const payload = trackChangesItemPayload(item);
+		return [
+			payload.insertedText,
+			payload.deletedText,
+			payload.excerpt
+		].some((value) => normalizeTrackDecisionText(value) === selected);
+	}
+	function normalizeTrackDecisionText(value) {
+		return typeof value === "string" ? value.replace(/\s+/g, " ").trim() : "";
+	}
 	function activeChangePartialDecisionRoute() {
 		const activeId = state.selection.activeChangeIds[0];
 		if (!activeId) return "unavailable";
-		const items = readAllStoryTrackChanges();
-		if (!items) return "unavailable";
 		const story = selectionStoryLocator(state.selection);
-		const item = items.find((candidate) => entityRowMatchesRequest(candidate, activeId, story));
+		const item = (state.trackChanges.status === "ready" ? state.trackChanges.items.find((candidate) => entityRowMatchesRequest(candidate, activeId, story)) : void 0) ?? readBodyTrackChangeForDecision(activeId, story) ?? readAllStoryTrackChanges()?.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 (selectedTextCoversTrackChangeText(state.selection, item)) return "id";
 		if (type === "replacement" && grouping === "replacement-pair") return "range";
 		return (type === "insertion" || type === "deletion" || type === "insert" || type === "delete") && grouping === "standalone" ? "range" : "id";
 	}
+	function executeTrackDecisionRangeWithIdFallback(kind, rangeTarget, changeId, story) {
+		const fallback = () => callTrackDecisionTarget(kind, trackDecisionIdTarget(changeId, story), changeId, story);
+		try {
+			const result = callTrackDecisionTarget(kind, rangeTarget, null);
+			if (isPromiseLike(result)) return settleCommandExecution(Promise.resolve(result).then((settled) => {
+				return commandResultSucceeded(commandResultFromOperationResult(settled)) ? settled : fallback();
+			}));
+			return settleCommandExecution(commandResultSucceeded(commandResultFromOperationResult(result)) ? result : fallback());
+		} catch {
+			return false;
+		}
+	}
 	function resolveTrackDecisionTarget(command, payload) {
 		if (command.scope === "all") return {
 			target: { scope: "all" },
@@ -6141,26 +6315,27 @@ function createSuperDocUI(options) {
 		};
 		if (payload && typeof payload === "object") {
 			const record = payload;
-			if (record.target && typeof record.target === "object") return {
-				target: record.target,
-				changeId: readTrackDecisionTargetId(record.target)
-			};
+			if (record.target && typeof record.target === "object") {
+				const target = record.target;
+				return {
+					target,
+					changeId: readTrackDecisionTargetId(target),
+					story: target.story
+				};
+			}
 			const id = typeof record.changeId === "string" ? record.changeId : record.id;
 			if (typeof id === "string" && id.length > 0) return {
-				target: {
-					kind: "id",
-					id
-				},
-				changeId: id
+				target: trackDecisionIdTarget(id, record.story),
+				changeId: id,
+				story: record.story
 			};
 		}
 		const selectedId = state.selection.activeChangeIds[0];
+		const story = nonBodySelectionStoryLocator(state.selection);
 		return selectedId ? {
-			target: {
-				kind: "id",
-				id: selectedId
-			},
-			changeId: selectedId
+			target: trackDecisionIdTarget(selectedId, story),
+			changeId: selectedId,
+			story
 		} : null;
 	}
 	function executeTrackDecisionCommand(command, payload) {
@@ -6174,13 +6349,23 @@ function createSuperDocUI(options) {
 				if (route === "unavailable") return false;
 				if (route === "range") {
 					const target = trackDecisionRangeFromSelection(state.selection);
-					return target ? executeTrackDecisionTarget(command.kind, target, null) : false;
+					const story = nonBodySelectionStoryLocator(state.selection);
+					return target ? executeTrackDecisionRangeWithIdFallback(command.kind, target, state.selection.activeChangeIds[0], story) : 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);
 		if (!resolved) return false;
-		return executeTrackDecisionTarget(command.kind, resolved.target, resolved.changeId);
+		return executeTrackDecisionTarget(command.kind, resolved.target, resolved.changeId, resolved.story);
 	}
 	function executeListToggleCommand(kind, payload) {
 		const lists = getEditCommands()?.lists;
@@ -7700,11 +7885,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 +7920,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) {
@@ -7880,10 +8079,12 @@ function createSuperDocUI(options) {
 	};
 	const trackChangesSub = sliceHandle((s) => s.trackChanges);
 	const navigateTrackChange = (step, options$1) => {
-		const rows = trackChangesSub.get().items.filter((item) => readEntityId(item) !== null);
-		if (rows.length === 0) return null;
+		const allRows = trackChangesSub.get().items.filter((item) => readEntityId(item) !== null);
+		if (allRows.length === 0) return null;
 		const currentId = state.trackChanges.activeId;
 		const currentStory = explicitActiveChange?.id === currentId ? explicitActiveChange.story : void 0;
+		const bodyRows = allRows.filter((row) => readEntityRequestStory(row) == null);
+		const rows = currentStory || bodyRows.length === 0 ? allRows : bodyRows;
 		let currentIdx = currentId ? rows.findIndex((row) => entityRowMatchesRequest(row, currentId, currentStory)) : -1;
 		if (currentIdx === -1 && currentId && currentStory) currentIdx = rows.findIndex((row) => entityRowMatchesRequest(row, currentId));
 		const nextRow = rows[currentIdx === -1 ? step > 0 ? 0 : rows.length - 1 : (currentIdx + step + rows.length) % rows.length];
@@ -7908,33 +8109,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) => {
@@ -7976,7 +8185,7 @@ function createSuperDocUI(options) {
 			if (!input || typeof input !== "object" || typeof input.x !== "number" || typeof input.y !== "number") return null;
 			const hits = entityAt(input);
 			if (hits.length === 0) return null;
-			const bodyItems = trackChangesSub.get().items;
+			const items = trackChangesSub.get().items;
 			let allStoryItems;
 			for (const hit of hits) {
 				if (hit.type !== "trackedChange") continue;
@@ -7985,7 +8194,7 @@ function createSuperDocUI(options) {
 					if (allStoryItems === void 0) allStoryItems = readAllStoryTrackChanges();
 					if (!allStoryItems) continue;
 					candidates = allStoryItems;
-				} else candidates = bodyItems;
+				} else candidates = items;
 				const item = candidates.find((candidate) => entityRowMatchesRequest(candidate, hit.id, hit.story));
 				if (item) return hit.story ? {
 					id: item.id,
@@ -8019,10 +8228,12 @@ function createSuperDocUI(options) {
 				if (!allStoryItems.some((row) => entityRowMatchesRequest(row, publicId, requested.story))) return false;
 				requested.id = publicId;
 			} else {
-				const bodyItems = trackChangesSub.get().items;
-				const publicId = buildTrackedChangeIdContext(bodyItems).toPublicId(requested.id) ?? requested.id;
-				if (!bodyItems.some((item) => readEntityId(item) === publicId)) return false;
+				const items = trackChangesSub.get().items;
+				const publicId = buildTrackedChangeIdContext(items).toPublicId(requested.id) ?? requested.id;
+				const item = items.find((candidate) => readEntityId(candidate) === publicId);
+				if (!item) return false;
 				requested.id = publicId;
+				requested.story = readEntityRequestStory(item);
 			}
 			if (paintedEntityId !== requested.id) requested.paintedEntityId = paintedEntityId;
 			setExplicitActiveChange(requested);
@@ -8036,47 +8247,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);
 			}
 		}
 	};
@@ -8331,8 +8560,8 @@ function createSuperDocUI(options) {
 		const rawHits = collectEntityHitsFromChain(startEls[0], container);
 		for (let i = 1; i < startEls.length; i += 1) for (const hit of collectEntityHitsFromChain(startEls[i], container)) rawHits.push(hit);
 		if (rawHits.length === 0) return rawHits;
-		const bodyItems = trackChangesSub.get().items;
-		const bodyIdContext = buildTrackedChangeIdContext(bodyItems);
+		const items = trackChangesSub.get().items;
+		const idContext = buildTrackedChangeIdContext(items);
 		let allStoryItems;
 		const seen = /* @__PURE__ */ new Set();
 		const hits = [];
@@ -8352,7 +8581,7 @@ function createSuperDocUI(options) {
 				publicId = buildStoryScopedTrackedChangeIdContext(allStoryItems, story).toPublicId(hit.id);
 				if (!publicId || !allStoryItems.some((item) => entityRowMatchesRequest(item, publicId, story))) continue;
 			} else {
-				publicId = bodyIdContext.toPublicId(hit.id);
+				publicId = idContext.toPublicId(hit.id);
 				if (!publicId) continue;
 			}
 			const key = `trackedChange:${publicId}`;