@superdoc/mcp 1.0.0-next.7 → 1.0.0-next.8

package/dist/index.js

@@ -349815,7 +349815,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.13.0-next.9";
+var SDK_VERSION = "2.13.0-next.10";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -691770,7 +691770,7 @@ function parseParagraphXml(xml, inheritedNamespaceBindings = {}, trackedWrapperI
     } else if (tagLocalName === "hyperlink") {
       const inner = stripOuterTag(next.xml);
       const closingTag = extractClosingTag(next.xml);
-      const innerSegments = parseInnerInline(inner, namespaceBindingsForElement(next.openTagInner, paragraphNamespaceBindings));
+      const innerSegments = parseInnerInline(inner, namespaceBindingsForElement(next.openTagInner, paragraphNamespaceBindings), trackedWrapperIdentityState);
       segments.push({
         kind: "atom",
         atomKind: INLINE_ATOM_KIND.preserved,
@@ -708730,7 +708730,7 @@ function runStorySurfaceMirror(prepared, options, admission, paragraphOnlyReview
       };
     }
   }
-  const familyResult = runFamilyMirror(prepared, extension2, options, admission.directStoryText, paragraphOnlyReviewStoryIds);
+  const familyResult = runFamilyMirror(prepared, extension2, options, admission.directStoryText, admission.trackedDecision, paragraphOnlyReviewStoryIds);
   if (!familyResult.mirrored) {
     return {
       txId: prepared.txId,
@@ -708788,7 +708788,7 @@ function hasStrictMirrorPrerequisites(prepared, options) {
     }
   }
 }
-function runFamilyMirror(prepared, extension2, options, directStoryText, paragraphOnlyReviewStoryIds) {
+function runFamilyMirror(prepared, extension2, options, directStoryText, trackedDecision, paragraphOnlyReviewStoryIds) {
   if (!options.resolveStoryShard) {
     return {
       mirrored: false,
@@ -708857,7 +708857,17 @@ function runFamilyMirror(prepared, extension2, options, directStoryText, paragra
       });
       return { ...sessionSync, mirrorPath: "session-sync" };
     }
-    return mirrorPreparedTrackedDecide(prepared, extension2, options);
+    if (!trackedDecision) {
+      return {
+        mirrored: false,
+        mirrorPath: "story-tracked-decide",
+        failure: {
+          storyId: prepared.resolvedTargets.stories[0] ?? "",
+          message: "storyTrackedDecide requires an admitted cross-story preflight"
+        }
+      };
+    }
+    return mirrorPreparedTrackedDecide(prepared, trackedDecision);
   }
   if (extension2.family === "compareApply") {
     return {
@@ -709072,30 +709082,11 @@ function mirrorPreparedCommentInsert(prepared, extension2, options) {
   });
   return { mirrored: true, mirrorPath: "session-sync" };
 }
-function mirrorPreparedTrackedDecide(prepared, extension2, options) {
-  const validation = validatePreparedTrackedDecide(prepared, extension2, options);
-  if (!validation.ok) {
-    return {
-      mirrored: false,
-      mirrorPath: "story-tracked-decide",
-      failure: {
-        storyId: prepared.resolvedTargets.stories[0] ?? "",
-        message: validation.failureReason
-      }
-    };
-  }
-  const source = validation.source;
-  const storyDocs = validation.storyDocs;
-  for (const { storyId, doc: doc2 } of storyDocs) {
-    const targets = validation.targets.filter((target) => target.storyId === storyId);
-    if (targets.length === 0)
-      continue;
-    const result = applyTrackedTextDecisionsToStory({
-      doc: doc2,
-      targets,
-      decision: source.decision,
-      txId: prepared.txId,
-      removedCommentIds: collectInvalidatedCommentIds(prepared)
+function mirrorPreparedTrackedDecide(prepared, preflight2) {
+  for (const { storyId, plan } of preflight2.stories) {
+    const result = applyPreflightedTrackedTextDecisionsToStory({
+      plan,
+      txId: prepared.txId
     });
     if (!result.ok) {
       return {
@@ -709169,6 +709160,26 @@ function validatePreparedTrackedDecide(prepared, extension2, options) {
   }
   return { ok: true, source, storyDocs, targets: trackedTextDecide.targets };
 }
+function preflightPreparedTrackedDecide(input) {
+  const stories = [];
+  const removedCommentIds = collectInvalidatedCommentIds(input.prepared);
+  for (const { storyId, doc: doc2 } of input.storyDocs) {
+    const targets = input.targets.filter((target) => target.storyId === storyId);
+    if (targets.length === 0)
+      continue;
+    const result = preflightTrackedTextDecisionsToStory({
+      doc: doc2,
+      targets,
+      decision: input.source.decision,
+      removedCommentIds
+    });
+    if (!result.ok) {
+      return { ok: false, failureReason: `${storyId}: ${result.failureReason}` };
+    }
+    stories.push({ storyId, plan: result.plan });
+  }
+  return { ok: true, preflight: { stories } };
+}
 function isSupportedPreparedTrackedTextKind(kind) {
   return kind === "ins" || kind === "del";
 }
@@ -709205,47 +709216,133 @@ function isSupportedPreparedTrackedCarrier(target) {
     return true;
   return target.carrierKind === "field-insertion" && target.trackedKind === "ins";
 }
-function applyTrackedTextDecisionsToStory(input) {
+function preflightTrackedTextDecisionsToStory(input) {
   const resolved = [];
-  for (const target of input.targets) {
-    const spans = findPreparedLiveTrackedTextSpans(input.doc, target);
-    const alreadyDecided = spans.length === 0 && hasTrackedDecisionLedgerEntry(input.doc, target.rsid);
-    if (spans.length === 0 && !alreadyDecided) {
+  const usedSpanIds = new Set;
+  const candidatesByTarget = input.targets.map((target) => ({
+    target,
+    spans: findPreparedLiveTrackedTextSpans(input.doc, target)
+  }));
+  for (const { target, spans } of candidatesByTarget) {
+    const span = spans.find((candidate) => !usedSpanIds.has(liveTrackedTextSpanId(candidate)));
+    const alreadyDecided = !span && spans.length === 0 && hasTrackedDecisionLedgerEntry(input.doc, target.rsid);
+    if (!span && !alreadyDecided) {
       return { ok: false, failureReason: `tracked decision target ${target.rsid} is not a live tracked text change` };
     }
-    resolved.push({ target, spans });
+    if (span)
+      usedSpanIds.add(liveTrackedTextSpanId(span));
+    resolved.push({ target, spans: span ? [span] : [] });
+  }
+  for (const { target, spans } of candidatesByTarget) {
+    if (spans.some((span) => !usedSpanIds.has(liveTrackedTextSpanId(span)))) {
+      return {
+        ok: false,
+        failureReason: `tracked decision target ${target.rsid} metadata does not cover every matching live carrier`
+      };
+    }
   }
   const live = resolved.filter((entry) => entry.spans.length > 0);
-  if (live.length === 0)
+  try {
+    const removedCommentCarrierIds = collectCommentCarrierIds(input.removedCommentIds);
+    const work = live.flatMap((entry) => entry.spans.map((span) => {
+      const block = findBlockMap(input.doc, span.blockId)?.block;
+      if (!block)
+        throw new Error(`target block ${span.blockId} is not present in the story shard`);
+      return {
+        target: entry.target,
+        span,
+        block,
+        leftBoundaryAtoms: [],
+        leftBoundaryAnchors: []
+      };
+    }));
+    for (const item of work) {
+      const { target, span, block, leftBoundaryAtoms, leftBoundaryAnchors } = item;
+      const blockLength = getBlockText(block).length;
+      if (span.startOffset < 0 || span.startOffset > blockLength) {
+        throw new Error(`tracked text span ${target.rsid} starts outside block ${span.blockId}`);
+      }
+      if (span.trackedKind === "ins" && input.decision === "reject") {
+        if (span.endOffset < span.startOffset || span.endOffset > blockLength) {
+          throw new Error(`tracked insert span ${target.rsid} is outside block ${span.blockId}`);
+        }
+      }
+      if (span.trackedKind === "del" && input.decision === "reject") {
+        let reachedStart = false;
+        const removedTrackedCarrierIds = trackedTextCarrierIds(span, false);
+        getBlockAtoms(block).forEach((atom) => {
+          if (reachedStart)
+            return;
+          const atomId = String(atom.get(ATOM_KEY.id) ?? "");
+          if (atomId === span.startAtomId) {
+            reachedStart = true;
+            return;
+          }
+          if (atomId && Number(atom.get(ATOM_KEY.visibleOffset) ?? -1) === span.startOffset && Number(atom.get(ATOM_KEY.length) ?? 0) === 0) {
+            if (removedCommentCarrierIds.has(atomId))
+              return;
+            if (removedTrackedCarrierIds.has(atomId)) {
+              throw new Error(`left-boundary atom ${atomId} aliases a removed tracked carrier`);
+            }
+            leftBoundaryAtoms.push(atom);
+            const anchorIdentity2 = rangeAnchorIdentityForAtom(atom);
+            if (anchorIdentity2) {
+              const matchingAnchors = getBlockAnchors(block).toArray().filter((anchor) => anchor.get(ANCHOR_KEY.id) === atom.get(ATOM_KEY.id) && anchor.get(ANCHOR_KEY.kind) === anchorIdentity2.kind && anchor.get(ANCHOR_KEY.boundary) === anchorIdentity2.boundary && Number(anchor.get(ANCHOR_KEY.visibleOffset) ?? -1) === span.startOffset);
+              if (matchingAnchors.length !== 1) {
+                throw new Error(`left-boundary atom ${atomId} does not resolve one exact anchor carrier`);
+              }
+              leftBoundaryAnchors.push(matchingAnchors[0]);
+            }
+          }
+        });
+        if (!reachedStart) {
+          throw new Error(`tracked deletion start ${span.startAtomId} is not present in block ${span.blockId}`);
+        }
+      }
+    }
+    return {
+      ok: true,
+      plan: {
+        doc: input.doc,
+        decision: input.decision,
+        removedCommentCarrierIds,
+        resolved,
+        work
+      }
+    };
+  } catch (error50) {
+    return { ok: false, failureReason: error50 instanceof Error ? error50.message : String(error50) };
+  }
+}
+function liveTrackedTextSpanId(span) {
+  return `${span.blockId}\x00${span.startAtomId}\x00${span.endAtomId}`;
+}
+function applyPreflightedTrackedTextDecisionsToStory(input) {
+  if (input.plan.work.length === 0)
     return { ok: true, applied: false, alreadyDecided: true };
   try {
-    resolveStoryShardScope(input.doc).doc.transact(() => {
-      const work = live.flatMap((entry) => entry.spans.map((span) => ({ target: entry.target, span })));
-      for (const { target, span } of work) {
-        const found = findBlockMap(input.doc, span.blockId)?.block;
-        if (!found)
-          throw new Error(`target block ${span.blockId} is not present in the story shard`);
-        removeTrackedTextCarriers(found, span, input.decision === "reject" && target.carrierKind === "field-insertion");
-        removeCommentCarriersByIds(found, input.removedCommentIds);
-      }
-      const sorted = work.sort((left, right) => {
+    resolveStoryShardScope(input.plan.doc).doc.transact(() => {
+      const { decision, doc: doc2, removedCommentCarrierIds, resolved, work } = input.plan;
+      for (const { target, span, block } of work) {
+        removeTrackedTextCarriers(block, span, decision === "reject" && target.carrierKind === "field-insertion");
+        removeCommentCarriersByIds(block, removedCommentCarrierIds);
+      }
+      const sorted = [...work].sort((left, right) => {
         if (left.span.blockId !== right.span.blockId)
           return left.span.blockId < right.span.blockId ? -1 : 1;
         if (left.span.startOffset !== right.span.startOffset)
           return right.span.startOffset - left.span.startOffset;
-        if (left.span.trackedKind === right.span.trackedKind)
-          return 0;
+        if (left.span.trackedKind === right.span.trackedKind) {
+          return right.span.startAtomIndex - left.span.startAtomIndex;
+        }
         return left.span.trackedKind === "ins" ? -1 : 1;
       });
-      for (const { target, span } of sorted) {
-        if (span.trackedKind === "ins" && input.decision === "reject") {
+      for (const { span, leftBoundaryAtoms, leftBoundaryAnchors } of sorted) {
+        if (span.trackedKind === "ins" && decision === "reject") {
           const length3 = span.endOffset - span.startOffset;
-          if (length3 < 0) {
-            throw new Error(`tracked insert span ${target.rsid} is outside block ${span.blockId}`);
-          }
           if (length3 > 0) {
             deleteText2({
-              doc: input.doc,
+              doc: doc2,
               blockId: span.blockId,
               offset: span.startOffset,
               length: length3,
@@ -709253,8 +709350,8 @@ function applyTrackedTextDecisionsToStory(input) {
             });
           }
         }
-        if (span.trackedKind === "del" && input.decision === "reject") {
-          const found = findBlockMap(input.doc, span.blockId)?.block;
+        if (span.trackedKind === "del" && decision === "reject") {
+          const found = findBlockMap(doc2, span.blockId)?.block;
           if (!found)
             throw new Error(`target block ${span.blockId} is not present in the story shard`);
           let offset = span.startOffset;
@@ -709266,7 +709363,7 @@ function applyTrackedTextDecisionsToStory(input) {
               continue;
             }
             insertText2({
-              doc: input.doc,
+              doc: doc2,
               blockId: span.blockId,
               offset,
               text: segment.text,
@@ -709293,10 +709390,12 @@ function applyTrackedTextDecisionsToStory(input) {
           if (restoredBreakXml) {
             throw new Error(`attributed break restoration in ${span.blockId} is incomplete`);
           }
+          leftBoundaryAtoms.forEach((atom) => atom.set(ATOM_KEY.visibleOffset, span.startOffset));
+          leftBoundaryAnchors.forEach((anchor) => anchor.set(ANCHOR_KEY.visibleOffset, span.startOffset));
         }
       }
       for (const { target } of resolved) {
-        recordTrackedDecision(input.doc, target.rsid, input.decision, input.txId);
+        recordTrackedDecision(doc2, target.rsid, decision, input.txId);
       }
     }, STORY_SURFACE_BACKEND_ORIGIN);
   } catch (error50) {
@@ -709375,6 +709474,7 @@ function collectLiveTrackedTextSpansInBlock(block, rsid, trackedKind) {
       blockId,
       startOffset: start.offset,
       endOffset: trackedKind === "del" ? start.offset + deletedTextLength2 : end.offset,
+      startAtomIndex: start.index,
       startAtomId: start.id,
       endAtomId: end.id,
       preservedAtomIds: preservedForSpan.map((atom) => atom.id),
@@ -709386,24 +709486,38 @@ function collectLiveTrackedTextSpansInBlock(block, rsid, trackedKind) {
   return spans;
 }
 function removeTrackedTextCarriers(block, span, removeContainedAtoms) {
-  const ids = new Set([
+  const ids = trackedTextCarrierIds(span, removeContainedAtoms);
+  deleteYMapArrayEntriesByIds(getBlockAtoms(block), ATOM_KEY.id, ids);
+  deleteYMapArrayEntriesByIds(getBlockAnchors(block), ANCHOR_KEY.id, ids);
+}
+function trackedTextCarrierIds(span, includeContainedAtoms) {
+  return new Set([
     span.startAtomId,
     span.endAtomId,
     ...span.preservedAtomIds,
-    ...removeContainedAtoms ? span.containedAtomIds : []
+    ...includeContainedAtoms ? span.containedAtomIds : []
   ]);
-  deleteYMapArrayEntriesByIds(getBlockAtoms(block), ATOM_KEY.id, ids);
-  deleteYMapArrayEntriesByIds(getBlockAnchors(block), ANCHOR_KEY.id, ids);
 }
-function removeCommentCarriersByIds(block, commentIds) {
-  if (commentIds.size === 0)
-    return;
+function rangeAnchorIdentityForAtom(atom) {
+  const atomKind = atom.get(ATOM_KEY.kind);
+  if (atomKind !== INLINE_ATOM_KIND.commentMarker && atomKind !== INLINE_ATOM_KIND.bookmark)
+    return null;
+  const marker = String(asRecord6(atom.get(ATOM_KEY.meta)).marker ?? "");
+  const boundary = marker.endsWith("End") ? "end" : marker.endsWith("Start") ? "start" : "point";
+  return { kind: atomKind === INLINE_ATOM_KIND.commentMarker ? "comment" : "bookmark", boundary };
+}
+function collectCommentCarrierIds(commentIds) {
   const ids = new Set;
   for (const commentId of commentIds) {
     ids.add(`comment:${commentId}:start`);
     ids.add(`comment:${commentId}:end`);
     ids.add(`comment:${commentId}:ref`);
   }
+  return ids;
+}
+function removeCommentCarriersByIds(block, ids) {
+  if (ids.size === 0)
+    return;
   deleteYMapArrayEntriesByIds(getBlockAtoms(block), ATOM_KEY.id, ids);
   deleteYMapArrayEntriesByIds(getBlockAnchors(block), ANCHOR_KEY.id, ids);
 }
@@ -709513,7 +709627,10 @@ function admitPreparedStorySurfaceMutation(prepared, options) {
       return options.session ? { ok: true } : { ok: false, message: "tracked-change decision session sync requires an authoritative session" };
     }
     const trackedDecision = validatePreparedTrackedDecide(prepared, extension2, options);
-    return trackedDecision.ok ? { ok: true } : { ok: false, message: trackedDecision.failureReason };
+    if (!trackedDecision.ok)
+      return { ok: false, message: trackedDecision.failureReason };
+    const preflight2 = preflightPreparedTrackedDecide({ prepared, ...trackedDecision });
+    return preflight2.ok ? { ok: true, trackedDecision: preflight2.preflight } : { ok: false, message: preflight2.failureReason };
   }
   if (extension2.family === "storyTable") {
     if (extension2.historyReplay) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.0.0-next.7",
+  "version": "1.0.0-next.8",
   "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.13.0-next.9",
+    "@superdoc/sdk": "2.13.0-next.10",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.16.0-next.7",
-    "@superdoc/docx-engine": "0.15.0-next.7",
+    "superdoc": "2.16.0-next.8",
+    "@superdoc/docx-engine": "0.15.0-next.8",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",