superdoc 2.12.0-next.13 → 2.12.0-next.15

package/dist/chunks/{create-super-doc-ui-C-AuEM9F.es.js → create-super-doc-ui-Biwv0tas.es.js}

@@ -4071,8 +4071,11 @@ function createSuperDocUI(options) {
 	const incompleteTrackChangesDirectoryReadTokens = /* @__PURE__ */ new Map();
 	const postSourceCompletionRefreshTokens = /* @__PURE__ */ new Map();
 	let sourceCompletionObservedToken = null;
-	let commentsDirectoryLeaseCount = 0;
-	let trackChangesDirectoryLeaseCount = 0;
+	const directoryLeaseCounts = {
+		comments: 0,
+		trackChanges: 0,
+		contentControls: 0
+	};
 	const demandHeavyDocRead = (key) => {
 		const token = contentToken();
 		if (demandedHeavyReads.get(key) === token) return;
@@ -4107,16 +4110,14 @@ function createSuperDocUI(options) {
 		if (invalidated) scheduleAsyncRefresh();
 	};
 	const acquireDirectoryLease = (family) => {
-		if (family === "comments") commentsDirectoryLeaseCount += 1;
-		else trackChangesDirectoryLeaseCount += 1;
+		directoryLeaseCounts[family] += 1;
 		demandHeavyDocRead(family);
 		let released = false;
 		return () => {
 			if (released) return;
 			released = true;
-			if (family === "comments") commentsDirectoryLeaseCount = Math.max(0, commentsDirectoryLeaseCount - 1);
-			else trackChangesDirectoryLeaseCount = Math.max(0, trackChangesDirectoryLeaseCount - 1);
-			if ((family === "comments" ? commentsDirectoryLeaseCount : trackChangesDirectoryLeaseCount) === 0 && demandedHeavyReads.get(family) === contentToken()) demandedHeavyReads.delete(family);
+			directoryLeaseCounts[family] = Math.max(0, directoryLeaseCounts[family] - 1);
+			if (directoryLeaseCounts[family] === 0 && demandedHeavyReads.get(family) === contentToken()) demandedHeavyReads.delete(family);
 			scheduleAsyncRefresh();
 		};
 	};
@@ -4887,7 +4888,7 @@ function createSuperDocUI(options) {
 		const activeIds = selection.activeCommentIds;
 		const directory = asyncReads.get("comments");
 		const directoryItems = directory?.token === contentToken() && directory.hasSettled && Array.isArray(directory.value) ? directory.value : null;
-		const activeValidationItems = commentsDirectoryLeaseCount > 0 ? directoryItems : items;
+		const activeValidationItems = directoryLeaseCounts.comments > 0 ? directoryItems : items;
 		if (explicitActiveCommentId && activeValidationItems && !activeValidationItems.some((item) => readEntityId(item) === explicitActiveCommentId)) explicitActiveCommentId = null;
 		const activeId = explicitActiveCommentId ?? activeIds[0] ?? null;
 		return {
@@ -4962,7 +4963,7 @@ function createSuperDocUI(options) {
 		if (active && !pendingTrackChangeRevealFocuses.has(active)) {
 			const directory = asyncReads.get("trackChanges");
 			const directoryItems = directory?.token === token && directory.hasSettled && Array.isArray(directory.value) ? filterPostDecisionTrackChanges(projectTrackChangesItems(directory.value), postDecisionIds) : null;
-			const activeValidationItems = trackChangesDirectoryLeaseCount > 0 ? directoryItems : active.story ? allStoryItems : items;
+			const activeValidationItems = directoryLeaseCounts.trackChanges > 0 ? directoryItems : active.story ? allStoryItems : items;
 			if (activeValidationItems && !activeValidationItems.some((row) => entityRowMatchesRequest(row, active.id, active.story))) setExplicitActiveChange(null);
 		}
 		const publicIdItems = allStoryItems ?? items;
@@ -7453,11 +7454,8 @@ function createSuperDocUI(options) {
 			return false;
 		}
 	}
-	function resolveTrackDecisionTarget(command, payload) {
-		if (command.scope === "all") return {
-			target: { kind: "all" },
-			changeId: null
-		};
+	/** A decision target carried by the payload itself, independent of the selection. */
+	function explicitTrackDecisionTarget(payload) {
 		if (typeof payload === "string" && payload.length > 0) return {
 			target: {
 				kind: "id",
@@ -7482,6 +7480,15 @@ function createSuperDocUI(options) {
 				story: record.story
 			};
 		}
+		return null;
+	}
+	function resolveTrackDecisionTarget(command, payload) {
+		if (command.scope === "all") return {
+			target: { kind: "all" },
+			changeId: null
+		};
+		const explicit = explicitTrackDecisionTarget(payload);
+		if (explicit) return explicit;
 		const selectedId = state.selection.activeChangeIds[0];
 		const story = nonBodySelectionStoryLocator(state.selection);
 		return selectedId ? {
@@ -8435,6 +8442,7 @@ function createSuperDocUI(options) {
 	const commandNeedsFreshSelection = (id, payload) => {
 		const trackCommand = trackDecisionCommand(id);
 		const descriptor = getCommandDescriptor(id);
+		if (trackCommand?.scope === "id" && explicitTrackDecisionTarget(payload)) return false;
 		if (trackCommand?.scope !== "id" && !descriptorNeedsFreshSelection(descriptor)) return false;
 		return !commandSelectionIsReady(id, descriptor, payload);
 	};
@@ -9212,6 +9220,7 @@ function createSuperDocUI(options) {
 	*/
 	const resolveEntityTarget = async (namespace, id, loaded, request) => {
 		const requestedStory = namespace === "trackChanges" ? request?.story : void 0;
+		const rowStory = namespace === "trackChanges" ? request?.matchStory ?? requestedStory : void 0;
 		const withRequestedStory = (target) => {
 			if (!requestedStory || !target || typeof target !== "object") return target;
 			const record = target;
@@ -9223,7 +9232,7 @@ function createSuperDocUI(options) {
 			};
 		};
 		const readTarget = namespace === "trackChanges" ? readTrackedChangeNavigationTarget : readEntityTarget;
-		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory));
+		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, rowStory));
 		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;
@@ -9517,9 +9526,13 @@ function createSuperDocUI(options) {
 			});
 		},
 		accept: (changeId) => executeTrackDecision("accept", changeId),
+		acceptAsync: (changeId) => settleTrackDecision(() => executeTrackDecision("accept", changeId)),
 		reject: (changeId) => executeTrackDecision("reject", changeId),
+		rejectAsync: (changeId) => settleTrackDecision(() => executeTrackDecision("reject", changeId)),
 		acceptAll: () => executeTrackDecisionTarget("accept", { kind: "all" }, null),
+		acceptAllAsync: () => settleTrackDecision(() => executeTrackDecisionTarget("accept", { kind: "all" }, null)),
 		rejectAll: () => executeTrackDecisionTarget("reject", { kind: "all" }, null),
+		rejectAllAsync: () => settleTrackDecision(() => executeTrackDecisionTarget("reject", { kind: "all" }, null)),
 		next: () => navigateTrackChange(1),
 		previous: () => navigateTrackChange(-1),
 		navigateNext: () => navigateAndScroll(1),
@@ -9584,19 +9597,27 @@ function createSuperDocUI(options) {
 			recompute();
 			return true;
 		},
-		scrollTo: async (changeId) => {
+		scrollTo: async (input) => {
 			if (!getDoc()) return {
 				success: false,
 				ok: false,
 				reason: getEditor() ? SUPERDOC_UI_REASONS.documentApiUnavailable : SUPERDOC_UI_REASONS.notReady
 			};
+			const changeId = typeof input === "string" ? input : input.id;
+			const matchStory = typeof input === "string" || !input.story || typeof input.story !== "object" ? void 0 : input.story;
+			const requestedStory = matchStory ? readEntityRequestStory({ address: { story: matchStory } }) : void 0;
+			if (typeof changeId !== "string" || changeId.length === 0) return {
+				success: false,
+				ok: false,
+				reason: SUPERDOC_UI_REASONS.targetUnresolved
+			};
 			queuedTrackChangeNavigationInvalidation += 1;
 			trackChangeRevealInvalidation += 1;
 			const requestedAtInvalidation = trackChangeRevealInvalidation;
-			const loadedItems = trackChangesSub.get().items;
-			const publicId = buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
-			const matchingRow = loadedItems.find((item) => readEntityId(item) === publicId);
-			const story = readEntityRequestStory(matchingRow);
+			const loadedItems = matchStory ? readAllStoryTrackChanges() ?? trackChangesSub.get().items : trackChangesSub.get().items;
+			const publicId = matchStory ? buildStoryScopedTrackedChangeIdContext(loadedItems, matchStory).toPublicId(changeId) ?? changeId : buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
+			const matchingRow = matchStory ? loadedItems.find((item) => entityRowMatchesRequest(item, publicId, matchStory)) : loadedItems.find((item) => readEntityId(item) === publicId);
+			const story = matchStory ? requestedStory : readEntityRequestStory(matchingRow);
 			const importedId = deriveTrackedChangeImportedId(matchingRow);
 			const previousActiveChange = explicitActiveChange;
 			const requestedActiveChange = {
@@ -9606,7 +9627,10 @@ function createSuperDocUI(options) {
 			};
 			pendingTrackChangeRevealFocuses.add(requestedActiveChange);
 			try {
-				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story ? { story } : void 0);
+				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story || matchStory ? {
+					story,
+					matchStory
+				} : void 0);
 				if (trackChangeRevealInvalidation !== requestedAtInvalidation) return {
 					success: false,
 					ok: false
@@ -9666,6 +9690,7 @@ function createSuperDocUI(options) {
 			id: input,
 			story: void 0
 		} : input;
+		if (typeof id !== "string" || id.length === 0) return false;
 		const target = {
 			kind: "id",
 			id,
@@ -9673,6 +9698,19 @@ function createSuperDocUI(options) {
 		};
 		return executeTrackDecisionTarget(kind, target, id, story);
 	};
+	/**
+	* Run a domain decision and resolve with its settled result. The domain
+	* helpers call the decision route directly so an application command that
+	* reuses a built-in tracked-change id cannot intercept them; only the command
+	* registry (`commands.execute*`) honours those overrides.
+	*/
+	const settleTrackDecision = (run) => {
+		pendingCommandSettlement = null;
+		lastCommandSettlement = Promise.resolve(false);
+		if (disposed) return Promise.resolve(false);
+		if (run() === false) return Promise.resolve(false);
+		return lastCommandSettlement;
+	};
 	const executeTrackDecisionTarget = (kind, target, changeId, story) => {
 		try {
 			return settleCommandExecution(callTrackDecisionTarget(kind, target, changeId, story));
@@ -9705,12 +9743,16 @@ function createSuperDocUI(options) {
 	const findContentControl = (id) => {
 		return contentControlsSub.get().items.find((item) => item?.id === id) ?? null;
 	};
-	const contentControlsSnap = snapshotHandle(contentControlsSub);
+	const contentControlsSnap = directorySnapshotHandle(contentControlsSub, select((s) => {
+		if (directoryLeaseCounts.contentControls > 0) demandHeavyDocRead("contentControls");
+		return s.contentControls;
+	}), "contentControls");
 	const contentControlsGet = ((input) => {
 		if (input === void 0) return contentControlsSnap.get();
 		const id = readContentControlRequestId(input);
 		return id ? findContentControl(id) : null;
 	});
+	const contentControlsPassiveSnap = snapshotHandle(contentControlsSub);
 	const contentControls = {
 		get: ((input) => {
 			if (input !== void 0) ensureContentControlsCatalog("api");
@@ -9719,6 +9761,7 @@ function createSuperDocUI(options) {
 		getSnapshot: contentControlsSnap.getSnapshot,
 		subscribe: contentControlsSnap.subscribe,
 		observe: contentControlsSnap.observe,
+		observeActivePath: contentControlsPassiveSnap.observe,
 		list: () => {
 			ensureContentControlsCatalog("api");
 			return contentControlsSub.get().items;
@@ -10822,8 +10865,7 @@ function createSuperDocUI(options) {
 		if (detachSourceLoading) detachSourceLoading();
 		detachSourceLoading = null;
 		sourceLoadingSubscriptionHost = null;
-		commentsDirectoryLeaseCount = 0;
-		trackChangesDirectoryLeaseCount = 0;
+		for (const family of Object.keys(directoryLeaseCounts)) directoryLeaseCounts[family] = 0;
 		demandedHeavyReads.clear();
 		incompleteTrackChangesDirectoryReadTokens.clear();
 		postSourceCompletionRefreshTokens.clear();

package/dist/chunks/{create-super-doc-ui-CBFGggZ2.cjs → create-super-doc-ui-BkDVQgqj.cjs}

@@ -4071,8 +4071,11 @@ function createSuperDocUI(options) {
 	const incompleteTrackChangesDirectoryReadTokens = /* @__PURE__ */ new Map();
 	const postSourceCompletionRefreshTokens = /* @__PURE__ */ new Map();
 	let sourceCompletionObservedToken = null;
-	let commentsDirectoryLeaseCount = 0;
-	let trackChangesDirectoryLeaseCount = 0;
+	const directoryLeaseCounts = {
+		comments: 0,
+		trackChanges: 0,
+		contentControls: 0
+	};
 	const demandHeavyDocRead = (key) => {
 		const token = contentToken();
 		if (demandedHeavyReads.get(key) === token) return;
@@ -4107,16 +4110,14 @@ function createSuperDocUI(options) {
 		if (invalidated) scheduleAsyncRefresh();
 	};
 	const acquireDirectoryLease = (family) => {
-		if (family === "comments") commentsDirectoryLeaseCount += 1;
-		else trackChangesDirectoryLeaseCount += 1;
+		directoryLeaseCounts[family] += 1;
 		demandHeavyDocRead(family);
 		let released = false;
 		return () => {
 			if (released) return;
 			released = true;
-			if (family === "comments") commentsDirectoryLeaseCount = Math.max(0, commentsDirectoryLeaseCount - 1);
-			else trackChangesDirectoryLeaseCount = Math.max(0, trackChangesDirectoryLeaseCount - 1);
-			if ((family === "comments" ? commentsDirectoryLeaseCount : trackChangesDirectoryLeaseCount) === 0 && demandedHeavyReads.get(family) === contentToken()) demandedHeavyReads.delete(family);
+			directoryLeaseCounts[family] = Math.max(0, directoryLeaseCounts[family] - 1);
+			if (directoryLeaseCounts[family] === 0 && demandedHeavyReads.get(family) === contentToken()) demandedHeavyReads.delete(family);
 			scheduleAsyncRefresh();
 		};
 	};
@@ -4887,7 +4888,7 @@ function createSuperDocUI(options) {
 		const activeIds = selection.activeCommentIds;
 		const directory = asyncReads.get("comments");
 		const directoryItems = directory?.token === contentToken() && directory.hasSettled && Array.isArray(directory.value) ? directory.value : null;
-		const activeValidationItems = commentsDirectoryLeaseCount > 0 ? directoryItems : items;
+		const activeValidationItems = directoryLeaseCounts.comments > 0 ? directoryItems : items;
 		if (explicitActiveCommentId && activeValidationItems && !activeValidationItems.some((item) => readEntityId(item) === explicitActiveCommentId)) explicitActiveCommentId = null;
 		const activeId = explicitActiveCommentId ?? activeIds[0] ?? null;
 		return {
@@ -4962,7 +4963,7 @@ function createSuperDocUI(options) {
 		if (active && !pendingTrackChangeRevealFocuses.has(active)) {
 			const directory = asyncReads.get("trackChanges");
 			const directoryItems = directory?.token === token && directory.hasSettled && Array.isArray(directory.value) ? filterPostDecisionTrackChanges(projectTrackChangesItems(directory.value), postDecisionIds) : null;
-			const activeValidationItems = trackChangesDirectoryLeaseCount > 0 ? directoryItems : active.story ? allStoryItems : items;
+			const activeValidationItems = directoryLeaseCounts.trackChanges > 0 ? directoryItems : active.story ? allStoryItems : items;
 			if (activeValidationItems && !activeValidationItems.some((row) => entityRowMatchesRequest(row, active.id, active.story))) setExplicitActiveChange(null);
 		}
 		const publicIdItems = allStoryItems ?? items;
@@ -7453,11 +7454,8 @@ function createSuperDocUI(options) {
 			return false;
 		}
 	}
-	function resolveTrackDecisionTarget(command, payload) {
-		if (command.scope === "all") return {
-			target: { kind: "all" },
-			changeId: null
-		};
+	/** A decision target carried by the payload itself, independent of the selection. */
+	function explicitTrackDecisionTarget(payload) {
 		if (typeof payload === "string" && payload.length > 0) return {
 			target: {
 				kind: "id",
@@ -7482,6 +7480,15 @@ function createSuperDocUI(options) {
 				story: record.story
 			};
 		}
+		return null;
+	}
+	function resolveTrackDecisionTarget(command, payload) {
+		if (command.scope === "all") return {
+			target: { kind: "all" },
+			changeId: null
+		};
+		const explicit = explicitTrackDecisionTarget(payload);
+		if (explicit) return explicit;
 		const selectedId = state.selection.activeChangeIds[0];
 		const story = nonBodySelectionStoryLocator(state.selection);
 		return selectedId ? {
@@ -8435,6 +8442,7 @@ function createSuperDocUI(options) {
 	const commandNeedsFreshSelection = (id, payload) => {
 		const trackCommand = trackDecisionCommand(id);
 		const descriptor = getCommandDescriptor(id);
+		if (trackCommand?.scope === "id" && explicitTrackDecisionTarget(payload)) return false;
 		if (trackCommand?.scope !== "id" && !descriptorNeedsFreshSelection(descriptor)) return false;
 		return !commandSelectionIsReady(id, descriptor, payload);
 	};
@@ -9212,6 +9220,7 @@ function createSuperDocUI(options) {
 	*/
 	const resolveEntityTarget = async (namespace, id, loaded, request) => {
 		const requestedStory = namespace === "trackChanges" ? request?.story : void 0;
+		const rowStory = namespace === "trackChanges" ? request?.matchStory ?? requestedStory : void 0;
 		const withRequestedStory = (target) => {
 			if (!requestedStory || !target || typeof target !== "object") return target;
 			const record = target;
@@ -9223,7 +9232,7 @@ function createSuperDocUI(options) {
 			};
 		};
 		const readTarget = namespace === "trackChanges" ? readTrackedChangeNavigationTarget : readEntityTarget;
-		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, requestedStory));
+		const loadedRow = loaded.find((row) => entityRowMatchesRequest(row, id, rowStory));
 		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;
@@ -9517,9 +9526,13 @@ function createSuperDocUI(options) {
 			});
 		},
 		accept: (changeId) => executeTrackDecision("accept", changeId),
+		acceptAsync: (changeId) => settleTrackDecision(() => executeTrackDecision("accept", changeId)),
 		reject: (changeId) => executeTrackDecision("reject", changeId),
+		rejectAsync: (changeId) => settleTrackDecision(() => executeTrackDecision("reject", changeId)),
 		acceptAll: () => executeTrackDecisionTarget("accept", { kind: "all" }, null),
+		acceptAllAsync: () => settleTrackDecision(() => executeTrackDecisionTarget("accept", { kind: "all" }, null)),
 		rejectAll: () => executeTrackDecisionTarget("reject", { kind: "all" }, null),
+		rejectAllAsync: () => settleTrackDecision(() => executeTrackDecisionTarget("reject", { kind: "all" }, null)),
 		next: () => navigateTrackChange(1),
 		previous: () => navigateTrackChange(-1),
 		navigateNext: () => navigateAndScroll(1),
@@ -9584,19 +9597,27 @@ function createSuperDocUI(options) {
 			recompute();
 			return true;
 		},
-		scrollTo: async (changeId) => {
+		scrollTo: async (input) => {
 			if (!getDoc()) return {
 				success: false,
 				ok: false,
 				reason: getEditor() ? SUPERDOC_UI_REASONS.documentApiUnavailable : SUPERDOC_UI_REASONS.notReady
 			};
+			const changeId = typeof input === "string" ? input : input.id;
+			const matchStory = typeof input === "string" || !input.story || typeof input.story !== "object" ? void 0 : input.story;
+			const requestedStory = matchStory ? readEntityRequestStory({ address: { story: matchStory } }) : void 0;
+			if (typeof changeId !== "string" || changeId.length === 0) return {
+				success: false,
+				ok: false,
+				reason: SUPERDOC_UI_REASONS.targetUnresolved
+			};
 			queuedTrackChangeNavigationInvalidation += 1;
 			trackChangeRevealInvalidation += 1;
 			const requestedAtInvalidation = trackChangeRevealInvalidation;
-			const loadedItems = trackChangesSub.get().items;
-			const publicId = buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
-			const matchingRow = loadedItems.find((item) => readEntityId(item) === publicId);
-			const story = readEntityRequestStory(matchingRow);
+			const loadedItems = matchStory ? readAllStoryTrackChanges() ?? trackChangesSub.get().items : trackChangesSub.get().items;
+			const publicId = matchStory ? buildStoryScopedTrackedChangeIdContext(loadedItems, matchStory).toPublicId(changeId) ?? changeId : buildTrackedChangeIdContext(loadedItems).toPublicId(changeId) ?? changeId;
+			const matchingRow = matchStory ? loadedItems.find((item) => entityRowMatchesRequest(item, publicId, matchStory)) : loadedItems.find((item) => readEntityId(item) === publicId);
+			const story = matchStory ? requestedStory : readEntityRequestStory(matchingRow);
 			const importedId = deriveTrackedChangeImportedId(matchingRow);
 			const previousActiveChange = explicitActiveChange;
 			const requestedActiveChange = {
@@ -9606,7 +9627,10 @@ function createSuperDocUI(options) {
 			};
 			pendingTrackChangeRevealFocuses.add(requestedActiveChange);
 			try {
-				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story ? { story } : void 0);
+				const target = await resolveEntityTarget("trackChanges", publicId, loadedItems, story || matchStory ? {
+					story,
+					matchStory
+				} : void 0);
 				if (trackChangeRevealInvalidation !== requestedAtInvalidation) return {
 					success: false,
 					ok: false
@@ -9666,6 +9690,7 @@ function createSuperDocUI(options) {
 			id: input,
 			story: void 0
 		} : input;
+		if (typeof id !== "string" || id.length === 0) return false;
 		const target = {
 			kind: "id",
 			id,
@@ -9673,6 +9698,19 @@ function createSuperDocUI(options) {
 		};
 		return executeTrackDecisionTarget(kind, target, id, story);
 	};
+	/**
+	* Run a domain decision and resolve with its settled result. The domain
+	* helpers call the decision route directly so an application command that
+	* reuses a built-in tracked-change id cannot intercept them; only the command
+	* registry (`commands.execute*`) honours those overrides.
+	*/
+	const settleTrackDecision = (run) => {
+		pendingCommandSettlement = null;
+		lastCommandSettlement = Promise.resolve(false);
+		if (disposed) return Promise.resolve(false);
+		if (run() === false) return Promise.resolve(false);
+		return lastCommandSettlement;
+	};
 	const executeTrackDecisionTarget = (kind, target, changeId, story) => {
 		try {
 			return settleCommandExecution(callTrackDecisionTarget(kind, target, changeId, story));
@@ -9705,12 +9743,16 @@ function createSuperDocUI(options) {
 	const findContentControl = (id) => {
 		return contentControlsSub.get().items.find((item) => item?.id === id) ?? null;
 	};
-	const contentControlsSnap = snapshotHandle(contentControlsSub);
+	const contentControlsSnap = directorySnapshotHandle(contentControlsSub, select((s) => {
+		if (directoryLeaseCounts.contentControls > 0) demandHeavyDocRead("contentControls");
+		return s.contentControls;
+	}), "contentControls");
 	const contentControlsGet = ((input) => {
 		if (input === void 0) return contentControlsSnap.get();
 		const id = readContentControlRequestId(input);
 		return id ? findContentControl(id) : null;
 	});
+	const contentControlsPassiveSnap = snapshotHandle(contentControlsSub);
 	const contentControls = {
 		get: ((input) => {
 			if (input !== void 0) ensureContentControlsCatalog("api");
@@ -9719,6 +9761,7 @@ function createSuperDocUI(options) {
 		getSnapshot: contentControlsSnap.getSnapshot,
 		subscribe: contentControlsSnap.subscribe,
 		observe: contentControlsSnap.observe,
+		observeActivePath: contentControlsPassiveSnap.observe,
 		list: () => {
 			ensureContentControlsCatalog("api");
 			return contentControlsSub.get().items;
@@ -10822,8 +10865,7 @@ function createSuperDocUI(options) {
 		if (detachSourceLoading) detachSourceLoading();
 		detachSourceLoading = null;
 		sourceLoadingSubscriptionHost = null;
-		commentsDirectoryLeaseCount = 0;
-		trackChangesDirectoryLeaseCount = 0;
+		for (const family of Object.keys(directoryLeaseCounts)) directoryLeaseCounts[family] = 0;
 		demandedHeavyReads.clear();
 		incompleteTrackChangesDirectoryReadTokens.clear();
 		postSourceCompletionRefreshTokens.clear();

package/dist/collaboration-upgrade-engine.cjs

@@ -19,7 +19,7 @@ var 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.12.0-next.13",
+	superdocVersion: "2.12.0-next.15",
 	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

@@ -18,7 +18,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = getCollaborationUpgradeEngineInfo$1();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.12.0-next.13",
+	superdocVersion: "2.12.0-next.15",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/layout-engine/painters/dom/src/derived-run-text-plane.d.ts

@@ -0,0 +1,9 @@
+import { FlowBlock, Run } from '../../../contracts/src/index.js';
+export type DerivedRunTextPlane = {
+    generation: number;
+    revision: string;
+    valuesByDataAttribute: ReadonlyMap<string, ReadonlyMap<string, string>>;
+};
+export declare function validateDerivedRunTextPlane(plane: DerivedRunTextPlane | null | undefined, generation: number): void;
+export declare function resolveDerivedRunText(run: Run, plane: DerivedRunTextPlane | null | undefined): string | undefined;
+export declare function blockUsesDerivedRunTextPlane(block: FlowBlock | undefined, plane: DerivedRunTextPlane | null | undefined): boolean;

package/dist/layout-engine/painters/dom/src/index.d.ts

@@ -15,6 +15,7 @@ export type { RulerDefinition, RulerConfig, RulerConfigPx, RulerTick, CreateRule
 export type { PaintSnapshot, PaintSnapshotAnnotationEntity, PaintSnapshotStructuredContentBlockEntity, PaintSnapshotStructuredContentInlineEntity, PaintSnapshotImageEntity, PaintSnapshotEntities, } from './renderer.js';
 export type { DomPainterInput, PositionMapping } from './renderer.js';
 export type { DomPainterPersistentPacketSource, DomPainterPersistentPageInput, DomPainterPersistentScaffold, DomPainterPersistentScaffoldPage, } from './persistent-page-surface.js';
+export type { DerivedRunTextPlane } from './derived-run-text-plane.js';
 export type { PaintWorkSummary } from './page-content.js';
 export type { RenderedLineInfo } from './runs/index.js';
 export { sanitizeUrl, linkMetrics, applyRunDataAttributes } from './runs/index.js';

package/dist/layout-engine/painters/dom/src/page-content.d.ts

@@ -3,6 +3,7 @@ import { FragmentRenderContext, PositionMapping } from './renderer.js';
 import { SdtBoundaryOptions } from './sdt/container.js';
 import { BetweenBorderInfo } from './paragraph/borders/index.js';
 import { PageStyles } from './styles.js';
+import { DerivedRunTextPlane } from './derived-run-text-plane.js';
 export type FragmentDomState = {
     key: string;
     signature: string;
@@ -116,7 +117,7 @@ export declare function createEmptyPaintWorkSummary(): PaintWorkSummary;
  * attribute-for-attribute — that exactness is the proof, never normalize it
  * away at the pass level (only the §7.7 unit tests use the normalized form).
  */
-export declare function persistentPageVersionKey(page: ResolvedPage, totalPages: number, sectionPageCount: number): string | null;
+export declare function persistentPageVersionKey(page: ResolvedPage, totalPages: number, sectionPageCount: number, derivedRunTextPlane?: DerivedRunTextPlane | null): string | null;
 /**
  * The class state `renderPage`/`patchPage` consume, made explicit. The
  * DomPainter builds one per call (values like `totalPages`, `layoutEpoch`,
@@ -130,6 +131,7 @@ export interface PageContentContext {
     totalPages: number;
     currentMapping: PositionMapping | null;
     changedBlocks: ReadonlySet<string>;
+    derivedRunTextPlane?: DerivedRunTextPlane | null;
     /** Record the smallest newly painted subtree for transaction finalization. */
     recordChangedRoot?(root: HTMLElement): void;
     sdtLabelsRendered: Set<string>;

package/dist/layout-engine/painters/dom/src/persistent-page-surface.d.ts

@@ -1,4 +1,5 @@
 import { DocumentBackground, ResolvedPage } from '../../../contracts/src/index.js';
+import { DerivedRunTextPlane } from './derived-run-text-plane.js';
 import { PageContentContext, PageDomState, PaintWorkSummary } from './page-content.js';
 /**
  * One exact page band of the committed scaffold (numbers-only,
@@ -69,6 +70,7 @@ export type DomPainterPersistentPageInput = {
     packetsByPageIndex: DomPainterPersistentPacketSource;
     sectionPageCounts?: Readonly<Record<string, number>>;
     documentBackground?: DocumentBackground | null;
+    derivedRunTextPlane?: DerivedRunTextPlane | null;
     captureSnapshot?: boolean;
 };
 /** Shell registry entry: the persistent page root and its geometry/style reuse key. */

package/dist/layout-engine/painters/dom/src/renderer.d.ts

@@ -1,6 +1,7 @@
 import { FlowMode, Fragment, PageMargins, PageNumberChapterSeparator, PageNumberFormat, SourceAnchor, ResolvedLayout, ResolvedPage, ResolvedPaintItem, LayoutSourceIdentity, LayoutStoryLocator } from '../../../contracts/src/index.js';
 import { PaintWorkSummary } from './page-content.js';
 import { DomPainterPersistentPageInput } from './persistent-page-surface.js';
+import { DerivedRunTextPlane } from './derived-run-text-plane.js';
 import { PageStyles } from './styles.js';
 import { PaintSnapshotStructuredContentBlockEntity, PaintSnapshotStructuredContentInlineEntity } from './sdt/snapshot.js';
 import { PositionValidationOptions, PositionValidationSummary } from './pm-position-validation.js';
@@ -143,6 +144,7 @@ export type FragmentRenderContext = {
      * `totalPages` / `sectionPageCount`. Absent/`true` = exact (default).
      */
     pageCountFieldsExact?: boolean;
+    derivedRunTextPlane?: DerivedRunTextPlane | null;
 };
 export type PaintSnapshotLineStyle = {
     paddingLeftPx?: number;
@@ -305,6 +307,7 @@ export declare class DomPainter {
      * `dispose()` so a stale window value can never leak across modes/mounts.
      */
     private persistentDocumentBackground;
+    private persistentDerivedRunTextPlane;
     private paintWork;
     /**
      * P5 §4.6 (review fix): per-page attribution arrays are opt-in. Counters

package/dist/public/ui-react.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-CBFGggZ2.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-BkDVQgqj.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let react = require("react");
 //#region src/public/ui/react.ts

package/dist/public/ui-react.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-C-AuEM9F.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-Biwv0tas.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { createContext, createElement, useCallback, useContext, useEffect, useRef, useState } from "react";
 //#region src/public/ui/react.ts

package/dist/public/ui-vue.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-CBFGggZ2.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-BkDVQgqj.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let vue = require("vue");
 //#region src/public/ui/vue.ts

package/dist/public/ui-vue.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-C-AuEM9F.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-Biwv0tas.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { computed, inject, onScopeDispose, provide, shallowRef, toRaw, toValue, watch } from "vue";
 //#region src/public/ui/vue.ts

package/dist/public/ui.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-CBFGggZ2.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-BkDVQgqj.cjs");
 exports.BUILT_IN_COMMAND_IDS = require_create_super_doc_ui.BUILT_IN_COMMAND_IDS;
 exports.createSuperDocUI = require_create_super_doc_ui.createSuperDocUI;
 exports.shallowEqual = require_create_super_doc_ui.shallowEqual;

package/dist/public/ui.es.js

@@ -1,2 +1,2 @@
-import { n as shallowEqual, r as BUILT_IN_COMMAND_IDS, t as createSuperDocUI } from "../chunks/create-super-doc-ui-C-AuEM9F.es.js";
+import { n as shallowEqual, r as BUILT_IN_COMMAND_IDS, t as createSuperDocUI } from "../chunks/create-super-doc-ui-Biwv0tas.es.js";
 export { BUILT_IN_COMMAND_IDS, createSuperDocUI, shallowEqual };