superdoc 2.0.0-next.26 → 2.0.0-next.28

package/dist/chunks/{create-super-doc-ui-CBs8xQUw.es.js → create-super-doc-ui-BlnUCtrx.es.js}

@@ -311,7 +311,8 @@ const SUPERDOC_UI_REASONS = {
 	historyEmpty: "history-empty",
 	searchUnavailable: "search-unavailable",
 	searchInvalidPattern: "search-invalid-pattern",
-	replaceUnsupported: "replace-unsupported"
+	replaceUnsupported: "replace-unsupported",
+	contentControlLocked: "content-control-locked"
 };
 const BUILT_IN_COMMAND_IDS = {
 	bold: "bold",
@@ -1393,6 +1394,17 @@ function readEntityId(row) {
 	const id = record.id ?? record.commentId ?? record.changeId;
 	return typeof id === "string" && id.length > 0 ? id : null;
 }
+function readCollapsedHostTrackChangeId(snapshot) {
+	if (!snapshot || typeof snapshot !== "object") return null;
+	const record = snapshot;
+	const anchor = record.anchor;
+	const focus = record.focus;
+	const anchorVisual = anchor?.visualCaret;
+	const focusVisual = focus?.visualCaret;
+	const anchorId = anchorVisual?.trackChangeId;
+	const focusId = focusVisual?.trackChangeId;
+	return typeof anchorId === "string" && anchorId.length > 0 && anchorId === focusId ? anchorId : null;
+}
 var trackedChangeIdContextCache = /* @__PURE__ */ new WeakMap();
 function readTrackChangeProvenanceIds(item) {
 	const out = [];
@@ -1543,12 +1555,11 @@ function paragraphTarget(blockId, story) {
 		...story && typeof story === "object" ? { story } : {}
 	};
 }
-function listsBlockTarget(blockId, story) {
+function listsBlockTarget(blockId) {
 	return {
 		kind: "block",
 		nodeType: "paragraph",
-		nodeId: blockId,
-		...story && typeof story === "object" ? { story } : {}
+		nodeId: blockId
 	};
 }
 function listItemTarget(blockId, story) {
@@ -2295,6 +2306,40 @@ function createSuperDocUI(options) {
 		const host = getEditor()?.host;
 		return host && typeof host === "object" ? host : null;
 	};
+	const resolveActiveHeaderFooterSlot = (story) => {
+		if (story.storyType !== "headerFooterPart" || typeof story.refId !== "string") return null;
+		const editor = getEditor();
+		const host = getHost();
+		const pageLayout = editor?.pageLayout ?? host?.pageLayout;
+		if (!pageLayout || typeof pageLayout !== "object") return null;
+		const getActiveRulerContext = pageLayout.getActiveRulerContext;
+		const resolveEditTarget = host?.resolveHeaderFooterEditTarget;
+		if (typeof getActiveRulerContext !== "function" || typeof resolveEditTarget !== "function") return null;
+		const active = safeCall(() => getActiveRulerContext.call(pageLayout), null);
+		if (!active || typeof active.pageIndex !== "number") return null;
+		for (const headerFooterKind of ["header", "footer"]) {
+			const resolved = safeCall(() => resolveEditTarget.call(host, {
+				pageIndex: active.pageIndex,
+				kind: headerFooterKind
+			}), null);
+			if (resolved?.status !== "ready" || resolved.refId !== story.refId || typeof resolved.sectionId !== "string" || ![
+				"default",
+				"first",
+				"even"
+			].includes(String(resolved.slotVariant))) continue;
+			return {
+				kind: "story",
+				storyType: "headerFooterSlot",
+				section: {
+					kind: "section",
+					sectionId: resolved.sectionId
+				},
+				headerFooterKind,
+				variant: resolved.slotVariant
+			};
+		}
+		return null;
+	};
 	const readPendingInlineFormat = () => {
 		const host = getHost();
 		const fn = host?.getPendingInlineFormat;
@@ -2407,6 +2452,31 @@ function createSuperDocUI(options) {
 	let explicitActiveChange = null;
 	let explicitActiveChangeRevision = 0;
 	let queuedTrackChangeNavigationInvalidation = 0;
+	const mirrorTrackedChangeFocusToHost = (next) => {
+		const host = getHost();
+		if (typeof host?.getHandles !== "function") return;
+		const handles = safeCall(() => host.getHandles(), null);
+		const review = handles?.review;
+		if (!review) return;
+		if (next) {
+			if (typeof review.setActiveReviewTarget !== "function") return;
+			const layout = handles?.layout;
+			safeCall(() => review.setActiveReviewTarget({
+				entityType: "trackedChange",
+				entityId: next.id,
+				...next.paintedEntityId ? { paintedEntityId: next.paintedEntityId } : {},
+				origin: "panel",
+				layoutEpoch: typeof layout?.generation === "number" ? layout.generation : 0,
+				story: next.story ?? {
+					kind: "story",
+					storyType: "body"
+				}
+			}), null);
+			return;
+		}
+		if (typeof review.getActiveReviewTarget !== "function" || typeof review.clearActiveReviewTarget !== "function") return;
+		if (safeCall(() => review.getActiveReviewTarget(), null)?.entityType === "trackedChange") safeCall(() => review.clearActiveReviewTarget(), void 0);
+	};
 	const setExplicitActiveChange = (next, options$1) => {
 		explicitActiveChange = next;
 		explicitActiveChangeRevision += 1;
@@ -2420,6 +2490,8 @@ function createSuperDocUI(options) {
 	let lastEffectiveInlineReadKey = null;
 	let pendingEffectiveInlineRead = null;
 	let asyncRefreshScheduled = false;
+	let asyncReadFailureRetryTimer = null;
+	let asyncReadFailureRetryAtMs = 0;
 	let foregroundAsyncRetryTimer = null;
 	let pendingSelectionSeedValidationToken = null;
 	let typingContentInvalidationTimer = null;
@@ -2434,6 +2506,19 @@ function createSuperDocUI(options) {
 		if (typeof queueMicrotask === "function") queueMicrotask(run);
 		else Promise.resolve().then(run);
 	};
+	const ASYNC_READ_FAILURE_RETRY_BASE_MS = 250;
+	const ASYNC_READ_FAILURE_RETRY_MAX_MS = 5e3;
+	const scheduleAsyncReadFailureRetry = (retryAtMs) => {
+		if (disposed) return;
+		if (asyncReadFailureRetryTimer && asyncReadFailureRetryAtMs <= retryAtMs) return;
+		if (asyncReadFailureRetryTimer) clearTimeout(asyncReadFailureRetryTimer);
+		asyncReadFailureRetryAtMs = retryAtMs;
+		asyncReadFailureRetryTimer = setTimeout(() => {
+			asyncReadFailureRetryTimer = null;
+			asyncReadFailureRetryAtMs = 0;
+			if (!disposed) recompute();
+		}, Math.max(0, retryAtMs - Date.now()));
+	};
 	const editorIdentityIds = /* @__PURE__ */ new WeakMap();
 	let editorIdentityCounter = 0;
 	const editorIdentityId = (editor) => {
@@ -2653,7 +2738,7 @@ function createSuperDocUI(options) {
 			recompute();
 		}
 	});
-	const selectionReadToken = () => `${contentToken()}|s${selectionEpoch}`;
+	const selectionReadToken = () => `${contentToken()}|m${readDocumentMode()}|s${selectionEpoch}`;
 	const selectionSignature = (selection$1) => JSON.stringify({
 		t: selection$1.target ?? null,
 		s: selection$1.selectionTarget ?? null
@@ -2670,7 +2755,7 @@ function createSuperDocUI(options) {
 		const read = host?.getDocumentLoadingSnapshot;
 		if (typeof read !== "function") return "unknown";
 		const stage = safeCall(() => read.call(host), null)?.sourceStage;
-		if (stage === "source-loading") return "loading";
+		if (stage === "opening" || stage === "ready-window" || stage === "source-loading") return "loading";
 		if (stage === "source-complete" || stage === "source-failed" || stage === "source-cancelled") return "complete";
 		return "unknown";
 	};
@@ -2836,17 +2921,24 @@ function createSuperDocUI(options) {
 				token,
 				value: normalize(raw),
 				hasSettled: true,
-				inflightToken: null
+				inflightToken: null,
+				failedToken: null,
+				failureCount: 0,
+				retryAtMs: 0
 			};
 			asyncReads.set(key, settled);
 			return settled;
 		}
 		const prev = asyncReads.get(key);
+		const retryingSameToken = prev?.failedToken === token;
 		asyncReads.set(key, {
 			token: prev?.token ?? null,
 			value: prev?.value ?? null,
 			hasSettled: prev?.hasSettled ?? false,
-			inflightToken: token
+			inflightToken: token,
+			failedToken: retryingSameToken ? token : null,
+			failureCount: retryingSameToken ? prev.failureCount ?? 0 : 0,
+			retryAtMs: 0
 		});
 		Promise.resolve(raw).then((resolved) => {
 			const entry = asyncReads.get(key);
@@ -2855,17 +2947,26 @@ function createSuperDocUI(options) {
 				token,
 				value: normalize(resolved),
 				hasSettled: true,
-				inflightToken: null
+				inflightToken: null,
+				failedToken: null,
+				failureCount: 0,
+				retryAtMs: 0
 			});
 			scheduleAsyncRefresh();
 		}, () => {
 			const entry = asyncReads.get(key);
 			if (!entry || entry.inflightToken !== token) return;
+			const failureCount = entry.failedToken === token ? (entry.failureCount ?? 0) + 1 : 1;
+			const retryDelayMs = Math.min(ASYNC_READ_FAILURE_RETRY_MAX_MS, ASYNC_READ_FAILURE_RETRY_BASE_MS * 2 ** Math.min(failureCount - 1, 8));
+			const retryAtMs = Date.now() + retryDelayMs;
 			asyncReads.set(key, {
 				...entry,
-				inflightToken: null
+				inflightToken: null,
+				failedToken: token,
+				failureCount,
+				retryAtMs
 			});
-			scheduleAsyncRefresh();
+			scheduleAsyncReadFailureRetry(retryAtMs);
 		});
 		return null;
 	};
@@ -2926,6 +3027,17 @@ function createSuperDocUI(options) {
 				status: "pending"
 			};
 		}
+		if (entry?.failedToken === token && entry.inflightToken == null && (entry.retryAtMs ?? 0) > Date.now()) {
+			scheduleAsyncReadFailureRetry(entry.retryAtMs);
+			if (entry.hasSettled) return {
+				value: entry.value,
+				status: "stale"
+			};
+			return {
+				value: null,
+				status: "pending"
+			};
+		}
 		if (!entry && key.startsWith("effInline:") && shouldDeferEffectiveInlineRead(key)) return {
 			value: null,
 			status: "pending"
@@ -2977,6 +3089,9 @@ function createSuperDocUI(options) {
 		reviewMutationReconciler.reset();
 		lastCoordinatorEditor = editor;
 		asyncReads.clear();
+		if (asyncReadFailureRetryTimer) clearTimeout(asyncReadFailureRetryTimer);
+		asyncReadFailureRetryTimer = null;
+		asyncReadFailureRetryAtMs = 0;
 		if (pendingEffectiveInlineRead?.timer) clearTimeout(pendingEffectiveInlineRead.timer);
 		pendingEffectiveInlineRead = null;
 		lastEffectiveInlineReadKey = null;
@@ -3094,14 +3209,15 @@ function createSuperDocUI(options) {
 		const end = target?.end;
 		return start?.kind === "text" && end?.kind === "text" && typeof start.blockId === "string" && start.blockId === end.blockId && typeof start.offset === "number" && start.offset === end.offset;
 	};
-	const seedCaretSelectionFromHost = () => {
+	const seedCaretSelectionFromHost = (hostSelectionSnapshot) => {
 		const host = getHost();
 		const read = host?.readLiveSelectionSyncSnapshot;
 		if (typeof read !== "function") return;
 		const seed = normalizeSelectionInfo(safeCall(() => read.call(host), null));
 		if (!seed || !isCollapsedCaretSnapshot(seed)) return;
 		const token = selectionReadToken();
-		const deferAuthoritativeRead = foregroundMutationActive();
+		const foreground = foregroundMutationState();
+		const deferAuthoritativeRead = Boolean(foreground && (foreground.active > 0 || foreground.pending > 0));
 		if (!deferAuthoritativeRead) {
 			pendingSelectionSeedValidationToken = null;
 			if (issueAsyncRead("selection", token, selectionCurrentRun, normalizeSelectionInfo)) return;
@@ -3111,11 +3227,22 @@ function createSuperDocUI(options) {
 		}
 		const prev = asyncReads.get("selection");
 		const seedMarks = Array.isArray(seed.activeMarks) && seed.activeMarks.length > 0 ? seed.activeMarks : Array.isArray(state.selection.activeMarks) ? state.selection.activeMarks : [];
+		const seedCommentIds = Array.isArray(seed.activeCommentIds) ? seed.activeCommentIds : [];
+		const paintedTrackChangeId = readCollapsedHostTrackChangeId(hostSelectionSnapshot);
+		const previousCaret = collapsedTextAddressFromSelection(state.selection);
+		const nextCaret = collapsedTextAddressFromTarget(seed.selectionTarget) ?? collapsedTextAddressFromTarget(seed.target);
+		const previousRange = previousCaret?.range;
+		const nextRange = nextCaret?.range;
+		const sameActiveTypingCaret = Boolean(foreground && foreground.active > 0 && previousCaret && nextCaret && previousCaret.blockId === nextCaret.blockId && storyLocatorSignature(previousCaret.story) === storyLocatorSignature(nextCaret.story) && typeof previousRange?.start === "number" && typeof nextRange?.start === "number" && Math.abs(nextRange.start - previousRange.start) <= 2);
+		const carriedChangeIds = paintedTrackChangeId != null || sameActiveTypingCaret ? state.selection.activeChangeIds.filter((id) => paintedTrackChangeId == null || buildTrackedChangeIdContext(state.trackChanges.items).aliasesFor(id).includes(paintedTrackChangeId)) : [];
+		const seedChangeIds = Array.isArray(seed.activeChangeIds) && seed.activeChangeIds.length > 0 ? seed.activeChangeIds : carriedChangeIds;
 		asyncReads.set("selection", {
 			token,
 			value: {
 				...seed,
-				activeMarks: seedMarks
+				activeMarks: seedMarks,
+				activeCommentIds: seedCommentIds,
+				activeChangeIds: seedChangeIds
 			},
 			hasSettled: true,
 			inflightToken: deferAuthoritativeRead ? null : prev?.inflightToken ?? null
@@ -3228,22 +3355,29 @@ function createSuperDocUI(options) {
 			activeIds
 		};
 	};
-	const computeActiveContentControlIds = (ccApi, selection$1) => {
+	const computeActiveContentControlLockModes = (ccApi, selection$1) => {
 		if (!ccApi || typeof ccApi.listInRange !== "function") return {
-			ids: [],
+			lockModesById: /* @__PURE__ */ new Map(),
 			status: "ready"
 		};
 		const range = selectionBlockRange(selection$1);
 		if (!range) return {
-			ids: [],
+			lockModesById: /* @__PURE__ */ new Map(),
 			status: "ready"
 		};
 		const { value, status } = readAsync(`contentControls:inRange:${selectionSignature(selection$1)}`, contentToken(), () => ccApi.listInRange(range), (raw) => raw && Array.isArray(raw.items) ? raw.items : []);
 		const rows = value ?? [];
-		const ids = [];
-		for (const row of rows) if (typeof row?.id === "string") ids.push(row.id);
+		const lockModesById = /* @__PURE__ */ new Map();
+		for (const row of rows) if (typeof row?.id === "string") lockModesById.set(row.id, typeof row.lockMode === "string" ? row.lockMode : "unlocked");
+		return {
+			lockModesById,
+			status
+		};
+	};
+	const computeActiveContentControlIds = (ccApi, selection$1) => {
+		const { lockModesById, status } = computeActiveContentControlLockModes(ccApi, selection$1);
 		return {
-			ids,
+			ids: [...lockModesById.keys()],
 			status
 		};
 	};
@@ -3559,14 +3693,20 @@ function createSuperDocUI(options) {
 			frozenProjectedValues = projectedInlineValues;
 			frozenProjectedValuesKey = `${selectionKey(selection$1)}:${contentToken()}`;
 		}
+		const ccApi = doc?.contentControls;
+		const { lockModesById } = computeActiveContentControlLockModes(ccApi, selection$1);
 		const states = {};
-		for (const id of allCommandIds()) states[id] = computeCommandState(id, doc, selection$1, projectedInlineValues);
+		for (const id of allCommandIds()) states[id] = computeCommandState(id, doc, selection$1, projectedInlineValues, lockModesById);
 		return states;
 	};
 	const unavailableRouteReason = (doc) => {
 		if (doc) return SUPERDOC_UI_REASONS.operationUnavailable;
 		return getEditor() ? SUPERDOC_UI_REASONS.documentApiUnavailable : SUPERDOC_UI_REASONS.notReady;
 	};
+	const blocksContentStyling = (lockMode) => lockMode === "contentLocked" || lockMode === "sdtContentLocked";
+	const contentControlLockReason = (lockModesById) => {
+		for (const lockMode of lockModesById.values()) if (blocksContentStyling(lockMode)) return SUPERDOC_UI_REASONS.contentControlLocked;
+	};
 	const trackDecisionReason = (command, supported, readonly, selection$1, doc) => {
 		if (!supported) return command.scope === "all" ? SUPERDOC_UI_REASONS.bulkDecisionsDisabled : unavailableRouteReason(doc);
 		if (readonly) return SUPERDOC_UI_REASONS.documentReadonly;
@@ -3589,7 +3729,7 @@ function createSuperDocUI(options) {
 		if (support && (support.status === "supported" || support.enabled === true)) return void 0;
 		return SUPERDOC_UI_REASONS.bulkDecisionsDisabled;
 	};
-	const computeCommandState = (id, doc, selection$1, projectedInlineValues) => {
+	const computeCommandState = (id, doc, selection$1, projectedInlineValues, lockModesById = /* @__PURE__ */ new Map()) => {
 		if (customCommands.has(id)) return normalizeCommandState({
 			supported: true,
 			enabled: true,
@@ -3664,6 +3804,13 @@ function createSuperDocUI(options) {
 				supported: true,
 				reason: SUPERDOC_UI_REASONS.documentReadonly
 			}, "builtin");
+			const lockReason = contentControlLockReason(lockModesById);
+			if (lockReason) return normalizeCommandState({
+				enabled: false,
+				active: false,
+				supported: true,
+				reason: lockReason
+			}, "builtin");
 			const enabled = selectionBlockIds(selection$1).length > 0 || resolveInlineSelectionTarget(selection$1) != null;
 			return normalizeCommandState({
 				enabled,
@@ -3706,6 +3853,7 @@ function createSuperDocUI(options) {
 		const active = commandActiveState(descriptor, doc, selection$1);
 		const value = routedCommandValue(descriptor, doc, selection$1, projectedInlineValues);
 		if (descriptor.list?.mode === "indent" || descriptor.list?.mode === "outdent") return computeHybridIndentCommandState(descriptor, doc, readonly, selection$1, active, value);
+		if (descriptor.list?.mode === "toggle-seed") return computeListToggleCommandState(descriptor, doc, readonly, selection$1, active, value);
 		if (descriptor.mutates && readonly) return normalizeCommandState({
 			enabled: false,
 			active,
@@ -3713,18 +3861,28 @@ function createSuperDocUI(options) {
 			value,
 			reason: SUPERDOC_UI_REASONS.documentReadonly
 		}, "builtin");
-		if (descriptor.inline && !resolveInlineSelectionTarget(selection$1)) return normalizeCommandState(selectionBlockIds(selection$1).length > 0 && typeof getHost()?.setPendingInlineFormat === "function" ? {
-			enabled: true,
-			active,
-			supported: true,
-			value
-		} : {
-			enabled: false,
-			active,
-			supported: true,
-			value,
-			reason: SUPERDOC_UI_REASONS.rangeSelectionRequired
-		}, "builtin");
+		if (descriptor.inline && !resolveInlineSelectionTarget(selection$1)) {
+			const lockReason = contentControlLockReason(lockModesById);
+			if (lockReason) return normalizeCommandState({
+				enabled: false,
+				active,
+				supported: true,
+				value,
+				reason: lockReason
+			}, "builtin");
+			return normalizeCommandState(selectionBlockIds(selection$1).length > 0 && typeof getHost()?.setPendingInlineFormat === "function" ? {
+				enabled: true,
+				active,
+				supported: true,
+				value
+			} : {
+				enabled: false,
+				active,
+				supported: true,
+				value,
+				reason: SUPERDOC_UI_REASONS.rangeSelectionRequired
+			}, "builtin");
+		}
 		if ((descriptor.blockParagraph || descriptor.list) && selectionBlockIds(selection$1).length === 0) return normalizeCommandState({
 			enabled: false,
 			active,
@@ -3738,6 +3896,16 @@ function createSuperDocUI(options) {
 			supported: true,
 			reason: SUPERDOC_UI_REASONS.rangeSelectionRequired
 		}, "builtin");
+		if (descriptor.inline) {
+			const lockReason = contentControlLockReason(lockModesById);
+			if (lockReason) return normalizeCommandState({
+				enabled: false,
+				active,
+				supported: true,
+				value,
+				reason: lockReason
+			}, "builtin");
+		}
 		return normalizeCommandState({
 			enabled: true,
 			active,
@@ -3822,47 +3990,81 @@ function createSuperDocUI(options) {
 		}
 		if (descriptor.id === "link") return readActiveLinkHref(doc, selection$1) ?? void 0;
 	};
-	const readListStateForBlock = (doc, blockId) => {
+	const readListStateSnapshotForBlock = (doc, blockId, story) => {
 		const listsApi = doc?.lists;
-		if (!listsApi || typeof listsApi.getState !== "function") return null;
-		const { value: result } = readAsync(`lists:${blockId}`, contentToken(), () => listsApi.getState({ target: listsBlockTarget(blockId) }), (raw) => raw && typeof raw === "object" ? raw : null);
-		return result?.success === true ? result : null;
+		if (!listsApi) return {
+			value: null,
+			status: "ready"
+		};
+		const isBodyStory = story.storyType === "body";
+		const readState = typeof listsApi.getStateInStory === "function" ? () => listsApi.getStateInStory({
+			target: listsBlockTarget(blockId),
+			story
+		}) : isBodyStory && typeof listsApi.getState === "function" ? () => listsApi.getState({ target: listsBlockTarget(blockId) }) : null;
+		if (!readState) return {
+			value: null,
+			status: "ready"
+		};
+		const { value: result, status } = readAsync(`lists:${storyLocatorSignature(story)}:${blockId}`, contentToken(), readState, (raw) => raw && typeof raw === "object" ? raw : null);
+		return {
+			value: result?.success === true ? result : null,
+			status
+		};
 	};
-	const readListSeedForBlock = (doc, blockId) => {
-		const result = readListStateForBlock(doc, blockId);
+	const readListStateForBlock = (doc, blockId, story) => {
+		return readListStateSnapshotForBlock(doc, blockId, story).value;
+	};
+	const readListSeedForBlock = (doc, blockId, story) => {
+		const result = readListStateForBlock(doc, blockId, story);
 		if (!result || result.isListItem !== true) return null;
 		return result.seed === "bullet" || result.seed === "ordered" ? result.seed : null;
 	};
-	const readListMembershipForBlock = (doc, blockId) => {
-		const result = readListStateForBlock(doc, blockId);
-		return result && typeof result.isListItem === "boolean" ? result.isListItem : null;
+	const readListMembershipSnapshotForBlock = (doc, blockId, story) => {
+		const snapshot = readListStateSnapshotForBlock(doc, blockId, story);
+		const result = snapshot.value;
+		return {
+			value: result && typeof result.isListItem === "boolean" ? result.isListItem : null,
+			status: snapshot.status
+		};
 	};
 	const readListSeed = (doc, selection$1) => {
 		const blockIds = selectionBlockIds(selection$1);
 		if (blockIds.length === 0 || !canProbeEverySelectedBlock(blockIds)) return null;
-		const firstSeed = readListSeedForBlock(doc, blockIds[0]);
+		const story = selectionStory(selection$1);
+		const firstSeed = readListSeedForBlock(doc, blockIds[0], story);
 		if (firstSeed !== "bullet" && firstSeed !== "ordered") return null;
-		for (const blockId of blockIds.slice(1)) if (readListSeedForBlock(doc, blockId) !== firstSeed) return null;
+		for (const blockId of blockIds.slice(1)) if (readListSeedForBlock(doc, blockId, story) !== firstSeed) return null;
 		return firstSeed;
 	};
-	const readNodeById = (doc, blockId) => {
-		if (!doc || typeof doc.getNodeById !== "function") return {
+	const readNodeById = (doc, blockId, story) => {
+		if (!doc) return {
+			value: null,
+			status: "ready"
+		};
+		const storySignature = storyLocatorSignature(story);
+		const isBodyStory = storySignature === "story:body";
+		if (isBodyStory && typeof doc.getNodeById !== "function") return {
+			value: null,
+			status: "ready"
+		};
+		if (!isBodyStory && typeof doc.getNode !== "function") return {
 			value: null,
 			status: "ready"
 		};
-		return readAsync(`node:${blockId}`, contentToken(), () => doc.getNodeById({
+		return readAsync(`node:${storySignature}:${blockId}`, contentToken(), () => isBodyStory ? doc.getNodeById({
 			nodeId: blockId,
 			nodeType: "paragraph"
-		}), (raw) => raw && typeof raw === "object" ? raw : null);
+		}) : doc.getNode(paragraphTarget(blockId, story)), (raw) => raw && typeof raw === "object" ? raw : null);
 	};
 	const resolveListMembershipForBlockAsync = async (doc, blockId, story) => {
 		const listsApi = doc?.lists;
 		if (!listsApi) return null;
 		try {
+			const isBodyStory = story.storyType === "body";
 			const raw = typeof listsApi.getStateInStory === "function" ? await listsApi.getStateInStory({
 				target: listsBlockTarget(blockId),
 				story
-			}) : typeof listsApi.getState === "function" ? await listsApi.getState({ target: listsBlockTarget(blockId) }) : null;
+			}) : isBodyStory && typeof listsApi.getState === "function" ? await listsApi.getState({ target: listsBlockTarget(blockId) }) : null;
 			const result = raw && typeof raw === "object" ? raw : null;
 			if (!result || result.success !== true || typeof result.isListItem !== "boolean") return null;
 			return result.isListItem;
@@ -3870,13 +4072,42 @@ function createSuperDocUI(options) {
 			return null;
 		}
 	};
-	const resolveParagraphIndentationForBlockAsync = async (doc, blockId) => {
-		if (!doc || typeof doc.getNodeById !== "function") return null;
+	const resolveListSeedForBlock = (doc, blockId, story) => {
+		const unavailable = {
+			resolved: false,
+			seed: null
+		};
+		const listsApi = doc?.lists;
+		if (!listsApi) return unavailable;
+		const isBodyStory = story.storyType === "body";
+		const readState = typeof listsApi.getStateInStory === "function" ? () => listsApi.getStateInStory({
+			target: listsBlockTarget(blockId),
+			story
+		}) : isBodyStory && typeof listsApi.getState === "function" ? () => listsApi.getState({ target: listsBlockTarget(blockId) }) : null;
+		if (!readState) return unavailable;
+		const normalize = (raw) => {
+			const result = raw && typeof raw === "object" ? raw : null;
+			if (!result || result.success !== true || typeof result.isListItem !== "boolean") return unavailable;
+			return {
+				resolved: true,
+				seed: result.isListItem === true && (result.seed === "bullet" || result.seed === "ordered") ? result.seed : null
+			};
+		};
+		try {
+			const raw = readState();
+			return isPromiseLike(raw) ? Promise.resolve(raw).then(normalize, () => unavailable) : normalize(raw);
+		} catch {
+			return unavailable;
+		}
+	};
+	const resolveParagraphIndentationForBlockAsync = async (doc, blockId, story) => {
+		if (!doc) return null;
 		try {
-			const raw = await doc.getNodeById({
+			const isBodyStory = !story || story.storyType === "body";
+			const raw = story && typeof doc.getNode === "function" ? await doc.getNode(paragraphTarget(blockId, story)) : isBodyStory && typeof doc.getNodeById === "function" ? await doc.getNodeById({
 				nodeId: blockId,
 				nodeType: "paragraph"
-			});
+			}) : null;
 			return readParagraphIndentationFromResult(raw && typeof raw === "object" ? raw : null);
 		} catch {
 			return null;
@@ -3901,9 +4132,50 @@ function createSuperDocUI(options) {
 		const listOp = descriptor.docRoute ? resolveDocOperation(doc, descriptor.docRoute) : null;
 		const paragraphSetIndent = resolveDocOperation(doc, "format.paragraph.setIndentation");
 		const paragraphClearIndent = resolveDocOperation(doc, "format.paragraph.clearIndentation");
-		const paragraphOpAvailable = descriptor.list?.mode === "indent" ? paragraphSetIndent != null : paragraphSetIndent != null || paragraphClearIndent != null;
-		for (const blockId of blockIds) {
-			const isListItem = readListMembershipForBlock(doc, blockId);
+		const mode = descriptor.list?.mode;
+		const paragraphOpAvailable = mode === "indent" ? paragraphSetIndent != null : paragraphSetIndent != null || paragraphClearIndent != null;
+		const story = selectionStory(selection$1);
+		let listMembership = null;
+		if (story.storyType !== "body") {
+			listMembership = [];
+			for (const blockId of blockIds) {
+				const { value: isListItem, status } = readListMembershipSnapshotForBlock(doc, blockId, story);
+				if (isListItem === null) {
+					if (status !== "ready" && (listOp != null || paragraphOpAvailable)) return normalizeCommandState({
+						enabled: true,
+						active,
+						supported: true,
+						value
+					}, "builtin");
+					return normalizeCommandState({
+						enabled: false,
+						active,
+						supported: false,
+						value,
+						reason: unavailableRouteReason(doc)
+					}, "builtin");
+				}
+				listMembership.push(isListItem);
+			}
+		}
+		if (listMembership?.some((isListItem) => isListItem === true)) {
+			const rangeRoute = mode === "indent" ? "lists.indentRange" : "lists.outdentRange";
+			const canUseRange = readDocumentMode() !== "suggesting" && listMembership.every((isListItem) => isListItem === true) && resolveDocOperation(doc, rangeRoute) != null;
+			const canUseStoryOutdent = mode === "outdent" && resolveDocOperation(doc, "lists.outdentInStory") != null;
+			if (!canUseRange && !canUseStoryOutdent) return normalizeCommandState({
+				enabled: false,
+				active,
+				supported: false,
+				value,
+				reason: unavailableRouteReason(doc)
+			}, "builtin");
+		}
+		for (const [index, blockId] of blockIds.entries()) {
+			const membership = listMembership ? {
+				value: listMembership[index] ?? null,
+				status: "ready"
+			} : readListMembershipSnapshotForBlock(doc, blockId, story);
+			const isListItem = membership.value;
 			if (isListItem === true) {
 				if (listOp != null) return normalizeCommandState({
 					enabled: true,
@@ -3913,18 +4185,30 @@ function createSuperDocUI(options) {
 				}, "builtin");
 				continue;
 			}
-			if (isListItem === false && paragraphOpAvailable) return normalizeCommandState({
-				enabled: true,
-				active,
-				supported: true,
-				value
-			}, "builtin");
-			if (isListItem === null && (listOp != null || paragraphOpAvailable)) return normalizeCommandState({
-				enabled: true,
-				active,
-				supported: true,
-				value
-			}, "builtin");
+			if (isListItem === false && paragraphOpAvailable) {
+				if (story.storyType !== "body" && typeof doc?.getNode !== "function") continue;
+				return normalizeCommandState({
+					enabled: true,
+					active,
+					supported: true,
+					value
+				}, "builtin");
+			}
+			if (isListItem === null) {
+				if (membership.status !== "ready" && (listOp != null || paragraphOpAvailable)) return normalizeCommandState({
+					enabled: true,
+					active,
+					supported: true,
+					value
+				}, "builtin");
+				return normalizeCommandState({
+					enabled: false,
+					active,
+					supported: false,
+					value,
+					reason: unavailableRouteReason(doc)
+				}, "builtin");
+			}
 		}
 		return normalizeCommandState({
 			enabled: false,
@@ -3934,6 +4218,86 @@ function createSuperDocUI(options) {
 			reason: unavailableRouteReason(doc)
 		}, "builtin");
 	};
+	const computeListToggleCommandState = (descriptor, doc, readonly, selection$1, active, value) => {
+		if (descriptor.mutates && readonly) return normalizeCommandState({
+			enabled: false,
+			active,
+			supported: true,
+			value,
+			reason: SUPERDOC_UI_REASONS.documentReadonly
+		}, "builtin");
+		const blockIds = selectionBlockIds(selection$1);
+		if (blockIds.length === 0) return normalizeCommandState({
+			enabled: false,
+			active,
+			supported: true,
+			value,
+			reason: SUPERDOC_UI_REASONS.selectionRequired
+		}, "builtin");
+		const story = selectionStory(selection$1);
+		const listsApi = doc?.lists;
+		if (!(typeof listsApi?.getStateInStory === "function" || story.storyType === "body" && typeof listsApi?.getState === "function")) return normalizeCommandState({
+			enabled: false,
+			active,
+			supported: false,
+			value,
+			reason: SUPERDOC_UI_REASONS.operationUnavailable
+		}, "builtin");
+		if (!canProbeEverySelectedBlock(blockIds)) return normalizeCommandState(story.storyType === "body" && resolveDocOperation(doc, "lists.remove") != null ? {
+			enabled: true,
+			active,
+			supported: true,
+			value
+		} : {
+			enabled: false,
+			active,
+			supported: false,
+			value,
+			reason: SUPERDOC_UI_REASONS.operationUnavailable
+		}, "builtin");
+		const snapshots = blockIds.map((blockId) => readListStateSnapshotForBlock(doc, blockId, story));
+		if (snapshots.some(({ status }) => status !== "ready")) return normalizeCommandState({
+			enabled: true,
+			active,
+			supported: true,
+			value
+		}, "builtin");
+		if (snapshots.some(({ value: state$1 }) => state$1 === null)) return normalizeCommandState({
+			enabled: false,
+			active,
+			supported: false,
+			value,
+			reason: SUPERDOC_UI_REASONS.operationUnavailable
+		}, "builtin");
+		const seed = descriptor.list?.seed;
+		const shouldRemove = snapshots.every(({ value: state$1 }) => state$1?.isListItem === true && state$1.seed === seed);
+		if (story.storyType === "body") return normalizeCommandState(!shouldRemove || resolveDocOperation(doc, "lists.remove") != null ? {
+			enabled: true,
+			active,
+			supported: true,
+			value
+		} : {
+			enabled: false,
+			active,
+			supported: false,
+			value,
+			reason: SUPERDOC_UI_REASONS.operationUnavailable
+		}, "builtin");
+		const removeInStory = resolveDocOperation(doc, "lists.removeInStory");
+		if (shouldRemove && removeInStory) return normalizeCommandState({
+			enabled: true,
+			active,
+			supported: true,
+			value
+		}, "builtin");
+		return normalizeCommandState({
+			enabled: false,
+			active,
+			supported: false,
+			value,
+			reason: SUPERDOC_UI_REASONS.operationUnavailable
+		}, "builtin");
+	};
 	const readActiveLinkHref = (doc, selection$1) => {
 		const href = (resolveCurrentHyperlink(doc, selection$1)?.properties)?.href;
 		return typeof href === "string" ? href : null;
@@ -4048,8 +4412,8 @@ function createSuperDocUI(options) {
 			status: combineStatus(full.status, quickResult.status)
 		};
 	};
-	const readBlockStyleRef = (doc, blockId) => {
-		const { value: result, status } = readNodeById(doc, blockId);
+	const readBlockStyleRef = (doc, blockId, story) => {
+		const { value: result, status } = readNodeById(doc, blockId, story);
 		if (!result) return {
 			ok: false,
 			styleRef: null,
@@ -4128,8 +4492,9 @@ function createSuperDocUI(options) {
 		let blockReadFailures = 0;
 		let defaultReadFailures = 0;
 		let readStatus = "ready";
+		const story = selectionStory(selection$1);
 		for (const blockId of blockIds) {
-			const read = readBlockStyleRef(doc, blockId);
+			const read = readBlockStyleRef(doc, blockId, story);
 			readStatus = combineStatus(readStatus, read.status);
 			if (!read.ok) {
 				blockReadFailures += 1;
@@ -4273,9 +4638,9 @@ function createSuperDocUI(options) {
 		currentHostSelectionSource = next;
 		if (!next) return;
 		try {
-			const unsubscribe = next.subscribe(() => {
+			const unsubscribe = next.subscribe((snapshot) => {
 				selectionEpoch += 1;
-				seedCaretSelectionFromHost();
+				seedCaretSelectionFromHost(snapshot);
 				recompute();
 			});
 			if (typeof unsubscribe === "function") detachHostSelection = unsubscribe;
@@ -4428,6 +4793,39 @@ function createSuperDocUI(options) {
 	function readTrackDecisionTargetId(target) {
 		return target && typeof target === "object" && typeof target.id === "string" ? String(target.id) : null;
 	}
+	function trackDecisionRangeFromSelection(selection$1) {
+		if (selection$1.empty) return null;
+		const explicit = selection$1.selectionTarget;
+		const start = explicit?.start;
+		const end = explicit?.end;
+		if (explicit?.kind !== "selection" || start?.kind !== "text" || end?.kind !== "text" || typeof start.blockId !== "string" || start.blockId !== end.blockId || !Number.isInteger(start.offset) || !Number.isInteger(end.offset) || start.offset < 0 || end.offset < 0 || start.offset === end.offset) return null;
+		const rangeStart = Math.min(start.offset, end.offset);
+		const rangeEnd = Math.max(start.offset, end.offset);
+		const story = selectionStoryLocator(selection$1);
+		return {
+			kind: "text",
+			...story ? { story } : {},
+			segments: [{
+				blockId: start.blockId,
+				range: {
+					start: rangeStart,
+					end: rangeEnd
+				}
+			}]
+		};
+	}
+	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));
+		if (!item) return "unavailable";
+		const type = trackChangesItemPayload(item).type;
+		const grouping = trackChangesItemPayload(item).grouping;
+		return (type === "insertion" || type === "deletion" || type === "insert" || type === "delete") && grouping === "standalone" ? "range" : "id";
+	}
 	function resolveTrackDecisionTarget(command, payload) {
 		if (command.scope === "all") return {
 			target: { scope: "all" },
@@ -4465,6 +4863,23 @@ function createSuperDocUI(options) {
 		} : null;
 	}
 	function executeTrackDecisionCommand(command, payload) {
+		if (command.scope === "id" && payload == null) {
+			if (state.selection.activeChangeIds.length > 1) return executeTrackDecisionTarget(command.kind, {
+				kind: "ids",
+				ids: state.selection.activeChangeIds
+			}, null);
+			if (state.selection.activeChangeIds.length === 1 && !state.selection.empty && state.selection.selectionTarget) {
+				const route = activeChangePartialDecisionRoute();
+				if (route === "unavailable") return false;
+				if (route === "range") {
+					const range = trackDecisionRangeFromSelection(state.selection);
+					return range ? executeTrackDecisionTarget(command.kind, {
+						kind: "range",
+						range
+					}, null) : false;
+				}
+			}
+		}
 		const resolved = resolveTrackDecisionTarget(command, payload);
 		if (!resolved) return false;
 		return executeTrackDecisionTarget(command.kind, resolved.target, resolved.changeId);
@@ -4653,8 +5068,8 @@ function createSuperDocUI(options) {
 			offsetSpace: "selection"
 		});
 	};
-	const buildBlockParagraphInput = (spec, blockId, payload) => {
-		const target = paragraphTarget(blockId);
+	const buildBlockParagraphInput = (spec, blockId, payload, story) => {
+		const target = paragraphTarget(blockId, story);
 		switch (spec.kind) {
 			case "alignment": {
 				const alignment = payload;
@@ -4724,6 +5139,9 @@ function createSuperDocUI(options) {
 		return true;
 	};
 	const executeClearFormattingCommand = () => {
+		const doc = getDoc();
+		const { lockModesById } = computeActiveContentControlLockModes(doc?.contentControls, state.selection);
+		if (contentControlLockReason(lockModesById)) return false;
 		const immediateResults = [];
 		const settledResults = [];
 		const record = (result) => {
@@ -4739,7 +5157,6 @@ function createSuperDocUI(options) {
 				settledResults.push(Promise.resolve(false));
 			}
 		};
-		const doc = getDoc();
 		const defaultStyleId = getStyleCatalog().cache?.full.defaults.paragraphStyleId ?? DEFAULT_PARAGRAPH_STYLE_ID;
 		const rangeTarget = resolveInlineSelectionTarget(state.selection);
 		if (rangeTarget) {
@@ -4755,13 +5172,19 @@ function createSuperDocUI(options) {
 			}
 		}
 		const resetOp = resolveDocOperation(doc, "format.paragraph.resetDirectFormatting");
-		const listsRemoveOp = resolveDocOperation(doc, "lists.remove");
 		const setStyleRefOp = resolveDocOperation(doc, "styles.paragraph.setStyleRef");
+		const story = selectionStoryLocator(state.selection);
+		const isBodyStory = !story || story.storyType === "body";
+		const listsRemoveOp = resolveDocOperation(doc, isBodyStory ? "lists.remove" : "lists.removeInStory");
 		for (const blockId of selectionBlockIds(state.selection)) {
-			const target = paragraphTarget(blockId);
+			const target = paragraphTarget(blockId, story);
 			if (resetOp) run(resetOp, { target });
 			if (listsRemoveOp) try {
-				const r = settleOperationResult(listsRemoveOp({ target }));
+				const listTarget = listsBlockTarget(blockId);
+				const r = settleOperationResult(listsRemoveOp(isBodyStory ? { target: listTarget } : {
+					target: listTarget,
+					story
+				}));
 				settledResults.push(r.settled.then((s) => commandResultSucceeded(s) ? s : true));
 			} catch {}
 			if (setStyleRefOp) run(setStyleRefOp, {
@@ -4772,7 +5195,7 @@ function createSuperDocUI(options) {
 		if (!rangeTarget && readDocumentMode() !== "suggesting") {
 			const setMarkRunPropsOp = resolveDocOperation(doc, "format.paragraph.setMarkRunProps");
 			if (setMarkRunPropsOp) for (const blockId of selectionBlockIds(state.selection)) run(setMarkRunPropsOp, {
-				target: paragraphTarget(blockId),
+				target: paragraphTarget(blockId, story),
 				markRunProps: {
 					bold: false,
 					italic: false,
@@ -4790,7 +5213,8 @@ function createSuperDocUI(options) {
 	const executeBlockParagraph = (descriptor, op, payload) => {
 		const blockIds = selectionBlockIds(state.selection);
 		if (blockIds.length === 0) return false;
-		return applyPerBlock(descriptor.docRoute, op, blockIds, (blockId) => buildBlockParagraphInput(descriptor.blockParagraph, blockId, payload));
+		const story = selectionStoryLocator(state.selection);
+		return applyPerBlock(descriptor.docRoute, op, blockIds, (blockId) => buildBlockParagraphInput(descriptor.blockParagraph, blockId, payload, story));
 	};
 	const executeHybridIndentCommand = (descriptor, listOp, blockIds) => {
 		const doc = getDoc();
@@ -4798,6 +5222,7 @@ function createSuperDocUI(options) {
 		const paragraphClearIndent = resolveDocOperation(doc, "format.paragraph.clearIndentation");
 		const mode = descriptor.list?.mode;
 		const story = selectionStory(state.selection);
+		const targetStory = selectionStoryLocator(state.selection);
 		const planBlock = async (blockId) => {
 			const isListItem = await resolveListMembershipForBlockAsync(doc, blockId, story);
 			if (isListItem === true) return {
@@ -4807,7 +5232,8 @@ function createSuperDocUI(options) {
 				input: { target: listItemTarget(blockId) }
 			};
 			if (isListItem === null) return null;
-			const current = await resolveParagraphIndentationForBlockAsync(doc, blockId);
+			if (targetStory && targetStory.storyType !== "body" && typeof doc?.getNode !== "function") return null;
+			const current = await resolveParagraphIndentationForBlockAsync(doc, blockId, targetStory);
 			const preserved = {};
 			if (current?.right != null) preserved.right = current.right;
 			if (current?.firstLine != null) preserved.firstLine = current.firstLine;
@@ -4819,7 +5245,7 @@ function createSuperDocUI(options) {
 					routeToCall: "format.paragraph.setIndentation",
 					opToCall: paragraphSetIndent,
 					input: {
-						target: paragraphTarget(blockId),
+						target: paragraphTarget(blockId, targetStory),
 						left: Math.max(0, current?.left ?? 0) + PARAGRAPH_INDENT_STEP_TWIPS,
 						...preserved
 					}
@@ -4832,14 +5258,14 @@ function createSuperDocUI(options) {
 					kind: "paragraph",
 					routeToCall: "format.paragraph.clearIndentation",
 					opToCall: paragraphClearIndent,
-					input: { target: paragraphTarget(blockId) }
+					input: { target: paragraphTarget(blockId, targetStory) }
 				};
 				if (paragraphSetIndent) return {
 					kind: "paragraph",
 					routeToCall: "format.paragraph.setIndentation",
 					opToCall: paragraphSetIndent,
 					input: {
-						target: paragraphTarget(blockId),
+						target: paragraphTarget(blockId, targetStory),
 						left: 0
 					}
 				};
@@ -4850,7 +5276,7 @@ function createSuperDocUI(options) {
 				routeToCall: "format.paragraph.setIndentation",
 				opToCall: paragraphSetIndent,
 				input: {
-					target: paragraphTarget(blockId),
+					target: paragraphTarget(blockId, targetStory),
 					...preserved
 				}
 			};
@@ -4870,9 +5296,16 @@ function createSuperDocUI(options) {
 					return false;
 				}
 			}
+			const nonBodyListPlans = story.storyType !== "body" && plans.some((plan) => plan?.kind === "list");
+			const outdentInStory = nonBodyListPlans && mode === "outdent" ? resolveDocOperation(doc, "lists.outdentInStory") : null;
+			if (nonBodyListPlans && !outdentInStory) return false;
 			const settledResults = plans.map((plan) => {
 				if (!plan) return Promise.resolve(false);
 				try {
+					if (plan.kind === "list" && outdentInStory) return settleOperationResult(callEditorMutation("lists.outdentInStory", outdentInStory, {
+						target: plan.input.target,
+						story
+					})).settled;
 					return settleOperationResult(callEditorMutation(plan.routeToCall, plan.opToCall, plan.input)).settled;
 				} catch {
 					return Promise.resolve(false);
@@ -4887,17 +5320,62 @@ function createSuperDocUI(options) {
 		const doc = getDoc();
 		const blockIds = selectionBlockIds(state.selection);
 		if (blockIds.length === 0) return false;
+		const story = selectionStory(state.selection);
+		const isBodyStory = story.storyType === "body";
 		if (spec.mode === "indent" || spec.mode === "outdent") return executeHybridIndentCommand(descriptor, op, blockIds);
 		const seed = spec.seed;
-		if (readListSeed(doc, state.selection) === seed) {
-			const remove = resolveDocOperation(doc, "lists.remove");
-			if (!remove) return false;
-			return applyPerBlock("lists.remove", remove, blockIds, (blockId) => ({ target: listsBlockTarget(blockId) }));
+		const executeResolved = (states) => {
+			if (states.some((listState) => !listState.resolved)) return {
+				immediate: false,
+				settled: null
+			};
+			const shouldRemove = states.every((listState) => listState.seed === seed);
+			if (!shouldRemove && !isBodyStory) return {
+				immediate: false,
+				settled: null
+			};
+			const route = shouldRemove ? isBodyStory ? "lists.remove" : "lists.removeInStory" : descriptor.docRoute;
+			const operation = shouldRemove ? resolveDocOperation(doc, route) : op;
+			if (!operation) return {
+				immediate: false,
+				settled: null
+			};
+			const immediateResults = [];
+			const settledResults = [];
+			blockIds.forEach((blockId, index) => {
+				if (!shouldRemove && states[index]?.seed === seed) return;
+				const input = shouldRemove ? {
+					target: listsBlockTarget(blockId),
+					...!isBodyStory ? { story } : {}
+				} : {
+					target: listsBlockTarget(blockId),
+					seed
+				};
+				try {
+					const result$1 = settleOperationResult(callEditorMutation(route, operation, input));
+					immediateResults.push(result$1.immediate);
+					settledResults.push(result$1.settled);
+				} catch {
+					immediateResults.push(false);
+					settledResults.push(Promise.resolve(false));
+				}
+			});
+			return {
+				immediate: combineCommandResults(immediateResults),
+				settled: settledResults.length ? Promise.all(settledResults).then((results) => combineCommandResults(results)) : null
+			};
+		};
+		const stateReads = blockIds.map((blockId) => resolveListSeedForBlock(doc, blockId, story));
+		if (stateReads.some(isPromiseLike)) {
+			pendingCommandSettlement = Promise.all(stateReads).then(async (states) => {
+				const result$1 = executeResolved(states);
+				return result$1.settled ? await result$1.settled : result$1.immediate;
+			});
+			return true;
 		}
-		return applyPerBlock(descriptor.docRoute, op, blockIds, (blockId) => readListSeedForBlock(doc, blockId) === seed ? null : {
-			target: listsBlockTarget(blockId),
-			seed
-		});
+		const result = executeResolved(stateReads);
+		pendingCommandSettlement = result.settled;
+		return result.immediate;
 	};
 	function readLinkPayloadRecord(payload) {
 		return payload && typeof payload === "object" ? payload : {};
@@ -5084,7 +5562,7 @@ function createSuperDocUI(options) {
 			const rows = Number(record.rows ?? record.rowCount);
 			const columns = Number(record.columns ?? record.cols ?? record.colCount);
 			if (!Number.isInteger(rows) || rows < 1 || !Number.isInteger(columns) || columns < 1) return false;
-			const caret = readDocumentMode() !== "suggesting" ? collapsedTextAddressFromSelection(state.selection) : null;
+			const caret = collapsedTextAddressFromSelection(state.selection);
 			const at = caret && typeof caret.blockId === "string" ? {
 				kind: "inParagraph",
 				target: paragraphTarget(caret.blockId),
@@ -5104,14 +5582,29 @@ function createSuperDocUI(options) {
 			const src = record.src ?? record.value;
 			if (typeof src !== "string" || src.trim() === "") return false;
 			const caret = collapsedTextAddressFromSelection(state.selection);
+			const story = selectionStory(state.selection);
+			const nonBodyStory = story.storyType === "body" ? null : story;
+			let at;
+			if (caret && typeof caret.blockId === "string") at = {
+				kind: "inParagraph",
+				target: paragraphTarget(caret.blockId, nonBodyStory),
+				offset: caret.range?.start ?? 0
+			};
+			else {
+				at = createLocationAt(state.selection, "target");
+				if (nonBodyStory && at.kind === "after") at = {
+					...at,
+					target: {
+						...at.target,
+						story: nonBodyStory
+					}
+				};
+			}
 			const input$1 = {
 				src,
-				at: caret && typeof caret.blockId === "string" ? {
-					kind: "inParagraph",
-					target: paragraphTarget(caret.blockId),
-					offset: caret.range?.start ?? 0
-				} : createLocationAt(state.selection, "target")
+				at
 			};
+			if (nonBodyStory) input$1.in = at.kind === "inParagraph" ? resolveActiveHeaderFooterSlot(nonBodyStory) ?? nonBodyStory : nonBodyStory;
 			if (typeof record.alt === "string") input$1.alt = record.alt;
 			if (typeof record.title === "string") input$1.title = record.title;
 			if (record.size && typeof record.size === "object") input$1.size = record.size;
@@ -5218,9 +5711,12 @@ function createSuperDocUI(options) {
 		const route = descriptor.docRoute;
 		if (!route) return false;
 		if (descriptor.mutates && readDocumentMode() === "viewing") return false;
-		const op = resolveDocOperation(getDoc(), route);
+		const doc = getDoc();
+		const op = resolveDocOperation(doc, route);
 		if (!op) return false;
 		if (descriptor.inline) {
+			const { lockModesById } = computeActiveContentControlLockModes(doc?.contentControls, state.selection);
+			if (contentControlLockReason(lockModesById)) return false;
 			const target = resolveInlineSelectionTarget(state.selection);
 			if (!target) {
 				if (state.selection.empty === false) return settleCommandExecution(false);
@@ -5478,6 +5974,12 @@ function createSuperDocUI(options) {
 		}
 		const doc = getDoc();
 		if (!doc) return;
+		const targetSelection = selectionSliceFromInfo(selection$1, "ready");
+		const { lockModesById } = computeActiveContentControlLockModes(doc.contentControls, targetSelection);
+		if (contentControlLockReason(lockModesById)) {
+			recompute();
+			return;
+		}
 		const selTarget = selection$1["target"];
 		const selectionTarget = selection$1["selectionTarget"];
 		if (!(selection$1["empty"] === true) && Object.keys(snap.inline).length > 0) {
@@ -6049,6 +6551,7 @@ function createSuperDocUI(options) {
 		setActive: (input) => {
 			if (input == null) {
 				setExplicitActiveChange(null);
+				mirrorTrackedChangeFocusToHost(null);
 				recompute();
 				return true;
 			}
@@ -6058,6 +6561,7 @@ function createSuperDocUI(options) {
 				story: input.story
 			};
 			if (typeof requested.id !== "string" || requested.id.length === 0) return false;
+			const paintedEntityId = requested.id;
 			if (requested.story) {
 				const allStoryItems = readAllStoryTrackChanges();
 				if (!allStoryItems) return false;
@@ -6070,7 +6574,9 @@ function createSuperDocUI(options) {
 				if (!bodyItems.some((item) => readEntityId(item) === publicId)) return false;
 				requested.id = publicId;
 			}
+			if (paintedEntityId !== requested.id) requested.paintedEntityId = paintedEntityId;
 			setExplicitActiveChange(requested);
+			mirrorTrackedChangeFocusToHost(requested);
 			recompute();
 			return true;
 		},
@@ -6089,10 +6595,11 @@ function createSuperDocUI(options) {
 				reason: SUPERDOC_UI_REASONS.targetUnresolved
 			};
 			const previousActiveChange = explicitActiveChange;
-			setExplicitActiveChange(story ? {
+			const requestedActiveChange = story ? {
 				id: changeId,
 				story
-			} : { id: changeId });
+			} : { id: changeId };
+			setExplicitActiveChange(requestedActiveChange);
 			recompute();
 			const optimisticActiveChange = explicitActiveChange;
 			const optimisticRevision = explicitActiveChangeRevision;
@@ -6108,6 +6615,7 @@ function createSuperDocUI(options) {
 				ok: false
 			};
 			if (!result.ok && result.reason !== SUPERDOC_UI_REASONS.targetNotVisible) rollback();
+			else mirrorTrackedChangeFocusToHost(requestedActiveChange);
 			return result;
 		}
 	};
@@ -6123,24 +6631,30 @@ function createSuperDocUI(options) {
 		}, id, story);
 	};
 	const executeTrackDecisionTarget = (kind, target, changeId, story) => {
+		try {
+			return settleCommandExecution(callTrackDecisionTarget(kind, target, changeId, story));
+		} catch {
+			return false;
+		}
+	};
+	const callTrackDecisionTarget = (kind, target, changeId, story) => {
 		if (reviewMutationsAreReadOnly()) return false;
 		const tcApi = getDoc()?.trackChanges;
+		const isAllTarget = target.scope === "all";
+		const isRangeTarget = target.kind === "range";
+		const isMultiIdTarget = target.kind === "ids";
 		if (bulkTrackDecisionBlockedReason({
 			kind,
-			scope: changeId ? "id" : "all"
+			scope: isAllTarget ? "all" : "id"
 		}, tcApi)) return false;
-		const legacyName = changeId ? kind : `${kind}All`;
-		const op = !story && tcApi && typeof tcApi[legacyName] === "function" ? tcApi[legacyName] : null;
+		const legacyName = isAllTarget ? `${kind}All` : kind;
+		const op = !isRangeTarget && !isMultiIdTarget && !story && tcApi && typeof tcApi[legacyName] === "function" ? tcApi[legacyName] : null;
 		const decide = tcApi && typeof tcApi.decide === "function" ? tcApi.decide : null;
 		if (!op && !decide) return false;
-		try {
-			return settleCommandExecution(op ? op.call(tcApi, changeId ?? {}) : decide.call(tcApi, {
-				decision: kind,
-				target
-			}));
-		} catch {
-			return false;
-		}
+		return op ? op.call(tcApi, changeId ?? {}) : decide.call(tcApi, {
+			decision: kind,
+			target
+		});
 	};
 	const contentControlsSub = sliceHandle((s) => s.contentControls);
 	const findContentControl = (id) => {
@@ -7069,6 +7583,11 @@ function createSuperDocUI(options) {
 			clearTimeout(foregroundAsyncRetryTimer);
 			foregroundAsyncRetryTimer = null;
 		}
+		if (asyncReadFailureRetryTimer) {
+			clearTimeout(asyncReadFailureRetryTimer);
+			asyncReadFailureRetryTimer = null;
+			asyncReadFailureRetryAtMs = 0;
+		}
 		if (pendingEffectiveInlineRead?.timer) {
 			clearTimeout(pendingEffectiveInlineRead.timer);
 			pendingEffectiveInlineRead.timer = null;