@a3s-lab/office 0.7.2 → 0.8.0

package/dist/8928.js

@@ -1,6 +1,7 @@
 import { Extension, Mark, Node as core_Node, ResizableNodeView, generateHTML, getSchema, mergeAttributes } from "@tiptap/core";
 import { Collaboration, isChangeOrigin } from "@tiptap/extension-collaboration";
 import { NodeSelection, Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
+import { AddMarkStep, Mapping, RemoveMarkStep, ReplaceStep } from "@tiptap/pm/transform";
 import { defaultDeleteFilter, defaultProtectedNodes, prosemirrorJSONToYXmlFragment, ySyncPluginKey, yXmlFragmentToProsemirrorJSON } from "@tiptap/y-tiptap";
 import extension_color from "@tiptap/extension-color";
 import { Table, TableCell, TableHeader, TableKit, TableRow, TableView, createTable } from "@tiptap/extension-table";
@@ -8,7 +9,6 @@ import extension_text_align from "@tiptap/extension-text-align";
 import font_size from "@tiptap/extension-text-style/font-size";
 import extension_underline from "@tiptap/extension-underline";
 import starter_kit from "@tiptap/starter-kit";
-import { Mapping } from "@tiptap/pm/transform";
 import { DOMParser as model_DOMParser, Fragment, Slice } from "@tiptap/pm/model";
 import jszip from "jszip";
 import { closeHistory, isHistoryTransaction } from "@tiptap/pm/history";
@@ -23,7 +23,7 @@ import { TextStyle } from "@tiptap/extension-text-style";
 import extension_highlight from "@tiptap/extension-highlight";
 import { createOfficeId as createWorkId, parseXml, xmlNamespacePrefix } from "./5184.js";
 import { workOfficeCollaborationJsonEqual, canonicalWorkOfficeCollaborationJson, isWorkOfficeCollaborationRecord, cloneWorkOfficeCollaborationJson } from "./4650.js";
-import { initializeWorkOfficeCollaborationMetadata, assertWorkOfficeCollaborationEditable, OfficeCollaborationError as WorkOfficeCollaborationError, readOfficeCollaborationMetadata as readWorkOfficeCollaborationMetadata, registerWorkOfficeCollaborationInitializer, markWorkOfficeCollaborationInitialized, assertWorkOfficeCollaborationOrigin } from "./9787.js";
+import { assertWorkOfficeCollaborationEditable, markWorkOfficeCollaborationInitialized, assertWorkOfficeCollaborationOrigin, initializeWorkOfficeCollaborationMetadata, assertWorkOfficeCollaborationWritable, OfficeCollaborationError as WorkOfficeCollaborationError, readOfficeCollaborationMetadata as readWorkOfficeCollaborationMetadata, registerWorkOfficeCollaborationInitializer } from "./9787.js";
 import * as __rspack_external_yjs from "yjs";
 const BOOKMARK_REFERENCE_SELECTOR = 'span[data-document-cross-reference][data-reference-target-type="bookmark"]';
 const BLOCK_TEXT_CONTAINER_NAMES = new Set([
@@ -6697,6 +6697,7 @@ const DocumentParagraphIdentity = Extension.create({
     name: 'documentParagraphIdentity',
     addOptions () {
         return {
+            rotateTextId: ()=>true,
             types: [
                 'paragraph',
                 'heading',
@@ -6735,7 +6736,7 @@ const DocumentParagraphIdentity = Extension.create({
     },
     addProseMirrorPlugins () {
         return [
-            createDocumentParagraphIdentityPlugin(this.options.types)
+            createDocumentParagraphIdentityPlugin(this.options.types, this.options.rotateTextId)
         ];
     }
 });
@@ -6776,11 +6777,11 @@ function applyDocumentParagraphIdentityToElement(element, source) {
     element.setAttribute(DOCUMENT_PARAGRAPH_TEXT_ID_ATTRIBUTE, identity.textId);
     return identity;
 }
-function createDocumentParagraphIdentityPlugin(types) {
+function createDocumentParagraphIdentityPlugin(types, rotateTextId) {
     const trackedTypes = new Set(types);
     return new Plugin({
         view (view) {
-            const transaction = normalizeDocumentParagraphIdentities(view.state, trackedTypes);
+            const transaction = normalizeDocumentParagraphIdentities(view.state, trackedTypes, rotateTextId);
             if (transaction) {
                 transaction.setMeta('addToHistory', false);
                 view.dispatch(transaction);
@@ -6789,16 +6790,16 @@ function createDocumentParagraphIdentityPlugin(types) {
         },
         appendTransaction (transactions, oldState, newState) {
             if (!transactions.some((transaction)=>transaction.docChanged)) return null;
-            return normalizeDocumentParagraphIdentities(newState, trackedTypes, oldState, transactions);
+            return normalizeDocumentParagraphIdentities(newState, trackedTypes, rotateTextId, oldState, transactions);
         }
     });
 }
-function normalizeDocumentParagraphIdentities(state, trackedTypes, oldState, transactions = []) {
+function normalizeDocumentParagraphIdentities(state, trackedTypes, rotateTextId, oldState, transactions = []) {
     const paragraphs = documentParagraphs(state.doc, trackedTypes);
     const identifiedParagraphs = paragraphs.filter(({ node })=>hasDocumentParagraphIdentityComponent(node));
     if (!identifiedParagraphs.length) return null;
     const retainedPositions = oldState ? retainedDocumentParagraphPositions(oldState, state, transactions, trackedTypes) : new Set();
-    const editedPositions = oldState && !transactions.some(isHistoryTransaction) ? editedDocumentParagraphPositions(oldState, state, transactions, trackedTypes) : new Set();
+    const editedPositions = oldState && rotateTextId() && !transactions.some(isHistoryTransaction) ? editedDocumentParagraphPositions(oldState, state, transactions, trackedTypes) : new Set();
     const ordered = [
         ...identifiedParagraphs.filter((item)=>retainedPositions.has(item.position)),
         ...identifiedParagraphs.filter((item)=>!retainedPositions.has(item.position))
@@ -6971,6 +6972,11 @@ const DOCUMENT_TABLE_ROW_ID_ATTRIBUTE = 'data-office-row-id';
 const DOCUMENT_TABLE_ROW_TEXT_ID_ATTRIBUTE = 'data-office-row-text-id';
 const DocumentTableRowIdentity = Extension.create({
     name: 'documentTableRowIdentity',
+    addOptions () {
+        return {
+            rotateTextId: ()=>true
+        };
+    },
     addGlobalAttributes () {
         return [
             {
@@ -6986,7 +6992,7 @@ const DocumentTableRowIdentity = Extension.create({
     },
     addProseMirrorPlugins () {
         return [
-            createDocumentTableRowIdentityPlugin()
+            createDocumentTableRowIdentityPlugin(this.options.rotateTextId)
         ];
     }
 });
@@ -7028,10 +7034,10 @@ function identityAttribute(htmlName) {
         }
     };
 }
-function createDocumentTableRowIdentityPlugin() {
+function createDocumentTableRowIdentityPlugin(rotateTextId) {
     return new Plugin({
         view (view) {
-            const transaction = normalizeDocumentTableRowIdentities(view.state);
+            const transaction = normalizeDocumentTableRowIdentities(view.state, rotateTextId);
             if (transaction) {
                 transaction.setMeta('addToHistory', false);
                 view.dispatch(transaction);
@@ -7040,16 +7046,16 @@ function createDocumentTableRowIdentityPlugin() {
         },
         appendTransaction (transactions, oldState, newState) {
             if (!transactions.some((transaction)=>transaction.docChanged)) return null;
-            return normalizeDocumentTableRowIdentities(newState, oldState, transactions);
+            return normalizeDocumentTableRowIdentities(newState, rotateTextId, oldState, transactions);
         }
     });
 }
-function normalizeDocumentTableRowIdentities(state, oldState, transactions = []) {
+function normalizeDocumentTableRowIdentities(state, rotateTextId, oldState, transactions = []) {
     const rows = documentTableRows(state.doc);
     const identifiedRows = rows.filter(({ node })=>hasDocumentTableRowIdentityComponent(node));
     if (!identifiedRows.length) return null;
     const retainedPositions = oldState ? retainedDocumentTableRowPositions(oldState, state, transactions) : new Set();
-    const editedPositions = oldState && !transactions.some(isHistoryTransaction) ? editedDocumentTableRowPositions(oldState, state, transactions) : new Set();
+    const editedPositions = oldState && rotateTextId() && !transactions.some(isHistoryTransaction) ? editedDocumentTableRowPositions(oldState, state, transactions) : new Set();
     const ordered = [
         ...identifiedRows.filter((item)=>retainedPositions.has(item.position)),
         ...identifiedRows.filter((item)=>!retainedPositions.has(item.position))
@@ -8410,6 +8416,13 @@ const DocumentChange = Mark.create({
                         'data-change-id': attributes.id
                     })
             },
+            actorId: {
+                default: '',
+                parseHTML: (element)=>element.getAttribute('data-change-actor-id') ?? '',
+                renderHTML: (attributes)=>attributes.actorId ? {
+                        'data-change-actor-id': attributes.actorId
+                    } : {}
+            },
             author: {
                 default: '',
                 parseHTML: (element)=>element.getAttribute('data-change-author') ?? '',
@@ -8451,10 +8464,12 @@ const DocumentChange = Mark.create({
             acceptDocumentChange: (id)=>(props)=>resolveDocumentChangesCommand(props, this.type, 'accept', new Set([
                         id
                     ])) > 0,
+            acceptDocumentChanges: (ids)=>(props)=>resolveDocumentChangesCommand(props, this.type, 'accept', new Set(ids)) > 0,
             rejectAllDocumentChanges: ()=>(props)=>resolveDocumentChangesCommand(props, this.type, 'reject') > 0,
             rejectDocumentChange: (id)=>(props)=>resolveDocumentChangesCommand(props, this.type, 'reject', new Set([
                         id
                     ])) > 0,
+            rejectDocumentChanges: (ids)=>(props)=>resolveDocumentChangesCommand(props, this.type, 'reject', new Set(ids)) > 0,
             replaceDocumentTextWithTrackedChange: (from, to, text)=>({ state, tr })=>{
                     if (from < 0 || to < from || to > state.doc.content.size) return false;
                     trackedReplacement(tr, state.doc, this.type, from, to, text, this.options.createChange);
@@ -8537,6 +8552,9 @@ function collectDocumentChanges(document1) {
         changes.set(key, {
             id,
             kind,
+            ...work_document_changes_stringAttribute(mark.attrs.actorId) ? {
+                actorId: work_document_changes_stringAttribute(mark.attrs.actorId)
+            } : {},
             author: work_document_changes_stringAttribute(mark.attrs.author) || '未知审阅者',
             date: work_document_changes_stringAttribute(mark.attrs.date),
             from: position,
@@ -8640,6 +8658,7 @@ function changeMark(type, kind, createChange) {
     return type.create({
         kind,
         id: identity.id || createDocumentChangeId(),
+        actorId: identity.actorId ?? '',
         author: identity.author || 'A3S Work',
         date: identity.date || new Date().toISOString()
     });
@@ -9169,20 +9188,35 @@ function collectDocumentCommentAnchors(document1) {
     return Array.from(anchors.values()).sort((left, right)=>left.from - right.from);
 }
 function documentCommentViews(comments, anchors) {
-    const byId = new Map(comments.map((comment)=>[
-            comment.id,
-            normalizeDocumentComment(comment)
+    const anchorsById = new Map(anchors.map((anchor)=>[
+            anchor.id,
+            anchor
         ]));
-    return anchors.map((anchor)=>({
-            ...byId.get(anchor.id) ?? {
-                id: anchor.id,
-                author: '未知审阅者',
-                date: '',
-                text: '此批注的内容不可用。',
-                resolved: false
-            },
-            ...anchor
-        }));
+    const commentIds = new Set(comments.map((comment)=>comment.id));
+    const views = comments.map((comment)=>{
+        const normalized = normalizeDocumentComment(comment);
+        const anchor = anchorsById.get(comment.id);
+        return anchor ? {
+            ...normalized,
+            ...anchor,
+            detached: false
+        } : {
+            ...normalized,
+            from: null,
+            to: null,
+            anchorText: '',
+            detached: true
+        };
+    });
+    for (const anchor of anchors)if (!commentIds.has(anchor.id)) views.push({
+        author: '未知审阅者',
+        date: '',
+        text: '此批注的内容不可用。',
+        resolved: false,
+        ...anchor,
+        detached: false
+    });
+    return views;
 }
 function retainAnchoredDocumentComments(comments, anchors, retainedIds = new Set()) {
     const ids = new Set(anchors.map((anchor)=>anchor.id));
@@ -9259,19 +9293,25 @@ function documentCommentMark(marks) {
     return marks.find((mark)=>'documentComment' === mark.type.name);
 }
 function normalizeDocumentComment(comment) {
-    return {
+    const normalized = {
         id: comment.id,
         author: comment.author || '未知审阅者',
         date: comment.date || '',
         text: comment.text || '（空批注）',
-        resolved: Boolean(comment.resolved),
-        replies: comment.replies?.map((reply)=>({
-                id: reply.id,
-                author: reply.author || '未知审阅者',
-                date: reply.date || '',
-                text: reply.text || '（空回复）'
-            }))
+        resolved: Boolean(comment.resolved)
     };
+    if (void 0 !== comment.actorId) normalized.actorId = comment.actorId;
+    if (void 0 !== comment.replies) normalized.replies = comment.replies.map((reply)=>{
+        const normalizedReply = {
+            id: reply.id,
+            author: reply.author || '未知审阅者',
+            date: reply.date || '',
+            text: reply.text || '（空回复）'
+        };
+        if (void 0 !== reply.actorId) normalizedReply.actorId = reply.actorId;
+        return normalizedReply;
+    });
+    return normalized;
 }
 function work_document_comments_stringAttribute(value) {
     return 'string' == typeof value ? value : '';
@@ -15576,7 +15616,9 @@ function createWorkDocumentExtensions(options = {}) {
         DocumentTableCell,
         DocumentTableHeader,
         DocumentTableRow,
-        DocumentTableRowIdentity,
+        DocumentTableRowIdentity.configure({
+            rotateTextId: options.rotateTrackedTextIdentities ?? (()=>true)
+        }),
         DocumentTableCommands,
         DocumentTableFormatting,
         DocumentTableSizing,
@@ -15593,7 +15635,9 @@ function createWorkDocumentExtensions(options = {}) {
                 'paragraph'
             ]
         }),
-        DocumentParagraphIdentity,
+        DocumentParagraphIdentity.configure({
+            rotateTextId: options.rotateTrackedTextIdentities ?? (()=>true)
+        }),
         DocumentParagraphFormatting,
         DocumentParagraphTabStops,
         DocumentTab,
@@ -15767,6 +15811,218 @@ function invalidSharedSidecars(label) {
 function office_document_collaboration_sidecar_utils_isRecord(value) {
     return isWorkOfficeCollaborationRecord(value);
 }
+function assertWorkOfficeDocumentCommentMutationAllowed(session, previous, next) {
+    if ('edit' === session.mode) return;
+    if ('comment' !== session.mode) deniedReviewMutation(session);
+    const actor = requiredReviewActor(session);
+    assertRetainedOrder(previous, next, 'comments');
+    const nextById = new Map(next.map((comment)=>[
+            comment.id,
+            comment
+        ]));
+    const previousIds = new Set(previous.map((comment)=>comment.id));
+    for (const comment of previous){
+        const updated = nextById.get(comment.id);
+        if (!updated) {
+            assertOwnedRecord(comment.actorId, actor, 'own comment');
+            continue;
+        }
+        assertExistingCommentMutation(actor, comment, updated);
+    }
+    for (const comment of next)if (!previousIds.has(comment.id)) assertNewComment(actor, comment);
+}
+function assertExistingCommentMutation(actor, previous, next) {
+    if (previous.id !== next.id || previous.actorId !== next.actorId || previous.author !== next.author || previous.date !== next.date || previous.text !== next.text) deniedImmutableRecord('comment');
+    assertReplyMutations(actor, previous.id, previous.replies ?? [], next.replies ?? []);
+}
+function assertReplyMutations(actor, commentId, previous, next) {
+    assertRetainedOrder(previous, next, `replies in comment '${commentId}'`);
+    const nextById = new Map(next.map((reply)=>[
+            reply.id,
+            reply
+        ]));
+    const previousIds = new Set(previous.map((reply)=>reply.id));
+    for (const reply of previous){
+        const updated = nextById.get(reply.id);
+        if (!updated) {
+            assertOwnedRecord(reply.actorId, actor, 'own comment reply');
+            continue;
+        }
+        if (!jsonEqual(reply, updated)) deniedImmutableRecord('comment reply');
+    }
+    for (const reply of next)if (!previousIds.has(reply.id)) assertActorRecord(actor, reply, 'reply');
+}
+function assertNewComment(actor, comment) {
+    assertActorRecord(actor, comment, 'comment');
+    for (const reply of comment.replies ?? [])assertActorRecord(actor, reply, 'reply');
+}
+function assertActorRecord(actor, record, label) {
+    if (record.actorId === actor.id && record.author === actor.name) return;
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `A Document ${label} created in comment mode must use collaboration actor '${actor.id}' and its current display name.`);
+}
+function assertOwnedRecord(actorId, actor, label) {
+    if (actorId === actor.id) return;
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `Comment mode can delete only the collaboration actor's ${label}.`);
+}
+function assertRetainedOrder(previous, next, label) {
+    const previousIds = new Set(previous.map((record)=>record.id));
+    const nextIds = new Set(next.map((record)=>record.id));
+    const retainedBefore = previous.filter((record)=>nextIds.has(record.id)).map((record)=>record.id);
+    const retainedAfter = next.filter((record)=>previousIds.has(record.id)).map((record)=>record.id);
+    let encounteredNewRecord = false;
+    let existingAfterNewRecord = false;
+    for (const record of next)if (previousIds.has(record.id)) {
+        if (encounteredNewRecord) existingAfterNewRecord = true;
+    } else encounteredNewRecord = true;
+    if (jsonEqual(retainedBefore, retainedAfter) && !existingAfterNewRecord) return;
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `Comment mode must preserve existing ${label} order and append new review records.`);
+}
+function requiredReviewActor(session) {
+    if (session.actor) return session.actor;
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', 'Comment mode requires a collaboration actor before it can write review records.');
+}
+function deniedImmutableRecord(label) {
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `Comment mode cannot rewrite an existing ${label}; it may append replies or change resolution state.`);
+}
+function deniedReviewMutation(session) {
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `The '${session.mode}' collaboration mode cannot modify Document review records.`);
+}
+function validatedWorkOfficeDocumentChangeDecisions(value) {
+    if (!Array.isArray(value)) invalidInputSidecars('an array of tracked-change decisions');
+    const ids = new Set();
+    const changes = new Set();
+    return value.map((candidate)=>{
+        const decision = validatedDecision(candidate);
+        if (ids.has(decision.id)) invalidInputSidecars(`a unique tracked-change decision ID; '${decision.id}' is repeated`);
+        const change = changeIdentity(decision);
+        if (changes.has(change)) invalidInputSidecars(`one final decision for tracked change '${decision.changeId}'`);
+        ids.add(decision.id);
+        changes.add(change);
+        return decision;
+    });
+}
+function initializeWorkOfficeDocumentChangeDecisions(records, order, decisions) {
+    for (const decision of decisions){
+        createDecisionRecord(records, decision);
+        order.push([
+            decision.id
+        ]);
+    }
+}
+function readWorkOfficeDocumentChangeDecisions(records, order) {
+    const decisions = validatedOrder(order, records, 'tracked-change decision').map((id)=>readDecisionRecord(requiredSharedMap(records, id, 'tracked-change decision'), id));
+    const changes = new Set();
+    for (const decision of decisions){
+        const identity = changeIdentity(decision);
+        if (changes.has(identity)) invalidSharedSidecars(`multiple final decisions for tracked change '${decision.changeId}'`);
+        changes.add(identity);
+    }
+    return decisions;
+}
+function patchWorkOfficeDocumentChangeDecisions(records, order, previous, next) {
+    const beforeById = new Map(previous.map((decision)=>[
+            decision.id,
+            decision
+        ]));
+    for (const decision of previous){
+        const candidate = next.find(({ id })=>id === decision.id);
+        if (!candidate || !jsonEqual(candidate, decision)) immutableDecision(decision.id);
+    }
+    for (const decision of next)if (!beforeById.has(decision.id)) {
+        if (!records.has(decision.id)) createDecisionRecord(records, decision);
+        insertIntoOrder(order, next.map(({ id })=>id), decision.id);
+    }
+}
+function assertWorkOfficeDocumentChangeDecisionConflicts(previous, next, shared) {
+    assertNoAddedCollision(previous, next, shared, 'tracked-change decision');
+    const nextById = new Map(next.map((decision)=>[
+            decision.id,
+            decision
+        ]));
+    for (const decision of previous)if (!jsonEqual(nextById.get(decision.id), decision)) immutableDecision(decision.id);
+    const sharedByChange = new Map(shared.map((decision)=>[
+            changeIdentity(decision),
+            decision
+        ]));
+    const previousIds = new Set(previous.map(({ id })=>id));
+    for (const decision of next){
+        if (previousIds.has(decision.id)) continue;
+        const current = sharedByChange.get(changeIdentity(decision));
+        if (current && !jsonEqual(current, decision)) throw new WorkOfficeCollaborationError('office.collaboration.content_invalid', `Tracked change '${decision.changeId}' already has a different final decision.`);
+    }
+}
+function validatedDecision(value) {
+    if (!office_document_collaboration_sidecar_utils_isRecord(value)) invalidInputSidecars('valid tracked-change decision records');
+    const decision = {
+        id: requiredIdentifier(value.id, 'tracked-change decision'),
+        changeId: requiredIdentifier(value.changeId, 'tracked change'),
+        changeKind: office_document_collaboration_change_decisions_changeKind(value.changeKind, false),
+        suggestedBy: requiredString(value.suggestedBy, 'suggestion author'),
+        suggestedAt: requiredString(value.suggestedAt, 'suggestion date'),
+        text: requiredString(value.text, 'suggestion text'),
+        decision: decisionAction(value.decision, false),
+        decidedBy: requiredString(value.decidedBy, 'decision author'),
+        decidedAt: requiredString(value.decidedAt, 'decision date')
+    };
+    if (void 0 !== value.suggestedByActorId) decision.suggestedByActorId = requiredIdentifier(value.suggestedByActorId, 'suggestion actor');
+    if (void 0 !== value.decidedByActorId) decision.decidedByActorId = requiredIdentifier(value.decidedByActorId, 'decision actor');
+    return decision;
+}
+function createDecisionRecord(records, decision) {
+    const record = new __rspack_external_yjs.Map();
+    records.set(decision.id, record);
+    for (const [key, value] of Object.entries(decision))record.set(key, value);
+}
+function readDecisionRecord(record, expectedId) {
+    const id = requiredSharedIdentifier(record.get('id'), 'tracked-change decision');
+    if (id !== expectedId) invalidSharedSidecars('tracked-change decision identity');
+    const allowed = new Set([
+        'id',
+        'changeId',
+        'changeKind',
+        'suggestedByActorId',
+        'suggestedBy',
+        'suggestedAt',
+        'text',
+        'decision',
+        'decidedByActorId',
+        'decidedBy',
+        'decidedAt'
+    ]);
+    if (Array.from(record.keys()).some((key)=>!allowed.has(key))) invalidSharedSidecars('tracked-change decision fields');
+    const decision = {
+        id,
+        changeId: requiredSharedIdentifier(record.get('changeId'), 'tracked change'),
+        changeKind: office_document_collaboration_change_decisions_changeKind(record.get('changeKind'), true),
+        suggestedBy: requiredSharedString(record.get('suggestedBy'), 'suggestion author'),
+        suggestedAt: requiredSharedString(record.get('suggestedAt'), 'suggestion date'),
+        text: requiredSharedString(record.get('text'), 'suggestion text'),
+        decision: decisionAction(record.get('decision'), true),
+        decidedBy: requiredSharedString(record.get('decidedBy'), 'decision author'),
+        decidedAt: requiredSharedString(record.get('decidedAt'), 'decision date')
+    };
+    const suggestedByActorId = record.get('suggestedByActorId');
+    if (void 0 !== suggestedByActorId) decision.suggestedByActorId = requiredSharedIdentifier(suggestedByActorId, 'suggestion actor');
+    const decidedByActorId = record.get('decidedByActorId');
+    if (void 0 !== decidedByActorId) decision.decidedByActorId = requiredSharedIdentifier(decidedByActorId, 'decision actor');
+    return decision;
+}
+function changeIdentity(decision) {
+    return `${decision.changeKind}:${decision.changeId}`;
+}
+function office_document_collaboration_change_decisions_changeKind(value, shared) {
+    if ('insertion' === value || 'deletion' === value) return value;
+    if (shared) invalidSharedSidecars('tracked-change decision kind');
+    invalidInputSidecars('an insertion or deletion tracked-change kind');
+}
+function decisionAction(value, shared) {
+    if ('accept' === value || 'reject' === value) return value;
+    if (shared) invalidSharedSidecars('tracked-change decision action');
+    invalidInputSidecars('an accept or reject tracked-change decision');
+}
+function immutableDecision(id) {
+    throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', `Tracked-change decision '${id}' is immutable and cannot be rewritten or removed.`);
+}
 function validatedWorkOfficeDocumentBibliography(value) {
     if (!office_document_collaboration_sidecar_utils_isRecord(value) || !isCitationStyle(value.style)) invalidInputSidecars('a supported bibliography style');
     if (!Array.isArray(value.sources)) invalidInputSidecars('an array of bibliography sources');
@@ -15995,6 +16251,7 @@ function validatedComment(value) {
         text: requiredString(value.text, 'comment text'),
         resolved: requiredBoolean(value.resolved, 'comment resolution')
     };
+    if (void 0 !== value.actorId) comment.actorId = requiredIdentifier(value.actorId, 'comment actor');
     if (void 0 !== value.replies) {
         if (!Array.isArray(value.replies)) invalidInputSidecars('an array of comment replies');
         const ids = new Set();
@@ -16009,17 +16266,20 @@ function validatedComment(value) {
 }
 function validatedReply(value) {
     if (!office_document_collaboration_sidecar_utils_isRecord(value)) invalidInputSidecars('valid comment reply records');
-    return {
+    const reply = {
         id: requiredIdentifier(value.id, 'comment reply'),
         author: requiredString(value.author, 'comment reply author'),
         date: requiredString(value.date, 'comment reply date'),
         text: requiredString(value.text, 'comment reply text')
     };
+    if (void 0 !== value.actorId) reply.actorId = requiredIdentifier(value.actorId, 'comment reply actor');
+    return reply;
 }
 function createCommentRecord(records, comment) {
     const record = new __rspack_external_yjs.Map();
     records.set(comment.id, record);
     record.set('id', comment.id);
+    if (void 0 !== comment.actorId) record.set('actorId', comment.actorId);
     record.set('author', comment.author);
     record.set('date', comment.date);
     record.set('text', comment.text);
@@ -16039,6 +16299,7 @@ function createReplyRecord(records, reply) {
     const record = new __rspack_external_yjs.Map();
     records.set(reply.id, record);
     record.set('id', reply.id);
+    if (void 0 !== reply.actorId) record.set('actorId', reply.actorId);
     record.set('author', reply.author);
     record.set('date', reply.date);
     record.set('text', reply.text);
@@ -16056,20 +16317,26 @@ function readCommentRecord(record, expectedId) {
         text: requiredSharedString(record.get('text'), 'comment text'),
         resolved: requiredSharedBoolean(record.get('resolved'), 'comment resolution')
     };
+    const actorId = optionalSharedIdentifier(record.get('actorId'), 'comment actor');
+    if (void 0 !== actorId) comment.actorId = actorId;
     if (orderedReplies.length > 0) comment.replies = orderedReplies;
     return comment;
 }
 function readReplyRecord(record, expectedId) {
     const id = requiredSharedIdentifier(record.get('id'), 'comment reply');
     if (id !== expectedId) invalidSharedSidecars('comment reply identity');
-    return {
+    const reply = {
         id,
         author: requiredSharedString(record.get('author'), 'comment reply author'),
         date: requiredSharedString(record.get('date'), 'comment reply date'),
         text: requiredSharedString(record.get('text'), 'comment reply text')
     };
+    const actorId = optionalSharedIdentifier(record.get('actorId'), 'comment reply actor');
+    if (void 0 !== actorId) reply.actorId = actorId;
+    return reply;
 }
 function patchCommentRecord(record, previous, next) {
+    patchOptionalScalar(record, 'actorId', previous.actorId, next.actorId);
     patchRequiredScalar(record, 'author', previous.author, next.author);
     patchRequiredScalar(record, 'date', previous.date, next.date);
     patchRequiredScalar(record, 'text', previous.text, next.text);
@@ -16098,12 +16365,18 @@ function patchReplies(records, order, previous, next) {
         }
         if (jsonEqual(before, reply)) continue;
         const record = requiredSharedMap(records, reply.id, 'comment reply');
+        patchOptionalScalar(record, 'actorId', before.actorId, reply.actorId);
         patchRequiredScalar(record, 'author', before.author, reply.author);
         patchRequiredScalar(record, 'date', before.date, reply.date);
         patchRequiredScalar(record, 'text', before.text, reply.text);
     }
 }
+function optionalSharedIdentifier(value, label) {
+    return void 0 === value ? void 0 : requiredSharedIdentifier(value, label);
+}
 function appendWorkOfficeDocumentRecordClaims(claims, previous, next) {
+    const previousDecisions = new Set((previous.changeDecisions ?? []).map((decision)=>decision.id));
+    for (const decision of next.changeDecisions ?? [])if (!previousDecisions.has(decision.id)) appendClaim(claims, 'change-decision', decision.id, decision);
     const previousComments = new Map((previous.comments ?? []).map((comment)=>[
             comment.id,
             comment
@@ -16126,6 +16399,7 @@ function assertWorkOfficeDocumentRecordClaims(claims, sidecars) {
         if (void 0 !== existing && existing !== claim.fingerprint) throw new WorkOfficeCollaborationError('office.collaboration.content_invalid', `The ${claimLabel(claim)} ID '${claim.id}' was concurrently assigned to different records.`);
         fingerprints.set(identity, claim.fingerprint);
     }
+    for (const decision of sidecars.changeDecisions ?? [])assertClaimExists(fingerprints, 'change-decision', decision.id);
     for (const comment of sidecars.comments ?? []){
         assertClaimExists(fingerprints, 'comment', comment.id);
         for (const reply of comment.replies ?? [])assertClaimExists(fingerprints, 'comment-reply', reply.id, comment.id);
@@ -16157,7 +16431,7 @@ function parsedClaim(rawClaim) {
     const keys = Object.keys(value);
     if (keys.some((key)=>'fingerprint' !== key && 'id' !== key && 'kind' !== key && 'parentId' !== key)) invalidSharedSidecars('record claim');
     const kind = value.kind;
-    if ('bibliography-source' !== kind && 'comment' !== kind && 'comment-reply' !== kind) invalidSharedSidecars('record claim kind');
+    if ('bibliography-source' !== kind && 'change-decision' !== kind && 'comment' !== kind && 'comment-reply' !== kind) invalidSharedSidecars('record claim kind');
     const id = requiredSharedIdentifier(value.id, 'record claim');
     const fingerprint = requiredSharedString(value.fingerprint, 'record claim fingerprint');
     const parentId = void 0 === value.parentId ? void 0 : requiredSharedIdentifier(value.parentId, 'record claim parent');
@@ -16190,6 +16464,7 @@ function claimIdentity(kind, id, parentId) {
     ]);
 }
 function claimLabel(claim) {
+    if ('change-decision' === claim.kind) return 'tracked-change decision';
     if ('comment' === claim.kind) return 'comment';
     if ('bibliography-source' === claim.kind) return 'bibliography source';
     return `reply in comment '${claim.parentId}'`;
@@ -16197,13 +16472,15 @@ function claimLabel(claim) {
 const DOCUMENT_OPTIONS_ROOT = 'document.options';
 const DOCUMENT_COMMENTS_ROOT = 'document.comments';
 const DOCUMENT_COMMENT_ORDER_ROOT = 'document.comment-order';
+const DOCUMENT_CHANGE_DECISIONS_ROOT = 'document.change-decisions';
+const DOCUMENT_CHANGE_DECISION_ORDER_ROOT = 'document.change-decision-order';
 const DOCUMENT_BIBLIOGRAPHY_ROOT = 'document.bibliography';
 const DOCUMENT_BIBLIOGRAPHY_SOURCES_ROOT = 'document.bibliography.sources';
 const DOCUMENT_BIBLIOGRAPHY_SOURCE_ORDER_ROOT = 'document.bibliography.source-order';
 const DOCUMENT_RECORD_CLAIMS_ROOT = 'document.record-claims';
 function assertWorkOfficeDocumentSidecarsEmpty(session) {
     const roots = documentSidecarRoots(session);
-    if (roots.options.size > 0 || roots.comments.size > 0 || roots.commentOrder.length > 0 || roots.bibliography.size > 0 || roots.bibliographySources.size > 0 || roots.bibliographySourceOrder.length > 0 || roots.recordClaims.length > 0) throw new WorkOfficeCollaborationError('office.collaboration.bootstrap_ambiguous', 'The Document collaboration sidecars contain data without initialized metadata.');
+    if (roots.options.size > 0 || roots.comments.size > 0 || roots.commentOrder.length > 0 || roots.changeDecisions.size > 0 || roots.changeDecisionOrder.length > 0 || roots.bibliography.size > 0 || roots.bibliographySources.size > 0 || roots.bibliographySourceOrder.length > 0 || roots.recordClaims.length > 0) throw new WorkOfficeCollaborationError('office.collaboration.bootstrap_ambiguous', 'The Document collaboration sidecars contain data without initialized metadata.');
 }
 function initializeWorkOfficeDocumentSidecars(session, content) {
     const roots = documentSidecarRoots(session);
@@ -16211,6 +16488,7 @@ function initializeWorkOfficeDocumentSidecars(session, content) {
     appendWorkOfficeDocumentRecordClaims(roots.recordClaims, {}, sidecars);
     if (void 0 !== sidecars.pageColor) roots.options.set('pageColor', sidecars.pageColor);
     if (void 0 !== sidecars.trackChanges) roots.options.set('trackChanges', sidecars.trackChanges);
+    if (void 0 !== sidecars.changeDecisions) initializeWorkOfficeDocumentChangeDecisions(roots.changeDecisions, roots.changeDecisionOrder, sidecars.changeDecisions);
     if (void 0 !== sidecars.comments) {
         roots.options.set('commentsPresent', true);
         initializeWorkOfficeDocumentComments(roots.comments, roots.commentOrder, sidecars.comments);
@@ -16233,6 +16511,8 @@ function readWorkOfficeDocumentSidecars(session) {
         if ('boolean' != typeof trackChanges) invalidSharedSidecars('track-changes setting');
         result.trackChanges = trackChanges;
     }
+    if (roots.changeDecisionOrder.length > 0) result.changeDecisions = readWorkOfficeDocumentChangeDecisions(roots.changeDecisions, roots.changeDecisionOrder);
+    else if (roots.changeDecisions.size > 0) invalidSharedSidecars('tracked-change decision order and record set');
     const commentsPresent = optionalPresence(roots.options.get('commentsPresent'), 'comment');
     if (true === commentsPresent || roots.commentOrder.length > 0) result.comments = readWorkOfficeDocumentComments(roots.comments, roots.commentOrder);
     else if (roots.comments.size > 0) invalidSharedSidecars('comment order and record set');
@@ -16246,14 +16526,17 @@ function updateWorkOfficeDocumentSidecars(session, previous, next, origin) {
     const before = validatedWorkOfficeDocumentSidecars(previous);
     const after = validatedWorkOfficeDocumentSidecars(next);
     if (jsonEqual(before, after)) return false;
+    assertDocumentSidecarMutationAllowed(session, before, after);
     const roots = documentSidecarRoots(session);
     const shared = readWorkOfficeDocumentSidecars(session);
     assertWorkOfficeDocumentCommentConflicts(before.comments ?? [], after.comments ?? [], shared.comments ?? []);
+    assertWorkOfficeDocumentChangeDecisionConflicts(before.changeDecisions ?? [], after.changeDecisions ?? [], shared.changeDecisions ?? []);
     assertWorkOfficeDocumentBibliographyConflicts(before.bibliography, after.bibliography, shared.bibliography);
     session.transact(()=>{
         appendWorkOfficeDocumentRecordClaims(roots.recordClaims, before, after);
         patchOptionalScalar(roots.options, 'pageColor', before.pageColor, after.pageColor);
         patchOptionalScalar(roots.options, 'trackChanges', before.trackChanges, after.trackChanges);
+        if (!jsonEqual(before.changeDecisions, after.changeDecisions)) patchWorkOfficeDocumentChangeDecisions(roots.changeDecisions, roots.changeDecisionOrder, before.changeDecisions ?? [], after.changeDecisions ?? []);
         if (!jsonEqual(before.comments, after.comments)) {
             patchPresence(roots.options, 'commentsPresent', before.comments, after.comments);
             patchWorkOfficeDocumentComments(roots.comments, roots.commentOrder, before.comments ?? [], after.comments ?? []);
@@ -16262,7 +16545,7 @@ function updateWorkOfficeDocumentSidecars(session, previous, next, origin) {
             patchPresence(roots.options, 'bibliographyPresent', before.bibliography, after.bibliography, false);
             patchWorkOfficeDocumentBibliography(roots.bibliography, roots.bibliographySources, roots.bibliographySourceOrder, before.bibliography, after.bibliography);
         }
-    }, origin);
+    }, origin, 'comment' === session.mode ? 'document-comment' : 'content');
     return true;
 }
 function workOfficeDocumentSidecarUndoScope(session) {
@@ -16277,9 +16560,19 @@ function workOfficeDocumentSidecarUndoScope(session) {
         roots.recordClaims
     ];
 }
+function workOfficeDocumentDecisionRootsChanged(session, transaction) {
+    const roots = documentSidecarRoots(session);
+    const changed = new Set(transaction.changedParentTypes.keys());
+    return changed.has(roots.changeDecisions) || changed.has(roots.changeDecisionOrder);
+}
 function workOfficeDocumentSidecarsChanged(session, transaction) {
     const changed = new Set(transaction.changedParentTypes.keys());
-    return workOfficeDocumentSidecarUndoScope(session).some((root)=>changed.has(root));
+    const roots = documentSidecarRoots(session);
+    return [
+        ...workOfficeDocumentSidecarUndoScope(session),
+        roots.changeDecisions,
+        roots.changeDecisionOrder
+    ].some((root)=>changed.has(root));
 }
 function validatedWorkOfficeDocumentSidecars(content) {
     if (!content || 'document' !== content.type) invalidInputSidecars('a Document content value');
@@ -16292,15 +16585,24 @@ function validatedWorkOfficeDocumentSidecars(content) {
         if ('boolean' != typeof content.trackChanges) invalidInputSidecars('a boolean track-changes setting');
         result.trackChanges = content.trackChanges;
     }
+    if (void 0 !== content.changeDecisions) result.changeDecisions = validatedWorkOfficeDocumentChangeDecisions(content.changeDecisions);
     if (void 0 !== content.comments) result.comments = validatedWorkOfficeDocumentComments(content.comments);
     if (void 0 !== content.bibliography) result.bibliography = validatedWorkOfficeDocumentBibliography(content.bibliography);
     return result;
 }
+function assertDocumentSidecarMutationAllowed(session, previous, next) {
+    if ('edit' === session.mode) return;
+    if ('comment' !== session.mode) return void assertWorkOfficeCollaborationEditable(session);
+    if (!jsonEqual(previous.pageColor, next.pageColor) || !jsonEqual(previous.trackChanges, next.trackChanges) || !jsonEqual(previous.changeDecisions, next.changeDecisions) || !jsonEqual(previous.bibliography, next.bibliography)) throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', 'The comment collaboration mode can modify only Document review records.');
+    assertWorkOfficeDocumentCommentMutationAllowed(session, previous.comments ?? [], next.comments ?? []);
+}
 function documentSidecarRoots(session) {
     return {
         options: session.document.getMap(session.rootName(DOCUMENT_OPTIONS_ROOT)),
         comments: session.document.getMap(session.rootName(DOCUMENT_COMMENTS_ROOT)),
         commentOrder: session.document.getArray(session.rootName(DOCUMENT_COMMENT_ORDER_ROOT)),
+        changeDecisions: session.document.getMap(session.rootName(DOCUMENT_CHANGE_DECISIONS_ROOT)),
+        changeDecisionOrder: session.document.getArray(session.rootName(DOCUMENT_CHANGE_DECISION_ORDER_ROOT)),
         bibliography: session.document.getMap(session.rootName(DOCUMENT_BIBLIOGRAPHY_ROOT)),
         bibliographySources: session.document.getMap(session.rootName(DOCUMENT_BIBLIOGRAPHY_SOURCES_ROOT)),
         bibliographySourceOrder: session.document.getArray(session.rootName(DOCUMENT_BIBLIOGRAPHY_SOURCE_ORDER_ROOT)),
@@ -16317,7 +16619,154 @@ function patchPresence(target, key, previous, next, absentValue) {
     else if (void 0 !== previous) if (false === absentValue) target.set(key, false);
     else target.delete(key);
 }
+function workOfficeDocumentSuggestionTransactionAllowed(session, transaction) {
+    const actor = session.actor;
+    if (!actor || !transaction.docChanged || 0 === transaction.steps.length) return false;
+    if (!transaction.steps.every((step)=>step instanceof ReplaceStep || (step instanceof AddMarkStep || step instanceof RemoveMarkStep) && 'documentChange' === step.mark.type.name)) return false;
+    const before = strictDocumentChanges(transaction.before);
+    const after = strictDocumentChanges(transaction.doc);
+    if (!before || !after) return false;
+    if (JSON.stringify(documentSuggestionBaseline(transaction.before)) !== JSON.stringify(documentSuggestionBaseline(transaction.doc))) return false;
+    const beforeById = new Map(before.map((change)=>[
+            change.id,
+            change
+        ]));
+    const afterById = new Map(after.map((change)=>[
+            change.id,
+            change
+        ]));
+    for (const previous of before){
+        const current = afterById.get(previous.id);
+        if (!current) {
+            if (previous.actorId !== actor.id) return false;
+            continue;
+        }
+        if (!sameChangeIdentity(previous, current)) return false;
+        if (previous.actorId !== actor.id && previous.text !== current.text) return false;
+        if (previous.actorId === actor.id && 'deletion' === previous.kind && previous.text !== current.text) return false;
+    }
+    for (const current of after)if (!beforeById.has(current.id)) {
+        if (current.actorId !== actor.id || current.author !== actor.name || !current.date || !current.text) return false;
+    }
+    return true;
+}
+function createWorkOfficeDocumentChangeDecisions(session, changes, decision, decidedAt = new Date().toISOString()) {
+    const decidedBy = session.actor?.name ?? 'A3S Work 用户';
+    return changes.map((change)=>({
+            id: `${change.kind}:${change.id}`,
+            changeId: change.id,
+            changeKind: change.kind,
+            ...change.actorId ? {
+                suggestedByActorId: change.actorId
+            } : {},
+            suggestedBy: change.author,
+            suggestedAt: change.date,
+            text: change.text,
+            decision,
+            ...session.actor ? {
+                decidedByActorId: session.actor.id
+            } : {},
+            decidedBy,
+            decidedAt
+        }));
+}
+function strictDocumentChanges(document1) {
+    const changes = new Map();
+    let valid = true;
+    document1.descendants((node)=>{
+        if (!valid || !node.isText || !node.text) return;
+        const marks = node.marks.filter((mark)=>'documentChange' === mark.type.name);
+        if (0 === marks.length) return;
+        if (1 !== marks.length) {
+            valid = false;
+            return false;
+        }
+        const mark = marks[0];
+        const id = strictString(mark.attrs.id);
+        const kind = strictChangeKind(mark.attrs.kind);
+        const author = strictString(mark.attrs.author);
+        const date = strictString(mark.attrs.date);
+        const actorId = optionalStrictString(mark.attrs.actorId);
+        if (!id || !kind || null === author || null === date || null === actorId) {
+            valid = false;
+            return false;
+        }
+        const current = changes.get(id);
+        const candidate = {
+            id,
+            kind,
+            ...actorId ? {
+                actorId
+            } : {},
+            author,
+            date,
+            text: node.text
+        };
+        if (!current) return void changes.set(id, candidate);
+        if (!sameChangeIdentity(current, candidate)) {
+            valid = false;
+            return false;
+        }
+        current.text += node.text;
+    });
+    return valid ? Array.from(changes.values()) : null;
+}
+function documentSuggestionBaseline(node) {
+    const json = node.toJSON();
+    if (node.isText) {
+        const change = node.marks.find((mark)=>'documentChange' === mark.type.name);
+        if (change?.attrs.kind === 'insertion') return null;
+        const marks = node.marks.filter((mark)=>'documentChange' !== mark.type.name).map((mark)=>mark.toJSON());
+        if (marks.length > 0) return {
+            ...json,
+            marks
+        };
+        const { marks: _marks, ...withoutMarks } = json;
+        return withoutMarks;
+    }
+    const content = [];
+    node.forEach((child)=>{
+        const projected = documentSuggestionBaseline(child);
+        if (null !== projected) appendSuggestionBaselineNode(content, projected);
+    });
+    if (content.length > 0) return {
+        ...json,
+        content
+    };
+    const { content: _content, ...withoutContent } = json;
+    return withoutContent;
+}
+function appendSuggestionBaselineNode(content, projected) {
+    const previous = content.at(-1);
+    if (isSuggestionBaselineText(previous) && isSuggestionBaselineText(projected) && JSON.stringify(previous.marks ?? []) === JSON.stringify(projected.marks ?? [])) {
+        content[content.length - 1] = {
+            ...previous,
+            text: previous.text + projected.text
+        };
+        return;
+    }
+    content.push(projected);
+}
+function isSuggestionBaselineText(value) {
+    if (!value || 'object' != typeof value) return false;
+    const candidate = value;
+    return 'text' === candidate.type && 'string' == typeof candidate.text;
+}
+function sameChangeIdentity(left, right) {
+    return left.id === right.id && left.kind === right.kind && left.actorId === right.actorId && left.author === right.author && left.date === right.date;
+}
+function strictString(value) {
+    return 'string' == typeof value && value.trim() === value && value ? value : null;
+}
+function optionalStrictString(value) {
+    if (void 0 === value || '' === value) return;
+    return strictString(value);
+}
+function strictChangeKind(value) {
+    return 'insertion' === value || 'deletion' === value ? value : null;
+}
 const DOCUMENT_CONTENT_ROOT = 'document.content';
+const MAX_DOCUMENT_COMMENT_HISTORY = 100;
 const mountedDocumentBindings = new WeakMap();
 function initializeWorkOfficeDocumentCollaboration(session, content) {
     assertDocumentSession(session);
@@ -16381,6 +16830,9 @@ class WorkOfficeDocumentCollaborationBindingImpl {
     #listeners = new Set();
     #errorListeners = new Set();
     #historyListeners = new Set();
+    #commentUndoStack = [];
+    #commentRedoStack = [];
+    #applyingCommentHistory = false;
     #destroyed = false;
     #destroyRequested = false;
     #observersAttached = false;
@@ -16395,7 +16847,8 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         assertWorkOfficeCollaborationOrigin(this.origin);
         const builtIns = createWorkDocumentExtensions({
             ...options.workExtensions,
-            collaborative: true
+            collaborative: true,
+            rotateTrackedTextIdentities: ()=>'suggest' !== session.mode
         });
         const additional = options.additionalExtensions ?? [];
         assertBehaviorOnlyExtensions(additional);
@@ -16418,10 +16871,13 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         ]));
         const existing = mountedDocumentBindings.get(session.document);
         if (existing) throw new WorkOfficeCollaborationError('office.collaboration.content_invalid', 'Only one Document collaboration binding may use a local Y.Doc at a time. Give each editor client its own synchronized Y.Doc.');
-        this.#undoManager = new __rspack_external_yjs.UndoManager([
+        const undoScope = 'comment' === session.mode || 'suggest' === session.mode ? [
+            this.fragment
+        ] : [
             this.fragment,
             ...workOfficeDocumentSidecarUndoScope(session)
-        ], {
+        ];
+        this.#undoManager = new __rspack_external_yjs.UndoManager(undoScope, {
             captureTimeout: options.captureTimeoutMs ?? 500,
             captureTransaction: (transaction)=>false !== transaction.meta.get('addToHistory'),
             deleteFilter: (item)=>defaultDeleteFilter(item, defaultProtectedNodes),
@@ -16433,7 +16889,7 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         const restore = restorable.restore?.bind(this.#undoManager);
         if (restore) restorable.restore = ()=>{
             restore();
-            this.#undoManager.addToScope([
+            this.#undoManager.addToScope('comment' === this.#session.mode || 'suggest' === this.#session.mode ? this.fragment : [
                 this.fragment,
                 ...workOfficeDocumentSidecarUndoScope(this.#session)
             ]);
@@ -16466,23 +16922,79 @@ class WorkOfficeDocumentCollaborationBindingImpl {
     }
     updateSidecars(previous, next) {
         this.ensureActive();
-        return updateWorkOfficeDocumentSidecars(this.#session, previous, next, this.origin);
+        const historyEntry = 'comment' !== this.#session.mode || this.#applyingCommentHistory ? null : createDocumentCommentHistoryEntry(previous, next);
+        if (historyEntry?.commentMembershipChanged) this.#undoManager.stopCapturing();
+        const changed = updateWorkOfficeDocumentSidecars(this.#session, previous, next, this.origin);
+        if (changed && historyEntry) {
+            appendBoundedCommentHistory(this.#commentUndoStack, historyEntry);
+            this.#commentRedoStack.length = 0;
+            this.#onHistoryChange();
+        }
+        return changed;
+    }
+    decideChanges(editor, changeIds, decision, options = {}) {
+        this.ensureActive();
+        assertWorkOfficeCollaborationEditable(this.#session);
+        if (editor.isDestroyed || 0 === changeIds.length) return false;
+        const requested = new Set(changeIds);
+        const changes = collectDocumentChanges(editor.state.doc).filter((change)=>requested.has(change.id));
+        if (changes.length !== requested.size) return false;
+        const before = this.content();
+        const decisions = createWorkOfficeDocumentChangeDecisions(this.#session, changes, decision, options.decidedAt);
+        const existing = new Set((before.changeDecisions ?? []).map(({ id })=>id));
+        if (decisions.some(({ id })=>existing.has(id))) throw new WorkOfficeCollaborationError('office.collaboration.permission_denied', 'A tracked change with a final decision cannot be decided again.');
+        const origin = this.#session.createOrigin(this.#session.localOrigin.kind);
+        let handled = false;
+        this.#session.transact(()=>{
+            handled = 'accept' === decision ? editor.commands.acceptDocumentChanges(changeIds) : editor.commands.rejectDocumentChanges(changeIds);
+            if (!handled) return;
+            updateWorkOfficeDocumentSidecars(this.#session, before, {
+                ...before,
+                changeDecisions: [
+                    ...before.changeDecisions ?? [],
+                    ...decisions
+                ]
+            }, origin);
+        }, origin);
+        if (handled) {
+            this.#undoManager.clear();
+            this.#onHistoryChange();
+        }
+        return handled;
     }
     canUndo() {
         this.ensureActive();
+        if ('comment' === this.#session.mode) return this.#commentUndoStack.length > 0 || this.#undoManager.canUndo();
         return this.#undoManager.canUndo();
     }
     canRedo() {
         this.ensureActive();
+        if ('comment' === this.#session.mode) return this.#commentRedoStack.length > 0 || this.#undoManager.canRedo();
         return this.#undoManager.canRedo();
     }
     undo() {
         this.ensureActive();
+        if ('comment' === this.#session.mode) {
+            assertWorkOfficeCollaborationWritable(this.#session, 'document-comment');
+            return this.applyCommentHistory('undo');
+        }
+        if ('suggest' === this.#session.mode) {
+            assertWorkOfficeCollaborationWritable(this.#session, 'document-suggestion');
+            return null !== this.#undoManager.undo();
+        }
         assertWorkOfficeCollaborationEditable(this.#session);
         return null !== this.#undoManager.undo();
     }
     redo() {
         this.ensureActive();
+        if ('comment' === this.#session.mode) {
+            assertWorkOfficeCollaborationWritable(this.#session, 'document-comment');
+            return this.applyCommentHistory('redo');
+        }
+        if ('suggest' === this.#session.mode) {
+            assertWorkOfficeCollaborationWritable(this.#session, 'document-suggestion');
+            return null !== this.#undoManager.redo();
+        }
         assertWorkOfficeCollaborationEditable(this.#session);
         return null !== this.#undoManager.redo();
     }
@@ -16525,6 +17037,10 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         if (transaction.origin === ySyncPluginKey) transaction.origin = this.origin;
     };
     #onTransaction = (transaction)=>{
+        if ('suggest' === this.#session.mode && workOfficeDocumentDecisionRootsChanged(this.#session, transaction)) {
+            this.#undoManager.clear();
+            this.#onHistoryChange();
+        }
         if (this.#destroyed || this.#destroyRequested || !transactionTouchesRoot(transaction, this.fragment) && !workOfficeDocumentSidecarsChanged(this.#session, transaction)) return;
         const local = transaction.origin === ySyncPluginKey || transaction.origin === this.origin || transaction.origin === this.#undoManager;
         this.#pendingLocal = this.#pendingChange ? this.#pendingLocal && local : local;
@@ -16559,6 +17075,30 @@ class WorkOfficeDocumentCollaborationBindingImpl {
     #onHistoryChange = ()=>{
         for (const listener of this.#historyListeners)listener();
     };
+    applyCommentHistory(direction) {
+        const sourceStack = 'undo' === direction ? this.#commentUndoStack : this.#commentRedoStack;
+        const targetStack = 'undo' === direction ? this.#commentRedoStack : this.#commentUndoStack;
+        const entry = sourceStack.pop();
+        if (!entry) return 'undo' === direction ? null !== this.#undoManager.undo() : null !== this.#undoManager.redo();
+        const from = 'undo' === direction ? entry.after : entry.before;
+        const to = 'undo' === direction ? entry.before : entry.after;
+        const current = this.content();
+        const comments = reconcileDocumentCommentHistory(current.comments, from, to);
+        let sidecarsChanged = false;
+        this.#applyingCommentHistory = true;
+        try {
+            if (!jsonEqual(current.comments, comments)) sidecarsChanged = this.updateSidecars(current, {
+                ...current,
+                comments
+            });
+        } finally{
+            this.#applyingCommentHistory = false;
+        }
+        const anchorChanged = entry.commentMembershipChanged ? 'undo' === direction ? null !== this.#undoManager.undo() : null !== this.#undoManager.redo() : false;
+        appendBoundedCommentHistory(targetStack, entry);
+        this.#onHistoryChange();
+        return sidecarsChanged || anchorChanged;
+    }
     finishDestroy(destroyUndoManager) {
         if (this.#destroyed) return;
         this.#destroyed = true;
@@ -16572,6 +17112,8 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         this.#listeners.clear();
         this.#errorListeners.clear();
         this.#historyListeners.clear();
+        this.#commentUndoStack.length = 0;
+        this.#commentRedoStack.length = 0;
     }
     detachObservers() {
         if (!this.#observersAttached) return;
@@ -16587,6 +17129,104 @@ class WorkOfficeDocumentCollaborationBindingImpl {
         throw new WorkOfficeCollaborationError('office.collaboration.binding_destroyed', 'The Document collaboration binding has been destroyed.');
     }
 }
+function createDocumentCommentHistoryEntry(previous, next) {
+    if (jsonEqual(previous.comments, next.comments)) return null;
+    const before = cloneDocumentComments(previous.comments);
+    const after = cloneDocumentComments(next.comments);
+    return {
+        before,
+        after,
+        commentMembershipChanged: !sameDocumentCommentMembership(before, after)
+    };
+}
+function appendBoundedCommentHistory(stack, entry) {
+    stack.push(entry);
+    if (stack.length > MAX_DOCUMENT_COMMENT_HISTORY) stack.shift();
+}
+function sameDocumentCommentMembership(left, right) {
+    return jsonEqual((left ?? []).map(({ id })=>id), (right ?? []).map(({ id })=>id));
+}
+function reconcileDocumentCommentHistory(current, from, to) {
+    const fromById = new Map((from ?? []).map((comment)=>[
+            comment.id,
+            comment
+        ]));
+    const toById = new Map((to ?? []).map((comment)=>[
+            comment.id,
+            comment
+        ]));
+    const result = cloneDocumentComments(current) ?? [];
+    const resultById = ()=>new Map(result.map((comment)=>[
+                comment.id,
+                comment
+            ]));
+    const orderedIds = [
+        ...(from ?? []).map(({ id })=>id),
+        ...(to ?? []).map(({ id })=>id)
+    ].filter((id, index, ids)=>ids.indexOf(id) === index);
+    for (const id of orderedIds){
+        const source = fromById.get(id);
+        const target = toById.get(id);
+        const currentById = resultById();
+        const existing = currentById.get(id);
+        if (!source && target) {
+            if (!existing) result.push(cloneDocumentComment(target));
+            continue;
+        }
+        if (source && !target) {
+            if (existing && jsonEqual(existing, source)) result.splice(result.findIndex((comment)=>comment.id === id), 1);
+            continue;
+        }
+        if (!source || !target || !existing) continue;
+        const next = reconcileExistingDocumentComment(existing, source, target);
+        const index = result.findIndex((comment)=>comment.id === id);
+        if (index >= 0) result[index] = next;
+    }
+    if (result.length > 0) return result;
+    return void 0 === to ? void 0 : [];
+}
+function reconcileExistingDocumentComment(current, from, to) {
+    const next = cloneDocumentComment(current);
+    if (from.resolved !== to.resolved && current.resolved === from.resolved) next.resolved = to.resolved;
+    const fromReplies = new Map((from.replies ?? []).map((reply)=>[
+            reply.id,
+            reply
+        ]));
+    const toReplies = new Map((to.replies ?? []).map((reply)=>[
+            reply.id,
+            reply
+        ]));
+    const replies = (next.replies ?? []).map((reply)=>({
+            ...reply
+        }));
+    const replyIds = [
+        ...(from.replies ?? []).map(({ id })=>id),
+        ...(to.replies ?? []).map(({ id })=>id)
+    ].filter((id, index, ids)=>ids.indexOf(id) === index);
+    for (const id of replyIds){
+        const source = fromReplies.get(id);
+        const target = toReplies.get(id);
+        const index = replies.findIndex((reply)=>reply.id === id);
+        if (!source && target && index < 0) replies.push({
+            ...target
+        });
+        else if (source && !target && index >= 0 && jsonEqual(replies[index], source)) replies.splice(index, 1);
+    }
+    if (replies.length > 0 || void 0 !== to.replies) next.replies = replies;
+    else delete next.replies;
+    return next;
+}
+function cloneDocumentComments(comments) {
+    return comments?.map(cloneDocumentComment);
+}
+function cloneDocumentComment(comment) {
+    return {
+        ...comment,
+        replies: comment.replies?.map((reply)=>({
+                ...reply
+            }))
+    };
+}
 function workOfficeDocumentCollaborationFragment(session) {
     assertDocumentSession(session);
     return session.document.getXmlFragment(session.rootName(DOCUMENT_CONTENT_ROOT));
@@ -16676,7 +17316,7 @@ function documentCollaborationPermissionExtension(session) {
             return [
                 new Plugin({
                     filterTransaction (transaction) {
-                        return 'edit' === session.mode || !transaction.docChanged || isChangeOrigin(transaction);
+                        return 'edit' === session.mode || !transaction.docChanged || isChangeOrigin(transaction) || 'comment' === session.mode && transaction.steps.length > 0 && transaction.steps.every((step)=>(step instanceof AddMarkStep || step instanceof RemoveMarkStep) && 'documentComment' === step.mark.type.name) || 'suggest' === session.mode && workOfficeDocumentSuggestionTransactionAllowed(session, transaction);
                     }
                 })
             ];