superdoc 2.28.0-next.16 → 2.28.0-next.17

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 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-DfSPIhxs.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-CXdsObDZ.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");
@@ -9,8 +9,6 @@ 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.16";
+		return "2.28.0-next.17";
 	} catch {
 		return "unknown";
 	}
@@ -7604,6 +7602,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();
@@ -8688,9 +8691,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;
@@ -8726,6 +8732,7 @@ var useCommentsStore = defineStore("comments", () => {
 					});
 					return outcome;
 				}
+				const ownsActiveDraftBeforeReconcile = activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance;
 				const reconciled = reconcileCommentsFromV2({
 					superdoc,
 					adapter: v2Adapter,
@@ -8737,14 +8744,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,
@@ -12383,6 +12393,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: {
@@ -12432,9 +12443,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);
@@ -12635,6 +12650,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."}`;
@@ -12645,6 +12665,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(() => {
@@ -12883,6 +12904,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 {
@@ -12897,6 +12927,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({
@@ -12911,6 +12948,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 = [];
@@ -13257,10 +13296,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({
@@ -13268,7 +13305,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;
@@ -13307,6 +13344,7 @@ var _sfc_main$33 = {
 		const handleCancel = (comment) => {
 			commentSaveFailure.value = "";
 			retireOwnEditSession();
+			retireOwnReplySession();
 			editingCommentId.value = null;
 			isReplying.value = false;
 			cancelComment(proxy.$superdoc);
@@ -13333,6 +13371,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) => {
@@ -13584,7 +13623,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 = [
@@ -19711,6 +19750,7 @@ function createV2EditorRuntimeAdapter(options) {
 		}
 		const result = await host.dispatch(mapped);
 		switch (result.status) {
+			case "selected": return { status: "selected" };
 			case "committed":
 				invalidatePositionTokens();
 				return {
@@ -22249,7 +22289,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}`);
@@ -23626,7 +23666,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 46, _hoisted_1$17);
 		};
 	}
-}, [["__scopeId", "data-v-9c1ff6d7"]]);
+}, [["__scopeId", "data-v-2c57eaa1"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -45358,7 +45398,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.28.0-next.16";
+		this.version = "2.28.0-next.17";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];

package/dist/superdoc.es.js

@@ -1,14 +1,12 @@
 import { i as __toESM$2 } from "./chunks/rolldown-runtime-0pSA04fp.es.js";
 import { t as blank_default } from "./chunks/blank-docx-DzQccOlW.es.js";
-import { _ as createInteractionHistory, a as registerFirstPartyCommandMutation, b as recordInteraction, c as applyV2CommentInvalidationFromMutation, d as createImageFilePicker, f as resolveImageSrc, g as closeInteractionHistory, h as DOM_CLASS_NAMES, i as readFirstPartyPageNumbers, l as getV2TrackedChangeMutationImpact, m as isSyntheticTrackedChangeCommentLaneItem, n as executeFirstPartyCommandAsync, o as isRecord, r as executeFirstPartyShortcutAsync, t as createSuperDocUI, u as isPlainObject$1, v as getWorkflowRecording, y as isWorkflowRecordingEnabled } from "./chunks/create-super-doc-ui-J7aMU_wd.es.js";
+import { _ as closeInteractionHistory, a as registerFirstPartyCommandMutation, b as isWorkflowRecordingEnabled, c as applyV2CommentInvalidationFromMutation, d as isPlainObject$1, f as createImageFilePicker, g as DOM_CLASS_NAMES, h as isSyntheticTrackedChangeCommentLaneItem, i as readFirstPartyPageNumbers, l as getV2TrackedChangeMutationImpact, n as executeFirstPartyCommandAsync, o as isRecord, p as resolveImageSrc, r as executeFirstPartyShortcutAsync, t as createSuperDocUI, u as mutationCommittedEventChangedDocument, v as createInteractionHistory, x as recordInteraction, y as getWorkflowRecording } from "./chunks/create-super-doc-ui-CAfcpwSS.es.js";
 import { t as import_eventemitter3 } from "./chunks/eventemitter3-DEIiXiH2.es.js";
 import { t as v4 } from "./chunks/uuid-H0Xcmmhy.es.js";
 import { $ as vModelText, A as onActivated, B as renderSlot, C as isRef$1, D as normalizeClass, E as nextTick, F as openBlock, G as toRaw$2, H as resolveDynamicComponent, I as provide$1, J as unref, K as toRef, L as reactive, M as onDeactivated, N as onMounted, O as normalizeProps, P as onScopeDispose$1, Q as vModelSelect, R as ref, S as isReactive$1, T as mergeProps, U as shallowRef$1, V as resolveDirective, W as toDisplayString, X as useSlots, Y as useAttrs, Z as vModelCheckbox, _ as getCurrentInstance, a as computed$1, b as hasInjectionContext, c as createCommentVNode, d as createStaticVNode, et as watch$1, f as createTextVNode, g as effectScope, h as defineComponent, i as Transition, it as withModifiers, j as onBeforeUnmount, k as normalizeStyle, l as createElementBlock, m as defineAsyncComponent, n as Fragment, nt as withDirectives, o as createApp, p as createVNode, q as toRefs, r as Teleport, rt as withKeys, s as createBlock, t as _plugin_vue_export_helper_default, tt as withCtx, u as createElementVNode, v as getCurrentScope, w as markRaw, x as inject$1, y as h, z as renderList } from "./chunks/_plugin-vue_export-helper-7ZiLY07t.es.js";
 import { a as init_dist$1, i as global, n as init_dist$2, o as Buffer, r as process$1, s as init_dist, t as require_jszip_min } from "./chunks/jszip-BzJ3CyxR.es.js";
 import { t as PDF_TO_CSS_UNITS } from "./chunks/constants-B6VBlmKp.es.js";
 import * as Vue from "vue";
-import "y-websocket";
-import "@hocuspocus/provider";
 import { Map as Map$1 } from "yjs";
 //#region src/core/v2-integration/browser-peer-runtime.js
 var SUPERDOC_V2_BROWSER_RUNTIME_GLOBAL_KEY = "__SUPERDOC_V2_BROWSER_RUNTIME__";
@@ -258,7 +256,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.28.0-next.16";
+		return "2.28.0-next.17";
 	} catch {
 		return "unknown";
 	}
@@ -7602,6 +7600,11 @@ var useCommentsStore = defineStore("comments", () => {
 	const suppressInternalExternal = ref(true);
 	const currentCommentText = ref("");
 	const currentCommentMentions = ref([]);
+	let commentDraftRevision = 0;
+	watch$1([currentCommentText, currentCommentMentions], () => commentDraftRevision++, {
+		deep: true,
+		flush: "sync"
+	});
 	const commentsList = ref([]);
 	const reviewDirectoryList = shallowRef$1([]);
 	let priorTrackedChangeThreadIndex = /* @__PURE__ */ new Map();
@@ -8686,9 +8689,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;
@@ -8724,6 +8730,7 @@ var useCommentsStore = defineStore("comments", () => {
 					});
 					return outcome;
 				}
+				const ownsActiveDraftBeforeReconcile = activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance;
 				const reconciled = reconcileCommentsFromV2({
 					superdoc,
 					adapter: v2Adapter,
@@ -8735,14 +8742,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,
@@ -12376,6 +12386,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 CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 	__name: "CommentDialog",
 	props: {
@@ -12425,9 +12436,13 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		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 = ref(true);
@@ -12628,6 +12643,11 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		const isReplying = ref(false);
 		const isSubmittingReply = ref(false);
 		const isSubmittingNewComment = ref(false);
+		let replyDraftRevision = 0;
+		watch$1([currentCommentText, currentCommentMentions], () => replyDraftRevision++, {
+			deep: true,
+			flush: "sync"
+		});
 		const commentSaveFailure = 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."}`;
@@ -12638,6 +12658,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 				ok: false,
 				reason: v2WriteCapability.value?.reason ?? "v2-write-unavailable"
 			};
+			commentReplySessions.set(commentsStore, { owner: replySessionOwner });
 			commentSaveFailure.value = "";
 			isReplying.value = true;
 			nextTick(() => {
@@ -12876,6 +12897,15 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			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 {
@@ -12890,6 +12920,13 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 				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({
@@ -12904,6 +12941,8 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 						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 = [];
@@ -13250,10 +13289,8 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 				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({
@@ -13261,7 +13298,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					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;
@@ -13300,6 +13337,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		const handleCancel = (comment) => {
 			commentSaveFailure.value = "";
 			retireOwnEditSession();
+			retireOwnReplySession();
 			editingCommentId.value = null;
 			isReplying.value = false;
 			cancelComment(proxy.$superdoc);
@@ -13326,6 +13364,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		});
 		onBeforeUnmount(() => {
 			retireOwnEditSession();
+			retireOwnReplySession();
 			proxy.$superdoc?.off?.("active-editor-change", refreshActiveEditor);
 		});
 		watch$1(showInputSection, (isVisible) => {
@@ -13576,7 +13615,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 64))], 14, _hoisted_1$26)), [[_directive_click_outside, handleClickOutside]]);
 		};
 	}
-}, [["__scopeId", "data-v-f8b79c74"]]);
+}, [["__scopeId", "data-v-239e0310"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$25 = [
@@ -19679,6 +19718,7 @@ function createV2EditorRuntimeAdapter(options) {
 		}
 		const result = await host.dispatch(mapped);
 		switch (result.status) {
+			case "selected": return { status: "selected" };
 			case "committed":
 				invalidatePositionTokens();
 				return {
@@ -22209,7 +22249,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			if (event.type === "mutation:committed") {
 				const bulkDecisionEvent = toV2BulkDecisionEvent(documentId, event.trackedChangeBulkDecision);
 				if (bulkDecisionEvent) proxy.$superdoc.emit("tracked-changes:bulk-decision", bulkDecisionEvent);
-				emitV2EditorUpdate();
+				if (mutationCommittedEventChangedDocument(event)) emitV2EditorUpdate();
 			}
 			if (event.type !== "mutation:committed") return;
 			if (event.origin === "history") v2ReviewWindowController.refreshCommittedWindow(`history-${event.direction}`);
@@ -23586,7 +23626,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 46, _hoisted_1$17);
 		};
 	}
-}, [["__scopeId", "data-v-9c1ff6d7"]]);
+}, [["__scopeId", "data-v-2c57eaa1"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -45286,7 +45326,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.28.0-next.16";
+		this.version = "2.28.0-next.17";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];