@ansonlai/docx-redline-js 0.8.0 → 0.8.2

package/services/document-operation-applier.js

@@ -1,11 +1,11 @@
 import { getDefaultAuthor } from '../adapters/config.js';
-import {
+import {
     normalizeDocumentOperation,
     resolveDocumentOperationAuthor,
     validateDocumentOperation
 } from './document-operation-contract.js';
-import { DocumentOperationSession } from './document-operation-session.js';
-import { compileOperationBatch } from './operation-batch-compiler.js';
+import { DocumentOperationSession } from './document-operation-session.js';
+import { compileOperationBatch } from './operation-batch-compiler.js';
 import {
     validateRevisionToken,
     computeDocumentPartsRevisionToken,
@@ -15,12 +15,13 @@ import {
     applyCommentToParagraphByExactText,
     applyFormattingToParagraphByExactText,
     applyHighlightToParagraphByExactText,
-    applyParagraphFormatToParagraphByExactText,
-    insertIntoRejectedDeletedText,
-    restoreDeletedParagraphByExactText,
-    applyToParagraphByExactText
+    applyParagraphFormatToParagraphByExactText,
+    insertIntoRejectedDeletedText,
+    restoreDeletedParagraphByExactText,
+    applyToParagraphByExactText
 } from './document-operation-mutations.js';
 import { applyCommentReplyToParts } from './comment-replies.js';
+import { anchorReplyInDocument, applyThreadResolutionToParts } from './comment-thread-parts.js';
 import {
     deriveCapturedEntity,
     invalidateAffectedCaptures
@@ -28,27 +29,27 @@ import {
 import {
     createEmptyReceipt,
     reconcileReceiptsAgainstOutput
-} from './receipt-collector.js';
-import { validateRedlineOoxml } from '../core/redline-validation.js';
-import { subtractValidationIssueMultiset, validationErrors } from '../core/validation-delta.js';
-import { normalizeErrorWithRecovery } from './error-recovery.js';
-import { extractCanonicalParagraphText } from '../core/paragraph-text.js';
-import { buildLocalizedReplacementChange } from './localized-replacement-compiler.js';
-
-export function normalizeOperationError(error, context = {}) {
-    return normalizeErrorWithRecovery(error, context);
-}
+} from './receipt-collector.js';
+import { validateRedlineOoxml } from '../core/redline-validation.js';
+import { subtractValidationIssueMultiset, validationErrors } from '../core/validation-delta.js';
+import { normalizeErrorWithRecovery } from './error-recovery.js';
+import { extractCanonicalParagraphText } from '../core/paragraph-text.js';
+import { buildLocalizedReplacementChange } from './localized-replacement-compiler.js';
+
+export function normalizeOperationError(error, context = {}) {
+    return normalizeErrorWithRecovery(error, context);
+}
 
 /**
  * Validates and dispatches one structured operation against full document XML.
  * Result metadata is assembled here so every mutation path exposes the same
  * */
-export async function applyOperationToDocumentXml(documentXml, op, author, runtimeContext = null, options = {}) {
-    const operationIndex = typeof options._operationIndex === 'number' ? options._operationIndex : 1;
-    const errorContext = {
-        operationIndex,
-        ...(typeof op?.operationId === 'string' ? { operationId: op.operationId } : {})
-    };
+export async function applyOperationToDocumentXml(documentXml, op, author, runtimeContext = null, options = {}) {
+    const operationIndex = typeof options._operationIndex === 'number' ? options._operationIndex : 1;
+    const errorContext = {
+        operationIndex,
+        ...(typeof op?.operationId === 'string' ? { operationId: op.operationId } : {})
+    };
     const validation = validateDocumentOperation(op);
     if (!validation.valid) {
         const authorUsed = resolveDocumentOperationAuthor(op, author, getDefaultAuthor());
@@ -56,33 +57,34 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
             documentXml,
             hasChanges: false,
             status: 'error',
-            error: normalizeOperationError(validation.error, errorContext),
+            error: normalizeOperationError(validation.error, errorContext),
             operationType: normalizeDocumentOperation(op).operationKind,
             authorUsed,
             receipt: createEmptyReceipt(operationIndex, op?.operationId, authorUsed, 'refused')
         };
     }
 
-    let operation = validation.operation || normalizeDocumentOperation(op);
+    let operation = validation.operation || normalizeDocumentOperation(op);
     const authorUsed = resolveDocumentOperationAuthor(operation, author, getDefaultAuthor());
 
-    if (
-        operation.operationKind !== 'comment_reply'
-        && operation.operationKind !== 'rejected-insert'
-        && operation.operationKind !== 'restore'
-        && (
-            operation.targetDescriptor?.revisionView === 'rejected'
-            || operation.targetEndDescriptor?.revisionView === 'rejected'
-        )
-    ) {
+    if (
+        operation.operationKind !== 'comment_reply'
+        && operation.operationKind !== 'comment_resolve'
+        && operation.operationKind !== 'rejected-insert'
+        && operation.operationKind !== 'restore'
+        && (
+            operation.targetDescriptor?.revisionView === 'rejected'
+            || operation.targetEndDescriptor?.revisionView === 'rejected'
+        )
+    ) {
         return {
             documentXml,
             hasChanges: false,
             status: 'error',
-            error: normalizeOperationError({
-                code: 'UNSUPPORTED_REVISION_VIEW_MUTATION',
-                message: 'Targeting rejected revision view for mutation is not supported yet.'
-            }, errorContext),
+            error: normalizeOperationError({
+                code: 'UNSUPPORTED_REVISION_VIEW_MUTATION',
+                message: 'Targeting rejected revision view for mutation is not supported yet.'
+            }, errorContext),
             operationType: operation.operationKind,
             authorUsed,
             receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
@@ -96,10 +98,10 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 documentXml,
                 hasChanges: false,
                 status: 'error',
-                error: normalizeOperationError({
-                    code: tokenValidation.error?.code || 'INVALID_REVISION_TOKEN',
-                    message: tokenValidation.error?.message || 'Invalid revision token.'
-                }, errorContext),
+                error: normalizeOperationError({
+                    code: tokenValidation.error?.code || 'INVALID_REVISION_TOKEN',
+                    message: tokenValidation.error?.message || 'Invalid revision token.'
+                }, errorContext),
                 operationType: operation.operationKind,
                 authorUsed,
                 receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
@@ -110,10 +112,10 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 documentXml,
                 hasChanges: false,
                 status: 'error',
-                error: normalizeOperationError({
-                    code: 'REVISION_TOKEN_SCOPE_MISMATCH',
-                    message: `Revision token scope mismatch: expected 'document-parts', got '${options.expectedRevision.scope}'.`
-                }, errorContext),
+                error: normalizeOperationError({
+                    code: 'REVISION_TOKEN_SCOPE_MISMATCH',
+                    message: `Revision token scope mismatch: expected 'document-parts', got '${options.expectedRevision.scope}'.`
+                }, errorContext),
                 operationType: operation.operationKind,
                 authorUsed,
                 receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
@@ -131,12 +133,12 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 documentXml,
                 hasChanges: false,
                 status: 'error',
-                error: normalizeOperationError({
-                    code: 'REVISION_MISMATCH',
-                    message: `Document revision mismatch: expected '${options.expectedRevision.value}', current is '${currentToken.value}'.`,
-                    expectedRevision: options.expectedRevision,
-                    currentRevision: currentToken
-                }, errorContext),
+                error: normalizeOperationError({
+                    code: 'REVISION_MISMATCH',
+                    message: `Document revision mismatch: expected '${options.expectedRevision.value}', current is '${currentToken.value}'.`,
+                    expectedRevision: options.expectedRevision,
+                    currentRevision: currentToken
+                }, errorContext),
                 operationType: operation.operationKind,
                 authorUsed,
                 receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
@@ -147,67 +149,67 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
     const session = options?._documentOperationSession instanceof DocumentOperationSession
         ? options._documentOperationSession
         : new DocumentOperationSession(documentXml, options);
-    if (!session.valid) {
+    if (!session.valid) {
         return {
             documentXml,
             hasChanges: false,
             status: 'error',
-            error: normalizeOperationError(session.parseResult.error, errorContext),
+            error: normalizeOperationError(session.parseResult.error, errorContext),
             warnings: session.parseResult.warnings,
             operationType: operation.operationKind,
             authorUsed,
             receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
-        };
-    }
-
-    if (
-        Array.isArray(operation.replacements)
-        || (operation.operationKind === 'restore' && op?.modified === undefined)
-    ) {
-        const compilation = compileOperationBatch(session.document, [op], {
-            strictTargets: options.strictTargets !== false,
-            onInfo: options.onInfo,
-            onWarn: options.onWarn
-        });
-        const compilationError = compilation.bindings[0]?.error || compilation.conflicts[0] || null;
-        if (compilationError) {
-            return {
-                documentXml,
-                hasChanges: false,
-                status: 'error',
-                error: normalizeOperationError(compilationError, errorContext),
-                operationType: operation.operationKind,
-                authorUsed,
-                receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
-            };
-        }
-        const compiledValidation = validateDocumentOperation(compilation.compiledOperations[0]);
-        if (!compiledValidation.valid) {
-            return {
-                documentXml,
-                hasChanges: false,
-                status: 'error',
-                error: normalizeOperationError(compiledValidation.error, errorContext),
-                operationType: operation.operationKind,
-                authorUsed,
-                receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
-            };
-        }
-        session.sourceTargetRegistry = compilation.registry;
-        operation = compiledValidation.operation;
-    }
-
-    const resolutionCapture = {};
-    let localizedChange = null;
+        };
+    }
+
+    if (
+        Array.isArray(operation.replacements)
+        || (operation.operationKind === 'restore' && op?.modified === undefined)
+    ) {
+        const compilation = compileOperationBatch(session.document, [op], {
+            strictTargets: options.strictTargets !== false,
+            onInfo: options.onInfo,
+            onWarn: options.onWarn
+        });
+        const compilationError = compilation.bindings[0]?.error || compilation.conflicts[0] || null;
+        if (compilationError) {
+            return {
+                documentXml,
+                hasChanges: false,
+                status: 'error',
+                error: normalizeOperationError(compilationError, errorContext),
+                operationType: operation.operationKind,
+                authorUsed,
+                receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
+            };
+        }
+        const compiledValidation = validateDocumentOperation(compilation.compiledOperations[0]);
+        if (!compiledValidation.valid) {
+            return {
+                documentXml,
+                hasChanges: false,
+                status: 'error',
+                error: normalizeOperationError(compiledValidation.error, errorContext),
+                operationType: operation.operationKind,
+                authorUsed,
+                receipt: createEmptyReceipt(operationIndex, operation.operationId, authorUsed, 'refused')
+            };
+        }
+        session.sourceTargetRegistry = compilation.registry;
+        operation = compiledValidation.operation;
+    }
+
+    const resolutionCapture = {};
+    let localizedChange = null;
     const savepoint = session.createSavepoint();
     session.receiptCollector?.beginOperation(
         operationIndex,
         operation.operationId,
         authorUsed
     );
-    const operationWarnings = Array.isArray(operation._compiledWarnings)
-        ? [...operation._compiledWarnings]
-        : [];
+    const operationWarnings = Array.isArray(operation._compiledWarnings)
+        ? [...operation._compiledWarnings]
+        : [];
     const operationOptions = {
         ...options,
         ...(typeof operation.generateRedlines === 'boolean' ? { generateRedlines: operation.generateRedlines } : {}),
@@ -217,12 +219,12 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
         pairReplacements: typeof operation.pairReplacements === 'boolean' ? operation.pairReplacements : (options.pairReplacements !== false),
         ...(operation.insertionAffinity ? { insertionAffinity: operation.insertionAffinity } : {}),
         ...(operation.formattingRevisionPolicy ? { formattingRevisionPolicy: operation.formattingRevisionPolicy } : {}),
-        targetDescriptor: operation.targetDescriptor,
-        targetEndDescriptor: operation.targetEndDescriptor,
-        _compiledSourceId: operation._compiledSourceId || null,
-        _compiledSourceEndId: operation._compiledSourceEndId || null,
-        _compiledResolvedBy: operation._compiledResolvedBy || null,
-        _sourceTargetRegistry: session.sourceTargetRegistry || null,
+        targetDescriptor: operation.targetDescriptor,
+        targetEndDescriptor: operation.targetEndDescriptor,
+        _compiledSourceId: operation._compiledSourceId || null,
+        _compiledSourceEndId: operation._compiledSourceEndId || null,
+        _compiledResolvedBy: operation._compiledResolvedBy || null,
+        _sourceTargetRegistry: session.sourceTargetRegistry || null,
         _resolutionCapture: resolutionCapture,
         _revisionIdAllocator: session.revisionIdAllocator,
         _documentOperationSession: session,
@@ -253,6 +255,7 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 result = applyCommentReplyToParts({
                     commentsXml: existingCommentsXml,
                     commentsExtendedXml: existingExtendedXml,
+                    documentXml,
                     parentCommentId: operation.parentCommentId,
                     commentId,
                     commentContent: operation.commentContent,
@@ -260,8 +263,33 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                     date: operation.date || new Date().toISOString()
                 });
                 result.documentXml = documentXml;
-                if (result.hasChanges && session.receiptCollector) session.receiptCollector.recordComment(commentId);
+                if (result.status !== 'error' && result.hasChanges) {
+                    // Word only shows a reply that has its own range/reference markers in the body.
+                    if (!session.document || !anchorReplyInDocument(session.document, result.threadCommentIds, commentId)) {
+                        result = { documentXml, hasChanges: false, status: 'error', error: { code: 'PARENT_ANCHOR_NOT_FOUND', message: `Comment '${operation.parentCommentId}' has no anchor in the document body, so a reply cannot be placed.` } };
+                    } else if (session.receiptCollector) {
+                        session.receiptCollector.recordComment(commentId);
+                    }
+                }
             }
+        } else if (operation.operationKind === 'comment_resolve') {
+            const resolution = applyThreadResolutionToParts({
+                commentsXml: session.commentsXml || runtimeContext?.commentsXml || options.commentsXml,
+                commentsExtendedXml: session.commentsExtendedXml || runtimeContext?.commentsExtendedXml || options.commentsExtendedXml,
+                commentId: operation.commentId,
+                resolved: operation.resolved !== false
+            });
+            result = resolution.status === 'error'
+                ? { documentXml, hasChanges: false, status: 'error', error: resolution.error }
+                : {
+                    documentXml,
+                    hasChanges: resolution.hasChanges,
+                    ...(resolution.commentsXml ? { commentsXml: resolution.commentsXml, commentsXmlMode: 'replace' } : {}),
+                    ...(resolution.commentsExtendedXml ? { commentsExtendedXml: resolution.commentsExtendedXml, commentsExtendedXmlMode: 'replace' } : {}),
+                    resolved: resolution.resolved,
+                    threadRootId: resolution.threadRootId,
+                    commentIds: resolution.commentIds
+                };
         } else if (operation.operationKind === 'highlight') {
             result = await applyHighlightToParagraphByExactText(
                 documentXml,
@@ -305,29 +333,29 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 runtimeContext,
                 operationOptions
             );
-        } else if (operation.operationKind === 'rejected-insert') {
-            result = await insertIntoRejectedDeletedText(
-                documentXml,
-                operation.target,
-                operation.anchor,
-                operation.modified,
-                authorUsed,
-                operation.targetRef,
-                runtimeContext,
-                operationOptions
-            );
-        } else if (operation.operationKind === 'restore') {
-            result = await restoreDeletedParagraphByExactText(
-                documentXml,
-                operation.target,
-                operation.modified,
-                authorUsed,
-                operation.targetRef,
-                operation.targetEndRef,
-                runtimeContext,
-                operationOptions
-            );
-        } else {
+        } else if (operation.operationKind === 'rejected-insert') {
+            result = await insertIntoRejectedDeletedText(
+                documentXml,
+                operation.target,
+                operation.anchor,
+                operation.modified,
+                authorUsed,
+                operation.targetRef,
+                runtimeContext,
+                operationOptions
+            );
+        } else if (operation.operationKind === 'restore') {
+            result = await restoreDeletedParagraphByExactText(
+                documentXml,
+                operation.target,
+                operation.modified,
+                authorUsed,
+                operation.targetRef,
+                operation.targetEndRef,
+                runtimeContext,
+                operationOptions
+            );
+        } else {
             result = await applyToParagraphByExactText(
                 documentXml,
                 operation.target,
@@ -377,72 +405,72 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                     operationReceipt.warnings.push(String(w));
                 }
             }
-        } else {
-            const beforeValidation = validateRedlineOoxml(savepoint.document);
-            const afterValidation = validateRedlineOoxml(session.document);
-            const generatedIssues = subtractValidationIssueMultiset(afterValidation.issues, beforeValidation.issues);
-            const generatedErrors = validationErrors(generatedIssues);
-            if (generatedErrors.length > 0) {
-                session.restoreSavepoint(savepoint);
-                operationReceipt = createEmptyReceipt(
-                    operationIndex,
-                    operation.operationId,
-                    authorUsed,
-                    'refused'
-                );
-                const codes = [...new Set(generatedErrors.map(issue => issue.code))].join(', ');
-                return {
-                    documentXml,
-                    hasChanges: false,
-                    status: 'error',
-                    error: normalizeOperationError({
-                        code: 'GENERATED_OOXML_INVALID',
-                        stage: 'validation',
-                        message: `Operation introduced invalid OOXML (${codes}).`,
-                        generatedIssues: generatedErrors
-                    }, errorContext),
-                    operationType: operation.operationKind,
-                    authorUsed,
-                    receipt: operationReceipt,
-                    ...resolutionCapture
-                };
-            }
-            session.markMutationCommitted(operation.operationKind !== 'comment_reply');
-            if (operation._compiledSourceId && session.sourceTargetRegistry) {
-                session.sourceTargetRegistry.commitMutation(
-                    operation._compiledSourceId,
-                    operationOptions._mutationRemovedNodes,
-                    operationOptions._mutationLiveNodes,
-                    operationIndex
-                );
-            }
-            if (operation._localizedReplacementCompilation) {
-                let outputText = null;
-                if (operation.operationKind === 'restore') {
-                    const restoredParagraph = operationOptions._mutationLiveNodes.find(node => node?.localName === 'p');
-                    if (restoredParagraph) {
-                        outputText = extractCanonicalParagraphText(restoredParagraph, {
-                            revisionView: 'accepted'
-                        });
-                    }
-                } else if (operation._compiledSourceId && session.sourceTargetRegistry) {
-                    const bound = session.sourceTargetRegistry.resolve(
-                        operation._compiledSourceId,
-                        session.document
-                    );
-                    if (bound.paragraph) {
-                        outputText = extractCanonicalParagraphText(bound.paragraph, {
-                            revisionView: 'accepted'
-                        });
-                    }
-                }
-                localizedChange = buildLocalizedReplacementChange(
-                    operation._localizedReplacementCompilation,
-                    outputText,
-                    resolutionCapture.resolvedTarget || {},
-                    operation._speculativeContext || null
-                );
-            }
+        } else {
+            const beforeValidation = validateRedlineOoxml(savepoint.document);
+            const afterValidation = validateRedlineOoxml(session.document);
+            const generatedIssues = subtractValidationIssueMultiset(afterValidation.issues, beforeValidation.issues);
+            const generatedErrors = validationErrors(generatedIssues);
+            if (generatedErrors.length > 0) {
+                session.restoreSavepoint(savepoint);
+                operationReceipt = createEmptyReceipt(
+                    operationIndex,
+                    operation.operationId,
+                    authorUsed,
+                    'refused'
+                );
+                const codes = [...new Set(generatedErrors.map(issue => issue.code))].join(', ');
+                return {
+                    documentXml,
+                    hasChanges: false,
+                    status: 'error',
+                    error: normalizeOperationError({
+                        code: 'GENERATED_OOXML_INVALID',
+                        stage: 'validation',
+                        message: `Operation introduced invalid OOXML (${codes}).`,
+                        generatedIssues: generatedErrors
+                    }, errorContext),
+                    operationType: operation.operationKind,
+                    authorUsed,
+                    receipt: operationReceipt,
+                    ...resolutionCapture
+                };
+            }
+            session.markMutationCommitted(true);
+            if (operation._compiledSourceId && session.sourceTargetRegistry) {
+                session.sourceTargetRegistry.commitMutation(
+                    operation._compiledSourceId,
+                    operationOptions._mutationRemovedNodes,
+                    operationOptions._mutationLiveNodes,
+                    operationIndex
+                );
+            }
+            if (operation._localizedReplacementCompilation) {
+                let outputText = null;
+                if (operation.operationKind === 'restore') {
+                    const restoredParagraph = operationOptions._mutationLiveNodes.find(node => node?.localName === 'p');
+                    if (restoredParagraph) {
+                        outputText = extractCanonicalParagraphText(restoredParagraph, {
+                            revisionView: 'accepted'
+                        });
+                    }
+                } else if (operation._compiledSourceId && session.sourceTargetRegistry) {
+                    const bound = session.sourceTargetRegistry.resolve(
+                        operation._compiledSourceId,
+                        session.document
+                    );
+                    if (bound.paragraph) {
+                        outputText = extractCanonicalParagraphText(bound.paragraph, {
+                            revisionView: 'accepted'
+                        });
+                    }
+                }
+                localizedChange = buildLocalizedReplacementChange(
+                    operation._localizedReplacementCompilation,
+                    outputText,
+                    resolutionCapture.resolvedTarget || {},
+                    operation._speculativeContext || null
+                );
+            }
             if (operation.captureKey && session.captureTable) {
                 session.captureTable.set(
                     operation.captureKey,
@@ -479,7 +507,7 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                         documentXml,
                         hasChanges: false,
                         status: 'error',
-                        error: normalizeOperationError(reconciliation.error, errorContext),
+                        error: normalizeOperationError(reconciliation.error, errorContext),
                         warnings: [reconciliation.error.message],
                         operationType: operation.operationKind,
                         authorUsed,
@@ -489,18 +517,18 @@ export async function applyOperationToDocumentXml(documentXml, op, author, runti
                 }
             }
         }
-        if (result?.error) result.error = normalizeOperationError(result.error, errorContext);
-        return {
+        if (result?.error) result.error = normalizeOperationError(result.error, errorContext);
+        return {
             ...result,
             operationType: operation.operationKind,
             authorUsed,
-            receipt: operationReceipt,
-            ...(localizedChange ? { change: localizedChange } : {}),
-            ...resolutionCapture
+            receipt: operationReceipt,
+            ...(localizedChange ? { change: localizedChange } : {}),
+            ...resolutionCapture
         };
     } catch (error) {
         session.restoreSavepoint(savepoint);
-        const normalizedError = normalizeOperationError(error, errorContext);
+        const normalizedError = normalizeOperationError(error, errorContext);
         const operationReceipt = createEmptyReceipt(
             operationIndex,
             operation.operationId,

package/services/document-operation-contract.js

@@ -20,6 +20,7 @@ const SUPPORTED_OPERATION_TYPES = new Set([
     'delete',
     'comment',
     'comment_reply',
+    'comment_resolve',
     'highlight'
 ]);
 
@@ -43,11 +44,16 @@ function nonEmptyString(value) {
     return typeof value === 'string' && value.trim().length > 0;
 }
 
+/** Operations that address an existing comment thread by id instead of targeting a paragraph. */
+export function isCommentThreadOperationKind(kind) {
+    return kind === 'comment_reply' || kind === 'comment_resolve';
+}
+
 export function getCanonicalOperationType(operation) {
     const type = operation?.type;
     if (type === 'insert' && operation?.target?.revisionView === 'rejected') return 'rejected-insert';
     if (type === 'restore') return 'restore';
-    if (type === 'comment' || type === 'comment_reply' || type === 'highlight') return type;
+    if (type === 'comment' || type === 'comment_reply' || type === 'comment_resolve' || type === 'highlight') return type;
     if (type === 'paragraph-format') return 'paragraph-format';
     if (type === 'character-format' || (type === 'format' && (operation?.textToFormat != null || operation?.properties != null))) return 'format';
     return 'redline';
@@ -191,7 +197,7 @@ export function validateDocumentOperation(operation) {
 
     const target = normalized.targetDescriptor;
     if (
-        normalized.operationKind !== 'comment_reply'
+        !isCommentThreadOperationKind(normalized.operationKind)
         && !nonEmptyString(target.text)
         && target.index == null
         && !target.paragraphId
@@ -460,6 +466,15 @@ export function validateDocumentOperation(operation) {
         }
     }
 
+    if (normalized.operationKind === 'comment_resolve') {
+        if (!nonEmptyString(String(normalized.commentId ?? ''))) {
+            return { valid: false, error: { code: 'INVALID_OPERATION', message: 'Comment resolve operations require a "commentId".' } };
+        }
+        if (normalized.resolved != null && typeof normalized.resolved !== 'boolean') {
+            return { valid: false, error: { code: 'INVALID_OPERATION', message: 'Comment resolve "resolved" must be a boolean when provided.' } };
+        }
+    }
+
     if (normalized.operationKind === 'highlight') {
         if (!nonEmptyString(normalized.textToHighlight)) {
             return {

package/services/error-recovery.js

@@ -35,6 +35,12 @@ const RULES = Object.freeze({
     STRUCTURED_CONTENT_INVALID: ['request', 'request_fixable', 'change_request'],
     UNSUPPORTED_INSERTION_AFFINITY: ['request', 'request_fixable', 'change_request'],
     EXISTING_REVISIONS: ['target-safety', 'policy_choice_required', 'set_option'],
+    PART_NOT_FOUND: ['target-resolution', 'target_refresh_required', 'reinspect'],
+    PART_AMBIGUOUS: ['target-resolution', 'candidate_selection_required', 'choose_candidate'],
+    COMMENT_IN_HEADER_FOOTER: ['request', 'request_fixable', 'change_request'],
+    FIELD_EDIT_REFUSED: ['target-safety', 'request_fixable', 'change_request'],
+    COMMENT_NOT_FOUND: ['target-resolution', 'target_refresh_required', 'reinspect'],
+    PARENT_ANCHOR_NOT_FOUND: ['target-resolution', 'target_refresh_required', 'reinspect'],
     COMMENTED_CONTENT_MERGE: ['target-safety', 'user_authorization_required', 'resolve_comments'],
     COMMENTED_CONTENT_DELETE: ['target-safety', 'user_authorization_required', 'resolve_comments'],
     OVERLAPPING_SOURCE_TARGETS: ['batch-compilation', 'source_conflict', 'consolidate_operations'],