superdoc 2.29.0 → 2.30.0-next.9

package/dist/superdoc.es.js

@@ -1,7 +1,7 @@
 import { i as __toESM$2 } from "./chunks/rolldown-runtime-0pSA04fp.es.js";
-import { $ as vModelSelect, A as onActivated, B as renderList, C as isRef$1, D as normalizeClass, E as nextTick, F as openBlock, G as toDisplayString, H as resolveDirective, I as provide$1, J as toRefs, K as toRaw$2, L as reactive, M as onDeactivated, N as onMounted, O as normalizeProps, P as onScopeDispose$1, Q as vModelCheckbox, R as readonly, S as isReactive$1, T as mergeProps, U as resolveDynamicComponent, V as renderSlot, W as shallowRef$1, X as useAttrs, Y as unref, Z as useSlots, _ as getCurrentInstance, a as computed$1, at as withModifiers, b as hasInjectionContext, c as createCommentVNode, d as createStaticVNode, et as vModelText, f as createTextVNode, g as effectScope, h as defineComponent, i as Transition, it as withKeys, j as onBeforeUnmount, k as normalizeStyle, l as createElementBlock, m as defineAsyncComponent, n as Fragment, nt as withCtx, o as createApp, ot as isPlainObject$1, p as createVNode, q as toRef, r as Teleport, rt as withDirectives, s as createBlock, st as isThenable$1, t as _plugin_vue_export_helper_default, tt as watch$1, u as createElementVNode, v as getCurrentScope, w as markRaw, x as inject$1, y as h, z as ref } from "./chunks/_plugin-vue_export-helper-DRPRMkeA.es.js";
+import { $ as vModelSelect, A as onActivated, B as renderList, C as isRef$1, D as normalizeClass, E as nextTick, F as openBlock, G as toDisplayString, H as resolveDirective, I as provide$1, J as toRefs, K as toRaw$2, L as reactive, M as onDeactivated, N as onMounted, O as normalizeProps, P as onScopeDispose$1, Q as vModelCheckbox, R as readonly, S as isReactive$1, T as mergeProps, U as resolveDynamicComponent, V as renderSlot, W as shallowRef$1, X as useAttrs, Y as unref, Z as useSlots, _ as getCurrentInstance, a as computed$1, at as withModifiers, b as hasInjectionContext, c as createCommentVNode, ct as isThenable$1, d as createStaticVNode, et as vModelText, f as createTextVNode, g as effectScope, h as defineComponent, i as Transition, it as withKeys, j as onBeforeUnmount, k as normalizeStyle, l as createElementBlock, m as defineAsyncComponent, n as Fragment, nt as withCtx, o as createApp, p as createVNode, q as toRef, r as Teleport, rt as withDirectives, s as createBlock, st as isPlainObject$1, t as _plugin_vue_export_helper_default, tt as watch$1, u as createElementVNode, v as getCurrentScope, w as markRaw, x as inject$1, y as h, z as ref } from "./chunks/_plugin-vue_export-helper-CmkaJDnr.es.js";
 import { t as blank_default } from "./chunks/blank-docx-DzQccOlW.es.js";
-import { C as getWorkflowRecording, S as createInteractionHistory, T as recordInteraction, _ as createTrackedChangePermissionResolver, a as registerFirstPartyCommandMutation, b as DOM_CLASS_NAMES, c as getCommandDescriptor, d as mutationCommittedEventChangedDocument, f as createImageFilePicker, g as PERMISSIONS, h as BUILT_IN_PERMISSION_METHOD, i as readFirstPartyPageNumbers, l as applyV2CommentInvalidationFromMutation, n as executeFirstPartyCommandAsync, o as isRecord, p as resolveImageSrc, r as executeFirstPartyShortcutAsync, t as createSuperDocUI, u as getV2TrackedChangeMutationImpact, v as isAllowed, w as isWorkflowRecordingEnabled, x as closeInteractionHistory, y as isSyntheticTrackedChangeCommentLaneItem } from "./chunks/create-super-doc-ui-Dc8dQAMc.es.js";
+import { C as createInteractionHistory, E as recordInteraction, S as closeInteractionHistory, T as isWorkflowRecordingEnabled, _ as isAllowed, a as registerFirstPartyCommandMutation, b as isRecord, c as applyV2CommentInvalidationFromMutation, d as createImageFilePicker, f as resolveImageSrc, g as createTrackedChangePermissionResolver, h as PERMISSIONS, i as readFirstPartyPageNumbers, l as getV2TrackedChangeMutationImpact, m as BUILT_IN_PERMISSION_METHOD, n as executeFirstPartyCommandAsync, r as executeFirstPartyShortcutAsync, s as getCommandDescriptor, t as createSuperDocUI, u as mutationCommittedEventChangedDocument, v as isSyntheticTrackedChangeCommentLaneItem, w as getWorkflowRecording, x as DOM_CLASS_NAMES, y as isStoryLocator } from "./chunks/create-super-doc-ui-Cq8trPVC.es.js";
 import { t as import_eventemitter3 } from "./chunks/eventemitter3-DEIiXiH2.es.js";
 import { t as v4 } from "./chunks/uuid-H0Xcmmhy.es.js";
 import { a as init_dist$1, i as global, n as init_dist$2, o as Buffer, r as process$1, s as init_dist, t as require_jszip_min } from "./chunks/jszip-BzJ3CyxR.es.js";
@@ -258,7 +258,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.29.0";
+		return "2.30.0-next.9";
 	} catch {
 		return "unknown";
 	}
@@ -5838,6 +5838,11 @@ function useCheckboxField(field) {
 	}) : itemoptions) };
 }
 //#endregion
+//#region src/core/collaboration/collaboration-comment-map.ts
+function createCollaborationCommentMap(entries) {
+	return new Map$1(entries);
+}
+//#endregion
 //#region src/core/collaboration/collaboration-comments.ts
 var readComment = (event) => {
 	const { comment } = event;
@@ -5846,14 +5851,14 @@ var readComment = (event) => {
 };
 var addYComment = (yArray, ydoc, event, user) => {
 	const comment = readComment(event);
-	const yComment = new Map$1(Object.entries(comment));
+	const yComment = createCollaborationCommentMap(Object.entries(comment));
 	ydoc.transact(() => {
 		yArray.push([yComment]);
 	}, { user });
 };
 var updateYComment = (yArray, ydoc, event, user) => {
 	const comment = readComment(event);
-	const yComment = new Map$1(Object.entries(comment));
+	const yComment = createCollaborationCommentMap(Object.entries(comment));
 	const commentIndex = getCommentIndex(yArray, comment);
 	if (commentIndex === -1) return;
 	ydoc.transact(() => {
@@ -6750,6 +6755,136 @@ var useSuperdocStore = defineStore("superdoc", () => {
 	};
 });
 //#endregion
+//#region ../document-api/src/errors.ts
+/**
+* Structured validation error thrown by document-api execute* functions.
+*
+* Consumers should prefer checking `error.code` over `instanceof` for resilience
+* across package boundaries and bundling scenarios.
+*/
+var DocumentApiValidationError = class DocumentApiValidationError extends Error {
+	constructor(code, message, details) {
+		super(message);
+		this.name = "DocumentApiValidationError";
+		this.code = code;
+		this.details = details;
+		Object.setPrototypeOf(this, DocumentApiValidationError.prototype);
+	}
+};
+//#endregion
+//#region ../document-api/src/export/export.types.ts
+/** Canonical tracked-change export modes accepted by every public export surface. */
+var SD_EXPORT_MODES = [
+	"review-preserving",
+	"final",
+	"original"
+];
+/** Default mode for modeful DOCX export. */
+var DEFAULT_SD_EXPORT_MODE = "review-preserving";
+var SD_COMMENT_EXPORT_POLICIES = [
+	"preserve",
+	"resolve",
+	"remove"
+];
+var SD_CONTENT_CONTROL_EXPORT_POLICIES = ["preserve", "flatten"];
+//#endregion
+//#region ../document-api/src/export/export.ts
+/**
+* Export namespace: engine-agnostic public API and adapter contract.
+*
+* Validates the requested mode at the public boundary so an invalid mode fails
+* closed with `INVALID_INPUT` before any document work happens, then delegates
+* byte production and degradation reporting to the engine adapter.
+*/
+function resolveMode$1(input) {
+	if (input != null && !isRecord(input)) throw new DocumentApiValidationError("INVALID_INPUT", "export.toDocx input must be an object.");
+	const raw = input?.mode;
+	if (raw === void 0) return DEFAULT_SD_EXPORT_MODE;
+	if (typeof raw !== "string" || !SD_EXPORT_MODES.includes(raw)) throw new DocumentApiValidationError("INVALID_INPUT", `export.toDocx mode must be one of: ${SD_EXPORT_MODES.join(", ")}.`, {
+		mode: raw,
+		allowedModes: [...SD_EXPORT_MODES]
+	});
+	return raw;
+}
+function resolveDocxExportPolicies(input = {}) {
+	if (!isRecord(input)) throw new DocumentApiValidationError("INVALID_INPUT", "DOCX export input must be an object.");
+	const mode = resolveMode$1(input);
+	const policies = input.policies;
+	if (policies !== void 0 && !isRecord(policies)) throw new DocumentApiValidationError("INVALID_INPUT", "DOCX export policies must be an object.");
+	const allowed = {
+		trackedChanges: SD_EXPORT_MODES,
+		comments: SD_COMMENT_EXPORT_POLICIES,
+		contentControls: SD_CONTENT_CONTROL_EXPORT_POLICIES
+	};
+	for (const [key, value] of Object.entries(policies ?? {})) if (!Object.prototype.hasOwnProperty.call(allowed, key) || value !== void 0 && !allowed[key].includes(value)) throw new DocumentApiValidationError("INVALID_INPUT", `Unsupported DOCX export policy: ${key}.`, {
+		policy: key,
+		value
+	});
+	const requested = policies;
+	if (input.mode !== void 0 && requested?.trackedChanges !== void 0 && mode !== requested.trackedChanges) throw new DocumentApiValidationError("INVALID_INPUT", "mode conflicts with policies.trackedChanges.");
+	return {
+		trackedChanges: requested?.trackedChanges ?? mode,
+		comments: requested?.comments ?? "preserve",
+		contentControls: requested?.contentControls ?? "preserve"
+	};
+}
+new TextEncoder();
+function normalizeCommentIdentity(value) {
+	if (value === null) return null;
+	if (typeof value !== "object" || Array.isArray(value) || !("providerId" in value) || !("userId" in value) || !xmlIdentityString(value.providerId) || !xmlIdentityString(value.userId)) throw new TypeError("commentIdentity requires XML-safe non-empty providerId and userId strings.");
+	return {
+		providerId: value.providerId,
+		userId: value.userId
+	};
+}
+function xmlIdentityString(value) {
+	return typeof value === "string" && value.trim().length > 0 && !/[^\u0009\u000A\u000D\u0020-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}]/u.test(value);
+}
+//#endregion
+//#region ../document-api/src/permission-ranges/permission-ranges.ts
+function editorKey(editor) {
+	return editor.id?.trim() ? editor.id : editor.email?.trim() || void 0;
+}
+function editorMatches(editor, id) {
+	return Boolean(id.trim()) && (editor.id === id || Boolean(editor.email?.trim() && editor.email.trim().toLowerCase() === id.toLowerCase()));
+}
+/**
+* Resolve a host ID or imported Word email against an explicitly supplied roster.
+* Word receives the email when available; opaque IDs remain host-specific.
+* Duplicate IDs/emails are ambiguous. This does not authenticate a user.
+*/
+function resolvePermissionRangeEditor(editors, id) {
+	const matches = editors.filter((editor) => editorMatches(editor, id));
+	if (matches.length === 0) return {
+		status: "unknown",
+		id
+	};
+	if (matches.length !== 1) return {
+		status: "ambiguous",
+		id
+	};
+	const editor = matches[0];
+	const wordId = editor.email?.trim() || editor.id;
+	if (editors.filter((candidate) => editorMatches(candidate, wordId)).length !== 1) return {
+		status: "ambiguous",
+		id
+	};
+	return {
+		status: "resolved",
+		id,
+		editor: { ...editor },
+		principal: {
+			kind: "editor",
+			id: wordId
+		}
+	};
+}
+/** Enumerate the host roster for an editor picker, including ambiguous entries. */
+function listPermissionRangeEditors(editors) {
+	const ids = new Set(editors.map(editorKey).filter((id) => id !== void 0));
+	return Array.from(ids, (id) => resolvePermissionRangeEditor(editors, id));
+}
+//#endregion
 //#region src/stores/helpers/floating-comment-instances.ts
 var HEADER_FOOTER_TRACKED_CHANGE_STORY_TYPE = "headerFooterPart";
 var toFinitePageIndex = (value) => {
@@ -7111,6 +7246,7 @@ var groupCommittedComments = (comments, presentations, isVisible) => {
 	});
 	const grouped = groupComments(comments.filter((row) => !presentations[String(row.fileId)]), isVisible);
 	for (const [documentId, presentation] of Object.entries(presentations)) {
+		if (!presentation) continue;
 		grouped.parentComments.push(...visibleRowsInOrder(documentId, presentation.groupOrder.open));
 		grouped.resolvedComments.push(...visibleRowsInOrder(documentId, presentation.groupOrder.resolved));
 	}
@@ -7806,9 +7942,55 @@ var createDroppedCommentIdMap = (duplicates) => {
 	return droppedCommentIds;
 };
 //#endregion
-//#region src/stores/comments-store.js
+//#region src/stores/helpers/v2-review-adapters.ts
+var COMMENTS_ADAPTER_METHODS = [
+	"setActiveComment",
+	"commitPendingComment",
+	"reply",
+	"edit",
+	"resolve",
+	"reopen",
+	"delete",
+	"mapV2CommentToUseCommentInput"
+];
+var COMMENTS_ADAPTER_OPTIONAL_METHODS = [
+	"getCapabilityState",
+	"captureCurrentSelection",
+	"isPendingCommentCreation",
+	"seedReviewCatalog",
+	"selectVisibleReviewComments"
+];
+var TRACKED_CHANGES_ADAPTER_METHODS = [
+	"accept",
+	"reject",
+	"mapV2TrackedChangeToCommentParams"
+];
+var TRACKED_CHANGES_ADAPTER_OPTIONAL_METHODS = ["clearActiveTrackedChangeTargetIfMatches"];
+var isAdapterDocumentId = (value) => value === void 0 || value === null || typeof value === "string" || typeof value === "number";
+var hasAdapterShape = (value, required, optional) => isPlainObject$1(value) && isAdapterDocumentId(value.documentId) && required.every((member) => typeof value[member] === "function") && optional.every((member) => value[member] === void 0 || typeof value[member] === "function");
+function isV2CommentsAdapter(value) {
+	return hasAdapterShape(value, COMMENTS_ADAPTER_METHODS, COMMENTS_ADAPTER_OPTIONAL_METHODS);
+}
+function isV2TrackedChangesAdapter(value) {
+	return hasAdapterShape(value, TRACKED_CHANGES_ADAPTER_METHODS, TRACKED_CHANGES_ADAPTER_OPTIONAL_METHODS);
+}
+//#endregion
+//#region src/stores/comments-store.ts
+var requireHost = (superdoc, action) => {
+	if (!superdoc) throw new TypeError(`${action} requires superdoc`);
+	return superdoc;
+};
+var PARENT_LINK_FIELDS = [
+	"trackedChangeThreadParentId",
+	"trackedChangeParentId",
+	"threadingParentCommentId",
+	"parentCommentId"
+];
+var isPresent = (value) => Boolean(value);
+var errorDetail = (error) => (error == null ? void 0 : Reflect.get(Object(error), "message")) ?? String(error);
 var useCommentsStore = defineStore("comments", () => {
 	const superdocStore = useSuperdocStore();
+	const findDocument = (documentId) => typeof documentId === "string" ? superdocStore.getDocument(documentId) : void 0;
 	const commentsConfig = reactive({
 		name: "comments",
 		readOnly: false,
@@ -7838,6 +8020,7 @@ var useCommentsStore = defineStore("comments", () => {
 	});
 	const debounceTimers = {};
 	const trackedChangeResolutionSnapshots = /* @__PURE__ */ new WeakMap();
+	let cachedTrackedChangeBatchIdentityIndex = null;
 	const isBenchmarkCommentsDebugEnabled = () => {
 		if (typeof window === "undefined") return false;
 		return "__labsSuperDocV2BenchmarkDebug" in window;
@@ -7875,7 +8058,7 @@ var useCommentsStore = defineStore("comments", () => {
 	});
 	const getTrackedChangeThread = (parentComment) => {
 		const id = parentComment?.commentId ?? null;
-		return (id != null ? trackedChangeThreadIndex.value.get(id) : null) ?? [parentComment].filter(Boolean);
+		return (id != null ? trackedChangeThreadIndex.value.get(id) : null) ?? (parentComment ? [parentComment] : []);
 	};
 	let priorTrackedChangeDecisionLinkIndex = /* @__PURE__ */ new Map();
 	const trackedChangeDecisionLinkIndex = computed$1(() => {
@@ -7907,29 +8090,28 @@ var useCommentsStore = defineStore("comments", () => {
 	});
 	const v2CommentsAdapter = shallowRef$1(null);
 	const setV2CommentsAdapter = (adapter) => {
-		if (v2CommentsAdapter.value !== (adapter ?? null)) pendingCommentRequest += 1;
-		v2CommentsAdapter.value = adapter ?? null;
+		const next = isV2CommentsAdapter(adapter) ? adapter : null;
+		if (v2CommentsAdapter.value !== next) pendingCommentRequest += 1;
+		v2CommentsAdapter.value = next;
 	};
 	const getV2CommentsAdapter = (superdoc) => {
-		const fromFacade = superdoc?.activeEditor?.v2Comments ?? null;
-		if (fromFacade) return fromFacade;
+		const fromFacade = superdoc?.activeEditor?.v2Comments;
+		if (isV2CommentsAdapter(fromFacade)) return fromFacade;
 		return v2CommentsAdapter.value;
 	};
 	const isV2EditorActive = (superdoc) => superdoc?.activeEditor?.editorVersion === 2 || v2CommentsAdapter.value !== null;
 	const v2TrackedChangesAdapter = shallowRef$1(null);
 	const setV2TrackedChangesAdapter = (adapter) => {
-		v2TrackedChangesAdapter.value = adapter ?? null;
+		cachedTrackedChangeBatchIdentityIndex = null;
+		v2TrackedChangesAdapter.value = isV2TrackedChangesAdapter(adapter) ? adapter : null;
 	};
 	const getV2TrackedChangesAdapter = (superdoc) => {
-		const fromFacade = superdoc?.activeEditor?.v2TrackedChanges ?? null;
-		if (fromFacade) return fromFacade;
+		const fromFacade = superdoc?.activeEditor?.v2TrackedChanges;
+		if (isV2TrackedChangesAdapter(fromFacade)) return fromFacade;
 		return v2TrackedChangesAdapter.value;
 	};
 	/**
 	* Initialize the store
-	*
-	* @param {Object} config The comments module config from SuperDoc
-	* @returns {void}
 	*/
 	const init = (config = {}) => {
 		const updatedConfig = {
@@ -7961,12 +8143,17 @@ var useCommentsStore = defineStore("comments", () => {
 		comment.trackedChangeDecision = null;
 	};
 	const getCommentEventPayload = (comment) => typeof comment?.getValues === "function" ? comment.getValues() : { ...comment };
+	const getDeletedCommentChanges = (sources, fileId) => {
+		const commentId = [...sources.map((source) => source?.commentId), ...sources.map((source) => source?.importedId)].map(normalizeCommentId).find(Boolean);
+		return commentId ? [{
+			key: "deleted",
+			commentId,
+			fileId
+		}] : [];
+	};
 	/**
 	* Check if a comment originated from the document editor (or has no explicit source).
 	* Comments without a source are assumed to be editor-backed for backward compatibility.
-	*
-	* @param {Object} comment - The comment to check
-	* @returns {boolean} True if the comment is editor-backed
 	*/
 	const isEditorBackedComment = (comment) => {
 		const source = comment?.selection?.source;
@@ -8000,9 +8187,6 @@ var useCommentsStore = defineStore("comments", () => {
 	}, { deep: false });
 	/**
 	* Get the editor position data for a comment.
-	*
-	* @param {Object | string} commentOrId The comment object or comment ID
-	* @returns {Object | null} The position data from editorCommentPositions
 	*/
 	const getCommentPosition = (commentOrId) => {
 		return resolveCommentPositionEntry(commentOrId).entry ?? null;
@@ -8015,10 +8199,6 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Set the active comment or clear all active comments
-	*
-	* @param {Object | undefined | null} superdoc The SuperDoc instance holding the active editor
-	* @param {string | undefined | null} id The comment ID
-	* @returns {void}
 	*/
 	const setActiveComment = (superdoc, id) => {
 		const activeEditor = superdoc?.activeEditor;
@@ -8029,7 +8209,7 @@ var useCommentsStore = defineStore("comments", () => {
 				v2Adapter.setActiveComment(null);
 				return;
 			}
-			activeEditor?.commands?.setActiveComment({ commentId: null });
+			activeEditor?.commands?.setActiveComment?.({ commentId: null });
 			return;
 		}
 		const comment = getComment(id);
@@ -8040,18 +8220,13 @@ var useCommentsStore = defineStore("comments", () => {
 			v2Adapter.setActiveComment(comment.commentId);
 			return;
 		}
-		activeEditor?.commands?.setActiveComment({ commentId: activeComment.value });
+		activeEditor?.commands?.setActiveComment?.({ commentId: activeComment.value });
 	};
 	/**
 	* Called when a tracked change is updated. Creates a new comment if necessary,
 	* or updates an existing tracked-change comment.
-	*
-	* @param {Object} param0
-	* @param {Object} param0.superdoc The SuperDoc instance
-	* @param {Object} param0.params The tracked change params
-	* @returns {void}
 	*/
-	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, trackedChangeIdentityIndex = null }) => {
+	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, trackedChangeIdentityIndex = null, preserveDraft = false }) => {
 		const span = startInteractionSpan("store.trackedChanges.handleUpdate", "store-reconciliation", {
 			event: params?.event ?? null,
 			changeId: params?.changeId ?? null,
@@ -8076,9 +8251,11 @@ var useCommentsStore = defineStore("comments", () => {
 			const normalizedTrackedChangeLabel = typeof trackedChangeLabel === "string" && trackedChangeLabel.length > 0 ? trackedChangeLabel : null;
 			const normalizedTrackedChangeDetailLines = normalizeTrackedChangeDetailLines(trackedChangeDetailLines);
 			const normalizedTrackedChangeImagePreview = normalizeTrackedChangeImagePreview(trackedChangeImagePreview);
+			const hasDraft = preserveDraft && (pendingComment.value !== null || currentCommentText.value !== "" || currentCommentMentions.value.length > 0);
 			const comment = getPendingComment({
 				documentId,
-				commentId: changeId,
+				...hasDraft ? { commentText: "" } : {},
+				commentId: normalizedChangeId ?? void 0,
 				trackedChange: true,
 				trackedChangeText,
 				trackedChangeType,
@@ -8130,7 +8307,7 @@ var useCommentsStore = defineStore("comments", () => {
 						commentCanonicalId,
 						commentAnchorKey,
 						...commentAliasIds
-					].filter(Boolean).some((id) => incomingAliasIds.has(id))) return true;
+					].some((id) => id != null && incomingAliasIds.has(id))) return true;
 					const hasSyntheticSideIdentity = normalizedTrackedChangeCanonicalId && normalizedTrackedChangeCanonicalId !== normalizedChangeId || commentCanonicalId && commentCanonicalId !== commentId;
 					if (hasCompatibleStory && commentId === normalizedChangeId) return true;
 					if (hasCompatibleStory && !hasSyntheticSideIdentity && (importedId === normalizedChangeId || normalizedImportedId !== void 0 && normalizedImportedId != null && importedId === normalizedImportedId)) return true;
@@ -8154,7 +8331,7 @@ var useCommentsStore = defineStore("comments", () => {
 			};
 			const emitTrackedChangeEvent = (event) => {
 				if (!broadcastChanges) return;
-				syncCommentsToClients(superdoc, event);
+				syncCommentsToClients(requireHost(superdoc, "handleTrackedChangeUpdate"), event);
 				debounceEmit(changeId, event, superdoc);
 			};
 			const setIfChanged = (target, key, value) => {
@@ -8197,8 +8374,9 @@ var useCommentsStore = defineStore("comments", () => {
 						target?.trackedChangeCanonicalId,
 						target?.trackedChangeAnchorKey,
 						...getCommentAliasIds(target)
-					].map((id) => normalizeCommentId(id)).filter(Boolean));
-					fields.trackedChangePositionAliases = normalizedTrackedChangePositionAliases.some((alias) => targetIdentityIds.has(alias)) ? normalizeTrackedChangePositionAliases([...Array.isArray(target?.trackedChangePositionAliases) ? target.trackedChangePositionAliases : [], ...normalizedTrackedChangePositionAliases]) : normalizedTrackedChangePositionAliases;
+					].map((id) => normalizeCommentId(id)).filter(isPresent));
+					const incomingAliases = normalizedTrackedChangePositionAliases ?? [];
+					fields.trackedChangePositionAliases = incomingAliases.some((alias) => targetIdentityIds.has(alias)) ? normalizeTrackedChangePositionAliases([...Array.isArray(target?.trackedChangePositionAliases) ? target.trackedChangePositionAliases : [], ...incomingAliases]) : incomingAliases;
 				}
 				let didChange = false;
 				for (const [key, value] of Object.entries(fields)) didChange = setIfChanged(target, key, value) || didChange;
@@ -8207,7 +8385,7 @@ var useCommentsStore = defineStore("comments", () => {
 					didChange = true;
 				}
 				if (hasCustomAttributes && target && !trackedChangeCustomAttributesEqual(target.customAttributes, normalizedCustomAttributes)) {
-					target.customAttributes = normalizedCustomAttributes;
+					target.customAttributes = normalizedCustomAttributes ?? null;
 					didChange = true;
 				}
 				return applyStoryMetadata(target) || didChange;
@@ -8229,9 +8407,10 @@ var useCommentsStore = defineStore("comments", () => {
 					return;
 				}
 				addHydratedComment({
-					superdoc,
+					superdoc: requireHost(superdoc, "handleTrackedChangeUpdate"),
 					comment,
-					broadcastChanges
+					broadcastChanges,
+					preserveDraft: hasDraft
 				});
 				trackedChangeIdentityIndex?.add(comment);
 			} else if (event === "update") {
@@ -8249,11 +8428,12 @@ var useCommentsStore = defineStore("comments", () => {
 					id: params.resolvedById ?? superdoc?.user?.id ?? null,
 					email: params.resolvedByEmail ?? superdoc?.user?.email ?? null,
 					name: params.resolvedByName ?? superdoc?.user?.name ?? null,
-					decision: params.decision ?? null,
+					decision: params.decision ?? void 0,
 					superdoc
 				};
 				if (existingTrackedChange && !existingTrackedChange.resolvedTime) existingTrackedChange.resolveComment({
 					...resolveArgs,
+					superdoc: requireHost(superdoc, "handleTrackedChangeUpdate"),
 					reconciliationToken: COMMENT_RECONCILIATION_TOKEN
 				});
 			}
@@ -8278,10 +8458,11 @@ var useCommentsStore = defineStore("comments", () => {
 		instantSidebarAlignmentInstanceId.value = null;
 	};
 	const debounceEmit = (commentId, event, superdoc, delay = 1e3) => {
-		if (debounceTimers[commentId]) clearTimeout(debounceTimers[commentId]);
-		debounceTimers[commentId] = setTimeout(() => {
+		const timerKey = String(commentId);
+		if (debounceTimers[timerKey]) clearTimeout(debounceTimers[timerKey]);
+		debounceTimers[timerKey] = setTimeout(() => {
 			if (superdoc) superdoc.emit("comments-update", event);
-			delete debounceTimers[commentId];
+			delete debounceTimers[timerKey];
 		}, delay);
 	};
 	const showAddComment = (superdoc, targetClientY = null) => {
@@ -8293,7 +8474,7 @@ var useCommentsStore = defineStore("comments", () => {
 			if (!ownsRequest()) return;
 			superdoc.emit("comments-update", {
 				type: COMMENT_EVENTS.PENDING,
-				pendingSelection: superdoc?.activeEditor === editor ? snapshot : null
+				pendingSelection: superdoc?.activeEditor === editor && isPlainObject$1(snapshot) ? snapshot : null
 			});
 		};
 		if (v2Adapter) {
@@ -8338,12 +8519,11 @@ var useCommentsStore = defineStore("comments", () => {
 			}).catch((err) => ({
 				ok: false,
 				reason: "selection-capture-failed",
-				detail: err?.message ?? String(err)
+				detail: errorDetail(err)
 			}));
 		}
 		const pendingSelection = getPendingSelectionSnapshot(superdoc, superdocStore.activeSelection);
-		const asyncSnapshot = typeof pendingSelection?.then === "function";
-		if (!asyncSnapshot) emitPending(pendingSelection);
+		if (!isThenable$1(pendingSelection)) emitPending(pendingSelection);
 		const showLegacyPending = (selection) => {
 			selection.selectionBounds = { ...selection.selectionBounds };
 			if (superdocStore.selectionPosition?.source && superdocStore.selectionPosition.source !== "pdf") superdocStore.selectionPosition.source = null;
@@ -8353,7 +8533,7 @@ var useCommentsStore = defineStore("comments", () => {
 				parentCommentId: null
 			});
 			if (!superdoc.config.isInternal) pendingComment.value.isInternal = false;
-			if (superdoc.activeEditor?.commands) superdoc.activeEditor.commands.insertComment({
+			if (superdoc.activeEditor?.commands) superdoc.activeEditor.commands.insertComment?.({
 				...pendingComment.value.getValues(),
 				commentId: "pending",
 				skipEmit: true
@@ -8364,10 +8544,10 @@ var useCommentsStore = defineStore("comments", () => {
 			activeComment.value = pendingComment.value.commentId;
 			return { ok: true };
 		};
-		if (asyncSnapshot) {
+		if (isThenable$1(pendingSelection)) {
 			const selection = { ...superdocStore.activeSelection };
 			selection.selectionBounds = { ...selection.selectionBounds };
-			return pendingSelection.then((snapshot) => {
+			return Promise.resolve(pendingSelection).then((snapshot) => {
 				if (!ownsRequest()) return {
 					ok: false,
 					reason: "pending-comment-superseded"
@@ -8399,12 +8579,6 @@ var useCommentsStore = defineStore("comments", () => {
 	});
 	/**
 	* Get a new pending comment
-	*
-	* @param {Object} param0
-	* @param {Object} [param0.selection] The selection object
-	* @param {string | null} [param0.documentId] The document ID
-	* @param {string | null} [param0.parentCommentId] The parent comment
-	* @returns {ReturnType<typeof useComment>} The new comment object
 	*/
 	const getPendingComment = ({ selection, documentId, parentCommentId, ...options }) => {
 		return _getNewcomment({
@@ -8416,17 +8590,11 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Get the new comment object
-	*
-	* @param {Object} param0
-	* @param {Object} param0.selection The selection object
-	* @param {String} param0.documentId The document ID
-	* @param {String} param0.parentCommentId The parent comment ID
-	* @returns {Object} The new comment object
 	*/
 	const _getNewcomment = ({ selection, documentId, parentCommentId, ...options }) => {
 		let activeDocument;
-		if (documentId) activeDocument = superdocStore.getDocument(documentId);
-		else if (selection) activeDocument = superdocStore.getDocument(selection.documentId);
+		if (documentId) activeDocument = findDocument(documentId);
+		else if (selection) activeDocument = findDocument(selection.documentId);
 		if (!activeDocument) activeDocument = superdocStore.documents[0];
 		return useComment({
 			fileId: activeDocument.id,
@@ -8443,8 +8611,6 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Remove the pending comment
-	*
-	* @returns {void}
 	*/
 	const resetPendingCommentState = (superdoc, clearViewingSelection = true) => {
 		const hadPending = !!pendingComment.value;
@@ -8460,7 +8626,7 @@ var useCommentsStore = defineStore("comments", () => {
 			} catch {}
 			return;
 		}
-		superdoc?.activeEditor?.commands?.removeComment({ commentId: "pending" });
+		superdoc?.activeEditor?.commands?.removeComment?.({ commentId: "pending" });
 	};
 	const removePendingComment = (superdoc) => {
 		pendingCommentRequest += 1;
@@ -8473,16 +8639,8 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Add a new comment to the document
-	*
-	* @param {Object} param0
-	* @param {Object} param0.superdoc The SuperDoc instance
-	* @param {ReturnType<typeof useComment>} param0.comment The comment to add
-	* @param {boolean} [param0.skipEditorUpdate] Skip writing the comment into the editor
-	* @param {boolean} [param0.broadcastChanges] Emit and sync the change
-	* @param {boolean} [param0.isHydration] The comment comes from import or collaboration
-	* @returns {{ ok: boolean, reason?: string, detail?: string, code?: string } | Promise<{ ok: boolean, reason?: string, detail?: string, code?: string }>} The mutation outcome
 	*/
-	const addCommentInternal = ({ superdoc, comment, skipEditorUpdate = false, broadcastChanges = true, isHydration = false }) => {
+	const addCommentInternal = ({ superdoc, comment, skipEditorUpdate = false, broadcastChanges = true, isHydration = false, preserveDraft = false }) => {
 		if (commentsAreReadOnly() && !isHydration) return readOnlyMutationOutcome();
 		const v2Adapter = !skipEditorUpdate && !isHydration ? getV2CommentsAdapter(superdoc) : null;
 		if (v2Adapter && !comment.trackedChange) {
@@ -8510,7 +8668,7 @@ var useCommentsStore = defineStore("comments", () => {
 					return {
 						ok: false,
 						reason: "adapter-threw",
-						detail: err?.message ?? String(err)
+						detail: errorDetail(err)
 					};
 				}
 			})().then((outcome) => {
@@ -8561,28 +8719,30 @@ var useCommentsStore = defineStore("comments", () => {
 				};
 			});
 		}
-		let parentComment = commentsList.value.find((c) => c.commentId === activeComment.value);
+		const activeId = activeComment.value;
+		const parent = toRaw$2(commentsList.value).find((c) => unref(c.commentId) === activeId);
+		let parentComment = parent ? reactive(parent) : void 0;
 		if (!parentComment) parentComment = comment;
 		const newComment = useComment(comment.getValues());
-		if (pendingComment.value) newComment.setText({
-			text: currentCommentText.value,
-			suppressUpdate: true
-		});
-		else newComment.setText({
-			text: comment.commentText,
+		const text = pendingComment.value && !preserveDraft ? currentCommentText.value : comment.commentText;
+		if (text === "") {
+			newComment.commentText = "";
+			newComment.mentions = [];
+		} else newComment.setText({
+			text,
 			suppressUpdate: true
 		});
-		newComment.selection.source = pendingComment.value?.selection?.source ?? newComment.selection.source;
+		if (!preserveDraft) newComment.selection.source = pendingComment.value?.selection?.source ?? newComment.selection.source;
 		if (parentComment) newComment.isInternal = parentComment.isInternal;
 		if (!superdoc.config.isInternal) newComment.isInternal = false;
 		commentsList.value.push(newComment);
-		const hadPendingComment = !!pendingComment.value;
-		removePendingComment(superdoc);
+		const hadPendingComment = !preserveDraft && !!pendingComment.value;
+		if (!preserveDraft) removePendingComment(superdoc);
 		if (hadPendingComment) {
 			activeComment.value = newComment.commentId;
 			setActiveFloatingCommentInstance(newComment.commentId);
 		}
-		if (!skipEditorUpdate && !comment.trackedChange && superdoc.activeEditor?.commands && !comment.parentCommentId) superdoc.activeEditor.commands.insertComment({
+		if (!skipEditorUpdate && !comment.trackedChange && superdoc.activeEditor?.commands && !comment.parentCommentId) superdoc.activeEditor.commands.insertComment?.({
 			...newComment.getValues(),
 			skipEmit: true
 		});
@@ -8605,12 +8765,13 @@ var useCommentsStore = defineStore("comments", () => {
 		skipEditorUpdate,
 		broadcastChanges
 	});
-	const addHydratedComment = ({ superdoc, comment, skipEditorUpdate = false, broadcastChanges = true }) => addCommentInternal({
+	const addHydratedComment = ({ superdoc, comment, skipEditorUpdate = false, broadcastChanges = true, preserveDraft = false }) => addCommentInternal({
 		superdoc,
 		comment,
 		skipEditorUpdate,
 		broadcastChanges,
-		isHydration: true
+		isHydration: true,
+		preserveDraft
 	});
 	const deleteComment = ({ commentId: commentIdToDelete, superdoc }) => {
 		if (commentsAreReadOnly()) return Promise.resolve(readOnlyMutationOutcome());
@@ -8630,7 +8791,7 @@ var useCommentsStore = defineStore("comments", () => {
 				return {
 					ok: false,
 					reason: "adapter-threw",
-					detail: err?.message ?? String(err)
+					detail: errorDetail(err)
 				};
 			}
 		})().then((outcome) => {
@@ -8650,16 +8811,16 @@ var useCommentsStore = defineStore("comments", () => {
 				});
 				return outcome;
 			}
-			const removedIds = new Set((Array.isArray(outcome.removedCommentIds) ? outcome.removedCommentIds : []).map(normalizeCommentId).filter(Boolean));
-			if (removedIds.has(normalizeCommentId(commentId))) {
-				if (importedId != null) removedIds.add(normalizeCommentId(importedId));
+			const removedIds = new Set((Array.isArray(outcome.removedCommentIds) ? outcome.removedCommentIds : []).map(normalizeCommentId).filter(isPresent));
+			if (removedIds.has(normalizeCommentId(commentId) ?? "")) {
+				if (importedId != null) removedIds.add(String(importedId));
 				let addedChild = true;
 				while (addedChild) {
 					addedChild = false;
 					for (const row of commentsList.value) {
 						const parentId = normalizeCommentId(row?.parentCommentId);
 						if (!parentId || !removedIds.has(parentId)) continue;
-						for (const alias of [row?.commentId, row?.importedId].map(normalizeCommentId).filter(Boolean)) {
+						for (const alias of [row?.commentId, row?.importedId].map(normalizeCommentId).filter(isPresent)) {
 							if (removedIds.has(alias)) continue;
 							removedIds.add(alias);
 							addedChild = true;
@@ -8667,9 +8828,9 @@ var useCommentsStore = defineStore("comments", () => {
 					}
 				}
 				commentsList.value = commentsList.value.filter((row) => {
-					return ![row?.commentId, row?.importedId].map(normalizeCommentId).filter(Boolean).some((alias) => removedIds.has(alias));
+					return ![row?.commentId, row?.importedId].map(normalizeCommentId).filter(isPresent).some((alias) => removedIds.has(alias));
 				});
-				if (removedIds.has(normalizeCommentId(activeComment.value))) clearActiveCommentSelection();
+				if (removedIds.has(normalizeCommentId(activeComment.value) ?? "")) clearActiveCommentSelection();
 			} else reconcileCommentsFromV2({
 				superdoc,
 				adapter: v2Adapter,
@@ -8677,18 +8838,18 @@ var useCommentsStore = defineStore("comments", () => {
 				items: outcome.items ?? [],
 				pruneStale: outcome.complete !== false
 			});
+			const payload = comment.getValues();
 			superdoc.emit("comments-update", {
 				type: COMMENT_EVENTS.DELETED,
-				comment: comment.getValues(),
-				changes: [{
-					key: "deleted",
+				comment: payload,
+				changes: getDeletedCommentChanges([{
 					commentId,
-					fileId
-				}]
+					importedId
+				}, payload], fileId)
 			});
 			return { ok: true };
 		});
-		superdoc.activeEditor?.commands?.removeComment({
+		superdoc.activeEditor?.commands?.removeComment?.({
 			commentId,
 			importedId
 		});
@@ -8696,14 +8857,14 @@ var useCommentsStore = defineStore("comments", () => {
 		const childCommentIds = commentsList.value.filter((c) => c.parentCommentId === commentId).map((c) => c.commentId || c.importedId);
 		commentsList.value = commentsList.value.filter((c) => !childCommentIds.includes(c.commentId));
 		if (activeComment.value === commentId || childCommentIds.includes(activeComment.value)) clearActiveCommentSelection();
+		const payload = comment.getValues();
 		const event = {
 			type: COMMENT_EVENTS.DELETED,
-			comment: comment.getValues(),
-			changes: [{
-				key: "deleted",
+			comment: payload,
+			changes: getDeletedCommentChanges([{
 				commentId,
-				fileId
-			}]
+				importedId
+			}, payload], fileId)
 		};
 		superdoc.emit("comments-update", event);
 		syncCommentsToClients(superdoc, event);
@@ -8715,7 +8876,7 @@ var useCommentsStore = defineStore("comments", () => {
 	* otherwise keep the source bubble after the document comment is gone.
 	*/
 	const dropCommentsFromMutationImpact = ({ superdoc, documentId, removedIds } = {}) => {
-		const seedIds = new Set([...removedIds instanceof Set ? removedIds : removedIds ?? []].map((id) => normalizeCommentId(id)).filter(Boolean));
+		const seedIds = new Set([...removedIds instanceof Set ? removedIds : removedIds ?? []].map((id) => normalizeCommentId(id)).filter(isPresent));
 		if (!seedIds.size) return {
 			ok: true,
 			removedIds: []
@@ -8739,7 +8900,7 @@ var useCommentsStore = defineStore("comments", () => {
 				if (!isDroppableCommentRow(row)) continue;
 				const aliases = getCommentAliasIds(row);
 				const alreadyDropped = aliases.some((alias) => droppedIds.has(alias));
-				const parentDropped = droppedIds.has(normalizeCommentId(row?.parentCommentId)) || droppedIds.has(normalizeCommentId(row?.threadingParentCommentId));
+				const parentDropped = droppedIds.has(normalizeCommentId(row?.parentCommentId) ?? "") || droppedIds.has(normalizeCommentId(row?.threadingParentCommentId) ?? "");
 				if (!alreadyDropped && !parentDropped) continue;
 				for (const alias of aliases) {
 					if (droppedIds.has(alias)) continue;
@@ -8767,11 +8928,7 @@ var useCommentsStore = defineStore("comments", () => {
 			const event = {
 				type: COMMENT_EVENTS.DELETED,
 				comment: payload,
-				changes: [{
-					key: "deleted",
-					commentId: payload?.commentId,
-					fileId: payload?.fileId
-				}]
+				changes: getDeletedCommentChanges([payload, comment], payload?.fileId)
 			};
 			superdoc?.emit?.("comments-update", event);
 		});
@@ -8793,7 +8950,7 @@ var useCommentsStore = defineStore("comments", () => {
 		const byAlias = /* @__PURE__ */ new Map();
 		const childrenByParentAlias = /* @__PURE__ */ new Map();
 		for (const row of rows) {
-			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) if (!byAlias.has(alias)) byAlias.set(alias, row);
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(isPresent)) if (!byAlias.has(alias)) byAlias.set(alias, row);
 			const parentId = normalizeCommentId(row.parentCommentId);
 			if (parentId) {
 				const children = childrenByParentAlias.get(parentId) ?? [];
@@ -8820,7 +8977,7 @@ var useCommentsStore = defineStore("comments", () => {
 			if (!row || visited.has(row)) continue;
 			visited.add(row);
 			family.push(row);
-			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) queue.push(...childrenByParentAlias.get(alias) ?? []);
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(isPresent)) queue.push(...childrenByParentAlias.get(alias) ?? []);
 		}
 		const isResolved = status === "resolved";
 		const resolvedAt = Date.now();
@@ -8843,7 +9000,7 @@ var useCommentsStore = defineStore("comments", () => {
 			outcome = {
 				ok: false,
 				reason: "adapter-threw",
-				detail: err?.message ?? String(err)
+				detail: errorDetail(err)
 			};
 		}
 		if (!isCurrentV2CommentsAdapter(adapter)) return {
@@ -8915,14 +9072,14 @@ var useCommentsStore = defineStore("comments", () => {
 		return (outcome.items ?? []).map((item) => adapter.mapV2CommentToUseCommentInput(item, {
 			fileId,
 			fileType: null
-		})).filter(Boolean);
+		})).filter(isPresent);
 	};
 	const isBlankDirectoryCommentText = (value) => typeof value !== "string" || value.replace(/<[^>]*>/g, "").replace(/&nbsp;/gi, " ").trim().length === 0;
 	const trackedChangeDirectoryComment = (params) => {
 		if (!params || params.event === "omit" || params.changeId == null) return null;
 		return getPendingComment({
 			documentId: params.documentId,
-			commentId: params.changeId,
+			commentId: String(params.changeId),
 			trackedChange: true,
 			trackedChangeText: params.trackedChangeText,
 			trackedChangeType: params.trackedChangeType,
@@ -8969,7 +9126,7 @@ var useCommentsStore = defineStore("comments", () => {
 		const mappedCommentInputs = commentItems.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => commentsAdapter.mapV2CommentToUseCommentInput(item, {
 			fileId: documentId,
 			fileType: document?.type ?? null
-		})).filter(Boolean);
+		})).filter(isPresent);
 		const trackedParentBySidecarId = /* @__PURE__ */ new Map();
 		for (const input of mappedCommentInputs) if (input.trackedChange !== true && input.trackedChangeThreadParentId && !input.parentCommentId && isBlankDirectoryCommentText(input.commentText)) trackedParentBySidecarId.set(String(input.commentId), String(input.trackedChangeThreadParentId));
 		const commentRows = mappedCommentInputs.filter((input) => !trackedParentBySidecarId.has(String(input.commentId))).map((input) => {
@@ -8980,7 +9137,7 @@ var useCommentsStore = defineStore("comments", () => {
 			}
 			return useComment(input);
 		});
-		const trackedRows = trackedChangeItems.map((item) => trackedChangesAdapter.mapV2TrackedChangeToCommentParams(item)).map((params) => trackedChangeDirectoryComment(params)).filter(Boolean);
+		const trackedRows = trackedChangeItems.map((item) => trackedChangesAdapter.mapV2TrackedChangeToCommentParams(item)).map((params) => trackedChangeDirectoryComment(params)).filter(isPresent);
 		reviewDirectoryList.value = [...commentRows, ...trackedRows];
 		return {
 			ok: true,
@@ -9061,13 +9218,6 @@ var useCommentsStore = defineStore("comments", () => {
 	*   - successful mutation refreshes from v2 list and reconciles
 	*   - rejection preserves rows and emits a rejected `comments-update` event
 	*   - committed-but-refresh-failed surfaces honestly (no reconcile with `[]`)
-	*
-	* @param {Object} [param0]
-	* @param {Object} [param0.superdoc] The SuperDoc instance.
-	* @param {string | null} [param0.parentCommentId] The comment or tracked-change row being replied to.
-	* @param {string} [param0.text] The reply text.
-	* @param {Array<{ name?: string | null, email?: string | null }>} [param0.mentions] Users mentioned in the reply.
-	* @param {{ kind: 'trackedChange', trackedChangeId: string, story?: unknown, side?: import('./helpers/tracked-change-thread-index.js').TrackedChangeSideGroup }} [param0.trackedChangeTarget] The tracked change a first reply anchors to.
 	*/
 	const replyCommentV2 = async ({ superdoc, parentCommentId, text, mentions = [], trackedChangeTarget } = {}) => {
 		if (commentsAreReadOnly()) return readOnlyMutationOutcome();
@@ -9342,10 +9492,15 @@ var useCommentsStore = defineStore("comments", () => {
 		row?.threadingParentCommentId,
 		row?.trackedChangeParentId,
 		row?.trackedChangeThreadParentId
-	].map((value) => normalizeCommentId(value)).filter(Boolean));
+	].map((value) => normalizeCommentId(value)).filter(isPresent));
 	/** Keep one mounted review window plus rows whose interaction is still live. */
 	const boundReviewPresentationRows = ({ documentId, visibleIds }) => {
 		const currentRows = commentsList.value;
+		if (currentRows.every((row) => {
+			if (!belongsToTrackedChangeSyncDocument(row, documentId)) return true;
+			const id = normalizeCommentId(row.commentId);
+			return Boolean(id && visibleIds.has(id));
+		})) return;
 		const identityIdsByRow = /* @__PURE__ */ new Map();
 		const identityIdsFor = (row) => {
 			let ids = identityIdsByRow.get(row);
@@ -9363,7 +9518,7 @@ var useCommentsStore = defineStore("comments", () => {
 			pendingComment.value?.commentId,
 			instantSidebarAlignmentThreadId.value,
 			instantSidebarAlignmentInstanceId.value
-		].map((value) => normalizeCommentId(value)).filter(Boolean));
+		].map((value) => normalizeCommentId(value)).filter(isPresent));
 		let changed = true;
 		while (changed) {
 			changed = false;
@@ -9431,7 +9586,8 @@ var useCommentsStore = defineStore("comments", () => {
 		if (preparedReview?.reuseCatalog === true && committedReviewPresentations.value[normalizedDocumentId]) {
 			const previous = committedReviewPresentations.value[normalizedDocumentId];
 			const next = preparedReview.presentation;
-			if (!next || !Number.isSafeInteger(preparedReview.catalogVersion) || preparedReview.catalogVersion < 1 || previous.catalogVersion > preparedReview.catalogVersion || next.catalogVersion !== preparedReview.catalogVersion || previous.coordinate?.documentEpoch !== next.coordinate?.documentEpoch || previous.coordinate?.mountId !== next.coordinate?.mountId || next.coordinate?.reviewVersion <= previous.coordinate?.reviewVersion || next.coordinate?.commitSequence < previous.coordinate?.commitSequence) return {
+			const catalogVersion = preparedReview.catalogVersion ?? NaN;
+			if (!next || !Number.isSafeInteger(catalogVersion) || catalogVersion < 1 || (previous.catalogVersion ?? 0) > catalogVersion || next.catalogVersion !== preparedReview.catalogVersion || previous.coordinate?.documentEpoch !== next.coordinate?.documentEpoch || previous.coordinate?.mountId !== next.coordinate?.mountId || next.coordinate?.reviewVersion <= previous.coordinate?.reviewVersion || next.coordinate?.commitSequence < previous.coordinate?.commitSequence) return {
 				ok: false,
 				reason: "review-catalog-stale"
 			};
@@ -9477,8 +9633,8 @@ var useCommentsStore = defineStore("comments", () => {
 			previousPresentation.updateContext = presentation.updateContext;
 			return {
 				ok: true,
-				commentItems: preparedReview.comments.length,
-				trackedItems: preparedReview.trackedChanges.length
+				commentItems: preparedReview?.comments.length,
+				trackedItems: preparedReview?.trackedChanges.length
 			};
 		}
 		let effectiveCommentItems = commentItems;
@@ -9492,7 +9648,7 @@ var useCommentsStore = defineStore("comments", () => {
 				reason: seeded?.reason ?? "comment-catalog-seed-failed"
 			};
 			const selected = commentsAdapter.selectVisibleReviewComments?.();
-			if (selected?.ok === true && Array.isArray(selected.items) && (!Array.isArray(selected.unresolvedIds) || selected.unresolvedIds.length === 0)) effectiveCommentItems = selected.items;
+			if (!isThenable$1(selected) && selected?.ok === true && Array.isArray(selected.items) && (!Array.isArray(selected.unresolvedIds) || selected.unresolvedIds.length === 0)) effectiveCommentItems = selected.items;
 		}
 		const fileType = (normalizedDocumentId ? superdocStore.getDocument(normalizedDocumentId) : null)?.type ?? null;
 		let preparedInputs;
@@ -9509,16 +9665,16 @@ var useCommentsStore = defineStore("comments", () => {
 			})) : effectiveCommentItems.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => commentsAdapter.mapV2CommentToUseCommentInput(item, {
 				fileId: normalizedDocumentId,
 				fileType
-			})).filter(Boolean);
+			})).filter(isPresent);
 			preparedParams = preparedReview ? preparedReview.trackedChanges.map((params) => ({
 				...params,
 				documentId: normalizedDocumentId
-			})) : trackedChangeItems.map((item) => trackedChangesAdapter.mapV2TrackedChangeToCommentParams(item)).filter(Boolean);
+			})) : trackedChangeItems.map((item) => trackedChangesAdapter.mapV2TrackedChangeToCommentParams(item)).filter(isPresent);
 		} catch (error) {
 			return {
 				ok: false,
 				reason: "mapper-failed",
-				detail: error?.message ?? String(error)
+				detail: errorDetail(error)
 			};
 		}
 		if (typeof patch !== "function") return {
@@ -9546,7 +9702,7 @@ var useCommentsStore = defineStore("comments", () => {
 				params?.trackedChangeCanonicalId,
 				params?.trackedChangeAnchorKey
 			])
-		].map((value) => normalizeCommentId(value)).filter(Boolean));
+		].map((value) => normalizeCommentId(value)).filter(isPresent));
 		patch(() => {
 			const previousPreparedPresentation = committedReviewPresentations.value[normalizedDocumentId] ?? null;
 			if (preparedReview?.presentation) committedReviewPresentations.value = {
@@ -9561,7 +9717,8 @@ var useCommentsStore = defineStore("comments", () => {
 				preparedParams,
 				preparedPresentation: preparedReview?.presentation ?? null,
 				previousPreparedPresentation,
-				pruneStale: false
+				pruneStale: false,
+				preserveDraft: true
 			});
 			reconcileCommentsFromV2({
 				superdoc,
@@ -9594,7 +9751,7 @@ var useCommentsStore = defineStore("comments", () => {
 		};
 		const effectiveDocumentId = documentId ?? adapter.documentId ?? null;
 		const normalizedEffectiveDocumentId = effectiveDocumentId != null ? String(effectiveDocumentId) : null;
-		const fileType = (effectiveDocumentId ? superdocStore.getDocument(effectiveDocumentId) : null)?.type ?? null;
+		const fileType = (effectiveDocumentId ? findDocument(effectiveDocumentId) : null)?.type ?? null;
 		const isBlankV2CommentText = (value) => {
 			if (typeof value !== "string") return true;
 			return value.replace(/<[^>]*>/g, "").replace(/&nbsp;/gi, " ").trim().length === 0;
@@ -9614,7 +9771,7 @@ var useCommentsStore = defineStore("comments", () => {
 		const candidateInputs = Array.isArray(preparedInputs) ? preparedInputs : items.filter((item) => !isSyntheticTrackedChangeCommentLaneItem(item)).map((item) => adapter.mapV2CommentToUseCommentInput(item, {
 			fileId: effectiveDocumentId,
 			fileType
-		})).filter(Boolean);
+		})).filter(isPresent);
 		for (const input of candidateInputs) {
 			if (isV2TrackedChangeSidecarCommentInput(input)) {
 				trackedChangeSidecarParentByCommentId.set(String(input.commentId), String(input.trackedChangeThreadParentId));
@@ -9667,7 +9824,7 @@ var useCommentsStore = defineStore("comments", () => {
 			existing.mentions = Array.isArray(input.mentions) ? input.mentions : [];
 			existing.isInternal = typeof input.isInternal === "boolean" ? input.isInternal : existing.isInternal;
 			if (typeof input.resolvedTime === "number") {
-				existing.resolvedTime = input.resolvedTimeWasSynthesized === true && typeof existing.resolvedTime === "number" ? existing.resolvedTime : input.resolvedTime;
+				existing.resolvedTime = input.resolvedTimeWasSynthesized === true && typeof existing.resolvedTime === "number" ? existing.resolvedTime : input.resolvedTime ?? null;
 				existing.resolvedByEmail = input.resolvedByEmail ?? null;
 				existing.resolvedByName = input.resolvedByName ?? null;
 			} else {
@@ -9741,7 +9898,7 @@ var useCommentsStore = defineStore("comments", () => {
 			return {
 				ok: false,
 				reason: "comment-read-failed",
-				detail: err?.message ?? String(err)
+				detail: errorDetail(err)
 			};
 		}
 		if (!isCurrentV2CommentsAdapter(adapter)) return {
@@ -9767,8 +9924,6 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Cancel the pending comment
-	*
-	* @returns {void}
 	*/
 	const cancelComment = (superdoc) => {
 		removePendingComment(superdoc);
@@ -9778,9 +9933,6 @@ var useCommentsStore = defineStore("comments", () => {
 	*
 	* Replace-file swaps call this before hydrating the replacement so stale
 	* comments never survive long enough to render beside the new content.
-	*
-	* @param {string | null | undefined} documentId
-	* @returns {void}
 	*/
 	function removeCommentsForDocument(documentId) {
 		const activeDocumentId = documentId != null ? String(documentId) : null;
@@ -9811,20 +9963,16 @@ var useCommentsStore = defineStore("comments", () => {
 	const remapTrackedChangeReferences = (droppedCommentIds, activeDocumentId) => {
 		const remapSelection = (selection) => {
 			const selectedId = normalizeCommentId(selection.value);
-			if (selectedId && droppedCommentIds.has(selectedId)) selection.value = droppedCommentIds.get(selectedId);
+			const replacementId = selectedId ? droppedCommentIds.get(selectedId) : void 0;
+			if (replacementId) selection.value = replacementId;
 		};
 		remapSelection(activeComment);
 		remapSelection(activeFloatingCommentInstanceId);
 		commentsList.value.forEach((row) => {
 			if (!belongsToTrackedChangeSyncDocument(row, activeDocumentId)) return;
 			const rowIdentityUpdates = {};
-			for (const field of [
-				"trackedChangeThreadParentId",
-				"trackedChangeParentId",
-				"threadingParentCommentId",
-				"parentCommentId"
-			]) {
-				const replacementId = droppedCommentIds.get(normalizeCommentId(row?.[field]));
+			for (const field of PARENT_LINK_FIELDS) {
+				const replacementId = droppedCommentIds.get(normalizeCommentId(row?.[field]) ?? "");
 				if (!replacementId) continue;
 				row[field] = replacementId;
 				rowIdentityUpdates[field] = replacementId;
@@ -9845,10 +9993,6 @@ var useCommentsStore = defineStore("comments", () => {
 	*
 	* Pruning is scoped to the active editor document so replay in one document does not
 	* delete tracked-change comments from other open documents.
-	*
-	* @param {Set<string>} liveTrackedChangeIds IDs currently present in editor marks.
-	* @param {string | null} activeDocumentId Document currently being synced.
-	* @returns {void}
 	*/
 	const pruneStaleTrackedChangeComments = (liveTrackedChangeIds, liveTrackedChangeAnchorKeys, activeDocumentId, superdoc = null, { broadcastChanges = true } = {}) => withInteractionSpan("store.trackedChanges.pruneStaleComments", "store-reconciliation", {
 		activeDocumentId: activeDocumentId ?? null,
@@ -9893,7 +10037,7 @@ var useCommentsStore = defineStore("comments", () => {
 				comment: payload
 			};
 			if (broadcastChanges) {
-				syncCommentsToClients(superdoc, event);
+				syncCommentsToClients(requireHost(superdoc, "pruneStaleTrackedChangeComments"), event);
 				superdoc?.emit?.("comments-update", event);
 			}
 		});
@@ -9925,14 +10069,10 @@ var useCommentsStore = defineStore("comments", () => {
 			const event = {
 				type: COMMENT_EVENTS.DELETED,
 				comment: payload,
-				changes: [{
-					key: "deleted",
-					commentId: payload.commentId,
-					fileId: payload.fileId
-				}]
+				changes: getDeletedCommentChanges([payload, comment], payload.fileId)
 			};
 			if (broadcastChanges) {
-				syncCommentsToClients(superdoc, event);
+				syncCommentsToClients(requireHost(superdoc, "pruneStaleTrackedChangeComments"), event);
 				superdoc?.emit?.("comments-update", event);
 			}
 		});
@@ -9955,7 +10095,6 @@ var useCommentsStore = defineStore("comments", () => {
 		const resolveArgs = {
 			email: superdoc?.user?.email ?? null,
 			name: superdoc?.user?.name ?? null,
-			superdoc,
 			reconciliationToken: COMMENT_RECONCILIATION_TOKEN
 		};
 		let resolvedCount = 0;
@@ -9966,9 +10105,12 @@ var useCommentsStore = defineStore("comments", () => {
 				trackedChangeThreadParentIdForComment(linkedComment),
 				linkedComment.threadingParentCommentId,
 				linkedComment.parentCommentId
-			].map((id) => normalizeCommentId(id)).filter(Boolean).some((id) => trackedChangeIds.has(id))) return;
+			].map((id) => normalizeCommentId(id)).filter(isPresent).some((id) => trackedChangeIds.has(id))) return;
 			if (typeof linkedComment.resolveComment === "function") {
-				linkedComment.resolveComment(resolveArgs);
+				linkedComment.resolveComment({
+					...resolveArgs,
+					superdoc: requireHost(superdoc, "resolveLinkedCommentsForTrackedChangeDecision")
+				});
 				resolvedCount += 1;
 			}
 		});
@@ -10065,7 +10207,7 @@ var useCommentsStore = defineStore("comments", () => {
 				if (previousCommentId) anchorSourceIds.add(previousCommentId);
 				if (previousCanonicalId) anchorSourceIds.add(previousCanonicalId);
 			}
-			if (comment.trackedChangeAnchorKey == null || anchorSourceIds.has(currentAnchorParts?.rawId)) comment.trackedChangeAnchorKey = toAnchor;
+			if (comment.trackedChangeAnchorKey == null || anchorSourceIds.has(currentAnchorParts?.rawId ?? "")) comment.trackedChangeAnchorKey = toAnchor;
 			comment.trackedChangePositionAliases = normalizeTrackedChangePositionAliases([...Array.isArray(comment.trackedChangePositionAliases) ? comment.trackedChangePositionAliases : [], fromId]);
 			const identitySourceIds = /* @__PURE__ */ new Set([fromId]);
 			if (advancesRemapLineage) {
@@ -10076,33 +10218,28 @@ var useCommentsStore = defineStore("comments", () => {
 				if (row === comment) return;
 				if (!belongsToTrackedChangeSyncDocument(row, normalizedDocumentId)) return;
 				const rowIdentityUpdates = {};
-				for (const field of [
-					"trackedChangeThreadParentId",
-					"trackedChangeParentId",
-					"threadingParentCommentId",
-					"parentCommentId"
-				]) {
-					if (!identitySourceIds.has(normalizeCommentId(row?.[field]))) continue;
+				for (const field of PARENT_LINK_FIELDS) {
+					if (!identitySourceIds.has(normalizeCommentId(row?.[field]) ?? "")) continue;
 					row[field] = toId;
 					rowIdentityUpdates[field] = toId;
 				}
 				if (Object.keys(rowIdentityUpdates).length && typeof row.updateIdentityValues === "function") row.updateIdentityValues(rowIdentityUpdates);
 			});
 			if (Object.keys(commentIdentityUpdates).length && typeof comment.updateIdentityValues === "function") comment.updateIdentityValues(commentIdentityUpdates);
-			const previousEntry = previousPositionEntry ?? [positions[fromId], positions[buildBodyTrackedChangeAnchorKey(fromId)]].find((entry) => entry && positionEntryMatchesTrackedChangeStory(entry, comment));
+			const previousEntry = previousPositionEntry ?? [positions[fromId], positions[String(buildBodyTrackedChangeAnchorKey(fromId))]].find((entry) => entry && positionEntryMatchesTrackedChangeStory(entry, comment));
 			if (previousEntry) {
-				for (const key of [toId, toAnchor]) if (positions[key] === void 0) {
+				for (const key of [toId, String(toAnchor)]) if (positions[key] === void 0) {
 					positions[key] = previousEntry;
 					positionsChanged = true;
 				}
 			}
-			if (identitySourceIds.has(normalizeCommentId(activeComment.value))) activeComment.value = toId;
-			if (identitySourceIds.has(normalizeCommentId(activeFloatingCommentInstanceId.value))) activeFloatingCommentInstanceId.value = toId;
+			if (identitySourceIds.has(normalizeCommentId(activeComment.value) ?? "")) activeComment.value = toId;
+			if (identitySourceIds.has(normalizeCommentId(activeFloatingCommentInstanceId.value) ?? "")) activeFloatingCommentInstanceId.value = toId;
 		}
 		if (positionsChanged) editorCommentPositions.value = { ...positions };
 	};
 	const pruneDecidedTrackedChangeRow = ({ superdoc, comment: targetComment, decidedId, decidedIds, documentId } = {}) => {
-		const normalizedDecidedIds = new Set((Array.isArray(decidedIds) || decidedIds instanceof Set ? Array.from(decidedIds) : [decidedId]).map((id) => normalizeCommentId(id)).filter(Boolean));
+		const normalizedDecidedIds = new Set((Array.isArray(decidedIds) || decidedIds instanceof Set ? Array.from(decidedIds) : [decidedId]).map((id) => normalizeCommentId(id)).filter(isPresent));
 		const normalizedDocumentId = normalizeCommentId(documentId);
 		if (!normalizedDecidedIds.size || !normalizedDocumentId) return {
 			removed: false,
@@ -10162,12 +10299,6 @@ var useCommentsStore = defineStore("comments", () => {
 	};
 	/**
 	* Accept or reject the tracked change behind a sidebar row.
-	*
-	* @param {Object} param0
-	* @param {Object} param0.superdoc The SuperDoc instance.
-	* @param {Object} param0.comment The tracked-change row.
-	* @param {string} param0.decision `'accept'` or `'reject'`.
-	* @returns {{ ok: boolean, success?: boolean, reason?: string } | Promise<{ ok: boolean, success?: boolean, reason?: string }>} The decision outcome.
 	*/
 	const decideTrackedChangeFromSidebar = ({ superdoc, comment, decision }) => {
 		const disabledReason = trackedChangeDecisionDisabledReason(superdoc);
@@ -10195,7 +10326,7 @@ var useCommentsStore = defineStore("comments", () => {
 						return {
 							ok: false,
 							reason: "adapter-threw",
-							detail: err?.message ?? String(err)
+							detail: errorDetail(err)
 						};
 					}
 				})().then(async (outcome) => {
@@ -10248,9 +10379,11 @@ var useCommentsStore = defineStore("comments", () => {
 		if (!activeEditor) return { ok: false };
 		const id = comment.commentId ?? comment.importedId;
 		if (!id) return { ok: false };
-		const story = comment.trackedChangeStory ?? void 0;
+		const rawStory = comment.trackedChangeStory ?? void 0;
+		const story = isStoryLocator(rawStory) ? rawStory : void 0;
 		const documentApi = typeof activeEditor.doc === "object" ? activeEditor.doc : null;
 		if (documentApi?.trackChanges?.decide) try {
+			if (rawStory && !story) throw new TypeError("trackedChangeStory must be a valid StoryLocator");
 			const target = story ? {
 				id,
 				story
@@ -10263,7 +10396,7 @@ var useCommentsStore = defineStore("comments", () => {
 				success: Boolean(receipt?.success)
 			}));
 		} catch (error) {
-			if (story) return {
+			if (rawStory) return {
 				ok: false,
 				error
 			};
@@ -10310,9 +10443,9 @@ var useCommentsStore = defineStore("comments", () => {
 				documentId: effectiveDocumentId
 			})).removed
 		};
-		const normalizedRemovedIds = new Set(Array.from(removedIds ?? []).map((id) => normalizeCommentId(id)).filter(Boolean));
-		const normalizedUpsertIds = [...new Set(Array.from(upsertIds ?? []).map((id) => normalizeCommentId(id)).filter(Boolean))];
-		const remappedSourceIds = new Set((Array.isArray(remappedPairs) ? remappedPairs : []).map((pair) => normalizeCommentId(pair?.from)).filter(Boolean));
+		const normalizedRemovedIds = new Set(Array.from(removedIds ?? []).map((id) => normalizeCommentId(id)).filter(isPresent));
+		const normalizedUpsertIds = [...new Set(Array.from(upsertIds ?? []).map((id) => normalizeCommentId(id)).filter(isPresent))];
+		const remappedSourceIds = new Set((Array.isArray(remappedPairs) ? remappedPairs : []).map((pair) => normalizeCommentId(pair?.from)).filter(isPresent));
 		const locallyRemovedIds = new Set([...normalizedRemovedIds].filter((id) => !remappedSourceIds.has(id)));
 		if (locallyRemovedIds.size > 0 && effectiveDocumentId != null) pruneDecidedTrackedChangeRow({
 			superdoc,
@@ -10331,6 +10464,10 @@ var useCommentsStore = defineStore("comments", () => {
 		const byIdentityAlias = /* @__PURE__ */ new Map();
 		const aliasesByRow = /* @__PURE__ */ new Map();
 		const indexedRows = /* @__PURE__ */ new Set();
+		const indexedIdentities = [];
+		let building = true;
+		let reusable = true;
+		let reused = false;
 		let aliasLookups = 0;
 		let candidateVisits = 0;
 		let rowAliasBuilds = 0;
@@ -10354,6 +10491,7 @@ var useCommentsStore = defineStore("comments", () => {
 			index.set(alias, bucket);
 		};
 		const add = (comment) => {
+			if (!building) reusable = false;
 			if (!comment?.trackedChange) return;
 			if (documentId && !belongsToTrackedChangeSyncDocument(comment, documentId)) return;
 			indexedRows.add(comment);
@@ -10365,19 +10503,49 @@ var useCommentsStore = defineStore("comments", () => {
 			rowAliasBuilds += 1;
 			aliasesByRow.set(comment, aliases);
 			aliases.forEach((alias) => addAlias(byIdentityAlias, alias, comment));
+			if (building) indexedIdentities.push({
+				row: comment,
+				aliases,
+				canonicalId: normalizeCommentId(comment.trackedChangeCanonicalId)
+			});
 		};
 		commentsList.value.forEach(add);
+		building = false;
 		return {
+			inUse: false,
 			add,
 			aliasesFor,
-			work: () => ({
-				trackedRowsIndexed: indexedRows.size,
-				invalidatedIdMembershipChecks: 0,
-				incomingAliasLookups: aliasLookups,
-				candidateVisits,
-				rowAliasBuilds,
-				rowAliasCacheHits
-			}),
+			isCurrent: () => {
+				if (!reusable) return false;
+				let index = 0;
+				for (const row of commentsList.value) {
+					if (!row?.trackedChange || documentId && !belongsToTrackedChangeSyncDocument(row, documentId)) continue;
+					const previous = indexedIdentities[index++];
+					if (!previous || previous.row !== row || previous.canonicalId !== normalizeCommentId(row.trackedChangeCanonicalId)) return false;
+					const aliases = getCommentAliasIds(row);
+					rowAliasBuilds += 1;
+					if (aliases.length !== previous.aliases.length || aliases.some((alias, i) => alias !== previous.aliases[i])) return false;
+				}
+				reused = index === indexedIdentities.length;
+				return reused;
+			},
+			work: () => {
+				const result = {
+					trackedRowsIndexed: indexedRows.size,
+					invalidatedIdMembershipChecks: 0,
+					incomingAliasLookups: aliasLookups,
+					candidateVisits,
+					rowAliasBuilds,
+					rowAliasCacheHits,
+					indexReused: Number(reused)
+				};
+				aliasLookups = 0;
+				candidateVisits = 0;
+				rowAliasBuilds = 0;
+				rowAliasCacheHits = 0;
+				reused = false;
+				return result;
+			},
 			candidates({ changeId, importedId, anchorKey, canonicalId, positionAliases = [] } = {}) {
 				const out = /* @__PURE__ */ new Set();
 				const include = (value) => {
@@ -10400,7 +10568,30 @@ var useCommentsStore = defineStore("comments", () => {
 			}
 		};
 	};
-	const reconcileTrackedChangesFromV2 = ({ superdoc, adapter, documentId, items, pruneStale = true, preparedParams = null, preparedPresentation = null, previousPreparedPresentation = null, liveIds: suppliedLiveIds = null, liveAnchorKeys: suppliedLiveAnchorKeys = null, hydrationGeneration } = {}) => withInteractionSpan("store.trackedChanges.reconcile", "store-reconciliation", {
+	const getTrackedChangeBatchIdentityIndex = (documentId) => {
+		const cached = cachedTrackedChangeBatchIdentityIndex;
+		if (cached?.documentId === documentId && !cached.index.inUse) {
+			cached.index.inUse = true;
+			let current = false;
+			try {
+				current = cached.index.isCurrent() && cachedTrackedChangeBatchIdentityIndex === cached;
+			} finally {
+				if (!current) {
+					cached.index.inUse = false;
+					if (cachedTrackedChangeBatchIdentityIndex === cached) cachedTrackedChangeBatchIdentityIndex = null;
+				}
+			}
+			if (current) return cached.index;
+		}
+		const index = createTrackedChangeBatchIdentityIndex(documentId);
+		index.inUse = true;
+		cachedTrackedChangeBatchIdentityIndex = {
+			documentId,
+			index
+		};
+		return index;
+	};
+	const reconcileTrackedChangesFromV2 = ({ superdoc, adapter, documentId, items, pruneStale = true, preparedParams = null, preserveDraft = false, preparedPresentation = null, previousPreparedPresentation = null, liveIds: suppliedLiveIds = null, liveAnchorKeys: suppliedLiveAnchorKeys = null, hydrationGeneration } = {}) => withInteractionSpan("store.trackedChanges.reconcile", "store-reconciliation", {
 		documentId: documentId ?? null,
 		itemCount: Array.isArray(items) ? items.length : null,
 		pruneStale,
@@ -10412,33 +10603,36 @@ var useCommentsStore = defineStore("comments", () => {
 		const liveAnchorKeys = suppliedLiveAnchorKeys instanceof Set ? suppliedLiveAnchorKeys : /* @__PURE__ */ new Set();
 		const liveIds = suppliedLiveIds instanceof Set ? suppliedLiveIds : /* @__PURE__ */ new Set();
 		let appliedCount = 0;
-		const trackedChangeIdentityIndex = createTrackedChangeBatchIdentityIndex(effectiveDocumentId == null ? null : String(effectiveDocumentId));
+		const trackedChangeIdentityIndex = getTrackedChangeBatchIdentityIndex(effectiveDocumentId == null ? null : String(effectiveDocumentId));
 		const identitySpan = startInteractionSpan("store.trackedChanges.batchIdentity", "store-reconciliation", { itemCount: items.length });
-		const paramsList = Array.isArray(preparedParams) ? preparedParams : items.map((item) => adapter.mapV2TrackedChangeToCommentParams(item));
-		const previousCoordinate = previousPreparedPresentation?.coordinate;
-		const coordinate = preparedPresentation?.coordinate;
-		const retainUnchangedRows = !pruneStale && previousCoordinate && coordinate && coordinate.documentEpoch === preparedPresentation.epoch && coordinate.documentEpoch === previousPreparedPresentation.epoch && coordinate.documentEpoch === previousCoordinate.documentEpoch && typeof coordinate.mountId === "string" && coordinate.mountId.length > 0 && coordinate.mountId === previousCoordinate.mountId && preparedPresentation.baseVersion === previousPreparedPresentation.version && preparedPresentation.version === preparedPresentation.baseVersion + 1 && coordinate.reviewVersion === preparedPresentation.version && previousCoordinate.reviewVersion === previousPreparedPresentation.version && Number.isSafeInteger(coordinate.commitSequence) && Number.isSafeInteger(previousCoordinate.commitSequence) && coordinate.commitSequence >= previousCoordinate.commitSequence;
+		let enteredBatch = false;
 		try {
+			const paramsList = Array.isArray(preparedParams) ? preparedParams : items.map((item) => adapter.mapV2TrackedChangeToCommentParams(item));
+			const previousCoordinate = previousPreparedPresentation?.coordinate;
+			const coordinate = preparedPresentation?.coordinate;
+			const retainUnchangedRows = !pruneStale && previousCoordinate && coordinate && coordinate.documentEpoch === preparedPresentation.epoch && coordinate.documentEpoch === previousPreparedPresentation.epoch && coordinate.documentEpoch === previousCoordinate.documentEpoch && typeof coordinate.mountId === "string" && coordinate.mountId.length > 0 && coordinate.mountId === previousCoordinate.mountId && preparedPresentation.baseVersion === previousPreparedPresentation.version && preparedPresentation.version === preparedPresentation.baseVersion + 1 && coordinate.reviewVersion === preparedPresentation.version && previousCoordinate.reviewVersion === previousPreparedPresentation.version && Number.isSafeInteger(coordinate.commitSequence) && Number.isSafeInteger(previousCoordinate.commitSequence) && coordinate.commitSequence >= previousCoordinate.commitSequence;
+			enteredBatch = true;
 			for (const params of paramsList) {
 				if (!params) continue;
 				let retainUnchangedRow = false;
+				const anchorParts = parseTrackedChangeAnchorKey(params.trackedChangeAnchorKey);
+				const anchorStoryKey = anchorParts ? normalizeTrackedChangeStoryKey(anchorParts.storyKey) : void 0;
 				if (preparedPresentation) {
 					if (preparedPresentation !== committedReviewPresentations.value[String(effectiveDocumentId)]) continue;
 					if (params.documentId != null && String(params.documentId) !== String(effectiveDocumentId)) continue;
 					const id = normalizeCommentId(params.changeId);
-					const version = preparedPresentation.rowVersions?.[id];
+					const version = preparedPresentation.rowVersions?.[String(id)] ?? NaN;
 					if (!id || !Number.isSafeInteger(version) || version < 1) continue;
 					const existing = [...trackedChangeIdentityIndex.candidates({ changeId: id })].filter((row) => String(row.fileId) === String(effectiveDocumentId) && String(row.commentId) === id);
 					if (existing.length > 1) continue;
 					const row = existing[0];
 					if (row && row.trackedChangeCanonicalId !== params.trackedChangeCanonicalId) {
-						const previousVersion = previousPreparedPresentation?.rowVersions?.[id];
-						if (!row.trackedChange || params.event !== "add" || typeof params.trackedChangeCanonicalId !== "string" || !params.trackedChangeCanonicalId || !Number.isSafeInteger(previousVersion) || previousVersion < 1 || version <= previousVersion || normalizeTrackedChangeStoryKey(getTrackedChangeStoryKey(row)) !== normalizeTrackedChangeStoryKey(parseTrackedChangeAnchorKey(params.trackedChangeAnchorKey)?.storyKey) || row.trackedChangeType !== params.trackedChangeType || row.trackedChangeDisplayType !== params.trackedChangeDisplayType) continue;
+						const previousVersion = previousPreparedPresentation?.rowVersions?.[id] ?? NaN;
+						if (!row.trackedChange || params.event !== "add" || typeof params.trackedChangeCanonicalId !== "string" || !params.trackedChangeCanonicalId || !Number.isSafeInteger(previousVersion) || previousVersion < 1 || version <= previousVersion || normalizeTrackedChangeStoryKey(getTrackedChangeStoryKey(row)) !== anchorStoryKey || row.trackedChangeType !== params.trackedChangeType || row.trackedChangeDisplayType !== params.trackedChangeDisplayType) continue;
 						row.trackedChangeCanonicalId = params.trackedChangeCanonicalId;
-						row.updateIdentityValues?.({ trackedChangeCanonicalId: params.trackedChangeCanonicalId });
 						trackedChangeIdentityIndex.add(row);
 					}
-					retainUnchangedRow = retainUnchangedRows && row?.trackedChange === true && previousPreparedPresentation.rowVersions?.[id] === version && row.trackedChangeCanonicalId === params.trackedChangeCanonicalId && row.trackedChangeType === params.trackedChangeType && row.trackedChangeDisplayType === params.trackedChangeDisplayType && normalizeTrackedChangeStoryKey(getTrackedChangeStoryKey(row)) === normalizeTrackedChangeStoryKey(parseTrackedChangeAnchorKey(params.trackedChangeAnchorKey)?.storyKey) && !row.resolvedTime && !row.resolvedById && !row.resolvedByEmail && !row.resolvedByName;
+					retainUnchangedRow = retainUnchangedRows === true && row?.trackedChange === true && previousPreparedPresentation.rowVersions?.[id] === version && row.trackedChangeCanonicalId === params.trackedChangeCanonicalId && row.trackedChangeType === params.trackedChangeType && row.trackedChangeDisplayType === params.trackedChangeDisplayType && normalizeTrackedChangeStoryKey(getTrackedChangeStoryKey(row)) === anchorStoryKey && !row.resolvedTime && !row.resolvedById && !row.resolvedByEmail && !row.resolvedByName;
 				}
 				if (params.event === "omit") {
 					if (params.changeId != null) liveIds.add(String(params.changeId));
@@ -10452,12 +10646,15 @@ var useCommentsStore = defineStore("comments", () => {
 					superdoc,
 					params,
 					broadcastChanges: false,
-					trackedChangeIdentityIndex
+					trackedChangeIdentityIndex,
+					preserveDraft
 				});
 				appliedCount += 1;
 			}
 		} finally {
-			endInteractionSpan(identitySpan, trackedChangeIdentityIndex.work());
+			const work = trackedChangeIdentityIndex.work();
+			trackedChangeIdentityIndex.inUse = false;
+			if (enteredBatch) endInteractionSpan(identitySpan, work);
 		}
 		if (!effectiveDocumentId || !pruneStale) {
 			if (effectiveDocumentId) compactDuplicateBodyTrackedChangeComments(String(effectiveDocumentId));
@@ -10479,22 +10676,18 @@ var useCommentsStore = defineStore("comments", () => {
 		return commentsList.value.filter((comment) => {
 			if (comment?.trackedChange !== true) return false;
 			if (normalizedDocumentId == null) return true;
-			const rowDocumentId = comment?.documentId ?? comment?.fileId ?? null;
+			const rowDocumentId = Reflect.get(comment, "documentId") ?? comment?.fileId ?? null;
 			return rowDocumentId != null && String(rowDocumentId) === normalizedDocumentId;
 		}).length;
 	};
 	/**
 	* Triggered when the editor locations are updated
 	* Updates floating comment locations from the editor
-	*
-	* @param {Object} allCommentPositions The collected geometry keyed by comment / tracked-change id
-	* @param {{ retainMissingTrackedChangeGeometry?: boolean, retainedTrackedChangeIds?: Iterable<string> }} options Geometry reconciliation options
-	* @returns {void}
 	*/
 	const handleEditorLocationsUpdate = (allCommentPositions, options = {}) => {
 		if (allCommentPositions == null) return;
 		const retainMissingTrackedChangeGeometry = options?.retainMissingTrackedChangeGeometry === true;
-		const retainedTrackedChangeIds = retainMissingTrackedChangeGeometry && options?.retainedTrackedChangeIds != null ? new Set(Array.from(options.retainedTrackedChangeIds, (id) => normalizeCommentId(id)).filter(Boolean)) : null;
+		const retainedTrackedChangeIds = retainMissingTrackedChangeGeometry && options?.retainedTrackedChangeIds != null ? new Set(Array.from(options.retainedTrackedChangeIds, (id) => normalizeCommentId(id)).filter(isPresent)) : null;
 		const previousPositions = editorCommentPositions.value || {};
 		const normalizedPositions = {};
 		Object.entries(allCommentPositions).forEach(([key, entry]) => {
@@ -10521,7 +10714,7 @@ var useCommentsStore = defineStore("comments", () => {
 			return null;
 		};
 		const writeTrackedChangeAliases = (entry, comment, extraKeys = []) => {
-			const keys = [...aliasesFor(comment), ...extraKeys.map((id) => normalizeCommentId(id)).filter(Boolean)];
+			const keys = [...aliasesFor(comment), ...extraKeys.map((id) => normalizeCommentId(id)).filter(isPresent)];
 			for (const key of new Set(keys)) if (normalizedPositions[key] === void 0) normalizedPositions[key] = entry;
 		};
 		commentsList.value.forEach((comment) => {
@@ -11827,8 +12020,8 @@ var _hoisted_11$3 = {
 	key: 0,
 	class: "card-section comment-body"
 };
-var _hoisted_12$2 = ["data-track-change-semantic-color-key"];
-var _hoisted_13$2 = { key: 0 };
+var _hoisted_12$3 = ["data-track-change-semantic-color-key"];
+var _hoisted_13$3 = { key: 0 };
 var _hoisted_14$2 = { class: "change-type tracked-change-label" };
 var _hoisted_15$2 = {
 	key: 0,
@@ -13002,7 +13195,7 @@ var CommentDialog_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 								"data-track-change-semantic-color-key": comment.semanticColorKey ?? void 0,
 								ref_for: true,
 								ref: index === 0 ? setParentBodyRef : void 0
-							}, [comment.trackedChangeLabel ? (openBlock(), createElementBlock("div", _hoisted_13$2, [createElementVNode("span", _hoisted_14$2, toDisplayString(comment.trackedChangeLabel), 1), comment.trackedChangeDetailLines && comment.trackedChangeDetailLines.length ? (openBlock(), createElementBlock("div", _hoisted_15$2, [(openBlock(true), createElementBlock(Fragment, null, renderList(comment.trackedChangeDetailLines, (line, lineIndex) => {
+							}, [comment.trackedChangeLabel ? (openBlock(), createElementBlock("div", _hoisted_13$3, [createElementVNode("span", _hoisted_14$2, toDisplayString(comment.trackedChangeLabel), 1), comment.trackedChangeDetailLines && comment.trackedChangeDetailLines.length ? (openBlock(), createElementBlock("div", _hoisted_15$2, [(openBlock(true), createElementBlock(Fragment, null, renderList(comment.trackedChangeDetailLines, (line, lineIndex) => {
 								return openBlock(), createElementBlock("div", {
 									key: lineIndex,
 									class: "tracked-change-detail-line"
@@ -13027,7 +13220,7 @@ var CommentDialog_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 								style: normalizeStyle(trackedChangeImagePreviewStyle(comment.trackedChangeImagePreview)),
 								loading: "lazy",
 								decoding: "async"
-							}, null, 12, _hoisted_38)], 8, _hoisted_37)) : createCommentVNode("", true)], 10, _hoisted_12$2),
+							}, null, 12, _hoisted_38)], 8, _hoisted_37)) : createCommentVNode("", true)], 10, _hoisted_12$3),
 							shouldTruncate.value && isTextOverflowing.value && index === 0 ? (openBlock(), createElementBlock("div", {
 								key: 0,
 								class: "show-more-toggle",
@@ -13121,7 +13314,7 @@ var CommentDialog_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 			], 64))], 14, _hoisted_1$26)), [[_directive_click_outside, handleClickOutside]]);
 		};
 	}
-}), [["__scopeId", "data-v-4220ce17"]]);
+}), [["__scopeId", "data-v-c0cc448b"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1$25 = [
@@ -13888,124 +14081,6 @@ var composeAuthorColorResolver = (config) => {
 	};
 };
 //#endregion
-//#region ../document-api/src/errors.ts
-/**
-* Structured validation error thrown by document-api execute* functions.
-*
-* Consumers should prefer checking `error.code` over `instanceof` for resilience
-* across package boundaries and bundling scenarios.
-*/
-var DocumentApiValidationError = class DocumentApiValidationError extends Error {
-	constructor(code, message, details) {
-		super(message);
-		this.name = "DocumentApiValidationError";
-		this.code = code;
-		this.details = details;
-		Object.setPrototypeOf(this, DocumentApiValidationError.prototype);
-	}
-};
-//#endregion
-//#region ../document-api/src/export/export.types.ts
-/** Canonical tracked-change export modes accepted by every public export surface. */
-var SD_EXPORT_MODES = [
-	"review-preserving",
-	"final",
-	"original"
-];
-/** Default mode for modeful DOCX export. */
-var DEFAULT_SD_EXPORT_MODE = "review-preserving";
-var SD_COMMENT_EXPORT_POLICIES = [
-	"preserve",
-	"resolve",
-	"remove"
-];
-var SD_CONTENT_CONTROL_EXPORT_POLICIES = ["preserve", "flatten"];
-//#endregion
-//#region ../document-api/src/export/export.ts
-/**
-* Export namespace: engine-agnostic public API and adapter contract.
-*
-* Validates the requested mode at the public boundary so an invalid mode fails
-* closed with `INVALID_INPUT` before any document work happens, then delegates
-* byte production and degradation reporting to the engine adapter.
-*/
-function resolveMode$1(input) {
-	if (input != null && !isRecord(input)) throw new DocumentApiValidationError("INVALID_INPUT", "export.toDocx input must be an object.");
-	const raw = input?.mode;
-	if (raw === void 0) return DEFAULT_SD_EXPORT_MODE;
-	if (typeof raw !== "string" || !SD_EXPORT_MODES.includes(raw)) throw new DocumentApiValidationError("INVALID_INPUT", `export.toDocx mode must be one of: ${SD_EXPORT_MODES.join(", ")}.`, {
-		mode: raw,
-		allowedModes: [...SD_EXPORT_MODES]
-	});
-	return raw;
-}
-function resolveDocxExportPolicies(input = {}) {
-	if (!isRecord(input)) throw new DocumentApiValidationError("INVALID_INPUT", "DOCX export input must be an object.");
-	const mode = resolveMode$1(input);
-	const policies = input.policies;
-	if (policies !== void 0 && !isRecord(policies)) throw new DocumentApiValidationError("INVALID_INPUT", "DOCX export policies must be an object.");
-	const allowed = {
-		trackedChanges: SD_EXPORT_MODES,
-		comments: SD_COMMENT_EXPORT_POLICIES,
-		contentControls: SD_CONTENT_CONTROL_EXPORT_POLICIES
-	};
-	for (const [key, value] of Object.entries(policies ?? {})) if (!Object.prototype.hasOwnProperty.call(allowed, key) || value !== void 0 && !allowed[key].includes(value)) throw new DocumentApiValidationError("INVALID_INPUT", `Unsupported DOCX export policy: ${key}.`, {
-		policy: key,
-		value
-	});
-	const requested = policies;
-	if (input.mode !== void 0 && requested?.trackedChanges !== void 0 && mode !== requested.trackedChanges) throw new DocumentApiValidationError("INVALID_INPUT", "mode conflicts with policies.trackedChanges.");
-	return {
-		trackedChanges: requested?.trackedChanges ?? mode,
-		comments: requested?.comments ?? "preserve",
-		contentControls: requested?.contentControls ?? "preserve"
-	};
-}
-//#endregion
-//#region ../document-api/src/permission-ranges/permission-ranges.ts
-function editorKey(editor) {
-	return editor.id?.trim() ? editor.id : editor.email?.trim() || void 0;
-}
-function editorMatches(editor, id) {
-	return Boolean(id.trim()) && (editor.id === id || Boolean(editor.email?.trim() && editor.email.trim().toLowerCase() === id.toLowerCase()));
-}
-/**
-* Resolve a host ID or imported Word email against an explicitly supplied roster.
-* Word receives the email when available; opaque IDs remain host-specific.
-* Duplicate IDs/emails are ambiguous. This does not authenticate a user.
-*/
-function resolvePermissionRangeEditor(editors, id) {
-	const matches = editors.filter((editor) => editorMatches(editor, id));
-	if (matches.length === 0) return {
-		status: "unknown",
-		id
-	};
-	if (matches.length !== 1) return {
-		status: "ambiguous",
-		id
-	};
-	const editor = matches[0];
-	const wordId = editor.email?.trim() || editor.id;
-	if (editors.filter((candidate) => editorMatches(candidate, wordId)).length !== 1) return {
-		status: "ambiguous",
-		id
-	};
-	return {
-		status: "resolved",
-		id,
-		editor: { ...editor },
-		principal: {
-			kind: "editor",
-			id: wordId
-		}
-	};
-}
-/** Enumerate the host roster for an editor picker, including ambiguous entries. */
-function listPermissionRangeEditors(editors) {
-	const ids = new Set(editors.map(editorKey).filter((id) => id !== void 0));
-	return Array.from(ids, (id) => resolvePermissionRangeEditor(editors, id));
-}
-//#endregion
 //#region src/core/superdoc-ui-owner.ts
 var ownerIds = /* @__PURE__ */ new WeakMap();
 function getSuperDocUiOwnerId(superdoc) {
@@ -14118,18 +14193,42 @@ var FloatingComments_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 		const { activeComment, activeFloatingCommentInstanceId, editorCommentPositions, pendingComment, editingCommentId, instantSidebarAlignmentTargetY, instantSidebarAlignmentThreadId, instantSidebarAlignmentInstanceId } = storeToRefs(piniaCommentsStore);
 		const { activeZoom } = storeToRefs(superdocStore);
 		const committedPresentation = computed$1(() => commentsStore.committedReviewPresentations?.[String(props.currentDocument?.id)] ?? null);
+		const committedInstanceCache = /* @__PURE__ */ new Map();
+		let committedInstanceCacheOwner = "";
+		const sameReviewInstance = (cached, next) => {
+			const before = Object.entries(cached).filter(([key]) => key !== "comment" && key !== "rowVersion");
+			const after = Object.entries(next);
+			if (before.length !== after.length) return false;
+			const previous = new Map(before);
+			return after.every(([key, value]) => previous.has(key) && (key === "positionEntry" ? JSON.stringify(previous.get(key)) === JSON.stringify(value) : Object.is(previous.get(key), value)));
+		};
 		const committedInstances = computed$1(() => {
 			const presentation = committedPresentation.value;
 			if (!presentation) return null;
 			const rows = new Map(commentsStore.commentsList.filter((row) => String(row.fileId) === String(props.currentDocument?.id)).map((row) => [String(row.commentId), row]));
-			return presentation.instances.flatMap((instance) => {
+			const owner = `${presentation.epoch}\u0000${presentation.coordinate?.mountId ?? ""}`;
+			if (owner !== committedInstanceCacheOwner) {
+				committedInstanceCache.clear();
+				committedInstanceCacheOwner = owner;
+			}
+			const live = /* @__PURE__ */ new Set();
+			const instances = presentation.instances.flatMap((instance) => {
 				const comment = instance.rowId === "pending" ? pendingComment.value : rows.get(instance.rowId);
-				return comment ? [{
+				if (!comment) return [];
+				const rowVersion = presentation.rowVersions[instance.rowId] ?? 0;
+				live.add(instance.id);
+				const cached = committedInstanceCache.get(instance.id);
+				if (cached && cached.comment === comment && cached.rowVersion === rowVersion && sameReviewInstance(cached, instance)) return [cached];
+				const merged = {
 					...instance,
 					comment,
-					rowVersion: presentation.rowVersions[instance.rowId] ?? 0
-				}] : [];
+					rowVersion
+				};
+				committedInstanceCache.set(instance.id, merged);
+				return [merged];
 			});
+			for (const id of committedInstanceCache.keys()) if (!live.has(id)) committedInstanceCache.delete(id);
+			return instances;
 		});
 		const floatingCommentInstances = computed$1(() => {
 			if (committedInstances.value) return committedInstances.value.filter((instance) => instance.rowId !== "pending");
@@ -14545,6 +14644,18 @@ var FloatingComments_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 				scheduleDeferredRemeasure(() => allPositions.value.map((pos) => pos.id));
 			});
 		};
+		const resizeHandlers = /* @__PURE__ */ new Map();
+		const resizeHandlerFor = (id) => {
+			let handler = resizeHandlers.get(id);
+			if (!handler) {
+				handler = () => {
+					const position = allPositions.value.find((candidate) => candidate.id === id);
+					if (position) handleResize(position);
+				};
+				resizeHandlers.set(id, handler);
+			}
+			return handler;
+		};
 		const setInstantLayoutTransitionsDisabled = (disabled) => {
 			if (!disabled && directDecisionContinuityTargetId.value != null) return;
 			disableInstantLayoutTransitions.value = disabled;
@@ -14949,6 +15060,7 @@ var FloatingComments_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 				visibilityChanged = true;
 			}
 			if (visibilityChanged) visibleIds.value = newVisible;
+			for (const id of resizeHandlers.keys()) if (!currentIds.has(id)) resizeHandlers.delete(id);
 			for (const id of prevPositionIds) if (!currentIds.has(id)) delete _heightsCache[id];
 			const setChanged = prevPositionIds.size !== currentIds.size || [...prevPositionIds].some((id) => !currentIds.has(id));
 			const orderChanged = renderedPositionOrder.length !== positionOrder.length || renderedPositionOrder.some((id, index) => id !== positionOrder[index]);
@@ -15041,12 +15153,13 @@ var FloatingComments_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 					style: normalizeStyle({
 						top: (pos.isOffscreenReviewCard && !committedPresentation.value ? pos.top - sidebarOffsetY.value : pos.top) + "px",
 						height: pos.height + "px",
-						transition: committedPresentation.value || disableInstantLayoutTransitions.value ? "none" : void 0
+						transition: committedPresentation.value || disableInstantLayoutTransitions.value ? "none" : void 0,
+						visibility: pos.instanceRef?.provisional ? "hidden" : void 0
 					})
 				}, [shouldRenderDialog(pos) ? (openBlock(), createBlock(CommentDialog_default, {
 					key: pos.id + commentsRenderKey.value,
 					onReady: handleDialog,
-					onResize: ($event) => handleResize(pos),
+					onResize: resizeHandlerFor(pos.id),
 					class: "floating-comment",
 					parent: __props.parent,
 					comment: pos.commentRef,
@@ -15066,7 +15179,7 @@ var FloatingComments_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 			}), 128))], 4)], 36);
 		};
 	}
-}), [["__scopeId", "data-v-aaf2c537"]]);
+}), [["__scopeId", "data-v-1070f5a1"]]);
 //#endregion
 //#region src/components/CommentsLayer/PdfCommentsLayer.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1$22 = {
@@ -15199,7 +15312,7 @@ var PdfCommentsLayer_default = /* @__PURE__ */ _plugin_vue_export_helper_default
 			}), 128))]);
 		};
 	}
-}), [["__scopeId", "data-v-86166837"]]);
+}), [["__scopeId", "data-v-e3ae65fa"]]);
 //#endregion
 //#region src/components/Whiteboard/use-whiteboard.ts
 var useWhiteboard = ({ proxy, layers, documents, modules }) => {
@@ -15791,6 +15904,21 @@ function useCommentSmallScreen({ commentsModuleConfig, superdocRoot, layers }) {
 	};
 }
 //#endregion
+//#region src/composables/use-comment-sidebar.ts
+function useCommentSidebar({ documentKey, enabled, hasContent }) {
+	const reserved = ref(false);
+	watch$1(documentKey, () => {
+		reserved.value = false;
+	}, { flush: "sync" });
+	watch$1(() => enabled.value && hasContent.value, (visible) => {
+		if (visible) reserved.value = true;
+	}, {
+		immediate: true,
+		flush: "sync"
+	});
+	return computed$1(() => enabled.value && (hasContent.value || reserved.value));
+}
+//#endregion
 //#region src/composables/use-compact-comment-popover.ts
 var POPOVER_WIDTH_PX = 320;
 var SAFE_MARGIN_PX = 12;
@@ -16169,6 +16297,116 @@ function resolveV2ReviewTargetCommentId(target, getComment) {
 	return commentId != null ? String(commentId) : null;
 }
 //#endregion
+//#region src/helpers/v2-review-geometry-delivery.ts
+function createReviewGeometryDelivery(deliver) {
+	const packets = /* @__PURE__ */ new Map();
+	let stageOwners = /* @__PURE__ */ new WeakMap();
+	let active = null;
+	const documentOf = (current) => current.documentId != null ? String(current.documentId) : current.mountContainer?.dataset.superdocV2DocumentId ?? null;
+	const matches = (documentId, current) => current.mountContainer?.dataset.superdocV2DocumentId === documentId && (current.documentId == null || String(current.documentId) === documentId);
+	const matchesPaint = (packet, current) => typeof packet.payload.paintEpoch !== "number" || packet.payload.paintEpoch === current.epoch;
+	const observe = (current) => {
+		const stage = current.mountContainer;
+		const documentId = documentOf(current);
+		if (!stage || !documentId || !matches(documentId, current)) return;
+		const previousOwner = stageOwners.get(stage);
+		if (previousOwner && previousOwner !== documentId) packets.delete(previousOwner);
+		stageOwners.set(stage, documentId);
+		const packet = packets.get(documentId);
+		if (packet?.stage && packet.stage !== stage) packets.delete(documentId);
+		else if (packet && (!active || active.stage !== stage || active.documentId !== documentId || active.epoch !== current.epoch)) packet.delivered = false;
+		active = {
+			documentId,
+			stage,
+			epoch: current.epoch
+		};
+	};
+	const dispatch = (documentId, packet, current, replay = false) => {
+		if (!current.mountContainer || !matches(documentId, current) || !matchesPaint(packet, current)) return false;
+		if (packet.stage && packet.stage !== current.mountContainer || packet.delivering || packet.delivered && !replay) return false;
+		const wasDelivered = packet.delivered;
+		const previousStage = packet.stage;
+		packet.stage = current.mountContainer;
+		packet.delivered = true;
+		packet.delivering = true;
+		try {
+			deliver(current, packet.payload);
+		} catch (error) {
+			packet.delivered = wasDelivered;
+			packet.stage = previousStage;
+			throw error;
+		} finally {
+			packet.delivering = false;
+		}
+		return true;
+	};
+	const notify = (documentId, payload, current, ready = true) => {
+		if (!payload.reviewGeometry || !Array.isArray(payload.pageIndices)) return false;
+		let key;
+		try {
+			key = JSON.stringify([
+				documentId,
+				payload.documentEpoch,
+				payload.paintEpoch,
+				payload.commitSequence,
+				payload.pageIndices,
+				payload.zoomScale,
+				payload.reviewGeometry
+			]);
+		} catch {
+			return false;
+		}
+		const isCurrent = current != null && matches(documentId, current);
+		if (isCurrent) observe(current);
+		const previous = packets.get(documentId);
+		if (previous && previous.payload.documentEpoch === payload.documentEpoch && typeof previous.payload.paintEpoch === "number" && typeof payload.paintEpoch === "number" && payload.paintEpoch < previous.payload.paintEpoch) return false;
+		if (previous && previous.payload.documentEpoch === payload.documentEpoch && typeof previous.payload.commitSequence === "number" && typeof payload.commitSequence === "number" && payload.commitSequence < previous.payload.commitSequence) return false;
+		if (previous && previous.payload.documentEpoch === payload.documentEpoch && typeof previous.payload.generation === "number" && typeof payload.generation === "number" && payload.generation < previous.payload.generation) return false;
+		if (isCurrent && typeof payload.paintEpoch === "number" && typeof current.epoch === "number" && payload.paintEpoch < current.epoch) return false;
+		if (previous?.key === key) {
+			previous.payload = payload;
+			return isCurrent && ready ? dispatch(documentId, previous, current) : false;
+		}
+		const packet = {
+			payload,
+			key,
+			stage: isCurrent ? current.mountContainer : previous && previous.payload.documentEpoch === payload.documentEpoch ? previous.stage : null,
+			delivered: false,
+			delivering: false
+		};
+		packets.set(documentId, packet);
+		if (!isCurrent || !ready) return false;
+		try {
+			return dispatch(documentId, packet, current);
+		} catch (error) {
+			if (previous) packets.set(documentId, previous);
+			else packets.delete(documentId);
+			throw error;
+		}
+	};
+	return {
+		notify,
+		observe,
+		flush(current) {
+			observe(current);
+			const documentId = documentOf(current);
+			const packet = documentId == null ? null : packets.get(documentId);
+			return documentId && packet ? dispatch(documentId, packet, current) : false;
+		},
+		replay(current) {
+			observe(current);
+			const documentId = documentOf(current);
+			const packet = documentId == null ? null : packets.get(documentId);
+			return documentId && packet ? dispatch(documentId, packet, current, true) : false;
+		},
+		reset() {
+			packets.clear();
+			stageOwners = /* @__PURE__ */ new WeakMap();
+			active = null;
+		}
+	};
+}
+//#endregion
 //#region src/helpers/v2-mutation-exception.ts
 var FAILURE_SOURCES = /* @__PURE__ */ new Set(["shell", "receipt"]);
 var DIAGNOSTIC_CODE = /^[a-zA-Z][a-zA-Z0-9_-]{0,127}$/;
@@ -16538,7 +16776,7 @@ function usePasswordPrompt({ getSurfaceManager, getPasswordPromptConfig, onUnhan
 				})
 			});
 		} else {
-			const mod = await import("./chunks/PasswordPromptSurface-CZqhDQQ1.es.js");
+			const mod = await import("./chunks/PasswordPromptSurface-DjV1JgjD.es.js");
 			const surfaceId = `password-prompt-${doc.id}`;
 			handle = manager.open({
 				id: surfaceId,
@@ -17198,7 +17436,7 @@ function useFindReplace({ getSurfaceManager, getActiveEditor, activeEditorRef, g
 			} else {
 				let FindReplaceSurface;
 				try {
-					FindReplaceSurface = (await import("./chunks/FindReplaceSurface-B_5ggdWg.es.js")).default;
+					FindReplaceSurface = (await import("./chunks/FindReplaceSurface-BEnRLpD9.es.js")).default;
 				} catch {
 					opening = false;
 					return;
@@ -17572,11 +17810,11 @@ var _hoisted_8$3 = { class: "input-row url-input-row" };
 var _hoisted_9$2 = ["innerHTML"];
 var _hoisted_10$2 = ["readonly", "onKeydown"];
 var _hoisted_11$2 = ["innerHTML"];
-var _hoisted_12$1 = {
+var _hoisted_12$2 = {
 	key: 0,
 	class: "input-row link-buttons"
 };
-var _hoisted_13$1 = ["disabled"];
+var _hoisted_13$2 = ["disabled"];
 var _hoisted_14$1 = ["innerHTML"];
 var _hoisted_15$1 = ["disabled"];
 var _hoisted_16$1 = {
@@ -17835,7 +18073,7 @@ var LinkInput_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__
 							"data-item": "btn-link-open"
 						}, null, 10, _hoisted_11$2)
 					]),
-					!isViewingMode.value ? (openBlock(), createElementBlock("div", _hoisted_12$1, [isEditing.value ? (openBlock(), createElementBlock("button", {
+					!isViewingMode.value ? (openBlock(), createElementBlock("div", _hoisted_12$2, [isEditing.value ? (openBlock(), createElementBlock("button", {
 						key: 0,
 						class: "remove-btn",
 						onClick: handleRemove,
@@ -17844,7 +18082,7 @@ var LinkInput_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__
 					}, [createElementVNode("div", {
 						class: "remove-btn__icon",
 						innerHTML: unref(toolbarIcons).removeLink
-					}, null, 8, _hoisted_14$1), _cache[6] || (_cache[6] = createTextVNode(" Remove ", -1))], 8, _hoisted_13$1)) : createCommentVNode("", true), createElementVNode("button", {
+					}, null, 8, _hoisted_14$1), _cache[6] || (_cache[6] = createTextVNode(" Remove ", -1))], 8, _hoisted_13$2)) : createCommentVNode("", true), createElementVNode("button", {
 						class: normalizeClass(["sd-submit-btn", { "disable-btn": isDisabled.value }]),
 						onClick: handleSubmit,
 						disabled: isSubmitting.value,
@@ -18754,6 +18992,7 @@ function createV2EditorRuntimeAdapter(options) {
 	const { id, documentId, root, host, getLegacyEditorProjection, onUnregister } = options;
 	let snapshot = host.getSnapshot();
 	let didDispose = false;
+	let detached = false;
 	let unregistered = false;
 	let mountedFocusHandle = null;
 	let tokenRevision = 0;
@@ -19050,7 +19289,17 @@ function createV2EditorRuntimeAdapter(options) {
 			};
 		}
 	}
+	function releaseHostSubscriptions() {
+		hostUnsubscribe?.();
+		hostUnsubscribe = null;
+		pageMetricsUnsubscribe?.();
+		pageMetricsUnsubscribe = null;
+		selectionUnsubscribe?.();
+		selectionUnsubscribe = null;
+		activeSelectionController = null;
+	}
 	function handleHostSnapshot(next) {
+		if (detached || didDispose) return;
 		snapshot = next;
 		invalidatePositionTokens();
 		syncSelectionSubscription();
@@ -19064,10 +19313,7 @@ function createV2EditorRuntimeAdapter(options) {
 		});
 		if (next.state === "disposed" && !didDispose) {
 			didDispose = true;
-			hostUnsubscribe?.();
-			pageMetricsUnsubscribe?.();
-			selectionUnsubscribe?.();
-			selectionUnsubscribe = null;
+			releaseHostSubscriptions();
 			emit({ type: "disposed" });
 			listeners.clear();
 			if (!unregistered) {
@@ -19214,10 +19460,7 @@ function createV2EditorRuntimeAdapter(options) {
 		await host.dispose();
 		if (!didDispose) {
 			didDispose = true;
-			hostUnsubscribe?.();
-			pageMetricsUnsubscribe?.();
-			selectionUnsubscribe?.();
-			selectionUnsubscribe = null;
+			releaseHostSubscriptions();
 			emit({ type: "disposed" });
 			listeners.clear();
 			if (!unregistered) {
@@ -19296,8 +19539,17 @@ function createV2EditorRuntimeAdapter(options) {
 			}
 		},
 		attachMountHandle(handle) {
+			if (detached || didDispose) return;
 			mountedFocusHandle = handle;
 			syncSelectionSubscription();
+		},
+		detach() {
+			if (detached) return;
+			detached = true;
+			unregistered = true;
+			releaseHostSubscriptions();
+			mountedFocusHandle = null;
+			listeners.clear();
 		}
 	};
 }
@@ -20460,7 +20712,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 	__name: "SuperDoc",
 	emits: ["selection-update"],
 	setup(__props, { emit: __emit }) {
-		const PdfViewer = defineAsyncComponent(() => import("./chunks/PdfViewer-CW09MNrB.es.js"));
+		const PdfViewer = defineAsyncComponent(() => import("./chunks/PdfViewer-C2r-K8zC.es.js"));
 		const getDocumentLoadPassword = (doc) => doc.password ?? proxy.$superdoc.config.password;
 		const resolveDocumentV2Collaboration = (doc) => {
 			const rawConfig = doc?.v2Collaboration;
@@ -20545,7 +20797,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			if (commentsConfig.highlightHoverColor) vars["--sd-comments-highlight-hover"] = commentsConfig.highlightHoverColor;
 			const activeTrackChangeColors = {
 				...commentsConfig.trackChangeHighlightColors || {},
-				...commentsConfig.trackChangeActiveHighlightColors || {}
+				...commentsConfig.trackChangeActiveHighlightColors
 			};
 			if (activeTrackChangeColors.insertBorder) vars["--sd-tracked-changes-insert-border"] = activeTrackChangeColors.insertBorder;
 			if (activeTrackChangeColors.insertBackground) vars["--sd-tracked-changes-insert-background"] = activeTrackChangeColors.insertBackground;
@@ -20574,6 +20826,8 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 		const v2ReviewSidebarUnlocked = ref(false);
 		const v2GeometryEpoch = ref(null);
 		let v2GeometryRafHandle = 0;
+		let v2GeometryReplayRafHandle = 0;
+		let v2GeometryReplayGeneration = 0;
 		let v2TrackedChangeRestampRetainPaints = 0;
 		let v2TrackedChangeRestampRetentionReason = null;
 		const activeEditorRef = computed$1(() => proxy.$superdoc.activeEditor);
@@ -20757,6 +21011,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			if (document && provider?.sendStateless) document.provider = null;
 			const entry = v2Runtimes.get(documentId);
 			if (!entry) return;
+			entry.adapter.detach();
 			proxy.$superdoc["unregisterEditorRuntime"](entry.runtimeId);
 			v2Runtimes.delete(documentId);
 			const hostRoot = subDocumentRoots.get(documentId);
@@ -21522,10 +21777,11 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 		const publishV2PendingPositionEntry = (entry) => {
 			if (!entry) return;
 			handleEditorLocationsUpdate({
-				...editorCommentPositions.value ?? {},
+				...editorCommentPositions.value,
 				pending: entry
 			});
 		};
+		let scheduleV2GeometryReplay = () => {};
 		const v2GeometryPublisher = resolvedEditorIntegration.createGeometryPublisher({
 			getLayersContainer: () => layers.value ?? null,
 			isCommentsEnabled: () => Boolean(commentsModuleConfig.value) && shouldRenderCommentsInViewing.value,
@@ -21541,7 +21797,8 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 					v2ReviewSidebarUnlocked.value = true;
 					v2GeometryEpoch.value = v2GeometryPublisher.getLastEpoch();
 				}
-			}
+			},
+			onCommittedPagePaint: ({ payload }) => scheduleV2GeometryReplay(payload)
 		});
 		const armV2TrackedChangeRestampGeometryRetention = (reason = "tracked-change-restamp") => {
 			v2TrackedChangeRestampRetainPaints = Math.max(v2TrackedChangeRestampRetainPaints, 3);
@@ -21561,20 +21818,53 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			v2TrackedChangeRestampRetentionReason = null;
 		};
 		const resolveV2GeometryPublishOptions = (options) => typeof options === "function" ? options() : options;
+		const isV2GeometryReady = (current) => {
+			if (!current?.mountContainer || !commentsModuleConfig.value || !shouldRenderCommentsInViewing.value) return false;
+			const mount = current.mount;
+			let liveEpoch;
+			try {
+				liveEpoch = mount?.getRenderEpoch?.();
+			} catch {
+				return false;
+			}
+			return v2GeometryPublisher.getLastPayload() === current && v2GeometryPublisher.getLastEpoch() != null && v2GeometryPublisher.getLastEpoch() === current.epoch && (liveEpoch == null || liveEpoch === current.epoch);
+		};
 		const scheduleV2GeometryPublish = (payload, options = void 0) => {
 			v2GeometryRender.value = payload;
 			if (v2GeometryRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryRafHandle);
+			const publish = () => {
+				const current = v2GeometryRender.value;
+				Promise.resolve(v2GeometryPublisher.publish(current, resolveV2GeometryPublishOptions(options))).then(() => {
+					if (current === v2GeometryRender.value && isV2GeometryReady(current)) v2ReviewGeometryDelivery.flush(current);
+				});
+			};
 			if (typeof requestAnimationFrame !== "function") {
-				v2GeometryPublisher.publish(v2GeometryRender.value, resolveV2GeometryPublishOptions(options));
+				publish();
 				return;
 			}
 			v2GeometryRafHandle = requestAnimationFrame(() => {
 				v2GeometryRafHandle = 0;
-				v2GeometryPublisher.publish(v2GeometryRender.value, resolveV2GeometryPublishOptions(options));
+				publish();
 			});
 		};
+		const v2ReviewGeometryDelivery = createReviewGeometryDelivery((current, packet) => {
+			v2GeometryPublisher.noteCommittedPageWindow?.(packet);
+			scheduleV2GeometryPublish(current);
+		});
+		scheduleV2GeometryReplay = (payload) => {
+			if (!payload || payload !== v2GeometryRender.value) return;
+			const generation = ++v2GeometryReplayGeneration;
+			if (v2GeometryReplayRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryReplayRafHandle);
+			const replay = () => {
+				v2GeometryReplayRafHandle = 0;
+				if (generation === v2GeometryReplayGeneration && payload === v2GeometryRender.value && isV2GeometryReady(payload)) v2ReviewGeometryDelivery.replay(payload);
+			};
+			if (typeof requestAnimationFrame === "function") v2GeometryReplayRafHandle = requestAnimationFrame(replay);
+			else queueMicrotask(replay);
+		};
 		const onV2Render = (payload) => {
 			if (!payload) return;
+			v2ReviewGeometryDelivery.observe(payload);
 			scheduleV2GeometryPublish(payload, () => takeV2TrackedChangeRestampGeometryRetention());
 			if (v2HasRangeSelection.value) scheduleV2SelectionToolbarStateSync();
 		};
@@ -21607,7 +21897,11 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			cancelScheduledV2SelectionToolbarSync();
 			if (v2GeometryRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryRafHandle);
 			v2GeometryRafHandle = 0;
+			if (v2GeometryReplayRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryReplayRafHandle);
+			v2GeometryReplayRafHandle = 0;
+			v2GeometryReplayGeneration++;
 			v2GeometryRender.value = null;
+			v2ReviewGeometryDelivery.reset();
 			v2GeometryEpoch.value = null;
 			v2GeometryAvailable.value = false;
 			v2ReviewSidebarUnlocked.value = false;
@@ -21755,14 +22049,15 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			if (!isV2Mode.value) return;
 			if (!v2GeometryPublisher.getLastPayload()) return;
 			if (v2GeometryRafHandle && typeof cancelAnimationFrame === "function") cancelAnimationFrame(v2GeometryRafHandle);
-			if (typeof requestAnimationFrame !== "function") {
-				v2GeometryPublisher.recollect(resolveV2GeometryPublishOptions(options));
-				return;
-			}
-			v2GeometryRafHandle = requestAnimationFrame(() => {
+			const recollect = () => {
 				v2GeometryRafHandle = 0;
-				v2GeometryPublisher.recollect(resolveV2GeometryPublishOptions(options));
-			});
+				const current = v2GeometryRender.value;
+				Promise.resolve(v2GeometryPublisher.recollect(resolveV2GeometryPublishOptions(options))).then(() => {
+					if (current === v2GeometryRender.value && isV2GeometryReady(current)) v2ReviewGeometryDelivery.replay(current);
+				});
+			};
+			if (typeof requestAnimationFrame !== "function") recollect();
+			else v2GeometryRafHandle = requestAnimationFrame(recollect);
 		};
 		const handleV2DocumentModeChange = () => {
 			if (!isV2Mode.value) return;
@@ -21990,13 +22285,17 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 						...payload,
 						documentId: doc.id
 					});
-					v2GeometryPublisher.noteCommittedPageWindow?.(payload);
+					if (payload.reviewGeometry && Array.isArray(payload.pageIndices)) {
+						const current = v2GeometryRender.value;
+						v2ReviewGeometryDelivery.notify(String(doc.id), payload, current, isV2GeometryReady(current));
+					} else v2GeometryPublisher.noteCommittedPageWindow?.(payload);
 				},
 				fontAssets: proxy.$superdoc.config.fonts,
 				workerUrls: proxy.$superdoc.config.workerUrls,
 				fieldContext: doc.fieldContext,
 				fieldUpdatePolicy: proxy.$superdoc.config.fieldUpdatePolicy,
 				workerStartupTimeoutMs: proxy.$superdoc.config.workerStartupTimeoutMs,
+				...proxy.$superdoc.config.changes ? { changes: proxy.$superdoc.config.changes } : {},
 				proofing: resolvedProofingConfig.value,
 				isNewFile,
 				password: getDocumentLoadPassword(doc),
@@ -22017,7 +22316,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 				documentLoading: proxy.$superdoc.uiConfig.loading.enabled,
 				linkPopoverResolver: getHyperlinkActivationHandler(),
 				layoutEngineOptions: useLayoutEngine ? {
-					...proxy.$superdoc.config.layoutEngineOptions || {},
+					...proxy.$superdoc.config.layoutEngineOptions,
 					proofing: resolvedProofingConfig.value,
 					debugLabel: proxy.$superdoc.config.layoutEngineOptions?.debugLabel ?? doc.name ?? doc.id,
 					zoom: (activeZoom.value ?? 100) / 100,
@@ -22280,11 +22579,16 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			if (layout !== "auto") return true;
 			return !isCompactCommentsMode.value;
 		});
-		const showCommentsSidebar = computed$1(() => {
+		const sidebarEnabled = computed$1(() => {
 			if (isV2Mode.value && !v2GeometryAvailable.value && !v2ReviewSidebarUnlocked.value && !hasPdfFloatingComments.value) return false;
 			if (!shouldRenderCommentsInViewing.value) return false;
 			if (!shouldUseSidebarComments.value) return false;
-			return pendingComment.value || (floatingComments.value.length > 0 || hasOpenTrackedChanges.value) && isReady.value && layers.value && isCommentsEnabled.value && !isCommentsListVisible.value;
+			return Boolean(pendingComment.value || isReady.value && layers.value && isCommentsEnabled.value && !isCommentsListVisible.value);
+		});
+		const showCommentsSidebar = useCommentSidebar({
+			documentKey: computed$1(() => JSON.stringify(documents.value.map((document) => document.id))),
+			enabled: sidebarEnabled,
+			hasContent: computed$1(() => Boolean(pendingComment.value || floatingComments.value.length || hasOpenTrackedChanges.value))
 		});
 		const activeCompactComment = computed$1(() => {
 			if (showCommentsSidebar.value) return null;
@@ -22908,7 +23212,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 				ref_key: "superdocRoot",
 				ref: superdocRoot,
 				class: normalizeClass(["superdoc", {
-					"superdoc--with-sidebar": showCommentsSidebar.value,
+					"superdoc--with-sidebar": unref(showCommentsSidebar),
 					"superdoc--web-layout": unref(proxy).$superdoc.config.viewOptions?.layout === "web",
 					"superdoc--contained": unref(proxy).$superdoc.config.contained,
 					"high-contrast": unref(isHighContrastMode)
@@ -23056,7 +23360,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 						onAnchorActivate: handleHighlightClick
 					})) : createCommentVNode("", true)
 				])], 512),
-				showCommentsSidebar.value ? (openBlock(), createElementBlock("div", {
+				unref(showCommentsSidebar) ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					ref_key: "rightSidebarRef",
 					ref: rightSidebarRef,
@@ -23079,7 +23383,7 @@ var SuperDoc_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__P
 			], 46, _hoisted_1$17);
 		};
 	}
-}), [["__scopeId", "data-v-d2540ad3"]]);
+}), [["__scopeId", "data-v-451ab88f"]]);
 //#endregion
 //#region src/core/create-app.ts
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -24560,6 +24864,16 @@ var SurfaceManager = class {
 };
 //#endregion
 //#region src/helpers/deprecation.ts
+/**
+* Deprecation utilities for steering consumers toward the Document API.
+*
+* ProseMirror will be removed in a future major version. These helpers emit
+* one-time console warnings when deprecated properties are accessed on an
+* editor instance handed to consumer callbacks (onEditorCreate, etc.).
+*
+* Internal code continues to use the raw Editor — only the consumer-facing
+* boundary wraps the editor with a Proxy.
+*/
 var MIGRATION_URL = "https://docs.superdoc.dev/guides/migration/document-api";
 var _warned = /* @__PURE__ */ new Set();
 /**
@@ -24748,7 +25062,8 @@ function normalizeSuperDocUser(user) {
 	if (!user || typeof user !== "object") return { ...DEFAULT_SUPERDOC_USER };
 	return {
 		...DEFAULT_SUPERDOC_USER,
-		...user
+		...user,
+		...user.commentIdentity !== void 0 ? { commentIdentity: normalizeCommentIdentity(user.commentIdentity) } : {}
 	};
 }
 //#endregion
@@ -25267,6 +25582,7 @@ function normalizeUiConfig(config = {}) {
 * Keeping policy separate means an application can disable the built-in
 * comments UI without losing the rules enforced by its custom UI.
 */
+var isAutocapitalize = (value) => value === "off" || value === "sentences" || value === "words" || value === "characters";
 var isCommentInteractionLevel = (value) => value === "read" || value === "write" || value === "resolve";
 /**
 * Resolve the effective interaction policy.
@@ -25286,14 +25602,26 @@ function normalizeInteractionConfig(config = {}) {
 	const canonicalLevel = interactionComments.level;
 	const hasCanonicalLevel = isCommentInteractionLevel(canonicalLevel);
 	const level = hasCanonicalLevel ? canonicalLevel : legacyReadOnly ? "read" : legacyAllowResolve ? "resolve" : "write";
+	const interactionWritingAssistance = isPlainObject$1(interaction.writingAssistance) ? interaction.writingAssistance : {};
+	const autocorrect = interactionWritingAssistance.autocorrect === true;
+	const autocapitalize = isAutocapitalize(interactionWritingAssistance.autocapitalize) ? interactionWritingAssistance.autocapitalize : "off";
+	const spellcheck = interactionWritingAssistance.spellcheck === true;
 	const canonicalAllowDecisions = interactionTrackedChanges.allowDecisions;
+	const interactionTouch = isPlainObject$1(interaction.touch) ? interaction.touch : {};
 	return {
 		comments: {
 			level,
 			readOnly: hasCanonicalLevel ? level === "read" : legacyReadOnly,
 			allowResolve: hasCanonicalLevel ? level === "resolve" : legacyAllowResolve
 		},
-		trackedChanges: { allowDecisions: typeof canonicalAllowDecisions === "boolean" ? canonicalAllowDecisions : !legacyReadOnly }
+		trackedChanges: { allowDecisions: typeof canonicalAllowDecisions === "boolean" ? canonicalAllowDecisions : !legacyReadOnly },
+		touch: { gestures: interactionTouch.gestures === true },
+		writingAssistance: {
+			enabled: autocorrect || autocapitalize !== "off" || spellcheck,
+			autocorrect,
+			autocapitalize,
+			spellcheck
+		}
 	};
 }
 //#endregion
@@ -25949,26 +26277,39 @@ var ToolbarButtonIcon_default = /* @__PURE__ */ _plugin_vue_export_helper_defaul
 var _hoisted_1$15 = [
 	"role",
 	"aria-label",
-	"aria-disabled"
+	"aria-disabled",
+	"aria-busy"
 ];
 var _hoisted_2$11 = ["data-item"];
 var _hoisted_3$10 = ["data-item"];
 var _hoisted_4$8 = {
-	key: 1,
+	key: 0,
+	role: "status",
+	"aria-label": "Applying list",
+	style: { "font-weight": "700" }
+};
+var _hoisted_5$6 = {
+	key: 2,
 	class: "sd-button-label"
 };
-var _hoisted_5$6 = ["data-item", "aria-label"];
-var _hoisted_6$4 = ["innerHTML"];
-var _hoisted_7$2 = { key: 2 };
-var _hoisted_8$2 = ["onKeydown", "id"];
-var _hoisted_9$1 = [
+var _hoisted_6$4 = ["data-item", "aria-label"];
+var _hoisted_7$2 = ["innerHTML"];
+var _hoisted_8$2 = {
+	key: 0,
+	role: "status",
+	"aria-label": "Applying list",
+	style: { "font-weight": "700" }
+};
+var _hoisted_9$1 = { key: 3 };
+var _hoisted_10$1 = ["onKeydown", "id"];
+var _hoisted_11$1 = [
 	"placeholder",
 	"onKeydown",
 	"id",
 	"data-item"
 ];
-var _hoisted_10$1 = ["data-item", "innerHTML"];
-var _hoisted_11$1 = {
+var _hoisted_12$1 = ["data-item", "innerHTML"];
+var _hoisted_13$1 = {
 	"aria-live": "polite",
 	class: "sd-visually-hidden"
 };
@@ -26141,6 +26482,7 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 				role: __props.isOverflowItem ? "menuitem" : "button",
 				"aria-label": unref(attributes).ariaLabel,
 				"aria-disabled": unref(disabled) ? "true" : void 0,
+				"aria-busy": unref(attributes).ariaBusy || void 0,
 				"data-sd-part": "toolbar-item",
 				onClick: handleOuterClick,
 				onKeydown: _cache[9] || (_cache[9] = withKeys(($event) => onEnterKeydown($event), ["enter"])),
@@ -26162,17 +26504,21 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 					class: "sd-toolbar-button__main",
 					"data-item": `btn-${unref(name) || ""}-main`,
 					onClick: _cache[0] || (_cache[0] = ($event) => handleSplitMainClick($event))
-				}, [unref(icon) ? (openBlock(), createBlock(ToolbarButtonIcon_default, {
-					key: 0,
-					color: unref(iconColor),
-					class: "sd-toolbar-icon",
-					icon: unref(icon),
-					name: unref(name)
-				}, null, 8, [
-					"color",
-					"icon",
-					"name"
-				])) : createCommentVNode("", true), unref(label) && !unref(hideLabel) && !unref(inlineTextInputVisible) ? (openBlock(), createElementBlock("div", _hoisted_4$8, toDisplayString(unref(label)), 1)) : createCommentVNode("", true)], 8, _hoisted_3$10)) : createCommentVNode("", true),
+				}, [
+					unref(attributes).ariaBusy && isSplit.value ? (openBlock(), createElementBlock("span", _hoisted_4$8, "…")) : createCommentVNode("", true),
+					unref(icon) ? (openBlock(), createBlock(ToolbarButtonIcon_default, {
+						key: 1,
+						color: unref(iconColor),
+						class: "sd-toolbar-icon",
+						icon: unref(icon),
+						name: unref(name)
+					}, null, 8, [
+						"color",
+						"icon",
+						"name"
+					])) : createCommentVNode("", true),
+					unref(label) && !unref(hideLabel) && !unref(inlineTextInputVisible) ? (openBlock(), createElementBlock("div", _hoisted_5$6, toDisplayString(unref(label)), 1)) : createCommentVNode("", true)
+				], 8, _hoisted_3$10)) : createCommentVNode("", true),
 				isSplit.value ? (openBlock(), createElementBlock("div", {
 					key: 1,
 					class: "sd-toolbar-button__caret",
@@ -26183,9 +26529,10 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 					class: "sd-dropdown-caret",
 					innerHTML: caretIcon.value,
 					style: normalizeStyle({ opacity: unref(disabled) ? .6 : 1 })
-				}, null, 12, _hoisted_6$4)], 8, _hoisted_5$6)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+				}, null, 12, _hoisted_7$2)], 8, _hoisted_6$4)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+					unref(attributes).ariaBusy ? (openBlock(), createElementBlock("span", _hoisted_8$2, "…")) : createCommentVNode("", true),
 					unref(icon) ? (openBlock(), createBlock(ToolbarButtonIcon_default, {
-						key: 0,
+						key: 1,
 						color: unref(iconColor),
 						class: "sd-toolbar-icon",
 						icon: unref(icon),
@@ -26196,10 +26543,10 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 						"name"
 					])) : createCommentVNode("", true),
 					unref(label) && !unref(hideLabel) && (!unref(inlineTextInputVisible) || itemName.value === "fontFamily") ? (openBlock(), createElementBlock("div", {
-						key: 1,
+						key: 2,
 						class: normalizeClass(["sd-button-label", { "sd-visually-hidden": unref(inlineTextInputVisible) && itemName.value === "fontFamily" }])
 					}, toDisplayString(unref(label)), 3)) : createCommentVNode("", true),
-					unref(inlineTextInputVisible) ? (openBlock(), createElementBlock("span", _hoisted_7$2, [unref(name) === "fontSize" ? withDirectives((openBlock(), createElementBlock("input", {
+					unref(inlineTextInputVisible) ? (openBlock(), createElementBlock("span", _hoisted_9$1, [unref(name) === "fontSize" ? withDirectives((openBlock(), createElementBlock("input", {
 						key: 0,
 						"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => inlineTextInput.value = $event),
 						onKeydown: [withKeys(withModifiers(handleInlineInputEnter, ["stop", "prevent"]), ["enter"]), _cache[2] || (_cache[2] = withKeys(($event) => handleInlineInputTab($event), ["tab"]))],
@@ -26211,7 +26558,7 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 						autocomplete: "off",
 						ref_key: "inlineInput",
 						ref: inlineInput
-					}, null, 42, _hoisted_8$2)), [[vModelText, inlineTextInput.value]]) : withDirectives((openBlock(), createElementBlock("input", {
+					}, null, 42, _hoisted_10$1)), [[vModelText, inlineTextInput.value]]) : withDirectives((openBlock(), createElementBlock("input", {
 						key: 1,
 						"onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => inlineTextInput.value = $event),
 						placeholder: unref(label),
@@ -26228,20 +26575,20 @@ var ToolbarButton_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/*
 						autocomplete: "off",
 						ref_key: "inlineInput",
 						ref: inlineInput
-					}, null, 42, _hoisted_9$1)), [[vModelText, inlineTextInput.value]])])) : createCommentVNode("", true),
+					}, null, 42, _hoisted_11$1)), [[vModelText, inlineTextInput.value]])])) : createCommentVNode("", true),
 					unref(hasCaret) ? (openBlock(), createElementBlock("div", {
-						key: 3,
+						key: 4,
 						class: "sd-dropdown-caret",
 						"data-item": `btn-${unref(name) || ""}-toggle`,
 						innerHTML: caretIcon.value,
 						style: normalizeStyle({ opacity: unref(disabled) ? .6 : 1 })
-					}, null, 12, _hoisted_10$1)) : createCommentVNode("", true)
+					}, null, 12, _hoisted_12$1)) : createCommentVNode("", true)
 				], 64)),
-				createElementVNode("div", _hoisted_11$1, toDisplayString(`${unref(attributes).ariaLabel} ${unref(active) ? "selected" : "unset"}`), 1)
+				createElementVNode("div", _hoisted_13$1, toDisplayString(`${unref(attributes).ariaLabel} ${unref(active) ? "selected" : "unset"}`), 1)
 			], 10, _hoisted_2$11)], 46, _hoisted_1$15);
 		};
 	}
-}), [["__scopeId", "data-v-e599674c"]]);
+}), [["__scopeId", "data-v-b49ede12"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/ToolbarSeparator.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1$14 = {
@@ -27533,7 +27880,7 @@ var SdTooltip_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__
 		]);
 		const contentStyle = computed$1(() => ({
 			...props.contentStyle,
-			...attrs.style || {},
+			...attrs.style,
 			position: "fixed",
 			top: position.value.top,
 			left: position.value.left,
@@ -27702,7 +28049,7 @@ var SdTooltip_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__
 			}, 8, ["css"])]))], 64);
 		};
 	}
-}), [["__scopeId", "data-v-dfd6f1d1"]]);
+}), [["__scopeId", "data-v-87967ab1"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/ButtonGroup.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1$11 = [
@@ -30526,6 +30873,8 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons: configuredIcons, toolbarTe
 		attributes: { ariaLabel: "Bold" }
 	});
 	const fontOptions = (toolbarFonts ?? TOOLBAR_FONTS).map(normalizeFontOption);
+	const isFontOption = (option) => typeof option.label === "string" && typeof option.key === "string";
+	const currentFontOptions = () => fontButton.nestedOptions.value.filter(isFontOption);
 	const fontButton = useToolbarItem({
 		type: "dropdown",
 		name: "fontFamily",
@@ -30552,8 +30901,9 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons: configuredIcons, toolbarTe
 			if (typeof fontFamily !== "string" || !fontFamily) return;
 			const family = fontFamily.split(",")[0];
 			const optionValue = (option) => option.value ?? option.label;
-			const defaultFont = fontOptions.find((option) => optionValue(option) === fontButton.defaultLabel.value);
-			const foundFont = fontOptions.find((option) => optionValue(option) === family);
+			const options = currentFontOptions();
+			const defaultFont = options.find((option) => optionValue(option) === fontButton.defaultLabel.value);
+			const foundFont = options.find((option) => optionValue(option) === family);
 			if (foundFont) {
 				fontButton.label.value = foundFont.label;
 				fontButton.selectedValue.value = foundFont.key;
@@ -30566,7 +30916,7 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons: configuredIcons, toolbarTe
 			}
 		},
 		onDeactivate: () => {
-			const defaultFont = fontOptions.find((option) => (option.value ?? option.label) === fontButton.defaultLabel.value);
+			const defaultFont = currentFontOptions().find((option) => (option.value ?? option.label) === fontButton.defaultLabel.value);
 			fontButton.label.value = defaultFont?.label ?? fontButton.defaultLabel.value;
 			fontButton.selectedValue.value = defaultFont?.key ?? "";
 		}
@@ -31778,7 +32128,7 @@ var V1_ENABLED_ON_SELECTION_REASON = /* @__PURE__ */ new Set([
 ]);
 var V1_ENABLED_ON_EMPTY_REASON = /* @__PURE__ */ new Set(["list", "numberedlist"]);
 function shouldKeepEnabledForV1ToolbarParity(name, commandState) {
-	if (name === "fontFamily" || name === "fontSize") return true;
+	if (name === "fontFamily" || name === "fontSize") return commandState?.reason !== "document-readonly" && commandState?.reason !== "deleted-text-formatting-unsupported";
 	if (V1_ENABLED_ON_EMPTY_REASON.has(name) && commandState?.disabled && commandState?.supported !== false && commandState?.reason == null) return true;
 	if (!V1_ENABLED_ON_SELECTION_REASON.has(name)) return false;
 	const reason = commandState?.reason;
@@ -31812,6 +32162,7 @@ var RESERVED_TOOLBAR_ITEM_NAMES = /* @__PURE__ */ new Set([
 * proof lane, and behavior tests resolve against a real object.
 */
 var BuiltInToolbar = class extends import_eventemitter3.default {
+	#formattingRefusalTooltips;
 	#imagePicker;
 	#groupItems;
 	#highlightOptions;
@@ -31843,6 +32194,7 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 			showPageNumberButton: false
 		};
 		this.toolbarItems = [];
+		this.#formattingRefusalTooltips = /* @__PURE__ */ new WeakMap();
 		this.overflowItems = [];
 		this.pendingSelectionCapture = void 0;
 		this.#imagePicker = null;
@@ -31969,7 +32321,7 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 			const signature = this.#fontOptionsSignature();
 			if (signature !== this._lastFontOptionsSignature) {
 				this._lastFontOptionsSignature = signature;
-				this.#rebuildToolbarItems();
+				if (!this.#refreshFontFamilyOptions()) this.#rebuildToolbarItems();
 			}
 			this.updateToolbarState();
 		};
@@ -32117,6 +32469,13 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 		this.#makeToolbarItems();
 		this.emit("toolbar-items-changed");
 	}
+	#refreshFontFamilyOptions() {
+		const items = this.#getAllToolbarItems().filter((item) => item.name.value === "fontFamily");
+		if (!items.length) return false;
+		const options = (this.#resolveToolbarFonts(this.config.fonts) ?? TOOLBAR_FONTS).map(normalizeFontOption);
+		for (const item of items) item.nestedOptions.value = options.map((option) => ({ ...option }));
+		return true;
+	}
 	#fontOptionsSignature() {
 		if (this.config.fonts) return "custom-fonts";
 		const options = this.superdoc?.fonts?.getFontFamilyOptions?.() ?? [];
@@ -32296,6 +32655,17 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 		const commandId = resolveBuiltInItemCommandId(name);
 		if (!commandId) return false;
 		const commandState = this.snapshot?.commands?.[commandId];
+		if (commandState?.reason === "deleted-text-formatting-unsupported") {
+			if (!this.#formattingRefusalTooltips.has(item)) this.#formattingRefusalTooltips.set(item, item.tooltip.value);
+			item.tooltip.value = "Select kept text, or accept or reject the deletion before formatting.";
+		} else if (this.#formattingRefusalTooltips.has(item)) {
+			item.tooltip.value = this.#formattingRefusalTooltips.get(item);
+			this.#formattingRefusalTooltips.delete(item);
+		}
+		if ((name === "list" || name === "numberedlist") && item.attributes.value.ariaBusy !== Boolean(commandState?.pending)) item.attributes.value = {
+			...item.attributes.value,
+			ariaBusy: Boolean(commandState?.pending)
+		};
 		if (shouldKeepEnabledForV1ToolbarParity(name, commandState)) item.setDisabled(false);
 		else item.setDisabled(Boolean(commandState?.disabled));
 		const handlers = {
@@ -32812,6 +33182,7 @@ function runtimeUserOf(user) {
 	const text = (value) => typeof value === "string" && value ? value : void 0;
 	return {
 		name: text(user.name) ?? "",
+		...user.commentIdentity !== void 0 ? { commentIdentity: user.commentIdentity ? { ...user.commentIdentity } : null } : {},
 		...text(user.id) ? { id: text(user.id) } : {},
 		...text(user.email) ? { email: text(user.email) } : {},
 		...text(user.initials) ? { initials: text(user.initials) } : {}
@@ -32840,6 +33211,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 	#v2ConnectionUnsub;
 	/** Latest `collaboration-connection-change` payload, for late readers. */
 	#v2ConnectionState;
+	#v2ConnectionFailureReported;
 	/** Whether the current collaboration room has completed a sync at least once. */
 	#v2ConnectionHasSynced;
 	/** Lock state captured before a local → v2 collaboration promotion remount. */
@@ -32942,6 +33314,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.#v2LockUnsub = null;
 		this.#v2ConnectionUnsub = null;
 		this.#v2ConnectionState = null;
+		this.#v2ConnectionFailureReported = false;
 		this.#v2ConnectionHasSynced = false;
 		this.#pendingV2LockSeed = null;
 		this.#mountWrapper = null;
@@ -33056,6 +33429,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		if (!config.selector) throw new Error("SuperDoc: selector is required");
 		const container = typeof config.selector === "string" ? document.querySelector(config.selector) : config.selector;
 		if (!(container instanceof HTMLElement)) throw new Error("SuperDoc: selector must be a valid CSS selector string or DOM element");
+		const user = normalizeSuperDocUser(config.user);
 		this.#diagnostics = createInteractionHistory(this, config, () => this.version, container);
 		this.#surfaceManager = new SurfaceManager({ getModuleConfig: () => this.#surfacesConfig });
 		this.#contentControlClickRoot = container;
@@ -33065,7 +33439,10 @@ var SuperDoc = class extends import_eventemitter3.default {
 		container.addEventListener("keydown", this.#handleContentControlKeyDown, true);
 		container.addEventListener("click", this.#handleContentControlClick, true);
 		this.#onConfig("content-control:active-change", config.onContentControlActiveChange);
-		this.#init(config, container);
+		this.#init({
+			...config,
+			user
+		}, container);
 		this.#contentControlEventBridgeReady = true;
 		if (this.listenerCount("content-control:active-change") > 0) this.ui;
 	}
@@ -33118,7 +33495,6 @@ var SuperDoc = class extends import_eventemitter3.default {
 		}
 		this.editorVersion = 2;
 		this.#validateLegacyConfig();
-		this.config.user = normalizeSuperDocUser(this.config.user);
 		if (!this.config.layoutEngineOptions.virtualization) this.config.layoutEngineOptions.virtualization = {
 			enabled: true,
 			window: 5,
@@ -33144,7 +33520,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.29.0";
+		this.version = "2.30.0-next.9";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];
@@ -33563,6 +33939,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		if (this.#v2ConnectionState?.documentId !== documentId) {
 			this.#v2ConnectionState = null;
 			this.#v2ConnectionHasSynced = false;
+			this.#v2ConnectionFailureReported = false;
 		}
 		const publish = (snapshot) => {
 			if (this.#destroyed) return;
@@ -33577,8 +33954,21 @@ var SuperDoc = class extends import_eventemitter3.default {
 				superdoc: this
 			};
 			this.#v2ConnectionState = payload;
-			if (snapshot.state === "synced") this.#v2ConnectionHasSynced = true;
-			this.emit("collaboration-connection-change", payload);
+			if (snapshot.state === "synced") {
+				this.#v2ConnectionHasSynced = true;
+				this.#v2ConnectionFailureReported = false;
+			}
+			const firstFailure = snapshot.state === "failed" && !this.#v2ConnectionFailureReported;
+			if (firstFailure) this.#v2ConnectionFailureReported = true;
+			const reportFailure = firstFailure && snapshot.detail !== "worker-transport-failed";
+			try {
+				this.emit("collaboration-connection-change", payload);
+			} finally {
+				if (reportFailure) {
+					const exception = createCollaborationException("collaboration-connection-failed", documentId);
+					if (exception) this.emit("exception", exception);
+				}
+			}
 		};
 		try {
 			const initialSnapshot = connection.getSnapshot?.();
@@ -34003,10 +34393,15 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.#requireReady("setUser");
 		const name = typeof user?.name === "string" ? user.name.trim() : "";
 		if (!name) return Promise.reject(/* @__PURE__ */ new TypeError("SuperDoc.setUser requires a non-empty user name."));
-		const next = normalizeSuperDocUser({
-			...user,
-			name
-		});
+		let next;
+		try {
+			next = normalizeSuperDocUser({
+				...user,
+				name
+			});
+		} catch (error) {
+			return Promise.reject(error);
+		}
 		const applied = this.#userSwitch.then(() => this.#applyUser(next));
 		this.#userSwitch = applied.catch(() => {});
 		return applied;
@@ -34020,7 +34415,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 			"email",
 			"image",
 			"initials"
-		].every((key) => (current[key] ?? null) === (next[key] ?? null))) return;
+		].every((key) => (current[key] ?? null) === (next[key] ?? null)) && current.commentIdentity === void 0 === (next.commentIdentity === void 0) && (current.commentIdentity?.providerId ?? null) === (next.commentIdentity?.providerId ?? null) && (current.commentIdentity?.userId ?? null) === (next.commentIdentity?.userId ?? null)) return;
 		const runtimes = this.#editorRuntimeRegistry.getAll();
 		const results = await Promise.allSettled(runtimes.map((runtime) => runtime.setUser?.(runtimeUserOf(next))));
 		const failure = results.find((result) => result.status === "rejected");