@superdoc/mcp 1.9.0-next.10 → 1.9.0-next.12

package/dist/index.js

@@ -31620,7 +31620,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.22.0-next.10";
+var SDK_VERSION = "2.22.0-next.12";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -159330,7 +159330,7 @@ function buildCommentsCatalog(state) {
   const extendedBytes = state.packageBytes.get(COMMENTS_EXTENDED_PART_URI);
   let extendedByParaId = extendedBytes ? parseCommentsExtendedXml(TD12.decode(extendedBytes)) : new Map;
   if (entries.length > 1) {
-    extendedByParaId = mergeInferredThreading(extendedByParaId, inferThreadingFromStoryAnchors(state, entries));
+    extendedByParaId = mergeInferredThreading(extendedByParaId, inferThreadingFromStoryAnchors(state, entries, extendedByParaId));
   }
   const idsBytes = state.packageBytes.get(COMMENTS_IDS_PART_URI);
   const durableByParaId = idsBytes ? parseCommentsIdsXml(TD12.decode(idsBytes)) : new Map;
@@ -159630,17 +159630,25 @@ function normalizeNullableCustomAttr(value) {
     return null;
   return decodeAttr(value);
 }
-function inferThreadingFromStoryAnchors(state, entries) {
+function inferThreadingFromStoryAnchors(state, entries, explicit) {
   const entryByWId = new Map;
   for (const entry of entries) {
     if (!entryByWId.has(entry.wId))
       entryByWId.set(entry.wId, entry);
   }
+  const paraIdOwners = new Map;
+  for (const entry of entries) {
+    for (const paraId of new Set(entry.bodyParaIds))
+      paraIdOwners.set(paraId, (paraIdOwners.get(paraId) ?? 0) + 1);
+  }
   const sessionParaIds = state.idReservations.comments.paraIds;
   const importedSourceIds = new Set(entries.filter((entry) => {
     const paraId = entry.bodyParaIds[0];
-    return paraId && !entry.isExplicitRoot && !sessionParaIds.has(paraId);
+    return paraId && paraIdOwners.get(paraId) === 1 && !entry.isExplicitRoot && !sessionParaIds.has(paraId);
   }).map((entry) => entry.wId));
+  const inferenceSourceIds = new Set([...entryByWId.values()].filter((entry) => importedSourceIds.has(entry.wId) && !entry.bodyParaIds.some((paraId) => explicit.has(paraId))).map((entry) => entry.wId));
+  if (inferenceSourceIds.size === 0)
+    return new Map;
   const sourceOrder = new Map;
   for (let i = 0;i < entries.length; i += 1) {
     const entry = entries[i];
@@ -159664,11 +159672,6 @@ function inferThreadingFromStoryAnchors(state, entries) {
       groups.push([anchor]);
   }
   const out = new Map;
-  for (const entry of entries) {
-    const paraId = entry.bodyParaIds[0];
-    if (paraId)
-      out.set(paraId, { parentParaId: null, done: false });
-  }
   for (const group of groups) {
     const uniqueSourceIds = Array.from(new Set(group.map((a) => a.sourceWId)));
     if (uniqueSourceIds.length < 2)
@@ -159680,7 +159683,7 @@ function inferThreadingFromStoryAnchors(state, entries) {
     if (!rootParaId)
       continue;
     for (const sourceWId of uniqueSourceIds) {
-      if (sourceWId === rootSourceId)
+      if (sourceWId === rootSourceId || !inferenceSourceIds.has(sourceWId))
         continue;
       const replyEntry = entryByWId.get(sourceWId);
       const replyParaId = replyEntry?.bodyParaIds[0];
@@ -159688,12 +159691,25 @@ function inferThreadingFromStoryAnchors(state, entries) {
         continue;
       const parentSourceId = chooseContainingParentSourceId(sourceWId, uniqueSourceIds, envelopeBySourceId, sourceOrder) ?? rootSourceId;
       const parentEntry = entryByWId.get(parentSourceId);
-      const parentParaId = parentEntry?.bodyParaIds[0] ?? rootParaId;
+      const parentParaId = parentEntry ? selectThreadingParaId(parentEntry, explicit) : rootParaId;
+      if (wouldCreateThreadCycle(replyParaId, parentParaId, explicit, out))
+        continue;
       out.set(replyParaId, { parentParaId, done: false });
     }
   }
   return out;
 }
+function wouldCreateThreadCycle(childParaId, parentParaId, explicit, inferred) {
+  const seen = new Set([childParaId]);
+  let cursor = parentParaId;
+  while (cursor !== null) {
+    if (seen.has(cursor))
+      return true;
+    seen.add(cursor);
+    cursor = (explicit.get(cursor) ?? inferred.get(cursor))?.parentParaId ?? null;
+  }
+  return false;
+}
 function representativeEnvelopeBySourceId(group) {
   const out = new Map;
   for (const envelope of group) {
@@ -159758,17 +159774,8 @@ function mergeInferredThreading(explicit, inferred) {
     return explicit;
   const out = new Map(explicit);
   for (const [paraId, inferredExt] of inferred) {
-    const existing = out.get(paraId);
-    if (!existing) {
+    if (!out.has(paraId))
       out.set(paraId, inferredExt);
-      continue;
-    }
-    if (existing.parentParaId === null && inferredExt.parentParaId !== null) {
-      out.set(paraId, {
-        parentParaId: inferredExt.parentParaId,
-        done: existing.done
-      });
-    }
   }
   return out;
 }
@@ -159779,25 +159786,38 @@ function collectCommentAnchorEnvelopes(state) {
       continue;
     const xml = TD12.decode(bytes);
     const starts = [];
-    const ends = [];
+    const endsBySourceId = new Map;
     const tokenRe = /<[\w.-]+:(commentRangeStart|commentRangeEnd)\b[^>]*\bw:id="([^"]+)"[^>]*\/?>/g;
     for (let match = tokenRe.exec(xml);match; match = tokenRe.exec(xml)) {
       const item = { sourceWId: match[2] ?? "", pos: match.index };
       if (match[1] === "commentRangeStart")
         starts.push(item);
-      else
-        ends.push(item);
+      else {
+        const ends = endsBySourceId.get(item.sourceWId);
+        if (ends)
+          ends.push(item.pos);
+        else
+          endsBySourceId.set(item.sourceWId, [item.pos]);
+      }
     }
+    const endCursors = new Map;
     for (const start of starts) {
-      const end = ends.find((candidate2) => candidate2.sourceWId === start.sourceWId && candidate2.pos >= start.pos);
-      if (end)
-        out.push({ sourceWId: start.sourceWId, start: start.pos, end: end.pos });
+      const ends = endsBySourceId.get(start.sourceWId);
+      if (!ends)
+        continue;
+      let cursor = endCursors.get(start.sourceWId) ?? 0;
+      while (cursor < ends.length && ends[cursor] < start.pos)
+        cursor++;
+      endCursors.set(start.sourceWId, cursor);
+      const end = ends[cursor];
+      if (end !== undefined)
+        out.push({ partUri, sourceWId: start.sourceWId, start: start.pos, end });
     }
   }
   return out;
 }
 function envelopesOverlap(a, b) {
-  return a.start <= b.end && b.start <= a.end;
+  return a.partUri === b.partUri && a.start <= b.end && b.start <= a.end;
 }
 function isStoryPartUri(partUri) {
   return partUri === "/word/document.xml" || /^\/word\/header\d+\.xml$/.test(partUri) || /^\/word\/footer\d+\.xml$/.test(partUri) || partUri === "/word/footnotes.xml" || partUri === "/word/endnotes.xml";
@@ -159961,27 +159981,42 @@ function shiftedMarker(marker, delta) {
     paragraph: marker.paragraph ? { ...marker.paragraph, range: shift(marker.paragraph.range) } : null
   };
 }
-function getBodyCommentMarkerFacts(state, partUri) {
+function indexMarkersBySourceId(markers) {
+  const index = new Map;
+  for (const marker of markers) {
+    const existing = index.get(marker.id);
+    if (existing)
+      existing.push(marker);
+    else
+      index.set(marker.id, [marker]);
+  }
+  return index;
+}
+function getBodyCommentByteFacts(state, partUri) {
   const bytes = state.packageBytes.get(partUri);
   const revision = state.parts.get(partUri)?.descriptor.revision;
   if (!bytes || !revision)
-    return [];
+    return null;
   const cache = byteFacts(state);
   const prior = cache.get(partUri);
   if (prior?.bytes === bytes && prior.partRevision === revision)
-    return prior.markers;
+    return prior;
   const bom = bytes[0] === 239 && bytes[1] === 187 && bytes[2] === 191 ? 3 : 0;
   const scanned = scanBodyCommentMarkers(TD13.decode(bytes));
   const markers = scanned.markers.map((marker) => shiftedMarker(marker, bom));
-  cache.set(partUri, { bytes, partRevision: revision, markers, complete: scanned.complete });
-  return markers;
+  const facts = { bytes, partRevision: revision, markers, markersBySourceId: indexMarkersBySourceId(markers), complete: scanned.complete };
+  cache.set(partUri, facts);
+  return facts;
+}
+function getBodyCommentMarkerFacts(state, partUri) {
+  return getBodyCommentByteFacts(state, partUri)?.markers ?? [];
+}
+function getBodyCommentMarkersForSourceId(state, partUri, commentId) {
+  return getBodyCommentByteFacts(state, partUri)?.markersBySourceId.get(commentId) ?? [];
 }
 function readCompleteBodyCommentMarkerFacts(state, partUri) {
-  if (!state.packageBytes.has(partUri))
-    return null;
-  const markers = getBodyCommentMarkerFacts(state, partUri);
-  const facts = byteFacts(state).get(partUri);
-  return facts?.complete === true && facts.bytes === state.packageBytes.get(partUri) && facts.partRevision === state.parts.get(partUri)?.descriptor.revision ? markers : null;
+  const facts = getBodyCommentByteFacts(state, partUri);
+  return facts?.complete === true ? facts.markers : null;
 }
 function peekBodyCommentMarkerFacts(state, partUri) {
   const cache = state.partRegistries.get(BYTE_FACTS_KEY);
@@ -160011,22 +160046,22 @@ function refreshBodyCommentMarkerFactsAfterParagraphMutation(input) {
   }
   const scanned = scanBodyCommentMarkers(TD13.decode(bytes.subarray(input.beforeStart, input.afterEnd)), input.namespaceBindings);
   const current = scanned.markers.map((marker) => shiftedMarker(marker, input.beforeStart));
+  const markers = [...unchanged, ...current].sort((a, b) => a.range.byteStart - b.range.byteStart);
   cache.set(input.partUri, {
     bytes,
     partRevision: revision,
     complete: prior.complete && scanned.complete,
-    markers: [...unchanged, ...current].sort((a, b) => a.range.byteStart - b.range.byteStart)
+    markers,
+    markersBySourceId: indexMarkersBySourceId(markers)
   });
 }
 function findRetainedBodyCommentAnchors(state, partUri, commentId, occurrenceIndex) {
-  return anchorsFromMarkers(getBodyCommentMarkerFacts(state, partUri), commentId, occurrenceIndex);
+  return anchorsFromMarkers(getBodyCommentMarkersForSourceId(state, partUri, commentId), commentId, occurrenceIndex);
 }
 function countRetainedBodyCommentAnchorOccurrences(state, partUri, commentId) {
   const counts = { commentRangeStart: 0, commentRangeEnd: 0, commentReference: 0 };
-  for (const marker of getBodyCommentMarkerFacts(state, partUri)) {
-    if (marker.id === commentId)
-      counts[marker.kind] += 1;
-  }
+  for (const marker of getBodyCommentMarkersForSourceId(state, partUri, commentId))
+    counts[marker.kind] += 1;
   return Math.max(counts.commentRangeStart, counts.commentRangeEnd, counts.commentReference);
 }
 function collectBodyCommentMarkers(documentXml, namespaceBindings) {
@@ -185500,7 +185535,8 @@ function createReviewStagingState(state, targetBlockIds) {
       result[key3] = clone2(item);
     return result;
   };
-  Object.assign(staged, Object.fromEntries(Object.entries(staged).filter(([key3]) => !["packageBytes", "paragraphIndexes", "partRegistries"].includes(key3)).map(([key3, value]) => [key3, clone2(value)])));
+  Object.assign(staged, Object.fromEntries(Object.entries(staged).filter(([key3]) => !["packageBytes", "paragraphIndexes", "partRegistries", "history"].includes(key3)).map(([key3, value]) => [key3, clone2(value)])));
+  staged.history = { entries: new Map(state.history.entries), order: [...state.history.order] };
   staged.paragraphIndexes = new Map;
   staged.partRegistries = new Map;
   staged.revisions = new RevisionAllocator("review-preview");
@@ -186198,7 +186234,7 @@ function captureCooperativeTrackedCatalogRead(state, mode, assertActive) {
     numberingCatalog: listContext.numberingCatalog,
     styleNumberingIndex: listContext.styleIndex,
     stylesStatus: listContext.stylesStatus,
-    textboxRegistryRecords: state.textboxRegistry.records
+    textboxRegistryRecords: Array.from(state.textboxRegistry.records)
   });
   let released = false, building = false;
   const check2 = () => {
@@ -264694,8 +264730,7 @@ class TxContext {
     const documentBytes = this.state.packageBytes.get(op.on.partUri);
     if (!documentBytes)
       return rejected21(this.txId, "invalid-range");
-    const documentXml = TD78.decode(documentBytes);
-    const anchors = findBodyCommentAnchors(documentXml, markerWId, sourceStoryInfo.localOccurrenceIndex);
+    const anchors = sourceStoryInfo.anchors;
     if (!anchors.rangeStart || !anchors.rangeEnd) {
       return rejected21(this.txId, "comment-anchor-not-found");
     }
@@ -264714,7 +264749,7 @@ class TxContext {
         continue;
       if (threadStory.partUri !== op.on.partUri)
         return rejected21(this.txId, "comment-move-cross-story");
-      const threadAnchors = findBodyCommentAnchors(documentXml, threadMarkerWId, threadStory.localOccurrenceIndex);
+      const threadAnchors = threadStory.anchors;
       if (threadAnchors.rangeStart)
         removeRanges.push(threadAnchors.rangeStart);
       if (threadAnchors.rangeEnd)
@@ -264741,7 +264776,7 @@ class TxContext {
     };
     if (newRange.byteEnd < newRange.byteStart)
       return rejected21(this.txId, "invalid-range");
-    if (!op.allowMarkerCarrierOverlap && rangesOverlap(oldEnvelope, newRange)) {
+    if (!op.allowMarkerCarrierOverlap && rangesOverlap(oldEnvelope, newRange) && !isUnchangedCommentRange(this.state, op.on, markerWId, anchors)) {
       return rejected21(this.txId, "comment-move-overlap");
     }
     const stripped = stripBytes2(documentBytes, mergedRemovals);
@@ -264749,7 +264784,7 @@ class TxContext {
     const newEnd = translateAfterRemovals(newRange.byteEnd, mergedRemovals);
     if (newStart == null || newEnd == null)
       return rejected21(this.txId, "comment-move-overlap");
-    const rewrite = rewriteDocumentXml(TD78.decode(stripped), { ...op.on, startByte: newStart, endByte: newEnd }, markerWId, undefined, {
+    const rewrite = rewriteDocumentXml(TD_KEEP_BOM.decode(stripped), { ...op.on, startByte: newStart, endByte: newEnd }, markerWId, undefined, {
       start: relocatedAnchors.map((anchor) => commentRangeStart(anchor.markerWId)).join(""),
       end: relocatedAnchors.map((anchor) => commentRangeEnd(anchor.markerWId) + commentReferenceRun(anchor.markerWId, anchor.referenceRunXml)).join("")
     });
@@ -264778,28 +264813,31 @@ class TxContext {
       const commentsBytes = this.state.packageBytes.get(COMMENTS_PART_URI3);
       if (!commentsBytes)
         return rejected21(this.txId, "comments-part-missing");
-      const commentsXml = TD78.decode(commentsBytes);
-      let commentsNext = commentsXml;
+      const bom = commentsBytes[0] === 239 && commentsBytes[1] === 187 && commentsBytes[2] === 191 ? 3 : 0;
+      const commentsPatches = [];
       for (const threadEntry of threadEntries) {
-        const rewritten = rewriteCommentTrackedChangeMetadata(commentsNext, threadEntry.sourceWId || threadEntry.wId, threadEntry.sourceWIdOccurrenceIndex, op.trackedChangeMetadata);
+        const startByte = threadEntry.byteStart + bom;
+        const endByte = threadEntry.byteEnd + bom;
+        const fragment3 = TD78.decode(commentsBytes.subarray(startByte, endByte));
+        const rewritten = rewriteCommentTrackedChangeMetadata(fragment3, threadEntry.sourceWId || threadEntry.wId, 0, op.trackedChangeMetadata);
         if (!rewritten.ok)
           return rejected21(this.txId, rewritten.reason);
-        commentsNext = rewritten.xml;
+        if (rewritten.xml !== fragment3)
+          commentsPatches.push({
+            kind: "replaceBytes",
+            order: commentsPatches.length,
+            startByte,
+            endByte,
+            bytes: TE44.encode(rewritten.xml)
+          });
       }
-      if (commentsNext !== commentsXml) {
-        const commentsPatch = {
-          kind: "replaceBytes",
-          order: 0,
-          startByte: 0,
-          endByte: commentsBytes.length,
-          bytes: TE44.encode(commentsNext)
-        };
-        perPart[COMMENTS_PART_URI3] = { kind: "modify", patches: [commentsPatch] };
+      if (commentsPatches.length > 0) {
+        perPart[COMMENTS_PART_URI3] = { kind: "modify", patches: commentsPatches };
         preconditions.push(byteWindowPrecondition10(COMMENTS_PART_URI3, commentsBytes));
         const commentsMap = buildPatchMap({
           partUri: COMMENTS_PART_URI3,
           originalLength: commentsBytes.length,
-          patches: [commentsPatch]
+          patches: commentsPatches
         });
         patchMaps[COMMENTS_PART_URI3] = commentsMap.ok ? commentsMap.value : { partUri: COMMENTS_PART_URI3, ranges: [] };
       }
@@ -265440,6 +265478,34 @@ function locateCommentAnchorStory(state, commentId, occurrenceIndex) {
   }
   return null;
 }
+function isUnchangedCommentRange(state, target, markerWId, anchors) {
+  if (!anchors.rangeStart || !anchors.rangeEnd)
+    return false;
+  const markers = getBodyCommentMarkersForSourceId(state, target.partUri, markerWId);
+  const bytes = state.packageBytes.get(target.partUri);
+  if (!bytes)
+    return false;
+  const models = new Map;
+  const matchesBoundary = (kind, anchor, blockId, offset) => {
+    const marker = markers.find((item) => item.kind === kind && item.range.byteStart === anchor.byteStart);
+    const paragraph = marker?.paragraph;
+    if (!paragraph || anchor.byteStart < paragraph.range.byteStart || anchor.byteEnd > paragraph.range.byteEnd)
+      return false;
+    if (paragraph.blockId !== blockId) {
+      const indexed = getStoryParagraphIndexFromState(state, target.storyId)?.byParaId(blockId);
+      if (!indexed || indexed.partUri !== target.partUri || indexed.partRevision !== target.partRevision || indexed.byteStart !== paragraph.range.byteStart || indexed.byteEnd !== paragraph.range.byteEnd)
+        return false;
+    }
+    let model = models.get(paragraph.range.byteStart);
+    if (!model) {
+      model = parseParagraphInlineMap(TD78.decode(bytes.subarray(paragraph.range.byteStart, paragraph.range.byteEnd)), paragraph.namespaceBindings);
+      models.set(paragraph.range.byteStart, model);
+    }
+    const leaf = model.leaves().find((piece) => piece.kind === "marker" && piece.id === markerWId && piece.markerKind === kind && piece.byteStart + paragraph.range.byteStart === anchor.byteStart);
+    return !!leaf && (target.coordinateSpace === "tracked" ? leaf.trackedStart : leaf.visibleStart) === offset;
+  };
+  return matchesBoundary("commentRangeStart", anchors.rangeStart, target.startBlockId, target.startOffset) && matchesBoundary("commentRangeEnd", anchors.rangeEnd, target.endBlockId, target.endOffset);
+}
 function findCommentAnchorsForStory(state, partUri, storyXml, commentId, occurrenceIndex) {
   const localOccurrenceIndex = localOccurrenceIndexForStory(state, partUri, storyXml, commentId, occurrenceIndex);
   if (localOccurrenceIndex === null) {
@@ -266206,22 +266272,25 @@ function materializeCurrentCommentThreadExtendedRows(input) {
     Object.assign(input.patchMaps, compiled.value.patchMaps);
     return { ok: true };
   }
-  let nextXml = TD78.decode(extendedBytes);
-  let changed = false;
-  for (const item of entries2) {
-    const next = upsertCommentsExtendedThreadRow(nextXml, {
-      paraId: item.paraId,
-      parentParaId: item.parentParaId,
-      done: item.done
-    });
-    if (!next.ok)
-      return next;
-    if (next.value !== nextXml) {
-      nextXml = next.value;
-      changed = true;
-    }
+  const xml = TD_KEEP_BOM.decode(extendedBytes);
+  const remaining = new Map(entries2.map((item) => [item.paraId, item]));
+  let nextXml = xml.replace(/<[\w.-]+:commentEx\b[^>]*>/g, (fragment3) => {
+    const paraId = /\b(?:w14|w15):paraId="([^"]*)"/.exec(fragment3)?.[1];
+    const item = paraId ? remaining.get(paraId) : undefined;
+    if (!item)
+      return fragment3;
+    remaining.delete(item.paraId);
+    const next = upsertCommentsExtendedThreadRow(fragment3, item);
+    return next.ok ? next.value : fragment3;
+  });
+  if (remaining.size > 0) {
+    const fragments = [...remaining.values()].map(commentsExtendedRowXml).join("");
+    const appended = appendToExistingXmlRoot(nextXml, fragments, "commentsEx");
+    if (!appended.ok)
+      return appended;
+    nextXml = appended.value;
   }
-  if (changed)
+  if (nextXml !== xml)
     addWholePartReplace(input, COMMENTS_EXTENDED_PART_URI3, extendedBytes, nextXml);
   return { ok: true };
 }
@@ -266277,11 +266346,13 @@ function threadRootParaId(catalog, entry) {
   }
   return entry.paraId;
 }
-function appendCommentsExtendedXml(xml, input) {
+function commentsExtendedRowXml(input) {
   const parentAttr = input.parentParaId ? ` w15:paraIdParent="${escapeXmlAttribute(input.parentParaId)}"` : "";
   const doneAttr = input.done ? "1" : "0";
-  const fragment3 = `<w15:commentEx w15:paraId="${escapeXmlAttribute(input.paraId)}" w15:done="${doneAttr}"${parentAttr}/>`;
-  return appendToExistingXmlRoot(xml, fragment3, "commentsEx");
+  return `<w15:commentEx w15:paraId="${escapeXmlAttribute(input.paraId)}" w15:done="${doneAttr}"${parentAttr}/>`;
+}
+function appendCommentsExtendedXml(xml, input) {
+  return appendToExistingXmlRoot(xml, commentsExtendedRowXml(input), "commentsEx");
 }
 function appendCommentsIdsXml(xml, input) {
   const fragment3 = `<w16cid:commentId w16cid:paraId="${escapeXmlAttribute(input.paraId)}" w16cid:durableId="${escapeXmlAttribute(input.durableId)}"/>`;
@@ -266448,7 +266519,7 @@ function emptyHeaderFooterSkeleton(kind) {
   const root = kind === "header" ? "w:hdr" : "w:ftr";
   return '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' + `<${root}` + ' xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"' + ' xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"' + ">" + "<w:p/>" + `</${root}>`;
 }
-var TE44, TD78, nextTx = 0, CONTENT_TYPES_PART_URI12 = "/[Content_Types].xml", DOCUMENT_RELS_PART_URI10 = "/word/_rels/document.xml.rels", COMMENTS_PART_URI3 = "/word/comments.xml", COMMENTS_IDS_PART_URI3 = "/word/commentsIds.xml", COMMENTS_EXTENDED_PART_URI3 = "/word/commentsExtended.xml", SDCOM_COMMENTS_NS_URI = "http://superdoc.dev/2024/comments", COMMENT_ELEMENT_RE, RUN_HAS_TEXT_LEAF_VISIBLE_RE, RUN_HAS_TEXT_LEAF_TRACKED_RE, RUN_CONTROL_LEAF_RE, RUN_TEXT_LEAF_RE_VISIBLE, RUN_TEXT_LEAF_RE_TRACKED;
+var TE44, TD78, TD_KEEP_BOM, nextTx = 0, CONTENT_TYPES_PART_URI12 = "/[Content_Types].xml", DOCUMENT_RELS_PART_URI10 = "/word/_rels/document.xml.rels", COMMENTS_PART_URI3 = "/word/comments.xml", COMMENTS_IDS_PART_URI3 = "/word/commentsIds.xml", COMMENTS_EXTENDED_PART_URI3 = "/word/commentsExtended.xml", SDCOM_COMMENTS_NS_URI = "http://superdoc.dev/2024/comments", COMMENT_ELEMENT_RE, RUN_HAS_TEXT_LEAF_VISIBLE_RE, RUN_HAS_TEXT_LEAF_TRACKED_RE, RUN_CONTROL_LEAF_RE, RUN_TEXT_LEAF_RE_VISIBLE, RUN_TEXT_LEAF_RE_TRACKED;
 var init_tx_context = __esm(() => {
   init_resident_paragraph_ownership();
   init_canonical_xml_analysis_frame();
@@ -266494,6 +266565,7 @@ var init_tx_context = __esm(() => {
   init_compile_image_ops();
   TE44 = new TextEncoder;
   TD78 = new TextDecoder;
+  TD_KEEP_BOM = new TextDecoder("utf-8", { ignoreBOM: true });
   COMMENT_ELEMENT_RE = /<[\w.-]+:comment(?=[\s>/])/;
   RUN_HAS_TEXT_LEAF_VISIBLE_RE = /<[\w.-]+:t\b/;
   RUN_HAS_TEXT_LEAF_TRACKED_RE = /<[\w.-]+:(t|delText)\b/;
@@ -314315,6 +314387,7 @@ function computeFieldResult(context, instruction, options = {}) {
   }
   switch (keyword) {
     case "PAGE":
+      return resolvePageFieldText(context, options.currentField ?? options.pageLocation, instruction);
     case "PAGEREF":
       return resolvePageFieldText(context, options.currentField);
     case "NUMPAGES":
@@ -315934,32 +316007,60 @@ function readPreservedTocPageByText(preserved, text) {
 function normalizeGeneratedTocHeadingText(text) {
   return text.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim();
 }
-function resolvePageFieldText(context, currentField) {
+function resolvePageFieldText(context, currentField, instruction) {
+  const format = (page, sectionFormat) => instruction == null ? String(page) : formatPageFieldNumber(page, instruction, sectionFormat);
   if (!currentField)
-    return "1";
+    return format(1);
   const pages = estimateDocumentPages(context);
   if (!currentField.storyId.startsWith("header:") && !currentField.storyId.startsWith("footer:")) {
-    return String(pages.displayPageByBlockId.get(currentField.blockId) ?? 1);
+    return format(pages.displayPageByBlockId.get(currentField.blockId) ?? 1, pages.numberFormatByBlockId.get(currentField.blockId));
   }
   const snapshot2 = getSDDocumentSessionInternalSourceSignalsSnapshot(context.session);
   const main = snapshot2?.stories.find((story) => story.storyKind === "main");
   if (!main)
-    return "1";
+    return format(1);
   const kind = currentField.storyId.startsWith("header:") ? "header" : "footer";
   const liveSections = readLiveSectionSignals(context);
   const rel = listSDDocumentSessionInternalHeaderFooterRels(context.session).find((candidate2) => candidate2.partUri === currentField.partUri);
   if (!rel)
-    return "1";
+    return format(1);
   for (const section of liveSections) {
     const ref5 = section.headerFooterRefs.find((candidate2) => candidate2.kind === kind && candidate2.relationshipId === rel.refId);
     if (!ref5)
       continue;
     const sectionPages = pages.sectionById.get(section.sectionId);
     if (!sectionPages)
-      return "1";
-    return String(sectionPages.startDisplayPage + headerFooterPageOffset(ref5.variant, sectionPages.startDisplayPage, sectionPages.pageCount, sectionPages.titlePage, sectionPages.pageNumberingMode));
+      return format(1);
+    return format(sectionPages.startDisplayPage + headerFooterPageOffset(ref5.variant, sectionPages.startDisplayPage, sectionPages.pageCount, sectionPages.titlePage, sectionPages.pageNumberingMode), section.pageNumbering.format);
+  }
+  return format(1);
+}
+function formatPageFieldNumber(page, instruction, sectionFormat) {
+  let format = sectionFormat ?? "decimal";
+  for (const match of instruction.matchAll(/(?:^|\s)\\\*\s*(?:"([^"]*)"|([^\s"]+))/g)) {
+    const value2 = match[1] ?? match[2];
+    switch (value2.toLowerCase()) {
+      case "roman":
+        format = value2[0] === "r" ? "lowerRoman" : "upperRoman";
+        break;
+      case "alphabetic":
+        format = value2[0] === "a" ? "lowerLetter" : "upperLetter";
+        break;
+      case "arabic":
+        format = "decimal";
+        break;
+      case "arabicdash":
+        format = "numberInDash";
+        break;
+    }
+  }
+  if (format === "numberInDash")
+    return `- ${page} -`;
+  if ((format === "upperLetter" || format === "lowerLetter") && page > 0) {
+    const letter = String.fromCharCode(65 + (page - 1) % 26).repeat(Math.floor((page - 1) / 26) + 1);
+    return format === "lowerLetter" ? letter.toLowerCase() : letter;
   }
-  return "1";
+  return formatNumberingOrdinal(page, format);
 }
 function headerFooterPageOffset(variant, startDisplayPage, pageCount, titlePage, pageNumberingMode = "unknown") {
   const firstBodyPageOffset = titlePage && pageCount > 1 && (pageNumberingMode === "restart" || pageNumberingMode === "invalid") ? 1 : 0;
@@ -315977,11 +316078,12 @@ function headerFooterPageOffset(variant, startDisplayPage, pageCount, titlePage,
 function estimateDocumentPages(context) {
   const physicalPageByBlockId = new Map;
   const displayPageByBlockId = new Map;
+  const numberFormatByBlockId = new Map;
   const sectionById = new Map;
   const snapshot2 = getSDDocumentSessionInternalSourceSignalsSnapshot(context.session);
   const main = snapshot2?.stories.find((story) => story.storyKind === "main");
   if (!main)
-    return { physicalPageByBlockId, displayPageByBlockId, sectionById };
+    return { physicalPageByBlockId, displayPageByBlockId, numberFormatByBlockId, sectionById };
   const sections = readLiveSectionSignals(context);
   const liveBody = readLiveBodyPageSignals(context);
   const paragraphOrdinals = main.paragraphIndex.map((signal, index) => ({
@@ -316018,9 +316120,10 @@ function estimateDocumentPages(context) {
       const priorBreaks = breaksInSection.filter((entry) => entry.bodyChildOrdinal < paragraph2.ordinal || entry.bodyChildOrdinal === paragraph2.ordinal && entry.source === "paragraph-page-break-before").length;
       physicalPageByBlockId.set(paragraph2.blockId, startPhysicalPage + priorBreaks);
       displayPageByBlockId.set(paragraph2.blockId, startDisplayPage + priorBreaks);
+      numberFormatByBlockId.set(paragraph2.blockId, section.pageNumbering.format);
     }
   }
-  return { physicalPageByBlockId, displayPageByBlockId, sectionById };
+  return { physicalPageByBlockId, displayPageByBlockId, numberFormatByBlockId, sectionById };
 }
 function readLiveBodyPageSignals(context) {
   const documentBytes = getSDDocumentSessionInternalPartBytes(context.session, "/word/document.xml");
@@ -377801,13 +377904,29 @@ function resolveCommentEntryByParaId(catalog, paraId) {
     return null;
   return catalog.commentsByCommentId.get(canonicalCommentId) ?? null;
 }
+function commentAnchorProjectionEntry(entry, catalog, anchorIndex) {
+  let cursor = entry;
+  const seen = new Set;
+  while (cursor.parentParaId !== null) {
+    if (seen.has(cursor.commentId))
+      return entry;
+    seen.add(cursor.commentId);
+    const hits = anchorIndex.hitsBySourceWId.get(cursor.sourceWId) ?? [];
+    if (catalog.commentsBySourceWId.get(cursor.sourceWId)?.length !== 1 || !hits.some((hit) => hit.hasReference) || hits.some((hit) => hit.hasRangeStart || hit.hasRangeEnd))
+      break;
+    const parent = resolveCommentEntryByParaId(catalog, cursor.parentParaId);
+    if (!parent)
+      break;
+    cursor = parent;
+  }
+  return cursor;
+}
 function toCommentInfo(entry, catalog, anchorIndex, headerFooterRels, trackedAssociations) {
   const publicCommentId = publicCommentIdForEntry(entry);
   const parentParaId = entry.parentParaId;
   const parentEntry = parentParaId ? resolveCommentEntryByParaId(catalog, parentParaId) : null;
   const parentCommentId = parentEntry ? publicCommentIdForEntry(parentEntry) : undefined;
   const rootCommentId = parentCommentId ? rootCommentIdForCatalogEntry(entry, catalog) : null;
-  const anchorProjectionEntry = entry;
   const info = {
     address: { kind: "entity", entityType: "comment", entityId: publicCommentId },
     commentId: publicCommentId,
@@ -377829,10 +377948,9 @@ function toCommentInfo(entry, catalog, anchorIndex, headerFooterRels, trackedAss
     info.creatorImage = entry.authorImage;
   if (entry.importedId !== null && entry.importedId !== publicCommentId)
     info.importedId = entry.importedId;
-  let sourceSiblings;
   if (entry.sourceWId) {
     info.rawOoxmlId = entry.sourceWId;
-    sourceSiblings = catalog.commentsBySourceWId.get(entry.sourceWId);
+    const sourceSiblings = catalog.commentsBySourceWId.get(entry.sourceWId);
     if (sourceSiblings && sourceSiblings.length > 1) {
       info.rawOoxmlOccurrenceIndex = entry.sourceWIdOccurrenceIndex;
     }
@@ -377870,11 +377988,12 @@ function toCommentInfo(entry, catalog, anchorIndex, headerFooterRels, trackedAss
   if (!info.trackedChange) {
     attachMetadataOnlyTrackedChangeLink(info, entry, anchorIndex ? null : trackedAssociations, metadataAssociation.status !== "unsafe");
   }
-  if (anchorIndex && anchorProjectionEntry) {
+  if (anchorIndex) {
+    const anchorProjectionEntry = commentAnchorProjectionEntry(entry, catalog, anchorIndex);
     const hits = anchorIndex.hitsBySourceWId.get(anchorProjectionEntry.sourceWId) ?? [];
     const projectable = hits.filter((h) => h.story.kind === "body" || h.story.kind === "header" || h.story.kind === "footer");
     if (projectable.length > 0) {
-      sourceSiblings ?? (sourceSiblings = catalog.commentsBySourceWId.get(anchorProjectionEntry.sourceWId));
+      const sourceSiblings = catalog.commentsBySourceWId.get(anchorProjectionEntry.sourceWId);
       const globalSegmentIndex = sourceSiblings && sourceSiblings.length > 1 ? anchorProjectionEntry.sourceWIdOccurrenceIndex : undefined;
       const projected = projectAnchor(projectable, headerFooterRels, globalSegmentIndex);
       if (projected) {
@@ -379066,8 +379185,17 @@ class V2TrackedChangesAdapter {
         items: [],
         unresolvedTrackedChangeIds: [...new Set(requestedIds)]
       };
-    const sourceFilter = source && { ...source, structuralScope: structuralScope ?? undefined };
     const resolveSession = createTrackedChangeFragmentResolveSession();
+    const range = source?.textRange;
+    const validTextRange = range && Number.isSafeInteger(range.start) && Number.isSafeInteger(range.end) && range.start >= 0 && range.end > range.start;
+    const sourceFilter = source && {
+      ...source,
+      structuralScope: structuralScope ?? undefined,
+      matchesTextFragment: validTextRange ? (fragment4) => {
+        const resolved = resolveTrackedChangeFragmentTextTarget(this.context, fragment4, "tracked", story, resolveSession);
+        return resolved.ok && resolved.normalizedTarget.segments.some((segment) => segment.blockId === range.blockId && segment.range.start <= range.start && range.end <= segment.range.end);
+      } : undefined
+    };
     const seenInput = new Set;
     const seenCanonical = new Set;
     const orderedRequestedIds = [];
@@ -382043,6 +382171,11 @@ function resolveReviewSnapshotOwner(logical, entry) {
 function reviewSnapshotEntryMatchesSource(entry, source, requestedId) {
   if (source?.partUri && entry.partUri !== source.partUri)
     return false;
+  if (source?.textRange) {
+    const aliases = requestedId ? reviewSnapshotRequestedIdAliases(requestedId) : [];
+    if (!entry.fragments.some((fragment4) => (requestedId === entry.id || aliases.includes(fragment4.wId) || aliases.includes(fragment4.rsid)) && (source.kind === "insert" ? fragment4.kind === "ins" || fragment4.kind === "moveTo" : source.kind === "delete" ? fragment4.kind === "del" || fragment4.kind === "moveFrom" : false) && source.matchesTextFragment?.(fragment4)))
+      return false;
+  }
   if (source?.structuralScope) {
     const scope = source.structuralScope;
     const aliases = requestedId ? reviewSnapshotRequestedIdAliases(requestedId) : [];
@@ -389529,15 +389662,16 @@ class V2FieldsAdapter {
     const resolved = resolveInsertTarget(this.context, input.at, options);
     if ("failure" in resolved)
       return mutationFailure2(resolved.failure.code, resolved.failure.message);
+    const paragraph4 = findParagraphInStory(this.context, resolved.range.storyId, resolved.range.startBlockId);
+    if (!paragraph4)
+      return mutationFailure2("TARGET_NOT_FOUND", `Paragraph "${resolved.range.startBlockId}" was not found.`);
     const beforeFieldEntries = listCanonicalFieldEntries(this.context);
     const beforeFieldIds = new Set(beforeFieldEntries.map((entry) => entry.stableFieldId));
     const preserveCached = input.updatePolicy === "preserveCached" && typeof input.cachedResultText === "string";
     const resultText = preserveCached ? input.cachedResultText : computeFieldResult(this.context, input.instruction, {
+      pageLocation: paragraph4,
       seqFallbackLabel: parseSeqFallbackLabel(input.instruction)
     });
-    const paragraph4 = findParagraphInStory(this.context, resolved.range.storyId, resolved.range.startBlockId);
-    if (!paragraph4)
-      return mutationFailure2("TARGET_NOT_FOUND", `Paragraph "${resolved.range.startBlockId}" was not found.`);
     const selectedText = paragraph4.text.slice(resolved.range.startOffset, resolved.range.endOffset);
     const replaceSelection = resolved.range.endOffset > resolved.range.startOffset && selectedText === resultText;
     let fieldXml = preserveCached ? buildPreservedCachedFieldXml(input.instruction, resultText) : options?.changeMode === "tracked" ? buildComplexFieldTextXml(input.instruction, resultText) : buildSimpleFieldXml(input.instruction, resultText);
@@ -478713,6 +478847,9 @@ function createHeadlessCollabRoomCoordinator(options) {
   let syncingManifest = false;
   let registryChangedDuringSync = false;
   let packageParts = getPackagePartsMap(options.rootDoc);
+  const numberingPartKey = encodeLogicalOwnerKey(NUMBERING_PART_URI7);
+  const numberingShardId = packageShardId(options.rootId, SHARD_KIND.numbering, NUMBERING_PART_URI7);
+  let numberingDeletionObserved = false;
   const meta3 = getMetaMap(options.rootDoc);
   const packageSelection = options.rootDoc.getMap(ROOT_MAP.package);
   const observedReplacements = new Set;
@@ -478727,9 +478864,19 @@ function createHeadlessCollabRoomCoordinator(options) {
     return changed;
   }
   observeReplacementCommits();
-  const manifestObserver = () => {
+  const manifestObserver = (event) => {
     if (disposed)
       return;
+    if (event.target === packageParts) {
+      for (const [partKey2, change] of event.changes.keys) {
+        if (change.action !== "delete")
+          continue;
+        const previous3 = toManifestPartDescriptor(partKey2, change.oldValue);
+        if (previous3?.partKind === "numbering" && previous3.partUri === NUMBERING_PART_URI7 && partKey2 === numberingPartKey) {
+          numberingDeletionObserved = true;
+        }
+      }
+    }
     const replacementCommitted = observeReplacementCommits();
     if (replacementCommitted)
       pruneReplacedRoomOrphans(options.rootDoc);
@@ -479876,7 +480023,8 @@ function createHeadlessCollabRoomCoordinator(options) {
     for (const [shardId, handle] of options.graph.projectionHandles.entries()) {
       if (activeShardIds.has(shardId))
         continue;
-      if (!replacingPackage && !isManifestPrunableProjectionHandle(handle))
+      const explicitlyRetiredNumbering = handle.shardKind === SHARD_KIND.numbering && shardId === numberingShardId && numberingDeletionObserved;
+      if (!replacingPackage && !explicitlyRetiredNumbering && !isManifestPrunableProjectionHandle(handle))
         continue;
       options.graph.projectionHandles.delete(shardId);
       options.graph.requiredShardIds.delete(shardId);
@@ -479884,6 +480032,7 @@ function createHeadlessCollabRoomCoordinator(options) {
         options.graph.commentsHandle = null;
       changed = true;
     }
+    numberingDeletionObserved = false;
     if (changed)
       notifyRegistryChangedIfActive();
   }
@@ -482800,6 +482949,25 @@ async function openV2CollaborativeDocumentSession(options) {
     } else {
       trace.mark("source-complete-deferred");
     }
+    if (ownsPreparedBootstrap) {
+      const current = readRoomManifest(rootConn.ydoc);
+      if (current.snapshot?.meta.bootstrapState === "committed") {
+        const committed = options.runtime.validateLateJoin({
+          compatibility: { supports: COLLAB_V2_ROOM_SCHEMA_VERSION },
+          readiness: READINESS_CLASS.bodyEditable
+        });
+        if (!committed.ok)
+          throwLateJoinValidationFailure(committed, options.runtime.rootId);
+        throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_ALREADY_EXISTS, "another creator committed this v2 collaboration room during open; reopen with join", { rootId: options.runtime.rootId });
+      }
+      if (current.snapshot?.meta.bootstrapState !== "pending" || current.diagnostics.length > 0) {
+        throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_CORRUPT, "prepared v2 collaboration room is no longer a valid pending room; this open did not publish content", { rootId: options.runtime.rootId });
+      }
+      const leader = readBootstrapClaims(rootConn.ydoc).find((claim) => claim.status !== "aborted");
+      if (leader?.claimerId !== expectedClaimerId || leader?.status !== "pending") {
+        throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_INITIALIZING, "another creator is initializing this v2 collaboration room", { rootId: options.runtime.rootId });
+      }
+    }
     const canonical = await buildCanonicalShardGraph({
       runtime: options.runtime,
       rootDoc: rootConn.ydoc,
@@ -483334,14 +483502,17 @@ async function buildCanonicalShardGraph(input) {
   for (const { story, shardId, bytes } of stories) {
     let unit;
     if (maySeedStoryShardsFromLocalSource && bytes) {
-      unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.story });
-      trySeedStoryShard(unit, {
-        shardId,
-        storyId: story.storyId,
-        storyKind: story.storyKind,
-        sourcePartUri: story.partUri,
-        bytes
-      });
+      unit = rootDoc.transact(() => {
+        const created = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.story });
+        trySeedStoryShard(created, {
+          shardId,
+          storyId: story.storyId,
+          storyKind: story.storyKind,
+          sourcePartUri: story.partUri,
+          bytes
+        });
+        return created;
+      }, "collab-v2:bootstrap:seed-unit");
     } else {
       await waitForStoryShardSeeded(rootDoc, shardId);
       unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.story });
@@ -483414,13 +483585,16 @@ async function buildCanonicalShardGraph(input) {
   let commentsHandle = null;
   const commentsShardId = packageShardId2(input.runtime.rootId, SHARD_KIND.comments, COMMENTS_PART_URI6);
   {
-    const unit = createCollabUnitHandle({ rootDoc, shardId: commentsShardId, shardKind: SHARD_KIND.comments });
-    if (commentsFamily != null) {
-      const commentsCatalog = buildCommentsCatalogFromParts(new Map(commentsFamily.parts.flatMap((part) => part.bytes ? [[part.partUri, part.bytes]] : [])));
-      trySeedCommentsShard(unit, commentsShardId, commentsCatalog, commentsFamily.partKeys, commentsFamily.parts);
-    } else {
-      trySeedEmptyCommentsShard(unit, commentsShardId);
-    }
+    const unit = rootDoc.transact(() => {
+      const created = createCollabUnitHandle({ rootDoc, shardId: commentsShardId, shardKind: SHARD_KIND.comments });
+      if (commentsFamily != null) {
+        const commentsCatalog = buildCommentsCatalogFromParts(new Map(commentsFamily.parts.flatMap((part) => part.bytes ? [[part.partUri, part.bytes]] : [])));
+        trySeedCommentsShard(created, commentsShardId, commentsCatalog, commentsFamily.partKeys, commentsFamily.parts);
+      } else {
+        trySeedEmptyCommentsShard(created, commentsShardId);
+      }
+      return created;
+    }, "collab-v2:bootstrap:seed-unit");
     projectionHandles.set(commentsShardId, {
       shardId: commentsShardId,
       shardKind: SHARD_KIND.comments,
@@ -483548,243 +483722,259 @@ function subtreePackageHandle(rootDoc, unit, shardKind, bootstrap) {
   };
 }
 async function connectRelationshipsShard(rootDoc, shardId, part) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.relationships });
-  if (part.bytes) {
-    const ownerPartUri2 = ownerPartUriForRels3(part.partUri);
-    const xml = TEXT_DECODER12.decode(part.bytes);
-    const parsed = parseRelationshipsXml(xml, {
-      ownerPartUri: ownerPartUri2,
-      relsUri: part.partUri,
-      resolveTarget(target, targetMode) {
-        return resolveTargetUri(ownerPartUri2, target, targetMode);
-      }
-    });
-    try {
-      seedRelationshipsShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.relationships });
+    if (part.bytes) {
+      const ownerPartUri2 = ownerPartUriForRels3(part.partUri);
+      const xml = TEXT_DECODER12.decode(part.bytes);
+      const parsed = parseRelationshipsXml(xml, {
         ownerPartUri: ownerPartUri2,
-        relationships: parsed.relationships.map((relationship) => ({
-          rId: relationship.id,
-          type: relationship.type,
-          target: relationship.target,
-          targetMode: relationship.targetMode,
-          external: relationship.targetMode === "External"
-        }))
+        relsUri: part.partUri,
+        resolveTarget(target, targetMode) {
+          return resolveTargetUri(ownerPartUri2, target, targetMode);
+        }
       });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+      try {
+        seedRelationshipsShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: ownerPartUri2,
+          relationships: parsed.relationships.map((relationship) => ({
+            rId: relationship.id,
+            type: relationship.type,
+            target: relationship.target,
+            targetMode: relationship.targetMode,
+            external: relationship.targetMode === "External"
+          }))
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.relationships);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.relationships);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectContentTypesShard(rootDoc, shardId, part) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.contentTypes });
-  if (part.bytes) {
-    const parsed = parseContentTypes(TEXT_DECODER12.decode(part.bytes));
-    try {
-      seedContentTypesShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
-        ownerPartUri: part.partUri,
-        defaults: Array.from(parsed.defaults.entries()).map(([extension2, contentType]) => ({
-          extension: extension2,
-          contentType
-        })),
-        overrides: Array.from(parsed.overrides.entries()).map(([partKey2, contentType]) => ({
-          partKey: partKey2,
-          contentType
-        }))
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.contentTypes });
+    if (part.bytes) {
+      const parsed = parseContentTypes(TEXT_DECODER12.decode(part.bytes));
+      try {
+        seedContentTypesShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: part.partUri,
+          defaults: Array.from(parsed.defaults.entries()).map(([extension2, contentType]) => ({
+            extension: extension2,
+            contentType
+          })),
+          overrides: Array.from(parsed.overrides.entries()).map(([partKey2, contentType]) => ({
+            partKey: partKey2,
+            contentType
+          }))
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.contentTypes);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.contentTypes);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectStylesShard(rootDoc, shardId, part) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.styles });
-  let bootstrap;
-  if (part.bytes) {
-    const xml = TEXT_DECODER12.decode(part.bytes);
-    const parsed = parseStylesPart3(xml);
-    bootstrap = bootstrapPartProjection(xml);
-    try {
-      seedStylesShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
-        ownerPartUri: part.partUri,
-        documentDefaults: parsed.documentDefaults,
-        styles: parsed.styles
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.styles });
+    let bootstrap;
+    if (part.bytes) {
+      const xml = TEXT_DECODER12.decode(part.bytes);
+      const parsed = parseStylesPart3(xml);
+      bootstrap = bootstrapPartProjection(xml);
+      try {
+        seedStylesShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: part.partUri,
+          documentDefaults: parsed.documentDefaults,
+          styles: parsed.styles
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.styles, bootstrap);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.styles, bootstrap);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectNumberingShard(rootDoc, shardId, part, numbering) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.numbering });
-  let bootstrap;
-  if (part.bytes) {
-    bootstrap = bootstrapPartProjection(TEXT_DECODER12.decode(part.bytes));
-  }
-  if (part.bytes && numbering.present) {
-    try {
-      seedNumberingShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
-        ownerPartUri: part.partUri,
-        abstractNums: Array.from(numbering.abstracts.values()).map((entry) => ({
-          abstractNumId: entry.abstractNumId,
-          multiLevelType: entry.multiLevelType,
-          rawXml: entry.rawXml,
-          levels: Array.from(entry.levels.values()).map((level) => ({
-            ilvl: level.ilvl,
-            numFmt: level.numFmt,
-            lvlText: level.lvlText,
-            start: level.start,
-            opaqueXml: null
-          }))
-        })),
-        nums: Array.from(numbering.instances.values()).map((entry) => ({
-          numId: entry.numId,
-          abstractNumId: entry.abstractNumId,
-          rawXml: entry.rawXml,
-          lvlOverrides: Array.from(entry.lvlOverrides.entries()).map(([ilvl, value2]) => ({
-            ilvl,
-            startOverride: value2.startOverride
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.numbering });
+    let bootstrap;
+    if (part.bytes) {
+      bootstrap = bootstrapPartProjection(TEXT_DECODER12.decode(part.bytes));
+    }
+    if (part.bytes && numbering.present) {
+      try {
+        seedNumberingShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: part.partUri,
+          abstractNums: Array.from(numbering.abstracts.values()).map((entry) => ({
+            abstractNumId: entry.abstractNumId,
+            multiLevelType: entry.multiLevelType,
+            rawXml: entry.rawXml,
+            levels: Array.from(entry.levels.values()).map((level) => ({
+              ilvl: level.ilvl,
+              numFmt: level.numFmt,
+              lvlText: level.lvlText,
+              start: level.start,
+              opaqueXml: null
+            }))
+          })),
+          nums: Array.from(numbering.instances.values()).map((entry) => ({
+            numId: entry.numId,
+            abstractNumId: entry.abstractNumId,
+            rawXml: entry.rawXml,
+            lvlOverrides: Array.from(entry.lvlOverrides.entries()).map(([ilvl, value2]) => ({
+              ilvl,
+              startOverride: value2.startOverride
+            }))
           }))
-        }))
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.numbering, bootstrap);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.numbering, bootstrap);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectSettingsShard(rootDoc, shardId, settingsPart, webSettingsPart) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.settings });
-  const settingsBootstrap = settingsPart?.bytes ? bootstrapPartProjection(TEXT_DECODER12.decode(settingsPart.bytes)) : null;
-  const webSettingsBootstrap = webSettingsPart?.bytes ? bootstrapPartProjection(TEXT_DECODER12.decode(webSettingsPart.bytes)) : null;
-  if (settingsPart?.bytes || webSettingsPart?.bytes) {
-    try {
-      seedSettingsShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: settingsPart?.partKey ?? encodeLogicalOwnerKey(SETTINGS_PART_URI7),
-        ownerPartUri: settingsPart?.partUri ?? SETTINGS_PART_URI7,
-        pairedPartKeys: [settingsPart?.partKey, webSettingsPart?.partKey].filter(Boolean),
-        settings: {
-          fields: {},
-          webFields: {},
-          opaqueXml: settingsPart?.bytes ? settingsInnerXmlWithNamespaceScope(TEXT_DECODER12.decode(settingsPart.bytes)) : null,
-          webOpaqueXml: webSettingsPart?.bytes ? settingsInnerXmlWithNamespaceScope(TEXT_DECODER12.decode(webSettingsPart.bytes)) : null
-        }
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.settings });
+    const settingsBootstrap = settingsPart?.bytes ? bootstrapPartProjection(TEXT_DECODER12.decode(settingsPart.bytes)) : null;
+    const webSettingsBootstrap = webSettingsPart?.bytes ? bootstrapPartProjection(TEXT_DECODER12.decode(webSettingsPart.bytes)) : null;
+    if (settingsPart?.bytes || webSettingsPart?.bytes) {
+      try {
+        seedSettingsShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: settingsPart?.partKey ?? encodeLogicalOwnerKey(SETTINGS_PART_URI7),
+          ownerPartUri: settingsPart?.partUri ?? SETTINGS_PART_URI7,
+          pairedPartKeys: [settingsPart?.partKey, webSettingsPart?.partKey].filter(Boolean),
+          settings: {
+            fields: {},
+            webFields: {},
+            opaqueXml: settingsPart?.bytes ? settingsInnerXmlWithNamespaceScope(TEXT_DECODER12.decode(settingsPart.bytes)) : null,
+            webOpaqueXml: webSettingsPart?.bytes ? settingsInnerXmlWithNamespaceScope(TEXT_DECODER12.decode(webSettingsPart.bytes)) : null
+          }
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.settings, {
-    sourceXml: settingsBootstrap?.sourceXml ?? null,
-    rootOpenTagXml: settingsBootstrap?.rootOpenTagXml ?? null,
-    rootCloseTagXml: settingsBootstrap?.rootCloseTagXml ?? null,
-    containerOpenTagXml: webSettingsBootstrap?.rootOpenTagXml ?? null,
-    containerCloseTagXml: webSettingsBootstrap?.rootCloseTagXml ?? null
-  });
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.settings, {
+      sourceXml: settingsBootstrap?.sourceXml ?? null,
+      rootOpenTagXml: settingsBootstrap?.rootOpenTagXml ?? null,
+      rootCloseTagXml: settingsBootstrap?.rootCloseTagXml ?? null,
+      containerOpenTagXml: webSettingsBootstrap?.rootOpenTagXml ?? null,
+      containerCloseTagXml: webSettingsBootstrap?.rootCloseTagXml ?? null
+    });
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectMediaManifestShard(rootDoc, shardId, parts, session, binaryMode) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.mediaManifest });
-  const assets = buildMediaAssets(parts, session, binaryMode);
-  if (assets.length > 0) {
-    try {
-      seedMediaManifestShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: encodeLogicalOwnerKey(MEDIA_OWNER_URI2),
-        ownerPartUri: MEDIA_OWNER_URI2,
-        assets
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.mediaManifest });
+    const assets = buildMediaAssets(parts, session, binaryMode);
+    if (assets.length > 0) {
+      try {
+        seedMediaManifestShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: encodeLogicalOwnerKey(MEDIA_OWNER_URI2),
+          ownerPartUri: MEDIA_OWNER_URI2,
+          assets
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.mediaManifest);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.mediaManifest);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectBinaryShard(rootDoc, shardId, part, assetId, binaryMode, blobStore) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.binary });
-  if (part.bytes) {
-    try {
-      const payload = prepareSingleDocBinaryPayload(part.bytes, binaryMode, blobStore);
-      seedBinaryShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
-        ownerPartUri: part.partUri,
-        assetId,
-        mode: payload.mode,
-        contentType: part.contentType ?? "",
-        ...payload.mode === BINARY_MODE.blob ? {
-          blobRef: payload.blobRef,
-          sha256: payload.sha256,
-          byteLength: payload.byteLength
-        } : {
-          bytes: payload.bytes,
-          sha256: payload.sha256
-        }
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.binary });
+    if (part.bytes) {
+      try {
+        const payload = prepareSingleDocBinaryPayload(part.bytes, binaryMode, blobStore);
+        seedBinaryShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: part.partUri,
+          assetId,
+          mode: payload.mode,
+          contentType: part.contentType ?? "",
+          ...payload.mode === BINARY_MODE.blob ? {
+            blobRef: payload.blobRef,
+            sha256: payload.sha256,
+            byteLength: payload.byteLength
+          } : {
+            bytes: payload.bytes,
+            sha256: payload.sha256
+          }
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.binary);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.binary);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 async function connectOpaqueShard(rootDoc, shardId, part, sourceZipSha256, binaryMode, blobStore) {
-  const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.opaquePart });
-  if (part.bytes) {
-    try {
-      const payload = prepareSingleDocBinaryPayload(part.bytes, binaryMode, blobStore);
-      seedOpaquePartShard({
-        doc: unit,
-        shardId,
-        ownerPartKey: part.partKey,
-        ownerPartUri: part.partUri,
-        partKey: part.partKey,
-        partUri: part.partUri,
-        contentType: part.contentType,
-        mode: payload.mode,
-        ...payload.mode === BINARY_MODE.blob ? {
-          blobRef: payload.blobRef,
-          sha256: payload.sha256,
-          byteLength: payload.byteLength
-        } : {
-          bytes: payload.bytes,
-          sha256: payload.sha256
-        },
-        sourceProvenance: {
-          sha256Zip: sourceZipSha256,
-          committedAt: null,
-          committerId: null
-        }
-      });
-    } catch (error50) {
-      if (!isAlreadySeededError(error50))
-        throw error50;
+  return rootDoc.transact(() => {
+    const unit = createCollabUnitHandle({ rootDoc, shardId, shardKind: SHARD_KIND.opaquePart });
+    if (part.bytes) {
+      try {
+        const payload = prepareSingleDocBinaryPayload(part.bytes, binaryMode, blobStore);
+        seedOpaquePartShard({
+          doc: unit,
+          shardId,
+          ownerPartKey: part.partKey,
+          ownerPartUri: part.partUri,
+          partKey: part.partKey,
+          partUri: part.partUri,
+          contentType: part.contentType,
+          mode: payload.mode,
+          ...payload.mode === BINARY_MODE.blob ? {
+            blobRef: payload.blobRef,
+            sha256: payload.sha256,
+            byteLength: payload.byteLength
+          } : {
+            bytes: payload.bytes,
+            sha256: payload.sha256
+          },
+          sourceProvenance: {
+            sha256Zip: sourceZipSha256,
+            committedAt: null,
+            committerId: null
+          }
+        });
+      } catch (error50) {
+        if (!isAlreadySeededError(error50))
+          throw error50;
+      }
     }
-  }
-  return subtreePackageHandle(rootDoc, unit, SHARD_KIND.opaquePart);
+    return subtreePackageHandle(rootDoc, unit, SHARD_KIND.opaquePart);
+  }, "collab-v2:bootstrap:seed-unit");
 }
 function storyProjectionHandle(handle) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.9.0-next.10",
+  "version": "1.9.0-next.12",
   "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.22.0-next.10",
+    "@superdoc/sdk": "2.22.0-next.12",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.25.0-next.10",
-    "@superdoc/docx-engine": "0.24.0-next.10",
+    "superdoc": "2.25.0-next.12",
+    "@superdoc/docx-engine": "0.24.0-next.12",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",