@superdoc/mcp 1.2.0-next.4 → 1.2.0-next.5

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.4";
+var SDK_VERSION = "2.15.0-next.5";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -133951,6 +133951,50 @@ var init_note_xml_validation = __esm(() => {
 });
 
 // ../../../v2/document-compare/src/replayability.ts
+function preservedBookmarkRunTokens(xml) {
+  const markerTags = [...xml.matchAll(/<([\w.-]+:)?bookmark(Start|End)\b[^<>]*?\/>/g)];
+  const markerOpenings = [...xml.matchAll(/<(?:[\w.-]+:)?bookmark(?:Start|End)\b/g)];
+  if (markerTags.length !== 2 || markerOpenings.length !== 2 || markerTags[0][2] !== "Start" || markerTags[1][2] !== "End")
+    return null;
+  let valid = true;
+  let depth = 0;
+  const markers = [];
+  const parser = new import_saxes3.SaxesParser({
+    xmlns: true,
+    additionalNamespaces: replayAdditionalNamespaces(xml)
+  });
+  parser.on("error", () => {
+    valid = false;
+  });
+  parser.on("opentag", (tag) => {
+    depth += 1;
+    if (tag.local !== "bookmarkStart" && tag.local !== "bookmarkEnd")
+      return;
+    const attributes = Object.values(tag.attributes);
+    const id = attributes.find((attribute) => attribute.uri === W_NS && attribute.local === "id")?.value;
+    const name = attributes.find((attribute) => attribute.uri === W_NS && attribute.local === "name")?.value ?? null;
+    if (tag.uri !== W_NS || !tag.isSelfClosing || depth !== 2 || !id || !/^\d+$/.test(id) || tag.local === "bookmarkStart" && !name || tag.local === "bookmarkEnd" && name !== null)
+      valid = false;
+    markers.push({ kind: tag.local, id: id ?? "", name });
+  });
+  parser.on("closetag", () => {
+    depth -= 1;
+  });
+  try {
+    parser.write(`<replay>${xml}</replay>`).close();
+  } catch {
+    valid = false;
+  }
+  if (!valid || depth !== 0 || markers.length !== 2 || markers[0].kind !== "bookmarkStart" || markers[1].kind !== "bookmarkEnd" || markers[0].id !== markers[1].id)
+    return null;
+  return {
+    startXml: markerTags[0][0],
+    endXml: markerTags[1][0],
+    leadingXml: xml.slice(0, markerTags[0].index),
+    trailingXml: xml.slice(markerTags[1].index + markerTags[1][0].length),
+    strippedXml: xml.slice(0, markerTags[0].index) + xml.slice(markerTags[0].index + markerTags[0][0].length, markerTags[1].index) + xml.slice(markerTags[1].index + markerTags[1][0].length)
+  };
+}
 function replayAdditionalNamespaces(xml) {
   const implicitNamespaces = { w: W_NS };
   const firstElement = /<([A-Za-z_][\w.-]*)(?::[A-Za-z_][\w.-]*)?(?=[\s/>])/.exec(xml);
@@ -134550,13 +134594,14 @@ function validateRunContents(xml, options) {
   if (xml === "")
     return { ok: true };
   const replayXml = stripAllowedNoteReferences(xml, options);
-  if (replayXml === null || UNSUPPORTED_XML.test(replayXml) || RELATIONSHIP_REFERENCE.test(replayXml)) {
+  const withoutBookmarks = replayXml !== null && /<(?:[\w.-]+:)?bookmark(?:Start|End)\b/.test(replayXml) ? preservedBookmarkRunTokens(replayXml)?.strippedXml ?? null : replayXml;
+  if (withoutBookmarks === null || UNSUPPORTED_XML.test(withoutBookmarks) || RELATIONSHIP_REFERENCE.test(withoutBookmarks)) {
     return { ok: false, reason: "target runs require unsupported structural or relationship replay" };
   }
-  const namespaceResult = validateReplayNamespaces(replayXml, "target runs use namespace prefixes that cannot be replayed safely");
+  const namespaceResult = validateReplayNamespaces(withoutBookmarks, "target runs use namespace prefixes that cannot be replayed safely");
   if (!namespaceResult.ok)
     return namespaceResult;
-  if (!parseDirectRunSequence(replayXml, false)) {
+  if (!parseDirectRunSequence(withoutBookmarks, false)) {
     return { ok: false, reason: "target runs contain unsupported inline markup" };
   }
   return { ok: true };
@@ -134604,7 +134649,7 @@ var import_saxes3, UNSUPPORTED_XML, RELATIONSHIP_REFERENCE, W_NS = "http://schem
 var init_replayability = __esm(() => {
   init_note_xml_validation();
   import_saxes3 = __toESM(require_saxes(), 1);
-  UNSUPPORTED_XML = /<(?:[\w.-]+:)?(?:hyperlink|drawing|pict|object|fldSimple|fldChar|instrText|commentReference|commentRangeStart|commentRangeEnd|bookmarkStart|bookmarkEnd|permStart|permEnd|sdt|customXml|oMath|oMathPara|footnoteReference|endnoteReference|ins|del|moveFrom|moveTo|pPrChange|rPrChange|sectPr)\b/i;
+  UNSUPPORTED_XML = /<(?:[\w.-]+:)?(?:hyperlink|drawing|pict|object|fldSimple|fldChar|instrText|commentReference|commentRangeStart|commentRangeEnd|permStart|permEnd|sdt|customXml|oMath|oMathPara|footnoteReference|endnoteReference|ins|del|moveFrom|moveTo|pPrChange|rPrChange|sectPr)\b/i;
   RELATIONSHIP_REFERENCE = /\s(?:r:id|r:embed|r:link)\s*=/i;
   DIRECT_RUN_PROPERTY_ELEMENTS = new Set([
     "rStyle",
@@ -220762,6 +220807,26 @@ function runComparePayloadInsertCommit(input, storyId, step2, changeMode, option
   });
   return withParagraphInsertionCatalogRefs(input, receipt2, paragraph.wordIds, storyId);
 }
+function unchangedBookmarkReferenceSteps(oldRuns, targetRuns) {
+  const oldHasMarker = /<(?:[\w.-]+:)?bookmark(?:Start|End)\b/.test(oldRuns);
+  const targetHasMarker = /<(?:[\w.-]+:)?bookmark(?:Start|End)\b/.test(targetRuns);
+  if (!oldHasMarker && !targetHasMarker)
+    return [];
+  const oldBookmark = preservedBookmarkRunTokens(oldRuns);
+  const targetBookmark = preservedBookmarkRunTokens(targetRuns);
+  if (!oldBookmark || !targetBookmark || oldBookmark.startXml !== targetBookmark.startXml || oldBookmark.endXml !== targetBookmark.endXml || oldBookmark.leadingXml !== targetBookmark.leadingXml || oldBookmark.trailingXml !== targetBookmark.trailingXml)
+    return null;
+  const startBindings = replayFragmentNamespaceBindings(oldBookmark.startXml);
+  const endBindings = replayFragmentNamespaceBindings(oldBookmark.endXml);
+  const bookmarkBindings = { ...startBindings, ...endBindings };
+  return [{
+    kind: "bookmark-start",
+    beforeXml: oldBookmark.startXml,
+    afterXml: oldBookmark.startXml,
+    beforeNamespaceBindings: bookmarkBindings,
+    afterNamespaceBindings: bookmarkBindings
+  }];
+}
 function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pushHistory, referenceSteps) {
   const { state, txId } = input;
   const partUri = storyPartUriFromStoryId2(storyId);
@@ -220779,6 +220844,14 @@ function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pu
   const pPrXml = findFirstElement(paraXml, "pPr")?.xml ?? "";
   const targetParagraphPropertiesXml = step2.targetParagraphPropertiesXml === undefined ? undefined : rewriteCanonicalWordprocessingPrefix(step2.targetParagraphPropertiesXml, paragraphWrapper.wordprocessingPrefix);
   const newRuns = rewriteCanonicalWordprocessingPrefix(step2.targetRunXml ?? renderParagraphRuns(step2.text), paragraphWrapper.wordprocessingPrefix);
+  const openEnd = paragraphWrapper.contentStart;
+  const closeStart = paraXml.lastIndexOf("</");
+  const innerXml = closeStart > openEnd ? paraXml.slice(openEnd, closeStart) : "";
+  const oldRunsRaw = stripElements(innerXml, "pPr");
+  const stableBookmarkSteps = unchangedBookmarkReferenceSteps(oldRunsRaw, newRuns);
+  if (stableBookmarkSteps === null && referenceSteps.length === 0)
+    return rejected14(txId, "unsupported-context");
+  const protectedReferenceSteps = [...referenceSteps, ...stableBookmarkSteps ?? []];
   let newParaXml;
   const createdRefs = [];
   if (changeMode === "tracked") {
@@ -220794,12 +220867,10 @@ function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pu
         storyId
       });
     }
-    const openEnd = paragraphWrapper.contentStart;
-    const closeStart = paraXml.lastIndexOf("</");
-    const innerXml = closeStart > openEnd ? paraXml.slice(openEnd, closeStart) : "";
-    const oldRunsRaw = stripElements(innerXml, "pPr");
     const oldRunsDel = oldRunsRaw.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
-    const protectedRuns = renderTrackedRunsWithProtectedReferences(oldRunsRaw, newRuns, referenceSteps, stamps, paragraphWrapper.wordprocessingPrefix);
+    const protectedRuns = renderTrackedRunsWithProtectedReferences(oldRunsRaw, newRuns, protectedReferenceSteps, stamps, paragraphWrapper.wordprocessingPrefix);
+    if (!protectedRuns && stableBookmarkSteps?.length)
+      return rejected14(txId, "unsupported-context");
     const delXml = protectedRuns?.xml ?? (oldRunsDel ? wrapTracked("del", oldRunsDel, stamps.del, "rsidDel", paragraphWrapper.wordprocessingPrefix) : "");
     const insXml = protectedRuns ? "" : newRuns ? wrapTracked("ins", newRuns, stamps.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
     const trackedPPrXml = buildTrackedParagraphProperties(targetParagraphPropertiesXml, pPrXml, stamps.paragraphProperties ?? stamps.ins, paragraphWrapper.wordprocessingPrefix);
@@ -220883,6 +220954,10 @@ function runCompareBodyFormatEditCommit(input, storyId, step2, changeMode, optio
   const innerXml = closeStart > openEnd ? paraXml.slice(openEnd, closeStart) : "";
   const oldRunsRaw = stripElements(innerXml, "pPr");
   const paragraphPropertiesChanged = !equivalentParagraphProperties(targetPPrXml, pPrXml);
+  const stableBookmarkSteps = unchangedBookmarkReferenceSteps(oldRunsRaw, targetRunXml);
+  if (stableBookmarkSteps === null && referenceSteps.length === 0)
+    return rejected14(txId, "unsupported-context");
+  const protectedReferenceSteps = [...referenceSteps, ...stableBookmarkSteps ?? []];
   const baseSimpleRuns = scanSimpleRunFormatting(oldRunsRaw);
   const targetSimpleRuns = scanSimpleRunFormatting(targetRunXml);
   const paragraphPropertiesOnly = paragraphPropertiesChanged && baseSimpleRuns?.text === targetSimpleRuns?.text && computeRunSignature(targetRunXml) === computeRunSignature(oldRunsRaw);
@@ -220946,7 +221021,9 @@ function runCompareBodyFormatEditCommit(input, storyId, step2, changeMode, optio
       if (!stamps)
         return rejected14(txId, "no-author-configured");
       const oldRunsDel = oldRunsRaw.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
-      const protectedRuns = renderTrackedRunsWithProtectedReferences(oldRunsRaw, targetRunXml, referenceSteps, stamps, paragraphWrapper.wordprocessingPrefix);
+      const protectedRuns = renderTrackedRunsWithProtectedReferences(oldRunsRaw, targetRunXml, protectedReferenceSteps, stamps, paragraphWrapper.wordprocessingPrefix);
+      if (!protectedRuns && stableBookmarkSteps?.length)
+        return rejected14(txId, "unsupported-context");
       const delXml = protectedRuns?.xml ?? (oldRunsDel ? wrapTracked("del", oldRunsDel, stamps.del, "rsidDel", paragraphWrapper.wordprocessingPrefix) : "");
       const insXml = protectedRuns ? "" : targetRunXml ? wrapTracked("ins", targetRunXml, stamps.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
       if (delXml || insXml) {
@@ -246944,7 +247021,7 @@ function prepareHistoryReplayMutation(state, entry, direction, patchGroup) {
     ...contentControlRewrite.addedBlockIds,
     ...contentControlRewrite.contentBlockIds,
     ...contentControlRewrite.leadingBlockIds
-  ])] : collectPatchGroupTargetBlockIds(patchGroup);
+  ])] : patchGroup.source.kind === "compareApply" ? [...new Set(patchGroup.source.bodySteps.map((step2) => step2.blockId))] : collectPatchGroupTargetBlockIds(patchGroup);
   const currentBaseRevisions = {
     package: state.packageRevision,
     perPart: {}
@@ -247198,6 +247275,8 @@ function collectPatchGroupTargetBlockIds(patchGroup) {
   return [...blockIds];
 }
 function inferHistoryStorySurfaceFamily(sourceKind) {
+  if (sourceKind === "compareApply")
+    return "compareApply";
   if (sourceKind === "editText")
     return "storyText";
   if (sourceKind.startsWith("list"))
@@ -424884,7 +424963,7 @@ function hasStrictMirrorPrerequisites(prepared, options) {
     case "storyAnchor":
       return options.session != null;
     case "compareApply":
-      return false;
+      return options.session != null;
     default: {
       const exhaustive = extension2.family;
       return exhaustive;
@@ -424982,13 +425061,24 @@ function runFamilyMirror(prepared, extension2, options, directStoryText, tracked
     return mirrorPreparedTrackedDecide(prepared, trackedDecision);
   }
   if (extension2.family === "compareApply") {
-    return {
-      mirrored: false,
-      failure: {
-        storyId: prepared.resolvedTargets.stories[0] ?? "",
-        message: "story-surface mirror for the compareApply family is not supported (apply-deferred)"
-      }
-    };
+    if (!options.session) {
+      return {
+        mirrored: false,
+        mirrorPath: "session-sync",
+        failure: {
+          storyId: prepared.resolvedTargets.stories[0] ?? "",
+          message: "compareApply session sync requires an authoritative session"
+        }
+      };
+    }
+    const sessionSync = mirrorStorySurfaceFromSession({
+      session: options.session,
+      prepared,
+      extension: extension2,
+      storyIds: storyIdsRequiringShards(prepared, extension2),
+      resolveStoryShard: options.resolveStoryShard
+    });
+    return { ...sessionSync, mirrorPath: "session-sync" };
   }
   if (extension2.family === "storyAnchor" && prepared.source.kind === "insertComment" && !prepared.source.materialize) {
     return mirrorPreparedCommentInsert(prepared, extension2, options);
@@ -425756,6 +425846,9 @@ function admitPreparedStorySurfaceMutation(prepared, options) {
   }
   if (!touchesOwnedStoryPart(prepared))
     return { ok: true };
+  if (extension2.family === "compareApply") {
+    return validateCompareApplySessionSync(prepared, extension2, options);
+  }
   if (extension2.family === "storyText") {
     if (extension2.historyReplay || extension2.resyncFromSession || extension2.sessionSync) {
       return validateStoryTextSessionSync(prepared, extension2, options);
@@ -425824,6 +425917,32 @@ function admitPreparedStorySurfaceMutation(prepared, options) {
   }
   return { ok: true };
 }
+function validateCompareApplySessionSync(prepared, extension2, options) {
+  const source = prepared.source;
+  if (source.kind !== "compareApply" || !options.session) {
+    return { ok: false, message: "compareApply session sync requires an authoritative session" };
+  }
+  if (options.isSessionProjectionCurrent?.() !== true) {
+    return { ok: false, message: "compareApply requires a current collaborative session projection" };
+  }
+  const storyId = String(source.storyId);
+  const ownership = prepared.resolvedTargets.storyPartOwnership;
+  if (!extension2.storyLocal || prepared.resolvedTargets.stories.length !== 1 || String(prepared.resolvedTargets.stories[0]) !== storyId || ownership.length !== 1 || String(ownership[0]?.storyId) !== storyId || prepared.resolvedTargets.partUris.length !== 1 || String(prepared.resolvedTargets.partUris[0]) !== String(ownership[0]?.partUri)) {
+    return { ok: false, message: "compareApply collaboration requires one owned story part" };
+  }
+  if (source.bodySteps.length === 0 || source.bodySteps.some((step3) => step3.kind !== "edit") || source.storyGroups?.length || source.storyPackageOperations?.length || source.commentSteps?.length || source.packageRewrites?.length || source.relationshipBackedBodyRewrites?.length || source.headerFooterLifecycle || source.headerFooterSlotSteps?.length || source.tableTopologySteps?.length || source.tableBlockSteps?.length || source.tablePropertySteps?.length || source.sectionReplaySteps?.length || source.referenceReplaySteps?.length) {
+    return { ok: false, message: "compareApply collaboration supports paragraph text edits only" };
+  }
+  const targetBlockIds2 = [...new Set(source.bodySteps.map((step3) => step3.blockId))];
+  if (targetBlockIds2.length !== extension2.targetBlockIds.length || targetBlockIds2.some((blockId) => !extension2.targetBlockIds.includes(blockId))) {
+    return { ok: false, message: "compareApply target blocks do not match its prepared refresh scope" };
+  }
+  const shard = options.resolveStoryShard(storyId);
+  if (!shard || targetBlockIds2.some((blockId) => !findBlockMap(shard, blockId))) {
+    return { ok: false, message: "compareApply target blocks are missing from the story shard" };
+  }
+  return { ok: true };
+}
 function validateStoryTextSessionSync(prepared, extension2, options) {
   if (!options.session) {
     return { ok: false, message: "storyText session sync requires an authoritative session" };
@@ -427460,6 +427579,7 @@ function createCollabV2SessionProjectionController(options) {
   const storyBackend = createStorySurfaceExecutionBackend({
     delegate: packageBackend,
     session: options.session,
+    isSessionProjectionCurrent: () => !destroyed && !remoteProjectionPending && !deferredSessionAuthoritativeRemotePending && sessionStoryAlignment === "aligned",
     resolveStoryShard(storyId) {
       const handle = options.dispatcherRegistry.findStoryShardByStoryId?.(storyId);
       return handle ? collabUnitTargetOrDoc(handle) : null;

package/package.json

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