@ansonlai/docx-redline-js 0.5.0 → 0.5.1

package/package.json

@@ -1,123 +1,123 @@
-{
-  "name": "@ansonlai/docx-redline-js",
-  "version": "0.5.0",
-  "description": "Host-independent OOXML reconciliation engine for .docx manipulation with track changes",
-  "license": "MIT",
-  "type": "module",
-  "main": "./index.js",
-  "module": "./index.js",
-  "types": "./index.d.ts",
-  "bin": {
-    "docx-redline": "./bin/docx-redline.js"
-  },
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "import": "./index.js",
-      "default": "./index.js"
-    },
-    "./standalone-runner": {
-      "types": "./services/standalone-operation-runner.d.ts",
-      "import": "./services/standalone-operation-runner.js",
-      "default": "./services/standalone-operation-runner.js"
-    },
-    "./node": {
-      "types": "./node/index.d.ts",
-      "import": "./node/index.js",
-      "default": "./node/index.js"
-    },
-    "./redline-operation-converter": "./orchestration/redline-operation-converter.js",
-    "./adapters/*": "./adapters/*",
-    "./core/*": "./core/*",
-    "./engine/*": "./engine/*",
-    "./pipeline/*": "./pipeline/*",
-    "./services/*": "./services/*",
-    "./orchestration/*": "./orchestration/*"
-  },
-  "files": [
-    "adapters/",
-    "core/",
-    "engine/",
-    "pipeline/",
-    "services/",
-    "node/",
-    "bin/",
-    "orchestration/",
-    "scripts/",
-    "docs/",
-    "index.js",
-    "index.d.ts",
-    "dist/",
-    "ARCHITECTURE.md",
-    "AGENTS.md",
-    "CHANGELOG.md",
-    "README.md",
-    "LICENSE"
-  ],
-  "dependencies": {
-    "diff-match-patch": "^1.0.5"
-  },
-  "peerDependencies": {
-    "@xmldom/xmldom": ">=0.8.0"
-  },
-  "peerDependenciesMeta": {
-    "@xmldom/xmldom": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@xmldom/xmldom": "^0.9.0",
-    "c8": "^12.0.0",
-    "docx-preview": "^0.4.0",
-    "esbuild": "^0.28.1",
-    "eslint": "^10.9.1",
-    "jszip": "^3.10.1",
-    "typescript": "^7.0.2"
-  },
-  "scripts": {
-    "build": "node scripts/build.mjs",
-    "check:types": "tsc -p tsconfig.types.json && node scripts/check-types.mjs",
-    "lint": "eslint index.js adapters core engine pipeline services orchestration scripts tests",
-    "test:coverage": "c8 --reporter=text --reporter=json --reporter=json-summary --reports-dir=coverage node scripts/run-tests.mjs",
-    "coverage:gaps": "node scripts/report-coverage-gaps.mjs",
-    "benchmark:session": "node scripts/benchmark-operation-session.mjs",
-    "benchmark:targeting": "node scripts/benchmark-targeting-hot-paths.mjs",
-    "benchmark:tests": "node scripts/benchmark-test-runner.mjs",
-    "profile:routes": "node scripts/profile-route-selection.mjs",
-    "smoke:word": "powershell -File scripts/word-com-smoke.ps1",
-    "smoke:word:diff": "powershell -File scripts/word-com-differential.ps1",
-    "test:word": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-suite.ps1",
-    "test:word:visual": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-visual-suite.ps1",
-    "test:corpus:word": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-corpus-suite.ps1",
-    "test:corpus:word:visual": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-corpus-visual-suite.ps1",
-    "test:visual:inspect": "node scripts/inspect-visual-evidence.mjs",
-    "test:visual:sample": "node scripts/sample-multimodal-visual-check.mjs",
-    "fixtures:reredline": "node scripts/export-reredline-stress-fixtures.mjs",
-    "corpus:fetch:superdoc": "node scripts/fetch-superdoc-corpus.mjs",
-    "report:word:coverage": "node scripts/report-word-coverage.mjs",
-    "report:test:dashboard": "node scripts/build-test-dashboard.mjs",
-    "review:word:prepare": "node scripts/prepare-word-review.mjs",
-    "docx-redline": "node bin/docx-redline.js",
-    "test": "node scripts/run-tests.mjs",
-    "test:isolation": "node tests/no_word_api_index_check.mjs && node tests/core_dependency_graph_check.mjs",
-    "prepublishOnly": "npm run test:isolation && npm run build"
-  },
-  "keywords": [
-    "docx",
-    "ooxml",
-    "reconciliation",
-    "track-changes",
-    "redlines",
-    "word",
-    "office",
-    "document",
-    "xml"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AnsonLai/docx-redline-js.git"
-  },
-  "engines": {
-    "node": ">=20.0.0"
-  }
-}
+{
+  "name": "@ansonlai/docx-redline-js",
+  "version": "0.5.1",
+  "description": "Host-independent OOXML reconciliation engine for .docx manipulation with track changes",
+  "license": "MIT",
+  "type": "module",
+  "main": "./index.js",
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "bin": {
+    "docx-redline": "./bin/docx-redline.js"
+  },
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
+    },
+    "./standalone-runner": {
+      "types": "./services/standalone-operation-runner.d.ts",
+      "import": "./services/standalone-operation-runner.js",
+      "default": "./services/standalone-operation-runner.js"
+    },
+    "./node": {
+      "types": "./node/index.d.ts",
+      "import": "./node/index.js",
+      "default": "./node/index.js"
+    },
+    "./redline-operation-converter": "./orchestration/redline-operation-converter.js",
+    "./adapters/*": "./adapters/*",
+    "./core/*": "./core/*",
+    "./engine/*": "./engine/*",
+    "./pipeline/*": "./pipeline/*",
+    "./services/*": "./services/*",
+    "./orchestration/*": "./orchestration/*"
+  },
+  "files": [
+    "adapters/",
+    "core/",
+    "engine/",
+    "pipeline/",
+    "services/",
+    "node/",
+    "bin/",
+    "orchestration/",
+    "scripts/",
+    "docs/",
+    "index.js",
+    "index.d.ts",
+    "dist/",
+    "ARCHITECTURE.md",
+    "AGENTS.md",
+    "CHANGELOG.md",
+    "README.md",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "diff-match-patch": "^1.0.5"
+  },
+  "peerDependencies": {
+    "@xmldom/xmldom": ">=0.8.0"
+  },
+  "peerDependenciesMeta": {
+    "@xmldom/xmldom": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@xmldom/xmldom": "^0.9.0",
+    "c8": "^12.0.0",
+    "docx-preview": "^0.4.0",
+    "esbuild": "^0.28.1",
+    "eslint": "^10.9.1",
+    "jszip": "^3.10.1",
+    "typescript": "^7.0.2"
+  },
+  "scripts": {
+    "build": "node scripts/build.mjs",
+    "check:types": "tsc -p tsconfig.types.json && node scripts/check-types.mjs",
+    "lint": "eslint index.js adapters core engine pipeline services orchestration scripts tests",
+    "test:coverage": "c8 --reporter=text --reporter=json --reporter=json-summary --reports-dir=coverage node scripts/run-tests.mjs",
+    "coverage:gaps": "node scripts/report-coverage-gaps.mjs",
+    "benchmark:session": "node scripts/benchmark-operation-session.mjs",
+    "benchmark:targeting": "node scripts/benchmark-targeting-hot-paths.mjs",
+    "benchmark:tests": "node scripts/benchmark-test-runner.mjs",
+    "profile:routes": "node scripts/profile-route-selection.mjs",
+    "smoke:word": "powershell -File scripts/word-com-smoke.ps1",
+    "smoke:word:diff": "powershell -File scripts/word-com-differential.ps1",
+    "test:word": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-suite.ps1",
+    "test:word:visual": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-visual-suite.ps1",
+    "test:corpus:word": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-corpus-suite.ps1",
+    "test:corpus:word:visual": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/word-com-corpus-visual-suite.ps1",
+    "test:visual:inspect": "node scripts/inspect-visual-evidence.mjs",
+    "test:visual:sample": "node scripts/sample-multimodal-visual-check.mjs",
+    "fixtures:reredline": "node scripts/export-reredline-stress-fixtures.mjs",
+    "corpus:fetch:superdoc": "node scripts/fetch-superdoc-corpus.mjs",
+    "report:word:coverage": "node scripts/report-word-coverage.mjs",
+    "report:test:dashboard": "node scripts/build-test-dashboard.mjs",
+    "review:word:prepare": "node scripts/prepare-word-review.mjs",
+    "docx-redline": "node bin/docx-redline.js",
+    "test": "node scripts/run-tests.mjs",
+    "test:isolation": "node tests/no_word_api_index_check.mjs && node tests/core_dependency_graph_check.mjs",
+    "prepublishOnly": "npm run test:isolation && npm run build"
+  },
+  "keywords": [
+    "docx",
+    "ooxml",
+    "reconciliation",
+    "track-changes",
+    "redlines",
+    "word",
+    "office",
+    "document",
+    "xml"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/AnsonLai/docx-redline-js.git"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}

package/scripts/generate-cross-author-slicing-fixtures.ps1

@@ -0,0 +1,256 @@
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+$repoRoot = Split-Path -Parent $PSScriptRoot
+$fixturesDir = Join-Path $repoRoot "tests\fixtures\cross-author-slicing"
+if (-not (Test-Path $fixturesDir)) {
+    New-Item -ItemType Directory -Path $fixturesDir -Force | Out-Null
+}
+
+function Extract-DocumentXml($docxPath, $xmlPath) {
+    $zip = [System.IO.Compression.ZipFile]::OpenRead($docxPath)
+    try {
+        $entry = $zip.GetEntry("word/document.xml")
+        if ($entry) {
+            $reader = New-Object System.IO.StreamReader($entry.Open(), [System.Text.Encoding]::UTF8)
+            try {
+                $xml = $reader.ReadToEnd()
+                [System.IO.File]::WriteAllText($xmlPath, $xml, [System.Text.Encoding]::UTF8)
+            } finally {
+                $reader.Dispose()
+            }
+        }
+    } finally {
+        $zip.Dispose()
+    }
+}
+
+function Save-Triple($doc, [string]$baseName) {
+    $pendingDocx = [string](Join-Path $fixturesDir "$baseName-pending.docx")
+    $acceptedDocx = [string](Join-Path $fixturesDir "$baseName-accepted.docx")
+    $rejectedDocx = [string](Join-Path $fixturesDir "$baseName-rejected.docx")
+    
+    [object]$pRef = $pendingDocx
+    [object]$aRef = $acceptedDocx
+    [object]$rRef = $rejectedDocx
+    [object]$fmt = 16
+    
+    # Save pending
+    $doc.SaveAs2([ref]$pRef, [ref]$fmt)
+    
+    # Accept All
+    $doc.Revisions.AcceptAll()
+    $doc.SaveAs2([ref]$aRef, [ref]$fmt)
+    $doc.Close($false)
+    
+    # Reopen pending and Reject All
+    $reopened = $global:word.Documents.Open([ref]$pRef)
+    $reopened.Revisions.RejectAll()
+    $reopened.SaveAs2([ref]$rRef, [ref]$fmt)
+    $reopened.Close($false)
+    
+    # Extract XML
+    Extract-DocumentXml $pendingDocx (Join-Path $fixturesDir "$baseName-pending.xml")
+    Extract-DocumentXml $acceptedDocx (Join-Path $fixturesDir "$baseName-accepted.xml")
+    Extract-DocumentXml $rejectedDocx (Join-Path $fixturesDir "$baseName-rejected.xml")
+    Write-Host "Saved: $baseName"
+}
+
+function Find-RequiredText($doc, [string]$text, [string]$scenario) {
+    $foundPos = $doc.Content.Text.IndexOf($text)
+    if ($foundPos -lt 0) {
+        throw "Scenario '$scenario' could not find required text '$text'."
+    }
+    return $foundPos
+}
+
+$origUserName = $null
+$origUserInitials = $null
+
+try {
+    $global:word = New-Object -ComObject Word.Application
+    $global:word.Visible = $false
+    $global:word.DisplayAlerts = 0
+    $origUserName = $global:word.UserName
+    $origUserInitials = $global:word.UserInitials
+
+    # -------------------------------------------------------------------------
+    # Scenario 1: insert-interior
+    # Author A (Barry) inserts: "amended by this Agreement."
+    # Author B (Anson) inserts "MASTER " before "Agreement"
+    # -------------------------------------------------------------------------
+    Write-Host "1. insert-interior"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Contract terms "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "amended by this Agreement."
+    
+    # Author B insertion inside Author A's insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    # Find "Agreement" and insert "MASTER " before it
+    $targetText = "Agreement."
+    $foundPos = Find-RequiredText $doc $targetText "insert-interior"
+    $insRange = $doc.Range($foundPos, $foundPos)
+    $insRange.Text = "MASTER "
+    Save-Triple $doc "insert-interior"
+
+    # -------------------------------------------------------------------------
+    # Scenario 2: delete-interior
+    # Author A (Barry) inserts: "The Services will process the Input to generate outputs for Customer."
+    # Author B (Anson) deletes: "generate "
+    # -------------------------------------------------------------------------
+    Write-Host "2. delete-interior"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Background. "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "The Services will process the Input to generate outputs for Customer."
+    
+    # Author B deletion inside Author A's insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    $delWord = "generate "
+    $foundPos = Find-RequiredText $doc $delWord "delete-interior"
+    $delRange = $doc.Range($foundPos, $foundPos + $delWord.Length)
+    $delRange.Delete() | Out-Null
+    Save-Triple $doc "delete-interior"
+
+    # -------------------------------------------------------------------------
+    # Scenario 3: delete-boundary-start
+    # Author A (Barry) inserts: "Notwithstanding the foregoing, the NDA remains in effect."
+    # Author B (Anson) deletes: "Notwithstanding the foregoing, "
+    # -------------------------------------------------------------------------
+    Write-Host "3. delete-boundary-start"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Section 1. "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "Notwithstanding the foregoing, the NDA remains in effect."
+    
+    # Author B deletion at start of insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    $delWord = "Notwithstanding the foregoing, "
+    $foundPos = Find-RequiredText $doc $delWord "delete-boundary-start"
+    $delRange = $doc.Range($foundPos, $foundPos + $delWord.Length)
+    $delRange.Delete() | Out-Null
+    Save-Triple $doc "delete-boundary-start"
+
+    # -------------------------------------------------------------------------
+    # Scenario 4: delete-boundary-end
+    # Author A (Barry) inserts: "subject to Section 2.8 and applicable law."
+    # Author B (Anson) deletes: " and applicable law."
+    # -------------------------------------------------------------------------
+    Write-Host "4. delete-boundary-end"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Compliance: "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "subject to Section 2.8 and applicable law."
+    
+    # Author B deletion at end of insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    $delWord = " and applicable law."
+    $foundPos = Find-RequiredText $doc $delWord "delete-boundary-end"
+    $delRange = $doc.Range($foundPos, $foundPos + $delWord.Length)
+    $delRange.Delete() | Out-Null
+    Save-Triple $doc "delete-boundary-end"
+
+    # -------------------------------------------------------------------------
+    # Scenario 5: delete-straddle-baseline-insertion
+    # Baseline: "Baseline start "
+    # Author A (Barry) inserts: "inserted finish."
+    # Author B (Anson) deletes: "start inserted" (straddling baseline and insertion)
+    # -------------------------------------------------------------------------
+    Write-Host "5. delete-straddle-baseline-insertion"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Baseline start "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "inserted finish."
+    
+    # Author B deletion straddling baseline and insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    $delWord = "start inserted"
+    $foundPos = Find-RequiredText $doc $delWord "delete-straddle-baseline-insertion"
+    $delRange = $doc.Range($foundPos, $foundPos + $delWord.Length)
+    $delRange.Delete() | Out-Null
+    Save-Triple $doc "delete-straddle-baseline-insertion"
+
+    # -------------------------------------------------------------------------
+    # Scenario 6: multi-author-stacked
+    # Baseline: "Provision "
+    # Author A (Barry) inserts: "first draft of the proposal with initial metrics."
+    # Author B (Anson) deletes: "of the proposal "
+    # Author C (Chris) deletes: "initial " from the remaining text
+    # -------------------------------------------------------------------------
+    Write-Host "6. multi-author-stacked"
+    $doc = $global:word.Documents.Add()
+    $doc.TrackRevisions = $false
+    $doc.Range(0, 0).Text = "Provision "
+    
+    # Author A insertion
+    $global:word.UserName = "Barry Plasteras"
+    $global:word.UserInitials = "BP"
+    $doc.TrackRevisions = $true
+    $endR = $doc.Range($doc.Content.End - 1, $doc.Content.End - 1)
+    $endR.Text = "first draft of the proposal with initial metrics."
+    
+    # Author B deletion inside Author A's insertion
+    $global:word.UserName = "Anson Lai"
+    $global:word.UserInitials = "AL"
+    $delWordB = "of the proposal "
+    $foundPosB = Find-RequiredText $doc $delWordB "multi-author-stacked (Author B)"
+    $delRangeB = $doc.Range($foundPosB, $foundPosB + $delWordB.Length)
+    $delRangeB.Delete() | Out-Null
+    
+    # Author C deletion inside Author A's remaining insertion
+    $global:word.UserName = "Chris Davis"
+    $global:word.UserInitials = "CD"
+    $delWordC = "initial "
+    $foundPosC = Find-RequiredText $doc $delWordC "multi-author-stacked (Author C)"
+    $delRangeC = $doc.Range($foundPosC, $foundPosC + $delWordC.Length)
+    $delRangeC.Delete() | Out-Null
+    Save-Triple $doc "multi-author-stacked"
+
+    Write-Host "All 6 fixture triples successfully generated!"
+}
+finally {
+    if ($null -ne $origUserName -and $null -ne $global:word) {
+        $global:word.UserName = $origUserName
+        $global:word.UserInitials = $origUserInitials
+    }
+    if ($null -ne $global:word) {
+        $global:word.Quit()
+        [System.Runtime.InteropServices.Marshal]::ReleaseComObject($global:word) | Out-Null
+    }
+}

package/services/batch-operation-orchestrator.js

@@ -1,7 +1,8 @@
 import { createSerializer, parseOoxmlSafe } from '../adapters/xml-adapter.js';
 import { getDefaultAuthor } from '../adapters/config.js';
-import {
-    normalizeDocumentOperation,
+import {
+    isExistingRevisionsPolicy,
+    normalizeDocumentOperation,
     resolveDocumentOperationAuthor
 } from './document-operation-contract.js';
 import {
@@ -183,15 +184,33 @@ function mergeCommentsXml(existingXml, incomingXml) {
     return serializer.serializeToString(existingDoc);
 }
 
-export async function applyOperationsToDocumentXml(documentXml, operations, author, runtimeContext = null, options = {}) {
+export async function applyOperationsToDocumentXml(documentXml, operations, author, runtimeContext = null, options = {}) {
     const sourceOperations = Array.isArray(operations) ? operations : [];
     const defaultAuthor = getDefaultAuthor();
-    const emptyReceipts = () => sourceOperations.map((op, i) => createEmptyReceipt(
+    const emptyReceipts = () => sourceOperations.map((op, i) => createEmptyReceipt(
         i + 1,
         op?.operationId,
         resolveDocumentOperationAuthor(op, author, defaultAuthor),
         'not_attempted'
-    ));
+    ));
+
+    if (options.existingRevisions != null && !isExistingRevisionsPolicy(options.existingRevisions)) {
+        return {
+            documentXml,
+            hasChanges: false,
+            commentsXml: null,
+            numberingXmlParts: [],
+            results: [],
+            receipts: emptyReceipts(),
+            executionOrder: [],
+            authorsUsed: [],
+            status: 'error',
+            error: {
+                code: 'INVALID_OPERATION',
+                message: `Unsupported existingRevisions policy: "${String(options.existingRevisions)}".`
+            }
+        };
+    }
 
     if (options?.expectedRevision) {
         const tokenValidation = validateRevisionToken(options.expectedRevision);

package/services/document-operation-contract.js

@@ -20,6 +20,18 @@ const SUPPORTED_OPERATION_TYPES = new Set([
     'highlight'
 ]);
 
+export const EXISTING_REVISIONS_POLICIES = Object.freeze([
+    'merge-same-author',
+    'slice-cross-author',
+    'reject-input',
+    'accept-all-first',
+    'accept-all-first-keep-normalized'
+]);
+
+export function isExistingRevisionsPolicy(value) {
+    return EXISTING_REVISIONS_POLICIES.includes(value);
+}
+
 function isRecord(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
@@ -203,6 +215,16 @@ export function validateDocumentOperation(operation) {
         };
     }
 
+    if (normalized.existingRevisions != null && !isExistingRevisionsPolicy(normalized.existingRevisions)) {
+        return {
+            valid: false,
+            error: {
+                code: 'INVALID_OPERATION',
+                message: `existingRevisions must be one of: ${EXISTING_REVISIONS_POLICIES.join(', ')}.`
+            }
+        };
+    }
+
     if (normalized.insertionAffinity != null) {
         if (!isRecord(normalized.insertionAffinity)) {
             return {

package/services/document-operation-mutations.js

@@ -860,11 +860,11 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
         && existingPolicy !== 'accept-all-first'
         && existingPolicy !== 'accept-all-first-keep-normalized'
     ) {
-        if (existingPolicy === 'merge-same-author') {
+        if (existingPolicy === 'merge-same-author' || existingPolicy === 'slice-cross-author') {
             const authors = getTrackedChangeAuthors(targetParagraph);
             const opAuthor = String(author || '').trim().toLowerCase();
             const allSame = authors.length > 0 && authors.every(a => a.trim().toLowerCase() === opAuthor);
-            if (!allSame) {
+            if (!allSame && existingPolicy === 'merge-same-author') {
                 return {
                     documentXml,
                     hasChanges: false,
@@ -876,7 +876,7 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
                     }
                 };
             }
-            const mergeCommentIds = getCommentIdsInElement(targetParagraph);
+            const mergeCommentIds = allSame ? getCommentIdsInElement(targetParagraph) : [];
             if (mergeCommentIds.length > 0) {
                 const comments = commentDetailsForIds(mergeCommentIds, options._existingCommentDetails);
                 return {
@@ -892,6 +892,22 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
                     }
                 };
             }
+            if (!allSame) {
+                const hasMove = targetParagraph.getElementsByTagNameNS(NS_W, 'moveFrom').length > 0
+                    || targetParagraph.getElementsByTagNameNS(NS_W, 'moveTo').length > 0;
+                if (hasMove) {
+                    return {
+                        documentXml,
+                        hasChanges: false,
+                        numberingXml: null,
+                        status: 'error',
+                        error: {
+                            code: 'UNSAFE_REVISION_NESTING',
+                            message: 'Cross-author slicing does not support pending move revisions.'
+                        }
+                    };
+                }
+            }
         } else {
             const hasDel = targetParagraph.getElementsByTagNameNS(NS_W, 'del').length > 0;
             const hasMove = targetParagraph.getElementsByTagNameNS(NS_W, 'moveFrom').length > 0