@superdoc/mcp 1.8.0-next.3 → 1.8.0-next.5

package/dist/index.js

@@ -31614,7 +31614,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.21.0-next.3";
+var SDK_VERSION = "2.21.0-next.5";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -134064,11 +134064,16 @@ function createParagraphSpanCollector(options) {
   const bookmarkStarts = [];
   const bookmarkEnds = [];
   const openParagraphs = [];
+  const wmlBodyPath = [];
   let storyRoot = null;
   const walkOptions = {
     fragment: options.fragment,
     additionalNamespaces: options.additionalNamespaces,
     onOpenTag(event) {
+      const directBodyChild = wmlBodyPath.at(-1) === true;
+      if (!event.tag.isSelfClosing) {
+        wmlBodyPath.push(event.tag.namespaceUri === NS_W && event.tag.localName === "body");
+      }
       if (!storyRoot && event.tag.namespaceUri === NS_W && STORY_ROOT_LOCAL_NAMES.has(event.tag.localName)) {
         storyRoot = rootFromEvent(event);
       }
@@ -134089,10 +134094,11 @@ function createParagraphSpanCollector(options) {
           openParagraphs.push(paragraphs.length - 1);
         return;
       }
-      if (openParagraphs.length > 0 && event.tag.namespaceUri === NS_W && (event.tag.localName === "bookmarkStart" || event.tag.localName === "bookmarkEnd")) {
+      if ((openParagraphs.length > 0 || directBodyChild) && event.tag.namespaceUri === NS_W && (event.tag.localName === "bookmarkStart" || event.tag.localName === "bookmarkEnd")) {
         const markers = event.tag.localName === "bookmarkStart" ? bookmarkStarts : bookmarkEnds;
         markers.push({
-          paragraphNamespaceBindings: paragraphs[openParagraphs.at(-1)].namespaceBindings,
+          paragraphNamespaceBindings: openParagraphs.length > 0 ? paragraphs[openParagraphs.at(-1)].namespaceBindings : event.namespaceBindings,
+          ...openParagraphs.length === 0 && directBodyChild ? { directBodyChild: true } : {},
           openStart: event.start,
           openEnd: event.end,
           namespaceBindings: event.namespaceBindings
@@ -134100,6 +134106,8 @@ function createParagraphSpanCollector(options) {
       }
     },
     onCloseTag(event) {
+      if (!event.tag.isSelfClosing)
+        wmlBodyPath.pop();
       if (event.tag.isSelfClosing || !isWmlParagraph(event))
         return;
       const index = openParagraphs.pop();
@@ -146808,6 +146816,7 @@ function bindParagraphIndexScanFacts(sourceBytes, facts) {
     previousEnd = byteEnd;
   }
   const bindMarkers = (markers) => markers.map((marker) => ({
+    ...marker.directBodyChild ? { directBodyChild: true } : {},
     markerByteStart: byteByCharOffset.get(marker.openStart),
     markerXml: facts.sourceXml.slice(marker.openStart, marker.openEnd),
     namespaceBindings: marker.namespaceBindings,
@@ -146915,6 +146924,7 @@ function scanParagraphParaIdNormalizationInput(xml, fragmentNamespaces, captureP
       if (captureParagraphIndexFacts && !event.tag.isSelfClosing) {
         elementFrames.push({
           bodyRoot,
+          wmlBodyRoot: event.tag.namespaceUri === NS_W && event.tag.localName === "body",
           ...bodyChildOrdinal == null ? {} : { bodyChildOrdinal },
           ...blockSdtRangeIndex == null ? {} : { blockSdtRangeIndex }
         });
@@ -146925,10 +146935,11 @@ function scanParagraphParaIdNormalizationInput(xml, fragmentNamespaces, captureP
       if (storyRoot == null && event.tag.namespaceUri === NS_W && STORY_ROOT_LOCAL_NAMES2.has(event.tag.localName)) {
         storyRoot = storyRootFromEvent(event);
       }
-      if (captureParagraphIndexFacts && openParagraphs.length > 0 && event.tag.namespaceUri === NS_W && (event.tag.localName === "bookmarkStart" || event.tag.localName === "bookmarkEnd")) {
+      if (captureParagraphIndexFacts && (openParagraphs.length > 0 || parent?.wmlBodyRoot === true) && event.tag.namespaceUri === NS_W && (event.tag.localName === "bookmarkStart" || event.tag.localName === "bookmarkEnd")) {
         const markers = event.tag.localName === "bookmarkStart" ? bookmarkStarts : bookmarkEnds;
         markers.push({
-          paragraphNamespaceBindings: paragraphs[openParagraphs.at(-1)].namespaceBindings,
+          paragraphNamespaceBindings: openParagraphs.length > 0 ? paragraphs[openParagraphs.at(-1)].namespaceBindings : event.namespaceBindings,
+          ...openParagraphs.length === 0 && parent?.wmlBodyRoot === true ? { directBodyChild: true } : {},
           openStart: event.start,
           openEnd: event.end,
           namespaceBindings: event.namespaceBindings
@@ -253350,8 +253361,12 @@ function buildBookmarkCatalogSynchronously(input, includeParagraphFingerprint) {
     markerByteStart: utf8Offsets.byteOffsetAt(tag.openStart),
     markerXml: xml.slice(tag.openStart, tag.openEnd),
     namespaceBindings: tag.namespaceBindings,
-    paragraphNamespaceBindings: tag.paragraphNamespaceBindings
+    paragraphNamespaceBindings: tag.paragraphNamespaceBindings,
+    ...tag.directBodyChild ? { directBodyChild: true } : {}
   }));
+  const bookmarkEnds = bookmarkEndsFromInput(input, paragraphScan, xml);
+  const pairing = createBookmarkPairing();
+  for (const _ of pairBookmarkOccurrences(bookmarkStarts, bookmarkEnds, pairing)) {}
   for (const tag of bookmarkStarts) {
     bookmarkStartTagsRead += 1;
     const projected = projectBookmarkStart({
@@ -253360,16 +253375,24 @@ function buildBookmarkCatalogSynchronously(input, includeParagraphFingerprint) {
       storyId: input.storyId,
       partUri: input.partUri,
       paragraphLocators: paragraphFacts.locators,
-      markerByteStart: tag.markerByteStart
+      markerByteStart: tag.markerByteStart,
+      directBodyChild: tag.directBodyChild === true,
+      followingBodyParagraph: followingBodyParagraph(input.bytes, tag, pairing, paragraphFacts.locators)
     });
-    if (!projected || seenBookmarkIds.has(projected.bookmarkId))
+    if (!projected)
+      continue;
+    if (pairing.overlappingStartBytes.has(projected.markerByteStart)) {
+      seenBookmarkIds.add(projected.bookmarkId);
+      continue;
+    }
+    if (pairing.invalidIds.has(projected.bookmarkId) && seenBookmarkIds.has(projected.bookmarkId))
       continue;
     seenBookmarkIds.add(projected.bookmarkId);
     bookmarks.push(projected);
     if (!byName.has(projected.name))
       byName.set(projected.name, projected);
   }
-  for (const _ of projectBookmarkRanges(input.bytes, bookmarks, bookmarkStarts, bookmarkEndsFromInput(input, paragraphScan, xml), paragraphFacts.locators)) {}
+  for (const _ of projectBookmarkRanges(input.bytes, bookmarks, bookmarkStarts, pairing, paragraphFacts.locators)) {}
   if (!paragraphSource.isCurrent()) {
     throw new Error("bookmark catalog paragraph index changed during build");
   }
@@ -253405,8 +253428,20 @@ async function buildBookmarkCatalogCooperativelyInternal(input) {
     markerByteStart: utf8Offsets.byteOffsetAt(tag.openStart),
     markerXml: xml.slice(tag.openStart, tag.openEnd),
     namespaceBindings: tag.namespaceBindings,
-    paragraphNamespaceBindings: tag.paragraphNamespaceBindings
+    paragraphNamespaceBindings: tag.paragraphNamespaceBindings,
+    ...tag.directBodyChild ? { directBodyChild: true } : {}
   }));
+  const bookmarkEnds = bookmarkEndsFromInput(input, paragraphScan, xml);
+  const pairing = createBookmarkPairing();
+  let markersRead = 0;
+  for (const _ of pairBookmarkOccurrences(bookmarkStarts, bookmarkEnds, pairing)) {
+    markersRead += 1;
+    if (markersRead % BOOKMARK_CHECKPOINT_SIZE === 0) {
+      await input.yieldPoint();
+      if (!paragraphSource.isCurrent() || !input.isCurrent())
+        return null;
+    }
+  }
   for (let index = 0;index < bookmarkStarts.length; index += 1) {
     const tag = bookmarkStarts[index];
     bookmarkStartTagsRead += 1;
@@ -253416,9 +253451,13 @@ async function buildBookmarkCatalogCooperativelyInternal(input) {
       storyId: input.storyId,
       partUri: input.partUri,
       paragraphLocators: paragraphFacts,
-      markerByteStart: tag.markerByteStart
+      markerByteStart: tag.markerByteStart,
+      directBodyChild: tag.directBodyChild === true,
+      followingBodyParagraph: followingBodyParagraph(input.bytes, tag, pairing, paragraphFacts)
     });
-    if (projected && !seenBookmarkIds.has(projected.bookmarkId)) {
+    if (projected && pairing.overlappingStartBytes.has(projected.markerByteStart)) {
+      seenBookmarkIds.add(projected.bookmarkId);
+    } else if (projected && (!pairing.invalidIds.has(projected.bookmarkId) || !seenBookmarkIds.has(projected.bookmarkId))) {
       seenBookmarkIds.add(projected.bookmarkId);
       bookmarks.push(projected);
       if (!byName.has(projected.name))
@@ -253431,7 +253470,7 @@ async function buildBookmarkCatalogCooperativelyInternal(input) {
     }
   }
   let endpointsRead = 0;
-  for (const _ of projectBookmarkRanges(input.bytes, bookmarks, bookmarkStarts, bookmarkEndsFromInput(input, paragraphScan, xml), paragraphFacts)) {
+  for (const _ of projectBookmarkRanges(input.bytes, bookmarks, bookmarkStarts, pairing, paragraphFacts)) {
     endpointsRead += 1;
     if (endpointsRead % ENDPOINT_CHECKPOINT_SIZE === 0) {
       await input.yieldPoint();
@@ -253465,11 +253504,81 @@ function bookmarkEndsFromInput(input, scan, xml) {
     markerByteStart: offsets.byteOffsetAt(tag.openStart),
     markerXml: xml.slice(tag.openStart, tag.openEnd),
     namespaceBindings: tag.namespaceBindings,
-    paragraphNamespaceBindings: tag.paragraphNamespaceBindings
+    paragraphNamespaceBindings: tag.paragraphNamespaceBindings,
+    ...tag.directBodyChild ? { directBodyChild: true } : {}
   }));
 }
-function* projectBookmarkRanges(bytes, bookmarks, starts, ends, paragraphs) {
-  const byId = new Map(bookmarks.map((bookmark) => [bookmark.bookmarkId, bookmark]));
+function createBookmarkPairing() {
+  return {
+    endsByStartByte: new Map,
+    invalidIds: new Set,
+    invalidStartBytes: new Set,
+    overlappingStartBytes: new Set
+  };
+}
+function* pairBookmarkOccurrences(starts, ends, pairing) {
+  const openById = new Map;
+  let startIndex = 0;
+  let endIndex = 0;
+  while (startIndex < starts.length || endIndex < ends.length) {
+    const start = starts[startIndex];
+    const end = ends[endIndex];
+    const isStart = start != null && (end == null || start.markerByteStart < end.markerByteStart);
+    const marker = isStart ? start : end;
+    const id = readWordAttribute3(marker.markerXml, "id", marker.namespaceBindings);
+    if (isStart)
+      startIndex += 1;
+    else
+      endIndex += 1;
+    if (id != null) {
+      const open2 = openById.get(id);
+      if (isStart) {
+        if (open2) {
+          pairing.invalidIds.add(id);
+          pairing.invalidStartBytes.add(open2.markerByteStart);
+          pairing.overlappingStartBytes.add(open2.markerByteStart);
+          pairing.overlappingStartBytes.add(marker.markerByteStart);
+        } else
+          openById.set(id, marker);
+      } else if (open2) {
+        pairing.endsByStartByte.set(open2.markerByteStart, marker);
+        openById.delete(id);
+      } else
+        pairing.invalidIds.add(id);
+    }
+    yield;
+  }
+  for (const [id, start] of openById) {
+    pairing.invalidIds.add(id);
+    pairing.invalidStartBytes.add(start.markerByteStart);
+  }
+}
+function followingBodyParagraph(bytes, start, pairing, paragraphs) {
+  if (!start.directBodyChild || !/\/\s*>$/.test(start.markerXml))
+    return null;
+  const id = readWordAttribute3(start.markerXml, "id", start.namespaceBindings);
+  const end = pairing.endsByStartByte.get(start.markerByteStart);
+  if (id == null || pairing.invalidStartBytes.has(start.markerByteStart) || !end?.directBodyChild || !/\/\s*>$/.test(end.markerXml))
+    return null;
+  const startEnd = start.markerByteStart + TE40.encode(start.markerXml).length;
+  if (!/^\s*$/.test(TD75.decode(bytes.subarray(startEnd, end.markerByteStart))))
+    return null;
+  const endEnd = end.markerByteStart + TE40.encode(end.markerXml).length;
+  let low = 0;
+  let high = paragraphs.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if (paragraphs[mid].byteStart < endEnd)
+      low = mid + 1;
+    else
+      high = mid;
+  }
+  const paragraph = paragraphs[low];
+  if (!paragraph || !/^\s*$/.test(TD75.decode(bytes.subarray(endEnd, paragraph.byteStart))))
+    return null;
+  return paragraph;
+}
+function* projectBookmarkRanges(bytes, bookmarks, starts, pairing, paragraphs) {
   const startsByByte = new Map(starts.map((start) => [start.markerByteStart, start]));
   const offsetsByParagraph = new Map;
   const endpoint = (marker) => {
@@ -253485,10 +253594,9 @@ function* projectBookmarkRanges(bytes, bookmarks, starts, ends, paragraphs) {
     const offset = offsets.get(marker.markerByteStart);
     return offset == null ? null : { blockId: paragraph.blockId, offset };
   };
-  for (const end of ends) {
-    const id = readWordAttribute3(end.markerXml, "id", end.namespaceBindings);
-    const bookmark = id == null ? undefined : byId.get(id);
-    if (bookmark && !bookmark.range && end.markerByteStart >= bookmark.markerByteStart) {
+  for (const bookmark of bookmarks) {
+    const end = pairing.endsByStartByte.get(bookmark.markerByteStart);
+    if (end && !bookmark.range && !pairing.invalidStartBytes.has(bookmark.markerByteStart)) {
       const start = startsByByte.get(bookmark.markerByteStart);
       const from = start ? endpoint(start) : null;
       const to = endpoint(end);
@@ -253549,7 +253657,7 @@ function projectBookmarkStart(input) {
   const name = readWordAttribute3(input.markerXml, "name", input.namespaceBindings);
   if (!bookmarkId || !name)
     return null;
-  const paragraph = findContainingParagraphLocator(input.paragraphLocators, input.markerByteStart);
+  const paragraph = input.directBodyChild ? input.followingBodyParagraph : findContainingParagraphLocator(input.paragraphLocators, input.markerByteStart);
   if (!paragraph)
     return null;
   const colFirst = readWordAttribute3(input.markerXml, "colFirst", input.namespaceBindings);
@@ -253562,6 +253670,9 @@ function projectBookmarkStart(input) {
     partUri: input.partUri,
     blockId: paragraph.blockId,
     markerByteStart: input.markerByteStart,
+    ...input.followingBodyParagraph ? {
+      range: { from: { blockId: paragraph.blockId, offset: 0 }, to: { blockId: paragraph.blockId, offset: 0 } }
+    } : {},
     ...tableColumn ? { tableColumn } : {}
   };
 }
@@ -297752,6 +297863,16 @@ function insertBookmarksIntoParagraphs(context, insertions, txIdPrefix) {
     return committed;
   return { ok: true, txId: committed.txId, bookmarkIds };
 }
+function ambiguousBookmarkIdFailure(context, entry) {
+  const xml = readPartXml(context, entry.partUri);
+  const scan = xml == null ? null : readBookmarkMarkerSpans(xml);
+  if (!scan || scan.markers.filter((marker) => marker.kind === "start" && marker.bookmarkId === entry.bookmarkId).length <= 1)
+    return null;
+  return {
+    code: "CAPABILITY_UNAVAILABLE",
+    message: "Unable to mutate a bookmark whose imported ID identifies multiple occurrences."
+  };
+}
 function renameBookmarkMarkup(context, entry, newName, txIdPrefix, options) {
   const xml = readPartXml(context, entry.partUri);
   const bytes = readPartBytes2(context, entry.partUri);
@@ -372721,15 +372842,21 @@ class V2BookmarksAdapter {
     return { attempts: maxRestarts + 1, restarts: maxRestarts, catalogPublished: false };
   }
   list(query3) {
-    const all2 = listBookmarkEntriesForQuery(this.context, query3?.in);
+    const documentEntries = listBookmarkEntriesForQuery(this.context);
+    const all2 = query3?.in ? listBookmarkEntriesForQuery(this.context, query3.in) : documentEntries;
     const offset = Math.max(0, Number.isFinite(query3?.offset) ? Number(query3?.offset) : 0);
     const requestedLimit = Number.isFinite(query3?.limit) ? Number(query3?.limit) : all2.length;
     const limit = Math.max(0, requestedLimit);
     const slice = all2.slice(offset, offset + limit);
+    const idCounts = new Map;
+    for (const entry of documentEntries) {
+      idCounts.set(entry.bookmarkId, (idCounts.get(entry.bookmarkId) ?? 0) + 1);
+    }
     const items = slice.map((entry) => {
       const info = projectBookmarkInfo(this.context, entry);
       const handle = buildResolvedHandle(`bookmark:${entry.name}`, "stable", "sdt");
-      return buildDiscoveryItem(entry.bookmarkId, handle, info);
+      const discoveryId = idCounts.get(entry.bookmarkId) > 1 ? `${entry.bookmarkId}:${entry.partUri}:${entry.markerByteStart}` : entry.bookmarkId;
+      return buildDiscoveryItem(discoveryId, handle, info);
     });
     return buildDiscoveryResult({
       evaluatedRevision: this.context.currentPublicRevision(),
@@ -372799,6 +372926,9 @@ class V2BookmarksAdapter {
     if (findBookmarkEntry(this.context, input.newName)) {
       return failure10("INVALID_INPUT", `bookmarks.rename: bookmark "${input.newName}" already exists.`);
     }
+    const ambiguity = ambiguousBookmarkIdFailure(this.context, entry);
+    if (ambiguity)
+      return failure10(ambiguity.code, ambiguity.message);
     if (options?.dryRun && options.changeMode !== "tracked") {
       return {
         success: true,
@@ -372823,6 +372953,9 @@ class V2BookmarksAdapter {
     if (!documentProtectionAllowsXmlRange(this.context, entry.partUri, entry.markerByteStart, entry.markerByteStart)) {
       return failure10("PERMISSION_DENIED", DOCUMENT_PROTECTION_MESSAGE);
     }
+    const ambiguity = ambiguousBookmarkIdFailure(this.context, entry);
+    if (ambiguity)
+      return failure10(ambiguity.code, ambiguity.message);
     if (options?.dryRun && options.changeMode !== "tracked") {
       return {
         success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.8.0-next.3",
+  "version": "1.8.0-next.5",
   "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.3",
+    "@superdoc/sdk": "2.21.0-next.5",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.24.0-next.3",
-    "@superdoc/docx-engine": "0.23.0-next.3",
+    "superdoc": "2.24.0-next.5",
+    "@superdoc/docx-engine": "0.23.0-next.5",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",