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

package/dist/index.js

@@ -31630,7 +31630,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.23.0-next.5";
+var SDK_VERSION = "2.23.0-next.6";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -384950,7 +384950,7 @@ function bytesProveNoContentControlCarrier(bytes) {
   }
   return true;
 }
-function listContentControlPartSources(context) {
+function listContentControlPartSources(context, rangeCache) {
   const body = context.resolveFullStoryLocator({ kind: "story", storyType: "body" });
   if ("error" in body)
     throw operationError("TARGET_NOT_FOUND", "body story is not available.");
@@ -384970,8 +384970,83 @@ function listContentControlPartSources(context) {
       story
     });
   }
+  const textboxes = listSDDocumentSessionInternalStories(context.session).filter((textbox) => textbox.storyKind === "textbox" && textbox.textboxId && textbox.storyByteRange);
+  const registry3 = getSDDocumentSessionInternalTextboxRegistry(context.session);
+  const progress = getSDDocumentSessionInternalTextboxRegistryProgressFingerprint(context.session);
+  for (const partUri of rangeCache.keys())
+    if (!seen.has(partUri))
+      rangeCache.delete(partUri);
+  for (const owner of [...sources]) {
+    const owned = textboxes.filter((textbox) => textbox.partUri === owner.partUri);
+    const bytes = owned.length ? readPartBytes2(context, owner.partUri) : null;
+    if (!bytes) {
+      rangeCache.delete(owner.partUri);
+      continue;
+    }
+    const inactive = owned.flatMap((textbox) => {
+      const [start, end] = textbox.storyByteRange;
+      return (registry3.byTextboxId.get(textbox.textboxId)?.alternateContentCounterparts ?? []).filter((range) => !(range[0] <= start && range[1] >= end));
+    });
+    const boundaries = [...new Set([
+      ...owned.flatMap((textbox) => [...textbox.storyByteRange]),
+      ...inactive.flatMap((range) => [...range])
+    ])].sort((left, right) => left - right);
+    let cached2 = rangeCache.get(owner.partUri);
+    if (!cached2 || cached2.bytes !== bytes || cached2.registry !== registry3 || cached2.progress !== progress || cached2.boundaries.length !== boundaries.length || cached2.boundaries.some((boundary, index2) => boundary !== boundaries[index2])) {
+      const offsets2 = new Map;
+      let byteOffset = 0;
+      let charOffset = 0;
+      for (const boundary of boundaries) {
+        charOffset += decodeXml(bytes.subarray(byteOffset, boundary)).length;
+        offsets2.set(boundary, charOffset);
+        byteOffset = boundary;
+      }
+      cached2 = { bytes, registry: registry3, progress, boundaries, offsets: offsets2 };
+      rangeCache.set(owner.partUri, cached2);
+    }
+    const { offsets } = cached2;
+    const characterRange = ([start, end]) => [offsets.get(start), offsets.get(end)];
+    if (inactive.length)
+      owner.excludedXmlRanges = inactive.map(characterRange);
+    for (const textbox of owned) {
+      sources.push({
+        partUri: textbox.partUri,
+        storyId: textbox.storyId,
+        story: { kind: "story", storyType: "textbox", textboxId: textbox.textboxId },
+        xmlRange: characterRange(textbox.storyByteRange)
+      });
+    }
+  }
   return sources;
 }
+function partitionContentControlScan(xml, sources) {
+  const hiddenControls = collectHiddenNativeContentControlStarts(xml);
+  const trackedWrapperRanges = buildTrackedWrapperRanges(xml);
+  const scans = new Map(sources.map((source) => [source, { ranges: [], hiddenControls, trackedWrapperRanges }]));
+  const owner = sources.find((source) => !source.xmlRange);
+  const textboxes = sources.filter((source) => source.xmlRange).sort((left, right) => left.xmlRange[0] - right.xmlRange[0]);
+  const inactive = [...owner.excludedXmlRanges ?? []].sort((left, right) => left[0] - right[0]);
+  const containing = (items, rangeOf, start, end) => {
+    let low = 0;
+    let high = items.length;
+    while (low < high) {
+      const middle = low + high >>> 1;
+      if (rangeOf(items[middle])[0] <= start)
+        low = middle + 1;
+      else
+        high = middle;
+    }
+    const candidate2 = items[low - 1];
+    return candidate2 !== undefined && rangeOf(candidate2)[1] >= end ? candidate2 : undefined;
+  };
+  for (const range of collectContentControlRanges(xml)) {
+    const textbox = containing(textboxes, (source) => source.xmlRange, range.start, range.end);
+    if (!textbox && containing(inactive, (range2) => range2, range.start, range.end))
+      continue;
+    scans.get(textbox ?? owner).ranges.push(range);
+  }
+  return scans;
+}
 
 class V2ContentControlsAdapter {
   constructor(context) {
@@ -385062,17 +385137,23 @@ class V2ContentControlsAdapter {
       ungroup: (input, options) => this.unwrap(input, options)
     };
     this.loadedCache = null;
+    this.textboxCharacterRanges = new Map;
     this.readCatalog = null;
     this.partsWithoutControlCarriers = new WeakSet;
   }
+  hasCurrentLoadedCache(revision) {
+    return this.loadedCache?.revision === revision && this.loadedCache.registry === getSDDocumentSessionInternalTextboxRegistry(this.context.session) && this.loadedCache.registryProgress === getSDDocumentSessionInternalTextboxRegistryProgressFingerprint(this.context.session);
+  }
   currentReadCatalog() {
     const cached2 = this.readCatalog;
     const session = this.context.session;
     if (!cached2 || getSDDocumentSessionInternalSourceCompletePosture(session) !== "source-complete" || cached2.identity !== getSDDocumentSessionInternalResidentMainControlInventoryIdentity(session))
       return null;
-    const sources = listContentControlPartSources(this.context);
-    if (JSON.stringify(sources) !== JSON.stringify(cached2.sources) || sources.some((source, i2) => i2 > 0 && getSDDocumentSessionInternalPartBytes(session, source.partUri) !== cached2.secondaryBytes[i2]))
+    const sources = listContentControlPartSources(this.context, this.textboxCharacterRanges);
+    if (JSON.stringify(sources) !== JSON.stringify(cached2.sources) || sources.some((source, i2) => i2 > 0 && getSDDocumentSessionInternalPartBytes(session, source.partUri) !== cached2.secondaryBytes[i2])) {
+      this.loadedCache = null;
       return null;
+    }
     if (this.loadedCache?.revision !== this.context.currentPublicRevision())
       this.loadedCache = null;
     return cached2;
@@ -385084,7 +385165,7 @@ class V2ContentControlsAdapter {
       this.readCatalog = null;
       return;
     }
-    const sources = listContentControlPartSources(this.context);
+    const sources = listContentControlPartSources(this.context, this.textboxCharacterRanges);
     this.readCatalog = {
       identity,
       sources,
@@ -385113,7 +385194,7 @@ class V2ContentControlsAdapter {
       const relationships = listSDDocumentSessionInternalHeaderFooterRels(session);
       if (bodyDescriptor.relationships.status === "missing" && relationships.length > 0)
         return false;
-      const sources = listContentControlPartSources(this.context);
+      const sources = listContentControlPartSources(this.context, this.textboxCharacterRanges);
       if (relationships.some((rel) => !sources.some((source) => source.story && source.partUri === rel.partUri))) {
         return false;
       }
@@ -385165,8 +385246,17 @@ class V2ContentControlsAdapter {
         throw error48;
       return { success: false, failure: { code: error48.code, message: error48.message } };
     }
+    if (part.story?.storyType === "textbox") {
+      const textbox = getSDDocumentSessionInternalTextboxRegistry(this.context.session).byTextboxId.get(part.story.textboxId);
+      if (textbox && textbox.alternateContentCounterparts.length > 1) {
+        return { success: false, failure: {
+          code: "CAPABILITY_UNSUPPORTED",
+          message: "Content-control creation in mirrored AlternateContent textbox stories is unsupported; no changes were made."
+        } };
+      }
+    }
     if (structuralReplacementXml !== undefined && input.at?.start.kind === "text") {
-      const anchor = findParagraphById3(part.xml, input.at.start.blockId);
+      const anchor = findParagraphById3(part.xml, input.at.start.blockId, part.xmlRange);
       const ranges = collectXmlElementRanges(part.xml).ranges;
       const paragraph4 = anchor && ranges.find((range) => range.start === anchor.start && range.end === anchor.end);
       const parent = paragraph4 && ranges.filter((range) => range.start < paragraph4.start && range.end > paragraph4.end).sort((left, right) => left.end - left.start - (right.end - right.start))[0];
@@ -385236,7 +385326,7 @@ class V2ContentControlsAdapter {
       if (!trackedStamp) {
         return { success: false, failure: { code: "PRECONDITION_FAILED", message: "no-author-configured" } };
       }
-      const preview = wrapSelectionInXml(this.context, part.xml, input.at, wrapTrackedStructuralXml({ innerXml: baseSdtXml, kind: "ins", stamp: trackedStamp }), input.kind, input.content ?? "", input.content !== undefined);
+      const preview = wrapSelectionInXml(this.context, part.xml, input.at, wrapTrackedStructuralXml({ innerXml: baseSdtXml, kind: "ins", stamp: trackedStamp }), input.kind, input.content ?? "", input.content !== undefined, undefined, false, part.xmlRange);
       if (!preview.ok)
         return { success: false, failure: preview.failure };
       if (!dryRun) {
@@ -385257,7 +385347,7 @@ class V2ContentControlsAdapter {
         }
       }
       if (input.at) {
-        const anchor = input.at.start.kind === "text" ? findParagraphById3(part.xml, input.at.start.blockId) : null;
+        const anchor = input.at.start.kind === "text" ? findParagraphById3(part.xml, input.at.start.blockId, part.xmlRange) : null;
         const hasPendingRevisions = anchor && /<(?:[\w.-]+:)?(?:ins|del|moveFrom|moveTo)\b/.test(anchor.xml);
         const pendingRevisionFailure = {
           success: false,
@@ -385268,7 +385358,7 @@ class V2ContentControlsAdapter {
         };
         if (hasPendingRevisions && !supportsTrackedInlineTextCreate(input))
           return pendingRevisionFailure;
-        const preview = wrapSelectionInXml(this.context, part.xml, input.at, baseSdtXml, "inline", input.content ?? "", input.content !== undefined);
+        const preview = wrapSelectionInXml(this.context, part.xml, input.at, baseSdtXml, "inline", input.content ?? "", input.content !== undefined, undefined, false, part.xmlRange);
         if (!preview.ok)
           return { success: false, failure: preview.failure };
         if (hasPendingRevisions) {
@@ -385280,10 +385370,10 @@ class V2ContentControlsAdapter {
       let beforeXml = "";
       let namespaceBindings = new Map(Object.entries(collectXmlElementRanges(part.xml).ranges[0]?.namespaceBindings ?? {}));
       if (input.at?.start.kind === "text") {
-        const anchor = findParagraphById3(part.xml, input.at.start.blockId);
+        const anchor = findParagraphById3(part.xml, input.at.start.blockId, part.xmlRange);
         if (anchor) {
           namespaceBindings = new Map(contentControlNamespaceBindings(part.xml, anchor.start, true));
-          if (input.kind === "block" && extractVisibleTextFromXml(anchor.xml).trim().length === 0) {
+          if (input.kind === "block" && isReplaceableEmptyParagraph(anchor.xml)) {
             beforeXml = anchor.xml;
           }
         }
@@ -385322,7 +385412,7 @@ class V2ContentControlsAdapter {
         if (wholeBlocks.kind === "failure") {
           return { success: false, failure: { code: wholeBlocks.code, message: wholeBlocks.message } };
         }
-        const anchor = at.start.kind === "text" ? findParagraphById3(part.xml, at.start.blockId) : null;
+        const anchor = at.start.kind === "text" ? findParagraphById3(part.xml, at.start.blockId, part.xmlRange) : null;
         if (wholeBlocks.kind === "ok") {
           const selectedXml = part.xml.slice(wholeBlocks.start, wholeBlocks.end);
           const wrapped = replaceSdtContentInTemplate(sdtXml, buildInnerXml(selectedXml));
@@ -385354,8 +385444,8 @@ class V2ContentControlsAdapter {
           })();
           let left = split.slice(0, splitAt) + "</w:p>";
           let right = anchor.xml.slice(0, openEnd) + properties2 + split.slice(splitAt + splitMarker.length);
-          const keepLeft = parseParagraphInlineMap(left).visibleLength > 0;
-          const keepRight = parseParagraphInlineMap(right).visibleLength > 0;
+          const keepLeft = parseParagraphInlineMap(left).visibleLength > 0 || hasParagraphObjects(left);
+          const keepRight = parseParagraphInlineMap(right).visibleLength > 0 || hasParagraphObjects(right);
           const allocateNextSplitId = createParaIdAllocator(this.context);
           const reservedReplacementIds = new Set(structuralReplacementXml === undefined ? [] : Array.from(structuralReplacementXml.matchAll(/\bw14:paraId="([^"]+)"/g), (match) => match[1]));
           const allocateSplitId = () => {
@@ -385406,7 +385496,7 @@ class V2ContentControlsAdapter {
             targetBlockIds2 = [at.start.blockId];
         }
       } else {
-        const wrapped = wrapSelectionInXml(this.context, part.xml, input.at, sdtXml, input.kind, input.content ?? "", input.content !== undefined, repeatingSectionItemId ? (text4) => buildInnerXml(buildContentXml(text4, input.kind, createParaIdAllocator(this.context))) : undefined, !tracked && !part.story && input.html === undefined && input.json === undefined && structuralReplacementXml === undefined);
+        const wrapped = wrapSelectionInXml(this.context, part.xml, input.at, sdtXml, input.kind, input.content ?? "", input.content !== undefined, repeatingSectionItemId ? (text4) => buildInnerXml(buildContentXml(text4, input.kind, createParaIdAllocator(this.context))) : undefined, !tracked && !part.story && input.html === undefined && input.json === undefined && structuralReplacementXml === undefined, part.xmlRange);
         if (!wrapped.ok) {
           return { success: false, failure: wrapped.failure };
         }
@@ -385436,7 +385526,7 @@ class V2ContentControlsAdapter {
           }))
         };
       }
-      nextXml = insertAtDocumentEnd(part.xml, wrapped);
+      nextXml = insertAtDocumentEnd(part.xml, wrapped, part.xmlRange);
     }
     if (dryRun)
       return this.validateDryRun(input, options, target);
@@ -386219,7 +386309,7 @@ class V2ContentControlsAdapter {
       if (at.start.kind !== "text" || at.end.kind !== "text" || at.start.blockId !== at.end.blockId) {
         throw operationError("CAPABILITY_UNAVAILABLE", "Content-control creation requires a selection within one paragraph.");
       }
-      const paragraph4 = findParagraphById3(part.xml, at.start.blockId);
+      const paragraph4 = findParagraphById3(part.xml, at.start.blockId, part.xmlRange);
       if (!paragraph4)
         throw operationError("TARGET_NOT_FOUND", `Paragraph ${at.start.blockId} was not found in the target story.`);
       if (![at.start.offset, at.end.offset].every((offset) => Number.isInteger(offset) && offset >= 0 && offset <= parseParagraphInlineMap(paragraph4.xml).visibleLength) || at.start.offset > at.end.offset) {
@@ -386742,22 +386832,30 @@ class V2ContentControlsAdapter {
   }
   load() {
     const revision = this.context.currentPublicRevision();
-    if (this.loadedCache?.revision === revision)
+    if (this.hasCurrentLoadedCache(revision))
       return this.loadedCache.value;
     const documentXml = readPartXml(this.context, DOCUMENT_PART_URI5);
     if (!documentXml)
       throw operationError("PRECONDITION_FAILED", "document.xml bytes are unavailable.");
     const parts = [];
-    for (const source of listContentControlPartSources(this.context)) {
-      const xml = source.partUri === DOCUMENT_PART_URI5 ? documentXml : readPartXml(this.context, source.partUri);
+    const sources = listContentControlPartSources(this.context, this.textboxCharacterRanges);
+    const captures = new Map;
+    for (const partUri of new Set(sources.map((source) => source.partUri))) {
+      const xml = partUri === DOCUMENT_PART_URI5 ? documentXml : readPartXml(this.context, partUri);
       if (!xml)
         continue;
-      const paragraphs2 = parseParagraphWindows(xml);
+      captures.set(partUri, { xml, scans: partitionContentControlScan(xml, sources.filter((source) => source.partUri === partUri)) });
+    }
+    for (const source of sources) {
+      const capture = captures.get(source.partUri);
+      if (!capture)
+        continue;
+      const paragraphs2 = parseParagraphWindows(capture.xml, source.xmlRange);
       parts.push({
         ...source,
-        xml,
+        xml: capture.xml,
         paragraphs: paragraphs2,
-        controls: parseContentControls(xml, paragraphs2, source.storyId, source.story)
+        controls: parseContentControls(capture.xml, paragraphs2, source.storyId, source.story, capture.scans.get(source))
       });
     }
     const body = parts.find((part) => part.partUri === DOCUMENT_PART_URI5);
@@ -386767,7 +386865,12 @@ class V2ContentControlsAdapter {
       controls: parts.flatMap((part) => part.controls),
       parts
     };
-    this.loadedCache = { revision, value: value3 };
+    this.loadedCache = {
+      revision,
+      value: value3,
+      registry: getSDDocumentSessionInternalTextboxRegistry(this.context.session),
+      registryProgress: getSDDocumentSessionInternalTextboxRegistryProgressFingerprint(this.context.session)
+    };
     this.captureReadCatalog(value3);
     return value3;
   }
@@ -386776,29 +386879,45 @@ class V2ContentControlsAdapter {
       return;
     for (let attempt = 0;attempt <= maxRestarts; attempt += 1) {
       const revision = this.context.currentPublicRevision();
-      if (this.loadedCache?.revision === revision)
+      if (this.hasCurrentLoadedCache(revision))
         return;
+      const registry3 = getSDDocumentSessionInternalTextboxRegistry(this.context.session);
+      const registryProgress = getSDDocumentSessionInternalTextboxRegistryProgressFingerprint(this.context.session);
+      const captureIsCurrent = () => this.context.currentPublicRevision() === revision && getSDDocumentSessionInternalTextboxRegistry(this.context.session) === registry3 && getSDDocumentSessionInternalTextboxRegistryProgressFingerprint(this.context.session) === registryProgress;
       const documentXml = readPartXml(this.context, DOCUMENT_PART_URI5);
       if (!documentXml)
         return;
-      const captures = listContentControlPartSources(this.context).flatMap((source) => {
-        const xml = source.partUri === DOCUMENT_PART_URI5 ? documentXml : readPartXml(this.context, source.partUri);
-        return xml ? [{ source, xml }] : [];
+      const sources = listContentControlPartSources(this.context, this.textboxCharacterRanges);
+      const physicalParts = new Map;
+      for (const partUri of new Set(sources.map((source) => source.partUri))) {
+        const xml = partUri === DOCUMENT_PART_URI5 ? documentXml : readPartXml(this.context, partUri);
+        if (!xml)
+          continue;
+        physicalParts.set(partUri, { xml, scans: partitionContentControlScan(xml, sources.filter((source) => source.partUri === partUri)) });
+      }
+      const captures = sources.flatMap((source) => {
+        const part = physicalParts.get(source.partUri);
+        return part ? [{ source, xml: part.xml, scan: part.scans.get(source) }] : [];
       });
       const parts = [];
       let preempted = false;
       for (const capture of captures) {
-        const paragraphs2 = await parseParagraphWindowsCooperatively(capture.xml, yieldPoint);
-        if (this.context.currentPublicRevision() !== revision) {
+        const paragraphs2 = await parseParagraphWindowsCooperatively(capture.xml, yieldPoint, capture.source.xmlRange);
+        if (!captureIsCurrent()) {
           preempted = true;
           break;
         }
-        const controls = await parseContentControlsCooperatively(capture.xml, paragraphs2, capture.source.storyId, capture.source.story, yieldPoint);
-        if (this.context.currentPublicRevision() !== revision) {
+        const controls = await parseContentControlsCooperatively(capture.xml, paragraphs2, capture.source.storyId, capture.source.story, yieldPoint, capture.scan);
+        if (!captureIsCurrent()) {
           preempted = true;
           break;
         }
-        parts.push({ ...capture.source, xml: capture.xml, paragraphs: paragraphs2, controls });
+        parts.push({
+          ...capture.source,
+          xml: capture.xml,
+          paragraphs: paragraphs2,
+          controls
+        });
       }
       if (preempted)
         continue;
@@ -386811,7 +386930,7 @@ class V2ContentControlsAdapter {
         controls: parts.flatMap((part) => part.controls),
         parts
       };
-      this.loadedCache = { revision, value: value3 };
+      this.loadedCache = { revision, value: value3, registry: registry3, registryProgress };
       this.captureReadCatalog(value3);
       return;
     }
@@ -386880,7 +386999,7 @@ class V2ContentControlsAdapter {
       semanticStyleDependencies: commitOptions.semanticStyleDependencies,
       storySurface: commitOptions.storySurface,
       signalLanesToRebuild: commitOptions.signalLanesToRebuild,
-      storyIds: commitOptions.storySurface?.contentControlRewrite ? this.load().parts.filter((part) => part.partUri === partUri).map((part) => part.storyId) : undefined,
+      storyIds: commitOptions.storySurface?.contentControlRewrite ? this.load().parts.filter((part) => part.partUri === partUri && !part.xmlRange).map((part) => part.storyId) : undefined,
       createdRefs: commitOptions.createdRefs
     });
     if (!committed.ok)
@@ -386913,53 +387032,42 @@ function contentControlTextBlockIds(info) {
     return [];
   return [...new Set([target.start.blockId, target.end.blockId])];
 }
-function parseParagraphWindows(documentXml) {
-  const paragraphs2 = [];
-  const paragraphRe = /<w:p\b[^>]*?(?:\/>|>[\s\S]*?<\/w:p>)/g;
-  for (let match = paragraphRe.exec(documentXml);match; match = paragraphRe.exec(documentXml)) {
-    const xml = match[0];
-    const blockId = /w14:paraId="([0-9A-Fa-f]{8})"/.exec(xml)?.[1];
+function* iterateParagraphWindows(documentXml, xmlRange) {
+  const paragraphStart = /<w:p(?=[\s/>])/g;
+  paragraphStart.lastIndex = xmlRange?.[0] ?? 0;
+  for (let match = paragraphStart.exec(documentXml);match && match.index < (xmlRange?.[1] ?? documentXml.length); match = paragraphStart.exec(documentXml)) {
+    const node4 = readXmlNodeAt(documentXml, match.index);
+    if (!node4 || node4.kind !== "element" || node4.end > (xmlRange?.[1] ?? documentXml.length))
+      continue;
+    paragraphStart.lastIndex = node4.end;
+    const blockId = readAttrs(documentXml.slice(match.index, node4.openEnd))["w14:paraId"];
     if (!blockId)
       continue;
-    paragraphs2.push({
-      blockId,
-      start: match.index,
-      end: paragraphRe.lastIndex,
-      xml,
-      textLength: extractVisibleTextFromXml(xml).length
-    });
+    const xml = documentXml.slice(match.index, node4.end);
+    yield { blockId, start: match.index, end: node4.end, xml, textLength: extractVisibleTextFromXml(xml).length };
   }
-  return paragraphs2;
 }
-async function parseParagraphWindowsCooperatively(documentXml, yieldPoint) {
+function parseParagraphWindows(documentXml, xmlRange) {
+  return [...iterateParagraphWindows(documentXml, xmlRange)].filter((paragraph4) => /^[0-9A-Fa-f]{8}$/.test(paragraph4.blockId));
+}
+async function parseParagraphWindowsCooperatively(documentXml, yieldPoint, xmlRange) {
   const paragraphs2 = [];
-  const paragraphRe = /<w:p\b[^>]*?(?:\/>|>[\s\S]*?<\/w:p>)/g;
   let sinceYield = 0;
-  for (let match = paragraphRe.exec(documentXml);match; match = paragraphRe.exec(documentXml)) {
-    const xml = match[0];
-    const blockId = /w14:paraId="([0-9A-Fa-f]{8})"/.exec(xml)?.[1];
-    if (!blockId)
+  for (const paragraph4 of iterateParagraphWindows(documentXml, xmlRange)) {
+    if (!/^[0-9A-Fa-f]{8}$/.test(paragraph4.blockId))
       continue;
-    paragraphs2.push({
-      blockId,
-      start: match.index,
-      end: paragraphRe.lastIndex,
-      xml,
-      textLength: extractVisibleTextFromXml(xml).length
-    });
+    paragraphs2.push(paragraph4);
     if ((sinceYield += 1) >= COOPERATIVE_PARSE_SLICE_PARAGRAPHS) {
       sinceYield = 0;
-      const resumeFrom = paragraphRe.lastIndex;
       await yieldPoint();
-      paragraphRe.lastIndex = resumeFrom;
     }
   }
   return paragraphs2;
 }
-function parseContentControls(documentXml, paragraphs2, storyId, story) {
-  const ranges = collectContentControlRanges(documentXml);
-  const hiddenControls = collectHiddenNativeContentControlStarts(documentXml);
-  const trackedWrapperRanges = buildTrackedWrapperRanges(documentXml);
+function parseContentControls(documentXml, paragraphs2, storyId, story, scan) {
+  const ranges = scan?.ranges ?? collectContentControlRanges(documentXml);
+  const hiddenControls = scan?.hiddenControls ?? collectHiddenNativeContentControlStarts(documentXml);
+  const trackedWrapperRanges = scan?.trackedWrapperRanges ?? buildTrackedWrapperRanges(documentXml);
   const parsed = ranges.filter((range) => {
     if (hiddenControls.has(range.start))
       return false;
@@ -386985,10 +387093,10 @@ function collectContentControlRanges(documentXml) {
   ranges.sort((a, b) => a.start - b.start || b.end - a.end);
   return ranges;
 }
-async function parseContentControlsCooperatively(documentXml, paragraphs2, storyId, story, yieldPoint) {
-  const ranges = collectContentControlRanges(documentXml);
-  const hiddenControls = collectHiddenNativeContentControlStarts(documentXml);
-  const trackedWrapperRanges = buildTrackedWrapperRanges(documentXml);
+async function parseContentControlsCooperatively(documentXml, paragraphs2, storyId, story, yieldPoint, scan) {
+  const ranges = scan?.ranges ?? collectContentControlRanges(documentXml);
+  const hiddenControls = scan?.hiddenControls ?? collectHiddenNativeContentControlStarts(documentXml);
+  const trackedWrapperRanges = scan?.trackedWrapperRanges ?? buildTrackedWrapperRanges(documentXml);
   const parsed = [];
   let sinceYield = 0;
   for (const range of ranges) {
@@ -388026,8 +388134,9 @@ function buildContentXml(text4, kind, allocParaId) {
 function buildAdjacentContent(text4, kind, allocParaId) {
   return kind === "inline" ? `<w:r><w:t>${xmlEscapeText(text4)}</w:t></w:r>` : buildParaIdParagraphXml(allocParaId(), `<w:r><w:t>${xmlEscapeText(text4)}</w:t></w:r>`);
 }
-function insertAtDocumentEnd(documentXml, fragment4) {
-  const offset = documentEndInsertionOffset(documentXml);
+function insertAtDocumentEnd(documentXml, fragment4, xmlRange) {
+  const container = xmlRange ? readXmlNodeAt(documentXml, xmlRange[0]) : null;
+  const offset = container?.kind === "element" ? container.closeStart : documentEndInsertionOffset(documentXml);
   return `${documentXml.slice(0, offset)}${fragment4}${documentXml.slice(offset)}`;
 }
 function replaceSdtPrXml(sdtXml, prXml) {
@@ -388218,6 +388327,7 @@ function controlPlacement(xml, control2) {
       case "body":
       case "hdr":
       case "ftr":
+      case "txbxContent":
         return "block";
       case "sdtContent":
       case "sdt":
@@ -388625,11 +388735,11 @@ function supportsTrackedInlineTextCreate(input) {
   const at = input.at;
   return input.kind === "inline" && input.controlType === "text" && input.content !== undefined && input.html === undefined && input.json === undefined && input.ooxml === undefined && at?.kind === "selection" && at.coordinateSpace !== "tracked" && at.start.kind === "text" && at.end.kind === "text" && at.start.blockId === at.end.blockId && at.start.offset === at.end.offset;
 }
-function wrapSelectionInXml(context, documentXml, target, sdtXml, kind, replacementContent, hasReplacementContent, buildReplacementContentXml2 = (text4) => buildContentXml(text4, kind, createParaIdAllocator(context)), allowBoundarySelection = false) {
+function wrapSelectionInXml(context, documentXml, target, sdtXml, kind, replacementContent, hasReplacementContent, buildReplacementContentXml2 = (text4) => buildContentXml(text4, kind, createParaIdAllocator(context)), allowBoundarySelection = false, xmlRange) {
   if (target?.kind !== "selection" || target.start?.kind !== "text" || target.end?.kind !== "text") {
     return { ok: false, failure: { code: "INVALID_TARGET", message: "A text selection is required." } };
   }
-  const para = findParagraphById3(documentXml, target.start.blockId);
+  const para = findParagraphById3(documentXml, target.start.blockId, xmlRange);
   if (!para)
     return { ok: false, failure: { code: "TARGET_NOT_FOUND", message: "Target paragraph was not found." } };
   if (kind === "inline" && target.start.offset === target.end.offset) {
@@ -388769,11 +388879,17 @@ function insertBlockContentControlAtSelection(documentXml, paragraphs2, target,
   if (!anchor)
     throw operationError("TARGET_NOT_FOUND", "Target paragraph was not found.");
   const collapsed = target.start.blockId === target.end.blockId && target.start.offset === target.end.offset;
-  if (collapsed && extractVisibleTextFromXml(anchor.xml).trim().length === 0) {
+  if (collapsed && isReplaceableEmptyParagraph(anchor.xml)) {
     return replaceRange3(documentXml, anchor.start, anchor.end, sdtXml);
   }
   return `${documentXml.slice(0, anchor.end)}${sdtXml}${documentXml.slice(anchor.end)}`;
 }
+function isReplaceableEmptyParagraph(paragraphXml) {
+  return extractVisibleTextFromXml(paragraphXml).trim().length === 0 && !hasParagraphObjects(paragraphXml);
+}
+function hasParagraphObjects(paragraphXml) {
+  return /<(?:[\w.-]+:)?(?:drawing|pict|object)\b/.test(paragraphXml);
+}
 function resolveWholeBlockSelection(documentXml, paragraphs2, target) {
   let startBlockId;
   let endBlockId;
@@ -388899,12 +389015,10 @@ function findFirstSdtElementRange(xml) {
   }
   return null;
 }
-function findParagraphById3(documentXml, blockId) {
-  const paraRe = /<w:p\b[^>]*?(?:\/>|>[\s\S]*?<\/w:p>)/g;
-  for (let match = paraRe.exec(documentXml);match; match = paraRe.exec(documentXml)) {
-    if (match[0].includes(`w14:paraId="${blockId}"`)) {
-      return { start: match.index, end: paraRe.lastIndex, xml: match[0] };
-    }
+function findParagraphById3(documentXml, blockId, xmlRange) {
+  for (const paragraph4 of iterateParagraphWindows(documentXml, xmlRange)) {
+    if (paragraph4.blockId === blockId)
+      return paragraph4;
   }
   return null;
 }
@@ -388991,26 +389105,27 @@ function splitTextRunAtVisibleOffset(paragraphXml, piece, localOffset, insertXml
   return `${paragraphXml.slice(0, piece.runCharStart)}${beforeRun}${insertXml}${afterRun}${paragraphXml.slice(piece.runCharEnd)}`;
 }
 function replaceTextRangeInParagraph2(paragraphXml, start, end, replacement2) {
-  const textRe = /<w:t\b[^>]*>([\s\S]*?)<\/w:t>/g;
-  let offset = 0;
-  for (let match = textRe.exec(paragraphXml);match; match = textRe.exec(paragraphXml)) {
-    const text4 = decodeXmlEntities(match[1]);
-    const nextOffset = offset + text4.length;
-    if (start >= offset && end <= nextOffset) {
-      const localStart = start - offset;
-      const localEnd = end - offset;
+  const pieces = Array.from(parseParagraphInlineMap(paragraphXml).leaves());
+  for (const piece of pieces) {
+    if (!isSplittableText(piece))
+      continue;
+    if (start >= piece.visibleStart && end <= piece.visibleEnd) {
+      if (hasRunNeighborBefore(pieces, piece) || hasRunNeighborAfter(pieces, piece))
+        return paragraphXml;
+      const text4 = piece.decodedText;
+      const localStart = start - piece.visibleStart;
+      const localEnd = end - piece.visibleStart;
       const before = text4.slice(0, localStart);
       const selected = text4.slice(localStart, localEnd);
       const after = text4.slice(localEnd);
-      const runStart = findEnclosingRunStart(paragraphXml, match.index);
-      const runEnd = paragraphXml.indexOf("</w:r>", textRe.lastIndex) + "</w:r>".length;
+      const runStart = piece.runCharStart;
+      const runEnd = piece.runCharEnd;
       const { runOpenTag, runProperties } = readRunOpenTagAndProperties(paragraphXml, runStart);
       const mkRun = (segment) => `${runOpenTag}${runProperties}<w:t xml:space="preserve">${xmlEscapeText(segment)}</w:t></w:r>`;
       const beforeRun = before ? mkRun(before) : "";
       const afterRun = after ? mkRun(after) : "";
       return `${paragraphXml.slice(0, runStart)}${beforeRun}${replacement2(selected)}${afterRun}${paragraphXml.slice(runEnd)}`;
     }
-    offset = nextOffset;
   }
   return paragraphXml;
 }

package/package.json

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