@superdoc/mcp 1.2.1-next.1 → 1.2.1-next.2

package/dist/index.js

@@ -31314,7 +31314,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.15.1-next.1";
+var SDK_VERSION = "2.15.1-next.2";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -140090,7 +140090,9 @@ function markFullParagraphInsertions(xml, fragments, structural, index, namespac
       continue;
     const structuralInParagraph = structuralByParagraph.get(`${paragraph.start}:${paragraph.end}`) ?? [];
     const terminalDeletionOfPendingInsertion = marker.structuralKind === "paragraph-mark-insertion" && structuralInParagraph.length === 2 && structuralInParagraph[0] === marker && structuralInParagraph[1]?.structuralKind === "paragraph-mark-deletion";
-    if (structuralInParagraph.length !== 1 && !terminalDeletionOfPendingInsertion)
+    const extraStructural = structuralInParagraph.filter((fragment2) => fragment2 !== marker);
+    const extrasArePasteObjects = extraStructural.every((fragment2) => fragment2.structuralKind === "footnote-insertion" || fragment2.structuralKind === "endnote-insertion" || fragment2.structuralKind === "image-insertion" || fragment2.structuralKind === "field-insertion");
+    if (structuralInParagraph.length !== 1 && !terminalDeletionOfPendingInsertion && !(extraStructural.length > 0 && extrasArePasteObjects))
       continue;
     const paragraphFragments = (fragmentsByParagraphStart.get(paragraph.start) ?? []).filter((candidate) => candidate.byteStart >= paragraph.openEnd && candidate.byteEnd <= paragraph.closeStart).sort((left, right) => left.byteStart - right.byteStart);
     const markerIdentity = buildReviewIdentity({
@@ -168023,10 +168025,13 @@ function projectWordLikeReviewGroupsWithLookupContext(lookupContext, input) {
     const partXml = input.partXmlByUri.get(partUri);
     if (!partXml)
       continue;
-    if (isBodyStoryId(storyId)) {
+    if (isBodyStoryId(storyId) || isNotesStoryId(storyId)) {
       projectStoryReviewGroups(lookupContext, storyId, partUri, partXml, entries, input);
     }
     projectFullParagraphInsertions(lookupContext, storyId, partUri, partXml, entries, input);
+    if (isBodyStoryId(storyId) || isNotesStoryId(storyId)) {
+      foldSameRsidPastedParagraphParents(storyId, partXml, input);
+    }
   }
 }
 function projectFullParagraphInsertions(lookupContext, storyId, partUri, partXml, entries, input) {
@@ -168190,6 +168195,230 @@ function materializeFullParagraphInsertion(lookupContext, args) {
   for (const fragment2 of objectFragments)
     input.structuralKeyToLogicalId.set(fragment2.entityKey, id);
 }
+function foldSameRsidPastedParagraphParents(storyId, partXml, input) {
+  const storyEntries = input.byStory.get(storyId);
+  if (!storyEntries)
+    return;
+  const parents = storyEntries.filter((entry) => isFoldablePastedParagraphParent(entry)).sort((left, right) => left.documentOrderStart - right.documentOrderStart);
+  if (parents.length < 2)
+    return;
+  const clusters = [];
+  let current = [];
+  const flush = () => {
+    if (current.length >= 2)
+      clusters.push(current);
+    current = [];
+  };
+  for (const parent of parents) {
+    const previous = current.at(-1);
+    if (!previous) {
+      current = [parent];
+      continue;
+    }
+    if (canFoldPastedParagraphParents(partXml, previous, parent, storyEntries)) {
+      current.push(parent);
+      continue;
+    }
+    flush();
+    current = [parent];
+  }
+  flush();
+  for (const cluster of clusters) {
+    mergePastedParagraphParents(storyId, partXml, cluster, input);
+  }
+}
+function isFoldablePastedParagraphParent(entry) {
+  const kind = entry.reviewGroup?.kind;
+  return entry.reviewGroup?.role === "parent" && (kind === "word-full-paragraph-insertion" || kind === "word-inserted-paragraph-range") && entry.subtype !== "table-split" && entry.subtype !== "image-insertion" && entry.subtype !== "list-item-insertion" && entry.subtype !== "field-insertion" && !entry.reviewGroup?.members.some((member) => member.subtype === "field-insertion") && pastedParagraphParentRsid(entry) != null;
+}
+function pastedParagraphParentRsid(entry) {
+  const mark = entry.structuralFragments.find((fragment2) => fragment2.structuralKind === "paragraph-mark-insertion" || fragment2.structuralKind === "paragraph-insertion");
+  const rsid = mark?.enclosingParagraphRsid ?? entry.sourceIds.rsids[0];
+  return rsid ? rsid.toUpperCase() : null;
+}
+function pastedParagraphParentBounds(entry) {
+  const marks = entry.structuralFragments.filter((fragment2) => fragment2.structuralKind === "paragraph-mark-insertion" || fragment2.structuralKind === "paragraph-insertion");
+  const starts = marks.map((fragment2) => fragment2.enclosingElementStart).filter((value) => value != null);
+  const ends = marks.map((fragment2) => fragment2.enclosingElementEnd).filter((value) => value != null);
+  if (starts.length === 0 || ends.length === 0)
+    return null;
+  return { start: Math.min(...starts), end: Math.max(...ends) };
+}
+function canFoldPastedParagraphParents(partXml, previous, next, storyEntries) {
+  if (pastedParagraphParentRsid(previous) !== pastedParagraphParentRsid(next))
+    return false;
+  if (previous.subtype !== next.subtype)
+    return false;
+  if (!isSameReviewGroupIdentity(buildReviewIdentity({
+    name: previous.author.name,
+    email: previous.authorEmail,
+    initials: previous.author.initials
+  }), buildReviewIdentity({
+    name: next.author.name,
+    email: next.authorEmail,
+    initials: next.author.initials
+  }))) {
+    return false;
+  }
+  const previousBounds = pastedParagraphParentBounds(previous);
+  const nextBounds = pastedParagraphParentBounds(next);
+  if (!previousBounds || !nextBounds || nextBounds.start < previousBounds.end)
+    return false;
+  const stripped = partXml.slice(previousBounds.end, nextBounds.start).replace(/<\/?[\w.-]+:(?:footnote|endnote)\b[^>]*>/g, "");
+  if (!isCleanGapXml(stripped))
+    return false;
+  return !hasInterveningVisibleReviewable(previous, next, storyEntries);
+}
+function hasInterveningVisibleReviewable(previous, next, storyEntries) {
+  const spanStart = Math.min(previous.documentOrderStart, next.documentOrderStart);
+  const spanEnd = Math.max(previous.documentOrderEnd, next.documentOrderEnd);
+  const ownedIds = new Set([
+    previous.id,
+    next.id,
+    ...previous.reviewGroup?.ownedChildIds ?? [],
+    ...next.reviewGroup?.ownedChildIds ?? []
+  ]);
+  for (const entry of storyEntries) {
+    if (ownedIds.has(entry.id))
+      continue;
+    if (entry.reviewGroup?.role === "child")
+      continue;
+    if (entry.subsumption?.role === "child")
+      continue;
+    if (entry.documentOrderStart > spanStart && entry.documentOrderStart < spanEnd) {
+      return true;
+    }
+  }
+  return false;
+}
+function mergePastedParagraphParents(storyId, partXml, cluster, input) {
+  const head = cluster[0];
+  const memberEntries = [];
+  const seenMemberIds = new Set;
+  const addMember = (entry) => {
+    if (!entry || seenMemberIds.has(entry.id))
+      return;
+    seenMemberIds.add(entry.id);
+    memberEntries.push(entry);
+  };
+  for (const parent2 of cluster) {
+    for (const childId of parent2.reviewGroup?.ownedChildIds ?? []) {
+      addMember(input.byId.get(childId));
+    }
+  }
+  if (memberEntries.length === 0 || memberEntries.some((entry) => entry.reviewGroup?.role === "child" && cluster.every((parent2) => parent2.id !== entry.reviewGroup?.parentId))) {
+    return;
+  }
+  const textFragments = uniqueFragments(cluster.flatMap((parent2) => parent2.fragments));
+  const structuralFragments = uniqueStructuralFragments(cluster.flatMap((parent2) => parent2.structuralFragments)).sort((left, right) => left.byteStart - right.byteStart);
+  const members = cluster.flatMap((parent2) => parent2.reviewGroup?.members ?? []);
+  const rsids = uniqueNonEmptyStrings(cluster.flatMap((parent2) => parent2.sourceIds.rsids));
+  const memberWordIds = uniqueNonEmptyStrings([
+    ...cluster.flatMap((parent2) => [
+      parent2.sourceIds.wordIdInsert ?? "",
+      ...parent2.sourceIds.wordIdOther
+    ]),
+    ...members.map((member) => member.wordId ?? "")
+  ]);
+  const wordIdInsert = head.sourceIds.wordIdInsert ?? memberWordIds[0];
+  const wordIdOther = memberWordIds.filter((id) => id !== wordIdInsert);
+  const canonicalText = cluster.map((parent2) => {
+    const text = parent2.after.text ?? "";
+    return text.endsWith(`
+`) ? text : `${text}
+`;
+  }).join("");
+  const markParagraphIds = cluster.map((parent2) => {
+    const start = parent2.structuralFragments.find((fragment2) => fragment2.structuralKind === "paragraph-mark-insertion")?.enclosingElementStart;
+    return start != null ? readParagraphIdAt(partXml, start) : null;
+  });
+  const markKey = markParagraphIds.every((paraId) => paraId != null) ? markParagraphIds.map((paraId) => `p:${paraId}`).join(",") : cluster.map((parent2) => parent2.id).join(",");
+  const identityKey = buildGroupIdentityKey(buildReviewIdentity({
+    name: head.author.name,
+    email: head.authorEmail,
+    initials: head.author.initials
+  }));
+  const groupHash = hashGroupKey(["word-inserted-paragraph-range", storyId, identityKey, `pm:${markKey}`, `tx:${textFragments.length}`].join("|"));
+  const groupId = buildLogicalId(storyId, "ins", "word-paragraph-range", groupHash);
+  const noteIds = uniqueNonEmptyStrings(cluster.flatMap((entry) => ownedNoteIds(entry)));
+  const parent = {
+    ...head,
+    id: groupId,
+    type: "insertion",
+    subtype: "text-insertion",
+    documentOrderStart: Math.min(...cluster.map((entry) => entry.documentOrderStart)),
+    documentOrderEnd: Math.max(...cluster.map((entry) => entry.documentOrderEnd)),
+    noteId: noteIds[0] ?? cluster.find((entry) => entry.noteId != null)?.noteId ?? head.noteId,
+    noteIds: noteIds.length > 0 ? noteIds : null,
+    sourceIds: { wordIdInsert, wordIdOther, rsids },
+    revisionGroupId: groupId,
+    after: { text: canonicalText },
+    contributingRsids: rsids,
+    fragments: textFragments,
+    structuralFragments,
+    structuralDelta: null,
+    excerpt: canonicalText,
+    reviewGroup: {
+      kind: "word-inserted-paragraph-range",
+      role: "parent",
+      parentId: null,
+      ownedChildIds: memberEntries.map((entry) => entry.id),
+      duplicateDisplayPolicy: "subsumed",
+      members
+    }
+  };
+  for (const entry of memberEntries) {
+    const mutable = entry;
+    mutable.reviewGroup = {
+      kind: "word-inserted-paragraph-range",
+      role: "child",
+      parentId: groupId,
+      ownedChildIds: [],
+      duplicateDisplayPolicy: "subsumed",
+      members: []
+    };
+    mutable.revisionGroupId = groupId;
+  }
+  const storyArr = input.byStory.get(storyId);
+  if (!storyArr)
+    return;
+  for (const dissolved of cluster) {
+    input.byId.delete(dissolved.id);
+    const index = storyArr.indexOf(dissolved);
+    if (index >= 0)
+      storyArr.splice(index, 1);
+  }
+  input.byId.set(groupId, parent);
+  storyArr.push(parent);
+  for (const fragment2 of textFragments)
+    input.rsidToLogicalId.set(fragment2.rsid, groupId);
+  for (const fragment2 of structuralFragments)
+    input.structuralKeyToLogicalId.set(fragment2.entityKey, groupId);
+}
+function uniqueFragments(fragments) {
+  const seen = new Set;
+  const out = [];
+  for (const fragment2 of fragments) {
+    const key2 = `${fragment2.byteStart}:${fragment2.byteEnd}:${fragment2.rsid}`;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    out.push(fragment2);
+  }
+  return out;
+}
+function uniqueStructuralFragments(fragments) {
+  const seen = new Set;
+  const out = [];
+  for (const fragment2 of fragments) {
+    const key2 = fragment2.entityKey;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    out.push(fragment2);
+  }
+  return out;
+}
 function classifyFullParagraphInsertion(lookupContext, partXml, paragraphStart, paragraphEnd, paragraphXml) {
   const parent = findImmediateParentElementAtPosition(partXml, paragraphStart, lookupContext);
   if (parent) {
@@ -168385,14 +168614,19 @@ function buildTrackedFieldLocationKey(lookupContext, partXml, fragment2) {
 function extractDeletionText(deletion, partXml) {
   return deletion.fragments.map((fragment2) => extractVisibleTextFromXml(partXml.slice(fragment2.byteStart, fragment2.byteEnd), "del")).join("");
 }
+function isAbsorbableInlineObjectInsertion(entry, fragment2) {
+  const kind = entry.subtype;
+  return (kind === "footnote-insertion" || kind === "endnote-insertion" || kind === "image-insertion" || kind === "field-insertion") && fragment2.structuralKind === kind && entry.reviewGroup == null && entry.subsumption == null;
+}
 function projectStoryReviewGroups(lookupContext, storyId, partUri, partXml, entries, input) {
   const markCandidates = collectMarkCandidates(storyId, partXml, entries);
   if (markCandidates.candidatesByParagraphStart.size === 0)
     return;
-  const textCandidates = collectTextCandidates(lookupContext, partXml, entries);
+  const textCandidates = collectTextCandidates(lookupContext, partXml, entries, storyId);
   if (textCandidates.length === 0)
     return;
-  const paragraphs = buildParagraphInfos(lookupContext, partXml, markCandidates, textCandidates);
+  const objectCandidates = collectObjectCandidates(lookupContext, partXml, entries);
+  const paragraphs = buildParagraphInfos(lookupContext, partXml, markCandidates, textCandidates, objectCandidates);
   if (paragraphs.length === 0)
     return;
   const atoms = buildAtomSequence(partXml, paragraphs);
@@ -168403,17 +168637,33 @@ function projectStoryReviewGroups(lookupContext, storyId, partUri, partXml, entr
     }
   }
 }
-function splitDistinctFullParagraphRuns(run) {
-  const members = run.filter((atom) => atom.kind !== "blocker");
-  const fullParagraphRsidsByStart = new Map(members.flatMap((atom) => {
+function paragraphRunHasImageInsertion(paragraphRun) {
+  return paragraphRun.some((atom) => atom.kind === "object" && atom.candidate.entry.subtype === "image-insertion");
+}
+function paragraphRunFullParagraphRsid(paragraphRun) {
+  for (const atom of paragraphRun) {
     if (atom.kind !== "mark" || atom.candidate.fragment.fullParagraphInsertion !== true)
-      return [];
+      continue;
     const rsid = atom.candidate.fragment.enclosingParagraphRsid;
-    return rsid ? [[atom.candidate.paragraphStart, rsid.toUpperCase()]] : [];
-  }));
-  if (fullParagraphRsidsByStart.size <= 1 || new Set(fullParagraphRsidsByStart.values()).size <= 1) {
-    return [run];
+    return rsid ? rsid.toUpperCase() : null;
+  }
+  return null;
+}
+function paragraphRunIsFullParagraphInsertion(paragraphRun) {
+  return paragraphRun.some((atom) => atom.kind === "mark" && atom.candidate.fragment.fullParagraphInsertion === true);
+}
+function canContinueFullParagraphRun(currentRun, nextParagraphRun, currentRsid, nextRsid, anyStampedFullParagraph) {
+  if (paragraphRunHasImageInsertion(currentRun) !== paragraphRunHasImageInsertion(nextParagraphRun)) {
+    return false;
   }
+  if (!anyStampedFullParagraph)
+    return true;
+  if (currentRsid == null || nextRsid == null)
+    return false;
+  return currentRsid === nextRsid;
+}
+function splitDistinctFullParagraphRuns(run) {
+  const members = run.filter((atom) => atom.kind !== "blocker");
   const paragraphRuns = [];
   for (const member of members) {
     const current = paragraphRuns.at(-1);
@@ -168423,6 +168673,11 @@ function splitDistinctFullParagraphRuns(run) {
       paragraphRuns.push([member]);
     }
   }
+  const fullParagraphRuns = paragraphRuns.filter(paragraphRunIsFullParagraphInsertion);
+  if (fullParagraphRuns.length <= 1) {
+    return [run];
+  }
+  const anyStampedFullParagraph = fullParagraphRuns.some((paragraphRun) => paragraphRunFullParagraphRsid(paragraphRun) != null);
   const projectedRuns = [];
   let currentRun = [];
   let currentRsid = null;
@@ -168434,9 +168689,7 @@ function splitDistinctFullParagraphRuns(run) {
     currentRsid = null;
   };
   for (const paragraphRun of paragraphRuns) {
-    const paragraphStart = paragraphRun[0].candidate.paragraphStart;
-    const paragraphRsid = fullParagraphRsidsByStart.get(paragraphStart) ?? null;
-    if (paragraphRsid === null) {
+    if (!paragraphRunIsFullParagraphInsertion(paragraphRun)) {
       if (currentRsid !== null && paragraphRun.every((atom) => atom.kind === "text")) {
         currentRun.push(...paragraphRun);
         continue;
@@ -168445,14 +168698,19 @@ function splitDistinctFullParagraphRuns(run) {
       currentRun = [...paragraphRun];
       continue;
     }
-    if (currentRsid === paragraphRsid) {
+    const paragraphRsid = paragraphRunFullParagraphRsid(paragraphRun);
+    if (currentRun.length > 0 && canContinueFullParagraphRun(currentRun, paragraphRun, currentRsid, paragraphRsid, anyStampedFullParagraph)) {
       currentRun.push(...paragraphRun);
+      if (currentRsid == null)
+        currentRsid = paragraphRsid;
       continue;
     }
-    if (currentRsid === null && currentRun.every((atom) => atom.kind === "mark")) {
-      currentRsid = paragraphRsid;
-      currentRun = [...currentRun, ...paragraphRun];
-      continue;
+    if (currentRsid === null && currentRun.length > 0 && currentRun.every((atom) => atom.kind === "mark")) {
+      if (canContinueFullParagraphRun(currentRun, paragraphRun, paragraphRsid, paragraphRsid, anyStampedFullParagraph)) {
+        currentRsid = paragraphRsid;
+        currentRun = [...currentRun, ...paragraphRun];
+        continue;
+      }
     }
     flushCurrentRun();
     currentRsid = paragraphRsid;
@@ -168473,10 +168731,10 @@ function collectMarkCandidates(storyId, partXml, entries) {
         continue;
       if (fragment2.enclosingElementStart === undefined || fragment2.enclosingElementEnd === undefined)
         continue;
-      const isCandidateShape = entry.subtype === "paragraph-mark-insertion" && fragment2.structuralKind === "paragraph-mark-insertion" && entry.structuralFragments.length === 1 && entry.noteId == null && entry.subsumption == null && entry.reviewGroup == null;
+      const isCandidateShape = entry.subtype === "paragraph-mark-insertion" && fragment2.structuralKind === "paragraph-mark-insertion" && entry.structuralFragments.length === 1 && (entry.noteId == null || isNotesStoryId(storyId)) && entry.subsumption == null && entry.reviewGroup == null;
       if (isCandidateShape) {
         markFragments.push({ entry, fragment: fragment2 });
-      } else if (isTerminalDeletionOfPendingFullParagraphInsertion(fragment2, entries)) {} else {
+      } else if (isTerminalDeletionOfPendingFullParagraphInsertion(fragment2, entries)) {} else if (isAbsorbableInlineObjectInsertion(entry, fragment2)) {} else {
         blockedParagraphStarts.add(fragment2.enclosingElementStart);
       }
     }
@@ -168517,12 +168775,12 @@ function isTerminalDeletionOfPendingFullParagraphInsertion(fragment2, entries) {
   const markers = entries.flatMap((entry) => entry.structuralFragments).filter((candidate2) => candidate2.enclosingElementStart === paragraphStart && candidate2.enclosingElementEnd === paragraphEnd && (candidate2.structuralKind === "paragraph-mark-insertion" || candidate2.structuralKind === "paragraph-mark-deletion")).sort((left, right) => left.byteStart - right.byteStart);
   return markers.length === 2 && markers[0]?.structuralKind === "paragraph-mark-insertion" && markers[0].fullParagraphInsertion === true && markers[1] === fragment2;
 }
-function collectTextCandidates(lookupContext, partXml, entries) {
+function collectTextCandidates(lookupContext, partXml, entries, storyId) {
   const out = [];
   for (const entry of entries) {
     if (entry.type !== "insertion" || entry.subtype !== "text-insertion")
       continue;
-    if (entry.noteId != null)
+    if (entry.noteId != null && !isNotesStoryId(storyId))
       continue;
     if (entry.sides || entry.movePair)
       continue;
@@ -168567,14 +168825,60 @@ function collectTextCandidates(lookupContext, partXml, entries) {
   }
   return out;
 }
+function collectObjectCandidates(lookupContext, partXml, entries) {
+  const out = [];
+  for (const entry of entries) {
+    if (entry.type !== "structural")
+      continue;
+    if (entry.sides || entry.movePair)
+      continue;
+    if (entry.subsumption || entry.reviewGroup)
+      continue;
+    if (entry.structuralFragments.length === 0)
+      continue;
+    if (!entry.structuralFragments.every((fragment2) => isAbsorbableInlineObjectInsertion(entry, fragment2))) {
+      continue;
+    }
+    let paragraphStart = null;
+    let eligible = true;
+    for (const fragment2 of entry.structuralFragments) {
+      const paragraph = findEnclosingElementAtPosition(partXml, fragment2.byteStart, "p", undefined, lookupContext);
+      if (!paragraph) {
+        eligible = false;
+        break;
+      }
+      if (paragraphStart == null)
+        paragraphStart = paragraph.start;
+      if (paragraph.start !== paragraphStart) {
+        eligible = false;
+        break;
+      }
+    }
+    if (!eligible || paragraphStart == null)
+      continue;
+    const headFragment = entry.structuralFragments[0];
+    out.push({
+      entry,
+      fragments: [...entry.structuralFragments].sort((a, b) => a.byteStart - b.byteStart),
+      paragraphStart,
+      identity: buildReviewIdentity({
+        name: entry.author.name,
+        email: entry.authorEmail ?? headFragment.authorEmail,
+        initials: entry.author.initials
+      }),
+      initials: entry.author.initials
+    });
+  }
+  return out;
+}
 function isSimpleInlineInsertionWrapper(wrapperXml) {
   const innerMatch = /^<[\w.-]+:ins\b[^>]*>([\s\S]*)<\/[\w.-]+:ins>\s*$/.exec(wrapperXml);
   if (!innerMatch)
     return false;
   const inner = innerMatch[1] ?? "";
-  return !/<[\w.-]+:(?:ins|del|moveFrom|moveTo|drawing|tbl|p|fldSimple|fldChar|sdt|footnoteReference|endnoteReference|commentReference)\b/.test(inner);
+  return !/<[\w.-]+:(?:ins|del|moveFrom|moveTo)\b/.test(inner);
 }
-function buildParagraphInfos(lookupContext, partXml, marks, textCandidates) {
+function buildParagraphInfos(lookupContext, partXml, marks, textCandidates, objectCandidates = []) {
   const byStart = new Map;
   const ensure = (start, end) => {
     let info = byStart.get(start);
@@ -168585,6 +168889,7 @@ function buildParagraphInfos(lookupContext, partXml, marks, textCandidates) {
         mark: null,
         markBlocked: marks.blockedParagraphStarts.has(start),
         textFragments: [],
+        objectFragments: [],
         invalid: false
       };
       byStart.set(start, info);
@@ -168604,17 +168909,28 @@ function buildParagraphInfos(lookupContext, partXml, marks, textCandidates) {
       info.textFragments.push({ candidate: candidate2, fragment: fragment2 });
     }
   }
+  for (const candidate2 of objectCandidates) {
+    const paragraph = findEnclosingElementAtPosition(partXml, candidate2.fragments[0].byteStart, "p", undefined, lookupContext);
+    if (!paragraph)
+      continue;
+    const info = ensure(paragraph.start, paragraph.end);
+    for (const fragment2 of candidate2.fragments) {
+      info.objectFragments.push({ candidate: candidate2, fragment: fragment2 });
+    }
+  }
   const paragraphs = Array.from(byStart.values()).sort((a, b) => a.start - b.start);
   for (const paragraph of paragraphs) {
     paragraph.textFragments.sort((a, b) => a.fragment.byteStart - b.fragment.byteStart);
+    paragraph.objectFragments.sort((a, b) => a.fragment.byteStart - b.fragment.byteStart);
     paragraph.invalid = !isEligibleGroupParagraph(lookupContext, partXml, paragraph);
   }
   return paragraphs;
 }
 function isEligibleGroupParagraph(lookupContext, partXml, paragraph) {
   const parent = findImmediateParentElementAtPosition(partXml, paragraph.start, lookupContext);
-  if (!parent || parent.localName !== "body")
+  if (!parent || parent.localName !== "body" && parent.localName !== "footnote" && parent.localName !== "endnote") {
     return false;
+  }
   const paragraphXml = partXml.slice(paragraph.start, paragraph.end);
   const pPrXml = readLeadingParagraphPropertyBlock(paragraphXml)?.xml ?? "";
   if (pPrXml && /<[\w.-]+:sectPr\b/.test(pPrXml))
@@ -168659,7 +168975,7 @@ function buildAtomSequence(partXml, paragraphs) {
   for (const paragraph of paragraphs) {
     if (previous) {
       const between = partXml.slice(previous.end, paragraph.start);
-      if (!isCleanGapXml(between))
+      if (!isCleanGroupingGap(between, previous, paragraph))
         atoms.push({ kind: "blocker" });
     }
     previous = paragraph;
@@ -168729,17 +169045,21 @@ function appendParagraphAtoms(partXml, paragraph, atoms, hyperlinkTags) {
     return isCleanGapXml(gap + partXml.slice(cursor2, end));
   };
   let cursor = contentStart;
-  for (const { candidate: candidate2, fragment: fragment2 } of paragraph.textFragments) {
-    if (fragment2.byteStart < cursor || fragment2.byteEnd > contentEnd) {
+  const contentAtoms = [
+    ...paragraph.textFragments.map(({ candidate: candidate2, fragment: fragment2 }) => ({ kind: "text", candidate: candidate2, fragment: fragment2 })),
+    ...paragraph.objectFragments.map(({ candidate: candidate2, fragment: fragment2 }) => ({ kind: "object", candidate: candidate2, fragment: fragment2 }))
+  ].sort((left, right) => left.fragment.byteStart - right.fragment.byteStart);
+  for (const atom of contentAtoms) {
+    if (atom.fragment.byteStart < cursor || atom.fragment.byteEnd > contentEnd) {
       atoms.push({ kind: "blocker" });
-      cursor = Math.max(cursor, fragment2.byteEnd);
+      cursor = Math.max(cursor, atom.fragment.byteEnd);
       continue;
     }
-    if (!cleanGap(cursor, fragment2.byteStart)) {
+    if (!cleanGap(cursor, atom.fragment.byteStart)) {
       atoms.push({ kind: "blocker" });
     }
-    atoms.push({ kind: "text", candidate: candidate2, fragment: fragment2 });
-    cursor = fragment2.byteEnd;
+    atoms.push(atom);
+    cursor = atom.fragment.byteEnd;
   }
   if (!cleanGap(cursor, contentEnd)) {
     atoms.push({ kind: "blocker" });
@@ -168757,6 +169077,16 @@ function isCleanGapXml(xml) {
     return false;
   return containsOnlyAllowedPairingMarkers(xml);
 }
+function isCleanGroupingGap(between, previous, next) {
+  const stripped = between.replace(/<\/?[\w.-]+:(?:footnote|endnote)\b[^>]*>/g, "");
+  if (!isCleanGapXml(stripped))
+    return false;
+  if (stripped === between)
+    return true;
+  const left = previous.mark?.fragment.enclosingParagraphRsid;
+  const right = next.mark?.fragment.enclosingParagraphRsid;
+  return Boolean(left && right && left.toUpperCase() === right.toUpperCase());
+}
 function collectSameIdentityRuns(atoms) {
   const runs = [];
   let current = [];
@@ -168791,17 +169121,17 @@ function isSameGroupIdentity(a, b) {
 function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, input) {
   const textAtoms = run.filter((atom) => atom.kind === "text");
   const markAtoms = run.filter((atom) => atom.kind === "mark");
+  const objectAtoms = run.filter((atom) => atom.kind === "object");
   if (textAtoms.length === 0 || markAtoms.length === 0)
     return;
   const carrierParagraphStarts = new Set([
     ...textAtoms.map((atom) => atom.candidate.paragraphStart),
+    ...objectAtoms.map((atom) => atom.candidate.paragraphStart),
     ...markAtoms.map((atom) => atom.candidate.paragraphStart)
   ]);
-  const fullParagraphStarts = new Set(markAtoms.filter((atom) => atom.candidate.fragment.fullParagraphInsertion === true && atom.candidate.fragment.enclosingParagraphRsid !== undefined).map((atom) => atom.candidate.paragraphStart));
-  let listInsertion;
-  if ([...carrierParagraphStarts].every((paragraphStart) => fullParagraphStarts.has(paragraphStart))) {
-    if (markAtoms.length !== 1)
-      return;
+  const fullParagraphStarts = new Set(markAtoms.filter((atom) => atom.candidate.fragment.fullParagraphInsertion === true).map((atom) => atom.candidate.paragraphStart));
+  let fullParagraphOwner;
+  if (markAtoms.length === 1 && [...carrierParagraphStarts].every((paragraphStart) => fullParagraphStarts.has(paragraphStart))) {
     const marker = markAtoms[0].candidate.fragment;
     const paragraphStart = marker.enclosingElementStart;
     const paragraphEnd = marker.enclosingElementEnd;
@@ -168811,12 +169141,12 @@ function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, i
     const subtype = classifyFullParagraphInsertion(lookupContext, partXml, paragraphStart, paragraphEnd, paragraphXml).subtype;
     if (subtype === "table-split")
       return;
-    if (subtype === "list-item-insertion") {
+    if (subtype === "list-item-insertion" || objectAtoms.length > 0) {
       const candidate2 = markAtoms[0].candidate;
-      const ownsStructuralContent = input.byStory.get(storyId)?.some((entry) => entry.type === "structural" && entry !== candidate2.entry && entry.structuralFragments.some((fragment2) => fragment2.byteStart >= paragraphStart && fragment2.byteEnd <= paragraphEnd));
+      const ownsStructuralContent = input.byStory.get(storyId)?.some((entry) => entry.type === "structural" && entry !== candidate2.entry && !objectAtoms.some((atom) => atom.candidate.entry === entry) && entry.structuralFragments.some((fragment2) => fragment2.byteStart >= paragraphStart && fragment2.byteEnd <= paragraphEnd));
       if (ownsStructuralContent)
         return;
-      listInsertion = candidate2;
+      fullParagraphOwner = candidate2;
     }
   }
   const memberEntries = [];
@@ -168839,15 +169169,15 @@ function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, i
   const markKey = markParagraphIds.every((paraId) => paraId != null) ? markParagraphIds.map((paraId) => `p:${paraId}`).join(",") : markOrdinals.join(",");
   const groupHash = hashGroupKey(["word-inserted-paragraph-range", storyId, identityKey, `pm:${markKey}`, `tx:${textAtoms.length}`].join("|"));
   const groupId = buildLogicalId(storyId, "ins", "word-paragraph-range", groupHash);
-  if (listInsertion) {
+  if (fullParagraphOwner) {
     materializeFullParagraphInsertion(lookupContext, {
       storyId,
       partUri,
       partXml,
-      structuralEntry: listInsertion.entry,
-      marker: listInsertion.fragment,
+      structuralEntry: fullParagraphOwner.entry,
+      marker: fullParagraphOwner.fragment,
       textEntries: uniqueEntries(textAtoms.map((atom) => atom.candidate.entry)),
-      objectEntries: [],
+      objectEntries: uniqueEntries(objectAtoms.map((atom) => atom.candidate.entry)),
       logicalId: groupId,
       input
     });
@@ -168855,8 +169185,11 @@ function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, i
   }
   const canonicalText = buildCanonicalGroupText(partXml, run);
   const fragments = textAtoms.map((atom) => atom.fragment);
-  const structuralFragments = markAtoms.map((atom) => atom.candidate.fragment);
-  const semanticPositions = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "text" ? { start: atom.fragment.byteStart, end: atom.fragment.byteEnd } : { start: atom.candidate.paragraphEnd, end: atom.candidate.paragraphEnd });
+  const structuralFragments = [
+    ...objectAtoms.map((atom) => atom.fragment),
+    ...markAtoms.map((atom) => atom.candidate.fragment)
+  ].sort((left, right) => left.byteStart - right.byteStart);
+  const semanticPositions = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "mark" ? { start: atom.candidate.paragraphEnd, end: atom.candidate.paragraphEnd } : { start: atom.fragment.byteStart, end: atom.fragment.byteEnd });
   const documentOrderStart = Math.min(...semanticPositions.map((position) => position.start));
   const documentOrderEnd = Math.max(...semanticPositions.map((position) => position.end));
   const textEntries = uniqueEntries(textAtoms.map((atom) => atom.candidate.entry));
@@ -168872,26 +169205,45 @@ function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, i
     ...structuralFragments.map((fragment2) => fragment2.date)
   ]);
   const headEntry = memberEntries[0];
-  const members = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "text" ? {
-    logicalId: atom.candidate.entry.id,
-    carrier: "text",
-    partUri,
-    storyId,
-    rsid: atom.fragment.rsid,
-    ...atom.fragment.wId ? { wordId: atom.fragment.wId } : {},
-    subtype: "text-insertion",
-    byteStart: atom.fragment.byteStart,
-    byteEnd: atom.fragment.byteEnd
-  } : {
-    logicalId: atom.candidate.entry.id,
-    carrier: "structural",
-    partUri,
-    storyId,
-    entityKey: atom.candidate.fragment.entityKey,
-    ...atom.candidate.fragment.wId ? { wordId: atom.candidate.fragment.wId } : {},
-    subtype: "paragraph-mark-insertion",
-    byteStart: atom.candidate.fragment.byteStart,
-    byteEnd: atom.candidate.fragment.byteEnd
+  const ownedNotes = uniqueNonEmptyStrings(memberEntries.flatMap((entry) => ownedNoteIds(entry)));
+  const members = run.filter((atom) => atom.kind !== "blocker").map((atom) => {
+    if (atom.kind === "text") {
+      return {
+        logicalId: atom.candidate.entry.id,
+        carrier: "text",
+        partUri,
+        storyId,
+        rsid: atom.fragment.rsid,
+        ...atom.fragment.wId ? { wordId: atom.fragment.wId } : {},
+        subtype: "text-insertion",
+        byteStart: atom.fragment.byteStart,
+        byteEnd: atom.fragment.byteEnd
+      };
+    }
+    if (atom.kind === "object") {
+      return {
+        logicalId: atom.candidate.entry.id,
+        carrier: "structural",
+        partUri,
+        storyId,
+        entityKey: atom.fragment.entityKey,
+        ...atom.fragment.wId ? { wordId: atom.fragment.wId } : {},
+        subtype: atom.fragment.structuralKind,
+        byteStart: atom.fragment.byteStart,
+        byteEnd: atom.fragment.byteEnd
+      };
+    }
+    return {
+      logicalId: atom.candidate.entry.id,
+      carrier: "structural",
+      partUri,
+      storyId,
+      entityKey: atom.candidate.fragment.entityKey,
+      ...atom.candidate.fragment.wId ? { wordId: atom.candidate.fragment.wId } : {},
+      subtype: "paragraph-mark-insertion",
+      byteStart: atom.candidate.fragment.byteStart,
+      byteEnd: atom.candidate.fragment.byteEnd
+    };
   });
   const parent = {
     id: groupId,
@@ -168900,7 +169252,8 @@ function materializeReviewGroup(lookupContext, storyId, partUri, partXml, run, i
     state: "open",
     storyId,
     partUri,
-    noteId: null,
+    noteId: ownedNotes[0] ?? memberEntries.find((entry) => entry.noteId != null)?.noteId ?? null,
+    noteIds: ownedNotes.length > 0 ? ownedNotes : null,
     documentOrderStart,
     documentOrderEnd,
     author: { name: headEntry.author.name, initials: headEntry.author.initials },
@@ -169014,9 +169367,17 @@ function uniqueNonEmptyStrings(values) {
   }
   return out;
 }
+function ownedNoteIds(entry) {
+  if (entry.noteIds && entry.noteIds.length > 0)
+    return [...entry.noteIds];
+  return entry.noteId != null ? [entry.noteId] : [];
+}
 function isBodyStoryId(storyId) {
   return storyId.startsWith("main:") || storyId.endsWith(":/word/document.xml");
 }
+function isNotesStoryId(storyId) {
+  return storyId.startsWith("footnotes:") || storyId.startsWith("endnotes:");
+}
 function buildBodyParagraphOrdinalIndexWithLookupContext(lookupContext, partXml) {
   const bodyOpen = /<([\w.-]+):body\b[^>]*>/.exec(partXml);
   if (!bodyOpen) {
@@ -169997,13 +170358,14 @@ function materializeDeletionGroup(storyId, partUri, partXml, run, carrierOrdinal
   ].filter((ordinal) => ordinal !== undefined).sort((a, b) => a - b);
   const memberParagraphTokens = run.filter((atom) => atom.kind !== "blocker").map((atom) => {
     const paraId = readParagraphIdAt(partXml, atom.candidate.paragraphStart);
-    return paraId != null ? `${atom.kind === "text" ? "t" : "m"}@p:${paraId}` : null;
+    const kindToken = atom.kind === "mark" ? "m" : atom.kind === "object" ? "o" : "t";
+    return paraId != null ? `${kindToken}@p:${paraId}` : null;
   });
   const memberKey = memberParagraphTokens.every((token) => token != null) ? memberParagraphTokens.join(",") : carrierOrdinals.join(",");
   const groupHash = hashGroupKey(["word-deleted-paragraph-range", storyId, partUri, `co:${memberKey}`].join("|"));
   const groupId = buildLogicalId(storyId, "del", "word-deleted-paragraph-range", groupHash);
   const canonicalText = buildCanonicalDeletionGroupText(partXml, run);
-  const semanticPositions = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "text" ? { start: atom.fragment.byteStart, end: atom.fragment.byteEnd } : { start: atom.candidate.paragraphEnd, end: atom.candidate.paragraphEnd });
+  const semanticPositions = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "mark" ? { start: atom.candidate.paragraphEnd, end: atom.candidate.paragraphEnd } : { start: atom.fragment.byteStart, end: atom.fragment.byteEnd });
   const documentOrderStart = Math.min(...semanticPositions.map((position) => position.start));
   const documentOrderEnd = Math.max(...semanticPositions.map((position) => position.end));
   const textEntries = uniqueEntries(textAtoms.map((atom) => atom.candidate.entry));
@@ -170021,7 +170383,7 @@ function materializeDeletionGroup(storyId, partUri, partXml, run, carrierOrdinal
   const headEntry = memberEntries[0];
   const hasDeletedText = textAtoms.length > 0;
   const structuralDelta = hasDeletedText ? null : buildDeletedParagraphMarkRangeStructuralDelta(partXml, structuralFragments);
-  const members = run.filter((atom) => atom.kind !== "blocker").map((atom) => atom.kind === "text" ? {
+  const members = run.filter((atom) => atom.kind === "text" || atom.kind === "mark").map((atom) => atom.kind === "text" ? {
     logicalId: atom.candidate.entry.id,
     carrier: "text",
     partUri,
@@ -174115,6 +174477,7 @@ function buildStructuralLogical(lookupContext, entityKey, group, noteId, partXml
     documentOrderStart,
     documentOrderEnd,
     author: { name: head.author.name, initials: head.author.initials },
+    authorEmail: head.authorEmail ?? null,
     date: head.date,
     sourceIds,
     revisionGroupId: id,
@@ -180832,7 +181195,7 @@ function reserveRevisionWIdBlock(state, count) {
   }
   return base2;
 }
-function planRevisionWIdBlock(state, count) {
+function planRevisionWIdBlock(state, count, options) {
   let max2 = state.idReservations.revisionWIds.max;
   if (!state.idReservations.revisionWIds.seeded) {
     for (const [, bytes] of state.packageBytes.entries()) {
@@ -180841,6 +181204,9 @@ function planRevisionWIdBlock(state, count) {
         max2 = value;
     }
   }
+  if (options?.afterMax != null && options.afterMax > max2) {
+    max2 = options.afterMax;
+  }
   const size = Math.max(1, Math.floor(count));
   return Array.from({ length: size }, (_, index) => max2 + index + 1);
 }
@@ -216733,7 +217099,8 @@ function compilePastedNotesMetadata(input) {
         paragraph,
         type,
         includeMarker: index === 0,
-        paraSalt: paraSalt += 1
+        paraSalt: paraSalt += 1,
+        trackedStamp: input.trackedStamp ?? null
       })).join("");
       fragments.push(`<w:${type} w:id="${escapeXmlAttribute(destinationId)}">${bodyXml}</w:${type}>`);
     }
@@ -216837,7 +217204,18 @@ function renderNoteParagraphXml(input) {
   const markerStyle = input.type === "footnote" ? "FootnoteReference" : "EndnoteReference";
   const markerLocal = input.type === "footnote" ? "footnoteRef" : "endnoteRef";
   const marker = input.includeMarker ? `<w:r><w:rPr><w:rStyle w:val="${markerStyle}"/></w:rPr><w:${markerLocal}/></w:r>` : "";
-  return `<w:p w14:paraId="${escapeXmlAttribute(paraId)}">` + `<w:pPr><w:pStyle w:val="${escapeXmlAttribute(style)}"/></w:pPr>` + `${marker}${renderPasteRuns(noteBodyRuns(input.paragraph))}</w:p>`;
+  const runs = noteBodyRuns(input.paragraph);
+  const inner = `${marker}${renderPasteRuns(runs)}`;
+  const pPrXml = `<w:pPr><w:pStyle w:val="${escapeXmlAttribute(style)}"/></w:pPr>`;
+  const stamp = input.trackedStamp;
+  const pPr = stamp ? renderTrackedParagraphMarkProperties(pPrXml, stamp) : pPrXml;
+  const body = stamp && inner ? wrapNoteTrackedInsertion(inner, stamp) : inner;
+  const rsid = stamp ? ` w:rsidR="${escapeXmlAttribute(stamp.rsid)}"` : "";
+  return `<w:p w14:paraId="${escapeXmlAttribute(paraId)}"${rsid}>` + `${pPr}${body}</w:p>`;
+}
+function wrapNoteTrackedInsertion(inner, stamp) {
+  const id = stamp.allocateWId();
+  return `${renderTrackedChangeOpen("ins", id, stamp, true)}${inner}</w:ins>`;
 }
 function noteBodyRuns(paragraph) {
   if (!paragraph.inlines)
@@ -232266,12 +232644,19 @@ function preparePasteFragmentMutation(input) {
   if (!review.ok)
     return rejected18(txId, review.reason);
   const mergedSidecarPerPart = { ...listExtras.perPart, ...imageExtras.value.perPart, ...review.perPart };
+  const pastedNotes = op.fragment.notes ?? [];
+  const noteParagraphs = pastedNotes.flatMap((note) => note.paragraphs);
+  const notesStamp = changeMode === "tracked" && pastedNotes.length > 0 ? pickTrackedStamp(input, trackedFragmentCarrierBudget(noteParagraphs) + noteParagraphs.length) : null;
+  if (changeMode === "tracked" && pastedNotes.length > 0 && !notesStamp) {
+    return rejected18(txId, "no-author-configured");
+  }
   const notes = compilePastedNotesMetadata({
     state,
     blocks: resolvedBlocks,
-    notes: op.fragment.notes ?? [],
+    notes: pastedNotes,
     documentRelsBytes: plannedPackagePartBytes(state, mergedSidecarPerPart, DOCUMENT_RELS_PART_URI9),
-    contentTypesBytes: plannedPackagePartBytes(state, mergedSidecarPerPart, CONTENT_TYPES_PART_URI11)
+    contentTypesBytes: plannedPackagePartBytes(state, mergedSidecarPerPart, CONTENT_TYPES_PART_URI11),
+    trackedStamp: notesStamp
   });
   if (!notes.ok)
     return rejected18(txId, notes.reason);
@@ -232287,7 +232672,8 @@ function preparePasteFragmentMutation(input) {
     patchMaps: { ...listExtras.patchMaps, ...imageExtras.value.patchMaps, ...review.patchMaps, ...notes.patchMaps },
     createdRefs: review.createdRefs,
     commentIdMap: review.commentIdMap,
-    noteIdMap: notes.noteIdMap
+    noteIdMap: notes.noteIdMap,
+    revisionWIds: usedTrackedWIds(notesStamp)
   };
   if (isStoryTarget(pasteTarget)) {
     if (preflight.plan.target.kind !== "story")
@@ -232495,7 +232881,9 @@ function runTrackedWholeStoryReplaceCommit(input, target, rendered, blocks, extr
   const preview = prepare();
   if (!preview)
     return rejected18(txId, "paste-tracked-structural-unsupported");
-  const revisionWIds = planRevisionWIdBlock(state, preview.wordIds.length);
+  const revisionWIds = planRevisionWIdBlock(state, preview.wordIds.length, {
+    afterMax: afterMaxFromPlannedRevisionWIds(extras.revisionWIds)
+  });
   const replacement = prepare(revisionWIds);
   if (!replacement)
     return rejected18(txId, "paste-tracked-structural-unsupported");
@@ -232525,7 +232913,7 @@ function runTrackedWholeStoryReplaceCommit(input, target, rendered, blocks, extr
     extraPatchMaps: extras.patchMaps,
     packagePartUris: inlineExtras.partUris,
     storyWideProjection: true,
-    revisionWIds,
+    revisionWIds: [...revisionWIds, ...extras.revisionWIds ?? []],
     indexRefreshScope: { perPart: { [target.partUri]: {
       beforeWindow: { startByte: target.byteStart, endByte: target.byteEnd },
       kind: "wide-rewrite",
@@ -232611,7 +232999,7 @@ function runParagraphBlockPasteCommit(input, target, blocks, extras, inlineExtra
     return rejected18(txId, "paste-target-unsupported");
   const changeMode = op.changeMode ?? "direct";
   const anchorXml = TD64.decode(bytes.subarray(anchor.byteStart, anchor.byteEnd));
-  const trackedStamp = changeMode === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + (target.placement === "replace" ? trackedBlockDeletionCarrierBudget(anchorXml) : 2)) : null;
+  const trackedStamp = changeMode === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + (target.placement === "replace" ? trackedBlockDeletionCarrierBudget(anchorXml) : 2), { afterMax: afterMaxFromPlannedRevisionWIds(extras.revisionWIds) }) : null;
   if (changeMode === "tracked" && !trackedStamp)
     return rejected18(txId, "no-author-configured");
   const trackedDeletedAnchor = trackedStamp && target.placement === "replace" ? renderTrackedBlockDeletion({
@@ -232763,7 +233151,7 @@ function runParagraphBlockPasteCommit(input, target, blocks, extras, inlineExtra
     extraPatchMaps: { ...extras.patchMaps, ...commentCascade.patchMaps, ...resourceCleanup.patchMaps },
     packagePartUris: [...inlineExtras.partUris, ...resourceCleanup.packagePartUris],
     storyWideProjection: target.placement === "replace" || blocks.some((block) => block.kind === "table"),
-    revisionWIds: usedTrackedWIds(trackedStamp),
+    revisionWIds: usedTrackedWIds(trackedStamp, extras.revisionWIds),
     ...target.placement === "replace" ? {
       indexRefreshScope: {
         perPart: {
@@ -232788,7 +233176,7 @@ function runWholeTableReplaceCommit(input, target, blocks, extras, inlineExtras)
     return rejected18(txId, "paste-target-unsupported");
   }
   const replacedParagraphs = index.entries.filter((entry) => entry.byteStart >= target.byteStart && entry.byteEnd <= target.byteEnd);
-  const trackedStamp = changeMode === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + table.rows.length + 2) : null;
+  const trackedStamp = changeMode === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + table.rows.length + 2, { afterMax: afterMaxFromPlannedRevisionWIds(extras.revisionWIds) }) : null;
   if (changeMode === "tracked" && !trackedStamp)
     return rejected18(txId, "no-author-configured");
   const replacedXml = TD64.decode(bytes.subarray(target.byteStart, target.byteEnd));
@@ -232893,7 +233281,7 @@ function runWholeTableReplaceCommit(input, target, blocks, extras, inlineExtras)
     extraPatchMaps: { ...extras.patchMaps, ...commentCascade.patchMaps },
     packagePartUris: inlineExtras.partUris,
     storyWideProjection: true,
-    revisionWIds: usedTrackedWIds(trackedStamp),
+    revisionWIds: usedTrackedWIds(trackedStamp, extras.revisionWIds),
     indexRefreshScope: {
       perPart: {
         [target.partUri]: {
@@ -232928,7 +233316,7 @@ function runCrossParagraphTrackedPasteCommit(input, target, blocks, extras, inli
   if (!rangeIntegrity.ok)
     return rejected18(txId, "invalid-range");
   const coveredEntries = index.entries.filter((entry) => entry.ordinal >= start.ordinal && entry.ordinal <= end.ordinal);
-  const stamp = pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + coveredEntries.length * 3 + 4);
+  const stamp = pickTrackedStamp(input, trackedFragmentCarrierBudget(blocks) + coveredEntries.length * 3 + 4, { afterMax: afterMaxFromPlannedRevisionWIds(extras.revisionWIds) });
   if (!stamp)
     return rejected18(txId, "no-author-configured");
   const patches = [];
@@ -233030,7 +233418,7 @@ function runCrossParagraphTrackedPasteCommit(input, target, blocks, extras, inli
     extraPatchMaps: extras.patchMaps,
     packagePartUris: inlineExtras.partUris,
     storyWideProjection: true,
-    revisionWIds: usedTrackedWIds(stamp),
+    revisionWIds: usedTrackedWIds(stamp, extras.revisionWIds),
     indexRefreshScope: {
       perPart: {
         [target.partUri]: {
@@ -233070,7 +233458,9 @@ function runCrossParagraphPasteCommit(input, target, blocks, extras, inlineExtra
     return rejected18(txId, "invalid-range");
   const endpointXml = TD64.decode(bytes.subarray(start.byteStart, start.byteEnd)) + TD64.decode(bytes.subarray(end.byteStart, end.byteEnd));
   const wrapperCount = [...endpointXml.matchAll(/<(?:[\w.-]+:)?(?:ins|del|moveFrom|moveTo)\b/g)].length;
-  const plannedWIds = planRevisionWIdBlock(state, Math.max(1, wrapperCount * 2 + 4));
+  const plannedWIds = planRevisionWIdBlock(state, Math.max(1, wrapperCount * 2 + 4), {
+    afterMax: afterMaxFromPlannedRevisionWIds(extras.revisionWIds)
+  });
   let usedWIds = 0;
   let splicePlan;
   let mintSalt = 0;
@@ -233147,7 +233537,7 @@ function runCrossParagraphPasteCommit(input, target, blocks, extras, inlineExtra
     packagePartUris: inlineExtras.partUris,
     storyWideProjection: true,
     indexRefreshScope: contribution.indexRefreshScope,
-    revisionWIds: plannedWIds.slice(0, usedWIds)
+    revisionWIds: [...plannedWIds.slice(0, usedWIds), ...extras.revisionWIds ?? []]
   });
 }
 function collectRemovedBookmarkRefs(ownerXml, removedXml, storyId) {
@@ -233223,7 +233613,7 @@ function tryRunTableRowPasteCommit(input, pasteTarget, pastedBlocks, additionalP
     scopeHintOpenTag: matchParagraphOpenTag(targetParagraphXml) ?? ""
   });
   const createdParagraphIds = [];
-  const trackedStamp = (input.op.changeMode ?? "direct") === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(pastedBlocks) + 2) : null;
+  const trackedStamp = (input.op.changeMode ?? "direct") === "tracked" ? pickTrackedStamp(input, trackedFragmentCarrierBudget(pastedBlocks) + 2, { afterMax: afterMaxFromPlannedRevisionWIds(additionalPatches.revisionWIds) }) : null;
   if ((input.op.changeMode ?? "direct") === "tracked" && !trackedStamp) {
     return rejected18(transactionId, "no-author-configured");
   }
@@ -233310,7 +233700,7 @@ function tryRunTableRowPasteCommit(input, pasteTarget, pastedBlocks, additionalP
     provisionalToFinal: Object.fromEntries(createdParagraphIds.map((paragraphId, index) => [`${transactionId}:paste:${index}`, paragraphId])),
     extraPatchMaps: additionalPatches.patchMaps,
     storyWideProjection: true,
-    revisionWIds: usedTrackedWIds(trackedStamp)
+    revisionWIds: usedTrackedWIds(trackedStamp, additionalPatches.revisionWIds)
   });
 }
 function findContainingTableCell(tableCatalog, targetParagraph) {
@@ -233710,7 +234100,7 @@ function runPasteSpliceCommit(input, target, resolvedBlocks, listExtras, imageEx
   const changeMode = input.op.changeMode ?? "direct";
   const wrapAllTracked = changeMode === "tracked";
   const fragmentTracked = fragmentHasTrackedInsertion(resolvedBlocks);
-  const trackedStamp = wrapAllTracked || fragmentTracked ? pickTrackedStamp(input, trackedFragmentCarrierBudget(resolvedBlocks) + 4) : null;
+  const trackedStamp = wrapAllTracked || fragmentTracked ? pickTrackedStamp(input, trackedFragmentCarrierBudget(resolvedBlocks) + 4, { afterMax: afterMaxFromPlannedRevisionWIds(listExtras.revisionWIds) }) : null;
   if ((wrapAllTracked || fragmentTracked) && !trackedStamp)
     return rejected18(txId, "no-author-configured");
   let mintSalt = 0;
@@ -233840,7 +234230,7 @@ function runPasteSpliceCommit(input, target, resolvedBlocks, listExtras, imageEx
     extraPatchMaps: listExtras.patchMaps,
     storyWideProjection: resolvedBlocks.some((block) => block.kind === "table"),
     packagePartUris: imageExtras.partUris,
-    revisionWIds: usedTrackedWIds(trackedStamp),
+    revisionWIds: usedTrackedWIds(trackedStamp, listExtras.revisionWIds),
     indexRefreshScope: {
       perPart: {
         [partUri]: {
@@ -234860,11 +235250,11 @@ function injectTrackedMarkIntoLastParagraph(xml, stamp, kind) {
   const replacement = injectTrackedParagraphMarkIntoXml(match[0], stamp, kind);
   return xml.slice(0, match.index) + replacement + xml.slice(match.index + match[0].length);
 }
-function pickTrackedStamp(input, capacity) {
+function pickTrackedStamp(input, capacity, options) {
   const author = input.authorOverride ?? input.author;
   if (!author)
     return null;
-  const plannedWIds = planRevisionWIdBlock(input.state, Math.max(1, capacity));
+  const plannedWIds = planRevisionWIdBlock(input.state, Math.max(1, capacity), options);
   const stamp = {
     rsid: allocateTxRsid(input.txId),
     plannedWIds,
@@ -234881,8 +235271,17 @@ function pickTrackedStamp(input, capacity) {
   };
   return stamp;
 }
-function usedTrackedWIds(stamp) {
-  return stamp ? stamp.plannedWIds.slice(0, stamp.usedWIdCount) : undefined;
+function afterMaxFromPlannedRevisionWIds(revisionWIds) {
+  if (!revisionWIds || revisionWIds.length === 0)
+    return;
+  return Math.max(...revisionWIds);
+}
+function usedTrackedWIds(stamp, extra) {
+  const ids = [
+    ...stamp ? stamp.plannedWIds.slice(0, stamp.usedWIdCount) : [],
+    ...extra ?? []
+  ];
+  return ids.length > 0 ? ids : undefined;
 }
 function replayTrackedStamp(source) {
   const replay = {
@@ -357366,7 +357765,14 @@ function logicalEntryMatchesStoryFilter(entry, filter) {
     return isBodyStoryId2(entry.storyId);
   if (!filter.storyIds?.has(entry.storyId))
     return false;
-  return !filter.noteId || entry.noteId === filter.noteId;
+  if (!filter.noteId)
+    return true;
+  return ownedLogicalNoteIds(entry).includes(filter.noteId);
+}
+function ownedLogicalNoteIds(entry) {
+  if (entry.noteIds && entry.noteIds.length > 0)
+    return entry.noteIds;
+  return entry.noteId != null ? [entry.noteId] : [];
 }
 function isVisibleLogicalChange(entry) {
   return isVisibleLogicalTrackedChange(entry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.2.1-next.1",
+  "version": "1.2.1-next.2",
   "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.15.1-next.1",
+    "@superdoc/sdk": "2.15.1-next.2",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.18.1-next.1",
-    "@superdoc/docx-engine": "0.17.1-next.1",
+    "superdoc": "2.18.1-next.2",
+    "@superdoc/docx-engine": "0.17.1-next.2",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",