@superdoc/mcp 1.0.1-next.5 → 1.0.1-next.6

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.13.1-next.5";
+var SDK_VERSION = "2.13.1-next.6";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -421919,13 +421919,21 @@ function mirrorStoryBlocksFromSession(input) {
           });
         }
         syncBlockPayloads(input.doc, payloads);
-      } else if (findBlockMap(input.doc, source.first.paraId) && findBlockMap(input.doc, source.second.paraId)) {
-        mergeBlocks({
-          doc: input.doc,
-          firstBlockId: source.first.paraId,
-          secondBlockId: source.second.paraId,
-          origin: STORY_SURFACE_BACKEND_ORIGIN
-        });
+      } else {
+        const physicallyMerged = input.prepared.semanticDelta.invalidatedRefs.some((ref5) => ref5.kind === "block" && ref5.storyId === input.storyId && ref5.nodeId === source.second.paraId);
+        if (physicallyMerged) {
+          if (findBlockMap(input.doc, source.first.paraId) && findBlockMap(input.doc, source.second.paraId)) {
+            mergeBlocks({
+              doc: input.doc,
+              firstBlockId: source.first.paraId,
+              secondBlockId: source.second.paraId,
+              origin: STORY_SURFACE_BACKEND_ORIGIN
+            });
+          }
+          syncBlocksFromSession(input.session, input.storyId, input.doc, [source.first.paraId]);
+        } else {
+          syncBlocksFromSession(input.session, input.storyId, input.doc, input.extension.targetBlockIds);
+        }
       }
       writeParagraphMembershipTableOverlaysFromSession(input.session, input.prepared, input.storyId, input.doc, [source.first.paraId, source.second.paraId], "paragraph.merge");
       return;
@@ -423027,6 +423035,14 @@ var init_story_surface_session_sync = __esm(() => {
 });
 
 // ../../../v2/collaboration-v2/dist/backend/story-surface-execution-backend.js
+function trackedStoryTextRequiresMergedCarrierSync(validation) {
+  if (!validation || validation.source.changeMode !== "tracked")
+    return false;
+  const authorsText = validation.trackedInsert != null || validation.trackedInsertContinuation === true || (validation.trackedRefinement?.metadata.insertedText.length ?? 0) > 0;
+  if (!authorsText && validation.trackedRefinement?.usesMergedCarrier !== true)
+    return false;
+  return snapshotStoryShard(validation.doc).blocks.some((block) => block.blockId === validation.target.blockId && block.mergedTailBlockIds.length > 0);
+}
 function createStorySurfaceExecutionBackend(options) {
   const delegate = options.delegate;
   return {
@@ -423215,7 +423231,8 @@ function runFamilyMirror(prepared, extension2, options, directStoryText, tracked
     };
   }
   if (extension2.family === "storyText") {
-    if (extension2.historyReplay || extension2.resyncFromSession || extension2.sessionSync) {
+    const mergedCarrierSync = trackedStoryTextRequiresMergedCarrierSync(directStoryText);
+    if (extension2.historyReplay || extension2.resyncFromSession || extension2.sessionSync || mergedCarrierSync) {
       if (!options.session) {
         return {
           mirrored: false,
@@ -423229,7 +423246,7 @@ function runFamilyMirror(prepared, extension2, options, directStoryText, tracked
       const sessionSync = mirrorStorySurfaceFromSession({
         session: options.session,
         prepared,
-        extension: extension2,
+        extension: mergedCarrierSync && !extension2.sessionSync ? { ...extension2, sessionSync: { reason: "structural-inline-edit" } } : extension2,
         storyIds: storyIdsRequiringShards(prepared, extension2),
         resolveStoryShard: options.resolveStoryShard
       });
@@ -424050,6 +424067,9 @@ function admitPreparedStorySurfaceMutation(prepared, options) {
       return validateStoryTextSessionSync(prepared, extension2, options);
     }
     const direct = validateDirectStoryText(prepared, extension2, options);
+    if (direct.ok && trackedStoryTextRequiresMergedCarrierSync(direct) && !options.session) {
+      return { ok: false, message: "tracked text across merged carriers requires an authoritative session" };
+    }
     return direct.ok ? { ok: true, directStoryText: direct } : { ok: false, message: direct.failureReason };
   }
   const storyIds = [...new Set(prepared.resolvedTargets.stories.map((storyId) => String(storyId)))];
@@ -424488,9 +424508,18 @@ function validateDirectStoryText(prepared, extension2, options) {
   let validatedTrackedRefinement;
   if (trackedRefinement?.ok) {
     const live = validateTrackedTextRefinementTarget(hydratedBlock, trackedRefinement.metadata);
-    if (!live.ok)
-      return { ok: false, failureReason: live.failureReason };
-    validatedTrackedRefinement = { metadata: trackedRefinement.metadata, span: live.span };
+    if (live.ok) {
+      validatedTrackedRefinement = { metadata: trackedRefinement.metadata, span: live.span };
+    } else {
+      const merged = validateMergedCarrierTrackedTextRefinementTarget(doc2, source.on.startBlockId, trackedRefinement.metadata);
+      if (!merged.ok)
+        return { ok: false, failureReason: live.failureReason };
+      validatedTrackedRefinement = {
+        metadata: trackedRefinement.metadata,
+        span: merged.span,
+        usesMergedCarrier: true
+      };
+    }
   } else {
     const mutationStart = trackedEdit?.ok ? trackedEdit.trackedEdit.startOffset : source.on.startOffset;
     const mutationEnd = trackedEdit?.ok ? trackedEdit.trackedEdit.endOffset : source.on.endOffset;
@@ -424583,6 +424612,58 @@ function validateTrackedTextRefinementTarget(block, metadata2) {
   }
   return { ok: true, span };
 }
+function validateMergedCarrierTrackedTextRefinementTarget(doc2, blockId, metadata2) {
+  const block = snapshotStoryShard(doc2).blocks.find((candidate2) => candidate2.blockId === blockId);
+  if (!block || block.mergedTailBlockIds.length === 0) {
+    return { ok: false, failureReason: "tracked text refinement has no merged paragraph carriers" };
+  }
+  const starts = block.atoms.map((atom, index2) => ({ atom, index: index2 })).filter(({ atom }) => atom.kind === INLINE_ATOM_KIND.trackedWrapper && atom.meta.wrapper === "ins" && String(atom.meta.rsid ?? "") === metadata2.insertionRsid && atom.meta.position === "start");
+  const ends = block.atoms.map((atom, index2) => ({ atom, index: index2 })).filter(({ atom }) => atom.kind === INLINE_ATOM_KIND.trackedWrapper && atom.meta.wrapper === "ins" && String(atom.meta.rsid ?? "") === metadata2.insertionRsid && atom.meta.position === "end");
+  const candidates = starts.flatMap((start) => {
+    const end = ends.find((candidate2) => candidate2.index > start.index);
+    if (!end)
+      return [];
+    const span2 = {
+      trackedKind: "ins",
+      blockId,
+      startOffset: start.atom.visibleOffset,
+      endOffset: end.atom.visibleOffset,
+      sourceStartOffset: start.atom.visibleOffset,
+      sourceEndOffset: end.atom.visibleOffset,
+      startAtomIndex: start.index,
+      startAtomId: start.atom.id,
+      endAtomId: end.atom.id,
+      preservedAtomIds: [],
+      containedAtomIds: block.atoms.slice(start.index + 1, end.index).map((atom) => atom.id),
+      deletedRuns: [],
+      deletedSegments: []
+    };
+    return metadata2.liveTextRange.startOffset >= span2.startOffset && metadata2.liveTextRange.endOffset <= span2.endOffset ? [span2] : [];
+  });
+  if (candidates.length !== 1) {
+    return {
+      ok: false,
+      failureReason: `tracked text refinement could not resolve insertion ${metadata2.insertionRsid}`
+    };
+  }
+  const span = candidates[0];
+  const resultLength = span.endOffset - span.startOffset - (metadata2.liveTextRange.endOffset - metadata2.liveTextRange.startOffset) + metadata2.insertedText.length;
+  if (resultLength < 0 || metadata2.removesInsertion !== (resultLength === 0)) {
+    return { ok: false, failureReason: "tracked text refinement removal metadata does not match live insertion" };
+  }
+  if (span.containedAtomIds.length > 0) {
+    return {
+      ok: false,
+      failureReason: "tracked text refinement intersects an unsupported insertion carrier"
+    };
+  }
+  const ownCarrierIds = new Set([span.startAtomId, span.endAtomId]);
+  const unsafeCarrier = block.atoms.find((atom) => !ownCarrierIds.has(atom.id) && atom.visibleOffset > metadata2.liveTextRange.startOffset && atom.visibleOffset < metadata2.liveTextRange.endOffset);
+  if (unsafeCarrier) {
+    return { ok: false, failureReason: `tracked text refinement intersects ${unsafeCarrier.kind} atom` };
+  }
+  return { ok: true, span };
+}
 function validateTrackedTextInsert(source, extension2) {
   if (extension2.changeMode !== "tracked") {
     return { ok: false, failureReason: "tracked editText source requires tracked storySurface metadata" };
@@ -424681,7 +424762,7 @@ function mirrorTrackedTextInsert(input) {
         wrapper: "ins",
         position: "start",
         rsid: input.trackedInsert.rsid,
-        wId: input.trackedInsert.wId,
+        wId: String(input.trackedInsert.wId),
         author: input.trackedInsert.author,
         authorEmail: author.email ?? null,
         date: input.trackedInsert.date
@@ -424695,7 +424776,7 @@ function mirrorTrackedTextInsert(input) {
         wrapper: "ins",
         position: "end",
         rsid: input.trackedInsert.rsid,
-        wId: input.trackedInsert.wId,
+        wId: String(input.trackedInsert.wId),
         author: input.trackedInsert.author,
         authorEmail: author.email ?? null,
         date: input.trackedInsert.date
@@ -424878,7 +424959,7 @@ function mirrorTrackedTextEdit(input) {
         wrapper: "del",
         position: "start",
         rsid: input.trackedEdit.deletion.rsid,
-        wId: input.trackedEdit.deletion.wId,
+        wId: String(input.trackedEdit.deletion.wId),
         author: input.trackedEdit.deletion.author,
         authorEmail: deletionAuthor.email ?? null,
         date: input.trackedEdit.deletion.date
@@ -424898,7 +424979,7 @@ function mirrorTrackedTextEdit(input) {
         wrapper: "del",
         position: "end",
         rsid: input.trackedEdit.deletion.rsid,
-        wId: input.trackedEdit.deletion.wId,
+        wId: String(input.trackedEdit.deletion.wId),
         author: input.trackedEdit.deletion.author,
         authorEmail: deletionAuthor.email ?? null,
         date: input.trackedEdit.deletion.date
@@ -424918,7 +424999,7 @@ function mirrorTrackedTextEdit(input) {
         wrapper: "ins",
         position: "start",
         rsid: insertion.rsid,
-        wId: insertion.wId,
+        wId: String(insertion.wId),
         author: insertion.author,
         authorEmail: insertionAuthor.email ?? null,
         date: insertion.date
@@ -424931,7 +425012,7 @@ function mirrorTrackedTextEdit(input) {
         wrapper: "ins",
         position: "end",
         rsid: insertion.rsid,
-        wId: insertion.wId,
+        wId: String(insertion.wId),
         author: insertion.author,
         authorEmail: insertionAuthor.email ?? null,
         date: insertion.date

package/package.json

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