superdoc 2.28.0-next.8 → 2.28.0

package/dist/superdoc.cjs

@@ -1,16 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./chunks/rolldown-runtime-74VwNCz7.cjs");
 const require_blank_docx = require("./chunks/blank-docx-BuFAbRjs.cjs");
-const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-B4c55pFy.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-BfgYblyI.cjs");
 const require_eventemitter3 = require("./chunks/eventemitter3-C_TAnXOl.cjs");
 const require_uuid = require("./chunks/uuid-BhG0ngwk.cjs");
-const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-BUdjGKyl.cjs");
+const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-6MBoygIY.cjs");
 const require_jszip = require("./chunks/jszip-D8mAFF-r.cjs");
 const require_constants = require("./chunks/constants-DpXuDx_g.cjs");
 let superdoc_entry_vue = require("vue");
 superdoc_entry_vue = require_rolldown_runtime.__toESM(superdoc_entry_vue, 1);
-require("y-websocket");
-require("@hocuspocus/provider");
 let yjs = require("yjs");
 //#region src/core/v2-integration/browser-peer-runtime.js
 var SUPERDOC_V2_BROWSER_RUNTIME_GLOBAL_KEY = "__SUPERDOC_V2_BROWSER_RUNTIME__";
@@ -260,7 +258,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.28.0-next.8";
+		return "2.28.0";
 	} catch {
 		return "unknown";
 	}
@@ -5529,13 +5527,22 @@ function resolveLiveblocksFamily(candidate, authEndpointBaseUrl) {
 		reason: "mixed-auth",
 		message: "SuperDoc v2 Liveblocks collaboration accepts exactly one auth mode; pass either publicApiKey or authEndpoint, not both."
 	};
+	const baseUrlRaw = candidate.baseUrl;
+	const baseUrl = baseUrlRaw === void 0 ? void 0 : normalizeHttpUrl(baseUrlRaw);
+	if (baseUrl === null) return {
+		ok: false,
+		reason: "invalid-base-url",
+		message: "SuperDoc v2 Liveblocks collaboration requires baseUrl to be an absolute http(s) URL."
+	};
+	const baseUrlOption = baseUrl ? { baseUrl } : {};
 	if (publicApiKey) return {
 		ok: true,
 		target: {
 			providerFamily: "liveblocks",
 			documentId,
 			roomMode,
-			publicApiKey
+			publicApiKey,
+			...baseUrlOption
 		}
 	};
 	const authEndpoint = normalizeHttpUrl(authEndpointRaw, authEndpointBaseUrl);
@@ -5550,7 +5557,8 @@ function resolveLiveblocksFamily(candidate, authEndpointBaseUrl) {
 			providerFamily: "liveblocks",
 			documentId,
 			roomMode,
-			authEndpoint
+			authEndpoint,
+			...baseUrlOption
 		}
 	};
 }
@@ -6833,87 +6841,6 @@ var useSuperdocStore = defineStore("superdoc", () => {
 	};
 });
 //#endregion
-//#region src/helpers/group-changes.js
-/**
-* Track changes helper
-* Combines replace transactions which are represented by insertion + deletion
-*
-* @param {Array} changes - Array of tracked changes from the editor
-* @returns {Array} Grouped track changes array with combined replacements
-*/
-var groupChanges = (changes) => {
-	const markMetaKeys = {
-		trackInsert: "insertedMark",
-		trackDelete: "deletionMark",
-		trackFormat: "formatMark"
-	};
-	const byId = /* @__PURE__ */ new Map();
-	for (const change of changes) {
-		const id = change.mark.attrs.id;
-		if (!byId.has(id)) byId.set(id, []);
-		byId.get(id).push(change);
-	}
-	const grouped = [];
-	for (const [, group] of byId) {
-		if (group.length === 1) {
-			const c = group[0];
-			const key = markMetaKeys[c.mark.type.name];
-			grouped.push({
-				from: c.from,
-				to: c.to,
-				[key]: c
-			});
-			continue;
-		}
-		const processed = /* @__PURE__ */ new Set();
-		for (let i = 0; i < group.length; i++) {
-			if (processed.has(i)) continue;
-			const c1 = group[i];
-			const c1Key = markMetaKeys[c1.mark.type.name];
-			const c2 = group[i + 1];
-			if (c2 && !processed.has(i + 1) && c1.to === c2.from && c1.mark.type.name !== c2.mark.type.name) {
-				const c2Key = markMetaKeys[c2.mark.type.name];
-				grouped.push({
-					from: c1.from,
-					to: c2.to,
-					[c1Key]: c1,
-					[c2Key]: c2
-				});
-				processed.add(i);
-				processed.add(i + 1);
-				continue;
-			}
-			let foundMatch = false;
-			for (let j = i + 1; j < group.length; j++) {
-				if (processed.has(j)) continue;
-				const cj = group[j];
-				if (c1.mark.type.name !== cj.mark.type.name) {
-					const cjKey = markMetaKeys[cj.mark.type.name];
-					grouped.push({
-						from: Math.min(c1.from, cj.from),
-						to: Math.max(c1.to, cj.to),
-						[c1Key]: c1,
-						[cjKey]: cj
-					});
-					processed.add(i);
-					processed.add(j);
-					foundMatch = true;
-					break;
-				}
-			}
-			if (!foundMatch) {
-				grouped.push({
-					from: c1.from,
-					to: c1.to,
-					[c1Key]: c1
-				});
-				processed.add(i);
-			}
-		}
-	}
-	return grouped;
-};
-//#endregion
 //#region src/stores/helpers/floating-comment-instances.js
 var HEADER_FOOTER_TRACKED_CHANGE_STORY_TYPE = "headerFooterPart";
 var toFinitePageIndex = (value) => {
@@ -7055,20 +6982,16 @@ var buildFloatingCommentInstances = ({ comment, positionKey, positionEntry, fall
 	})];
 };
 //#endregion
-//#region src/core/v2-integration/v2-integration.js
-/** @type {() => Promise<unknown>} */
+//#region src/core/v2-integration/v2-integration.ts
 var engineModuleLoader = () => import("@superdoc/docx-engine");
-/** @type {Promise<void> | null} */
 var engineModulePromise = null;
-/** @type {((...args: unknown[]) => unknown) | null} */
 var createSuperDocV2Integration = null;
-/** Load the engine before Vue evaluates the synchronous integration seam. */
 async function loadDefaultV2Integration() {
 	if (!engineModulePromise) {
 		const loadPromise = Promise.resolve().then(() => engineModuleLoader()).then((module) => {
 			const factory = module && typeof module === "object" && "createSuperDocV2Integration" in module ? module.createSuperDocV2Integration : null;
 			if (typeof factory !== "function") throw new TypeError("SuperDoc: the DOCX Engine module does not export createSuperDocV2Integration");
-			createSuperDocV2Integration = factory;
+			createSuperDocV2Integration = () => factory();
 		});
 		engineModulePromise = loadPromise;
 		loadPromise.catch(() => {
@@ -7080,7 +7003,6 @@ async function loadDefaultV2Integration() {
 	}
 	await engineModulePromise;
 }
-/** Load the engine for editor startup, preserving the fail-closed stub on failure. */
 async function loadDefaultV2IntegrationOrFallback() {
 	try {
 		await loadDefaultV2Integration();
@@ -7089,12 +7011,8 @@ async function loadDefaultV2IntegrationOrFallback() {
 	}
 }
 var V2_BODY_TRACKED_CHANGE_ANCHOR_PREFIX = "tc::body::";
-/**
-* @param {{ trackedChange?: unknown, trackedChangeAnchorKey?: unknown } | null | undefined} row
-* @returns {boolean}
-*/
 function isV2SyntheticTrackedChangeRow(row) {
-	if (!row || row.trackedChange !== true) return false;
+	if (!require_create_super_doc_ui.isPlainObject(row) || row.trackedChange !== true) return false;
 	const anchorKey = row.trackedChangeAnchorKey;
 	return typeof anchorKey === "string" && anchorKey.startsWith(V2_BODY_TRACKED_CHANGE_ANCHOR_PREFIX);
 }
@@ -7144,9 +7062,6 @@ var StubV2EditorComponent = require__plugin_vue_export_helper.defineComponent({
 		return () => require__plugin_vue_export_helper.h("div", { class: "superdoc-v2-integration-missing" });
 	}
 });
-/**
-* @returns {SuperDocV2Integration}
-*/
 function createStubV2Integration() {
 	return {
 		version: 1,
@@ -7159,30 +7074,25 @@ function createStubV2Integration() {
 		isV2SyntheticTrackedChangeRow
 	};
 }
-/**
-* Build the default v2 integration the runtime always uses. The v2
-* browser shell is the only source of the editor runtime; no customer-provided
-* integration is consulted. Falls back to the local stub only if the engine
-* shell throws during construction (defensive, never selects v1).
-*
-* @returns {SuperDocV2Integration}
-*/
+function adoptEngineIntegration(engineIntegration) {
+	const stub = createStubV2Integration();
+	if (!require_create_super_doc_ui.isPlainObject(engineIntegration) || !engineIntegration.EditorComponent) return stub;
+	const engine = engineIntegration;
+	return {
+		version: typeof engine.version === "number" ? engine.version : stub.version,
+		capabilities: engine.capabilities ?? stub.capabilities,
+		EditorComponent: engine.EditorComponent ?? stub.EditorComponent,
+		RulerComponent: engine.RulerComponent ?? stub.RulerComponent,
+		createGeometryPublisher: engine.createGeometryPublisher ?? stub.createGeometryPublisher,
+		createReviewWindowController: engine.createReviewWindowController ?? stub.createReviewWindowController,
+		isSyntheticTrackedChangeCommentLaneItem: engine.isSyntheticTrackedChangeCommentLaneItem ?? stub.isSyntheticTrackedChangeCommentLaneItem,
+		isV2SyntheticTrackedChangeRow: engine.isV2SyntheticTrackedChangeRow ?? stub.isV2SyntheticTrackedChangeRow
+	};
+}
 function createDefaultV2Integration() {
 	if (!createSuperDocV2Integration) return createStubV2Integration();
 	try {
-		const stub = createStubV2Integration();
-		const integration = createSuperDocV2Integration();
-		if (!integration || typeof integration !== "object" || !integration.EditorComponent) return stub;
-		return {
-			version: typeof integration.version === "number" ? integration.version : stub.version,
-			capabilities: integration.capabilities ?? stub.capabilities,
-			EditorComponent: integration.EditorComponent,
-			RulerComponent: integration.RulerComponent ?? stub.RulerComponent,
-			createGeometryPublisher: integration.createGeometryPublisher ?? stub.createGeometryPublisher,
-			createReviewWindowController: integration.createReviewWindowController ?? stub.createReviewWindowController,
-			isSyntheticTrackedChangeCommentLaneItem: integration.isSyntheticTrackedChangeCommentLaneItem ?? stub.isSyntheticTrackedChangeCommentLaneItem,
-			isV2SyntheticTrackedChangeRow: integration.isV2SyntheticTrackedChangeRow ?? stub.isV2SyntheticTrackedChangeRow
-		};
+		return adoptEngineIntegration(createSuperDocV2Integration());
 	} catch (error) {
 		console.error("[SuperDoc] DOCX Engine integration failed to construct; using the stub.", error);
 		return createStubV2Integration();
@@ -7474,20 +7384,6 @@ var buildTrackedChangeDecisionLinkIndex = (allComments, previous = /* @__PURE__
 };
 //#endregion
 //#region src/stores/comments-store.js
-var Editor = class {
-	constructor() {
-		throw new Error("SuperDoc v2 beta: v1 editor-backed comment import paths are not available.");
-	}
-};
-var trackChangesHelpers = {
-	getTrackChanges: () => [],
-	enumerateStructuralRowChanges: () => []
-};
-var CommentsPluginKey = Symbol("comments-plugin-disabled");
-var getRichTextExtensions = () => [];
-var createOrUpdateTrackedChangeComment = () => null;
-var getTrackedChangeIndex = () => null;
-var resolveTrackedChangeInStory = () => null;
 var makeTrackedChangeAnchorKey = ({ storyKey, rawId }) => `tc::${storyKey}::${rawId}`;
 var COMMENT_DRAFT_BR_TAG = /<br(?:\s[^>]*)?\s*\/?>/gi;
 var COMMENT_DRAFT_BLOCK_BOUNDARY = /(?:<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>\s*)+(?:<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]*)?\s*\/?>)+/gi;
@@ -7632,25 +7528,6 @@ var useCommentsStore = defineStore("comments", () => {
 			rawId: String(rawId)
 		});
 	};
-	/**
-	* Compute the stable public id for a structural (whole-table) tracked change.
-	*
-	* This MUST match the public id the document-api projects for the same change
-	* (`tracked-change-resolver.groupTrackedChanges`), otherwise the right-rail
-	* accept/reject would route `trackChanges.decide` to a change that does not
-	* exist. The doc-api derives the public id as `word:structural:<sourceId>`
-	* for imported Word revisions, falling back to the per-import logical id.
-	* Reuse the exact rule here so the bubble id is the decide id.
-	*
-	* @param {{ sourceId?: string, id?: string }} structural
-	* @returns {string | null}
-	*/
-	const buildStructuralTrackedChangeId = (structural) => {
-		if (!structural) return null;
-		const sourceId = structural.sourceId ? String(structural.sourceId) : "";
-		if (sourceId) return `word:structural:${sourceId}`;
-		return structural.id ? String(structural.id) : null;
-	};
 	const superdocStore = useSuperdocStore();
 	const commentsConfig = require__plugin_vue_export_helper.reactive({
 		name: "comments",
@@ -7682,8 +7559,6 @@ var useCommentsStore = defineStore("comments", () => {
 	const isDebugging = false;
 	const debounceTimers = {};
 	const trackedChangeResolutionSnapshots = /* @__PURE__ */ new WeakMap();
-	const importedTrackedChangeBootstrapTasks = /* @__PURE__ */ new Map();
-	let importedTrackedChangeBootstrapGeneration = 0;
 	const isBenchmarkCommentsDebugEnabled = () => {
 		if (typeof window === "undefined") return false;
 		return "__labsSuperDocV2BenchmarkDebug" in window;
@@ -7710,6 +7585,11 @@ var useCommentsStore = defineStore("comments", () => {
 	const suppressInternalExternal = require__plugin_vue_export_helper.ref(true);
 	const currentCommentText = require__plugin_vue_export_helper.ref("");
 	const currentCommentMentions = require__plugin_vue_export_helper.ref([]);
+	let commentDraftRevision = 0;
+	require__plugin_vue_export_helper.watch([currentCommentText, currentCommentMentions], () => commentDraftRevision++, {
+		deep: true,
+		flush: "sync"
+	});
 	const commentsList = require__plugin_vue_export_helper.ref([]);
 	const reviewDirectoryList = require__plugin_vue_export_helper.shallowRef([]);
 	let priorTrackedChangeThreadIndex = /* @__PURE__ */ new Map();
@@ -8043,17 +7923,6 @@ var useCommentsStore = defineStore("comments", () => {
 		comment.resolvedByName = null;
 		comment.trackedChangeDecision = null;
 	};
-	const restoreResolvedMetadata = (comment) => {
-		if (!comment) return false;
-		const snapshot = trackedChangeResolutionSnapshots.get(comment);
-		if (!snapshot) return false;
-		comment.resolvedTime = snapshot.resolvedTime ?? Date.now();
-		comment.resolvedById = snapshot.resolvedById ?? null;
-		comment.resolvedByEmail = snapshot.resolvedByEmail ?? null;
-		comment.resolvedByName = snapshot.resolvedByName ?? null;
-		comment.trackedChangeDecision = snapshot.trackedChangeDecision ?? null;
-		return true;
-	};
 	const getCommentEventPayload = (comment) => typeof comment?.getValues === "function" ? comment.getValues() : { ...comment };
 	/**
 	* Check if a comment originated from the document editor (or has no explicit source).
@@ -8068,129 +7937,14 @@ var useCommentsStore = defineStore("comments", () => {
 		return source === DOCUMENT_EDITOR_SELECTION_SOURCE;
 	};
 	const isTrackedChangeThread = (comment) => Boolean(comment?.trackedChange) || Boolean(trackedChangeThreadParentIdForComment$1(comment));
-	const syncTrackedChangePositionsWithDocument = ({ documentId, editor } = {}) => {
-		if (!editor?.state) return 0;
-		if (!commentsList.value?.length) return 0;
-		const currentPositions = editorCommentPositions.value || {};
-		if (!Object.keys(currentPositions).length) return 0;
-		const resolveExistingPositionKey = (aliasIds) => aliasIds.find((key) => currentPositions[key] !== void 0) ?? null;
-		const candidateRootPositionKeys = /* @__PURE__ */ new Set();
-		const rootAliasesByPositionKey = /* @__PURE__ */ new Map();
-		commentsList.value.forEach((comment) => {
-			if (!comment?.trackedChange) return;
-			if (documentId) {
-				const resolvedDocumentId = comment?.fileId ?? null;
-				if (resolvedDocumentId && resolvedDocumentId !== documentId) return;
-			}
-			const aliasIds = getCommentAliasIds(comment);
-			const normalizedPositionKey = resolveExistingPositionKey(aliasIds);
-			if (!normalizedPositionKey) return;
-			candidateRootPositionKeys.add(normalizedPositionKey);
-			rootAliasesByPositionKey.set(normalizedPositionKey, new Set(aliasIds));
-		});
-		if (!candidateRootPositionKeys.size) return 0;
-		const trackedIds = new Set(trackChangesHelpers.getTrackChanges(editor.state).map(({ mark }) => mark?.attrs?.id).filter((id) => id !== void 0 && id !== null).map((id) => String(id)));
-		const trackedChangeIndex = typeof getTrackedChangeIndex === "function" ? getTrackedChangeIndex(editor) : null;
-		let liveAnchorKeySource = [];
-		try {
-			liveAnchorKeySource = trackedChangeIndex?.getAll?.() ?? [];
-		} catch {}
-		const liveAnchorKeys = new Set(liveAnchorKeySource.map((snapshot) => snapshot?.anchorKey).filter((anchorKey) => typeof anchorKey === "string" && anchorKey.length > 0));
-		const staleRootPositionKeys = new Set(Array.from(candidateRootPositionKeys).filter((positionKey) => {
-			const aliases = rootAliasesByPositionKey.get(positionKey) ?? /* @__PURE__ */ new Set([positionKey]);
-			if (Array.from(aliases).some((alias) => liveAnchorKeys.has(alias))) return false;
-			return !Array.from(aliases).some((alias) => trackedIds.has(alias));
-		}));
-		if (!staleRootPositionKeys.size) return 0;
-		const staleRootAliasIds = /* @__PURE__ */ new Set();
-		staleRootPositionKeys.forEach((positionKey) => {
-			(rootAliasesByPositionKey.get(positionKey) ?? /* @__PURE__ */ new Set([positionKey])).forEach((alias) => staleRootAliasIds.add(alias));
-		});
-		const stalePositionKeys = new Set(staleRootPositionKeys);
-		commentsList.value.forEach((comment) => {
-			const aliasIds = getCommentAliasIds(comment);
-			const normalizedPositionKey = resolveExistingPositionKey(aliasIds);
-			if (!normalizedPositionKey) return;
-			if ([
-				trackedChangeThreadParentIdForComment$1(comment),
-				comment?.threadingParentCommentId,
-				comment?.parentCommentId
-			].map((id) => normalizeCommentId(id)).filter(Boolean).some((id) => staleRootAliasIds.has(id))) stalePositionKeys.add(normalizedPositionKey);
-		});
-		const nextPositions = { ...currentPositions };
-		stalePositionKeys.forEach((key) => {
-			delete nextPositions[key];
-		});
-		editorCommentPositions.value = nextPositions;
-		if (activeComment.value !== void 0 && activeComment.value !== null) {
-			const activeCommentModel = getComment(activeComment.value);
-			const activeAliases = new Set(getCommentAliasIds(activeCommentModel ?? activeComment.value));
-			const activeParentKeys = [
-				trackedChangeThreadParentIdForComment$1(activeCommentModel),
-				activeCommentModel?.threadingParentCommentId,
-				activeCommentModel?.parentCommentId
-			].map((id) => normalizeCommentId(id)).filter(Boolean);
-			if (Array.from(activeAliases).some((id) => staleRootAliasIds.has(id)) || activeParentKeys.some((id) => staleRootAliasIds.has(id))) clearActiveCommentSelection();
-		}
-		return stalePositionKeys.size;
-	};
-	const collectStandardCommentDocumentState = (editor) => {
-		const doc = editor?.state?.doc;
-		if (!doc || typeof doc.descendants !== "function") return null;
-		const liveMarkIds = /* @__PURE__ */ new Set();
-		const resolvedAnchorIds = /* @__PURE__ */ new Set();
-		doc.descendants((node) => {
-			node.marks?.filter((mark) => mark?.type?.name === "commentMark").forEach((mark) => {
-				[mark.attrs?.commentId, mark.attrs?.importedId].map((id) => normalizeCommentId(id)).filter(Boolean).forEach((id) => liveMarkIds.add(id));
-			});
-			const typeName = node.type?.name;
-			if (typeName !== "commentRangeStart" && typeName !== "commentRangeEnd") return;
-			const anchorId = normalizeCommentId(node.attrs?.["w:id"]);
-			if (anchorId) resolvedAnchorIds.add(anchorId);
-		});
-		return {
-			liveMarkIds,
-			resolvedAnchorIds
-		};
-	};
-	/**
-	* Fall back to a live editor when the caller has none (the store watchers).
-	* `editorCommentPositions` refreshes asynchronously, so a positions-based
-	* decision taken mid-undo/redo can act on STALE keys — e.g. clearing the
-	* resolved metadata that the redo restore just wrote back. The document
-	* itself is the source of truth; prefer it whenever an editor is reachable.
-	*/
-	const getFallbackCommentsEditor = () => {
-		const docs = superdocStore.documents;
-		if (!Array.isArray(docs)) return null;
-		for (const doc of docs) {
-			const editor = typeof doc?.getEditor === "function" ? doc.getEditor() : null;
-			if (editor?.state?.doc) return editor;
-		}
-		return null;
-	};
-	const syncResolvedCommentsWithDocument = ({ editor } = {}) => {
+	const syncResolvedCommentsWithDocument = () => {
 		if (v2CommentsAdapter.value) return 0;
-		const effectiveEditor = editor ?? getFallbackCommentsEditor();
-		const documentState = collectStandardCommentDocumentState(effectiveEditor);
 		const docPositions = editorCommentPositions.value || {};
 		const activeKeys = new Set(Object.keys(docPositions));
-		if (!documentState && !activeKeys.size) return 0;
+		if (!activeKeys.size) return 0;
 		let changed = 0;
 		commentsList.value.forEach((comment) => {
 			if (!isEditorBackedComment(comment) || isTrackedChangeThread(comment)) return;
-			if (documentState) {
-				const aliasIds = getCommentAliasIds(comment);
-				const hasLiveMark = aliasIds.some((id) => documentState.liveMarkIds.has(id));
-				const hasResolvedAnchor = aliasIds.some((id) => documentState.resolvedAnchorIds.has(id));
-				if (hasLiveMark && comment.resolvedTime != null) {
-					clearResolvedMetadata(comment);
-					changed += 1;
-					return;
-				}
-				if (!hasLiveMark && hasResolvedAnchor && comment.resolvedTime == null && restoreResolvedMetadata(comment)) changed += 1;
-				return;
-			}
 			const { key } = resolveCommentPositionEntry(comment);
 			if (!key) return;
 			if (activeKeys.has(String(key)) && comment.resolvedTime != null) {
@@ -8208,23 +7962,6 @@ var useCommentsStore = defineStore("comments", () => {
 		syncResolvedCommentsWithDocument();
 	}, { deep: false });
 	/**
-	* Normalize a position object to a consistent { start, end } format.
-	* Handles different editor position schemas (start/end, pos/to, from/to).
-	*
-	* @param {Object | null | undefined} position The position object
-	* @returns {{ start: number, end: number } | null} The normalized range or null
-	*/
-	const getCommentPositionRange = (position) => {
-		if (!position) return null;
-		const start = position.start ?? position.pos ?? position.from;
-		const end = position.end ?? position.to ?? start;
-		if (!Number.isFinite(start) || !Number.isFinite(end)) return null;
-		return {
-			start,
-			end
-		};
-	};
-	/**
 	* Get the editor position data for a comment.
 	*
 	* @param {Object | string} commentOrId The comment object or comment ID
@@ -8233,44 +7970,6 @@ var useCommentsStore = defineStore("comments", () => {
 	const getCommentPosition = (commentOrId) => {
 		return resolveCommentPositionEntry(commentOrId).entry ?? null;
 	};
-	/**
-	* Get the text that a comment is anchored to in the document.
-	*
-	* @param {Object | string} commentOrId The comment object or comment ID
-	* @param {Object} [options] Options for text extraction
-	* @param {string} [options.separator=' '] Separator for textBetween when crossing nodes
-	* @param {boolean} [options.trim=true] Whether to trim whitespace from the result
-	* @returns {string | null} The anchored text or null if unavailable
-	*/
-	const getCommentAnchoredText = (commentOrId, options = {}) => {
-		const comment = typeof commentOrId === "object" ? commentOrId : getComment(commentOrId);
-		if (!comment) return null;
-		const position = resolveCommentPositionEntry(commentOrId).entry ?? null;
-		const range = getCommentPositionRange(position);
-		if (!range) return null;
-		const docNode = (superdocStore.getDocument(comment.fileId)?.getEditor?.())?.state?.doc;
-		if (!docNode?.textBetween) return null;
-		const separator = options.separator ?? " ";
-		const text = docNode.textBetween(range.start, range.end, separator, separator);
-		return options.trim === false ? text : text?.trim();
-	};
-	/**
-	* Get both position and anchored text data for a comment.
-	*
-	* @param {Object | string} commentOrId The comment object or comment ID
-	* @param {Object} [options] Options passed to getCommentAnchoredText
-	* @param {string} [options.separator=' '] Separator for textBetween when crossing nodes
-	* @param {boolean} [options.trim=true] Whether to trim whitespace from the result
-	* @returns {{ position: Object, anchoredText: string | null } | null} The anchor data or null
-	*/
-	const getCommentAnchorData = (commentOrId, options = {}) => {
-		const position = getCommentPosition(commentOrId);
-		if (!position) return null;
-		return {
-			position,
-			anchoredText: getCommentAnchoredText(commentOrId, options)
-		};
-	};
 	const isThreadVisible = (comment) => {
 		if (!isViewingMode.value) return true;
 		const parent = getThreadParent(comment);
@@ -8315,7 +8014,7 @@ var useCommentsStore = defineStore("comments", () => {
 	* @param {Object} param0.params The tracked change params
 	* @returns {void}
 	*/
-	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, documentState = void 0, trackedChangeIdentityIndex = null }) => {
+	const handleTrackedChangeUpdate = ({ superdoc, params, broadcastChanges = true, trackedChangeIdentityIndex = null }) => {
 		const span = startInteractionSpan("store.trackedChanges.handleUpdate", "store-reconciliation", {
 			event: params?.event ?? null,
 			changeId: params?.changeId ?? null,
@@ -8332,26 +8031,6 @@ var useCommentsStore = defineStore("comments", () => {
 			const normalizedCustomAttributes = hasCustomAttributes ? normalizeTrackedChangeCustomAttributes(customAttributes) : void 0;
 			const normalizedImportedId = hasImportedId ? importedId != null ? String(importedId) : null : void 0;
 			const normalizedDocumentId = documentId != null ? String(documentId) : null;
-			if (!(trackedChangeDisplayType === "tableInsert" || trackedChangeDisplayType === "tableDelete") && normalizedChangeId) {
-				const effectiveDocumentId = normalizedDocumentId ?? (superdoc?.activeEditor?.options?.documentId != null ? String(superdoc.activeEditor.options.documentId) : null);
-				const docEditor = effectiveDocumentId ? superdocStore.getDocument(effectiveDocumentId)?.getEditor?.() : null;
-				const docState = documentState !== void 0 ? documentState : docEditor?.state ?? superdoc?.activeEditor?.state ?? null;
-				if (docState) {
-					const { ranges: tableRanges, ids: structuralIds } = computeTrackedTableSummaryForState(docState);
-					const ranges = trackChangesHelpers.getTrackChanges(docState, normalizedChangeId);
-					const inRange = tableRanges.length > 0 && ranges.length > 0 && isInlineRangeInsideTrackedTable(ranges, tableRanges);
-					const isStructuralRowIdEcho = ranges.length === 0 && structuralIds.has(normalizedChangeId);
-					if (inRange || isStructuralRowIdEcho) {
-						pruneSuppressedInlineTableComments({
-							suppressedIds: /* @__PURE__ */ new Set([normalizedChangeId]),
-							activeDocumentId: effectiveDocumentId,
-							superdoc,
-							broadcastChanges
-						});
-						return;
-					}
-				}
-			}
 			const hasStoryMetadata = trackedChangeStory !== void 0 || trackedChangeStoryKind !== void 0 || trackedChangeStoryLabel !== void 0 || trackedChangeAnchorKey !== void 0;
 			const normalizedTrackedChangeStory = hasStoryMetadata ? trackedChangeStory ?? null : BODY_TRACKED_CHANGE_STORY;
 			const normalizedTrackedChangeStoryKind = hasStoryMetadata ? trackedChangeStoryKind ?? null : "body";
@@ -8545,38 +8224,6 @@ var useCommentsStore = defineStore("comments", () => {
 			endInteractionSpan(span);
 		}
 	};
-	const collectTrackedChangeMarksByType = (trackedChanges = []) => ({
-		insertedMark: trackedChanges.find(({ mark }) => mark?.type?.name === "trackInsert")?.mark ?? null,
-		deletionMark: trackedChanges.find(({ mark }) => mark?.type?.name === "trackDelete")?.mark ?? null,
-		formatMark: trackedChanges.find(({ mark }) => mark?.type?.name === "trackFormat")?.mark ?? null
-	});
-	const refreshTrackedChangeCommentsByIds = ({ superdoc, editor, changeIds, broadcastChanges = true }) => {
-		if (!superdoc || !editor?.state || !Array.isArray(changeIds) || !changeIds.length) return;
-		const documentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
-		if (!documentId) return;
-		for (const changeId of new Set(changeIds.map((id) => id != null ? String(id) : null).filter(Boolean))) {
-			const trackedChangesForId = trackChangesHelpers.getTrackChanges(editor.state, changeId);
-			if (!trackedChangesForId.length) continue;
-			const params = createOrUpdateTrackedChangeComment({
-				event: "update",
-				marks: collectTrackedChangeMarksByType(trackedChangesForId),
-				nodes: [],
-				newEditorState: editor.state,
-				documentId,
-				trackedChangesForId
-			});
-			if (!params) continue;
-			params.trackedChangeStory = BODY_TRACKED_CHANGE_STORY;
-			params.trackedChangeStoryKind = "body";
-			params.trackedChangeStoryLabel = "";
-			params.trackedChangeAnchorKey = buildBodyTrackedChangeAnchorKey(params.changeId ?? changeId);
-			handleTrackedChangeUpdate({
-				superdoc,
-				params,
-				broadcastChanges
-			});
-		}
-	};
 	const requestInstantSidebarAlignment = (targetY = null, threadId = null, instanceId = null) => {
 		const hasTargetY = Number.isFinite(targetY);
 		instantSidebarAlignmentTargetY.value = hasTargetY ? targetY : null;
@@ -8912,9 +8559,12 @@ var useCommentsStore = defineStore("comments", () => {
 		if (commentsAreReadOnly() && !isHydration) return readOnlyMutationOutcome();
 		const v2Adapter = !skipEditorUpdate && !isHydration ? getV2CommentsAdapter(superdoc) : null;
 		if (v2Adapter && !comment.trackedChange) {
-			const submittedPendingComment = pendingComment.value;
+			const pendingDraft = pendingComment.value;
+			const draftRevision = commentDraftRevision;
+			const draftActiveComment = activeComment.value;
+			const draftActiveInstance = activeFloatingCommentInstanceId.value;
 			const submittedPendingRequest = pendingCommentRequest;
-			const text = normalizeV2CommentDraftText(submittedPendingComment ? currentCommentText.value : comment.commentText);
+			const text = normalizeV2CommentDraftText(pendingDraft ? currentCommentText.value : comment.commentText);
 			const mentions = pendingComment.value ? currentCommentMentions.value : comment.mentions ?? [];
 			const target = pendingComment.value ? pendingV2CommentTarget.value : null;
 			const parentCommentId = comment.parentCommentId ? String(comment.parentCommentId) : pendingComment.value ? null : null;
@@ -8950,6 +8600,7 @@ var useCommentsStore = defineStore("comments", () => {
 					});
 					return outcome;
 				}
+				const ownsActiveDraftBeforeReconcile = activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance;
 				const reconciled = reconcileCommentsFromV2({
 					superdoc,
 					adapter: v2Adapter,
@@ -8961,14 +8612,17 @@ var useCommentsStore = defineStore("comments", () => {
 					reconciled,
 					documentId: v2Adapter.documentId
 				});
-				const hadPendingComment = submittedPendingComment != null && pendingComment.value?.commentId === submittedPendingComment.commentId;
+				const createdId = created?.commentId ?? null;
+				const createdIsActive = createdId !== null && activeComment.value === createdId;
+				const createdInstance = createdIsActive ? activeFloatingCommentInstanceId.value : null;
 				const ownsSubmittedRequest = pendingCommentRequest === submittedPendingRequest;
-				if (hadPendingComment) if (ownsSubmittedRequest) removePendingComment(superdoc);
+				const reconciliationClearedActiveDraft = ownsActiveDraftBeforeReconcile && activeComment.value === null && activeFloatingCommentInstanceId.value === null;
+				const ownsPendingDraft = pendingDraft !== null && pendingComment.value === pendingDraft && commentDraftRevision === draftRevision && (createdIsActive || reconciliationClearedActiveDraft || activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance);
+				if (ownsPendingDraft) if (ownsSubmittedRequest) removePendingComment(superdoc);
 				else resetPendingCommentState(superdoc, false);
-				const createdId = created?.commentId ?? null;
-				if (hadPendingComment && ownsSubmittedRequest && createdId) {
+				if (ownsPendingDraft && ownsSubmittedRequest && createdId) {
 					setActiveComment(superdoc, createdId);
-					setActiveFloatingCommentInstance(createdId);
+					setActiveFloatingCommentInstance(createdInstance ?? createdId);
 				}
 				if (broadcastChanges) superdoc.emit("comments-update", {
 					type: COMMENT_EVENTS.ADD,
@@ -10186,178 +9840,6 @@ var useCommentsStore = defineStore("comments", () => {
 		removePendingComment(superdoc);
 	};
 	/**
-	* Imported DOCX comments can omit the normalized author string.
-	* Strip the exporter suffix when present and tolerate missing metadata.
-	*
-	* @param {string | null | undefined} creatorName
-	* @returns {string | null}
-	*/
-	const normalizeImportedCreatorName = (creatorName) => {
-		if (typeof creatorName !== "string") return null;
-		return creatorName.replace(/\s*\(imported\)\s*$/u, "").trim() || null;
-	};
-	/**
-	* Read the mounted editor view and state without touching `editor.state`.
-	* The editor convenience getter delegates to `view.state` and throws after
-	* teardown, which is precisely when a deferred import callback can run.
-	*
-	* @param {Object | null | undefined} editor
-	* @returns {{ view: Object, state: Object } | null}
-	*/
-	const readMountedEditorSnapshot = (editor) => {
-		if (!editor) return null;
-		try {
-			if (editor.isDestroyed === true) return null;
-			const view = editor.view;
-			if (!view || view.isDestroyed === true || view.destroyed === true) return null;
-			const state = view.state;
-			if (!state) return null;
-			return {
-				view,
-				state
-			};
-		} catch {
-			return null;
-		}
-	};
-	const normalizeBootstrapDocumentId = (documentId) => documentId !== void 0 && documentId !== null && String(documentId).length > 0 ? String(documentId) : null;
-	/**
-	* Cancel deferred imported tracked-change comment work. Passing a document
-	* id cancels only that document; omitting it cancels every pending task.
-	*
-	* @param {string | null | undefined} documentId
-	* @returns {number} number of invalidated tasks
-	*/
-	const cancelImportedTrackedChangeBootstrap = (documentId) => {
-		const normalizedDocumentId = normalizeBootstrapDocumentId(documentId);
-		const entries = normalizedDocumentId ? [[normalizedDocumentId, importedTrackedChangeBootstrapTasks.get(normalizedDocumentId)]] : Array.from(importedTrackedChangeBootstrapTasks.entries());
-		let canceled = 0;
-		for (const [taskDocumentId, task] of entries) {
-			if (!task) continue;
-			importedTrackedChangeBootstrapTasks.delete(taskDocumentId);
-			if (task.timeoutHandle !== null && task.timeoutHandle !== void 0) clearTimeout(task.timeoutHandle);
-			canceled += 1;
-		}
-		return canceled;
-	};
-	const captureImportedTrackedChangeBootstrapSnapshot = (editor) => {
-		const mountedEditor = readMountedEditorSnapshot(editor);
-		if (!mountedEditor) return null;
-		let trackedChanges = [];
-		try {
-			trackedChanges = trackChangesHelpers.getTrackChanges(mountedEditor.state) ?? [];
-		} catch {
-			return null;
-		}
-		const enumerateStructuralChanges = trackChangesHelpers?.enumerateStructuralRowChanges;
-		let structuralChanges = [];
-		if (typeof enumerateStructuralChanges === "function") try {
-			structuralChanges = enumerateStructuralChanges(mountedEditor.state) ?? [];
-		} catch {
-			structuralChanges = [];
-		}
-		let storySnapshots = [];
-		if (typeof getTrackedChangeIndex === "function") try {
-			storySnapshots = getTrackedChangeIndex(editor)?.getAll?.() ?? [];
-		} catch {
-			storySnapshots = [];
-		}
-		return {
-			...mountedEditor,
-			trackedChanges,
-			structuralChanges,
-			storySnapshots
-		};
-	};
-	/**
-	* Bootstrap tracked-change comment threads after a DOCX import finishes.
-	*
-	* Initial import historically rebuilt only body tracked-change threads so
-	* resolved imported body comments stayed resolved. Header/footer and note
-	* tracked changes live outside the body PM state, so they need an additional
-	* story-aware bootstrap pass here.
-	*
-	* We intentionally keep the existing body-only rebuild instead of switching
-	* to the broader syncTrackedChangeComments() path so imported resolved body
-	* tracked-change threads preserve their initial resolved state.
-	*
-	* @param {Object | null | undefined} editor
-	* @param {Object | null | undefined} superdoc
-	* @param {Object | null | undefined} snapshot
-	* @returns {boolean}
-	*/
-	const bootstrapImportedTrackedChangeComments = (editor, superdoc, snapshot = null) => {
-		if (!editor || !superdoc) return false;
-		const captured = snapshot ?? captureImportedTrackedChangeBootstrapSnapshot(editor);
-		if (!captured) return false;
-		createCommentForTrackChanges(editor, superdoc, captured.trackedChanges, {
-			editorState: captured.state,
-			editorView: captured.view
-		});
-		syncStoryTrackedChangeComments({
-			superdoc,
-			editor,
-			snapshots: captured.storySnapshots,
-			documentState: captured.state,
-			resolveFromEditor: false
-		});
-		syncStructuralTrackedChangeComments({
-			superdoc,
-			editor,
-			structuralChanges: captured.structuralChanges
-		});
-		return true;
-	};
-	const isCurrentImportedTrackedChangeBootstrap = (task) => {
-		if (!task) return false;
-		if (importedTrackedChangeBootstrapTasks.get(task.documentId) !== task) return false;
-		try {
-			const editorDocumentId = task.editor?.options?.documentId;
-			if (editorDocumentId != null && String(editorDocumentId) !== task.documentId) return false;
-			const mountedDocument = superdocStore.getDocument(task.documentId);
-			if (!mountedDocument) return false;
-			if (mountedDocument.getEditor?.() !== task.editor) return false;
-		} catch {
-			return false;
-		}
-		return true;
-	};
-	const runImportedTrackedChangeBootstrap = (task) => {
-		if (!isCurrentImportedTrackedChangeBootstrap(task)) {
-			if (importedTrackedChangeBootstrapTasks.get(task?.documentId) === task) importedTrackedChangeBootstrapTasks.delete(task.documentId);
-			return false;
-		}
-		const snapshot = captureImportedTrackedChangeBootstrapSnapshot(task.editor);
-		if (!snapshot || !isCurrentImportedTrackedChangeBootstrap(task)) {
-			if (importedTrackedChangeBootstrapTasks.get(task.documentId) === task) importedTrackedChangeBootstrapTasks.delete(task.documentId);
-			return false;
-		}
-		try {
-			return bootstrapImportedTrackedChangeComments(task.editor, task.superdoc, snapshot);
-		} finally {
-			if (importedTrackedChangeBootstrapTasks.get(task.documentId) === task) importedTrackedChangeBootstrapTasks.delete(task.documentId);
-		}
-	};
-	const scheduleImportedTrackedChangeBootstrap = ({ editor, superdoc, documentId, defer = true }) => {
-		const normalizedDocumentId = normalizeBootstrapDocumentId(documentId);
-		if (!normalizedDocumentId || !editor || !superdoc) return false;
-		cancelImportedTrackedChangeBootstrap(normalizedDocumentId);
-		const task = {
-			documentId: normalizedDocumentId,
-			editor,
-			superdoc,
-			generation: ++importedTrackedChangeBootstrapGeneration,
-			timeoutHandle: null
-		};
-		importedTrackedChangeBootstrapTasks.set(normalizedDocumentId, task);
-		if (!defer) return runImportedTrackedChangeBootstrap(task);
-		task.timeoutHandle = setTimeout(() => {
-			task.timeoutHandle = null;
-			runImportedTrackedChangeBootstrap(task);
-		}, 0);
-		return true;
-	};
-	/**
 	* Drop imported threads and cached positions for one document id.
 	*
 	* Replace-file swaps call this before hydrating the replacement so stale
@@ -10374,7 +9856,6 @@ var useCommentsStore = defineStore("comments", () => {
 			delete next[activeDocumentId];
 			committedReviewPresentations.value = next;
 		}
-		cancelImportedTrackedChangeBootstrap(activeDocumentId);
 		const removedComments = commentsList.value.filter((comment) => belongsToDocument(comment, activeDocumentId, { allowSingleDocumentMismatch: true }));
 		if (!removedComments.length) return;
 		const removedAliasIds = /* @__PURE__ */ new Set();
@@ -10392,217 +9873,6 @@ var useCommentsStore = defineStore("comments", () => {
 		const activeCommentId = activeComment.value != null ? String(activeComment.value) : null;
 		if (activeCommentId && removedAliasIds.has(activeCommentId)) clearActiveCommentSelection();
 	}
-	function resetCommentsForReplacedDocument(documentId) {
-		removeCommentsForDocument(documentId);
-	}
-	/**
-	* Initialize loaded comments into SuperDoc by mapping the imported
-	* comment data to SuperDoc useComment objects.
-	*
-	* Updates the commentsList ref with the new comments.
-	*
-	* @param {Object} param0
-	* @param {Array} param0.comments The comments to be loaded
-	* @param {String} param0.documentId The document ID
-	* @param {boolean} [param0.replacedFile] Whether this load replaces an existing document in place
-	* @returns {void}
-	*/
-	const processLoadedDocxComments = async ({ superdoc, editor, comments, documentId, replacedFile = false }) => {
-		const document = superdocStore.getDocument(documentId);
-		if (document?.commentThreadingProfile) document.commentThreadingProfile.value = editor?.converter?.commentThreadingProfile || null;
-		if (replacedFile) resetCommentsForReplacedDocument(documentId);
-		comments.forEach((comment) => {
-			const textElements = Array.isArray(comment.elements) ? comment.elements : [];
-			const htmlContent = getHtmlFromComment(textElements);
-			if (!htmlContent && !comment.trackedChange) return;
-			const creatorName = normalizeImportedCreatorName(comment.creatorName);
-			const importedName = creatorName ? `${creatorName} (imported)` : null;
-			const newComment = useComment({
-				fileId: documentId,
-				fileType: document.type,
-				docxCommentJSON: textElements.length ? textElements : null,
-				commentId: comment.commentId,
-				isInternal: false,
-				parentCommentId: comment.parentCommentId,
-				trackedChangeParentId: comment.trackedChangeParentId,
-				trackedChangeThreadParentId: comment.trackedChangeThreadParentId,
-				creatorId: null,
-				creatorName,
-				createdTime: comment.createdTime,
-				creatorEmail: comment.creatorEmail,
-				importedAuthor: {
-					...importedName ? { name: importedName } : {},
-					email: comment.creatorEmail
-				},
-				commentText: htmlContent,
-				resolvedTime: comment.isDone ? Date.now() : null,
-				resolvedById: null,
-				resolvedByEmail: comment.isDone ? comment.creatorEmail : null,
-				resolvedByName: comment.isDone ? importedName || "(Imported)" : null,
-				trackedChange: comment.trackedChange || false,
-				trackedChangeText: comment.trackedChangeText,
-				trackedChangeType: comment.trackedChangeType,
-				trackedChangeDisplayType: comment.trackedChangeDisplayType,
-				deletedText: comment.trackedDeletedText,
-				origin: comment.origin || "word",
-				threadingMethod: comment.threadingMethod,
-				threadingStyleOverride: comment.threadingStyleOverride,
-				threadingParentCommentId: comment.threadingParentCommentId,
-				originalXmlStructure: comment.originalXmlStructure
-			});
-			addHydratedComment({
-				superdoc,
-				comment: newComment
-			});
-		});
-		if (replacedFile) {
-			scheduleImportedTrackedChangeBootstrap({
-				editor,
-				superdoc,
-				documentId,
-				defer: false
-			});
-			return;
-		}
-		scheduleImportedTrackedChangeBootstrap({
-			editor,
-			superdoc,
-			documentId
-		});
-	};
-	const createCommentForTrackChanges = (editor, superdoc, trackedChangesOverride = null, options = {}) => {
-		const { reopenResolved = false, refreshExisting = false, broadcastChanges = true, editorState: editorStateOverride = null, editorView: editorViewOverride = null } = options;
-		const mountedEditor = editorStateOverride ? {
-			state: editorStateOverride,
-			view: editorViewOverride
-		} : readMountedEditorSnapshot(editor);
-		if (!mountedEditor?.state) return;
-		const editorState = mountedEditor.state;
-		const trackedChanges = trackedChangesOverride ?? trackChangesHelpers.getTrackChanges(editorState);
-		const groupedChanges = groupChanges(trackedChanges);
-		const activeDocumentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
-		if (!activeDocumentId) return;
-		const skipIds = /* @__PURE__ */ new Set();
-		const existingTrackedChangeById = /* @__PURE__ */ new Map();
-		commentsList.value.forEach((comment) => {
-			if (!comment?.trackedChange) return;
-			if (!belongsToTrackedChangeSyncDocument(comment, activeDocumentId)) return;
-			if (!isBodyTrackedChangeComment(comment)) return;
-			const commentIds = [comment.commentId, comment.importedId].map((id) => id != null ? String(id) : null).filter(Boolean);
-			if (comment.resolvedTime) {
-				if (!reopenResolved) commentIds.forEach((id) => skipIds.add(id));
-				return;
-			}
-			commentIds.forEach((id) => {
-				existingTrackedChangeById.set(id, comment);
-				if (!refreshExisting) skipIds.add(id);
-			});
-		});
-		const changesByIdMap = /* @__PURE__ */ new Map();
-		for (const change of trackedChanges) {
-			const id = change.mark.attrs.id;
-			if (!changesByIdMap.has(id)) changesByIdMap.set(id, []);
-			changesByIdMap.get(id).push(change);
-		}
-		const documentId = activeDocumentId;
-		const processedIds = /* @__PURE__ */ new Set();
-		groupedChanges.forEach(({ insertedMark, deletionMark, formatMark }) => {
-			const id = insertedMark?.mark.attrs.id || deletionMark?.mark.attrs.id || formatMark?.mark.attrs.id;
-			if (id == null) return;
-			const normalizedId = String(id);
-			if (processedIds.has(normalizedId)) return;
-			processedIds.add(normalizedId);
-			if (!refreshExisting && skipIds.has(normalizedId)) return;
-			const existingTrackedChange = existingTrackedChangeById.get(normalizedId);
-			const marks = {
-				...insertedMark && { insertedMark: insertedMark.mark },
-				...deletionMark && { deletionMark: deletionMark.mark },
-				...formatMark && { formatMark: formatMark.mark }
-			};
-			const params = createOrUpdateTrackedChangeComment({
-				event: existingTrackedChange ? "update" : "add",
-				marks,
-				nodes: [],
-				newEditorState: editorState,
-				documentId,
-				trackedChangesForId: changesByIdMap.get(id) || []
-			});
-			if (params) {
-				const anchorKey = buildBodyTrackedChangeAnchorKey(params.changeId ?? id);
-				params.trackedChangeStory = BODY_TRACKED_CHANGE_STORY;
-				params.trackedChangeStoryKind = "body";
-				params.trackedChangeStoryLabel = "";
-				params.trackedChangeAnchorKey = anchorKey;
-				handleTrackedChangeUpdate({
-					superdoc,
-					params,
-					broadcastChanges,
-					documentState: editorState
-				});
-				if (!existingTrackedChange) {
-					skipIds.add(normalizedId);
-					if (params.changeId != null) skipIds.add(String(params.changeId));
-					if (params.importedId != null) skipIds.add(String(params.importedId));
-				}
-			}
-		});
-		const editorView = mountedEditor.view;
-		try {
-			if (!editorView || editor.view !== editorView || editorView.isDestroyed === true || editorView.destroyed === true) return;
-		} catch {
-			return;
-		}
-		const { tr } = editorState;
-		tr.setMeta(CommentsPluginKey, { type: "force" });
-		editorView.dispatch(tr);
-	};
-	/**
-	* Remove inline tracked-change comments whose change id is subsumed by a
-	* tracked whole-table change. Mirrors the deletion-event emission of
-	* `pruneStaleTrackedChangeComments` but is keyed on an explicit suppressed-id
-	* set rather than mark liveness (the mark is still live; only the review item
-	* is unwanted). Also clears the active-comment selection if it pointed at a
-	* now-suppressed change, so no stale active-on-click dialog can reference it.
-	*
-	* @param {{ suppressedIds: Set<string>, activeDocumentId: string, superdoc: any, broadcastChanges?: boolean }} input
-	*/
-	const pruneSuppressedInlineTableComments = ({ suppressedIds, activeDocumentId, superdoc = null, broadcastChanges = true }) => {
-		if (!(suppressedIds instanceof Set) || !suppressedIds.size || !activeDocumentId) return;
-		const removedComments = [];
-		commentsList.value = commentsList.value.filter((comment) => {
-			if (!comment?.trackedChange) return true;
-			if (!isBodyTrackedChangeComment(comment)) return true;
-			if (isStructuralTableBubble(comment)) return true;
-			if (!belongsToTrackedChangeSyncDocument(comment, activeDocumentId)) return true;
-			const commentId = comment.commentId != null ? String(comment.commentId) : null;
-			const importedId = comment.importedId != null ? String(comment.importedId) : null;
-			if (!(commentId && suppressedIds.has(commentId) || importedId && suppressedIds.has(importedId))) return true;
-			removedComments.push(comment);
-			return false;
-		});
-		if (!removedComments.length) return;
-		const removedIds = /* @__PURE__ */ new Set();
-		removedComments.forEach((comment) => {
-			if (comment.commentId != null) removedIds.add(String(comment.commentId));
-			if (comment.importedId != null) removedIds.add(String(comment.importedId));
-			const payload = getCommentEventPayload(comment);
-			const event = {
-				type: COMMENT_EVENTS.DELETED,
-				comment: payload,
-				changes: [{
-					key: "deleted",
-					commentId: payload.commentId,
-					fileId: payload.fileId
-				}]
-			};
-			if (broadcastChanges) {
-				syncCommentsToClients(superdoc, event);
-				superdoc?.emit?.("comments-update", event);
-			}
-		});
-		const activeCommentId = activeComment.value != null ? String(activeComment.value) : null;
-		if (activeCommentId && removedIds.has(activeCommentId)) clearActiveCommentSelection();
-	};
 	const getCommentDocumentId = (comment) => {
 		if (!comment) return null;
 		if (comment.fileId != null) return String(comment.fileId);
@@ -11458,286 +10728,6 @@ var useCommentsStore = defineStore("comments", () => {
 			return rowDocumentId != null && String(rowDocumentId) === normalizedDocumentId;
 		}).length;
 	};
-	const syncTrackedChangeComments = ({ superdoc, editor, broadcastChanges = true }) => {
-		if (!superdoc || !editor) return;
-		const activeDocumentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
-		if (!activeDocumentId) return;
-		const captured = captureImportedTrackedChangeBootstrapSnapshot(editor);
-		if (!captured) return;
-		const trackedChanges = captured.trackedChanges;
-		const liveTrackedChangeIds = /* @__PURE__ */ new Set();
-		trackedChanges.forEach((change) => {
-			const id = change?.mark?.attrs?.id;
-			if (id == null) return;
-			liveTrackedChangeIds.add(String(id));
-		});
-		const storySnapshots = captured.storySnapshots;
-		const liveTrackedChangeAnchorKeys = new Set(storySnapshots.map((snapshot) => snapshot?.anchorKey).filter((anchorKey) => typeof anchorKey === "string" && anchorKey.length > 0));
-		pruneStaleTrackedChangeComments(liveTrackedChangeIds, liveTrackedChangeAnchorKeys, activeDocumentId, superdoc, { broadcastChanges });
-		createCommentForTrackChanges(editor, superdoc, trackedChanges, {
-			reopenResolved: true,
-			refreshExisting: true,
-			broadcastChanges,
-			editorState: captured.state,
-			editorView: captured.view
-		});
-		syncStoryTrackedChangeComments({
-			superdoc,
-			editor,
-			broadcastChanges,
-			snapshots: storySnapshots,
-			documentState: captured.state
-		});
-		syncStructuralTrackedChangeComments({
-			superdoc,
-			editor,
-			broadcastChanges,
-			structuralChanges: captured.structuralChanges
-		});
-	};
-	/**
-	* Surface decidable whole-table structural tracked changes (table insert /
-	* table delete) as right-rail bubbles, mirroring the inline tracked-change
-	* path. Structural row revisions live on node attrs (not inline marks), so
-	* the inline `getTrackChanges` enumerator never sees them — they are
-	* enumerated separately here.
-	*
-	* Only `decidable` whole-table changes are surfaced; partial/mixed shapes are
-	* not actionable (the decision engine fails them closed) so they get no
-	* bubble. The bubble id is the document-api public id so accept/reject in the
-	* sidebar routes `trackChanges.decide` to the same change.
-	*
-	* Positioning: the bubble carries a body-story anchorKey (matching the
-	* tracked-change index snapshot) and a body PM range (table start/end). The
-	* DocumentRendererRuntime position pass emits a body-story position entry for that
-	* anchorKey, whose bounds resolve through the same `getRangeRects` path inline
-	* body comments/TC use — so it lines up with the table in layout-engine
-	* viewing mode.
-	*/
-	const syncStructuralTrackedChangeComments = ({ superdoc, editor, broadcastChanges = true, structuralChanges: structuralChangesOverride = null }) => {
-		const activeDocumentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
-		if (!activeDocumentId) return;
-		const enumerate = trackChangesHelpers?.enumerateStructuralRowChanges;
-		if (typeof enumerate !== "function") return;
-		let structuralChanges = structuralChangesOverride;
-		if (!Array.isArray(structuralChanges)) {
-			const mountedEditor = readMountedEditorSnapshot(editor);
-			if (!mountedEditor) return;
-			try {
-				structuralChanges = enumerate(mountedEditor.state) ?? [];
-			} catch {
-				structuralChanges = [];
-			}
-		}
-		for (const structural of structuralChanges) {
-			if (!structural?.decidable || !structural?.wholeTable) continue;
-			const publicId = buildStructuralTrackedChangeId(structural);
-			if (!publicId) continue;
-			const anchorKey = buildBodyTrackedChangeAnchorKey(publicId);
-			const displayType = structural.subtype === "table-insert" ? "tableInsert" : "tableDelete";
-			const trackedChangeType = structural.side === "insertion" ? "trackInsert" : "trackDelete";
-			const normalizedPublicId = String(publicId);
-			const normalizedAnchorKey = anchorKey != null ? String(anchorKey) : null;
-			const params = {
-				event: commentsList.value.find((comment) => {
-					if (!comment?.trackedChange) return false;
-					if (!belongsToTrackedChangeSyncDocument(comment, activeDocumentId)) return false;
-					const commentAnchorKey = comment.trackedChangeAnchorKey != null ? String(comment.trackedChangeAnchorKey) : null;
-					if (normalizedAnchorKey && commentAnchorKey) return commentAnchorKey === normalizedAnchorKey;
-					const commentId = comment.commentId != null ? String(comment.commentId) : null;
-					const importedId = comment.importedId != null ? String(comment.importedId) : null;
-					return commentId === normalizedPublicId || importedId === normalizedPublicId;
-				}) ? "update" : "add",
-				changeId: publicId,
-				trackedChangeText: "",
-				trackedChangeType,
-				trackedChangeDisplayType: displayType,
-				deletedText: null,
-				authorId: null,
-				authorEmail: structural.authorEmail || null,
-				authorImage: structural.authorImage || null,
-				date: structural.date || null,
-				author: structural.author || null,
-				importedAuthor: structural.importedAuthor ? { name: structural.importedAuthor } : null,
-				semanticColorKey: structural.semanticColorKey ?? null,
-				semanticColor: structural.semanticColor ?? null,
-				documentId: activeDocumentId,
-				coords: null,
-				trackedChangeStory: BODY_TRACKED_CHANGE_STORY,
-				trackedChangeStoryKind: "body",
-				trackedChangeStoryLabel: "",
-				trackedChangeAnchorKey: anchorKey
-			};
-			handleTrackedChangeUpdate({
-				superdoc,
-				params,
-				broadcastChanges
-			});
-		}
-	};
-	const syncStoryTrackedChangeComments = ({ superdoc, editor, broadcastChanges = true, snapshots = null, documentState = void 0, resolveFromEditor = true }) => {
-		const activeDocumentId = editor?.options?.documentId != null ? String(editor.options.documentId) : null;
-		if (!activeDocumentId) return;
-		let resolvedSnapshots = snapshots;
-		if (!Array.isArray(resolvedSnapshots)) {
-			if (typeof getTrackedChangeIndex !== "function") return;
-			if (!readMountedEditorSnapshot(editor)) return;
-			let index = null;
-			try {
-				index = getTrackedChangeIndex(editor);
-			} catch {
-				return;
-			}
-			if (!index) return;
-			try {
-				resolvedSnapshots = index.getAll();
-			} catch {
-				return;
-			}
-		}
-		for (const snapshot of resolvedSnapshots) {
-			if (snapshot.storyKind === "body") continue;
-			upsertStoryTrackedChangeComment({
-				superdoc,
-				editor,
-				snapshot,
-				documentId: activeDocumentId,
-				broadcastChanges,
-				documentState,
-				resolveFromEditor
-			});
-		}
-	};
-	const getStoryTrackedChangeDisplayType = (snapshot) => {
-		if (snapshot?.type !== "structural") return snapshot?.type ?? null;
-		return snapshot?.subtype === "table-delete" ? "tableDelete" : "tableInsert";
-	};
-	const getStoryTrackedChangeType = (snapshot) => {
-		if (snapshot?.type !== "structural") return snapshot?.type ?? null;
-		return snapshot?.subtype === "table-delete" ? "trackDelete" : "trackInsert";
-	};
-	const isStoryTrackedChangeDeletion = (snapshot) => {
-		if (!snapshot) return false;
-		if (snapshot.type === "delete") return true;
-		return snapshot.type === "structural" && snapshot.subtype === "table-delete";
-	};
-	const buildStoryTrackedChangeParams = ({ editor, snapshot, documentId, event, resolveFromEditor = true }) => {
-		const trackedChangeType = getStoryTrackedChangeType(snapshot);
-		const trackedChangeDisplayType = getStoryTrackedChangeDisplayType(snapshot);
-		const fallbackParams = {
-			event,
-			changeId: snapshot.runtimeRef.rawId,
-			trackedChangeText: isStoryTrackedChangeDeletion(snapshot) ? "" : snapshot.excerpt ?? "",
-			trackedChangeType,
-			trackedChangeDisplayType,
-			semanticColorKey: snapshot.semanticColorKey ?? null,
-			semanticColor: snapshot.semanticColor ?? null,
-			deletedText: isStoryTrackedChangeDeletion(snapshot) ? snapshot.excerpt ?? "" : null,
-			authorId: snapshot.authorId,
-			authorEmail: snapshot.authorEmail,
-			authorImage: snapshot.authorImage,
-			date: snapshot.date,
-			author: snapshot.author,
-			documentId,
-			coords: null,
-			trackedChangeStory: snapshot.story,
-			trackedChangeStoryKind: snapshot.storyKind,
-			trackedChangeStoryLabel: snapshot.storyLabel,
-			trackedChangeAnchorKey: snapshot.anchorKey
-		};
-		if (!resolveFromEditor || typeof resolveTrackedChangeInStory !== "function") return fallbackParams;
-		let resolvedChange = null;
-		try {
-			resolvedChange = resolveTrackedChangeInStory(editor, {
-				kind: "entity",
-				entityType: "trackedChange",
-				entityId: snapshot.runtimeRef.rawId,
-				story: snapshot.story
-			});
-		} catch {
-			resolvedChange = null;
-		}
-		const storyEditorState = resolvedChange?.editor?.state ?? null;
-		if (!storyEditorState) return fallbackParams;
-		let trackedChangesForId = [];
-		try {
-			trackedChangesForId = trackChangesHelpers.getTrackChanges(storyEditorState, resolvedChange.change.rawId) ?? [];
-		} catch {
-			trackedChangesForId = [];
-		}
-		const resolvedParams = createOrUpdateTrackedChangeComment({
-			event,
-			marks: collectTrackedChangeMarksByType(trackedChangesForId),
-			nodes: [],
-			newEditorState: storyEditorState,
-			documentId,
-			trackedChangesForId
-		});
-		if (!resolvedParams) return fallbackParams;
-		if (resolvedParams.semanticColorKey == null && snapshot.semanticColorKey != null) resolvedParams.semanticColorKey = snapshot.semanticColorKey;
-		if (resolvedParams.semanticColor == null && snapshot.semanticColor != null) resolvedParams.semanticColor = snapshot.semanticColor;
-		resolvedParams.trackedChangeStory = snapshot.story;
-		resolvedParams.trackedChangeStoryKind = snapshot.storyKind;
-		resolvedParams.trackedChangeStoryLabel = snapshot.storyLabel;
-		resolvedParams.trackedChangeAnchorKey = snapshot.anchorKey;
-		return resolvedParams;
-	};
-	const upsertStoryTrackedChangeComment = ({ superdoc, editor, snapshot, documentId, broadcastChanges, documentState, resolveFromEditor }) => {
-		if (!snapshot?.runtimeRef?.rawId) return;
-		const existingComment = commentsList.value.find((comment) => {
-			if (!comment?.trackedChange) return false;
-			const commentAnchorKey = comment.trackedChangeAnchorKey != null ? String(comment.trackedChangeAnchorKey) : null;
-			if (commentAnchorKey && snapshot.anchorKey) return commentAnchorKey === snapshot.anchorKey;
-			if (commentAnchorKey || snapshot.anchorKey) return false;
-			return comment.commentId === snapshot.runtimeRef.rawId || comment.importedId === snapshot.runtimeRef.rawId;
-		});
-		const params = buildStoryTrackedChangeParams({
-			editor,
-			snapshot,
-			documentId,
-			event: existingComment ? "update" : "add",
-			resolveFromEditor
-		});
-		handleTrackedChangeUpdate({
-			superdoc,
-			params,
-			broadcastChanges,
-			documentState
-		});
-		if (existingComment) {
-			existingComment.trackedChangeStory = snapshot.story;
-			existingComment.trackedChangeStoryKind = snapshot.storyKind;
-			existingComment.trackedChangeStoryLabel = snapshot.storyLabel;
-			existingComment.trackedChangeAnchorKey = snapshot.anchorKey;
-		}
-	};
-	const normalizeDocxSchemaForExport = (value) => {
-		if (!value) return [];
-		return (Array.isArray(value) ? value : [value]).filter(Boolean);
-	};
-	const translateCommentsForExport = () => {
-		const processedComments = [];
-		commentsList.value.forEach((comment) => {
-			const values = comment.getValues();
-			const richText = values.commentText;
-			const docxSchema = normalizeDocxSchemaForExport(values.docxCommentJSON);
-			const schema = docxSchema.length ? docxSchema : convertHtmlToSchema(richText);
-			processedComments.push({
-				...values,
-				commentJSON: schema
-			});
-		});
-		return processedComments;
-	};
-	const convertHtmlToSchema = (commentHTML) => {
-		const json = new Editor({
-			mode: "text",
-			isHeadless: true,
-			content: commentHTML,
-			extensions: getRichTextExtensions()
-		}).getJSON();
-		return Array.isArray(json?.content) ? json.content.filter(Boolean) : [];
-	};
 	/**
 	* Triggered when the editor locations are updated
 	* Updates floating comment locations from the editor
@@ -11800,150 +10790,12 @@ var useCommentsStore = defineStore("comments", () => {
 	const clearEditorCommentPositions = () => {
 		editorCommentPositions.value = {};
 	};
-	/**
-	* Identify the single structural (whole-table) bubble for a tracked table so
-	* it is NEVER suppressed by the table-subsume filter below. The structural
-	* bubble is the parent "Added table" / "Deleted table" change; its public
-	* id is `word:structural:<id>` (or a bare structural fallback) and its display
-	* type is `tableInsert` / `tableDelete`.
-	*
-	* @param {Object} comment
-	* @returns {boolean}
-	*/
-	const isStructuralTableBubble = (comment) => {
-		if (!comment?.trackedChange) return false;
-		const displayType = comment?.trackedChangeDisplayType;
-		if (displayType === "tableInsert" || displayType === "tableDelete") return true;
-		return [
-			comment?.commentId,
-			comment?.importedId,
-			comment?.trackedChangeAnchorKey
-		].map((id) => id != null ? String(id) : "").filter(Boolean).some((id) => id.includes("word:structural:"));
-	};
-	/**
-	* Compute the decidable whole-table tracked-change ranges for a comment's
-	* document, memoized per editor state so the filter does not re-enumerate the
-	* document once per comment. Returns `[]` when the document has no tracked
-	* whole-table change (the common case), so non-tracked tables and inline-only
-	* tracked changes are never affected.
-	*
-	* @param {string | null | undefined} fileId
-	* @returns {Array<{ from: number, to: number }>}
-	*/
-	const trackedTableSummaryCache = /* @__PURE__ */ new WeakMap();
-	/**
-	* Single source of truth for the decidable whole-table tracked changes in an
-	* editor state, enumerated and memoized ONCE per state. Returns:
-	*  - `ranges`: each tracked whole-table's `{ from, to }` document span. Used to
-	*    test whether an inline tracked change falls inside a tracked table.
-	*  - `ids`: every change id associated with those tables (the change's public
-	*    id / revisionId / revisionGroupId / sourceId plus each row's trackChange
-	*    id / sourceId). Text typed inside a tracked-inserted row inherits that
-	*    row's revision id, so such an inline change reports a changeId that is one
-	*    of these — it must be subsumed by the structural bubble, not get its own
-	*    review item.
-	*
-	* @param {object | null | undefined} state
-	* @returns {{ ranges: Array<{ from: number, to: number }>, ids: Set<string> }}
-	*/
-	const computeTrackedTableSummaryForState = (state) => {
-		if (!state) return {
-			ranges: [],
-			ids: /* @__PURE__ */ new Set()
-		};
-		const cached = trackedTableSummaryCache.get(state);
-		if (cached) return cached;
-		const ranges = [];
-		const ids = /* @__PURE__ */ new Set();
-		const add = (value) => {
-			if (value != null && value !== "") ids.add(String(value));
-		};
-		const enumerate = trackChangesHelpers?.enumerateStructuralRowChanges;
-		if (typeof enumerate === "function") {
-			let structuralChanges = [];
-			try {
-				structuralChanges = enumerate(state) ?? [];
-			} catch {
-				structuralChanges = [];
-			}
-			for (const change of structuralChanges) {
-				if (!change?.decidable || !change?.wholeTable) continue;
-				const from = Number(change.tableFrom);
-				const to = Number(change.tableTo);
-				if (Number.isFinite(from) && Number.isFinite(to)) ranges.push({
-					from,
-					to
-				});
-				add(change.id);
-				add(change.revisionId);
-				add(change.revisionGroupId);
-				add(change.sourceId);
-				for (const row of change.rows || []) {
-					const tc = row?.node?.attrs?.trackChange;
-					add(tc?.id);
-					add(tc?.sourceId);
-				}
-			}
-		}
-		const summary = {
-			ranges,
-			ids
-		};
-		trackedTableSummaryCache.set(state, summary);
-		return summary;
-	};
-	const getTrackedTableRangesForDocument = (fileId) => {
-		const editor = superdocStore.getDocument(fileId)?.getEditor?.();
-		return computeTrackedTableSummaryForState(editor?.state).ranges;
-	};
-	/**
-	* True when every `{ from, to }` range of an inline tracked change is wholly
-	* contained within some decidable whole-table tracked-change range. Such an
-	* inline change is subsumed by the structural "Inserted/Deleted table" review
-	* item and must NOT become an independent review item (no comment object →
-	* no floating bubble and no active-on-click dialog). The underlying
-	* trackInsert/trackDelete mark (the green highlight) is untouched — only the
-	* review-item comment is suppressed.
-	*
-	* @param {Array<{ from?: number, to?: number }>} changeRanges
-	* @param {Array<{ from: number, to: number }>} tableRanges
-	* @returns {boolean}
-	*/
-	const isInlineRangeInsideTrackedTable = (changeRanges, tableRanges) => {
-		if (!tableRanges?.length || !changeRanges?.length) return false;
-		return changeRanges.every((seg) => {
-			const start = Number(seg?.from);
-			const end = Number(seg?.to);
-			if (!Number.isFinite(start) || !Number.isFinite(end)) return false;
-			return tableRanges.some((table) => start >= table.from && end <= table.to);
-		});
-	};
-	/**
-	* Suppress an inline tracked-change bubble whose document range falls within a
-	* tracked whole-table change's range, so only the structural "Added table"
-	* / "Deleted table" bubble shows for that table (matching Word / Google Docs).
-	* The structural bubble itself, real user comments, and inline tracked changes
-	* inside a NON-tracked table are never suppressed.
-	*
-	* @param {Object} comment
-	* @returns {boolean} True when the bubble must NOT render.
-	*/
-	const isInlineTrackedChangeInsideTrackedTable = (comment) => {
-		if (!comment?.trackedChange) return false;
-		if (isStructuralTableBubble(comment)) return false;
-		const ranges = getTrackedTableRangesForDocument(comment?.fileId);
-		if (!ranges.length) return false;
-		const entry = resolveCommentPositionEntry(comment).entry;
-		const range = getCommentPositionRange(entry);
-		if (!range) return false;
-		return ranges.some((table) => range.start >= table.from && range.end <= table.to);
-	};
 	const getFloatingComments = require__plugin_vue_export_helper.computed(() => {
 		return getGroupedComments.value?.parentComments.filter((c) => !c.resolvedTime).filter((c) => {
 			if (!isEditorBackedComment(c)) return true;
 			if (isTrackedChangeThread(c)) return true;
 			return Boolean(resolveCommentPositionEntry(c).entry);
-		}).filter((c) => !isInlineTrackedChangeInsideTrackedTable(c));
+		});
 	});
 	const getFloatingCommentInstances = require__plugin_vue_export_helper.computed(() => {
 		return getFloatingComments.value.flatMap((comment) => {
@@ -11988,75 +10840,6 @@ var useCommentsStore = defineStore("comments", () => {
 		if (typeof commentsVisible === "boolean") viewingVisibility.commentsVisible = commentsVisible;
 		if (typeof trackChangesVisible === "boolean") viewingVisibility.trackChangesVisible = trackChangesVisible;
 	};
-	/**
-	* Get HTML content from the comment text JSON (which uses DOCX schema)
-	*
-	* @param {Object} commentTextJson The comment text JSON
-	* @returns {string} The HTML content
-	*/
-	const normalizeCommentForEditor = (node) => {
-		if (Array.isArray(node)) return node.map((child) => normalizeCommentForEditor(child)).flat().filter(Boolean);
-		if (!node || typeof node !== "object") return node;
-		const stripTextStyleAttrs = (attrs) => {
-			if (!attrs) return attrs;
-			const rest = { ...attrs };
-			delete rest.fontSize;
-			delete rest.fontFamily;
-			delete rest.eastAsiaFontFamily;
-			return Object.keys(rest).length ? rest : void 0;
-		};
-		const normalizeMark = (mark) => {
-			if (!mark) return mark;
-			const typeName = typeof mark.type === "string" ? mark.type : mark.type?.name;
-			const attrs = mark?.attrs ? { ...mark.attrs } : void 0;
-			if (typeName === "textStyle" && attrs) return {
-				...mark,
-				attrs: stripTextStyleAttrs(attrs)
-			};
-			return {
-				...mark,
-				attrs
-			};
-		};
-		const cloneMarks = (marks) => Array.isArray(marks) ? marks.filter(Boolean).map((mark) => normalizeMark(mark)) : void 0;
-		const cloneAttrs = (attrs) => attrs && typeof attrs === "object" ? { ...attrs } : void 0;
-		if (!Array.isArray(node.content)) return {
-			type: node.type,
-			...node.text !== void 0 ? { text: node.text } : {},
-			...node.attrs ? { attrs: cloneAttrs(node.attrs) } : {},
-			...node.marks ? { marks: cloneMarks(node.marks) } : {}
-		};
-		const normalizedChildren = node.content.map((child) => normalizeCommentForEditor(child)).flat().filter(Boolean);
-		if (node.type === "run") return normalizedChildren;
-		return {
-			type: node.type,
-			...node.attrs ? { attrs: cloneAttrs(node.attrs) } : {},
-			...node.marks ? { marks: cloneMarks(node.marks) } : {},
-			content: normalizedChildren
-		};
-	};
-	const getHtmlFromComment = (commentTextElements) => {
-		const elementsArray = Array.isArray(commentTextElements) ? commentTextElements : commentTextElements ? [commentTextElements] : [];
-		if (!elementsArray.some((element) => element?.content?.length)) return;
-		try {
-			const normalizedContent = normalizeCommentForEditor(elementsArray);
-			const contentArray = Array.isArray(normalizedContent) ? normalizedContent : normalizedContent ? [normalizedContent] : [];
-			if (!contentArray.length) return null;
-			return new Editor({
-				mode: "text",
-				isHeadless: true,
-				content: {
-					type: "doc",
-					content: contentArray
-				},
-				loadFromSchema: true,
-				extensions: getRichTextExtensions()
-			}).getHTML();
-		} catch (error) {
-			console.warn("Failed to convert comment", error);
-			return;
-		}
-	};
 	return {
 		COMMENT_EVENTS,
 		isDebugging,
@@ -12104,8 +10887,6 @@ var useCommentsStore = defineStore("comments", () => {
 		getTrackedChangeThread,
 		getCommentPositionKey,
 		getCommentPosition,
-		getCommentAnchoredText,
-		getCommentAnchorData,
 		resolveCommentPositionEntry,
 		getCommentDocumentId,
 		belongsToDocument,
@@ -12125,23 +10906,17 @@ var useCommentsStore = defineStore("comments", () => {
 		cancelComment,
 		deleteComment,
 		removePendingComment,
-		cancelImportedTrackedChangeBootstrap,
 		removeCommentsForDocument,
 		setReviewDirectoryFromV2,
 		clearReviewDirectory,
-		processLoadedDocxComments,
-		translateCommentsForExport,
 		handleEditorLocationsUpdate,
 		clearEditorCommentPositions,
 		handleTrackedChangeUpdate,
-		refreshTrackedChangeCommentsByIds,
 		syncResolvedCommentsWithDocument,
-		syncTrackedChangePositionsWithDocument,
 		setActiveFloatingCommentInstance,
 		requestInstantSidebarAlignment,
 		peekInstantSidebarAlignment,
 		clearInstantSidebarAlignment,
-		syncTrackedChangeComments,
 		decideTrackedChangeFromSidebar,
 		v2CommentsAdapter,
 		setV2CommentsAdapter,
@@ -13484,6 +12259,7 @@ var _hoisted_53 = { class: "reply-input-wrapper" };
 var _hoisted_54 = { class: "reply-actions" };
 var _hoisted_55 = ["disabled", "data-disabled-reason"];
 var commentEditSessions = /* @__PURE__ */ new WeakMap();
+var commentReplySessions = /* @__PURE__ */ new WeakMap();
 var _sfc_main$33 = {
 	__name: "CommentDialog",
 	props: {
@@ -13533,9 +12309,13 @@ var _sfc_main$33 = {
 		const superdocStore = useSuperdocStore();
 		const commentsStore = useCommentsStore();
 		const editSessionOwner = {};
+		const replySessionOwner = {};
 		const retireOwnEditSession = () => {
 			if (commentEditSessions.get(commentsStore)?.owner === editSessionOwner) commentEditSessions.delete(commentsStore);
 		};
+		const retireOwnReplySession = () => {
+			if (commentReplySessions.get(commentsStore)?.owner === replySessionOwner) commentReplySessions.delete(commentsStore);
+		};
 		const { addComment, cancelComment, deleteComment, getCommentAliasIds, removePendingComment, getCommentDocumentId, requestInstantSidebarAlignment, resolveCommentPositionEntry, clearInstantSidebarAlignment, setActiveFloatingCommentInstance } = commentsStore;
 		const { suppressInternalExternal, getConfig, activeComment, activeFloatingCommentInstanceId, floatingCommentsOffset, pendingComment, currentCommentText, currentCommentMentions, isDebugging, editingCommentId, editorCommentPositions, isCommentHighlighted } = storeToRefs(commentsStore);
 		const isInternal = require__plugin_vue_export_helper.ref(true);
@@ -13736,6 +12516,11 @@ var _sfc_main$33 = {
 		const isReplying = require__plugin_vue_export_helper.ref(false);
 		const isSubmittingReply = require__plugin_vue_export_helper.ref(false);
 		const isSubmittingNewComment = require__plugin_vue_export_helper.ref(false);
+		let replyDraftRevision = 0;
+		require__plugin_vue_export_helper.watch([currentCommentText, currentCommentMentions], () => replyDraftRevision++, {
+			deep: true,
+			flush: "sync"
+		});
 		const commentSaveFailure = require__plugin_vue_export_helper.ref("");
 		const commentSaveFailureMessage = (outcome, hasDraft = true) => {
 			return `Your comment could not be saved${outcome?.detail === "document-mode-read-only" ? " because the document or connection is read-only" : outcome?.code === "PERMISSION_DENIED" ? " because you do not have permission" : ""}.${hasDraft ? " Your draft is still here. Try again or cancel." : " Try again."}`;
@@ -13746,6 +12531,7 @@ var _sfc_main$33 = {
 				ok: false,
 				reason: v2WriteCapability.value?.reason ?? "v2-write-unavailable"
 			};
+			commentReplySessions.set(commentsStore, { owner: replySessionOwner });
 			commentSaveFailure.value = "";
 			isReplying.value = true;
 			require__plugin_vue_export_helper.nextTick(() => {
@@ -13984,6 +12770,15 @@ var _sfc_main$33 = {
 			commentsStore.setActiveComment(proxy.$superdoc, activeComment.value);
 			isCommentHighlighted.value = false;
 		};
+		const captureCommentEditorOwner = () => {
+			const editor = proxy.$superdoc.activeEditor;
+			const adapter = editor.v2Comments;
+			const document = editor.doc;
+			return {
+				adapter,
+				isCurrent: () => proxy.$superdoc.activeEditor === editor && editor.v2Comments === adapter && editor.doc === document
+			};
+		};
 		const handleAddComment = async () => {
 			if (commentsAreReadOnly()) return readOnlyMutationOutcome();
 			if (isV2WriteDisabled.value) return {
@@ -13998,6 +12793,13 @@ var _sfc_main$33 = {
 				isSubmittingReply.value = true;
 				commentSaveFailure.value = "";
 				try {
+					const session = commentReplySessions.get(commentsStore);
+					const draftRevision = replyDraftRevision;
+					const editorOwner = captureCommentEditorOwner();
+					const threadId = props.comment.commentId;
+					const fileId = props.comment.fileId;
+					const pendingDraft = pendingComment.value;
+					const edit = editingCommentId.value;
 					const parentCommentId = getV2ExistingReplyParentId(props.comment);
 					const trackedChangeTarget = getV2TrackedChangeCommentTarget(props.comment);
 					const outcome = await commentsStore.replyCommentV2({
@@ -14012,6 +12814,8 @@ var _sfc_main$33 = {
 						require__plugin_vue_export_helper.nextTick(() => emit("resize"));
 						return outcome;
 					}
+					if (session?.owner !== replySessionOwner || commentReplySessions.get(commentsStore) !== session || replyDraftRevision !== draftRevision || !editorOwner.isCurrent() || props.comment.commentId !== threadId || props.comment.fileId !== fileId || pendingComment.value !== pendingDraft || editingCommentId.value !== edit || !isDialogActive.value || !isReplying.value) return outcome;
+					retireOwnReplySession();
 					isReplying.value = false;
 					currentCommentText.value = "";
 					currentCommentMentions.value = [];
@@ -14358,10 +13162,8 @@ var _sfc_main$33 = {
 				const session = commentEditSessions.get(commentsStore);
 				const submission = Symbol("comment-edit-submission");
 				if (session?.owner === editSessionOwner) session.submission = submission;
-				const editor = proxy.$superdoc.activeEditor;
-				const adapter = editor.v2Comments;
-				const documentId = adapter.documentId;
-				const document = editor.doc;
+				const editorOwner = captureCommentEditorOwner();
+				const documentId = editorOwner.adapter.documentId;
 				const thread = props.comment;
 				const draft = currentCommentText.value;
 				const outcome = await commentsStore.editCommentV2({
@@ -14369,7 +13171,7 @@ var _sfc_main$33 = {
 					commentId: comment.commentId,
 					text: draft
 				});
-				if (session?.owner !== editSessionOwner || commentEditSessions.get(commentsStore) !== session || session.submission !== submission || proxy.$superdoc.activeEditor !== editor || editor.v2Comments !== adapter || adapter.documentId !== documentId || editor.doc !== document || props.comment !== thread || editingCommentId.value !== comment.commentId || currentCommentText.value !== draft) return outcome;
+				if (session?.owner !== editSessionOwner || commentEditSessions.get(commentsStore) !== session || session.submission !== submission || !editorOwner.isCurrent() || editorOwner.adapter.documentId !== documentId || props.comment !== thread || editingCommentId.value !== comment.commentId || currentCommentText.value !== draft) return outcome;
 				if (!outcome?.ok) {
 					commentSaveFailure.value = commentSaveFailureMessage(outcome);
 					return outcome;
@@ -14408,6 +13210,7 @@ var _sfc_main$33 = {
 		const handleCancel = (comment) => {
 			commentSaveFailure.value = "";
 			retireOwnEditSession();
+			retireOwnReplySession();
 			editingCommentId.value = null;
 			isReplying.value = false;
 			cancelComment(proxy.$superdoc);
@@ -14434,6 +13237,7 @@ var _sfc_main$33 = {
 		});
 		require__plugin_vue_export_helper.onBeforeUnmount(() => {
 			retireOwnEditSession();
+			retireOwnReplySession();
 			proxy.$superdoc?.off?.("active-editor-change", refreshActiveEditor);
 		});
 		require__plugin_vue_export_helper.watch(showInputSection, (isVisible) => {
@@ -14685,7 +13489,7 @@ var _sfc_main$33 = {
 		};
 	}
 };
-var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-f8b79c74"]]);
+var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-239e0310"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$25 = [
@@ -15337,6 +14141,25 @@ function useViewportFit({ getSuperdoc, superdocContainerWidth, isReady, activeZo
 	return { evaluateViewport };
 }
 //#endregion
+//#region src/composables/use-high-contrast-mode.ts
+var HIGH_CONTRAST_MODE_KEY = Symbol("superdoc-high-contrast-mode");
+function createHighContrastMode() {
+	const isHighContrastMode = require__plugin_vue_export_helper.ref(false);
+	return {
+		isHighContrastMode,
+		setHighContrastMode: (value) => {
+			isHighContrastMode.value = value;
+		}
+	};
+}
+var HIGH_CONTRAST_OFF = {
+	isHighContrastMode: require__plugin_vue_export_helper.readonly(require__plugin_vue_export_helper.ref(false)),
+	setHighContrastMode: () => {}
+};
+function useHighContrastMode() {
+	return require__plugin_vue_export_helper.inject(HIGH_CONTRAST_MODE_KEY, HIGH_CONTRAST_OFF);
+}
+//#endregion
 //#region ../layout-engine/contracts/src/author-colors.ts
 /**
 * Curated, high-contrast fallback palette. Used when neither `overrides` nor
@@ -17131,15 +15954,15 @@ var collectRemovedCommentIds = (comments, targetIds, isInScope = () => true) =>
 	return removedIds;
 };
 //#endregion
-//#region src/composables/use-high-contrast-mode.js
-var isHighContrastMode = require__plugin_vue_export_helper.ref(false);
-function useHighContrastMode() {
-	const setHighContrastMode = (value) => {
-		isHighContrastMode.value = value;
-	};
+//#region src/composables/use-superdoc-instance.ts
+function useSuperDocInstance() {
+	const instance = require__plugin_vue_export_helper.getCurrentInstance();
+	if (!instance?.proxy) throw new Error("useSuperDocInstance() must be called during a component setup function.");
+	const superdoc = instance.appContext.config.globalProperties.$superdoc;
+	if (!superdoc) throw new Error("useSuperDocInstance() found no SuperDoc registered at app.config.globalProperties.$superdoc.");
 	return {
-		isHighContrastMode,
-		setHighContrastMode
+		proxy: instance.proxy,
+		superdoc
 	};
 }
 var VALID_COMMENTS_LAYOUTS = /* @__PURE__ */ new Set([
@@ -18122,7 +16945,7 @@ function usePasswordPrompt({ getSurfaceManager, getPasswordPromptConfig, onUnhan
 				})
 			});
 		} else {
-			const PasswordPromptSurface = (await Promise.resolve().then(() => require("./chunks/PasswordPromptSurface-B5DHV6qr.cjs"))).default;
+			const PasswordPromptSurface = (await Promise.resolve().then(() => require("./chunks/PasswordPromptSurface-BpqP4pUa.cjs"))).default;
 			const surfaceId = `password-prompt-${doc.id}`;
 			handle = manager.open({
 				id: surfaceId,
@@ -18817,7 +17640,7 @@ function useFindReplace({ getSurfaceManager, getActiveEditor, activeEditorRef, g
 			} else {
 				let FindReplaceSurface;
 				try {
-					FindReplaceSurface = (await Promise.resolve().then(() => require("./chunks/FindReplaceSurface-8V8AjgR4.cjs"))).default;
+					FindReplaceSurface = (await Promise.resolve().then(() => require("./chunks/FindReplaceSurface-BRs3JrCq.cjs"))).default;
 				} catch {
 					opening = false;
 					return;
@@ -20812,6 +19635,7 @@ function createV2EditorRuntimeAdapter(options) {
 		}
 		const result = await host.dispatch(mapped);
 		switch (result.status) {
+			case "selected": return { status: "selected" };
 			case "committed":
 				invalidatePositionTokens();
 				return {
@@ -21261,8 +20085,11 @@ function translateRenderReadinessDiagnostic(diag, ctx = {}) {
 	else if (severity === "error") diagnosticCode = "RENDER_ERROR";
 	else return null;
 	const message = reason || code;
+	const error = new Error(typeof diag.error?.message === "string" ? diag.error.message : message);
+	if (typeof diag.error?.name === "string") error.name = diag.error.name;
+	if (typeof diag.error?.stack === "string") error.stack = diag.error.stack;
 	return {
-		error: new Error(message),
+		error,
 		diagnosticCode,
 		diagnosticStage: unusableFurniture ? "parse" : "render",
 		severity,
@@ -22109,7 +20936,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 	__name: "SuperDoc",
 	emits: ["selection-update"],
 	setup(__props, { emit: __emit }) {
-		const PdfViewer = require__plugin_vue_export_helper.defineAsyncComponent(() => Promise.resolve().then(() => require("./chunks/PdfViewer-omriDChK.cjs")));
+		const PdfViewer = require__plugin_vue_export_helper.defineAsyncComponent(() => Promise.resolve().then(() => require("./chunks/PdfViewer-Cg072l5d.cjs")));
 		const getDocumentLoadPassword = (doc) => doc.password ?? proxy.$superdoc.config.password;
 		const resolveDocumentV2Collaboration = (doc) => {
 			const rawConfig = doc?.v2Collaboration;
@@ -22155,10 +20982,10 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			}
 		});
 		const { getConfig, documentsWithConverations, commentsList, pendingComment, activeComment, skipSelectionUpdate, commentsByDocument, isCommentsListVisible, isFloatingCommentsReady, generalCommentIds, hasSyncedCollaborationComments, editorCommentPositions, hasInitializedLocations, isCommentHighlighted, hasOpenTrackedChanges } = storeToRefs(commentsStore);
-		const { showAddComment, handleEditorLocationsUpdate, handleTrackedChangeUpdate, refreshTrackedChangeCommentsByIds, syncTrackedChangePositionsWithDocument, syncTrackedChangeComments, addComment, addHydratedComment, getComment, resolveCommentPositionEntry, belongsToDocument, COMMENT_EVENTS, requestInstantSidebarAlignment, peekInstantSidebarAlignment, clearInstantSidebarAlignment } = commentsStore;
-		const { proxy } = require__plugin_vue_export_helper.getCurrentInstance();
+		const { showAddComment, handleEditorLocationsUpdate, handleTrackedChangeUpdate, addComment, addHydratedComment, getComment, resolveCommentPositionEntry, belongsToDocument, COMMENT_EVENTS, requestInstantSidebarAlignment, peekInstantSidebarAlignment, clearInstantSidebarAlignment } = commentsStore;
+		const { proxy, superdoc } = useSuperDocInstance();
 		commentsStore.proxy = proxy;
-		const documentOpenTelemetry = createDocumentOpenTelemetry(proxy.$superdoc.config);
+		const documentOpenTelemetry = createDocumentOpenTelemetry(superdoc.config);
 		const resolvedEditorIntegration = createDefaultV2Integration();
 		const V2DocumentEditor = require__plugin_vue_export_helper.markRaw(resolvedEditorIntegration.EditorComponent);
 		const V2Ruler = resolvedEditorIntegration.RulerComponent ? require__plugin_vue_export_helper.markRaw(resolvedEditorIntegration.RulerComponent) : null;
@@ -22207,7 +21034,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		const layers = require__plugin_vue_export_helper.ref(null);
 		const rightSidebarRef = require__plugin_vue_export_helper.ref(null);
 		const pdfViewerRef = require__plugin_vue_export_helper.ref(null);
-		const pendingReplayTrackedChangeSync = require__plugin_vue_export_helper.ref(false);
 		const toolsMenuPosition = require__plugin_vue_export_helper.reactive({
 			top: null,
 			right: "-25px",
@@ -22269,21 +21095,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				});
 			}
 		});
-		const pdfConfig = proxy.$superdoc.config.modules?.pdf || {};
-		const flushPendingReplayTrackedChangeSync = () => {
-			if (!pendingReplayTrackedChangeSync.value) return;
-			pendingReplayTrackedChangeSync.value = false;
-			syncTrackedChangeComments({
-				superdoc: proxy.$superdoc,
-				editor: proxy.$superdoc?.activeEditor
-			});
-		};
-		const scheduleReplayTrackedChangeSync = () => {
-			pendingReplayTrackedChangeSync.value = true;
-			require__plugin_vue_export_helper.nextTick(() => {
-				flushPendingReplayTrackedChangeSync();
-			});
-		};
+		const pdfConfig = superdoc.config.modules?.pdf || {};
 		const handleDocumentReady = (documentId, container) => {
 			const doc = getDocument(documentId);
 			if (!doc || doc.loadScope && !doc.loadScope.finish()) return;
@@ -23283,7 +22095,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			v2PageMetricsSnapshot.value = null;
 			const clearedDocumentId = payload?.documentId == null ? null : String(payload.documentId);
 			clearV2MutationRejectionNotifications(clearedDocumentId);
-			commentsStore.cancelImportedTrackedChangeBootstrap?.(clearedDocumentId ?? void 0);
 			if (clearedDocumentId) v2MountStagesByDocumentId.delete(clearedDocumentId);
 			if (latestV2MountStage && (clearedDocumentId == null || latestV2MountStage.dataset?.superdocV2DocumentId === clearedDocumentId)) latestV2MountStage = null;
 			v2ReviewWindowController.reset("render-cleared");
@@ -23299,7 +22110,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				...event,
 				documentId: document?.id ?? null
 			}));
-			if (event.type === "mutation:committed" && event.origin === "extension") return;
+			if (event.type === "mutation:committed" && event.dryRun) return;
 			const documentId = document?.id ?? null;
 			if (event.type === "history:changed" && event.state) {
 				proxy.$superdoc.emit("history-change", {
@@ -23363,7 +22174,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			if (event.type === "mutation:committed") {
 				const bulkDecisionEvent = toV2BulkDecisionEvent(documentId, event.trackedChangeBulkDecision);
 				if (bulkDecisionEvent) proxy.$superdoc.emit("tracked-changes:bulk-decision", bulkDecisionEvent);
-				emitV2EditorUpdate();
+				if (require_create_super_doc_ui.mutationCommittedEventChangedDocument(event)) emitV2EditorUpdate();
 			}
 			if (event.type !== "mutation:committed") return;
 			if (event.origin === "history") v2ReviewWindowController.refreshCommittedWindow(`history-${event.direction}`);
@@ -23463,6 +22274,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				case "collaboration-room-corrupt": return "SuperDoc v2 found a structurally invalid collaboration room. No changes were made.";
 				case "collaboration-v2-room-missing": return "SuperDoc v2 could not find a committed v2 collaboration room. No changes were made. Use roomMode: \"create\" only when creating a new room.";
 				case "collaboration-v2-room-already-exists": return "SuperDoc v2 was asked to create a collaboration room that already exists. Use roomMode: \"join\" to open it.";
+				case "collaboration-session-invalidated": return "This collaboration session is no longer current. Please reopen the shared document with roomMode: \"join\".";
 				case "collaboration-v2-room-initializing": return "The SuperDoc v2 collaboration room has not completed initialization. This open attempt did not modify it.";
 				case "collaboration-v2-room-bootstrap-stalled": return "The SuperDoc v2 collaboration room bootstrap appears stalled. This open attempt did not modify it. Preserve the room data if a create retry cannot recover it.";
 				case "collaboration-open-intent-invalid": return "SuperDoc v2 received an invalid collaboration room mode. No provider was connected.";
@@ -23473,10 +22285,17 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 		const normalizeV2EditorFailureDetail = (detail) => typeof detail === "string" && detail.trim().length > 0 ? detail.trim() : null;
 		const onV2EditorFailed = (payload) => {
 			documents.value.find((doc) => doc.id === payload?.documentId)?.loadScope?.finish();
-			clearActiveV2EditorFacade(payload?.documentId ?? null);
 			const reason = typeof payload?.reason === "string" && payload.reason.length > 0 ? payload.reason : "open-failed";
 			const detail = normalizeV2EditorFailureDetail(payload?.detail);
 			const documentId = typeof payload?.documentId === "string" && payload.documentId.length > 0 ? payload.documentId : null;
+			const retiredDocument = reason === "collaboration-session-invalidated" && documentId ? getDocument(documentId) : null;
+			const retiredExporter = retiredDocument?.getEditor?.();
+			clearActiveV2EditorFacade(payload?.documentId ?? null);
+			if (retiredExporter?.editorVersion === 2 && typeof retiredExporter.exportDocx === "function") {
+				retiredDocument.isReady = false;
+				if (v2Runtimes.has(documentId)) clearV2RuntimeRegistration(documentId);
+				retiredDocument.setEditor?.(retiredExporter);
+			}
 			if (reason === "worker-transport-failed") {
 				proxy.$superdoc.emit("exception", {
 					error: /* @__PURE__ */ new Error("Worker transport failed."),
@@ -23503,7 +22322,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 				...workerFailure ? { workerFailure } : {},
 				reason
 			};
-			if (reason === "collaboration-v1-config-unsupported" || reason === "collaboration-room-format-unsupported" || reason === "collaboration-room-format-conflict" || reason === "collaboration-room-corrupt" || reason === "collaboration-v2-room-missing" || reason === "collaboration-v2-room-already-exists" || reason === "collaboration-v2-room-initializing" || reason === "collaboration-v2-room-bootstrap-stalled" || reason === "collaboration-open-intent-invalid" || reason === "collaboration-config-invalid") console.warn(`[SuperDoc] ${message}`, logContext);
+			if (reason === "collaboration-v1-config-unsupported" || reason === "collaboration-room-format-unsupported" || reason === "collaboration-room-format-conflict" || reason === "collaboration-room-corrupt" || reason === "collaboration-v2-room-missing" || reason === "collaboration-v2-room-already-exists" || reason === "collaboration-session-invalidated" || reason === "collaboration-v2-room-initializing" || reason === "collaboration-v2-room-bootstrap-stalled" || reason === "collaboration-open-intent-invalid" || reason === "collaboration-config-invalid") console.warn(`[SuperDoc] ${message}`, logContext);
 			else console.error(`[SuperDoc] ${message}`, logContext);
 			proxy.$superdoc.emit("exception", collaborationException && reason !== "collaboration-config-invalid" ? collaborationException : {
 				error: new Error(message),
@@ -23809,7 +22628,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 					existingComment: null
 				};
 			};
-			if (type === "replayCompleted") scheduleReplayTrackedChangeSync();
 			if (COMMENT_EVENTS?.ADD && type === COMMENT_EVENTS.ADD && commentPayload) {
 				commentPayload = normalizeReplayCommentModelPayload(commentPayload);
 				const currentUser = proxy.$superdoc?.user;
@@ -24118,7 +22936,6 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			handleFormattingMarksShortcut(e);
 		}
 		require__plugin_vue_export_helper.onBeforeUnmount(() => {
-			commentsStore.cancelImportedTrackedChangeBootstrap?.();
 			passwordPrompt.destroy();
 			findReplace.destroy();
 			linkPopover.destroy();
@@ -24734,7 +23551,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 46, _hoisted_1$17);
 		};
 	}
-}, [["__scopeId", "data-v-f2db957f"]]);
+}, [["__scopeId", "data-v-ba00d895"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -24936,29 +23753,28 @@ var setPiniaDevtoolsSuppressedForApp = (app, isSuppressed) => {
 * @property {import('pinia').Pinia} pinia The Pinia store instance attached to `app`
 * @property {ReturnType<typeof useSuperdocStore>} superdocStore The SuperDoc Pinia store
 * @property {ReturnType<typeof useCommentsStore>} commentsStore The Comments Pinia store
-* @property {ReturnType<typeof useHighContrastMode>} highContrastModeStore The high-contrast mode composable refs (`isHighContrastMode`, `setHighContrastMode`). Named `*Store` for historical reasons; this is a plain Vue composable, not a Pinia store.
 */
 /**
 * Generate the superdoc vue app
 *
-* @param {Object} [options]
+* @param {Object} options
 * @param {boolean} [options.disablePiniaDevtools=false] Disable Pinia devtools registration for this app instance
-* @returns {SuperdocVueAppRefs} An object containing the vue app, the pinia reference, the superdoc/comments Pinia stores, and the high-contrast mode composable
+* @param {import('../composables/use-high-contrast-mode').HighContrastMode} options.highContrastMode The owning SuperDoc's high-contrast state, provided to the app
+* @returns {SuperdocVueAppRefs} An object containing the vue app, the pinia reference, and the superdoc/comments Pinia stores
 */
-var createSuperdocVueApp = ({ disablePiniaDevtools = false } = {}) => {
+var createSuperdocVueApp = ({ disablePiniaDevtools = false, highContrastMode }) => {
 	const app = require__plugin_vue_export_helper.createApp(SuperDoc_default);
 	const pinia = createPinia();
 	const cleanupPiniaDevtoolsSuppression = setPiniaDevtoolsSuppressedForApp(app, disablePiniaDevtools);
 	let superdocStore;
 	let commentsStore;
-	let highContrastModeStore;
 	try {
 		app.use(pinia);
 		if (disablePiniaDevtools) purgeDevtoolsPluginQueueForApp(app);
 		app.directive("click-outside", v_click_outside_default);
 		superdocStore = useSuperdocStore();
 		commentsStore = useCommentsStore();
-		highContrastModeStore = useHighContrastMode();
+		app.provide(HIGH_CONTRAST_MODE_KEY, highContrastMode);
 	} catch (error) {
 		cleanupPiniaDevtoolsSuppression();
 		throw error;
@@ -24974,8 +23790,7 @@ var createSuperdocVueApp = ({ disablePiniaDevtools = false } = {}) => {
 		app,
 		pinia,
 		superdocStore,
-		commentsStore,
-		highContrastModeStore
+		commentsStore
 	};
 };
 //#endregion
@@ -38853,6 +37668,69 @@ var EditorRuntimeRegistry = class {
 		} catch {}
 	}
 };
+//#endregion
+//#region src/internal/toolbar/compatibility-catalog.ts
+/**
+* Internal built-in toolbar compatibility catalog (V2 toolbar parity, phase 1).
+*
+* This module is the SINGLE place the legacy built-in toolbar item names (the
+* ids v1 toolbars, `modules.toolbar.groups`, and the docs use) are mapped onto
+* the V2 world. Later renderers, the toolbar authority, and any proof helper
+* consume this catalog instead of rediscovering the mapping ad hoc.
+*
+* It does NOT re-implement command routing. The V2 command controller catalog
+* in `../../public/ui/commands.ts` stays the single source of truth for how a
+* command is backed; every `controller-routed` entry here points at a canonical
+* command id that must exist there (enforced by `assertCatalogAlignedWithController`).
+*
+* Every documented built-in item is classified into exactly one disposition:
+*
+*   - `controller-routed` → driven by the V2 command controller (a routed
+*     command id in `COMMAND_CATALOG`).
+*   - `host-routed` → driven by a public `SuperDoc`-instance method the built-in
+*     shell owns directly (e.g. formatting-marks toggle), not by the controller
+*     command set.
+*   - `shell-owned` → pure rendered-shell chrome/config the built-in toolbar
+*     owns (custom buttons, layout groups). Has no command and no document
+*     effect of its own.
+*   - `unsupported` → documented built-in item that is explicitly out of V2
+*     functional parity (a signed product decision). The controller command (if
+*     any) fails closed with `command-unsupported`; the docs do not call it
+*     supported.
+*   - `unresolved` → documented today but with no identified public V2 surface
+*     yet. Recorded explicitly so later phases close it deliberately rather than
+*     pretending it already works.
+*
+* Nothing here reintroduces a public `headless-toolbar*` export; the catalog is
+* internal to the `superdoc` package.
+*/
+var TABLE_ACTION_COMMAND_IDS_BY_OPTION = {
+	addRowBefore: "table-add-row-before",
+	addRowAfter: "table-add-row-after",
+	deleteRow: "table-delete-row",
+	addColumnBefore: "table-add-column-before",
+	addColumnAfter: "table-add-column-after",
+	deleteColumn: "table-delete-column",
+	deleteTable: "table-delete",
+	deleteCellAndTableBorders: "table-remove-borders",
+	mergeCells: "table-merge-cells",
+	splitCell: "table-split-cell",
+	fixTables: "table-fix"
+};
+var TABLE_ACTION_COMMAND_IDS = Object.values(TABLE_ACTION_COMMAND_IDS_BY_OPTION);
+function tableActionCommandId(option) {
+	return TABLE_ACTION_COMMAND_IDS_BY_OPTION[option];
+}
+/**
+* Member controller command ids the legacy `tableActions` dropdown fans out
+* into. These are real V2 `tables.*` operations now routed through the shared
+* table-context facade (`ui.tables` / `host.getTableContext()`): each is a
+* `routed` controller command that enables when a table context is resolvable
+* and fails closed with `table-context-unavailable` otherwise. The dropdown
+* itself is shell chrome; its members are controller-routed.
+*/
+var ROUTED_TABLE_ACTION_COMMAND_IDS = TABLE_ACTION_COMMAND_IDS.filter((commandId) => require_create_super_doc_ui.getCommandDescriptor(commandId)?.disposition === "routed");
+var UNCATALOGED_ITEM_COMMAND_IDS = { tableOfContents: "table-of-contents-insert" };
 /**
 * The built-in toolbar compatibility catalog. Order groups items the way the
 * docs present them; it is documentation-only.
@@ -39024,18 +37902,7 @@ var BUILT_IN_TOOLBAR_CATALOG = [
 		instanceMethod: null,
 		disposition: "shell-owned",
 		group: "center",
-		memberCommandIds: [
-			"table-add-row-before",
-			"table-add-row-after",
-			"table-delete-row",
-			"table-add-column-before",
-			"table-add-column-after",
-			"table-delete-column",
-			"table-delete",
-			"table-merge-cells",
-			"table-split-cell",
-			"table-remove-borders"
-		],
+		memberCommandIds: ROUTED_TABLE_ACTION_COMMAND_IDS,
 		note: "table editing dropdown is shell chrome; its member commands are controller-routed through the shared table-context facade (ui.tables / host.getTableContext()) and fail closed with table-context-unavailable when the caret is not in a table"
 	},
 	{
@@ -39135,6 +38002,9 @@ function resolveToolbarCommandId(name) {
 	const entry = CATALOG_BY_NAME.get(name);
 	return entry?.disposition === "controller-routed" ? entry.commandId : null;
 }
+function resolveBuiltInItemCommandId(name) {
+	return resolveToolbarCommandId(name) ?? UNCATALOGED_ITEM_COMMAND_IDS[name] ?? null;
+}
 //#endregion
 //#region src/internal/toolbar/built-in/helpers.js
 var sanitizeNumber = (value, defaultNumber) => {
@@ -41633,54 +40503,6 @@ var RESPONSIVE_BREAKPOINTS = {
 	lg: 1280,
 	xl: 1410
 };
-var HEADLESS_ITEM_MAP = {
-	undo: "undo",
-	redo: "redo",
-	bold: "bold",
-	italic: "italic",
-	underline: "underline",
-	strike: "strikethrough",
-	acceptTrackedChangeBySelection: "track-changes-accept-selection",
-	rejectTrackedChangeOnSelection: "track-changes-reject-selection",
-	ruler: "ruler",
-	formattingMarks: "formatting-marks",
-	zoom: "zoom",
-	measurementUnit: "measurement-unit",
-	documentMode: "document-mode",
-	link: "link",
-	fontFamily: "font-family",
-	fontSize: "font-size",
-	list: "bullet-list",
-	numberedlist: "numbered-list",
-	table: "table-insert",
-	image: "image",
-	tableOfContents: "table-of-contents-insert",
-	color: "text-color",
-	highlight: "highlight-color",
-	textAlign: "text-align",
-	lineHeight: "line-height",
-	linkedStyles: "linked-style",
-	indentleft: "indent-decrease",
-	indentright: "indent-increase",
-	directionLtr: "direction-ltr",
-	directionRtl: "direction-rtl",
-	clearFormatting: "clear-formatting",
-	copyFormat: "copy-format"
-};
-var TABLE_ACTION_COMMAND_MAP = {
-	addRowBefore: "table-add-row-before",
-	addRowAfter: "table-add-row-after",
-	deleteRow: "table-delete-row",
-	addColumnBefore: "table-add-column-before",
-	addColumnAfter: "table-add-column-after",
-	deleteColumn: "table-delete-column",
-	deleteTable: "table-delete",
-	deleteCellAndTableBorders: "table-remove-borders",
-	mergeCells: "table-merge-cells",
-	splitCell: "table-split-cell",
-	fixTables: "table-fix"
-};
-var TABLE_ACTION_COMMAND_IDS = Object.values(TABLE_ACTION_COMMAND_MAP);
 //#endregion
 //#region src/internal/toolbar/built-in/Toolbar.vue
 var _hoisted_1$10 = ["data-superdoc-ui-owner"];
@@ -43132,6 +41954,7 @@ var TableGrid_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_
 //#region src/internal/toolbar/built-in/TableActions.vue
 var _hoisted_1$1 = { class: "toolbar-table-actions" };
 var _hoisted_2$1 = [
+	"aria-disabled",
 	"onClick",
 	"data-item",
 	"ariaLabel"
@@ -43146,12 +41969,17 @@ var _sfc_main$1 = {
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
 		const handleClick = (item) => {
+			if (item.disabled) return;
 			emit("select", { command: item.command });
 		};
 		return (_ctx, _cache) => {
 			return require__plugin_vue_export_helper.openBlock(), require__plugin_vue_export_helper.createElementBlock("div", _hoisted_1$1, [(require__plugin_vue_export_helper.openBlock(true), require__plugin_vue_export_helper.createElementBlock(require__plugin_vue_export_helper.Fragment, null, require__plugin_vue_export_helper.renderList(__props.options, (option) => {
 				return require__plugin_vue_export_helper.openBlock(), require__plugin_vue_export_helper.createElementBlock("div", {
-					class: require__plugin_vue_export_helper.normalizeClass(["toolbar-table-actions__item", { "toolbar-table-actions__item--border": option.bottomBorder }]),
+					class: require__plugin_vue_export_helper.normalizeClass(["toolbar-table-actions__item", {
+						"toolbar-table-actions__item--border": option.bottomBorder,
+						"sd-disabled": option.disabled
+					}]),
+					"aria-disabled": option.disabled ? "true" : void 0,
 					onClick: ($event) => handleClick(option),
 					"data-item": option.props?.["data-item"] || "",
 					ariaLabel: option.props?.ariaLabel,
@@ -43164,7 +41992,7 @@ var _sfc_main$1 = {
 		};
 	}
 };
-var TableActions_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$1, [["__scopeId", "data-v-0cdad084"]]);
+var TableActions_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$1, [["__scopeId", "data-v-72123aae"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/PageNumberMenu.vue
 var _hoisted_1 = ["aria-busy"];
@@ -44279,7 +43107,10 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons, toolbarTexts, toolbarFonts
 	];
 	function renderTableActions(tableActionsItem) {
 		return require__plugin_vue_export_helper.h(TableActions_default, {
-			options: tableActionsOptions,
+			options: tableActionsOptions.map((option) => ({
+				...option,
+				disabled: !superToolbar.isCommandEnabled(tableActionCommandId(option.command))
+			})),
 			onSelect: (event) => {
 				closeDropdown(tableActionsItem);
 				const { command } = event;
@@ -45054,8 +43885,6 @@ var findElementBySelector = (selector) => {
 * Internal only: nothing here is a public package export and no
 * `headless-toolbar*` subpath is reintroduced.
 */
-var HEADLESS_COMMAND_IDS = HEADLESS_ITEM_MAP;
-var TABLE_ACTION_COMMANDS = TABLE_ACTION_COMMAND_MAP;
 function isThenable(value) {
 	return (typeof value === "object" || typeof value === "function") && value !== null && "then" in value && typeof value.then === "function";
 }
@@ -45071,15 +43900,6 @@ function isListenerTarget(value) {
 function hasClosest(target) {
 	return target !== null && "closest" in target && typeof target.closest === "function";
 }
-/**
-* Resolve a legacy built-in item name to its canonical V2 controller command
-* id. The compatibility catalog is the primary truth; a small supplemental map
-* (`HEADLESS_ITEM_MAP`) covers documented items the renderer can surface that
-* are not modeled as catalog rows yet (e.g. table-of-contents, direction).
-*/
-function resolveCommandId(name) {
-	return resolveToolbarCommandId(name) ?? HEADLESS_COMMAND_IDS[name] ?? null;
-}
 function executeCommand(ui, commandId, argument, options = {}) {
 	if (!ui?.commands || !commandId) return false;
 	if (typeof ui.commands.has === "function" && !ui.commands.has(commandId)) return false;
@@ -45161,7 +43981,8 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 	#groupItems;
 	#highlightOptions;
 	#painterListenersDetach;
-	constructor(config = {}) {
+	#highContrastMode;
+	constructor(config) {
 		super();
 		this.config = {
 			selector: null,
@@ -45203,6 +44024,7 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 			this.#makeToolbarItems();
 			this.updateToolbarState();
 		};
+		this.#highContrastMode = config.highContrastMode;
 		this.config = {
 			...this.config,
 			...config
@@ -45267,6 +44089,7 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 			this.app = require__plugin_vue_export_helper.createApp(Toolbar_default);
 			this.app.directive("click-outside", v_click_outside_default);
 			this.app.config.globalProperties.$toolbar = this;
+			this.app.provide(HIGH_CONTRAST_MODE_KEY, this.#highContrastMode);
 			this.toolbar = this.app.mount(this.toolbarContainer);
 			this.updateToolbarState();
 		} catch (error) {
@@ -45600,18 +44423,22 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 	#isFontFamilyMixedState(commandState) {
 		return Boolean(commandState) && commandState?.disabled === false && commandState?.value == null;
 	}
+	isCommandEnabled(commandId) {
+		if (!commandId) return false;
+		const commandState = this.snapshot?.commands?.[commandId];
+		return Boolean(commandState && !commandState.disabled);
+	}
 	#applyHeadlessState(item) {
 		const name = item.name.value;
 		if (item.isCustomToolbarItem && typeof item.command === "string") {
 			const commandState = this.snapshot?.commands?.[item.command];
-			item.setDisabled(item.initiallyDisabled || !commandState || Boolean(commandState.disabled));
+			item.setDisabled(item.initiallyDisabled || !this.isCommandEnabled(item.command));
 			if (commandState?.active) item.activate();
 			else item.deactivate();
 			return true;
 		}
 		if (name === "tableActions") {
-			const hasAnyEnabled = TABLE_ACTION_COMMAND_IDS.map((commandId) => this.snapshot?.commands?.[commandId]).some((state) => state && !state.disabled);
-			item.setDisabled(!hasAnyEnabled);
+			item.setDisabled(!TABLE_ACTION_COMMAND_IDS.some((commandId) => this.isCommandEnabled(commandId)));
 			return true;
 		}
 		if (name === "search") {
@@ -45630,7 +44457,7 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 			else item.deactivate();
 			return true;
 		}
-		const commandId = resolveCommandId(name);
+		const commandId = resolveBuiltInItemCommandId(name);
 		if (!commandId) return false;
 		const commandState = this.snapshot?.commands?.[commandId];
 		if (shouldKeepEnabledForV1ToolbarParity(name, commandState)) item.setDisabled(false);
@@ -45795,12 +44622,12 @@ var BuiltInToolbar = class extends require_eventemitter3.import_eventemitter3.de
 		if (name === "image" && argument == null) return this.#startImagePick();
 		if (name === "tableActions") {
 			const tableAction = typeof argument === "object" && argument !== null && "command" in argument ? argument.command : void 0;
-			const commandId = typeof tableAction === "string" ? TABLE_ACTION_COMMANDS[tableAction] : void 0;
+			const commandId = typeof tableAction === "string" ? tableActionCommandId(tableAction) : void 0;
 			if (!commandId) return false;
 			return executeCommand(this.ui, commandId, void 0, callbacks);
 		}
 		if (getBuiltInToolbarItem(name)?.disposition === "unsupported") return true;
-		const commandId = resolveCommandId(name);
+		const commandId = resolveBuiltInItemCommandId(name);
 		if (!commandId) return false;
 		return executeCommand(this.ui, commandId, argument, callbacks);
 	}
@@ -46237,6 +45064,10 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		return this.#surfacesConfig;
 	}
 	#surfaceManager;
+	/**
+	* @private
+	*/
+	#highContrastMode;
 	#sourceLifecycleReady;
 	#pendingSourceLifecycle;
 	/**
@@ -46310,6 +45141,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.users = [];
 		this.whiteboard = null;
 		this.colors = [];
+		this.#highContrastMode = createHighContrastMode();
 		this.readyEditors = 0;
 		this.#sourceLifecycleReady = false;
 		this.#pendingSourceLifecycle = [];
@@ -46466,7 +45298,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.28.0-next.8";
+		this.version = "2.28.0";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];
@@ -46766,7 +45598,10 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		});
 	}
 	#initVueApp() {
-		const { app, pinia, superdocStore, commentsStore, highContrastModeStore } = createSuperdocVueApp({ disablePiniaDevtools: Boolean(this.config.disablePiniaDevtools) });
+		const { app, pinia, superdocStore, commentsStore } = createSuperdocVueApp({
+			disablePiniaDevtools: Boolean(this.config.disablePiniaDevtools),
+			highContrastMode: this.#highContrastMode
+		});
 		this.app = app;
 		this.pinia = pinia;
 		this.app.config.globalProperties.$config = this.config;
@@ -46775,7 +45610,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.app.provide("surfaceManager", this.#surfaceManager);
 		this.superdocStore = superdocStore;
 		this.commentsStore = commentsStore;
-		this.highContrastModeStore = highContrastModeStore;
 		if (typeof this.superdocStore.setExceptionHandler === "function") this.superdocStore.setExceptionHandler((payload) => this.emit("exception", payload));
 		this.superdocStore.init(this.config);
 		const commentsModuleConfig = this.config.modules.comments;
@@ -47173,7 +46007,8 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			roomMode: target.roomMode,
 			...syncTimeoutOption,
 			...target.publicApiKey ? { publicApiKey: target.publicApiKey } : {},
-			...target.authEndpoint ? { authEndpoint: target.authEndpoint } : {}
+			...target.authEndpoint ? { authEndpoint: target.authEndpoint } : {},
+			...target.baseUrl ? { baseUrl: target.baseUrl } : {}
 		};
 		if (target.providerFamily === "hocuspocus") return {
 			providerType: "hocuspocus",
@@ -47879,7 +46714,8 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 				toolbarGroups: toolbarUi.options.toolbarGroups,
 				icons: toolbarUi.options.icons,
 				texts: toolbarUi.options.texts,
-				uiDisplayFallbackFont: this.config.uiDisplayFallbackFont
+				uiDisplayFallbackFont: this.config.uiDisplayFallbackFont,
+				highContrastMode: this.#highContrastMode
 			});
 		} catch (error) {
 			console.warn("[SuperDoc] built-in toolbar mount failed", error);
@@ -48489,23 +47325,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 				confirmed
 			};
 		}
-		const legacyReplaceFile = activeEditor && !isV2ActiveEditorFacade(activeEditor) ? activeEditor.replaceFile : null;
-		if (typeof legacyReplaceFile === "function") {
-			const result = await legacyReplaceFile.call(activeEditor, source);
-			const legacyState = result && typeof result === "object" ? result.state : void 0;
-			const legacyConfirmed = legacyState === void 0 || legacyState === null || legacyState === "review-ready" || legacyState === "editing-ready";
-			if (legacyConfirmed) {
-				this.#replaceActiveDocumentData(activeEditor, source);
-				this.emit("document-replaced", {
-					editor: activeEditor,
-					host: activeEditor?.host
-				});
-			}
-			return {
-				raw: result,
-				confirmed: legacyConfirmed
-			};
-		}
 		throw new Error("SuperDoc: replaceFile is unavailable for the active editor");
 	}
 	/**
@@ -48518,19 +47337,6 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			commentsType,
 			isFinalDoc
 		});
-		const uiStoreHydrated = this.config?.modules?.comments !== false;
-		let legacyComments;
-		let legacyCommentsComputed = false;
-		const getLegacyCommentsForV1 = () => {
-			if (legacyCommentsComputed) return legacyComments;
-			legacyCommentsComputed = true;
-			if (commentsType === "clean") legacyComments = [];
-			else if (uiStoreHydrated && this.commentsStore && typeof this.commentsStore.translateCommentsForExport === "function") {
-				legacyComments = this.commentsStore.translateCommentsForExport();
-				if (!Array.isArray(legacyComments)) legacyComments = [];
-			}
-			return legacyComments;
-		};
 		const bridgedExportErrors = /* @__PURE__ */ new WeakSet();
 		const rememberBridgedExportError = (payload) => {
 			if ("editor" in payload && payload.error && typeof payload.error === "object") bridgedExportErrors.add(payload.error);
@@ -48541,7 +47347,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 			if (policies !== void 0 && documents.some((doc) => {
 				if (doc.type !== "application/vnd.openxmlformats-officedocument.wordprocessingml.document") return false;
 				const editor = doc.getEditor?.();
-				return editor?.editorVersion !== 2 || typeof editor.exportDocx !== "function";
+				return !isV2ActiveEditorFacade(editor) || typeof editor.exportDocx !== "function";
 			})) throw new Error("Independent DOCX export policies require a mounted V2 exporter for every document.");
 			const docxPromises = documents.map(async (doc) => {
 				if (!doc || doc.type !== "application/vnd.openxmlformats-officedocument.wordprocessingml.document") return null;
@@ -48554,19 +47360,13 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 					if (isDocumentByteSource(doc.data)) return this.#savedDocxToBlob(doc.data);
 					return null;
 				};
-				if (!editor || typeof editor.exportDocx !== "function") return fallbackDocx();
-				const isV2Editor = editor.editorVersion === 2;
+				if (!isV2ActiveEditorFacade(editor) || typeof editor.exportDocx !== "function") return fallbackDocx();
 				try {
-					const exported = await editor.exportDocx(isV2Editor ? {
+					const exported = await editor.exportDocx({
 						isFinalDoc,
 						commentsType,
 						policies,
 						fieldsHighlightColor
-					} : {
-						isFinalDoc,
-						comments: getLegacyCommentsForV1(),
-						commentsType,
-						fieldsHighlightColor
 					});
 					if (exported) return exported;
 				} catch (error) {
@@ -48580,7 +47380,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 							editor: null
 						}));
 					}
-					if (isV2Editor) throw error;
+					throw error;
 				}
 				return fallbackDocx();
 			});
@@ -48723,7 +47523,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 	setHighContrastMode(isHighContrast) {
 		if (!this.activeEditor) return;
 		this.activeEditor.setHighContrastMode?.(isHighContrast);
-		this.highContrastModeStore?.setHighContrastMode(isHighContrast);
+		this.#highContrastMode.setHighContrastMode(isHighContrast);
 	}
 };
 Object.defineProperty(SuperDoc.prototype.canPerformPermission, Symbol.for("superdoc.internal.permission-method.builtin"), { value: true });