@superdoc/mcp 1.3.1-next.6 → 1.3.1-next.8

package/dist/index.js

@@ -31318,7 +31318,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.16.1-next.6";
+var SDK_VERSION = "2.16.1-next.8";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -132506,6 +132506,7 @@ function createSDTxPerfProbe() {
     sourceCoverageChunksCarried: null,
     sourceCoverageFullRescans: null,
     sourceCoverageBytesScanned: null,
+    sourceCoverageCurrentPartBytesRead: null,
     renderCommitEnvelopeMs: null,
     catalogMaintenanceMs: null,
     catalogTextSplicesApplied: null,
@@ -132655,6 +132656,58 @@ function findEnclosingRunElementAt(xml, pos) {
 }
 var escapeRegExp2 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), ATTRS = `(?:"[^"]*"|'[^']*'|[^>"'])*?`, qnamePattern = (escapedLocalName) => `(?:[\\w.-]+:)?${escapedLocalName}(?=[\\s/>])`;
 
+// ../../../v2/editor-core/dist/document/internal/inline-text-extraction.js
+function extractVisibleTextFromXml(xml, telemetry) {
+  return extractInlineText(xml, "visible", telemetry);
+}
+function extractTrackedTextFromXml(xml, telemetry) {
+  return extractInlineText(xml, "tracked", telemetry);
+}
+function projectParagraphInlineText(paragraphXml, space, telemetry) {
+  return projectReadOnlyParagraphText(paragraphXml, space, telemetry);
+}
+function extractInlineText(xml, space, telemetry) {
+  const chunks = [];
+  for (const { tagStart, node: node2 } of iterateTopLevelParagraphElements(xml)) {
+    chunks.push(projectParagraphInlineText(xml.slice(tagStart, node2.end), space, telemetry));
+  }
+  return chunks.length === 0 ? tolerantTokenWalk(xml, space) : chunks.join("");
+}
+function tolerantTokenWalk(xml, space) {
+  const contentXml = stripElements(xml, "sdtPr");
+  const body = stripOpaqueObjectBlocks(space === "visible" ? stripParagraphProperties(stripHiddenRevisionBlocks(contentXml)) : stripParagraphProperties(contentXml));
+  const pattern = space === "visible" ? /<[\w.-]+:t\b[^>]*>([\s\S]*?)<\/[\w.-]+:t>|<[\w.-]+:(tab|br|cr)\b[^>]*\/>/g : /<[\w.-]+:(?:t|delText)\b[^>]*>([\s\S]*?)<\/[\w.-]+:(?:t|delText)>|<[\w.-]+:(tab|br|cr)\b[^>]*\/>/g;
+  let out = "";
+  for (const token of body.matchAll(pattern)) {
+    if (token[1] != null) {
+      out += decodeXmlText(token[1]);
+      continue;
+    }
+    out += controlChar2(token[2]);
+  }
+  return out;
+}
+function controlChar2(control) {
+  if (control === "tab")
+    return "\t";
+  return `
+`;
+}
+function stripParagraphProperties(xml) {
+  return stripElements(xml, "pPr");
+}
+function stripHiddenRevisionBlocks(xml) {
+  return xml.replace(/<[\w.-]+:(?:del|moveFrom)\b(?![^>]*\/>)[^>]*>[\s\S]*?<\/[\w.-]+:(?:del|moveFrom)>/g, "");
+}
+function stripOpaqueObjectBlocks(xml) {
+  return xml.replace(/<[\w.-]+:(?:drawing|object|pict)\b(?![^>]*\/>)[^>]*>[\s\S]*?<\/[\w.-]+:(?:drawing|object|pict)>|<[\w.-]+:(?:drawing|object|pict)\b[^>]*\/>/g, "");
+}
+var init_inline_text_extraction = __esm(() => {
+  init_paragraph_scan_count();
+  init_paragraph_text_projection();
+  init_xml_text();
+});
+
 // ../../../v2/editor-core/dist/document/lazy-indexes.js
 function ensureLazyIndexState(state) {
   const carrier = state;
@@ -133172,53 +133225,7 @@ function buildSearchTextIndex(input) {
   };
 }
 function visibleParagraphTextWithFieldPolicy(paragraphXml, includeDeletedText = false) {
-  const visibleXml = stripParagraphPropertiesXml(paragraphXml);
-  const TOK_RE = /<([\w.-]+):(t|delText|instrText|fldChar)\b([^>]*)>(?:([\s\S]*?)<\/\1:\2>)?|<([\w.-]+):(tab|br|cr)\b([^>]*)\/>/g;
-  let out = "";
-  let fieldDepth = 0;
-  let instrSuppressed = false;
-  let m;
-  while (m = TOK_RE.exec(visibleXml)) {
-    const local = m[2] ?? m[6];
-    const attrs = m[3] ?? m[7] ?? "";
-    const inner = m[4] ?? "";
-    if (local === "fldChar") {
-      const kind = attrs.match(/(?:[\w.-]+:)?fldCharType="([^"]+)"/)?.[1] ?? "";
-      if (kind === "begin") {
-        fieldDepth += 1;
-        instrSuppressed = true;
-      } else if (kind === "separate") {
-        instrSuppressed = false;
-      } else if (kind === "end") {
-        fieldDepth = Math.max(0, fieldDepth - 1);
-        instrSuppressed = fieldDepth > 0;
-      }
-      continue;
-    }
-    if (local === "tab" || local === "br" || local === "cr") {
-      if (instrSuppressed)
-        continue;
-      out += local === "tab" ? "\t" : `
-`;
-      continue;
-    }
-    if (local === "instrText")
-      continue;
-    if (local === "delText") {
-      if (includeDeletedText)
-        out += decodeXmlText(inner);
-      continue;
-    }
-    if (local === "t") {
-      if (instrSuppressed)
-        continue;
-      out += decodeXmlText(inner);
-    }
-  }
-  return out;
-}
-function stripParagraphPropertiesXml(paragraphXml) {
-  return stripElements(paragraphXml, "pPr");
+  return projectParagraphInlineText(paragraphXml, includeDeletedText ? "tracked" : "visible");
 }
 function normalizeParagraphXmlForSearch(paragraphXml, storyId) {
   return shouldExcludeNestedTextboxContent(storyId) ? stripTextboxContent(paragraphXml) : paragraphXml;
@@ -133245,7 +133252,7 @@ function storyPartUriFromStoryId(storyId) {
 var TD7, SEARCH_TEXT_INDEX_REGISTRY_PREFIX = "__sd:search-text-index:", SEARCH_TEXT_INDEX_TAG, SEARCH_TEXT_INDEX_DEFERRED_PREFIX = "__sd:search-text-index-deferred:", SEARCH_TEXT_INDEX_PART_GENERATION_PREFIX = "__sd:search-text-generation:", SEARCH_TEXT_INDEX_PART_GENERATION_TAG, INITIAL_SEARCH_TEXT_INDEX_PART_GENERATION, SEARCH_TEXT_INDEX_DELETED_SUFFIX = "#deleted";
 var init_search_text_index = __esm(() => {
   init_sd_document_state();
-  init_xml_text();
+  init_inline_text_extraction();
   init_lazy_indexes();
   init_paragraph_index();
   TD7 = new TextDecoder;
@@ -142323,7 +142330,8 @@ function stageRetainedSourceChunkWindowSplice(input) {
   if (input.windowStart < target.byteStart)
     return null;
   if (input.windowEnd <= target.byteEnd) {
-    const bootstrapDecision = deriveExactBootstrapRetiling({
+    const retainsTextBoundary = input.directBodyChildDelta == null && input.nestedParagraphDelta == null && target.byteEnd - target.byteStart + input.delta <= DEFAULT_SOURCE_BOOTSTRAP_POLICY.maxBytes;
+    const bootstrapDecision = retainsTextBoundary ? { applicable: false } : deriveExactBootstrapRetiling({
       retained,
       target,
       targetIndex: k,
@@ -150962,9 +150970,17 @@ function refreshMainStorySourceCoverageFromCurrentBytes(state, mainStoryId, loca
     return current;
   }
   const partUri = mainDocumentPartUriFromStoryId(storyId);
-  const bytes = state.packageBytes.get(partUri);
-  if (!bytes)
+  if (!state.packageBytes.has(partUri))
     return current;
+  let materializedBytes;
+  const readCurrentBytes = () => {
+    if (!materializedBytes) {
+      materializedBytes = state.packageBytes.get(partUri);
+      recordSDTxPerf("sourceCoverageCurrentPartBytesRead", materializedBytes.byteLength);
+    }
+    return materializedBytes;
+  };
+  recordSDTxPerf("sourceCoverageCurrentPartBytesRead", 0);
   const storyRevision = state.stories.get(storyId)?.descriptor.revision ?? current.chunks[0]?.storyRevision ?? state.packageRevision;
   const sourceCoverageRevision = state.revisions.sourceCoverageRevision();
   const localizedBatch = localizedMutation && "splices" in localizedMutation ? localizedMutation : null;
@@ -151005,13 +151021,17 @@ function refreshMainStorySourceCoverageFromCurrentBytes(state, mainStoryId, loca
       delta: localizedSplice.delta,
       beforeWindowBytes: localizedSplice.beforeWindowBytes,
       afterWindowBytes: localizedSplice.afterWindowBytes,
-      currentPartBytes: bytes,
+      get currentPartBytes() {
+        return readCurrentBytes();
+      },
       storyRevision,
       ...localizedSplice.directBodyChildDelta == null ? {} : { directBodyChildDelta: localizedSplice.directBodyChildDelta },
       ...localizedSplice.nestedParagraphDelta == null ? {} : { nestedParagraphDelta: localizedSplice.nestedParagraphDelta }
     });
     if (staged) {
       staged.commit(storyRevision);
+      recordSDTxPerf("sourceCoverageFullRescans", 0);
+      recordSDTxPerf("sourceCoverageBytesScanned", localizedSplice.beforeWindowBytes.byteLength + localizedSplice.afterWindowBytes.byteLength);
       recordSDTxPerf("sourceCoverageChunksRebuilt", staged.work.coverageChunksRebuilt);
       recordSDTxPerf("sourceCoverageChunksCarried", Math.max(0, current.chunks.length - staged.work.coverageChunksVisited));
       const next2 = {
@@ -151031,6 +151051,7 @@ function refreshMainStorySourceCoverageFromCurrentBytes(state, mainStoryId, loca
       return next2;
     }
   }
+  const bytes = readCurrentBytes();
   let next;
   if (current.status === "source-complete") {
     const shifted = localizedSplice && current.byteCoverageComplete && !exactBootstrapRetilingRequired ? shiftStorySpineChunksForLocalizedSplice({
@@ -168958,7 +168979,7 @@ function projectDeletedImageParagraphGroups(input) {
       const deletedText = [
         ...fragments,
         ...structuralFragments.filter((fragment2) => fragment2 !== marker)
-      ].sort((left, right) => left.byteStart - right.byteStart).map((fragment2) => extractVisibleTextFromXml(xml.slice(fragment2.byteStart, fragment2.byteEnd), "del")).join("");
+      ].sort((left, right) => left.byteStart - right.byteStart).map((fragment2) => extractVisibleTextFromXml2(xml.slice(fragment2.byteStart, fragment2.byteEnd), "del")).join("");
       const grouped = {
         ...mark,
         id,
@@ -169106,7 +169127,7 @@ function materializeFullParagraphInsertion(lookupContext, args) {
   const paragraphKind = classifyFullParagraphInsertion(lookupContext, partXml, paragraphStart, paragraphEnd, paragraphXml);
   const textFragments = textEntries.flatMap((entry) => entry.fragments).sort((left, right) => left.byteStart - right.byteStart);
   const objectFragments = objectEntries.flatMap((entry) => entry.structuralFragments);
-  const insertedText = [...textFragments, ...objectFragments].sort((left, right) => left.byteStart - right.byteStart).map((fragment2) => extractVisibleTextFromXml(partXml.slice(fragment2.byteStart, fragment2.byteEnd), "ins")).join("");
+  const insertedText = [...textFragments, ...objectFragments].sort((left, right) => left.byteStart - right.byteStart).map((fragment2) => extractVisibleTextFromXml2(partXml.slice(fragment2.byteStart, fragment2.byteEnd), "ins")).join("");
   const imageOnlyEntry = textFragments.length === 0 && insertedText === "" && objectEntries.length === 1 && objectFragments.length === 1 && objectEntries[0].subtype === "image-insertion" ? objectEntries[0] : undefined;
   const imageEntry = paragraphKind.subtype === "paragraph-insertion" ? imageOnlyEntry : undefined;
   const subtype = imageEntry ? "image-insertion" : paragraphKind.subtype;
@@ -169475,7 +169496,7 @@ function projectTrackedHyperlinkWrapGroupsWithLookupContext(lookupContext, input
       const fieldXml = partXml.slice(fieldFragment.byteStart, fieldFragment.byteEnd);
       if (!/<[\w.-]+:instrText\b[^>]*>[\s\S]*?\bHYPERLINK\b/i.test(fieldXml))
         continue;
-      const fieldResultText = extractVisibleTextFromXml(fieldXml);
+      const fieldResultText = extractVisibleTextFromXml2(fieldXml);
       if (!fieldResultText)
         continue;
       const candidates = deletions.filter((deletion) => {
@@ -169638,7 +169659,7 @@ function buildTrackedFieldLocationKey(lookupContext, partXml, fragment2) {
   return `${paragraphKey}|text-prefix:${hashGroupKey(visiblePrefix)}`;
 }
 function extractDeletionText(deletion, partXml) {
-  return deletion.fragments.map((fragment2) => extractVisibleTextFromXml(partXml.slice(fragment2.byteStart, fragment2.byteEnd), "del")).join("");
+  return deletion.fragments.map((fragment2) => extractVisibleTextFromXml2(partXml.slice(fragment2.byteStart, fragment2.byteEnd), "del")).join("");
 }
 function isAbsorbableInlineObjectInsertion(entry, fragment2) {
   const kind = entry.subtype;
@@ -170342,7 +170363,7 @@ function buildCanonicalGroupText(partXml, run) {
   let out = "";
   for (const atom of run) {
     if (atom.kind === "text") {
-      out += extractVisibleTextFromXml(partXml.slice(atom.fragment.byteStart, atom.fragment.byteEnd), "ins");
+      out += extractVisibleTextFromXml2(partXml.slice(atom.fragment.byteStart, atom.fragment.byteEnd), "ins");
     } else if (atom.kind === "mark") {
       out += `
 `;
@@ -170929,7 +170950,7 @@ function materializeRunFormattingGroup(storyId, partUri, partXml, run, input, st
   const documentOrderStart = Math.min(...fragments.map((fragment2) => fragment2.byteStart));
   const documentOrderEnd = Math.max(...fragments.map((fragment2) => fragment2.byteEnd));
   const formattingDelta = childEntries.every((entry) => entry.formattingDelta && entry.formattingDelta.beforeXml === childEntries[0].formattingDelta?.beforeXml && entry.formattingDelta.afterXml === childEntries[0].formattingDelta?.afterXml) ? childEntries[0].formattingDelta : null;
-  const excerpt = head.paragraphOrdinal === undefined && formattingDelta ? childEntries[0].excerpt : extractVisibleTextFromXml(partXml.slice(head.paragraph.start, head.paragraph.end), "ins");
+  const excerpt = head.paragraphOrdinal === undefined && formattingDelta ? childEntries[0].excerpt : extractVisibleTextFromXml2(partXml.slice(head.paragraph.start, head.paragraph.end), "ins");
   const date6 = earliestDate(fragments.map((fragment2) => fragment2.date));
   const wordIdOther = uniqueNonEmptyStrings(fragments.map((fragment2) => fragment2.wId));
   const members = run.map((member) => ({
@@ -171116,7 +171137,7 @@ function materializeFormattingGroup(storyId, partUri, partXml, run, input) {
   const fragments = run.map((member) => member.fragment);
   const documentOrderStart = Math.min(...fragments.map((fragment2) => fragment2.byteStart));
   const documentOrderEnd = Math.max(...fragments.map((fragment2) => fragment2.byteEnd));
-  const excerpt = run.map((member) => extractVisibleTextFromXml(partXml.slice(member.paragraph.start, member.paragraph.end), "ins")).join(`
+  const excerpt = run.map((member) => extractVisibleTextFromXml2(partXml.slice(member.paragraph.start, member.paragraph.end), "ins")).join(`
 `);
   const date6 = earliestDate(fragments.map((fragment2) => fragment2.date));
   const wordIdOther = uniqueNonEmptyStrings(fragments.map((fragment2) => fragment2.wId));
@@ -171515,7 +171536,7 @@ function buildCanonicalDeletionGroupText(partXml, run) {
   let out = "";
   for (const atom of run) {
     if (atom.kind === "text") {
-      out += extractVisibleTextFromXml(partXml.slice(atom.fragment.byteStart, atom.fragment.byteEnd), "del");
+      out += extractVisibleTextFromXml2(partXml.slice(atom.fragment.byteStart, atom.fragment.byteEnd), "del");
     } else if (atom.kind === "mark") {
       out += `
 `;
@@ -174217,8 +174238,8 @@ function isAdjacentIgnoringMarkers(lookupContext, a, b, partXml) {
     return false;
   if (!isSameReviewGroupIdentity(buildReviewIdentity({ ...first.author, email: first.authorEmail }), buildReviewIdentity({ ...second.author, email: second.authorEmail })))
     return false;
-  const before = extractVisibleTextFromXml(partXml.slice(first.byteStart, first.byteEnd), "del");
-  const after = extractVisibleTextFromXml(partXml.slice(second.byteStart, second.byteEnd), "ins");
+  const before = extractVisibleTextFromXml2(partXml.slice(first.byteStart, first.byteEnd), "del");
+  const after = extractVisibleTextFromXml2(partXml.slice(second.byteStart, second.byteEnd), "ins");
   const insertionOpenEnd = partXml.indexOf(">", second.byteStart) + 1;
   const insertionCloseStart = partXml.indexOf("</", insertionOpenEnd);
   const insertionCloseEnd = partXml.indexOf(">", insertionCloseStart) + 1;
@@ -176600,7 +176621,7 @@ function enrichLogicalChangeExcerpts(catalog, partXmlByUri) {
     const afterTexts = [];
     for (const fragment2 of logical.fragments) {
       const inner = xml.slice(fragment2.byteStart, fragment2.byteEnd);
-      const visible = extractVisibleTextFromXml(inner, fragment2.kind);
+      const visible = extractVisibleTextFromXml2(inner, fragment2.kind);
       if (visible.length === 0 && logical.subtype === "move-image") {
         continue;
       }
@@ -176719,7 +176740,7 @@ function findEnclosingContainerId(xml, start, localName2) {
   }
   return null;
 }
-function extractVisibleTextFromXml(xml, kind) {
+function extractVisibleTextFromXml2(xml, kind) {
   const sanitizedXml = kind ? stripNestedSameKindWrapperXml(xml, kind) : xml;
   const tag = kind === "del" ? "(?:delText)" : kind === "ins" ? "(?:t)" : "(?:t|delText)";
   const re = new RegExp(`<[\\w.-]+:${tag}\\b[^>]*>([\\s\\S]*?)<\\/[\\w.-]+:${tag}>`, "g");
@@ -177466,8 +177487,10 @@ function buildSDRenderCommitEnvelope(state, prepared, result, context = {}, opti
   if (!storySurface || !storySurface.storyLocal || !storySurfaceFamilyMatchesSource(storySurface.family, source.sourceKind)) {
     return broad("non-local-story");
   }
-  if (op.on.storyId !== state.mainStoryId)
-    return broad("non-main-story");
+  if (op.on.storyId !== state.mainStoryId) {
+    const immutableStoryOwner = captureImmutableHeaderFooterTextEffect(state, prepared, result, context);
+    return { ...broad("non-main-story"), ...immutableStoryOwner ? { immutableStoryOwner } : {} };
+  }
   const ownerContentEffects = source.sourceKind === "textboxAtomReplacement" ? textboxOwnerContentEffects(state, prepared, result.storiesChanged ?? []) : [];
   if (!ownerContentEffects)
     return broad("multi-story");
@@ -177742,6 +177765,54 @@ function captureTrackedDecisionAllResolvedProof(state, prepared, base2) {
 function trackedChangeInvalidationIds(refs) {
   return [...new Set(refs.flatMap((ref3) => ref3.kind === "trackedChange" ? [ref3.entityId] : []))];
 }
+function captureImmutableHeaderFooterTextEffect(state, prepared, result, context) {
+  const op = prepared.source;
+  if (op.kind !== "editText" || op.on.startBlockId !== op.on.endBlockId || state.sourceCompletePosture !== "source-complete" || prepared.resolvedTargets.stories.length !== 1 || result.storiesChanged?.length !== 1 || prepared.resolvedTargets.partUris.length !== 1 || result.partsChanged?.length !== 1 || !hasOnlyLocalTextDependencies(prepared, op.changeMode))
+    return null;
+  const descriptor = getStoryDescriptorFromState(state, op.on.storyId);
+  if (!descriptor || descriptor.storyKind !== "header" && descriptor.storyKind !== "footer")
+    return null;
+  const story = result.storiesChanged[0];
+  const part = result.partsChanged[0];
+  if (story.storyId !== op.on.storyId || part.partUri !== op.on.partUri || part.kind !== "modified" || !part.previousRevision || !part.nextRevision)
+    return null;
+  const annotations = op.changeMode === "tracked" ? captureTrackedAnnotationDelta(prepared) : [];
+  if (annotations == null)
+    return null;
+  const patchGroup = result.forwardPatchGroup ?? prepared.localApplyBundle;
+  const entry = patchGroup.perPart[op.on.partUri];
+  if (entry?.kind !== "modify" || entry.patches.length !== 1)
+    return null;
+  const patch = entry.patches[0];
+  if (patch.kind !== "replaceBytes" || patch.startByte !== op.on.paragraphByteStart || patch.endByte !== op.on.paragraphByteEnd || classifyUnprovedSliceDependency(TD25.decode(patch.bytes), annotations, context.originParagraphXml))
+    return null;
+  const length = state.packageBytes.byteLength(op.on.partUri);
+  if (length == null || length > MAX_NARROW_SLICE_BYTES)
+    return null;
+  const bytes = readPartRangeFromStateSync(state, op.on.partUri, 0, length);
+  if (!bytes)
+    return null;
+  const xml = TD25.decode(bytes);
+  if (GLOBAL_SLICE_DEPENDENCY_RE.test(xml) || FAIL_CLOSED_NON_COMMENT_REF_OR_ANCHOR_RE.test(xml) || COMMENT_ANCHOR_RE.test(xml) || /<(?:[\w.-]+:)?(?:numPr|txbxContent|hyperlink)\b/.test(xml))
+    return null;
+  const dependencies = captureRenderDependencyParts(state, op.on.partUri, null);
+  if (!dependencies)
+    return null;
+  return {
+    schemaVersion: 1,
+    kind: descriptor.storyKind,
+    storyId: story.storyId,
+    partUri: part.partUri,
+    previousStoryRevision: story.previousRevision,
+    storyRevision: story.nextRevision,
+    previousPartRevision: part.previousRevision,
+    partRevision: part.nextRevision,
+    paragraphId: op.on.startBlockId,
+    partXml: xml,
+    byteLength: bytes.byteLength,
+    dependencies
+  };
+}
 function buildNoteOwnerRenderCommitEnvelope(state, prepared, result, context, base2) {
   const broad = (reason) => ({
     ...base2,
@@ -177757,7 +177828,10 @@ function buildNoteOwnerRenderCommitEnvelope(state, prepared, result, context, ba
   if (!noteStory)
     return broad("note-owner-identity-mismatch");
   const changeMode = source.kind === "editText" ? source.changeMode : source.changeMode ?? "direct";
-  if (changeMode !== "direct")
+  if (changeMode === "tracked" && source.kind !== "editText")
+    return broad("tracked-annotation-unproved");
+  const trackedAnnotations = changeMode === "tracked" ? captureTrackedAnnotationDelta(prepared) : [];
+  if (changeMode === "tracked" && !trackedAnnotations)
     return broad("tracked-annotation-unproved");
   const storySurface = prepared.backendExtensions.storySurface;
   if (!storySurface || !storySurface.storyLocal)
@@ -177785,8 +177859,8 @@ function buildNoteOwnerRenderCommitEnvelope(state, prepared, result, context, ba
   if (source.kind === "editText") {
     if (source.on.startBlockId !== source.on.endBlockId)
       return broad("range-not-single-block");
-    if (!hasOnlyLocalTextDependencies(prepared, "direct")) {
-      return broad(hasUnexpectedRefs(prepared, "direct") ? "ref-dependency-change" : "global-dependency-change");
+    if (!hasOnlyLocalTextDependencies(prepared, changeMode)) {
+      return broad(hasUnexpectedRefs(prepared, changeMode) ? "ref-dependency-change" : "global-dependency-change");
     }
   } else {
     const deltaReason = classifyUnexpectedStructuralDelta(prepared, source, storyId, noteStory.partUri, null, null);
@@ -177827,7 +177901,7 @@ function buildNoteOwnerRenderCommitEnvelope(state, prepared, result, context, ba
       return broad("paragraph-index-mismatch");
     }
     const postParagraphXml = TD25.decode(patch.bytes);
-    const dependencyReason = classifyUnprovedSliceDependency(postParagraphXml, [], context.originParagraphXml);
+    const dependencyReason = classifyUnprovedSliceDependency(postParagraphXml, trackedAnnotations, context.originParagraphXml);
     if (dependencyReason)
       return broad(dependencyReason);
   }
@@ -177858,7 +177932,7 @@ function buildNoteOwnerRenderCommitEnvelope(state, prepared, result, context, ba
     classification: {
       kind: "narrow-note-owner",
       operation,
-      changeMode: "direct",
+      changeMode,
       noteType: noteStory.noteType,
       noteId: origin.noteId,
       storyId,
@@ -193035,7 +193109,25 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
   const headRuns = coalesceWrappedRuns(flat.slice(0, localStart));
   const removedRuns = coalesceWrappedRuns(flat.slice(localStart, localEnd));
   const tailRuns = coalesceWrappedRuns(flat.slice(localEnd));
-  const headInsXml = headText.length > 0 || headOwnedNested.length > 0 ? buildInsWrapperXml({
+  let freshBaseWId = null;
+  let freshWIdCount = 0;
+  const allocateFreshWId = () => {
+    if (freshBaseWId === null)
+      freshBaseWId = resolveNextWId(input);
+    const offset = freshWIdCount++;
+    if (offset === 0)
+      return String(freshBaseWId);
+    if (typeof input.nextWId === "number" && offset === 1)
+      return String(freshBaseWId + 1);
+    return String(input.reserveWId ? input.reserveWId() : freshBaseWId + offset);
+  };
+  const childDelWId = removedText.length > 0 ? allocateFreshWId() : null;
+  const childInsWId = input.newText.length > 0 ? allocateFreshWId() : null;
+  const hasHeadFragment = headText.length > 0 || headOwnedNested.length > 0;
+  const hasTailFragment = tailText.length > 0 || tailOwnedNested.length > 0;
+  const emitsTrailingParentFragment = hasTailFragment || removedText.length > 0 && input.newText.length > 0;
+  const tailParentWId = input.changeMode === "tracked" && input.newText.length > 0 && hasHeadFragment && emitsTrailingParentFragment ? allocateFreshWId() : parent.wId;
+  const headInsXml = hasHeadFragment ? buildInsWrapperXml({
     openTag: parent.openTag,
     namespaceBindings: parent.namespaceBindings,
     nsPrefix: parent.nsPrefix,
@@ -193046,11 +193138,11 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
     inner: headRuns[0] ?? parent.inner,
     innerXml: buildInsInnerXmlInterleaved(flat, headOwnedNested, 0, localStart)
   }) : "";
-  const tailInsXml = tailText.length > 0 || tailOwnedNested.length > 0 ? buildInsWrapperXml({
+  const tailInsXml = hasTailFragment ? buildInsWrapperXml({
     openTag: parent.openTag,
     namespaceBindings: parent.namespaceBindings,
     nsPrefix: parent.nsPrefix,
-    wId: parent.wId,
+    wId: tailParentWId,
     author: parent.author,
     date: parent.date,
     rsidR: parent.rsidR,
@@ -193065,11 +193157,10 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
   let childDelXml = "";
   let childInsXml = "";
   const emittedRsids = [];
-  if (removedText.length > 0) {
-    const delWId = resolveNextWId(input);
+  if (childDelWId !== null) {
     childDelXml = buildDelWrapperXml({
       nsPrefix: parent.nsPrefix,
-      wId: String(delWId),
+      wId: childDelWId,
       author: currentAuthor,
       date: input.txTimestamp,
       rsidDel: input.rsid,
@@ -193078,15 +193169,13 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
     });
     emittedRsids.push(input.rsid);
   }
-  if (input.newText.length > 0) {
-    const nextWId = resolveNextWId(input);
-    const insWId = removedText.length > 0 ? nextWId + 1 : nextWId;
+  if (childInsWId !== null) {
     const preferNextRunAtBoundary = localEnd > localStart;
     const insertMeta = runMetaAtInsertionPoint(parent, localStart, preferNextRunAtBoundary);
     const insertRPr = rPrAtInsertionPoint(parent, localStart, preferNextRunAtBoundary);
     childInsXml = buildInsWrapperXml({
       nsPrefix: parent.nsPrefix,
-      wId: String(insWId),
+      wId: childInsWId,
       author: currentAuthor,
       date: input.txTimestamp,
       rsidR: input.insRsid,
@@ -193111,7 +193200,7 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
       openTag: parent.openTag,
       namespaceBindings: parent.namespaceBindings,
       nsPrefix: parent.nsPrefix,
-      wId: parent.wId,
+      wId: tailParentWId,
       author: parent.author,
       date: parent.date,
       rsidR: parent.rsidR,
@@ -193132,7 +193221,7 @@ function splitInsertionAroundChildChange(input, allTokens, parent) {
     ok: true,
     xml,
     emittedRsids,
-    ...removedText.length > 0 ? { requiresCollaborationSessionSync: true } : {}
+    ...removedText.length > 0 || tailParentWId !== parent.wId ? { requiresCollaborationSessionSync: true } : {}
   };
 }
 function insertAtForeignDeletion(input, allTokens, parent, sameUser) {
@@ -199148,7 +199237,7 @@ function hasProvableSelectedCommentRange(paragraphXml, rangeStart, rangeEnd) {
     markerKindsById.set(marker.id, markerKinds);
   }
   for (const marker of markers) {
-    const selected = marker.markerKind === "commentRangeStart" ? rangeStart <= marker.visibleStart && marker.visibleStart < rangeEnd : rangeStart < marker.visibleStart && marker.visibleStart <= rangeEnd;
+    const selected = marker.markerKind === "commentRangeStart" ? rangeStart <= marker.visibleStart && marker.visibleStart < rangeEnd : selectionStraddlesMarker2(rangeStart, rangeEnd, marker.visibleStart);
     if (!selected)
       continue;
     if (marker.id === null)
@@ -204299,6 +204388,18 @@ var init_decide_engine = __esm(() => {
 });
 
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/structural-inline-decision.js
+function hasSessionSyncRepeatedTrackedTextDecision(fragments) {
+  const seen = new Set;
+  for (const fragment2 of fragments) {
+    if (fragment2.kind !== "ins" && fragment2.kind !== "del")
+      continue;
+    const key2 = `${fragment2.storyId}:${fragment2.kind}:${fragment2.rsid}`;
+    if (seen.has(key2))
+      return true;
+    seen.add(key2);
+  }
+  return false;
+}
 function hasSessionSyncStructuralInlineDeletion(xml, fragments, namespaceBindings = new Map) {
   const selectedRanges = fragments.filter((fragment2) => fragment2.kind === "del").map((fragment2) => ({ start: fragment2.byteStart, end: fragment2.byteEnd })).sort((left, right) => left.start - right.start || right.end - left.end);
   if (selectedRanges.length === 0)
@@ -204517,7 +204618,7 @@ function tryRunLocalTrackedChangeDecideCommit(input) {
       };
     })
   };
-  const sessionSyncedTextDecision = hasSessionSyncStructuralInlineDeletion(beforeXml, decisions.map(({ localFragment }) => localFragment), new Map(Object.entries(state.mainStorySourceOverlay?.rootNamespaceBindings ?? {})));
+  const sessionSyncedTextDecision = hasSessionSyncStructuralInlineDeletion(beforeXml, decisions.map(({ localFragment }) => localFragment), new Map(Object.entries(state.mainStorySourceOverlay?.rootNamespaceBindings ?? {}))) || hasSessionSyncRepeatedTrackedTextDecision(decisions.map(({ fragment: fragment2 }) => fragment2));
   const prepared = {
     txId,
     source: op,
@@ -208237,7 +208338,7 @@ function runTrackedChangeDecideCommitWithLookupContext(lookupContext, input) {
     fragmentsByPart,
     structuralTargets
   });
-  const sessionSyncedTextDecision = trackedTextDecide && (hasNestedTextDecision(catalog, fragmentsByPart) || hasStructuralInlineDeletionDecision(state, fragmentsByPart) || hasMarkerSeparatedTextDecision(state, fragmentsByPart));
+  const sessionSyncedTextDecision = trackedTextDecide && (hasNestedTextDecision(catalog, fragmentsByPart) || hasStructuralInlineDeletionDecision(state, fragmentsByPart) || hasMarkerSeparatedTextDecision(state, fragmentsByPart) || hasSessionSyncRepeatedTrackedTextDecision(Array.from(fragmentsByPart.values()).flat()));
   const prepared = {
     txId,
     source: op,
@@ -232846,7 +232947,12 @@ function planParagraphSplice(input) {
   };
   const mergeable = (block) => block.kind === "paragraph" && !block.styleRef && !block.numbering && !block.listIntent && !block.paragraphProps && !block.pPrXml && !block.blockSdts?.length && !block.complete;
   const paragraphs = [];
-  if (blocks.length === 1 && mergeable(blocks[0])) {
+  const blockControlsBeforeAnchor = start === 0 && end === 0 && split.headXml.length === 0 && !input.trackedStamp && blocks.length > 0 && blocks.every((block) => (block.kind === "paragraph" || block.kind === "table") && !!block.blockSdts?.length);
+  if (blockControlsBeforeAnchor) {
+    const rendered = blocks.map((block, index) => standalone(block, index));
+    paragraphs.push(renderBlockSdtSequence(blocks, rendered, input.blockSdtIds ?? new Map));
+    paragraphs.push(input.anchorXml);
+  } else if (blocks.length === 1 && mergeable(blocks[0])) {
     if (anchorParaId)
       destinationParaIdsByBlock[0].push(anchorParaId);
     paragraphs.push(envelope.open + envelope.pPr + split.headXml + runsOf(blocks[0]) + split.tailXml + envelope.close);
@@ -232892,7 +232998,8 @@ function planParagraphSplice(input) {
     createdParaIds,
     destinationParaIdsByBlock,
     insertedVisibleChars,
-    removedVisibleChars: end - start
+    removedVisibleChars: end - start,
+    anchorParagraphUnchanged: blockControlsBeforeAnchor
   };
 }
 function paragraphPropertiesAllowEmptyAnchorRelocation(pPrXml) {
@@ -235240,9 +235347,9 @@ function preflightFragmentApply(input) {
   const target = resolveFragmentApplyTarget(state, op);
   if (!target.ok)
     return target;
-  if (isTextTarget2(op.target) && op.formattingMode === "match-destination" && op.fragment.blocks.some((block) => (block.kind === "paragraph" || block.kind === "heading") && block.blockSdts?.length))
+  if (isTextTarget2(op.target) && op.formattingMode === "match-destination" && op.fragment.blocks.some((block) => (block.kind === "paragraph" || block.kind === "heading" || block.kind === "table") && block.blockSdts?.length))
     return { ok: false, reason: "paste-structure-unsupported" };
-  if ((op.changeMode ?? "direct") === "tracked" && op.fragment.blocks.some((block) => (block.kind === "paragraph" || block.kind === "heading") && block.blockSdts?.length))
+  if ((op.changeMode ?? "direct") === "tracked" && op.fragment.blocks.some((block) => (block.kind === "paragraph" || block.kind === "heading" || block.kind === "table") && block.blockSdts?.length))
     return { ok: false, reason: "paste-tracked-structural-unsupported" };
   if ((op.changeMode ?? "direct") === "tracked" && target.target.kind === "block" && target.target.blockKind === "table" && !trackedWholeTableRowsAreDirectChildren(state, target.target)) {
     return { ok: false, reason: "paste-tracked-structural-unsupported" };
@@ -235508,7 +235615,7 @@ function validateFragmentRangeIntegrity(input) {
 }
 function fragmentRequiresCommit5Materialization(blocks) {
   for (const block of blocks) {
-    if ((block.kind === "paragraph" || block.kind === "heading") && block.blockSdts?.length)
+    if ((block.kind === "paragraph" || block.kind === "heading" || block.kind === "table") && block.blockSdts?.length)
       return true;
     if (block.kind === "heading" || block.kind === "horizontalRule")
       return true;
@@ -237504,8 +237611,8 @@ function runPasteSpliceCommit(input, target, resolvedBlocks, listExtras, imageEx
     {
       storyId: target.storyId,
       atChar: anchor.charPrefix + target.charOffset,
-      blockId: anchor.entry.blockId,
-      atCharInBlock: target.charOffset,
+      blockId: plan.anchorParagraphUnchanged ? plan.createdParaIds[0] : anchor.entry.blockId,
+      atCharInBlock: plan.anchorParagraphUnchanged ? 0 : target.charOffset,
       delta
     }
   ];
@@ -237709,7 +237816,8 @@ function prepareImageExtras(state, storyId, partUri, fragment2, blocks, changeMo
       }
     }
   }
-  if (inlineParagraphs.length === 0) {
+  const blockControls = blocks.flatMap((block) => block.kind === "paragraph" || block.kind === "table" ? block.blockSdts ?? [] : []);
+  if (inlineParagraphs.length === 0 && blockControls.length === 0) {
     return { ok: true, value: { inlineSpecs: new Map, blockSdtIds: new Map, partUris: [], perPart: {}, preconditions: [], patchMaps: {} } };
   }
   const assets = new Map((fragment2.assets ?? []).map((asset) => [asset.id, asset]));
@@ -237805,7 +237913,7 @@ function prepareImageExtras(state, storyId, partUri, fragment2, blocks, changeMo
   }
   let docPrId = allocateDocPrId(state, storyId);
   const inlineSpecs = new Map;
-  const hasControls = inlineParagraphs.some((paragraph) => paragraph.blockSdts?.length || paragraph.inlines?.some((inline) => inline.kind === "sdt"));
+  const hasControls = blockControls.length > 0 || inlineParagraphs.some((paragraph) => paragraph.inlines?.some((inline) => inline.kind === "sdt"));
   const usedControlIds = new Set;
   if (hasControls) {
     for (const [uri, bytes] of state.packageBytes) {
@@ -237836,11 +237944,9 @@ function prepareImageExtras(state, storyId, partUri, fragment2, blocks, changeMo
     return String(id);
   };
   const blockSdtIds = new Map;
-  for (const paragraph of inlineParagraphs) {
-    for (const wrapper of paragraph.blockSdts ?? []) {
-      if (!blockSdtIds.has(wrapper.sourceId))
-        blockSdtIds.set(wrapper.sourceId, mintControlId());
-    }
+  for (const wrapper of blockControls) {
+    if (!blockSdtIds.has(wrapper.sourceId))
+      blockSdtIds.set(wrapper.sourceId, mintControlId());
   }
   const leafSpec = (inline) => {
     if (inline.kind === "text")
@@ -237909,8 +238015,8 @@ function validateBlocks(blocks) {
   const closedControls = new Set;
   let activeControls = [];
   for (const block of blocks) {
-    const controls = block.kind === "paragraph" || block.kind === "heading" ? block.blockSdts ?? [] : [];
-    if (controls.length && (block.kind !== "paragraph" && block.kind !== "heading" || !block.complete || controls.length > 16)) {
+    const controls = block.kind === "paragraph" || block.kind === "heading" || block.kind === "table" ? block.blockSdts ?? [] : [];
+    if (controls.length && ((block.kind === "paragraph" || block.kind === "heading") && !block.complete || controls.length > 16)) {
       return { ok: false, reason: "paste-structure-unsupported" };
     }
     let common = 0;
@@ -253971,58 +254077,6 @@ var init_creation_date = __esm(() => {
   DECODER2 = new TextDecoder;
 });
 
-// ../../../v2/editor-core/dist/document/internal/inline-text-extraction.js
-function extractVisibleTextFromXml2(xml, telemetry) {
-  return extractInlineText(xml, "visible", telemetry);
-}
-function extractTrackedTextFromXml(xml, telemetry) {
-  return extractInlineText(xml, "tracked", telemetry);
-}
-function projectParagraphInlineText(paragraphXml, space, telemetry) {
-  return projectReadOnlyParagraphText(paragraphXml, space, telemetry);
-}
-function extractInlineText(xml, space, telemetry) {
-  const chunks = [];
-  for (const { tagStart, node: node2 } of iterateTopLevelParagraphElements(xml)) {
-    chunks.push(projectParagraphInlineText(xml.slice(tagStart, node2.end), space, telemetry));
-  }
-  return chunks.length === 0 ? tolerantTokenWalk(xml, space) : chunks.join("");
-}
-function tolerantTokenWalk(xml, space) {
-  const contentXml = stripElements(xml, "sdtPr");
-  const body = stripOpaqueObjectBlocks(space === "visible" ? stripParagraphProperties(stripHiddenRevisionBlocks(contentXml)) : stripParagraphProperties(contentXml));
-  const pattern = space === "visible" ? /<[\w.-]+:t\b[^>]*>([\s\S]*?)<\/[\w.-]+:t>|<[\w.-]+:(tab|br|cr)\b[^>]*\/>/g : /<[\w.-]+:(?:t|delText)\b[^>]*>([\s\S]*?)<\/[\w.-]+:(?:t|delText)>|<[\w.-]+:(tab|br|cr)\b[^>]*\/>/g;
-  let out = "";
-  for (const token of body.matchAll(pattern)) {
-    if (token[1] != null) {
-      out += decodeXmlText(token[1]);
-      continue;
-    }
-    out += controlChar2(token[2]);
-  }
-  return out;
-}
-function controlChar2(control) {
-  if (control === "tab")
-    return "\t";
-  return `
-`;
-}
-function stripParagraphProperties(xml) {
-  return stripElements(xml, "pPr");
-}
-function stripHiddenRevisionBlocks(xml) {
-  return xml.replace(/<[\w.-]+:(?:del|moveFrom)\b(?![^>]*\/>)[^>]*>[\s\S]*?<\/[\w.-]+:(?:del|moveFrom)>/g, "");
-}
-function stripOpaqueObjectBlocks(xml) {
-  return xml.replace(/<[\w.-]+:(?:drawing|object|pict)\b(?![^>]*\/>)[^>]*>[\s\S]*?<\/[\w.-]+:(?:drawing|object|pict)>|<[\w.-]+:(?:drawing|object|pict)\b[^>]*\/>/g, "");
-}
-var init_inline_text_extraction = __esm(() => {
-  init_paragraph_scan_count();
-  init_paragraph_text_projection();
-  init_xml_text();
-});
-
 // ../../../v2/editor-core/dist/document/transactions/tracked-bookmark-rename.js
 function prepareTrackedBookmarkRename(input) {
   const parsed = collectXmlElementRanges(input.xml);
@@ -283091,7 +283145,7 @@ function scanParagraphNamespaceBindingsByByteStart(xml) {
   return bindings;
 }
 function readVisibleParagraphText(xml) {
-  return extractVisibleTextFromXml2(xml);
+  return extractVisibleTextFromXml(xml);
 }
 function readTrackedParagraphText(xml) {
   return extractTrackedTextFromXml(xml);
@@ -285312,7 +285366,8 @@ function wrapHyperlinkInParagraphXml(input) {
 }
 function wrapRangeWithMarkupInParagraphXml(input) {
   const collected = collectPlainTextRuns2(input.paragraphXml, input.rangeStart, input.rangeEnd, {
-    allowFieldResultContent: true
+    allowFieldResultContent: input.allowFieldResultContent ?? true,
+    rejectUnsupportedMarkers: input.rejectUnsupportedMarkers
   });
   if (!collected.ok)
     return collected;
@@ -285736,6 +285791,9 @@ function collectPlainTextRuns2(paragraphXml, rangeStart, rangeEnd, options = {})
     const openXml = childMatch[0].slice(leadingWhitespace.length);
     const selfClosing = /\/>$/.test(openXml);
     if (selfClosing) {
+      if (options.rejectUnsupportedMarkers && localName2 !== "pPr" && selectionStraddlesMarker3(rangeStart, rangeEnd, textCursor)) {
+        return { ok: false, reason: "unsupported-context" };
+      }
       if (isReferenceMarker(localName2) && selectionStraddlesMarker3(rangeStart, rangeEnd, textCursor)) {
         return { ok: false, reason: "unsupported-context" };
       }
@@ -285750,6 +285808,7 @@ function collectPlainTextRuns2(paragraphXml, rangeStart, rangeEnd, options = {})
     const childTextEnd = textCursor + visibleTextLength3(childXml);
     textCursor = childTextEnd;
     cursor = end;
+    const intersects = rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd) || options.rejectUnsupportedMarkers === true && childTextStart === childTextEnd && selectionStraddlesMarker3(rangeStart, rangeEnd, childTextStart);
     if (localName2 === "pPr")
       continue;
     if (localName2 === "r") {
@@ -285760,7 +285819,7 @@ function collectPlainTextRuns2(paragraphXml, rangeStart, rangeEnd, options = {})
       complexFieldResultDepth = Math.max(0, complexFieldResultDepth + markers.separates - markers.ends);
       const parsed = parsePlainRun2(childXml, childTextStart, cursor - childXml.length, cursor);
       if (!parsed.ok) {
-        if (rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd)) {
+        if (intersects) {
           return { ok: false, reason: parsed.reason };
         }
         continue;
@@ -285778,29 +285837,31 @@ function collectPlainTextRuns2(paragraphXml, rangeStart, rangeEnd, options = {})
       continue;
     }
     if (localName2 === "ins" || localName2 === "del" || localName2 === "moveFrom" || localName2 === "moveTo") {
-      if (rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd)) {
+      if (intersects) {
         return { ok: false, reason: "text-range-in-unsupported-tracked-wrapper" };
       }
       continue;
     }
     if (localName2 === "sdt") {
-      if (rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd)) {
+      if (intersects) {
         return { ok: false, reason: "text-range-in-sdt" };
       }
       continue;
     }
     if (localName2 === "hyperlink" || localName2 === "fldSimple") {
-      if (rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd)) {
+      if (intersects) {
         return { ok: false, reason: "text-range-in-field" };
       }
       continue;
     }
     if (localName2 === "oMath" || localName2 === "oMathPara") {
-      if (rangesOverlap7(childTextStart, childTextEnd, rangeStart, rangeEnd)) {
+      if (intersects) {
         return { ok: false, reason: "text-range-in-equation" };
       }
       continue;
     }
+    if (options.rejectUnsupportedMarkers && intersects)
+      return { ok: false, reason: "unsupported-context" };
   }
   return { ok: true, runs };
 }
@@ -298242,7 +298303,7 @@ function findCreatedField(context, storyId, blockId, beforeFieldIds, expected) {
 function fieldTextStartOffset(paragraph2, entry) {
   const relativeByteStart = Math.max(0, entry.descriptor.byteStart - paragraph2.byteStart);
   const rawXmlBeforeField = paragraph2.rawXml.slice(0, charIndexForUtf8ByteOffset(paragraph2.rawXml, relativeByteStart));
-  return extractVisibleTextFromXml2(rawXmlBeforeField).length;
+  return extractVisibleTextFromXml(rawXmlBeforeField).length;
 }
 function charIndexForUtf8ByteOffset(text, byteOffset) {
   let bytes = 0;
@@ -299064,7 +299125,7 @@ class V2AnchoredMetadataAdapter {
     if ("error" in resolvedSegments)
       throw operationError(resolvedSegments.error, resolvedSegments.message);
     const knownIds = new Set(existingRecords.map((record3) => record3.id));
-    if (hasOverlappingMetadataAnchor(documentXml, resolvedSegments.segments, knownIds)) {
+    if (hasOverlappingMetadataAnchor(documentXml, resolvedSegments.segments, existingRecords)) {
       return failure2("INVALID_TARGET", "metadata.attach target overlaps an existing metadata anchor.");
     }
     const existingPart = ensureCustomXmlPartForNamespace(this.context, input.namespace);
@@ -299079,9 +299140,15 @@ class V2AnchoredMetadataAdapter {
     const bySegmentPosition = resolvedSegments.segments.map((segment, index) => ({ segment, sdtId: sdtIds[index] })).sort((a, b) => b.segment.para.start - a.segment.para.start);
     let nextDocumentXml = documentXml;
     for (const { segment, sdtId } of bySegmentPosition) {
-      const wrapped = wrapTextRangeWithMetadataSdt(segment.para.xml, segment.startOffset, segment.endOffset, id, sdtId);
+      const wrapped = wrapTextRangeWithMetadataSdt(segment.para.xml, segment.startOffset, segment.endOffset, id, sdtId, knownIds);
       if (!wrapped.ok)
         throw metadataWrapRejectError(wrapped.reason);
+      if (wrapped.contained) {
+        const ids = countBodyControlIds(documentXml);
+        if (!ids || wrapped.parentId !== null && ids.get(wrapped.parentId) !== 1 || buildStructuralBoundaryMap(TEXT_ENCODER.encode(documentXml)).byBlockId(segment.blockId)?.blockSdtPath.length) {
+          throw metadataWrapRejectError("text-range-in-sdt");
+        }
+      }
       nextDocumentXml = replaceRange2(nextDocumentXml, segment.para.start, segment.para.end, wrapped.xml);
     }
     if (!dryRunRequested(input, options)) {
@@ -299372,8 +299439,8 @@ function materializeMetadataAnchor(documentXml, sdt, id) {
   const para = findParagraphContaining2(documentXml, sdt.start);
   if (!para)
     return null;
-  const startOffset = extractVisibleTextFromXml2(para.xml.slice(0, sdt.start - para.start)).length;
-  const length = extractVisibleTextFromXml2(unwrapSdt(sdt.xml) ?? sdt.xml).length;
+  const startOffset = extractVisibleTextFromXml(para.xml.slice(0, sdt.start - para.start)).length;
+  const length = extractVisibleTextFromXml(unwrapSdt(sdt.xml) ?? sdt.xml).length;
   const endOffset = startOffset + length;
   return {
     id,
@@ -299613,9 +299680,22 @@ function validateContiguousStructuralRun(documentXml, blockIds) {
   }
   return null;
 }
-function hasOverlappingMetadataAnchor(documentXml, segments, knownIds) {
+function hasOverlappingMetadataAnchor(documentXml, segments, records) {
+  const knownIds = new Set(records.map((record3) => record3.id));
   const anchors = listMetadataAnchors(documentXml, knownIds);
-  return segments.some((segment) => anchors.some((anchor) => anchor.blockId === segment.blockId && rangesStrictlyOverlap(segment.startOffset, segment.endOffset, anchor.startOffset, anchor.endOffset)));
+  return segments.some((segment) => {
+    const overlapping = anchors.filter((anchor) => anchor.blockId === segment.blockId && rangesStrictlyOverlap(segment.startOffset, segment.endOffset, anchor.startOffset, anchor.endOffset));
+    if (overlapping.length === 0)
+      return false;
+    const parent = overlapping[0];
+    if (segments.length !== 1 || overlapping.length !== 1 || segment.startOffset <= parent.startOffset || segment.endOffset >= parent.endOffset)
+      return true;
+    const parentRecords = records.filter((record3) => record3.id === parent.id);
+    if (parentRecords.length !== 1)
+      return true;
+    const grouped = groupMetadataAnchor(documentXml, parent.id, knownIds, parentRecords[0].physicalIds);
+    return grouped?.segments.length !== 1 || grouped.segments[0].start !== parent.start;
+  });
 }
 function rangesStrictlyOverlap(leftStart, leftEnd, rightStart, rightEnd) {
   return leftStart < rightEnd && rightStart < leftEnd;
@@ -299623,14 +299703,60 @@ function rangesStrictlyOverlap(leftStart, leftEnd, rightStart, rightEnd) {
 function bodyStoryLocator2() {
   return { kind: "story", storyType: "body" };
 }
-function wrapTextRangeWithMetadataSdt(paragraphXml, start, end, id, sdtId) {
-  return wrapRangeWithMarkupInParagraphXml({
-    paragraphXml,
-    rangeStart: start,
-    rangeEnd: end,
+function wrapTextRangeWithMetadataSdt(paragraphXml, start, end, id, sdtId, knownIds) {
+  const candidates = listSdtRanges(paragraphXml).filter((sdt) => {
+    const from2 = extractVisibleTextFromXml(paragraphXml.slice(0, sdt.start)).length;
+    const to = from2 + extractVisibleTextFromXml(unwrapSdt(sdt.xml) ?? sdt.xml).length;
+    return rangesStrictlyOverlap(start, end, from2, to) || from2 === to && start < from2 && from2 < end;
+  });
+  const wrap = (xml, from2, to, contained = false) => wrapRangeWithMarkupInParagraphXml({
+    paragraphXml: xml,
+    rangeStart: from2,
+    rangeEnd: to,
     open: metadataSdtOpenXml(id, sdtId),
-    close: "</w:sdtContent></w:sdt>"
+    close: "</w:sdtContent></w:sdt>",
+    ...contained ? { allowFieldResultContent: false, rejectUnsupportedMarkers: true } : {}
   });
+  if (candidates.length === 0)
+    return wrap(paragraphXml, start, end);
+  if (candidates.length !== 1)
+    return { ok: false, reason: "text-range-in-sdt" };
+  const parent = candidates[0];
+  const paragraph2 = parseContainerXml(paragraphXml, "p");
+  if (parent.unmatched || !paragraph2 || !parseTopLevelChildren(paragraph2.inner).some((child) => child.name === "w:sdt" && child.xml === parent.xml)) {
+    return { ok: false, reason: "text-range-in-sdt" };
+  }
+  const from = extractVisibleTextFromXml(paragraphXml.slice(0, parent.start)).length;
+  const content = unwrapSdt(parent.xml);
+  if (content === null || start <= from || end >= from + extractVisibleTextFromXml(content).length) {
+    return { ok: false, reason: "text-range-in-sdt" };
+  }
+  const pr = ownSdtPr(parent.xml);
+  const parentContainer = parseContainerXml(parent.xml, "sdt");
+  const children2 = parentContainer ? parseTopLevelChildren(parentContainer.inner) : [];
+  if (children2.filter((child) => child.localName === "sdtContent").length !== 1 || children2.filter((child) => child.localName === "sdtPr").length > 1 || [...pr.matchAll(/<w:id\b/g)].length > 1 || [...pr.matchAll(/<w:(?:text|richText)\b/g)].length > 1) {
+    return { ok: false, reason: "text-range-in-sdt" };
+  }
+  const tag = attrValue(/<w:tag\b[^>]*\/>/.exec(pr)?.[0] ?? "", "val");
+  const metadataParent = tag !== null && isMetadataAnchorPr(pr, tag, knownIds);
+  const alias = attrValue(/<w:alias\b[^>]*\/>/.exec(pr)?.[0] ?? "", "val");
+  if (!isSdtContentEditable(parent.xml) || /<w:lock\b/.test(pr) && attrValue(/<w:lock\b[^>]*>/.exec(pr)?.[0] ?? "", "val") !== "unlocked" || !metadataParent && (/<w:text\b/.test(pr) || alias === METADATA_ANCHOR_ALIAS)) {
+    return { ok: false, reason: "text-range-in-sdt" };
+  }
+  const wrapped = wrap(`<w:p>${content}</w:p>`, start - from, end - from, true);
+  if (!wrapped.ok)
+    return wrapped;
+  const nextContent = parseContainerXml(wrapped.xml, "p").inner;
+  const open = /<w:sdtContent\b[^>]*>/.exec(parent.xml);
+  const contentStart = open.index + open[0].length;
+  let nextParent = replaceRange2(parent.xml, contentStart, contentStart + content.length, nextContent);
+  if (metadataParent && /<w:text\b/.test(pr)) {
+    let nextPr = pr.replace(/<w:text\b[^>]*(?:\/>|>[\s\S]*?<\/w:text>)/, "<w:richText/>");
+    if (alias === null)
+      nextPr = nextPr.replace("</w:sdtPr>", `<w:alias w:val="${METADATA_ANCHOR_ALIAS}"/></w:sdtPr>`);
+    nextParent = nextParent.replace(pr, nextPr);
+  }
+  return { ok: true, xml: replaceRange2(paragraphXml, parent.start, parent.end, nextParent), contained: true, parentId: metadataAnchorPhysicalId(parent) };
 }
 function metadataSdtOpenXml(id, sdtId) {
   return [
@@ -299765,6 +299891,7 @@ var init_adapter9 = __esm(() => {
   init_sd_document_session_internal();
   init_visible_text();
   init_inline();
+  init_common();
   init_adapter2();
   init_shared();
   init_xml();
@@ -308947,7 +309074,7 @@ function toParagraphNumberingFromListSummary(listItem) {
   return { numId, level: listItem.ilvl };
 }
 function visibleText(xml, telemetry) {
-  return extractVisibleTextFromXml2(xml, telemetry);
+  return extractVisibleTextFromXml(xml, telemetry);
 }
 function visibleParagraphText2(paragraphXml, telemetry) {
   return projectParagraphInlineText(paragraphXml, "visible", telemetry);
@@ -334034,7 +334161,7 @@ class V2ContentControlsAdapter {
         const anchor = findParagraphById3(part.xml, input.at.start.blockId);
         if (anchor) {
           namespaceBindings = new Map(contentControlNamespaceBindings(part.xml, anchor.start, true));
-          if (input.kind === "block" && extractVisibleTextFromXml2(anchor.xml).trim().length === 0) {
+          if (input.kind === "block" && extractVisibleTextFromXml(anchor.xml).trim().length === 0) {
             beforeXml = anchor.xml;
           }
         }
@@ -334471,8 +334598,8 @@ class V2ContentControlsAdapter {
     }
     let requestedOffset = offset;
     if (source.info.kind === "inline" && source.start >= anchor.start && source.end <= anchor.end) {
-      const beforeSource = extractVisibleTextFromXml2(loaded.documentXml.slice(anchor.start, source.start)).length;
-      const sourceVisible = extractVisibleTextFromXml2(source.xml).length;
+      const beforeSource = extractVisibleTextFromXml(loaded.documentXml.slice(anchor.start, source.start)).length;
+      const sourceVisible = extractVisibleTextFromXml(source.xml).length;
       if (requestedOffset > beforeSource)
         requestedOffset = Math.max(beforeSource, requestedOffset - sourceVisible);
     }
@@ -334541,7 +334668,7 @@ class V2ContentControlsAdapter {
       const updatedPara = spliced.kind === "ok" ? spliced.xml : insertXmlIntoParagraphContent(para.xml, destinationXml);
       nextXml = replaceRange3(withoutSource, para.start, para.end, updatedPara);
     } else {
-      const insertBefore = requestedOffset === 0 && extractVisibleTextFromXml2(para.xml).trim().length > 0;
+      const insertBefore = requestedOffset === 0 && extractVisibleTextFromXml(para.xml).trim().length > 0;
       nextXml = insertBefore ? `${withoutSource.slice(0, para.start)}${destinationXml}${withoutSource.slice(para.start)}` : `${withoutSource.slice(0, para.end)}${destinationXml}${withoutSource.slice(para.end)}`;
     }
     return this.commitDocument(nextXml, "content-control-move", input, options, source.target, commitOptions);
@@ -335332,7 +335459,7 @@ function parseParagraphWindows(documentXml) {
       start: match.index,
       end: paragraphRe.lastIndex,
       xml,
-      textLength: extractVisibleTextFromXml2(xml).length
+      textLength: extractVisibleTextFromXml(xml).length
     });
   }
   return paragraphs;
@@ -335351,7 +335478,7 @@ async function parseParagraphWindowsCooperatively(documentXml, yieldPoint) {
       start: match.index,
       end: paragraphRe.lastIndex,
       xml,
-      textLength: extractVisibleTextFromXml2(xml).length
+      textLength: extractVisibleTextFromXml(xml).length
     });
     if ((sinceYield += 1) >= COOPERATIVE_PARSE_SLICE_PARAGRAPHS) {
       sinceYield = 0;
@@ -335793,7 +335920,7 @@ function selectionOffsetInParagraph(paragraph4, absoluteIndex) {
   if (absoluteIndex <= paragraph4.start)
     return 0;
   const relative = Math.min(absoluteIndex, paragraph4.end) - paragraph4.start;
-  const textOffset = extractVisibleTextFromXml2(paragraph4.xml.slice(0, relative)).length;
+  const textOffset = extractVisibleTextFromXml(paragraph4.xml.slice(0, relative)).length;
   if (!/<[\w.-]+:(?:drawing|pict|object)\b/.test(paragraph4.xml.slice(0, relative))) {
     return Math.max(0, Math.min(paragraph4.textLength, textOffset));
   }
@@ -337019,7 +337146,7 @@ function insertBlockContentControlAtSelection(documentXml, paragraphs, target, s
   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 && extractVisibleTextFromXml2(anchor.xml).trim().length === 0) {
+  if (collapsed && extractVisibleTextFromXml(anchor.xml).trim().length === 0) {
     return replaceRange3(documentXml, anchor.start, anchor.end, sdtXml);
   }
   return `${documentXml.slice(0, anchor.end)}${sdtXml}${documentXml.slice(anchor.end)}`;
@@ -362873,7 +363000,7 @@ function extractStructuralCellTexts(xml, side) {
   return findAllElements(xml, "tc").map((cell) => extractStructuralText(cell.xml, side)).filter((value2) => value2.trim().length > 0);
 }
 function extractStructuralText(xml, side) {
-  const readText = side === "deleted" ? extractTrackedTextFromXml : extractVisibleTextFromXml2;
+  const readText = side === "deleted" ? extractTrackedTextFromXml : extractVisibleTextFromXml;
   const paragraphs = scanParagraphXmlSpans({ bytes: TEXT_ENCODER2.encode(xml) });
   if (paragraphs.length === 0)
     return readText(xml);
@@ -376464,7 +376591,7 @@ var init_adapter28 = __esm(() => {
   init_story_surface();
   init_visible_text();
   TD113 = new TextDecoder;
-  extractVisibleTextFromXml4 = extractVisibleTextFromXml2;
+  extractVisibleTextFromXml4 = extractVisibleTextFromXml;
 });
 
 // ../../../v2/document-api-v2-adapter/dist/search/node-discovery.js
@@ -381070,8 +381197,8 @@ function resolveDescriptorVisibleTextRange(paragraph4, descriptor) {
   }
   const innerStartIndex = stringIndexAtUtf8Offset(paragraph4.rawXml, relativeInnerStart);
   const innerEndIndex = stringIndexAtUtf8Offset(paragraph4.rawXml, relativeInnerEnd);
-  const start = extractVisibleTextFromXml2(paragraph4.rawXml.slice(0, innerStartIndex)).length;
-  const length = extractVisibleTextFromXml2(paragraph4.rawXml.slice(innerStartIndex, innerEndIndex)).length;
+  const start = extractVisibleTextFromXml(paragraph4.rawXml.slice(0, innerStartIndex)).length;
+  const length = extractVisibleTextFromXml(paragraph4.rawXml.slice(innerStartIndex, innerEndIndex)).length;
   return { start, end: start + length };
 }
 function utf8CodePointWidth(codePoint) {
@@ -385626,6 +385753,12 @@ function normalizeTableBlock(block, index2, version2) {
     reason: "paste-structure-unsupported",
     diagnostics: [diagnostic("paste-structure-unsupported", message, "superdoc-v2-fragment", "error", ["blocks", index2])]
   });
+  const blockSdts = normalizeBlockSdts(block.blockSdts, ["blocks", index2, "blockSdts"]);
+  if (isPlanFailure(blockSdts))
+    return blockSdts;
+  if (blockSdts && version2 !== SUPERDOC_V22_CLIPBOARD_FRAGMENT_VERSION) {
+    return fail6("Block content controls around tables require a v2.2 fragment.");
+  }
   if (block.cellSpacingPt !== undefined && !isSafePaddingPoints2(block.cellSpacingPt)) {
     return fail6("Paste table cellSpacingPt must be a non-negative finite point value within the safe twip range.");
   }
@@ -385725,6 +385858,7 @@ function normalizeTableBlock(block, index2, version2) {
     return sourcePath;
   return {
     kind: "table",
+    ...blockSdts ? { blockSdts } : {},
     rows,
     ...block.cellSpacingPt !== undefined ? { cellSpacingPt: block.cellSpacingPt } : {},
     ...sourcePath ? { sourcePath } : {}
@@ -386532,7 +386666,8 @@ function serializeSelectionRange(context, target, includeHtml, options) {
     const tableCellPath = boundaryMap.byBlockId(entry.blockId)?.tableCellPath ?? [];
     const blockSdtPath = boundaryMap.byBlockId(entry.blockId)?.blockSdtPath ?? [];
     const properties = readParagraphProperties(paragraphXml);
-    const fullyCovered = from === 0 && to === map3.visibleLength && (options?.wholeParagraphs === true || startEntry.ordinal !== endEntry.ordinal || properties.styleRef !== undefined || properties.numbering !== undefined || hasParagraphProperties(paragraphXml));
+    const selectedInlineControl = options?.wholeParagraphs !== true && startEntry.ordinal === endEntry.ordinal && map3.pieces.some((piece) => piece.kind === "container" && piece.containerKind === "sdt" && piece.visibleStart === from && piece.visibleEnd === to);
+    const fullyCovered = !selectedInlineControl && from === 0 && to === map3.visibleLength && (options?.wholeParagraphs === true || startEntry.ordinal !== endEntry.ordinal || properties.styleRef !== undefined || properties.numbering !== undefined || hasParagraphProperties(paragraphXml));
     const styleModel = copyStyleModel ?? (copyStyleModel = compileCopyStyleModel(context));
     const styleContext = copyStyleContext(styleModel, properties.styleRef);
     const semanticStyleRole = portableSemanticStyleRole(styleModel, properties.styleRef);
@@ -386638,7 +386773,7 @@ function serializeSelectionRange(context, target, includeHtml, options) {
     const listLevel = numbering ? Number.parseInt(numbering.ilvl, 10) : undefined;
     const blockSdts = blockSdtPath.map((ordinal) => {
       const wrapper = blockSdtWrappers.get(ordinal);
-      if (!wrapper || !fullyCovered || tableCellPath.length > 0 || !wrapper.supported || index2.entries.some((candidate2) => boundaryMap.byBlockId(candidate2.blockId)?.blockSdtPath.includes(ordinal) && (candidate2.ordinal < startEntry.ordinal || candidate2.ordinal > endEntry.ordinal || candidate2.ordinal === startEntry.ordinal && startPoint.offset !== 0 || candidate2.ordinal === endEntry.ordinal && endPoint.offset !== parseParagraphInlineMap(SERIALIZE_TD.decode(bytes.subarray(endEntry.byteStart, endEntry.byteEnd))).visibleLength)))
+      if (!wrapper || !fullyCovered || !wrapper.supported || index2.entries.some((candidate2) => boundaryMap.byBlockId(candidate2.blockId)?.blockSdtPath.includes(ordinal) && ((boundaryMap.byBlockId(candidate2.blockId)?.tableCellPath.length ?? 0) > 1 || candidate2.ordinal < startEntry.ordinal || candidate2.ordinal > endEntry.ordinal || candidate2.ordinal === startEntry.ordinal && startPoint.offset !== 0 || candidate2.ordinal === endEntry.ordinal && endPoint.offset !== parseParagraphInlineMap(SERIALIZE_TD.decode(bytes.subarray(endEntry.byteStart, endEntry.byteEnd))).visibleLength)))
         return null;
       return wrapper.properties;
     });
@@ -386786,11 +386921,20 @@ function parseSupportedSdtProperties(xml) {
 function scanBlockSdtWrappers(xml) {
   const wrappers = new Map;
   const stack = [];
-  const tokens = /<w:p\b[^>]*>[\s\S]*?<\/w:p\s*>|<w:sdt\b[^>]*>|<\/w:sdt\s*>/g;
+  const tokens = /<w:p\b[^>]*>[\s\S]*?<\/w:p\s*>|<w:(?:sdt|tc)\b[^>]*>|<\/w:(?:sdt|tc)\s*>/g;
+  let cellDepth = 0;
   let ordinal = 0;
   for (const token of xml.matchAll(tokens)) {
     if (token[0].startsWith("<w:p"))
       continue;
+    if (token[0].startsWith("<w:tc")) {
+      cellDepth += 1;
+      continue;
+    }
+    if (token[0].startsWith("</w:tc")) {
+      cellDepth -= 1;
+      continue;
+    }
     if (token[0].startsWith("</")) {
       const frame = stack.pop();
       if (!frame)
@@ -386801,10 +386945,10 @@ function scanBlockSdtWrappers(xml) {
       const children2 = contentXml === undefined ? [] : parseTopLevelChildren(contentXml);
       const parsedProperties = propertiesXml === undefined ? null : parseSupportedSdtProperties(propertiesXml);
       const properties = { sourceId: String(frame.ordinal), ...parsedProperties ?? { controlType: "richText" } };
-      const supported = parsedProperties !== null && contentXml !== undefined && children2.length > 0 && children2.every((child) => child.prefix === "w" && (child.localName === "p" || child.localName === "sdt")) && topLevelChildrenCoverXml(contentXml, children2);
+      const supported = !frame.inCell && parsedProperties !== null && contentXml !== undefined && children2.length > 0 && children2.every((child) => child.prefix === "w" && (child.localName === "p" || child.localName === "sdt" || child.localName === "tbl")) && topLevelChildrenCoverXml(contentXml, children2);
       wrappers.set(frame.ordinal, { properties, supported });
     } else {
-      stack.push({ ordinal: ordinal++, start: token.index });
+      stack.push({ ordinal: ordinal++, start: token.index, inCell: cellDepth > 0 });
     }
   }
   return wrappers;
@@ -387648,6 +387792,7 @@ function groupTableBlocks(blocks) {
         ordinal: coord.table,
         group: {
           kind: "table",
+          ...block.blockSdts ? { blockSdts: block.blockSdts } : {},
           ...coord.cellSpacingPt !== undefined ? { cellSpacingPt: coord.cellSpacingPt } : {},
           rows: []
         }
@@ -387670,7 +387815,8 @@ function groupTableBlocks(blocks) {
       };
       row.cells.push(cell);
     }
-    cell.blocks.push(block);
+    const { blockSdts: _tableWrappers, ...cellBlock } = block;
+    cell.blocks.push(cellBlock);
   }
   return out;
 }
@@ -387756,6 +387902,7 @@ function richFragmentBlockFor(grouped) {
     return richParagraphFragmentFor(grouped.block);
   return {
     kind: "table",
+    ...grouped.blockSdts ? { blockSdts: grouped.blockSdts } : {},
     ...grouped.cellSpacingPt !== undefined ? { cellSpacingPt: grouped.cellSpacingPt } : {},
     rows: grouped.rows.map((row) => ({
       cells: row.cells.map((cell) => ({
@@ -429197,7 +429344,7 @@ function replaceLiveTableStructuralProperties(tableXml, tableBlocks, rowProperti
   const replacements = [];
   for (const row of directElementSpans(tableXml, table.openEnd, table.closeStart, "tr")) {
     const cells = directElementSpans(tableXml, row.openEnd, row.closeStart, "tc");
-    const rowBlock = cells.flatMap((cell) => directParagraphSpans(tableXml, cell)).map((paragraph4) => blockIdFromParagraphXml(tableXml.slice(paragraph4.start, paragraph4.end))).map((blockId) => blockId == null ? undefined : blockById.get(blockId)).find(Boolean);
+    const rowBlock = cells.flatMap((cell) => cellParagraphSpans(tableXml, cell)).map((paragraph4) => blockIdFromParagraphXml(tableXml.slice(paragraph4.start, paragraph4.end))).map((blockId) => blockId == null ? undefined : blockById.get(blockId)).find(Boolean);
     const rowNodeId = rowBlock?.structuralRefs.rowNodeId;
     if (rowNodeId && cells[0] && rowProperties.has(rowNodeId)) {
       const prefix = tableXml.slice(row.start, cells[0].start);
@@ -429208,12 +429355,12 @@ function replaceLiveTableStructuralProperties(tableXml, tableBlocks, rowProperti
       });
     }
     for (const cell of cells) {
-      const paragraphs = directParagraphSpans(tableXml, cell);
+      const paragraphs = cellParagraphSpans(tableXml, cell);
       const cellBlock = paragraphs.map((paragraph4) => blockIdFromParagraphXml(tableXml.slice(paragraph4.start, paragraph4.end))).map((blockId) => blockId == null ? undefined : blockById.get(blockId)).find(Boolean);
       const cellNodeId = cellBlock?.structuralRefs.cellNodeId;
       if (!cellNodeId || !cellProperties.has(cellNodeId))
         continue;
-      const contentStart = paragraphs[0]?.start ?? cell.closeStart;
+      const contentStart = directParagraphSpans(tableXml, cell)[0]?.start ?? cell.closeStart;
       const prefix = tableXml.slice(cell.start, contentStart);
       replacements.push({
         start: cell.start,
@@ -429533,7 +429680,7 @@ function tableBlockIdsFromXml(tableXml) {
     return blockIds;
   for (const row of directElementSpans(tableXml, table.openEnd, table.closeStart, "tr")) {
     for (const cell of directElementSpans(tableXml, row.openEnd, row.closeStart, "tc")) {
-      for (const paragraph4 of directParagraphSpans(tableXml, cell)) {
+      for (const paragraph4 of cellParagraphSpans(tableXml, cell)) {
         const blockId = blockIdFromParagraphXml(tableXml.slice(paragraph4.start, paragraph4.end));
         if (blockId)
           blockIds.add(blockId);
@@ -429590,6 +429737,15 @@ function findContainingTableCellSpan(xml, offset) {
   }
   return containing;
 }
+function cellParagraphSpans(xml, cellSpan) {
+  const spans = directParagraphSpans(xml, cellSpan);
+  for (const control of directElementSpans(xml, cellSpan.openEnd, cellSpan.closeStart, "sdt")) {
+    for (const content3 of directElementSpans(xml, control.openEnd, control.closeStart, "sdtContent")) {
+      spans.push(...cellParagraphSpans(xml, content3));
+    }
+  }
+  return spans;
+}
 function directParagraphSpans(xml, cellSpan) {
   const spans = [];
   let cursor = cellSpan.openEnd;
@@ -435442,13 +435598,18 @@ function usesTrackedDecisionSessionSync(prepared, extension2, options) {
     const doc2 = options.resolveStoryShard(target.storyId);
     if (!doc2)
       return false;
-    const liveSpans = collectLiveTrackedTextSpans(doc2, target.rsid, target.trackedKind, [target.blockId]);
+    const liveSpans = collectLiveTrackedTextSpansInLogicalTarget(doc2, target);
     if (liveSpans.length > 1)
       return true;
-    if (!hasTrackedDecisionLedgerEntry(doc2, target.rsid) || findPreparedLiveTrackedTextSpans(doc2, target).length > 0) {
-      return false;
-    }
-    return liveSpans.length > 0;
+    return hasTrackedDecisionLedgerEntry(doc2, target.rsid) && liveSpans.length > 0;
+  });
+}
+function collectLiveTrackedTextSpansInLogicalTarget(doc2, target) {
+  return collectLiveTrackedTextSpans(doc2, target.rsid, target.trackedKind, []).filter((span) => {
+    if (span.blockId === target.blockId)
+      return true;
+    const carrier = findBlockMap(doc2, span.blockId)?.block;
+    return carrier?.get(BLOCK_KEY.mergedIntoBlockId) === target.blockId;
   });
 }
 function tryMirrorStoryText(prepared, extension2, options, admitted) {

package/package.json

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