@superdoc/mcp 1.3.0-next.12 → 1.3.0-next.14

package/dist/index.js

@@ -31318,7 +31318,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.16.0-next.12";
+var SDK_VERSION = "2.16.0-next.14";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -134761,6 +134761,20 @@ function isValidRevisionDate(value) {
   const daysInMonth = [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
   return day <= daysInMonth[month - 1];
 }
+function parseRevisionMarkerAttributes(attributes) {
+  const idAttributes = attributes.filter((attribute) => attribute.local === "id");
+  const authorAttributes = attributes.filter((attribute) => attribute.local === "author");
+  const dateAttributes = attributes.filter((attribute) => attribute.local === "date");
+  const hasValidIdAttribute = idAttributes.length === 1 && idAttributes[0].uri === W_NS;
+  const id = hasValidIdAttribute ? parseRevisionWId(idAttributes[0].value) : null;
+  const hasValidAuthorAttribute = authorAttributes.length === 1 && authorAttributes[0].uri === W_NS;
+  const author = hasValidAuthorAttribute ? authorAttributes[0].value : "";
+  const hasValidDateAttributes = dateAttributes.every((attribute) => attribute.uri === W_NS && isValidRevisionDate(attribute.value));
+  if (!hasValidIdAttribute || !hasValidAuthorAttribute || id === null || !author || !hasValidDateAttributes) {
+    return null;
+  }
+  return { id, author, date: dateAttributes[0]?.value };
+}
 function parseDirectRunSequence(xml, allowRevisions) {
   const revisions = [];
   const stack = [];
@@ -134815,21 +134829,13 @@ function parseDirectRunSequence(xml, allowRevisions) {
         return;
       }
       if (allowRevisions && tag.uri === W_NS && (tag.local === "ins" || tag.local === "del") && !tag.isSelfClosing) {
-        const attributes = Object.values(tag.attributes);
-        const idAttributes = attributes.filter((attribute) => attribute.local === "id");
-        const authorAttributes = attributes.filter((attribute) => attribute.local === "author");
-        const dateAttributes = attributes.filter((attribute) => attribute.local === "date");
-        const hasValidIdAttribute = idAttributes.length === 1 && idAttributes[0].uri === W_NS;
-        const idValue = hasValidIdAttribute ? idAttributes[0].value : "";
-        const id = parseRevisionWId(idValue);
-        const hasValidAuthorAttribute = authorAttributes.length === 1 && authorAttributes[0].uri === W_NS;
-        const author = hasValidAuthorAttribute ? authorAttributes[0].value : "";
-        if (!hasValidIdAttribute || !hasValidAuthorAttribute || id === null || !author || dateAttributes.some((attribute) => attribute.uri !== W_NS || !isValidRevisionDate(attribute.value)))
+        const marker = parseRevisionMarkerAttributes(Object.values(tag.attributes));
+        if (!marker)
           valid = false;
         activeRevision = tag.local;
         activeRevisionRunCount = 0;
-        if (id !== null)
-          revisions.push({ kind: tag.local, wId: id, author });
+        if (marker)
+          revisions.push({ kind: tag.local, wId: marker.id, author: marker.author });
         stack.push("revision");
         return;
       }
@@ -134922,9 +134928,171 @@ function parseDirectRunSequence(xml, allowRevisions) {
     return null;
   return { currentText, originalText, revisions };
 }
+function splitLeadingNoteMarkerRun(xml, family) {
+  const firstRun = /^\s*<((?:[A-Za-z_][\w.-]*:)?r)\b(?:"[^"]*"|'[^']*'|[^>"'])*>[\s\S]*?<\/\1>/.exec(xml);
+  if (!firstRun)
+    return null;
+  const markerRunXml = firstRun[0];
+  const localName2 = family === "footnotes" ? "footnoteRef" : "endnoteRef";
+  const markerTag = new RegExp(`<((?:[A-Za-z_][\\w.-]*:)?)${localName2}\\s*\\/>`, "g");
+  const markers = [...markerRunXml.matchAll(markerTag)];
+  if (markers.length !== 1)
+    return null;
+  let valid = true;
+  let depth = 0;
+  let markerCount = 0;
+  const parser = new import_saxes3.SaxesParser({
+    xmlns: true,
+    additionalNamespaces: replayAdditionalNamespaces(markerRunXml)
+  });
+  parser.on("error", () => {
+    valid = false;
+  });
+  parser.on("opentag", (tag) => {
+    depth += 1;
+    if (depth === 1 && tag.local === "replay")
+      return;
+    if (depth === 2 && tag.uri === W_NS && tag.local === "r")
+      return;
+    if (depth === 3 && tag.uri === W_NS && tag.local === "rPr")
+      return;
+    if (depth === 3 && tag.uri === W_NS && tag.local === localName2 && tag.isSelfClosing && Object.keys(tag.attributes).length === 0) {
+      markerCount += 1;
+      return;
+    }
+    if (depth === 3 || (tag.local === "footnoteRef" || tag.local === "endnoteRef"))
+      valid = false;
+  });
+  parser.on("closetag", () => {
+    depth -= 1;
+  });
+  try {
+    parser.write(`<replay>${markerRunXml}</replay>`).close();
+  } catch {
+    valid = false;
+  }
+  const withoutMarker = markerRunXml.replace(markerTag, "<w:t/>");
+  if (!valid || depth !== 0 || markerCount !== 1 || parseDirectRunSequence(withoutMarker, false)?.currentText !== "")
+    return null;
+  return { markerRunXml, remainingRunXml: xml.slice(markerRunXml.length) };
+}
+function sameNoteMarkerRunXml(base2, target) {
+  const withoutRedundantWordNamespace = (xml) => xml.split(` xmlns:w="${W_NS}"`).join("").split(` xmlns:w='${W_NS}'`).join("");
+  return withoutRedundantWordNamespace(base2) === withoutRedundantWordNamespace(target);
+}
 function inspectDirectParagraphRevisionRuns(xml) {
   return parseDirectRunSequence(xml, true);
 }
+function inspectDirectRunSequence(xml) {
+  return parseDirectRunSequence(xml, false);
+}
+function parseParagraphMarkRevisionMarker(pPrXml) {
+  if (pPrXml === "")
+    return null;
+  let valid = true;
+  const stack = [];
+  let hasSectPr = false;
+  let markerCount = 0;
+  let marker = null;
+  const parser = new import_saxes3.SaxesParser({
+    xmlns: true,
+    additionalNamespaces: replayAdditionalNamespaces(pPrXml)
+  });
+  parser.on("error", () => {
+    valid = false;
+  });
+  parser.on("opentag", (tag) => {
+    const parent = stack.at(-1);
+    const grandparent = stack.at(-2);
+    if (parent === undefined && (tag.local !== "pPr" || tag.uri !== W_NS))
+      valid = false;
+    if (tag.uri === W_NS && tag.local === "sectPr")
+      hasSectPr = true;
+    const parentIsLiveRPr = stack.length === 2 && parent !== undefined && parent.uri === W_NS && parent.local === "rPr" && grandparent !== undefined && grandparent.uri === W_NS && grandparent.local === "pPr";
+    if (parentIsLiveRPr && tag.uri === W_NS && (tag.local === "ins" || tag.local === "del")) {
+      markerCount += 1;
+      if (!tag.isSelfClosing) {
+        valid = false;
+      } else {
+        const attrs = parseRevisionMarkerAttributes(Object.values(tag.attributes));
+        if (!attrs || marker !== null) {
+          valid = false;
+        } else {
+          marker = { kind: tag.local, wId: attrs.id, author: attrs.author, date: attrs.date };
+        }
+      }
+    } else if (parentIsLiveRPr && tag.uri === W_NS && (tag.local === "moveFrom" || tag.local === "moveTo")) {
+      valid = false;
+    }
+    stack.push({ uri: tag.uri ?? "", local: tag.local ?? "" });
+  });
+  parser.on("closetag", () => {
+    stack.pop();
+  });
+  try {
+    parser.write(pPrXml).close();
+  } catch {
+    valid = false;
+  }
+  if (!valid || stack.length !== 0 || hasSectPr || markerCount !== 1 || marker === null)
+    return null;
+  return marker;
+}
+function removeProvenParagraphMarkMarker(xml, marker) {
+  const baseBindings = new Map([["w", W_NS]]);
+  const stack = [];
+  let removal = null;
+  let position = 0;
+  while (position < xml.length) {
+    const start = xml.indexOf("<", position);
+    if (start < 0)
+      break;
+    if (xml.startsWith("<!--", start) || xml.startsWith("<![CDATA[", start) || xml.startsWith("<?", start)) {
+      return null;
+    }
+    const end = findXmlTagEnd2(xml, start);
+    if (end < 0)
+      return null;
+    const rawTag = xml.slice(start, end + 1);
+    if (rawTag.startsWith("</")) {
+      const close = /^<\/\s*([A-Za-z_][\w.-]*(?::[A-Za-z_][\w.-]*)?)\s*>$/.exec(rawTag);
+      if (!close || stack.pop()?.qname !== close[1])
+        return null;
+      position = end + 1;
+      continue;
+    }
+    const parsed = parseXmlStartTag(rawTag);
+    if (!parsed)
+      return null;
+    const bindings = new Map(stack.at(-1)?.bindings ?? baseBindings);
+    for (const attribute of parsed.attributes) {
+      if (attribute.qname === "xmlns")
+        bindings.set("", attribute.value);
+      else if (attribute.prefix === "xmlns")
+        bindings.set(attribute.localName, attribute.value);
+    }
+    const namespaceUri = bindings.get(parsed.prefix) ?? "";
+    const parentEntry = stack.at(-1);
+    const grandparentEntry = stack.at(-2);
+    const isLiveRPrChild = stack.length === 2 && parentEntry?.localName === "rPr" && grandparentEntry?.localName === "pPr";
+    if (isLiveRPrChild && namespaceUri === W_NS && parsed.localName === marker.kind && parsed.selfClosing) {
+      const idValue = parsed.attributes.find((attribute) => attribute.localName === "id" && (bindings.get(attribute.prefix) ?? "") === W_NS)?.value;
+      const authorValue = parsed.attributes.find((attribute) => attribute.localName === "author" && (bindings.get(attribute.prefix) ?? "") === W_NS)?.value;
+      const dateValue = parsed.attributes.find((attribute) => attribute.localName === "date" && (bindings.get(attribute.prefix) ?? "") === W_NS)?.value;
+      if (parseRevisionWId(idValue ?? "") === marker.wId && authorValue === marker.author && dateValue === marker.date) {
+        if (removal !== null)
+          return null;
+        removal = { start, end: end + 1 };
+      }
+    }
+    if (!parsed.selfClosing)
+      stack.push({ qname: parsed.qname, localName: parsed.localName, bindings });
+    position = end + 1;
+  }
+  if (stack.length > 0 || removal === null)
+    return null;
+  return xml.slice(0, removal.start) + xml.slice(removal.end);
+}
 function trackedAnnotationEntries(annotations) {
   return annotations?.find((capture) => capture.family === "tracked-changes")?.entries ?? [];
 }
@@ -135265,9 +135433,21 @@ function parseXmlStartTag(rawTag) {
   return null;
 }
 function validateRunContents(xml, options) {
-  if (xml === "")
+  const baseHasNoteMarker = options.baseRunXml !== undefined && /<(?:[A-Za-z_][\w.-]*:)?(?:footnoteRef|endnoteRef)\b/.test(options.baseRunXml);
+  const targetHasNoteMarker = /<(?:[A-Za-z_][\w.-]*:)?(?:footnoteRef|endnoteRef)\b/.test(xml);
+  let runs = xml;
+  if (baseHasNoteMarker || targetHasNoteMarker) {
+    const family = options.noteMarkerFamily;
+    const target = family && splitLeadingNoteMarkerRun(xml, family);
+    const base2 = family && options.baseRunXml !== undefined ? splitLeadingNoteMarkerRun(options.baseRunXml, family) : undefined;
+    if (!target || options.baseRunXml !== undefined && (!base2 || !sameNoteMarkerRunXml(base2.markerRunXml, target.markerRunXml))) {
+      return { ok: false, reason: "target runs change or misplace the note marker" };
+    }
+    runs = target.remainingRunXml;
+  }
+  if (runs === "")
     return { ok: true };
-  const replayXml = stripAllowedNoteReferences(xml, options);
+  const replayXml = stripAllowedNoteReferences(runs, options);
   const withoutCarriers = replayXml !== null && options.baseRunXml ? stripRetainedCarrier(replayXml, options.baseRunXml, options.allowNamespaceDeclarationDifference === true) : replayXml;
   const withoutBookmarks = withoutCarriers !== null && /<(?:[\w.-]+:)?bookmark(?:Start|End)\b/.test(withoutCarriers) ? preservedBookmarkRunTokens(withoutCarriers)?.strippedXml ?? null : withoutCarriers;
   if (withoutBookmarks === null || UNSUPPORTED_XML.test(withoutBookmarks) || RELATIONSHIP_REFERENCE.test(withoutBookmarks)) {
@@ -135303,9 +135483,27 @@ function validateCompareReplayPayload(payload, options = {}) {
   if (!dependencyResult.ok)
     return dependencyResult;
   if (payload.targetParagraphPropertiesXml !== undefined) {
-    const result = validateParagraphProperties(payload.targetParagraphPropertiesXml);
-    if (!result.ok)
-      return result;
+    if (payload.targetParagraphMarkRevisionReplay !== undefined) {
+      const proof = payload.targetParagraphMarkRevisionReplay;
+      if (proof.policy !== "preserve-target-paragraph-mark-revision") {
+        return { ok: false, reason: "target paragraph mark revision replay policy is incomplete" };
+      }
+      const marker = parseParagraphMarkRevisionMarker(payload.targetParagraphPropertiesXml);
+      if (!marker || marker.kind !== proof.kind || marker.wId !== proof.wId || marker.author !== proof.author || marker.date !== proof.date) {
+        return { ok: false, reason: "target paragraph mark revision replay proof does not match the target paragraph properties" };
+      }
+      const strippedXml = removeProvenParagraphMarkMarker(payload.targetParagraphPropertiesXml, marker);
+      if (strippedXml === null) {
+        return { ok: false, reason: "target paragraph mark revision replay proof could not be isolated from the target paragraph properties" };
+      }
+      const result = validateParagraphProperties(strippedXml);
+      if (!result.ok)
+        return result;
+    } else {
+      const result = validateParagraphProperties(payload.targetParagraphPropertiesXml);
+      if (!result.ok)
+        return result;
+    }
   }
   if (payload.targetRevisionReplay !== undefined) {
     if (payload.targetRevisionReplay.policy !== "preserve-target-revision-set" || payload.targetRunXml === undefined) {
@@ -136103,14 +136301,27 @@ function validateBodyOperation(operation, label, problems, replayOptions = {}) {
       }
     }
   }
-  const carriesReplayPayload = operation.targetParagraphPropertiesXml !== undefined || operation.targetRunXml !== undefined || operation.replayDependencies !== undefined || operation.replayDependencyProofFailed !== undefined;
-  if (carriesReplayPayload && hasValidReplayPayloadShape && hasValidReplayShape) {
+  let hasValidParagraphMarkReplayShape = operation.targetParagraphMarkRevisionReplay === undefined;
+  if (operation.targetParagraphMarkRevisionReplay !== undefined) {
+    const replay = operation.targetParagraphMarkRevisionReplay;
+    const hasValidShape = isRecord9(replay) && replay.policy === "preserve-target-paragraph-mark-revision" && (replay.kind === "ins" || replay.kind === "del") && typeof replay.wId === "number" && Number.isSafeInteger(replay.wId) && isNonEmptyString2(replay.author) && (replay.date === undefined || typeof replay.date === "string");
+    hasValidParagraphMarkReplayShape = hasValidShape;
+    if (!hasValidShape) {
+      problems.push(`${label}.targetParagraphMarkRevisionReplay: invalid target paragraph mark revision replay`);
+    }
+    if (operation.kind === "edit" || operation.kind === "formatEdit") {
+      problems.push(`${label}.targetParagraphMarkRevisionReplay: ${operation.kind} does not support paragraph mark revision replay`);
+      hasValidParagraphMarkReplayShape = false;
+    }
+  }
+  const carriesReplayPayload = operation.kind !== "delete" && (operation.targetParagraphPropertiesXml !== undefined || operation.targetRunXml !== undefined || operation.replayDependencies !== undefined || operation.replayDependencyProofFailed !== undefined || operation.targetParagraphMarkRevisionReplay !== undefined);
+  if (carriesReplayPayload && hasValidReplayPayloadShape && hasValidReplayShape && hasValidParagraphMarkReplayShape) {
     const proof = validateCompareReplayPayload(operation, {
       ...replayOptions,
       expectedCurrentText: operation.kind !== "delete" && typeof operation.text === "string" ? operation.text : undefined
     });
     if (!proof.ok) {
-      const field = operation.targetRevisionReplay === undefined ? "replayPayload" : "targetRevisionReplay";
+      const field = operation.targetRevisionReplay === undefined ? operation.targetParagraphMarkRevisionReplay === undefined ? "replayPayload" : "targetParagraphMarkRevisionReplay" : "targetRevisionReplay";
       problems.push(`${label}.${field}: ${proof.reason}`);
     }
   }
@@ -136876,8 +137087,8 @@ function validatePlanDispositions(value, steps, problems) {
       }
     });
   }
-  const bodyHasTargetRevisionReplay = Array.isArray(value.bodyOperations) && value.bodyOperations.some((operation) => isRecord9(operation) && operation.targetRevisionReplay !== undefined);
-  const storyHasTargetRevisionReplay = Array.isArray(value.storyOperations) && value.storyOperations.some((group) => isRecord9(group) && Array.isArray(group.operations) && group.operations.some((operation) => isRecord9(operation) && operation.targetRevisionReplay !== undefined));
+  const bodyHasTargetRevisionReplay = Array.isArray(value.bodyOperations) && value.bodyOperations.some((operation) => isRecord9(operation) && (operation.targetRevisionReplay !== undefined || operation.targetParagraphMarkRevisionReplay !== undefined));
+  const storyHasTargetRevisionReplay = Array.isArray(value.storyOperations) && value.storyOperations.some((group) => isRecord9(group) && Array.isArray(group.operations) && group.operations.some((operation) => isRecord9(operation) && (operation.targetRevisionReplay !== undefined || operation.targetParagraphMarkRevisionReplay !== undefined)));
   if ((bodyHasTargetRevisionReplay || storyHasTargetRevisionReplay) && dispositions.get("tracked-changes") !== "supported") {
     problems.push("target revision replay requires a supported tracked-changes step");
   }
@@ -136990,7 +137201,8 @@ function validateCompareApplyPlan(value, baseBody = []) {
       if (!isRecord9(group) || !Array.isArray(group.operations))
         return;
       group.operations.forEach((operation, operationIndex) => {
-        validateBodyOperation(operation, `storyOperations[${index}].operations[${operationIndex}]`, problems);
+        const noteMarkerFamily = (group.family === "footnotes" || group.family === "endnotes") && isRecord9(operation) && (operation.kind === "edit" || operation.kind === "formatEdit") ? group.family : undefined;
+        validateBodyOperation(operation, `storyOperations[${index}].operations[${operationIndex}]`, problems, { noteMarkerFamily });
       });
     });
   }
@@ -138970,6 +139182,33 @@ function matchingRevisionAnnotationKeys(annotations, revisions, partUri, paragra
   }
   return keys;
 }
+function matchingParagraphMarkAnnotationKey(annotations, marker, structuralKind, paragraphStructuralAnnotationKeys) {
+  const entries = annotations?.find((capture) => capture.family === "tracked-changes")?.entries ?? [];
+  const exactKeys = paragraphStructuralAnnotationKeys === undefined ? null : new Set(paragraphStructuralAnnotationKeys);
+  const matches = entries.filter((entry) => entry.label === `structural revision ${structuralKind}` && (entry.semanticKey?.startsWith(`structural:${structuralKind}|`) ?? false) && entry.key.includes(`|${marker.wId}|`) && (exactKeys === null || exactKeys.has(entry.key)));
+  return matches.length === 1 ? matches[0].key : null;
+}
+function paragraphMarkTargetRevisionReplay(entry, annotations) {
+  if (!entry)
+    return null;
+  const marker = parseParagraphMarkRevisionMarker(entry.paragraphPropertiesXml ?? "");
+  if (!marker)
+    return null;
+  const structuralKind = marker.kind === "ins" ? "paragraph-mark-insertion" : "paragraph-mark-deletion";
+  const key2 = matchingParagraphMarkAnnotationKey(annotations, marker, structuralKind, entry.structuralChangeAnnotationKeys);
+  if (!key2)
+    return null;
+  return {
+    key: key2,
+    replay: {
+      policy: "preserve-target-paragraph-mark-revision",
+      kind: marker.kind,
+      wId: marker.wId,
+      author: marker.author,
+      date: marker.date
+    }
+  };
+}
 function attachExactTargetRevisionReplay(operations, baseEntries, targetEntries, entityMatch, baseAnnotations, targetAnnotations, basePartUri, targetPartUri, entityId = (blockId) => blockId) {
   if (!entityMatch) {
     return {
@@ -138988,51 +139227,69 @@ function attachExactTargetRevisionReplay(operations, baseEntries, targetEntries,
   const replayOperations = operations.map((operation) => {
     if (operation.kind === "insert" || operation.kind === "insertAtStart") {
       const targetEntry2 = targetById.get(entityId(operation.blockId));
-      if (!targetEntry2)
-        return operation;
-      const targetInspection2 = inspectDirectParagraphRevisionRuns(targetEntry2.runXml ?? "");
-      if (!targetInspection2 || targetInspection2.revisions.length === 0 || targetInspection2.currentText !== targetEntry2.text) {
-        return operation;
+      let targetRevisionReplayPatch;
+      let targetParagraphMarkRevisionReplayPatch;
+      if (targetEntry2) {
+        const targetInspection2 = inspectDirectParagraphRevisionRuns(targetEntry2.runXml ?? "");
+        if (targetInspection2 && targetInspection2.revisions.length > 0 && targetInspection2.currentText === targetEntry2.text) {
+          const targetAnnotationKeys2 = matchingRevisionAnnotationKeys(targetAnnotations, targetInspection2.revisions, targetPartUri, targetEntry2.trackedChangeAnnotationKeys);
+          if (targetAnnotationKeys2) {
+            for (const key2 of targetAnnotationKeys2)
+              coveredTargetAnnotations.add(key2);
+            changedTrackedXmlReplayed = true;
+            targetRevisionReplayPatch = {
+              targetRevisionReplay: {
+                policy: "preserve-target-revision-set",
+                structuralAction: "insert",
+                originalText: targetInspection2.originalText,
+                revisionWIds: targetInspection2.revisions.map((revision) => revision.wId)
+              }
+            };
+          }
+        }
+        const markResult = paragraphMarkTargetRevisionReplay(targetEntry2, targetAnnotations);
+        if (markResult) {
+          coveredTargetAnnotations.add(markResult.key);
+          changedTrackedXmlReplayed = true;
+          targetParagraphMarkRevisionReplayPatch = { targetParagraphMarkRevisionReplay: markResult.replay };
+        }
       }
-      const targetAnnotationKeys2 = matchingRevisionAnnotationKeys(targetAnnotations, targetInspection2.revisions, targetPartUri, targetEntry2.trackedChangeAnnotationKeys);
-      if (!targetAnnotationKeys2)
+      if (!targetRevisionReplayPatch && !targetParagraphMarkRevisionReplayPatch)
         return operation;
-      for (const key2 of targetAnnotationKeys2)
-        coveredTargetAnnotations.add(key2);
-      changedTrackedXmlReplayed = true;
-      return {
-        ...operation,
-        targetRevisionReplay: {
-          policy: "preserve-target-revision-set",
-          structuralAction: "insert",
-          originalText: targetInspection2.originalText,
-          revisionWIds: targetInspection2.revisions.map((revision) => revision.wId)
-        }
-      };
+      return { ...operation, ...targetRevisionReplayPatch, ...targetParagraphMarkRevisionReplayPatch };
     }
     if (operation.kind === "delete") {
       const baseEntry2 = baseById.get(entityId(operation.blockId));
-      if (!baseEntry2)
-        return operation;
-      const baseInspection2 = inspectDirectParagraphRevisionRuns(baseEntry2.runXml ?? "");
-      if (!baseInspection2 || baseInspection2.revisions.length === 0 || baseInspection2.currentText !== baseEntry2.text) {
-        return operation;
+      let targetRevisionReplayPatch;
+      let targetParagraphMarkRevisionReplayPatch;
+      if (baseEntry2) {
+        const baseInspection2 = inspectDirectParagraphRevisionRuns(baseEntry2.runXml ?? "");
+        if (baseInspection2 && baseInspection2.revisions.length > 0 && baseInspection2.currentText === baseEntry2.text) {
+          const baseAnnotationKeys2 = matchingRevisionAnnotationKeys(baseAnnotations, baseInspection2.revisions, basePartUri, baseEntry2.trackedChangeAnnotationKeys);
+          if (baseAnnotationKeys2) {
+            for (const key2 of baseAnnotationKeys2)
+              coveredBaseAnnotations.add(key2);
+            changedTrackedXmlReplayed = true;
+            targetRevisionReplayPatch = {
+              targetRevisionReplay: {
+                policy: "preserve-target-revision-set",
+                structuralAction: "delete",
+                originalText: baseInspection2.originalText,
+                revisionWIds: baseInspection2.revisions.map((revision) => revision.wId)
+              }
+            };
+          }
+        }
+        const markResult = paragraphMarkTargetRevisionReplay(baseEntry2, baseAnnotations);
+        if (markResult) {
+          coveredBaseAnnotations.add(markResult.key);
+          changedTrackedXmlReplayed = true;
+          targetParagraphMarkRevisionReplayPatch = { targetParagraphMarkRevisionReplay: markResult.replay };
+        }
       }
-      const baseAnnotationKeys2 = matchingRevisionAnnotationKeys(baseAnnotations, baseInspection2.revisions, basePartUri, baseEntry2.trackedChangeAnnotationKeys);
-      if (!baseAnnotationKeys2)
+      if (!targetRevisionReplayPatch && !targetParagraphMarkRevisionReplayPatch)
         return operation;
-      for (const key2 of baseAnnotationKeys2)
-        coveredBaseAnnotations.add(key2);
-      changedTrackedXmlReplayed = true;
-      return {
-        ...operation,
-        targetRevisionReplay: {
-          policy: "preserve-target-revision-set",
-          structuralAction: "delete",
-          originalText: baseInspection2.originalText,
-          revisionWIds: baseInspection2.revisions.map((revision) => revision.wId)
-        }
-      };
+      return { ...operation, ...targetRevisionReplayPatch, ...targetParagraphMarkRevisionReplayPatch };
     }
     const baseEntryId = entityId(operation.blockId);
     const baseEntry = baseById.get(baseEntryId);
@@ -139106,7 +139363,7 @@ function attachExactTargetRevisionReplayToStories(groups, base2, target, matchRe
   });
   return { groups: replayGroups, coveredBaseAnnotations, coveredTargetAnnotations, changedTrackedXmlReplayed };
 }
-function firstUnsafeReplayReason(operations, noteLifecycle = [], targetStories = [], baseBody = []) {
+function firstUnsafeReplayReason(operations, noteLifecycle = [], targetStories = [], baseBody = [], noteMarkerFamily) {
   const createdNoteReferences = noteLifecycle.filter((operation) => operation.kind === "create-note-definition" || operation.kind === "create-note-story").map((operation) => ({ family: operation.family, noteId: operation.noteId }));
   const retainedNoteReferences = targetStories.flatMap((story) => (story.family === "footnotes" || story.family === "endnotes") && story.noteId ? [{ family: story.family, noteId: story.noteId }] : []);
   const allowedNoteReferences = [...createdNoteReferences, ...retainedNoteReferences];
@@ -139116,7 +139373,7 @@ function firstUnsafeReplayReason(operations, noteLifecycle = [], targetStories =
       continue;
     const result = validateCompareReplayPayload(operation, {
       allowedNoteReferences,
-      ...operation.kind === "edit" || operation.kind === "formatEdit" ? { baseRunXml: baseRunByBlockId.get(operation.blockId) } : {}
+      ...operation.kind === "edit" || operation.kind === "formatEdit" ? { baseRunXml: baseRunByBlockId.get(operation.blockId), noteMarkerFamily } : {}
     });
     if (!result.ok)
       return result.reason;
@@ -139310,7 +139567,9 @@ function planCompare(base2, target) {
   for (const group of storyOperations) {
     if (!replayableStoryFamilies.has(group.family))
       continue;
-    const unsafeStoryReason = firstUnsafeReplayReason(group.operations);
+    const noteMarkerFamily = group.family === "footnotes" || group.family === "endnotes" ? group.family : undefined;
+    const baseStory = noteMarkerFamily ? base2.stories?.find((story) => story.storyId === group.storyId && story.family === group.family && story.noteId === group.noteId) : undefined;
+    const unsafeStoryReason = firstUnsafeReplayReason(group.operations, [], [], baseStory?.entries ?? [], noteMarkerFamily);
     if (!unsafeStoryReason || unsafeStoryFamilies.has(group.family))
       continue;
     unsafeStoryFamilies.add(group.family);
@@ -222476,7 +222735,7 @@ function hasTerminalTrackedParagraphDeletion(state, groups, storyPackageOperatio
     if (!index)
       return false;
     return group.bodySteps.some((step2, stepIndex) => {
-      if (step2.kind !== "delete" || step2.targetRevisionReplay !== undefined)
+      if (step2.kind !== "delete" || step2.targetRevisionReplay !== undefined || step2.targetParagraphMarkRevisionReplay !== undefined)
         return false;
       if (isBodyReplayNoteReferenceRemoval(state, group.storyId, step2, storyPackageOperations))
         return false;
@@ -222582,7 +222841,10 @@ function normalizeCompareBodyStep(step2, sectionSteps, referenceSteps, allowedNo
     return step2.targetRevisionReplay === undefined || step2.targetRevisionReplay.structuralAction === "delete" ? step2 : null;
   }
   const baseRunXml = step2.kind === "edit" || step2.kind === "formatEdit" ? liveCompareBodyRunXml(state, storyId, step2.blockId) : undefined;
-  if (!validateCompareBodyReplayPayload(step2, sectionSteps, referenceSteps, allowedNoteReferences, step2.text, baseRunXml))
+  const noteMarkerFamily = step2.kind === "edit" || step2.kind === "formatEdit" ? storyId.startsWith("footnotes:") ? "footnotes" : storyId.startsWith("endnotes:") ? "endnotes" : undefined : undefined;
+  if (noteMarkerFamily && baseRunXml && /<(?:[A-Za-z_][\w.-]*:)?(?:footnoteRef|endnoteRef)\b/.test(baseRunXml) && step2.targetRunXml === undefined)
+    return null;
+  if (!validateCompareBodyReplayPayload(step2, sectionSteps, referenceSteps, allowedNoteReferences, step2.text, baseRunXml, noteMarkerFamily))
     return null;
   const targetParagraphPropertiesXml = step2.targetParagraphPropertiesXml === undefined ? undefined : canonicalizeCompareBodyParagraphPropertiesXml(step2.targetParagraphPropertiesXml, sectionSteps);
   const targetRunXml = step2.targetRunXml === undefined ? undefined : (step2.targetRunXml.includes("<w:drawing") || step2.targetRunXml.includes("<w:fldSimple")) && baseRunXml && referenceSteps.length === 0 ? step2.targetRunXml : canonicalizeCompareBodyRunXml(step2.targetRunXml, referenceSteps);
@@ -222597,8 +222859,9 @@ function normalizeCompareBodyStep(step2, sectionSteps, referenceSteps, allowedNo
     targetParagraphPropertiesXml,
     targetRunXml,
     replayDependencies: "replayDependencies" in step2 ? step2.replayDependencies : undefined,
-    targetRevisionReplay: "targetRevisionReplay" in step2 ? step2.targetRevisionReplay : undefined
-  }, sectionSteps, referenceSteps, allowedNoteReferences, step2.text, baseRunXml) ? normalized : null;
+    targetRevisionReplay: "targetRevisionReplay" in step2 ? step2.targetRevisionReplay : undefined,
+    targetParagraphMarkRevisionReplay: "targetParagraphMarkRevisionReplay" in step2 ? step2.targetParagraphMarkRevisionReplay : undefined
+  }, sectionSteps, referenceSteps, allowedNoteReferences, step2.text, baseRunXml, noteMarkerFamily) ? normalized : null;
 }
 function liveCompareBodyRunXml(state, storyId, blockId) {
   const entry = getStoryParagraphIndexFromState(state, storyId)?.byParaId(blockId);
@@ -222731,7 +222994,7 @@ function sourceProofBindsReference(proof, family) {
   const childXml = wrappedSource.slice(child.start, child.end);
   return isValidNoteReferenceReplayRunXml(childXml, family, proof.noteId, child.namespaceBindings) && replayCarrierXmlEquals(childXml, proof.referenceRunXml);
 }
-function validateCompareBodyReplayPayload(payload, sectionSteps, referenceSteps, allowedNoteReferences, expectedCurrentText, baseRunXml) {
+function validateCompareBodyReplayPayload(payload, sectionSteps, referenceSteps, allowedNoteReferences, expectedCurrentText, baseRunXml, noteMarkerFamily) {
   if (payload.targetRunXml !== undefined && expectedCurrentText !== undefined && projectCompareReplayCurrentText(payload.targetRunXml) !== expectedCurrentText.replace(/\uFFFC/g, "")) {
     return false;
   }
@@ -222739,7 +223002,12 @@ function validateCompareBodyReplayPayload(payload, sectionSteps, referenceSteps,
   if (targetParagraphPropertiesXml === null)
     return false;
   const targetRunXml = payload.targetRunXml === undefined ? undefined : stripProtectedReferenceTokens(payload.targetRunXml, referenceSteps);
-  return targetRunXml !== null && validateCompareReplayPayload({ ...payload, targetParagraphPropertiesXml, targetRunXml }, { allowedNoteReferences, baseRunXml, allowNamespaceDeclarationDifference: baseRunXml !== undefined }).ok;
+  return targetRunXml !== null && validateCompareReplayPayload({ ...payload, targetParagraphPropertiesXml, targetRunXml }, {
+    allowedNoteReferences,
+    baseRunXml,
+    noteMarkerFamily,
+    allowNamespaceDeclarationDifference: baseRunXml !== undefined
+  }).ok;
 }
 function stripProtectedSectionTokens(xml, sectionSteps) {
   const tokens = collectProtectedSectionTokens(xml, sectionSteps);
@@ -223090,8 +223358,8 @@ function runBodyStep(input, storyId, noteId, step2, changeMode, options, pushHis
     if (!hasSuccessor)
       return rejected14(txId, "unsupported-context");
   }
-  if (step2.targetRevisionReplay !== undefined) {
-    if (step2.targetRevisionReplay.structuralAction !== "delete") {
+  if (step2.targetRevisionReplay !== undefined || step2.targetParagraphMarkRevisionReplay !== undefined) {
+    if (step2.targetRevisionReplay !== undefined && step2.targetRevisionReplay.structuralAction !== "delete") {
       return rejected14(txId, "unsupported-context");
     }
     const entry = getStoryParagraphIndexFromState(state, storyId)?.byParaId(step2.blockId);
@@ -223230,7 +223498,10 @@ function prepareTrackedTerminalParagraphDeleteAtState(input) {
 }
 function resolveExactStructuralRevisionDeletion(state, storyId, step2) {
   const replay = step2.targetRevisionReplay;
-  if (!replay || replay.structuralAction !== "delete")
+  const markReplay = step2.targetParagraphMarkRevisionReplay;
+  if (replay !== undefined && replay.structuralAction !== "delete")
+    return null;
+  if (replay === undefined && markReplay === undefined)
     return null;
   const entry = getStoryParagraphIndexFromState(state, storyId)?.byParaId(step2.blockId);
   const bytes = entry ? state.packageBytes.get(entry.partUri) : undefined;
@@ -223238,9 +223509,22 @@ function resolveExactStructuralRevisionDeletion(state, storyId, step2) {
     return null;
   const paraXml = TD59.decode(bytes.subarray(entry.byteStart, entry.byteEnd));
   const wrapper = readParagraphWrapper(paraXml, step2.blockId, bytes, entry.byteStart);
-  const inspection = inspectDirectParagraphRevisionRuns(stripElements(paraXml.slice(wrapper.contentStart, paraXml.lastIndexOf("</")), "pPr"));
-  if (!inspection || inspection.originalText !== replay.originalText || JSON.stringify(inspection.revisions.map((revision) => revision.wId)) !== JSON.stringify(replay.revisionWIds))
-    return null;
+  const runContent = stripElements(paraXml.slice(wrapper.contentStart, paraXml.lastIndexOf("</")), "pPr");
+  if (replay !== undefined && replay.structuralAction === "delete") {
+    const inspection = inspectDirectParagraphRevisionRuns(runContent);
+    if (!inspection || inspection.originalText !== replay.originalText || JSON.stringify(inspection.revisions.map((revision) => revision.wId)) !== JSON.stringify(replay.revisionWIds))
+      return null;
+  } else {
+    const inspection = inspectDirectRunSequence(runContent);
+    if (!inspection || inspection.revisions.length > 0)
+      return null;
+  }
+  if (markReplay !== undefined) {
+    const pPrXml = findFirstElement(paraXml, "pPr")?.xml ?? "";
+    const marker = parseParagraphMarkRevisionMarker(pPrXml);
+    if (!marker || marker.kind !== markReplay.kind || marker.wId !== markReplay.wId || marker.author !== markReplay.author || marker.date !== markReplay.date)
+      return null;
+  }
   const parsedPart = collectXmlElementRanges(TD59.decode(bytes));
   const paragraphCharStart = TD59.decode(bytes.subarray(0, entry.byteStart)).length;
   const paragraphRange = parsedPart.ranges.find((range) => range.start === paragraphCharStart && range.tag.namespaceUri === NS_W && range.tag.localName === "p");
@@ -223255,7 +223539,7 @@ function resolveExactStructuralRevisionDeletion(state, storyId, step2) {
     byteEnd: entry.byteEnd,
     charStart: paragraphRange.start,
     charEnd: paragraphRange.end,
-    revisionWIds: replay.revisionWIds
+    revisionWIds: [...replay?.revisionWIds ?? [], ...markReplay ? [markReplay.wId] : []]
   };
 }
 function runTargetRevisionReplayCommit(input, storyId, step2, options, pushHistory) {
@@ -223383,7 +223667,7 @@ function incomingRevisionIdsCollide(input, targetPartUri, targetStart, targetEnd
       return true;
     if (liveTargetRunXml) {
       const previousOwner = parseTargetRevisionReplayOwner(transferFrom);
-      const previousInspection = previousOwner ? inspectDirectParagraphRevisionRuns(previousOwner.targetRunXml) : null;
+      const previousInspection = previousOwner?.targetRunXml !== undefined ? inspectDirectParagraphRevisionRuns(previousOwner.targetRunXml) : null;
       if (!previousInspection)
         return true;
       for (const { wId } of previousInspection.revisions) {
@@ -223425,7 +223709,7 @@ function transferableInPlaceRevisionReplayOwner(input) {
     return null;
   const previousKey = parseTargetRevisionReplayOwner(previousOwner);
   const nextKey = parseTargetRevisionReplayOwner(input.replayOwner);
-  if (!previousKey || !nextKey || previousKey.partUri !== input.targetPartUri || nextKey.partUri !== input.targetPartUri || previousKey.blockId !== nextKey.blockId || previousKey.targetParagraphPropertiesXml !== nextKey.targetParagraphPropertiesXml || !sameTargetRevisionReplayProvenance(previousKey.targetRevisionReplay, nextKey.targetRevisionReplay))
+  if (!previousKey || !nextKey || previousKey.partUri !== input.targetPartUri || nextKey.partUri !== input.targetPartUri || previousKey.blockId !== nextKey.blockId || previousKey.targetParagraphPropertiesXml !== nextKey.targetParagraphPropertiesXml || !sameTargetRevisionReplayProvenance(previousKey.targetRevisionReplay, nextKey.targetRevisionReplay) || !sameTargetParagraphMarkRevisionReplay(previousKey.targetParagraphMarkRevisionReplay, nextKey.targetParagraphMarkRevisionReplay) || previousKey.targetRunXml === undefined || nextKey.targetRunXml === undefined)
     return null;
   const previousInspection = inspectDirectParagraphRevisionRuns(previousKey.targetRunXml);
   if (!previousInspection || !liveInspection || JSON.stringify(previousInspection) !== JSON.stringify(liveInspection)) {
@@ -223459,7 +223743,7 @@ function transferableRevisionReplayOwner(input) {
   const nextKey = parseTargetRevisionReplayOwner(input.replayOwner);
   if (!previousKey || !nextKey || previousKey.blockId !== nextKey.blockId)
     return null;
-  if (previousKey.targetParagraphPropertiesXml !== nextKey.targetParagraphPropertiesXml || previousKey.targetRunXml !== nextKey.targetRunXml || !sameTargetRevisionReplaySet(previousKey.targetRevisionReplay, nextKey.targetRevisionReplay))
+  if (previousKey.targetParagraphPropertiesXml !== nextKey.targetParagraphPropertiesXml || previousKey.targetRunXml !== nextKey.targetRunXml || !sameTargetRevisionReplaySet(previousKey.targetRevisionReplay, nextKey.targetRevisionReplay) || !sameTargetParagraphMarkRevisionReplay(previousKey.targetParagraphMarkRevisionReplay, nextKey.targetParagraphMarkRevisionReplay))
     return null;
   const previousDeletion = input.scheduledDeletions.find((deletion) => deletion.partUri === previousKey.partUri && deletion.blockId === previousKey.blockId && JSON.stringify(deletion.revisionWIds) === JSON.stringify(input.revisionWIds));
   return previousDeletion && input.revisionWIds.every((id) => previousDeletion.completeLiveCarrierWIds?.includes(id)) ? previousOwner : null;
@@ -223467,21 +223751,24 @@ function transferableRevisionReplayOwner(input) {
 function parseTargetRevisionReplayOwner(owner) {
   try {
     const key2 = JSON.parse(owner);
-    if (!Array.isArray(key2) || key2.length !== 5 || typeof key2[0] !== "string" || typeof key2[1] !== "string" || typeof key2[3] !== "string") {
+    if (!Array.isArray(key2) || key2.length !== 6 || typeof key2[0] !== "string" || typeof key2[1] !== "string" || key2[3] !== null && typeof key2[3] !== "string") {
       return null;
     }
     return {
       partUri: key2[0],
       blockId: key2[1],
       targetParagraphPropertiesXml: key2[2],
-      targetRunXml: key2[3],
-      targetRevisionReplay: key2[4]
+      targetRunXml: key2[3] === null ? undefined : key2[3],
+      targetRevisionReplay: key2[4] === null ? undefined : key2[4],
+      targetParagraphMarkRevisionReplay: key2[5] === null ? undefined : key2[5]
     };
   } catch {
     return null;
   }
 }
 function sameTargetRevisionReplayProvenance(left, right) {
+  if (left === undefined && right === undefined)
+    return true;
   if (!left || typeof left !== "object" || !right || typeof right !== "object")
     return false;
   const leftReplay = left;
@@ -223489,12 +223776,23 @@ function sameTargetRevisionReplayProvenance(left, right) {
   return leftReplay.policy === "preserve-target-revision-set" && rightReplay.policy === "preserve-target-revision-set" && leftReplay.originalText === rightReplay.originalText;
 }
 function sameTargetRevisionReplaySet(left, right) {
+  if (left === undefined && right === undefined)
+    return true;
   if (!sameTargetRevisionReplayProvenance(left, right))
     return false;
   const leftReplay = left;
   const rightReplay = right;
   return Array.isArray(leftReplay.revisionWIds) && Array.isArray(rightReplay.revisionWIds) && JSON.stringify(leftReplay.revisionWIds) === JSON.stringify(rightReplay.revisionWIds);
 }
+function sameTargetParagraphMarkRevisionReplay(left, right) {
+  if (left === undefined && right === undefined)
+    return true;
+  if (!left || typeof left !== "object" || !right || typeof right !== "object")
+    return false;
+  const leftReplay = left;
+  const rightReplay = right;
+  return leftReplay.policy === "preserve-target-paragraph-mark-revision" && rightReplay.policy === "preserve-target-paragraph-mark-revision" && leftReplay.kind === rightReplay.kind && leftReplay.wId === rightReplay.wId && leftReplay.author === rightReplay.author && leftReplay.date === rightReplay.date;
+}
 function applyRevisionReplayOwnershipTransfers(state, transfers) {
   const reservations = state.idReservations.revisionWIds.replayOwners;
   for (const transfer of transfers) {
@@ -223580,22 +223878,36 @@ function targetRevisionReplayOwner(partUri, step2, fallbackParagraphPropertiesXm
     step2.blockId,
     step2.targetParagraphPropertiesXml ?? fallbackParagraphPropertiesXml ?? null,
     step2.targetRunXml,
-    step2.targetRevisionReplay
+    step2.targetRevisionReplay,
+    "targetParagraphMarkRevisionReplay" in step2 ? step2.targetParagraphMarkRevisionReplay : undefined
   ]);
 }
 function prepareExactTargetRevisionInsert(input, partUri, insertByte, step2) {
   const replay = step2.targetRevisionReplay;
-  if (!replay)
+  const markReplay = step2.targetParagraphMarkRevisionReplay;
+  if (!replay && !markReplay)
     return null;
-  if (replay.structuralAction !== "insert" || !step2.targetRunXml)
-    return false;
+  const revisionWIds = [];
+  if (replay !== undefined) {
+    if (replay.structuralAction !== "insert" || !step2.targetRunXml)
+      return false;
+    const inspection = inspectDirectParagraphRevisionRuns(step2.targetRunXml);
+    if (!inspection || inspection.currentText !== step2.text || inspection.originalText !== replay.originalText || JSON.stringify(inspection.revisions.map((revision) => revision.wId)) !== JSON.stringify(replay.revisionWIds))
+      return false;
+    revisionWIds.push(...replay.revisionWIds);
+  }
+  if (markReplay !== undefined) {
+    const marker = parseParagraphMarkRevisionMarker(step2.targetParagraphPropertiesXml ?? "");
+    if (!marker || marker.kind !== markReplay.kind || marker.wId !== markReplay.wId || marker.author !== markReplay.author || marker.date !== markReplay.date)
+      return false;
+    revisionWIds.push(markReplay.wId);
+  }
   const replayOwner = targetRevisionReplayOwner(partUri, step2);
   const ownershipTransfers = [];
-  const inspection = inspectDirectParagraphRevisionRuns(step2.targetRunXml);
-  if (!inspection || inspection.currentText !== step2.text || inspection.originalText !== replay.originalText || JSON.stringify(inspection.revisions.map((revision) => revision.wId)) !== JSON.stringify(replay.revisionWIds) || incomingRevisionIdsCollide(input, partUri, insertByte, insertByte, replay.revisionWIds, replayOwner, ownershipTransfers))
+  if (incomingRevisionIdsCollide(input, partUri, insertByte, insertByte, revisionWIds, replayOwner, ownershipTransfers))
     return false;
   applyRevisionReplayOwnershipTransfers(input.state, ownershipTransfers);
-  for (const wId of replay.revisionWIds)
+  for (const wId of revisionWIds)
     reserveRevisionWIdForReplay(input.state, wId, replayOwner);
   return true;
 }
@@ -223717,6 +224029,24 @@ function unchangedBookmarkReferenceSteps(oldRuns, targetRuns) {
     afterNamespaceBindings: bookmarkBindings
   }];
 }
+function retainedNoteMarkerRuns(oldRuns, targetRuns, storyId) {
+  const markerPattern = /<(?:[A-Za-z_][\w.-]*:)?(?:footnoteRef|endnoteRef)\b/;
+  if (!markerPattern.test(oldRuns) && !markerPattern.test(targetRuns)) {
+    return { markerRunXml: "", oldRuns, targetRuns };
+  }
+  const family = storyId.startsWith("footnotes:") ? "footnotes" : storyId.startsWith("endnotes:") ? "endnotes" : null;
+  if (!family)
+    return null;
+  const oldMarker = splitLeadingNoteMarkerRun(oldRuns, family);
+  const targetMarker = splitLeadingNoteMarkerRun(targetRuns, family);
+  if (!oldMarker || !targetMarker || !sameNoteMarkerRunXml(oldMarker.markerRunXml, targetMarker.markerRunXml))
+    return null;
+  return {
+    markerRunXml: oldMarker.markerRunXml,
+    oldRuns: oldMarker.remainingRunXml,
+    targetRuns: targetMarker.remainingRunXml
+  };
+}
 function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pushHistory, referenceSteps) {
   const { state, txId } = input;
   const partUri = storyPartUriFromStoryId2(storyId);
@@ -223738,6 +224068,9 @@ function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pu
   const closeStart = paraXml.lastIndexOf("</");
   const innerXml = closeStart > openEnd ? paraXml.slice(openEnd, closeStart) : "";
   const oldRunsRaw = stripElements(innerXml, "pPr");
+  const retainedMarker = retainedNoteMarkerRuns(oldRunsRaw, newRuns, storyId);
+  if (!retainedMarker)
+    return rejected14(txId, "unsupported-context");
   const stableBookmarkSteps = unchangedBookmarkReferenceSteps(oldRunsRaw, newRuns);
   if (stableBookmarkSteps === null && referenceSteps.length === 0)
     return rejected14(txId, "unsupported-context");
@@ -223756,10 +224089,10 @@ function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pu
         storyId
       });
     }
-    const oldRunsDel = oldRunsRaw.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
+    const oldRunsDel = retainedMarker.oldRuns.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
     const hunkStamps = makeCompareHunkStampSource(stamps, input);
-    const retainedCarrier = newRuns.includes("<w:drawing") || newRuns.includes("<w:fldSimple") && protectedReferenceSteps.length === 0;
-    const protectedRuns = retainedCarrier ? protectedReferenceSteps.length === 0 ? renderTrackedRunsWithRetainedCarrier(oldRunsRaw, newRuns, hunkStamps.next, paragraphWrapper.wordprocessingPrefix, bytes, entry.byteStart, entry.byteEnd) : null : renderTrackedRunsWithProtectedReferences(oldRunsRaw, newRuns, protectedReferenceSteps, hunkStamps.next, paragraphWrapper.wordprocessingPrefix);
+    const retainedCarrier = retainedMarker.targetRuns.includes("<w:drawing") || retainedMarker.targetRuns.includes("<w:fldSimple") && protectedReferenceSteps.length === 0;
+    const protectedRuns = retainedCarrier ? protectedReferenceSteps.length === 0 ? renderTrackedRunsWithRetainedCarrier(retainedMarker.oldRuns, retainedMarker.targetRuns, hunkStamps.next, paragraphWrapper.wordprocessingPrefix, bytes, entry.byteStart, entry.byteEnd) : null : renderTrackedRunsWithProtectedReferences(retainedMarker.oldRuns, retainedMarker.targetRuns, protectedReferenceSteps, hunkStamps.next, paragraphWrapper.wordprocessingPrefix);
     if (retainedCarrier && !protectedRuns)
       return rejected14(txId, "unsupported-context");
     if (!protectedRuns && stableBookmarkSteps?.length)
@@ -223772,10 +224105,10 @@ function runCompareBodyEditCommit(input, storyId, step2, changeMode, options, pu
     } else {
       const fallbackPair = hunkStamps.next();
       delXml = oldRunsDel ? wrapTracked("del", oldRunsDel, fallbackPair.del, "rsidDel", paragraphWrapper.wordprocessingPrefix) : "";
-      insXml = newRuns ? wrapTracked("ins", newRuns, fallbackPair.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
+      insXml = retainedMarker.targetRuns ? wrapTracked("ins", retainedMarker.targetRuns, fallbackPair.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
     }
     const trackedPPrXml = buildTrackedParagraphProperties(targetParagraphPropertiesXml, pPrXml, stamps.paragraphProperties ?? stamps.ins, paragraphWrapper.wordprocessingPrefix);
-    const assembledParaXml = `${paragraphWrapper.openTag}${trackedPPrXml}${delXml}${insXml}${paragraphWrapper.closeTag}`;
+    const assembledParaXml = `${paragraphWrapper.openTag}${trackedPPrXml}` + `${retainedMarker.markerRunXml}${delXml}${insXml}${paragraphWrapper.closeTag}`;
     if (hunkStamps.usedPairs.length === 0) {
       newParaXml = assembledParaXml;
     } else {
@@ -224068,6 +224401,9 @@ function runCompareBodyFormatEditCommit(input, storyId, step2, changeMode, optio
   const closeStart = paraXml.lastIndexOf("</");
   const innerXml = closeStart > openEnd ? paraXml.slice(openEnd, closeStart) : "";
   const oldRunsRaw = stripElements(innerXml, "pPr");
+  const retainedMarker = retainedNoteMarkerRuns(oldRunsRaw, targetRunXml, storyId);
+  if (!retainedMarker)
+    return rejected14(txId, "unsupported-context");
   const paragraphPropertiesChanged = !equivalentParagraphProperties(targetPPrXml, pPrXml);
   const stableBookmarkSteps = unchangedBookmarkReferenceSteps(oldRunsRaw, targetRunXml);
   if (stableBookmarkSteps === null && referenceSteps.length === 0)
@@ -224135,12 +224471,12 @@ function runCompareBodyFormatEditCommit(input, storyId, step2, changeMode, optio
       const stamps = compareTrackedStampPair(input, paragraphPropertiesChanged);
       if (!stamps)
         return rejected14(txId, "no-author-configured");
-      const oldRunsDel = oldRunsRaw.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
-      const protectedRuns = renderTrackedRunsWithProtectedReferences(oldRunsRaw, targetRunXml, protectedReferenceSteps, () => stamps, paragraphWrapper.wordprocessingPrefix);
+      const oldRunsDel = retainedMarker.oldRuns.replace(/<((?:[\w.-]+:)?)t(\b[^>]*)>/g, "<$1delText$2>").replace(/<\/((?:[\w.-]+:)?)t>/g, "</$1delText>");
+      const protectedRuns = renderTrackedRunsWithProtectedReferences(retainedMarker.oldRuns, retainedMarker.targetRuns, protectedReferenceSteps, () => stamps, paragraphWrapper.wordprocessingPrefix);
       if (!protectedRuns && stableBookmarkSteps?.length)
         return rejected14(txId, "unsupported-context");
       const delXml = protectedRuns?.xml ?? (oldRunsDel ? wrapTracked("del", oldRunsDel, stamps.del, "rsidDel", paragraphWrapper.wordprocessingPrefix) : "");
-      const insXml = protectedRuns ? "" : targetRunXml ? wrapTracked("ins", targetRunXml, stamps.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
+      const insXml = protectedRuns ? "" : retainedMarker.targetRuns ? wrapTracked("ins", retainedMarker.targetRuns, stamps.ins, "rsidR", paragraphWrapper.wordprocessingPrefix) : "";
       if (delXml || insXml) {
         createdRefs.push({ kind: "trackedChange", entityId: stamps.ins.rsid, storyId });
       }
@@ -224152,7 +224488,7 @@ function runCompareBodyFormatEditCommit(input, storyId, step2, changeMode, optio
         });
       }
       const trackedPPrXml = buildTrackedParagraphProperties(targetParagraphPropertiesXml, pPrXml, stamps.paragraphProperties ?? stamps.ins, paragraphWrapper.wordprocessingPrefix);
-      newParaXml = `${paragraphWrapper.openTag}${trackedPPrXml}${delXml}${insXml}${paragraphWrapper.closeTag}`;
+      newParaXml = `${paragraphWrapper.openTag}${trackedPPrXml}` + `${retainedMarker.markerRunXml}${delXml}${insXml}${paragraphWrapper.closeTag}`;
     }
   } else {
     newParaXml = `${paragraphWrapper.openTag}${targetPPrXml}${targetRunXml}${paragraphWrapper.closeTag}`;
@@ -358786,6 +359122,10 @@ function trackedChangeAnnotationKeysForParagraph(context, paragraph4) {
   const fragments = getSDDocumentSessionInternalTrackedChangeCatalog(context.session).byPart.get(paragraph4.partUri) ?? [];
   return fragments.filter((fragment3) => fragment3.storyId === paragraph4.storyId && fragment3.sourceByteStart >= paragraph4.byteStart && fragment3.sourceByteEnd <= paragraph4.byteEnd).map(trackedChangeAnnotationKey);
 }
+function structuralChangeAnnotationKeysForParagraph(context, paragraph4) {
+  const fragments = getSDDocumentSessionInternalTrackedChangeCatalog(context.session).structuralByPart.get(paragraph4.partUri) ?? [];
+  return fragments.filter((fragment3) => fragment3.storyId === paragraph4.storyId && (fragment3.sourceByteStart ?? fragment3.byteStart) >= paragraph4.byteStart && (fragment3.sourceByteEnd ?? fragment3.byteEnd) <= paragraph4.byteEnd).map((fragment3) => fragment3.entityKey);
+}
 function projectFieldsReferences(context) {
   const entries = [];
   let ordinal = 0;
@@ -359731,6 +360071,7 @@ function projectStories(context, slots) {
         runSignature: runSignatureByOrdinal.get(p.ordinal),
         runXml,
         trackedChangeAnnotationKeys: trackedChangeAnnotationKeysForParagraph(context, p),
+        structuralChangeAnnotationKeys: structuralChangeAnnotationKeysForParagraph(context, p),
         paragraphPropertiesXml,
         paragraphPropertiesSignature: computeParagraphPropertiesSignature2(paragraphPropertiesXml)
       };
@@ -359816,6 +360157,7 @@ function projectBody(context) {
       runSignature: runSignatures[ordinal],
       runXml,
       trackedChangeAnnotationKeys: trackedChangeAnnotationKeysForParagraph(context, p),
+      structuralChangeAnnotationKeys: structuralChangeAnnotationKeysForParagraph(context, p),
       paragraphPropertiesXml,
       paragraphPropertiesSignature: computeParagraphPropertiesSignature2(paragraphPropertiesXml)
     };
@@ -360040,7 +360382,7 @@ function applyComparePlan(context, plan, options = {}) {
   const appliedFamilySet = new Set;
   if (plan.bodyOperations.length > 0)
     appliedFamilySet.add("body");
-  const appliedTargetRevisionReplay = plan.bodyOperations.some((operation) => ("targetRevisionReplay" in operation) && operation.targetRevisionReplay !== undefined) || storyGroups.some((group) => group.bodySteps.some((step3) => step3.targetRevisionReplay !== undefined));
+  const appliedTargetRevisionReplay = plan.bodyOperations.some((operation) => ("targetRevisionReplay" in operation) && operation.targetRevisionReplay !== undefined || ("targetParagraphMarkRevisionReplay" in operation) && operation.targetParagraphMarkRevisionReplay !== undefined) || storyGroups.some((group) => group.bodySteps.some((step3) => step3.targetRevisionReplay !== undefined || ("targetParagraphMarkRevisionReplay" in step3) && step3.targetParagraphMarkRevisionReplay !== undefined));
   if (appliedTargetRevisionReplay)
     appliedFamilySet.add("tracked-changes");
   for (const group of storyGroups) {
@@ -363370,7 +363712,8 @@ function buildHeaderFooterLifecyclePlan(base3, target) {
     const after = targetParts.get(partUri);
     const kind = after?.kind ?? before.kind;
     const relationshipsChanged = !headerFooterPartRelationshipsEqual(before?.relationshipsBytes ?? null, after?.relationshipsBytes ?? null);
-    const changed = !before || !after || !numbersEqual(before.bytes, after.bytes) || relationshipsChanged;
+    const contentChanged = Boolean(before && after && (before.bytes.length !== after.bytes.length || before.bytes.some((value2, index2) => value2 !== after.bytes[index2])));
+    const changed = !before || !after || contentChanged || relationshipsChanged;
     if (!changed)
       continue;
     if (hasUnsafeRelationshipDependencyChange(before, after, relationshipsChanged)) {
@@ -363387,7 +363730,7 @@ function buildHeaderFooterLifecyclePlan(base3, target) {
       });
     } else if (before && !after) {
       rewrites.push({ family: "header-footer-parts", partUri, kind: "remove" });
-    } else if (before && after && !numbersEqual(before.bytes, after.bytes)) {
+    } else if (before && after && contentChanged) {
       contentRewrites.push({
         family: "header-footer-parts",
         partUri,
@@ -365053,6 +365396,17 @@ function isCommentRelationshipSemanticKey(semanticKey) {
   const relType = semanticKey.slice(sep + 1);
   return /\/relationships\/(?:comments|commentsExtended|commentsIds|commentsExtensible|threadedComments|people)$/i.test(relType);
 }
+function isResolutionSidecarAddition(key2, targetEntry) {
+  if (!targetEntry)
+    return false;
+  if (key2 === "ct:override:/word/commentsExtended.xml") {
+    return targetEntry.semanticKey === key2 && targetEntry.contentSignature === sha256HexSync(TE62.encode("override:/word/commentsExtended.xml=" + "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml"));
+  }
+  if (!key2.startsWith("rel:/word/document.xml|"))
+    return false;
+  const type = "http://schemas.microsoft.com/office/2011/relationships/commentsExtended";
+  return targetEntry.semanticKey === `/word/document.xml|${type}` && targetEntry.contentSignature === sha256HexSync(TE62.encode(`type:${type}#mode:Internal#target:/word/commentsExtended.xml`));
+}
 function isCommentScopedPackageKey(context, key2, presentInBase, hasCommentCreate, targetEntry) {
   if (key2.startsWith("ct:")) {
     const uri = key2.slice(key2.indexOf(":", 3) + 1);
@@ -365088,10 +365442,15 @@ function packageGraphKeysNotCoveredByComments(context, base3, target, steps) {
       changedKeys.add(key2);
   const hasCommentCreate = steps.some((s) => s.kind === "create");
   const hasCommentDelete = steps.some((s) => s.kind === "delete");
+  const hasRootResolution = steps.some((s) => s.kind === "set-resolved" && s.resolved && !s.targetIsReply && s.targetParentParaId === null);
+  const addedResolutionSidecarKeys = [...changedKeys].filter((key2) => !baseSigs.has(key2) && targetSigs.has(key2) && isResolutionSidecarAddition(key2, targetEntries.get(key2)));
+  const coversResolutionSidecar = hasRootResolution && addedResolutionSidecarKeys.length === 2 && addedResolutionSidecarKeys.includes("ct:override:/word/commentsExtended.xml");
   const notCovered = [];
   for (const key2 of changedKeys) {
     const presentInBase = baseSigs.has(key2);
     const presentInTarget = targetSigs.has(key2);
+    if (coversResolutionSidecar && addedResolutionSidecarKeys.includes(key2))
+      continue;
     let lifecycleCoversEntry = false;
     if (presentInBase !== presentInTarget) {
       lifecycleCoversEntry = presentInBase ? hasCommentDelete : hasCommentCreate;
@@ -369701,16 +370060,19 @@ function validateFullDiffApplyConsistency(diff, payload, physicalPlan, canonical
   }
   return problems;
 }
+function hasAnyTargetRevisionReplay(operation) {
+  return "targetRevisionReplay" in operation && operation.targetRevisionReplay !== undefined || "targetParagraphMarkRevisionReplay" in operation && operation.targetParagraphMarkRevisionReplay !== undefined;
+}
 function buildApplyOperationCounts(applyPlan) {
   const counts = new Map;
   let revisionReplayCount = 0;
   if (applyPlan.bodyOperations.length > 0) {
     counts.set("body", applyPlan.bodyOperations.length);
-    revisionReplayCount += applyPlan.bodyOperations.filter((operation) => ("targetRevisionReplay" in operation) && operation.targetRevisionReplay !== undefined).length;
+    revisionReplayCount += applyPlan.bodyOperations.filter(hasAnyTargetRevisionReplay).length;
   }
   for (const group of applyPlan.storyOperations ?? []) {
     counts.set(group.family, (counts.get(group.family) ?? 0) + group.operations.length);
-    revisionReplayCount += group.operations.filter((operation) => ("targetRevisionReplay" in operation) && operation.targetRevisionReplay !== undefined).length;
+    revisionReplayCount += group.operations.filter(hasAnyTargetRevisionReplay).length;
   }
   if (revisionReplayCount > 0)
     counts.set("tracked-changes", revisionReplayCount);
@@ -369721,8 +370083,8 @@ function buildApplyOperationCounts(applyPlan) {
 }
 function setRuntimeBodyOperationCounts(counts, applyPlan, bodyOperations) {
   counts.set("body", bodyOperations.length);
-  const storyRevisionReplayCount = (applyPlan.storyOperations ?? []).reduce((total, group) => total + group.operations.filter((operation) => operation.targetRevisionReplay !== undefined).length, 0);
-  const bodyRevisionReplayCount = bodyOperations.filter((operation) => operation.targetRevisionReplay !== undefined).length;
+  const storyRevisionReplayCount = (applyPlan.storyOperations ?? []).reduce((total, group) => total + group.operations.filter(hasAnyTargetRevisionReplay).length, 0);
+  const bodyRevisionReplayCount = bodyOperations.filter(hasAnyTargetRevisionReplay).length;
   const revisionReplayCount = storyRevisionReplayCount + bodyRevisionReplayCount;
   if (revisionReplayCount > 0)
     counts.set("tracked-changes", revisionReplayCount);
@@ -369770,16 +370132,27 @@ function throwLocalizedBodyCorrespondenceError(sectionSteps, referenceSteps) {
     unsupportedReason: "section-reference-replay-unsafe"
   });
 }
+function paragraphMarkReplayOf(operation) {
+  return operation.kind === "insert" || operation.kind === "insertAtStart" || operation.kind === "delete" ? operation.targetParagraphMarkRevisionReplay : undefined;
+}
 function mergeCanonicalRevisionReplay(derivedOperations, canonicalOperations) {
   return derivedOperations.map((derived) => {
-    const candidates = canonicalOperations.filter((canonical) => sameBodyOperationIdentity(derived, canonical));
+    const candidates = canonicalOperations.filter((canonical2) => sameBodyOperationIdentity(derived, canonical2));
     if (candidates.length !== 1)
       return derived;
-    const replay = candidates[0].targetRevisionReplay;
-    if (replay === undefined || derived.targetRevisionReplay !== undefined)
+    const canonical = candidates[0];
+    const replay = canonical.targetRevisionReplay;
+    const markReplay = paragraphMarkReplayOf(canonical);
+    const wantsReplay = replay !== undefined && derived.targetRevisionReplay === undefined;
+    const wantsMarkReplay = markReplay !== undefined && paragraphMarkReplayOf(derived) === undefined;
+    if (!wantsReplay && !wantsMarkReplay)
       return derived;
-    const merged = { ...derived, targetRevisionReplay: replay };
-    if (derived.kind === "delete" && replay.structuralAction === "delete")
+    const merged = {
+      ...derived,
+      ...wantsReplay ? { targetRevisionReplay: replay } : {},
+      ...wantsMarkReplay ? { targetParagraphMarkRevisionReplay: markReplay } : {}
+    };
+    if (derived.kind === "delete" && (merged.targetRevisionReplay === undefined || merged.targetRevisionReplay.structuralAction === "delete"))
       return merged;
     return validateCompareReplayPayload(merged).ok ? merged : derived;
   });
@@ -370104,8 +370477,9 @@ function findStructurallyUnsupportedOperationFamilies(context, runtimeApplyPlan,
       return bodyStructuralIds.editDelete.has(op.blockId.toUpperCase()) && !localizedReferenceEditIsProtected(op.targetRunXml, referenceSteps) && !(referenceSteps.length === 0 && localizedRetainedFieldEditIsProtected(op.targetRunXml));
     }
     if (op.kind === "delete") {
-      if (op.targetRevisionReplay?.structuralAction === "delete")
+      if (op.targetRevisionReplay?.structuralAction === "delete" || op.targetParagraphMarkRevisionReplay !== undefined) {
         return false;
+      }
       return bodyStructuralIds.editDelete.has(op.blockId.toUpperCase());
     }
     if (op.kind === "formatEdit")
@@ -370135,8 +370509,9 @@ function findStructurallyUnsupportedOperationFamilies(context, runtimeApplyPlan,
         return storyStructuralIds.editDelete.has(op.blockId.toUpperCase());
       }
       if (op.kind === "delete") {
-        if (op.targetRevisionReplay?.structuralAction === "delete")
+        if (op.targetRevisionReplay?.structuralAction === "delete" || op.targetParagraphMarkRevisionReplay !== undefined) {
           return false;
+        }
         return storyStructuralIds.editDelete.has(op.blockId.toUpperCase());
       }
       if (op.kind === "formatEdit")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.3.0-next.12",
+  "version": "1.3.0-next.14",
   "description": "Model Context Protocol server for SuperDoc, giving an AI agent tools to read and edit .docx files.",
   "type": "module",
   "license": "AGPL-3.0",
@@ -24,13 +24,13 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@superdoc/sdk": "2.16.0-next.12",
+    "@superdoc/sdk": "2.16.0-next.14",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.19.0-next.11",
-    "@superdoc/docx-engine": "0.18.0-next.11",
+    "superdoc": "2.19.0-next.13",
+    "@superdoc/docx-engine": "0.18.0-next.13",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",