superdoc 2.4.0-next.17 → 2.4.0-next.18

package/dist/collaboration-upgrade-engine.cjs

@@ -19,7 +19,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = (0, _superdoc_docx_engine_collaboration_upgrade_engine.getCollaborationUpgradeEngineInfo)();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.4.0-next.17",
+	superdocVersion: "2.4.0-next.18",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/collaboration-upgrade-engine.es.js

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

package/dist/superdoc.cjs

@@ -8562,6 +8562,61 @@ var useCommentsStore = defineStore("comments", () => {
 		syncCommentsToClients(superdoc, event);
 		return Promise.resolve({ ok: true });
 	};
+	const applyV2ThreadLifecycleReceipt = ({ superdoc, documentId, lifecycle } = {}) => {
+		const commentId = normalizeCommentId(lifecycle?.commentId);
+		const status = lifecycle?.status;
+		if (!commentId || status !== "open" && status !== "resolved") return null;
+		const normalizedDocumentId = normalizeCommentId(documentId);
+		const rows = commentsList.value.filter((comment) => {
+			if (!comment || comment.trackedChange === true || isV2SyntheticTrackedChangeRow(comment)) return false;
+			const rowDocumentId = normalizeCommentId(comment.fileId);
+			return normalizedDocumentId == null || rowDocumentId == null || rowDocumentId === normalizedDocumentId;
+		});
+		const byAlias = /* @__PURE__ */ new Map();
+		const childrenByParentAlias = /* @__PURE__ */ new Map();
+		for (const row of rows) {
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) if (!byAlias.has(alias)) byAlias.set(alias, row);
+			const parentId = normalizeCommentId(row.parentCommentId);
+			if (parentId) {
+				const children = childrenByParentAlias.get(parentId) ?? [];
+				children.push(row);
+				childrenByParentAlias.set(parentId, children);
+			}
+		}
+		let root = byAlias.get(commentId) ?? null;
+		const seenParents = /* @__PURE__ */ new Set();
+		while (root?.parentCommentId != null) {
+			const parentId = normalizeCommentId(root.parentCommentId);
+			if (!parentId || seenParents.has(parentId)) break;
+			seenParents.add(parentId);
+			const parent = byAlias.get(parentId);
+			if (!parent) break;
+			root = parent;
+		}
+		if (!root) return null;
+		const family = [];
+		const queue = [root];
+		const visited = /* @__PURE__ */ new Set();
+		while (queue.length > 0) {
+			const row = queue.shift();
+			if (!row || visited.has(row)) continue;
+			visited.add(row);
+			family.push(row);
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) queue.push(...childrenByParentAlias.get(alias) ?? []);
+		}
+		const isResolved = status === "resolved";
+		const resolvedAt = Date.now();
+		for (const row of family) {
+			row.resolvedTime = isResolved ? row.resolvedTime ?? resolvedAt : null;
+			row.resolvedById = isResolved ? superdoc?.user?.id ?? null : null;
+			row.resolvedByEmail = isResolved ? superdoc?.user?.email ?? null : null;
+			row.resolvedByName = isResolved ? superdoc?.user?.name ?? null : null;
+		}
+		return {
+			added: null,
+			lifecycleUpdated: family.length
+		};
+	};
 	const runV2CommentMutation = async ({ superdoc, adapter, fileId, operation, eventType, rejectionFallbackReason, rejectionEventExtras = {}, validateOutcome, successEventBuilder }) => {
 		let outcome;
 		try {
@@ -8611,10 +8666,15 @@ var useCommentsStore = defineStore("comments", () => {
 			superdoc?.emit?.("comments-update", rejectedEvent);
 			return failedOutcome;
 		}
-		const reconciled = reconcileCommentsFromV2({
+		const documentId = adapter.documentId ?? fileId;
+		const reconciled = applyV2ThreadLifecycleReceipt({
+			superdoc,
+			documentId,
+			lifecycle: outcome.threadLifecycle
+		}) ?? reconcileCommentsFromV2({
 			superdoc,
 			adapter,
-			documentId: adapter.documentId ?? fileId,
+			documentId,
 			items: outcome.items ?? [],
 			pruneStale: outcome.complete !== false
 		});
@@ -8626,7 +8686,11 @@ var useCommentsStore = defineStore("comments", () => {
 		return {
 			ok: true,
 			items: outcome.items ?? [],
-			reconciled
+			reconciled,
+			...outcome.complete === false ? { complete: false } : {},
+			...outcome.visibleWindowSource != null ? { visibleWindowSource: outcome.visibleWindowSource } : {},
+			...outcome.threadLifecycle != null ? { threadLifecycle: outcome.threadLifecycle } : {},
+			...outcome.mutationPath != null ? { mutationPath: outcome.mutationPath } : {}
 		};
 	};
 	const mapV2OutcomeCommentInputs = ({ outcome, adapter, fileId }) => {
@@ -8642,6 +8706,23 @@ var useCommentsStore = defineStore("comments", () => {
 	const commentInputParentId = (input) => input?.parentCommentId != null ? String(input.parentCommentId) : null;
 	const validateV2ThreadLifecycleRefresh = ({ outcome, adapter, fileId, commentId, expectedResolved, operation }) => {
 		const id = commentId != null ? String(commentId) : null;
+		const receiptLifecycle = outcome?.threadLifecycle;
+		if (receiptLifecycle != null) {
+			const observedId = normalizeCommentId(receiptLifecycle.commentId);
+			const observedResolved = receiptLifecycle.status === "resolved";
+			if (observedId === id && observedResolved === expectedResolved) return { ok: true };
+			return {
+				ok: false,
+				reason: `v2-${operation}-receipt-lifecycle-mismatch`,
+				detail: {
+					expected: {
+						commentId: id,
+						status: expectedResolved ? "resolved" : "open"
+					},
+					observed: receiptLifecycle
+				}
+			};
+		}
 		const inputs = mapV2OutcomeCommentInputs({
 			outcome,
 			adapter,
@@ -8787,8 +8868,8 @@ var useCommentsStore = defineStore("comments", () => {
 	* Resolve an existing comment through the v2 adapter.
 	*
 	* Plan §4.3 rules:
-	*   - successful resolve refreshes from v2 list and clears the active
-	*     comment / dialog target if the resolved comment was active
+	*   - successful resolve applies the committed lifecycle receipt to the
+	*     hydrated thread and clears the active comment / dialog target
 	*   - rejection leaves the row active, emits a rejected event
 	*   - active state must never reference a deleted/missing anchor — the
 	*     reconciler is already family-scoped (see TCS 001 §5)
@@ -8846,18 +8927,19 @@ var useCommentsStore = defineStore("comments", () => {
 	*
 	* Symmetric inverse of {@link resolveCommentV2}. The adapter routes the
 	* reopen through `activeEditor.doc.comments.patch({ status: 'active' })`,
-	* which removes the resolved anchors and restores the live comment mark,
-	* then refreshes from the v2 comment list. Rules:
+	* which removes the resolved anchors and restores the live comment mark.
+	* The successful receipt updates the hydrated thread immediately while
+	* normal review hydration remains the eventual reconciliation path. Rules:
 	*   - the store owns mutation gating (via the adapter capability state),
-	*     adapter identity stamping, refresh reconciliation, and event emission
+	*     adapter identity stamping, local lifecycle projection, and event emission
 	*   - there is no dedicated REOPENED event in the comment event enum, so a
-	*     successful reopen emits an UPDATE event with the refreshed (now open)
+	*     successful reopen emits an UPDATE event with the now-open
 	*     comment payload
 	*   - rejection is non-mutating and emits the same rejected-event shape as
 	*     the other v2 comment mutations; the row stays resolved so the user can
 	*     retry
-	*   - body / replies / anchor identity are preserved by the reconciler; we
-	*     only confirm the open state after the refreshed list lands
+	*   - body / replies / anchor identity are preserved; only lifecycle metadata
+	*     changes on the hydrated thread
 	*/
 	const reopenCommentV2 = async ({ superdoc, commentId } = {}) => {
 		if (commentsAreReadOnly()) return readOnlyMutationOutcome();
@@ -43335,7 +43417,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.4.0-next.17";
+		this.version = "2.4.0-next.18";
 		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

@@ -8561,6 +8561,61 @@ var useCommentsStore = defineStore("comments", () => {
 		syncCommentsToClients(superdoc, event);
 		return Promise.resolve({ ok: true });
 	};
+	const applyV2ThreadLifecycleReceipt = ({ superdoc, documentId, lifecycle } = {}) => {
+		const commentId = normalizeCommentId(lifecycle?.commentId);
+		const status = lifecycle?.status;
+		if (!commentId || status !== "open" && status !== "resolved") return null;
+		const normalizedDocumentId = normalizeCommentId(documentId);
+		const rows = commentsList.value.filter((comment) => {
+			if (!comment || comment.trackedChange === true || isV2SyntheticTrackedChangeRow(comment)) return false;
+			const rowDocumentId = normalizeCommentId(comment.fileId);
+			return normalizedDocumentId == null || rowDocumentId == null || rowDocumentId === normalizedDocumentId;
+		});
+		const byAlias = /* @__PURE__ */ new Map();
+		const childrenByParentAlias = /* @__PURE__ */ new Map();
+		for (const row of rows) {
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) if (!byAlias.has(alias)) byAlias.set(alias, row);
+			const parentId = normalizeCommentId(row.parentCommentId);
+			if (parentId) {
+				const children = childrenByParentAlias.get(parentId) ?? [];
+				children.push(row);
+				childrenByParentAlias.set(parentId, children);
+			}
+		}
+		let root = byAlias.get(commentId) ?? null;
+		const seenParents = /* @__PURE__ */ new Set();
+		while (root?.parentCommentId != null) {
+			const parentId = normalizeCommentId(root.parentCommentId);
+			if (!parentId || seenParents.has(parentId)) break;
+			seenParents.add(parentId);
+			const parent = byAlias.get(parentId);
+			if (!parent) break;
+			root = parent;
+		}
+		if (!root) return null;
+		const family = [];
+		const queue = [root];
+		const visited = /* @__PURE__ */ new Set();
+		while (queue.length > 0) {
+			const row = queue.shift();
+			if (!row || visited.has(row)) continue;
+			visited.add(row);
+			family.push(row);
+			for (const alias of [row.commentId, row.importedId].map(normalizeCommentId).filter(Boolean)) queue.push(...childrenByParentAlias.get(alias) ?? []);
+		}
+		const isResolved = status === "resolved";
+		const resolvedAt = Date.now();
+		for (const row of family) {
+			row.resolvedTime = isResolved ? row.resolvedTime ?? resolvedAt : null;
+			row.resolvedById = isResolved ? superdoc?.user?.id ?? null : null;
+			row.resolvedByEmail = isResolved ? superdoc?.user?.email ?? null : null;
+			row.resolvedByName = isResolved ? superdoc?.user?.name ?? null : null;
+		}
+		return {
+			added: null,
+			lifecycleUpdated: family.length
+		};
+	};
 	const runV2CommentMutation = async ({ superdoc, adapter, fileId, operation, eventType, rejectionFallbackReason, rejectionEventExtras = {}, validateOutcome, successEventBuilder }) => {
 		let outcome;
 		try {
@@ -8610,10 +8665,15 @@ var useCommentsStore = defineStore("comments", () => {
 			superdoc?.emit?.("comments-update", rejectedEvent);
 			return failedOutcome;
 		}
-		const reconciled = reconcileCommentsFromV2({
+		const documentId = adapter.documentId ?? fileId;
+		const reconciled = applyV2ThreadLifecycleReceipt({
+			superdoc,
+			documentId,
+			lifecycle: outcome.threadLifecycle
+		}) ?? reconcileCommentsFromV2({
 			superdoc,
 			adapter,
-			documentId: adapter.documentId ?? fileId,
+			documentId,
 			items: outcome.items ?? [],
 			pruneStale: outcome.complete !== false
 		});
@@ -8625,7 +8685,11 @@ var useCommentsStore = defineStore("comments", () => {
 		return {
 			ok: true,
 			items: outcome.items ?? [],
-			reconciled
+			reconciled,
+			...outcome.complete === false ? { complete: false } : {},
+			...outcome.visibleWindowSource != null ? { visibleWindowSource: outcome.visibleWindowSource } : {},
+			...outcome.threadLifecycle != null ? { threadLifecycle: outcome.threadLifecycle } : {},
+			...outcome.mutationPath != null ? { mutationPath: outcome.mutationPath } : {}
 		};
 	};
 	const mapV2OutcomeCommentInputs = ({ outcome, adapter, fileId }) => {
@@ -8641,6 +8705,23 @@ var useCommentsStore = defineStore("comments", () => {
 	const commentInputParentId = (input) => input?.parentCommentId != null ? String(input.parentCommentId) : null;
 	const validateV2ThreadLifecycleRefresh = ({ outcome, adapter, fileId, commentId, expectedResolved, operation }) => {
 		const id = commentId != null ? String(commentId) : null;
+		const receiptLifecycle = outcome?.threadLifecycle;
+		if (receiptLifecycle != null) {
+			const observedId = normalizeCommentId(receiptLifecycle.commentId);
+			const observedResolved = receiptLifecycle.status === "resolved";
+			if (observedId === id && observedResolved === expectedResolved) return { ok: true };
+			return {
+				ok: false,
+				reason: `v2-${operation}-receipt-lifecycle-mismatch`,
+				detail: {
+					expected: {
+						commentId: id,
+						status: expectedResolved ? "resolved" : "open"
+					},
+					observed: receiptLifecycle
+				}
+			};
+		}
 		const inputs = mapV2OutcomeCommentInputs({
 			outcome,
 			adapter,
@@ -8786,8 +8867,8 @@ var useCommentsStore = defineStore("comments", () => {
 	* Resolve an existing comment through the v2 adapter.
 	*
 	* Plan §4.3 rules:
-	*   - successful resolve refreshes from v2 list and clears the active
-	*     comment / dialog target if the resolved comment was active
+	*   - successful resolve applies the committed lifecycle receipt to the
+	*     hydrated thread and clears the active comment / dialog target
 	*   - rejection leaves the row active, emits a rejected event
 	*   - active state must never reference a deleted/missing anchor — the
 	*     reconciler is already family-scoped (see TCS 001 §5)
@@ -8845,18 +8926,19 @@ var useCommentsStore = defineStore("comments", () => {
 	*
 	* Symmetric inverse of {@link resolveCommentV2}. The adapter routes the
 	* reopen through `activeEditor.doc.comments.patch({ status: 'active' })`,
-	* which removes the resolved anchors and restores the live comment mark,
-	* then refreshes from the v2 comment list. Rules:
+	* which removes the resolved anchors and restores the live comment mark.
+	* The successful receipt updates the hydrated thread immediately while
+	* normal review hydration remains the eventual reconciliation path. Rules:
 	*   - the store owns mutation gating (via the adapter capability state),
-	*     adapter identity stamping, refresh reconciliation, and event emission
+	*     adapter identity stamping, local lifecycle projection, and event emission
 	*   - there is no dedicated REOPENED event in the comment event enum, so a
-	*     successful reopen emits an UPDATE event with the refreshed (now open)
+	*     successful reopen emits an UPDATE event with the now-open
 	*     comment payload
 	*   - rejection is non-mutating and emits the same rejected-event shape as
 	*     the other v2 comment mutations; the row stays resolved so the user can
 	*     retry
-	*   - body / replies / anchor identity are preserved by the reconciler; we
-	*     only confirm the open state after the refreshed list lands
+	*   - body / replies / anchor identity are preserved; only lifecycle metadata
+	*     changes on the hydrated thread
 	*/
 	const reopenCommentV2 = async ({ superdoc, commentId } = {}) => {
 		if (commentsAreReadOnly()) return readOnlyMutationOutcome();
@@ -43269,7 +43351,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.4.0-next.17";
+		this.version = "2.4.0-next.18";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];