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

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.7";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -369135,6 +369135,7 @@ async function compilePlan(context, input) {
   }
   detectTargetConflicts(context, steps, failures);
   detectUnsupportedRuntimeDrift(input.steps, failures);
+  detectTargetOffsetDriftRisk(steps, failures);
   return { evaluatedRevision, steps, failures };
 }
 function isOrderedAtomicTextProgram(steps) {
@@ -369619,6 +369620,14 @@ function detectUnsupportedRuntimeDrift(steps, failures) {
           message: "multi-step mutation plans cannot use revision-bound ref targets; use selector targets so the engine can re-resolve each step before commit."
         });
       }
+      if (step3.where.by === "target" && step3.where.target.kind === "selection" && step3.where.target.start.kind === "text" && step3.where.target.end.kind === "text" && step3.where.target.start.blockId !== step3.where.target.end.blockId) {
+        failures.push({
+          code: "CAPABILITY_UNSUPPORTED",
+          stepId: step3.id,
+          phase: "compile",
+          message: 'multi-step mutation plans cannot combine a cross-block by:"target" step with other mutating steps; ' + "conflict and offset-drift detection only see that step's first block. Apply it alone, or split the " + "plan so the cross-block step runs in its own mutations.apply call."
+        });
+      }
     }
   }
 }
@@ -369659,6 +369668,33 @@ function detectTargetConflicts(context, steps, failures) {
     }
   }
 }
+function detectTargetOffsetDriftRisk(steps, failures) {
+  const textShiftingOps = new Set(["text.rewrite", "text.delete", "text.insert"]);
+  const byBlock = new Map;
+  for (const step3 of steps) {
+    if (!textShiftingOps.has(step3.op) || step3.source.op === "assert" || step3.source.where?.by !== "target")
+      continue;
+    const resolutions = step3.resolutions ?? (step3.resolution ? [step3.resolution] : []);
+    for (const resolution of resolutions) {
+      const key2 = `${storyKeyForTarget(resolution.target)}::${resolution.target.blockId}`;
+      const list2 = byBlock.get(key2) ?? [];
+      list2.push(step3);
+      byBlock.set(key2, list2);
+    }
+  }
+  for (const blockSteps of byBlock.values()) {
+    if (blockSteps.length <= 1)
+      continue;
+    for (const step3 of blockSteps) {
+      failures.push({
+        code: "CAPABILITY_UNSUPPORTED",
+        stepId: step3.stepId,
+        phase: "compile",
+        message: `step "${step3.stepId}" shares a block with another by:"target" text-shifting step in this plan; explicit ` + "offsets are not re-derived between steps, so an earlier same-block step can shift this one's offsets. " + 'Split same-block edits into separate mutations.apply calls, or use by:"select" for later occurrences in ' + "the same block."
+      });
+    }
+  }
+}
 function conflictRangeForResolution(context, step3, resolution) {
   if (step3.source.op !== "format.apply" || step3.source.args.scope !== "block" && step3.source.args.alignment === undefined) {
     return resolution.range;
@@ -369713,9 +369749,117 @@ async function resolveMutationStep(context, step3, story, changeMode) {
     const compiled = resolveRefMutationStep(context, step3, story, matches[0].ref);
     return applySelectMatchReplacementPolicy(compiled, step3, matches[0].groups);
   }
+  if (step3.where.by === "target") {
+    return resolveTargetWhereMutationStep(context, step3, step3.where, story, changeMode);
+  }
   const ref5 = resolveStepRef(step3);
   return resolveRefMutationStep(context, step3, story, ref5);
 }
+function resolveTargetWhereMutationStep(context, step3, where, story, changeMode) {
+  const target = where.target;
+  if (target.kind !== "selection" || target.start.kind !== "text" || target.end.kind !== "text") {
+    throw new DocumentApiValidationError2("INVALID_TARGET", `v2 ${step3.op} target steps require a text SelectionTarget with text-kind endpoints.`);
+  }
+  const storyLocator = target.story ?? story;
+  if (!isSupportedMutationStoryScope(storyLocator)) {
+    throw new DocumentApiValidationError2("CAPABILITY_UNSUPPORTED", `v2 mutation plan engine supports only the body story; "${storyLocator?.storyType}" story targets are not supported.`);
+  }
+  if (step3.op === "text.rewrite" && step3.args.replacementMode === "regex-template") {
+    throw new DocumentApiValidationError2("CAPABILITY_UNSUPPORTED", 'v2 text.rewrite target steps do not support replacementMode "regex-template"; an explicit target carries no ' + 'capture groups. Use a by:"select" step for regex-template replacements.');
+  }
+  const selectionMutation = new V2SelectionMutationAdapter(context);
+  if (step3.op === "text.insert") {
+    const { text: text4, position: position2 } = readInsertArgs(step3);
+    const point3 = position2 === "before" ? target.start : target.end;
+    const collapsed = {
+      kind: "selection",
+      start: point3,
+      end: point3,
+      ...target.story ? { story: target.story } : {},
+      ...target.coordinateSpace ? { coordinateSpace: target.coordinateSpace } : {}
+    };
+    const request = { kind: "insert", target: collapsed, text: text4, ...story ? { in: story } : {} };
+    const receipt3 = selectionMutation.execute({ kind: "insert", target: collapsed, text: text4, ...story ? { in: story } : {} }, { changeMode, dryRun: true });
+    if (!receipt3.success)
+      throw new DocumentApiValidationError2(receipt3.failure.code, receipt3.failure.message);
+    const resolution2 = {
+      target: receipt3.resolution.target,
+      range: receipt3.resolution.range,
+      text: receipt3.resolution.text
+    };
+    return {
+      stepId: step3.id,
+      op: "text.insert",
+      resolution: resolution2,
+      request,
+      noopEquivalentText: text4.length === 0 ? text4 : undefined,
+      source: step3
+    };
+  }
+  if (step3.op === "format.apply") {
+    const crossBlock = target.start.blockId !== target.end.blockId;
+    if (crossBlock && (step3.args.alignment !== undefined || step3.args.scope === "block")) {
+      throw new DocumentApiValidationError2("CAPABILITY_UNSUPPORTED", "v2 format.apply target steps spanning more than one block support only an inline patch with the default " + '(non-block) scope; split a cross-block alignment or scope:"block" edit into one step per block.');
+    }
+    const placeholderResolution = {
+      target: {
+        kind: "text",
+        blockId: target.start.blockId,
+        range: { start: 0, end: 0 },
+        ...storyLocator ? { story: storyLocator } : {}
+      },
+      range: { from: 0, to: 0 },
+      text: ""
+    };
+    const request = buildFormatCommitRequest(context, step3, placeholderResolution, target, story, storyLocator);
+    if (request.kind !== "format") {
+      throw new DocumentApiValidationError2("INVALID_TARGET", "v2 format.apply target steps require a resolvable target.");
+    }
+    let resolution2;
+    if (request.inline) {
+      const receipt3 = "target" in request ? selectionMutation.execute({ kind: "format", target: request.target, inline: request.inline, ...request.in ? { in: request.in } : {} }, { changeMode, dryRun: true, ...request.skipAtomicObjects ? { skipAtomicObjects: true } : {} }) : selectionMutation.execute({ kind: "format", ref: request.ref, inline: request.inline, ...request.in ? { in: request.in } : {} }, { changeMode, dryRun: true, ...request.skipAtomicObjects ? { skipAtomicObjects: true } : {} });
+      if (!receipt3.success)
+        throw new DocumentApiValidationError2(receipt3.failure.code, receipt3.failure.message);
+      resolution2 = {
+        target: receipt3.resolution.target,
+        range: receipt3.resolution.range,
+        text: receipt3.resolution.text
+      };
+    } else {
+      const blockText = readBlockTargetText(context, target.start.blockId, Number.MAX_SAFE_INTEGER, storyLocator, target.coordinateSpace);
+      resolution2 = {
+        target: { kind: "text", blockId: target.start.blockId, range: { start: 0, end: blockText.length }, ...storyLocator ? { story: storyLocator } : {} },
+        range: { from: 0, to: blockText.length },
+        text: blockText
+      };
+    }
+    return {
+      stepId: step3.id,
+      op: "format.apply",
+      resolution: resolution2,
+      request,
+      source: step3
+    };
+  }
+  const rewriteTemplate = step3.op === "text.delete" ? "" : normalizeReplacement(step3.args.replacement);
+  const probeReceipt = selectionMutation.execute({ kind: "replace", target, text: rewriteTemplate, ...story ? { in: story } : {} }, { changeMode, dryRun: true });
+  if (!probeReceipt.success)
+    throw new DocumentApiValidationError2(probeReceipt.failure.code, probeReceipt.failure.message);
+  const resolution = {
+    target: probeReceipt.resolution.target,
+    range: probeReceipt.resolution.range,
+    text: probeReceipt.resolution.text
+  };
+  const replacementText = step3.op === "text.delete" ? "" : replacementTextForMatch(step3, resolution.text);
+  return {
+    stepId: step3.id,
+    op: step3.op,
+    resolution,
+    request: { kind: "replace", target, text: replacementText, ...story ? { in: story } : {} },
+    ...step3.op === "text.rewrite" ? { noopEquivalentText: replacementText } : {},
+    source: step3
+  };
+}
 function resolveRefMutationStep(context, step3, story, ref5, cache) {
   if (isV2RangeRef(ref5)) {
     return resolveRangeRefMutationStep(context, step3, story, ref5);
@@ -421919,13 +422063,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 +423179,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 +423375,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 +423390,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 +424211,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 +424652,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 +424756,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 +424906,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 +424920,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 +425103,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 +425123,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 +425143,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 +425156,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.7",
   "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.7",
     "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.7",
+    "@superdoc/docx-engine": "0.15.1-next.6",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",