@superdoc/mcp 1.2.0-next.13 → 1.2.0-next.14

package/dist/index.js

@@ -31314,7 +31314,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.15.0-next.13";
+var SDK_VERSION = "2.15.0-next.14";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -134832,26 +134832,68 @@ function canonicalName(namespace, localName2) {
     return `xml:${localName2}`;
   return namespace ? `{${namespace}}${localName2}` : localName2;
 }
-function computeRunSignature(runXml) {
-  const canonicalXml = canonicalizeXmlForSignature(runXml);
-  const normalized = normalizeRunXmlForSignature(canonicalXml.replace(REVISION_ATTR_RE, (attribute, offset, xml) => {
-    const precedingTag = xml.slice(xml.lastIndexOf("<", offset), offset);
-    return /^<w:proofErr(?:\s|$)/.test(precedingTag) ? attribute : "";
-  }).replace(REVISION_ELEMENT_RE, (markup) => markup.replace(REVISION_ID_ATTR_RE, "")).replace(COMMENT_MARKUP_RE, (markup, name, attributes) => isWordprocessingElement3(name, attributes, canonicalXml) ? "" : markup).replace(NOTE_REFERENCE_MARKUP_RE, (markup, runName, runAttributes, _rPrName, nestedName, nestedAttributes, standaloneName, standaloneAttributes) => {
-    const name = nestedName ?? standaloneName;
-    const attributes = nestedAttributes ?? standaloneAttributes;
-    if (!isWordprocessingElement3(name, attributes, canonicalXml))
-      return markup;
-    if (runName && !isWordprocessingElement3(runName, runAttributes, canonicalXml))
-      return markup;
-    return "";
-  }));
-  let hash2 = 2166136261;
-  for (let i = 0;i < normalized.length; i += 1) {
-    hash2 ^= normalized.charCodeAt(i);
-    hash2 = Math.imul(hash2, 16777619) >>> 0;
+function normalizeBalancedBookmarkIds(canonicalXmls) {
+  const starts = new Map;
+  const ends = new Set;
+  const names = new Set;
+  for (const xml of canonicalXmls) {
+    const tags = [...xml.matchAll(BOOKMARK_TAG_RE)];
+    if (tags.length !== [...xml.matchAll(BOOKMARK_OPENING_RE)].length)
+      return canonicalXmls;
+    for (const tag of tags) {
+      if (tag[1] || !tag[0].endsWith("/>"))
+        return canonicalXmls;
+      const attributes = [...tag[3].matchAll(ATTRIBUTE_RE)];
+      const ids = attributes.filter((attribute) => attribute[1] === "w:id");
+      const bookmarkNames = attributes.filter((attribute) => attribute[1] === "w:name");
+      const id = ids[0]?.[2] ?? ids[0]?.[3];
+      if (ids.length !== 1 || !id || !/^\d+$/u.test(id))
+        return canonicalXmls;
+      if (tag[2] === "Start") {
+        const name = bookmarkNames[0]?.[2] ?? bookmarkNames[0]?.[3];
+        if (bookmarkNames.length !== 1 || !name || starts.has(id) || names.has(name))
+          return canonicalXmls;
+        starts.set(id, name);
+        names.add(name);
+      } else {
+        if (bookmarkNames.length > 0 || !starts.has(id) || ends.has(id))
+          return canonicalXmls;
+        ends.add(id);
+      }
+    }
   }
-  return `v2-run-${hash2.toString(16).padStart(8, "0")}`;
+  if (starts.size !== ends.size)
+    return canonicalXmls;
+  return canonicalXmls.map((xml) => xml.replace(BOOKMARK_TAG_RE, (tag, _closing, _kind, attributes) => {
+    const id = /\bw:id="([^"]*)"/u.exec(attributes)[1];
+    return tag.replace(/\bw:id="[^"]*"/u, `w:id=${JSON.stringify(`bookmark:${starts.get(id)}`)}`);
+  }));
+}
+function computeRunSignatures(runXmls) {
+  const canonicalXmls = normalizeBalancedBookmarkIds(runXmls.map(canonicalizeXmlForSignature));
+  return canonicalXmls.map((canonicalXml) => {
+    const normalized = normalizeRunXmlForSignature(canonicalXml.replace(REVISION_ATTR_RE, (attribute, offset, xml) => {
+      const precedingTag = xml.slice(xml.lastIndexOf("<", offset), offset);
+      return /^<w:proofErr(?:\s|$)/.test(precedingTag) ? attribute : "";
+    }).replace(REVISION_ELEMENT_RE, (markup) => markup.replace(REVISION_ID_ATTR_RE, "")).replace(COMMENT_MARKUP_RE, (markup, name, attributes) => isWordprocessingElement3(name, attributes, canonicalXml) ? "" : markup).replace(NOTE_REFERENCE_MARKUP_RE, (markup, runName, runAttributes, _rPrName, nestedName, nestedAttributes, standaloneName, standaloneAttributes) => {
+      const name = nestedName ?? standaloneName;
+      const attributes = nestedAttributes ?? standaloneAttributes;
+      if (!isWordprocessingElement3(name, attributes, canonicalXml))
+        return markup;
+      if (runName && !isWordprocessingElement3(runName, runAttributes, canonicalXml))
+        return markup;
+      return "";
+    }));
+    let hash2 = 2166136261;
+    for (let i = 0;i < normalized.length; i += 1) {
+      hash2 ^= normalized.charCodeAt(i);
+      hash2 = Math.imul(hash2, 16777619) >>> 0;
+    }
+    return `v2-run-${hash2.toString(16).padStart(8, "0")}`;
+  });
+}
+function computeRunSignature(runXml) {
+  return computeRunSignatures([runXml])[0];
 }
 function normalizeRunXmlForSignature(runXml) {
   const pieces = [];
@@ -134934,7 +134976,7 @@ function isWordprocessingElement3(name, attributes, namespaceContext) {
     return true;
   return (declaration[2] ?? declaration[3] ?? "") === WORDPROCESSINGML_NAMESPACE2;
 }
-var REVISION_ATTR_RE, REVISION_ELEMENT_RE, REVISION_ID_ATTR_RE, COMMENT_MARKUP_RE, PROOFING_BOUNDARY_MARKUP_RE, NOTE_REFERENCE_MARKUP_RE, RUN_RE, RUN_PROPERTIES_RE, EMPTY_RUN_PROPERTIES_RE, TEXTISH_RE, RUN_CONTROL_RE, ATTRIBUTE_RE, WORDPROCESSINGML_NAMESPACE2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", WORDPROCESSINGML_2010_NAMESPACE = "http://schemas.microsoft.com/office/word/2010/wordml", MARKUP_COMPATIBILITY_NAMESPACE = "http://schemas.openxmlformats.org/markup-compatibility/2006", XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace", XML_TAG_RE;
+var REVISION_ATTR_RE, REVISION_ELEMENT_RE, REVISION_ID_ATTR_RE, COMMENT_MARKUP_RE, PROOFING_BOUNDARY_MARKUP_RE, NOTE_REFERENCE_MARKUP_RE, RUN_RE, RUN_PROPERTIES_RE, EMPTY_RUN_PROPERTIES_RE, TEXTISH_RE, RUN_CONTROL_RE, ATTRIBUTE_RE, WORDPROCESSINGML_NAMESPACE2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", WORDPROCESSINGML_2010_NAMESPACE = "http://schemas.microsoft.com/office/word/2010/wordml", MARKUP_COMPATIBILITY_NAMESPACE = "http://schemas.openxmlformats.org/markup-compatibility/2006", XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace", XML_TAG_RE, BOOKMARK_OPENING_RE, BOOKMARK_TAG_RE;
 var init_run_signature = __esm(() => {
   REVISION_ATTR_RE = /\s+(?:w:rsid\w*|w14:paraId|w14:textId)="[^"]*"/g;
   REVISION_ELEMENT_RE = /<w:(?:ins|del|moveFrom|moveTo)\b[^>]*>/g;
@@ -134949,6 +134991,8 @@ var init_run_signature = __esm(() => {
   RUN_CONTROL_RE = /<((?:[\w.-]+:)?(tab|br|cr))\b([^>]*)\/>/g;
   ATTRIBUTE_RE = /([\w.:-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/g;
   XML_TAG_RE = /<(\/?)(([A-Za-z_][\w.-]*)(?::([A-Za-z_][\w.-]*))?)((?:(?:"[^"]*"|'[^']*'|[^>"'])*))>/g;
+  BOOKMARK_OPENING_RE = /<\/?w:bookmark(?:Start|End)\b/g;
+  BOOKMARK_TAG_RE = /<(\/?)w:bookmark(Start|End)\b((?:"[^"]*"|[^">])*)>/g;
 });
 
 // ../../../v2/document-compare/src/note-story-projection.ts
@@ -134960,7 +135004,7 @@ function projectCapturedNoteStoryEntries(value) {
   const ranges = collectWordParagraphRanges(value.notePartXml);
   if (!ranges)
     return null;
-  return ranges.flatMap((range, ordinal) => {
+  const entries = ranges.flatMap((range, ordinal) => {
     if (range.start < noteStart || range.end > noteEnd)
       return [];
     const paragraphXml = value.notePartXml.slice(range.start, range.end);
@@ -134974,12 +135018,13 @@ function projectCapturedNoteStoryEntries(value) {
       text: visibleParagraphText(paragraphXml, range.namespaceBindings),
       headingLevel: metadata2.headingLevel,
       styleId: metadata2.styleId,
-      runSignature: computeRunSignature(runXml),
       runXml,
       paragraphPropertiesXml,
       paragraphPropertiesSignature: computeParagraphPropertiesSignature(paragraphPropertiesXml)
     }];
   });
+  const runSignatures = computeRunSignatures(entries.map((entry) => entry.runXml ?? ""));
+  return entries.map((entry, index) => ({ ...entry, runSignature: runSignatures[index] }));
 }
 function collectWordParagraphRanges(xml) {
   let valid = true;
@@ -355004,8 +355049,12 @@ function projectStories(context, slots) {
     if (family === "footnotes" || family === "endnotes")
       requiredPartBytes(context, story.partUri);
     const paragraphs = readStoryParagraphs(context, story.storyId).filter(isWordprocessingParagraph);
+    const runXmls = paragraphs.map((p) => extractParagraphRunXml(p.rawXml, p.namespaceBindings ?? {}));
+    const runSignatures = computeRunSignatures(runXmls);
+    const runXmlByOrdinal = new Map(paragraphs.map((p, i2) => [p.ordinal, runXmls[i2]]));
+    const runSignatureByOrdinal = new Map(paragraphs.map((p, i2) => [p.ordinal, runSignatures[i2]]));
     const projectEntry2 = (p) => {
-      const runXml = extractParagraphRunXml(p.rawXml, p.namespaceBindings ?? {});
+      const runXml = runXmlByOrdinal.get(p.ordinal);
       const paragraphPropertiesXml = extractParagraphPropertiesXml(p.rawXml, p.namespaceBindings ?? {});
       const blockId = family === "header-footer-parts" && isStructurallyBlankStoryParagraph({ text: p.text, runXml }) ? `${slotKey}::blank:${p.ordinal}` : p.blockId;
       return {
@@ -355014,7 +355063,7 @@ function projectStories(context, slots) {
         text: p.text,
         headingLevel: p.headingLevel,
         styleId: p.styleId,
-        runSignature: computeRunSignature(runXml),
+        runSignature: runSignatureByOrdinal.get(p.ordinal),
         runXml,
         trackedChangeAnnotationKeys: trackedChangeAnnotationKeysForParagraph(context, p),
         paragraphPropertiesXml,
@@ -355087,8 +355136,10 @@ function bodyParagraphStructuralScopes(context, paragraphs) {
 function projectBody(context) {
   const paragraphs = readBodyParagraphs(context).filter(isWordprocessingParagraph);
   const scopes = bodyParagraphStructuralScopes(context, paragraphs);
+  const runXmls = paragraphs.map((p) => extractParagraphRunXml(p.rawXml, p.namespaceBindings ?? {}));
+  const runSignatures = computeRunSignatures(runXmls);
   return paragraphs.map((p, ordinal) => {
-    const runXml = extractParagraphRunXml(p.rawXml, p.namespaceBindings ?? {});
+    const runXml = runXmls[ordinal];
     const paragraphPropertiesXml = extractParagraphPropertiesXml(p.rawXml, p.namespaceBindings ?? {});
     return {
       blockId: p.blockId,
@@ -355097,7 +355148,7 @@ function projectBody(context) {
       text: p.text,
       headingLevel: p.headingLevel,
       styleId: p.styleId,
-      runSignature: computeRunSignature(runXml),
+      runSignature: runSignatures[ordinal],
       runXml,
       trackedChangeAnnotationKeys: trackedChangeAnnotationKeysForParagraph(context, p),
       paragraphPropertiesXml,
@@ -360667,10 +360718,16 @@ function projectMainDocumentBodyEntries(source, options = {}) {
   });
   const scopes = mapBodyParagraphStructuralScopes(tableCatalog, paragraphIndex.entries);
   const namespaceBindingsByByteStart = scanParagraphNamespaceBindingsByByteStart(source.xml);
-  return paragraphIndex.entries.map((entry) => {
-    const rawXml = TD107.decode(bytes.subarray(entry.byteStart, entry.byteEnd));
+  const rawXmls = paragraphIndex.entries.map((entry) => TD107.decode(bytes.subarray(entry.byteStart, entry.byteEnd)));
+  const runXmls = paragraphIndex.entries.map((entry, index2) => {
+    const namespaceBindings = namespaceBindingsByByteStart.get(entry.byteStart) ?? {};
+    return extractParagraphRunXml(rawXmls[index2], namespaceBindings);
+  });
+  const runSignatures = computeRunSignatures(runXmls);
+  return paragraphIndex.entries.map((entry, index2) => {
+    const rawXml = rawXmls[index2];
     const namespaceBindings = namespaceBindingsByByteStart.get(entry.byteStart) ?? {};
-    const runXml = extractParagraphRunXml(rawXml, namespaceBindings);
+    const runXml = runXmls[index2];
     const paragraphPropertiesXml = extractParagraphPropertiesXml(rawXml, namespaceBindings);
     return {
       blockId: entry.blockId,
@@ -360679,7 +360736,7 @@ function projectMainDocumentBodyEntries(source, options = {}) {
       text: readVisibleParagraphText(rawXml),
       headingLevel: paragraphHeadingLevel(rawXml, { paragraphStyleOutlineLevels }),
       styleId: paragraphStyleId(rawXml),
-      runSignature: computeRunSignature(runXml),
+      runSignature: runSignatures[index2],
       runXml,
       paragraphPropertiesXml,
       paragraphPropertiesSignature: computeParagraphPropertiesSignature2(paragraphPropertiesXml)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.2.0-next.13",
+  "version": "1.2.0-next.14",
   "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.15.0-next.13",
+    "@superdoc/sdk": "2.15.0-next.14",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.18.0-next.13",
-    "@superdoc/docx-engine": "0.17.0-next.15",
+    "superdoc": "2.18.0-next.14",
+    "@superdoc/docx-engine": "0.17.0-next.16",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",