@superdoc/mcp 1.8.0-next.6 → 1.8.0-next.7

package/dist/index.js

@@ -31616,7 +31616,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.21.0-next.6";
+var SDK_VERSION = "2.21.0-next.7";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -233558,9 +233558,9 @@ function hasOverlappingTrackedWrapper(xml, target) {
   const targetXml = xml.slice(target.byteStart, target.byteEnd);
   const targetOpenEnd = targetXml.indexOf(">");
   const targetCloseStart = targetXml.lastIndexOf("</");
-  if (targetOpenEnd < 0 || targetCloseStart < targetOpenEnd || /<[\w.-]+:(?:ins|del|moveFrom|moveTo)\b/.test(targetXml.slice(targetOpenEnd + 1, targetCloseStart)))
+  if (targetOpenEnd < 0 || targetCloseStart < targetOpenEnd || new RegExp(`<(?:${RAW_XML_NCNAME_PATTERN}:)?(?:ins|del|moveFrom|moveTo)\\b`, "u").test(targetXml.slice(targetOpenEnd + 1, targetCloseStart)))
     return true;
-  const tokenRe = /<(\/?)([\w.-]+):(ins|del|moveFrom|moveTo)\b[^>]*(\/?)>/g;
+  const tokenRe = new RegExp(`<(\\/?)(?:(${RAW_XML_NCNAME_PATTERN}):)?(ins|del|moveFrom|moveTo)\\b[^>]*(\\/?)>`, "gu");
   let depth = 0;
   for (let match = tokenRe.exec(xml);match; match = tokenRe.exec(xml)) {
     if (match.index >= target.byteStart)
@@ -235121,6 +235121,154 @@ var init_image_review_resources = __esm(() => {
   UNCHANGED_IMAGE_OWNER = Symbol("unchanged-image-review-owner");
 });
 
+// ../../../v2/editor-core/dist/document/transactions/tracked-changes/accepted-insertion-replacement.js
+function indexReplacementSource(input) {
+  const parsed = input.elements();
+  if (parsed.errors.length)
+    return null;
+  const rangesByStart = new Map;
+  const parentByStart = new Map;
+  const previousByStart = new Map;
+  const nextByStart = new Map;
+  const childrenByStart = new Map;
+  const parents = [];
+  for (const range of [...parsed.ranges].sort((a, b) => a.start - b.start || b.end - a.end)) {
+    while (parents.length && range.start >= parents.at(-1).end)
+      parents.pop();
+    const parent = parents.at(-1);
+    if (parent) {
+      parentByStart.set(range.start, parent);
+      const children = childrenByStart.get(parent.start) ?? [];
+      const previous = children.at(-1);
+      if (previous) {
+        previousByStart.set(range.start, previous);
+        nextByStart.set(previous.start, range);
+      }
+      children.push(range);
+      childrenByStart.set(parent.start, children);
+    }
+    rangesByStart.set(range.start, range);
+    parents.push(range);
+  }
+  const fragmentsByStart = new Map(input.catalogFragments.map((f) => [f.byteStart, f]));
+  const selectedStarts = input.selectedFragments.map((f) => f.byteStart).sort((a, b) => a - b);
+  const selectedEnds = input.selectedFragments.map((f) => f.byteEnd).sort((a, b) => a - b);
+  return { rangesByStart, parentByStart, previousByStart, nextByStart, childrenByStart, fragmentsByStart, selectedStarts, selectedEnds };
+}
+function countBefore(values, target, includeEqual = false) {
+  let low = 0;
+  let high = values.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if (values[mid] < target || includeEqual && values[mid] === target)
+      low = mid + 1;
+    else
+      high = mid;
+  }
+  return low;
+}
+function createAcceptedInsertionReplacementResolver(input) {
+  const { xml } = input;
+  let index;
+  return (fragment3) => {
+    if (fragment3.kind !== "ins")
+      return null;
+    const firstStart = fragment3.openEndChar;
+    if (firstStart == null)
+      return null;
+    const firstTagStart = xml.indexOf("<", firstStart);
+    if (firstTagStart < 0 || firstTagStart >= fragment3.byteEnd || xml.slice(firstStart, firstTagStart).trim())
+      return null;
+    const firstTagEnd = xml.indexOf(">", firstTagStart);
+    const firstKind = parseRawXmlElementTag(xml.slice(firstTagStart, firstTagEnd + 1))?.localName;
+    if (firstKind !== "del" && firstKind !== "r")
+      return null;
+    const prefixShape = firstKind === "r";
+    if (index === undefined)
+      index = indexReplacementSource(input);
+    const source = index;
+    if (!source)
+      return null;
+    const outer = source.rangesByStart.get(fragment3.byteStart);
+    if (!outer || outer.end !== fragment3.byteEnd)
+      return null;
+    const childStart = prefixShape ? source.childrenByStart.get(outer.start)?.at(-1)?.start : firstTagStart;
+    const deletion = childStart == null ? undefined : source.fragmentsByStart.get(childStart);
+    if (!deletion || deletion.kind !== "del" || deletion.byteStart <= fragment3.byteStart || deletion.byteEnd >= fragment3.byteEnd)
+      return null;
+    const child = source.rangesByStart.get(deletion.byteStart);
+    if (!child || child.end !== deletion.byteEnd || (prefixShape ? xml.slice(child.end, outer.closeStart).trim() : xml.slice(outer.openEnd, child.start).trim()))
+      return null;
+    const container = source.parentByStart.get(outer.start);
+    if (!container || container.tag.namespaceUri !== NS_W || container.tag.localName !== "p")
+      return null;
+    const adjacent = prefixShape ? source.nextByStart.get(outer.start) : source.previousByStart.get(outer.start);
+    if (!adjacent || adjacent.tag.namespaceUri !== NS_W || adjacent.tag.localName !== "ins" || (prefixShape ? xml.slice(outer.end, adjacent.start).trim() : xml.slice(adjacent.end, outer.start).trim()))
+      return null;
+    const insertion = source.fragmentsByStart.get(adjacent.start);
+    if (!insertion || insertion.kind !== "ins" || insertion.byteEnd !== adjacent.end || insertion.date !== deletion.date || !deletion.date)
+      return null;
+    const identity = (f) => buildReviewIdentity({ ...f.author, email: f.authorEmail });
+    if (!isSameReviewGroupIdentity(identity(insertion), identity(deletion)) || isSameReviewGroupIdentity(identity(fragment3), identity(deletion)) || !fragment3.author.name || !deletion.author.name || fragment3.author.name === deletion.author.name && (!fragment3.authorEmail || !deletion.authorEmail || fragment3.authorEmail === deletion.authorEmail))
+      return null;
+    const insRsid = readXmlAttribute(adjacent.tag, NS_W, "rsidR")?.value;
+    const delRsid = readXmlAttribute(child.tag, NS_W, "rsidDel")?.value;
+    if (!insRsid || insRsid !== delRsid)
+      return null;
+    if (countBefore(source.selectedStarts, prefixShape ? adjacent.end : outer.end) - countBefore(source.selectedEnds, prefixShape ? outer.start : adjacent.start, true) !== 1)
+      return null;
+    const directChildren3 = (parent, start, end) => {
+      let cursor = start;
+      const direct = [];
+      for (const range of source.childrenByStart.get(parent.start) ?? []) {
+        if (range.end <= start)
+          continue;
+        if (range.start >= end)
+          break;
+        if (range.start < start || range.end > end)
+          return [];
+        if (xml.slice(cursor, range.start).trim())
+          return [];
+        direct.push(range);
+        cursor = range.end;
+      }
+      return xml.slice(cursor, end).trim() ? [] : direct;
+    };
+    const textRuns = (parent, start = parent.openEnd, end = parent.closeStart) => {
+      const runs = directChildren3(parent, start, end);
+      if (xml.slice(start, end).trim() && !runs.length)
+        return false;
+      return runs.every((r) => {
+        if (r.tag.namespaceUri !== NS_W || r.tag.localName !== "r")
+          return false;
+        const content = directChildren3(r, r.openEnd, r.closeStart);
+        return (!xml.slice(r.openEnd, r.closeStart).trim() || content.length > 0) && content.every((element) => element.tag.namespaceUri === NS_W && ["rPr", "t", "delText"].includes(element.tag.localName));
+      });
+    };
+    if (!textRuns(adjacent) || !textRuns(child) || !(prefixShape ? textRuns(outer, outer.openEnd, child.start) : textRuns(outer, child.end)))
+      return null;
+    const deletionContent = closeNamespaceScope(xml.slice(child.openEnd, child.closeStart), child.namespaceBindings, container.namespaceBindings, { referencedOnly: true });
+    if (deletionContent === null)
+      return null;
+    const scopedDeletion = xml.slice(child.start, child.openEnd) + deletionContent + xml.slice(child.closeStart, child.end);
+    const movedDeletion = closeNamespaceScope(scopedDeletion, child.namespaceBindings, container.namespaceBindings, { referencedOnly: true });
+    const exposedRuns = closeNamespaceScope(prefixShape ? xml.slice(outer.openEnd, child.start) : xml.slice(child.end, outer.closeStart), outer.namespaceBindings, container.namespaceBindings, { referencedOnly: true });
+    if (movedDeletion === null || exposedRuns === null)
+      return null;
+    if (prefixShape)
+      return {
+        start: outer.start,
+        end: outer.end,
+        replacement: exposedRuns + movedDeletion + xml.slice(child.end, outer.closeStart)
+      };
+    return { start: adjacent.start, end: outer.end, replacement: movedDeletion + xml.slice(adjacent.start, adjacent.end) + xml.slice(adjacent.end, outer.start) + xml.slice(outer.openEnd, child.start) + exposedRuns };
+  };
+}
+var init_accepted_insertion_replacement = __esm(() => {
+  init_xml_sax();
+  init_xml_namespace_scope();
+});
+
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/compound-move-paragraph.js
 function collectSelectedCompoundMoveWrapperIds(xml, paragraph, selected, paragraphMark) {
   if (selected.length < 2)
@@ -235879,6 +236027,22 @@ function runTrackedChangeDecideCommitWithLookupContext(lookupContext, input, xml
     }
     const decodedSourceLength = workingXml.length;
     const partPartials = partialFragmentByteRanges.get(partUri);
+    const acceptedInsertionReplacements = new Map;
+    if (op.decision === "accept") {
+      const resolveReplacement = createAcceptedInsertionReplacementResolver({
+        xml: sourceXml,
+        catalogFragments: catalog.byPart.get(partUri) ?? [],
+        selectedFragments: sorted,
+        elements: () => xmlAnalysis.original(partUri, sourceXml)
+      });
+      for (const fragment3 of sorted) {
+        if (partPartials?.has(`${fragment3.byteStart}|${fragment3.byteEnd}`))
+          continue;
+        const rewrite = resolveReplacement(fragment3);
+        if (rewrite)
+          acceptedInsertionReplacements.set(trackedChangeFragmentKey(fragment3), rewrite);
+      }
+    }
     const moveRangePairPlan = moveRangePlansByPart.get(partUri);
     if (!moveRangePairPlan)
       return rejected13(txId, "patch-precondition-failed");
@@ -236088,6 +236252,9 @@ function runTrackedChangeDecideCommitWithLookupContext(lookupContext, input, xml
       }
       const removedTrackedHyperlink = !specialRewrite && (op.decision === "reject" && f.kind === "ins" || op.decision === "accept" && f.kind === "del" && removesHyperlinkOwner(fOriginal)) ? componentContext || !useImmutableAssembler ? findRemovedTrackedHyperlinkWrapper(activeXml, f, componentContext?.namespaceBindings) : removedTrackedHyperlinks.get(trackedChangeFragmentKey(fOriginal)) ?? null : null;
       let wholeReplacement = result.replacement;
+      const acceptedReplacement = acceptedInsertionReplacements.get(trackedChangeFragmentKey(fOriginal));
+      if (acceptedReplacement)
+        wholeReplacement = acceptedReplacement.replacement;
       if (result.deletedRange) {
         const preserveAdjacentEndBoundaryWIdsForDrop = preserveAdjacentEndBoundaryWIdsForDroppedRange({
           partXml: activeXml,
@@ -236148,8 +236315,9 @@ function runTrackedChangeDecideCommitWithLookupContext(lookupContext, input, xml
         }
       }
       const consumedParentInsertion = !specialRewrite && !componentContext && op.decision === "accept" && f.kind === "del" && isSessionCreatedTextFragment(f, sessionCreatedTrackedChangeRsids, sessionCreatedTrackedChangeWIds) ? emptyParentInsertionConsumedByDeletion(lookupContext, activeXml, f, wholeReplacement) : null;
-      const spliceStart = consumedParentInsertion?.start ?? removedTrackedHyperlink?.start ?? f.byteStart;
-      const spliceEnd = consumedParentInsertion?.end ?? removedTrackedHyperlink?.end ?? f.byteEnd;
+      const acceptedReplacementOffset = f.byteStart - fOriginal.byteStart;
+      const spliceStart = acceptedReplacement ? acceptedReplacement.start + acceptedReplacementOffset : consumedParentInsertion?.start ?? removedTrackedHyperlink?.start ?? f.byteStart;
+      const spliceEnd = acceptedReplacement ? acceptedReplacement.end + acceptedReplacementOffset : consumedParentInsertion?.end ?? removedTrackedHyperlink?.end ?? f.byteEnd;
       if (componentContext && component) {
         componentContext.workingXml = measureSDTxPerf("trackedChangeTextSpliceMs", () => activeXml.slice(0, spliceStart) + wholeReplacement + activeXml.slice(spliceEnd));
         recordSDTxPerf("trackedChangeTextSplices", 1);
@@ -240369,6 +240537,7 @@ var init_compile_tracked_change_decide = __esm(() => {
   init_bibliography_review_resources();
   init_image_review_resources();
   init_decision_xml_analysis();
+  init_accepted_insertion_replacement();
   init_compound_move_paragraph();
   init_prepared_mutation();
   init_patch_substrate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.8.0-next.6",
+  "version": "1.8.0-next.7",
   "description": "Model Context Protocol server for SuperDoc, giving an AI agent tools to read and edit .docx files.",
   "type": "module",
   "license": "AGPL-3.0",
@@ -24,13 +24,13 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@superdoc/sdk": "2.21.0-next.6",
+    "@superdoc/sdk": "2.21.0-next.7",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.24.0-next.6",
-    "@superdoc/docx-engine": "0.23.0-next.6",
+    "superdoc": "2.24.0-next.7",
+    "@superdoc/docx-engine": "0.23.0-next.7",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",