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

package/dist/index.js

@@ -31630,7 +31630,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.23.0-next.4";
+var SDK_VERSION = "2.23.0-next.5";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -132643,6 +132643,259 @@ var init_part_payload = __esm(() => {
   EMPTY_CHUNK = new Uint8Array(0);
 });
 
+// ../../../v2/editor-core/dist/util/sha256-sync.js
+function rightRotate(value, amount) {
+  return value >>> amount | value << 32 - amount;
+}
+function sha256HexSync(bytes) {
+  const bitLength = BigInt(bytes.length) * 8n;
+  const paddedLength = Math.ceil((bytes.length + 1 + 8) / 64) * 64;
+  const padded = new Uint8Array(paddedLength);
+  padded.set(bytes);
+  padded[bytes.length] = 128;
+  const paddedView = new DataView(padded.buffer);
+  paddedView.setUint32(paddedLength - 8, Number(bitLength >> 32n & 0xffffffffn));
+  paddedView.setUint32(paddedLength - 4, Number(bitLength & 0xffffffffn));
+  const hash2 = [...INITIAL_HASH];
+  const words = new Uint32Array(64);
+  for (let offset = 0;offset < paddedLength; offset += 64) {
+    for (let index = 0;index < 16; index += 1) {
+      words[index] = paddedView.getUint32(offset + index * 4);
+    }
+    for (let index = 16;index < 64; index += 1) {
+      const s0 = rightRotate(words[index - 15], 7) ^ rightRotate(words[index - 15], 18) ^ words[index - 15] >>> 3;
+      const s1 = rightRotate(words[index - 2], 17) ^ rightRotate(words[index - 2], 19) ^ words[index - 2] >>> 10;
+      words[index] = words[index - 16] + s0 + words[index - 7] + s1 >>> 0;
+    }
+    let [a, b, c, d, e, f, g, h] = hash2;
+    for (let index = 0;index < 64; index += 1) {
+      const s1 = rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25);
+      const ch = e & f ^ ~e & g;
+      const temp1 = h + s1 + ch + ROUND_CONSTANTS[index] + words[index] >>> 0;
+      const s0 = rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22);
+      const maj = a & b ^ a & c ^ b & c;
+      const temp2 = s0 + maj >>> 0;
+      h = g;
+      g = f;
+      f = e;
+      e = d + temp1 >>> 0;
+      d = c;
+      c = b;
+      b = a;
+      a = temp1 + temp2 >>> 0;
+    }
+    hash2[0] = hash2[0] + a >>> 0;
+    hash2[1] = hash2[1] + b >>> 0;
+    hash2[2] = hash2[2] + c >>> 0;
+    hash2[3] = hash2[3] + d >>> 0;
+    hash2[4] = hash2[4] + e >>> 0;
+    hash2[5] = hash2[5] + f >>> 0;
+    hash2[6] = hash2[6] + g >>> 0;
+    hash2[7] = hash2[7] + h >>> 0;
+  }
+  return hash2.map((value) => value.toString(16).padStart(8, "0")).join("");
+}
+var INITIAL_HASH, ROUND_CONSTANTS;
+var init_sha256_sync = __esm(() => {
+  INITIAL_HASH = [1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225];
+  ROUND_CONSTANTS = [
+    1116352408,
+    1899447441,
+    3049323471,
+    3921009573,
+    961987163,
+    1508970993,
+    2453635748,
+    2870763221,
+    3624381080,
+    310598401,
+    607225278,
+    1426881987,
+    1925078388,
+    2162078206,
+    2614888103,
+    3248222580,
+    3835390401,
+    4022224774,
+    264347078,
+    604807628,
+    770255983,
+    1249150122,
+    1555081692,
+    1996064986,
+    2554220882,
+    2821834349,
+    2952996808,
+    3210313671,
+    3336571891,
+    3584528711,
+    113926993,
+    338241895,
+    666307205,
+    773529912,
+    1294757372,
+    1396182291,
+    1695183700,
+    1986661051,
+    2177026350,
+    2456956037,
+    2730485921,
+    2820302411,
+    3259730800,
+    3345764771,
+    3516065817,
+    3600352804,
+    4094571909,
+    275423344,
+    430227734,
+    506948616,
+    659060556,
+    883997877,
+    958139571,
+    1322822218,
+    1537002063,
+    1747873779,
+    1955562222,
+    2024104815,
+    2227730452,
+    2361852424,
+    2428436474,
+    2756734187,
+    3204031479,
+    3329325298
+  ];
+});
+
+// ../../../v2/editor-core/dist/document/internal/xml-text.js
+function decodeXmlText(text) {
+  return decodeXmlTextEntities(text, false);
+}
+function decodeXmlTextPreservingInvalidNumericEntities(text) {
+  return decodeXmlTextEntities(text, true);
+}
+function decodeXmlTextEntities(text, preserveInvalidNumericEntities) {
+  return text.replace(ENTITY_RE, (_, entity) => {
+    switch (entity) {
+      case "lt":
+        return "<";
+      case "gt":
+        return ">";
+      case "amp":
+        return "&";
+      case "quot":
+        return '"';
+      case "apos":
+        return "'";
+      default: {
+        const cp = entity.startsWith("#x") ? Number.parseInt(entity.slice(2), 16) : Number.parseInt(entity.slice(1), 10);
+        if (!Number.isFinite(cp))
+          return `&${entity};`;
+        if (preserveInvalidNumericEntities && (cp <= 0 || cp > 1114111 || cp >= 55296 && cp <= 57343))
+          return `&${entity};`;
+        return String.fromCodePoint(cp);
+      }
+    }
+  });
+}
+function decodeXmlAttributeValue(value) {
+  return decodeXmlText(value.replace(/[\t\n\r]/g, " "));
+}
+function semanticXmlAttributeValueSpace(value) {
+  return value.replace(/[\t\n\r]/g, " ");
+}
+function escapeXmlText(text) {
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function escapedXmlTextCodePointUtf8Width(codePoint) {
+  if (codePoint === 38)
+    return 5;
+  if (codePoint === 60 || codePoint === 62)
+    return 4;
+  if (codePoint <= 127)
+    return 1;
+  if (codePoint <= 2047)
+    return 2;
+  if (codePoint <= 65535)
+    return 3;
+  return 4;
+}
+function escapeXmlAttribute(text) {
+  return escapeXmlText(text).replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
+function needsXmlSpacePreserve(text) {
+  return /^\s|\s$/.test(text);
+}
+function isUtf16Boundary(text, offset) {
+  if (offset <= 0 || offset >= text.length)
+    return true;
+  const previous = text.charCodeAt(offset - 1);
+  const next = text.charCodeAt(offset);
+  return !(previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343);
+}
+var ENTITY_RE;
+var init_xml_text = __esm(() => {
+  ENTITY_RE = /&(lt|gt|amp|quot|apos|#\d+|#x[0-9a-fA-F]+);/g;
+});
+
+// ../../../v2/editor-core/dist/document/transactions/tracked-changes/revision-id-identity.js
+function revisionIdentityBinding(partUri, namespaceUri, kind, portableId, originalId, author, date6) {
+  return sha256HexSync(ENCODER.encode(JSON.stringify([
+    partUri,
+    namespaceUri,
+    kind,
+    portableId,
+    originalId,
+    author,
+    date6
+  ])));
+}
+function* readRevisionIdentityAliasesWork(xml, partUri, elements, namespaceBindingsByTagStart) {
+  const result = new Map;
+  if (!xml.includes("binding"))
+    return result;
+  for (const element of elements) {
+    yield;
+    const bindings2 = namespaceBindingsByTagStart.get(element.start) ?? {};
+    const attributes = [...scanRawXmlAttributes(xml.slice(element.start, element.openEnd))].map((a) => ({
+      namespaceUri: bindings2[a.prefix] ?? "",
+      localName: a.localName,
+      value: decodeXmlAttributeValue(a.value)
+    }));
+    const word = (name) => attributes.find((a) => a.localName === name && (a.namespaceUri === NS_W || a.namespaceUri === NS_WSTRICT))?.value ?? "";
+    const physical = word("id");
+    const metadata = attributes.filter((a) => a.namespaceUri === REVISION_IDENTITY_NAMESPACE && (a.localName === "id" || a.localName === "binding" || a.localName === "lexical"));
+    if (!metadata.length)
+      continue;
+    const reservedId = metadata.find((a) => a.localName === "id")?.value;
+    const lexical = metadata.find((a) => a.localName === "lexical")?.value;
+    const original = lexical ?? reservedId;
+    const binding = metadata.find((a) => a.localName === "binding")?.value;
+    const decodedOriginal = original ? decodeXmlAttributeValue(original) : "";
+    if (metadata.length !== (lexical === undefined ? 2 : 3) || !original || !binding || !physical || !reservedId || !/^[+-]?\d{1,128}$/.test(reservedId) || !/^[\x20\t\r\n]*[+-]?\d{1,128}[\x20\t\r\n]*$/.test(decodedOriginal) || !/^[\x20\t\r\n]*[+-]?\d{1,128}[\x20\t\r\n]*$/.test(physical))
+      continue;
+    const originalInteger = BigInt(decodedOriginal.trim()), portableInteger = BigInt(physical.trim());
+    if (BigInt(reservedId) !== originalInteger)
+      continue;
+    if (originalInteger >= -2147483648n && originalInteger <= 2147483647n || portableInteger < -2147483648n || portableInteger > 2147483647n)
+      continue;
+    const portable = String(portableInteger);
+    if (binding !== revisionIdentityBinding(partUri, element.namespaceUri, element.localName, portable, original, word("author"), word("date")))
+      continue;
+    result.set(element.start, original);
+  }
+  return result;
+}
+function logicalRevisionWId(fragment2) {
+  return fragment2.logicalWId ?? fragment2.wId;
+}
+var REVISION_IDENTITY_NAMESPACE = "urn:superdoc:revision-identity:1", ENCODER;
+var init_revision_id_identity = __esm(() => {
+  init_sha256_sync();
+  init_xml_sax();
+  init_xml_text();
+  ENCODER = new TextEncoder;
+});
+
 // ../../../v2/editor-core/dist/document/internal/xml-element-slice.js
 function matchLeadingElement(xml, localName) {
   const name = escapeRegExp2(localName);
@@ -132855,6 +133108,180 @@ var init_metadata_projection = __esm(() => {
   };
 });
 
+// ../../../v2/editor-core/dist/document/internal/xml-ignorable.js
+function appendXmlIgnorablePrefix(openTag, namespaceBindings, prefix, mcPrefix) {
+  for (const attribute of scanRawXmlAttributes(openTag)) {
+    if (attribute.localName === "Ignorable" && attribute.prefix && namespaceBindings[attribute.prefix] === NS_MC) {
+      return openTag.slice(0, attribute.valueEnd) + ` ${prefix}` + openTag.slice(attribute.valueEnd);
+    }
+  }
+  return openTag.slice(0, -1) + ` xmlns:${mcPrefix}="${NS_MC}" ${mcPrefix}:Ignorable="${prefix}">`;
+}
+var init_xml_ignorable = __esm(() => {
+  init_xml_sax();
+});
+
+// ../../../v2/editor-core/dist/document/transactions/tracked-changes/revision-id-export.js
+function integer2(value) {
+  const collapsed = value.replace(/^[\x20\t\r\n]+|[\x20\t\r\n]+$/g, "");
+  return /^[+-]?\d+$/.test(collapsed) ? BigInt(collapsed) : null;
+}
+function normalizeRevisionIdsForWordExport(parts, excludedPartUris) {
+  if (![...parts.values()].some((xml) => /\d{10,}|&#/.test(xml)))
+    return new Map;
+  const reserved = new Set;
+  const edits = [];
+  const errors4 = [];
+  for (const [partUri, xml] of [...parts].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
+    const result = walkXmlElements(xml, {
+      onOpenTag: ({ tag, start, end, namespaceBindings }) => {
+        for (const attribute2 of tag.attributes) {
+          if (attribute2.localName !== "id")
+            continue;
+          const value2 = integer2(attribute2.value);
+          if (value2 !== null && value2 >= MIN_WORD_ID && value2 <= MAX_WORD_ID)
+            reserved.add(value2);
+        }
+        const wordElement = tag.namespaceUri === NS_W || tag.namespaceUri === NS_WSTRICT;
+        if (!(wordElement && WORD_CARRIERS.has(tag.localName)) && !(tag.namespaceUri === NS_W14 && EXTENDED_CARRIERS.has(tag.localName)))
+          return;
+        const attribute = tag.attributes.find((a) => a.localName === "id" && (a.namespaceUri === NS_W || a.namespaceUri === NS_WSTRICT));
+        if (!attribute)
+          return;
+        const value = integer2(attribute.value);
+        if (value === null || value >= MIN_WORD_ID && value <= MAX_WORD_ID)
+          return;
+        const raw = [...scanRawXmlAttributes(xml.slice(start, end))].find((a) => a.name === attribute.name);
+        if (!raw)
+          throw new Error("Revision ID source value could not be located.");
+        const word = (name) => tag.attributes.find((a) => a.localName === name && (a.namespaceUri === NS_W || a.namespaceUri === NS_WSTRICT))?.value ?? "";
+        edits.push({
+          partUri,
+          start: start + raw.valueStart,
+          end: start + raw.valueEnd,
+          integer: value,
+          originalValue: raw.value,
+          tagStart: start,
+          tagEnd: end,
+          namespaceBindings,
+          namespaceUri: tag.namespaceUri,
+          kind: tag.localName,
+          author: word("author"),
+          date: word("date")
+        });
+      }
+    });
+    errors4.push(...result.errors);
+  }
+  if (!edits.length)
+    return new Map;
+  if (excludedPartUris?.size)
+    throw new RevisionIdExportCoverageError([...excludedPartUris].sort()[0]);
+  if (errors4.length)
+    throw new Error("Revision ID normalization cannot certify malformed Word XML.");
+  const mapping = new Map;
+  let candidate = 0n;
+  for (const edit of edits) {
+    if (mapping.has(edit.integer))
+      continue;
+    while (reserved.has(candidate) && candidate <= MAX_WORD_ID)
+      candidate += 1n;
+    if (candidate > MAX_WORD_ID)
+      throw new Error("No unused Word revision ID remains.");
+    mapping.set(edit.integer, String(candidate));
+    reserved.add(candidate);
+  }
+  const byPart = new Map;
+  for (const edit of edits) {
+    const list = byPart.get(edit.partUri) ?? [];
+    list.push(edit);
+    byPart.set(edit.partUri, list);
+  }
+  const output = new Map;
+  for (const [partUri, replacements] of byPart) {
+    let xml = parts.get(partUri);
+    for (const edit of replacements.sort((a, b) => b.start - a.start)) {
+      const portable = mapping.get(edit.integer);
+      let openTag = xml.slice(edit.tagStart, edit.start) + portable + xml.slice(edit.end, edit.tagEnd);
+      const staleMetadata = [...scanRawXmlAttributes(openTag)].filter((a) => edit.namespaceBindings[a.prefix] === REVISION_IDENTITY_NAMESPACE && (a.localName === "id" || a.localName === "binding" || a.localName === "lexical"));
+      for (const attribute of staleMetadata.sort((a, b) => b.sourceStart - a.sourceStart)) {
+        openTag = openTag.slice(0, attribute.sourceStart) + openTag.slice(attribute.sourceEnd);
+      }
+      const availablePrefix = (seed) => {
+        let prefix2 = seed;
+        for (let index = 1;edit.namespaceBindings[prefix2]; index += 1)
+          prefix2 = `${seed}${index}`;
+        return prefix2;
+      };
+      const prefix = availablePrefix("sdRevision"), mc = availablePrefix("sdRevisionMc");
+      const selfClosing = openTag.endsWith("/>");
+      if (selfClosing)
+        openTag = openTag.slice(0, -2) + ">";
+      openTag = appendXmlIgnorablePrefix(openTag, edit.namespaceBindings, prefix, mc);
+      const binding = revisionIdentityBinding(partUri, edit.namespaceUri, edit.kind, portable, edit.originalValue, edit.author, edit.date);
+      const escapedOriginal = edit.originalValue.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/\t/g, "&#9;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;");
+      const lexical = edit.originalValue === String(edit.integer) ? "" : ` ${prefix}:lexical="${escapedOriginal}"`;
+      openTag = openTag.slice(0, -1) + ` xmlns:${prefix}="${REVISION_IDENTITY_NAMESPACE}" ${prefix}:id="${edit.integer}"${lexical} ${prefix}:binding="${binding}"${selfClosing ? "/>" : ">"}`;
+      xml = xml.slice(0, edit.tagStart) + openTag + xml.slice(edit.tagEnd);
+    }
+    output.set(partUri, xml);
+  }
+  return output;
+}
+var MIN_WORD_ID, MAX_WORD_ID = 2147483647n, WORD_CARRIERS, EXTENDED_CARRIERS, RevisionIdExportCoverageError;
+var init_revision_id_export = __esm(() => {
+  init_xml_sax();
+  init_xml_ignorable();
+  init_revision_id_identity();
+  MIN_WORD_ID = -2147483648n;
+  WORD_CARRIERS = new Set([
+    "ins",
+    "del",
+    "moveFrom",
+    "moveTo",
+    "cellIns",
+    "cellDel",
+    "cellMerge",
+    "rPrChange",
+    "pPrChange",
+    "tblPrChange",
+    "tblPrExChange",
+    "tblGridChange",
+    "trPrChange",
+    "tcPrChange",
+    "sectPrChange",
+    "sdtPrChange",
+    "numberingChange",
+    "moveFromRangeStart",
+    "moveFromRangeEnd",
+    "moveToRangeStart",
+    "moveToRangeEnd",
+    "customXmlInsRangeStart",
+    "customXmlInsRangeEnd",
+    "customXmlDelRangeStart",
+    "customXmlDelRangeEnd",
+    "customXmlMoveFromRangeStart",
+    "customXmlMoveFromRangeEnd",
+    "customXmlMoveToRangeStart",
+    "customXmlMoveToRangeEnd"
+  ]);
+  EXTENDED_CARRIERS = new Set([
+    "conflictIns",
+    "conflictDel",
+    "customXmlConflictInsRangeStart",
+    "customXmlConflictInsRangeEnd",
+    "customXmlConflictDelRangeStart",
+    "customXmlConflictDelRangeEnd"
+  ]);
+  RevisionIdExportCoverageError = class RevisionIdExportCoverageError extends Error {
+    constructor(partUri) {
+      super("Normalizing revision IDs requires the complete package ID inventory.");
+      this.partUri = partUri;
+      this.name = "RevisionIdExportCoverageError";
+    }
+  };
+});
+
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/pairing-markers.js
 function containsOnlyAllowedPairingMarkers(xml) {
   let remaining = xml.replace(/<!--[\s\S]*?-->/g, "").replace(/<\?xml[\s\S]*?\?>/g, "");
@@ -134626,77 +135053,6 @@ var init_native_sdt_groups = __esm(() => {
   MATERIAL_LEAVES = new Set(["t", "delText", "instrText", "delInstrText", "tab", "br", "cr", "drawing", "pict", "object", "fldChar", "footnoteReference", "endnoteReference", "sym"]);
 });
 
-// ../../../v2/editor-core/dist/document/internal/xml-text.js
-function decodeXmlText(text) {
-  return decodeXmlTextEntities(text, false);
-}
-function decodeXmlTextPreservingInvalidNumericEntities(text) {
-  return decodeXmlTextEntities(text, true);
-}
-function decodeXmlTextEntities(text, preserveInvalidNumericEntities) {
-  return text.replace(ENTITY_RE, (_, entity) => {
-    switch (entity) {
-      case "lt":
-        return "<";
-      case "gt":
-        return ">";
-      case "amp":
-        return "&";
-      case "quot":
-        return '"';
-      case "apos":
-        return "'";
-      default: {
-        const cp = entity.startsWith("#x") ? Number.parseInt(entity.slice(2), 16) : Number.parseInt(entity.slice(1), 10);
-        if (!Number.isFinite(cp))
-          return `&${entity};`;
-        if (preserveInvalidNumericEntities && (cp <= 0 || cp > 1114111 || cp >= 55296 && cp <= 57343))
-          return `&${entity};`;
-        return String.fromCodePoint(cp);
-      }
-    }
-  });
-}
-function decodeXmlAttributeValue(value) {
-  return decodeXmlText(value.replace(/[\t\n\r]/g, " "));
-}
-function semanticXmlAttributeValueSpace(value) {
-  return value.replace(/[\t\n\r]/g, " ");
-}
-function escapeXmlText(text) {
-  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
-function escapedXmlTextCodePointUtf8Width(codePoint) {
-  if (codePoint === 38)
-    return 5;
-  if (codePoint === 60 || codePoint === 62)
-    return 4;
-  if (codePoint <= 127)
-    return 1;
-  if (codePoint <= 2047)
-    return 2;
-  if (codePoint <= 65535)
-    return 3;
-  return 4;
-}
-function escapeXmlAttribute(text) {
-  return escapeXmlText(text).replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}
-function needsXmlSpacePreserve(text) {
-  return /^\s|\s$/.test(text);
-}
-function isUtf16Boundary(text, offset) {
-  if (offset <= 0 || offset >= text.length)
-    return true;
-  const previous = text.charCodeAt(offset - 1);
-  const next = text.charCodeAt(offset);
-  return !(previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343);
-}
-var ENTITY_RE;
-var init_xml_text = __esm(() => {
-  ENTITY_RE = /&(lt|gt|amp|quot|apos|#\d+|#x[0-9a-fA-F]+);/g;
-});
-
 // ../../../v2/editor-core/dist/document/internal/tracked-change-email.js
 function serializeTrackedChangeEmail(email3, wordPrefix, protectedXml = "") {
   if (!email3)
@@ -138817,129 +139173,6 @@ var init_paragraph_index = __esm(() => {
   _SDCompactParagraphRecordStore_storyIds = new WeakMap, _SDCompactParagraphRecordStore_storyRevisions = new WeakMap, _SDCompactParagraphRecordStore_partUris = new WeakMap, _SDCompactParagraphRecordStore_partRevisions = new WeakMap, _SDCompactParagraphRecordStore_blockIds = new WeakMap, _SDCompactParagraphRecordStore_baseTextStarts = new WeakMap, _SDCompactParagraphRecordStore_baseByteStarts = new WeakMap, _SDCompactParagraphRecordStore_baseByteEnds = new WeakMap, _SDCompactParagraphRecordStore_textLengths = new WeakMap, _SDCompactParagraphRecordStore_directBodyChildOrdinals = new WeakMap, _SDCompactParagraphRecordStore_containingBodyChildOrdinals = new WeakMap, _SDCompactParagraphRecordStore_flags = new WeakMap, _SDCompactParagraphRecordStore_stringPayloadBytes = new WeakMap, _SDCompactParagraphRecordStore_generation = new WeakMap;
 });
 
-// ../../../v2/editor-core/dist/util/sha256-sync.js
-function rightRotate(value, amount) {
-  return value >>> amount | value << 32 - amount;
-}
-function sha256HexSync(bytes) {
-  const bitLength = BigInt(bytes.length) * 8n;
-  const paddedLength = Math.ceil((bytes.length + 1 + 8) / 64) * 64;
-  const padded = new Uint8Array(paddedLength);
-  padded.set(bytes);
-  padded[bytes.length] = 128;
-  const paddedView = new DataView(padded.buffer);
-  paddedView.setUint32(paddedLength - 8, Number(bitLength >> 32n & 0xffffffffn));
-  paddedView.setUint32(paddedLength - 4, Number(bitLength & 0xffffffffn));
-  const hash2 = [...INITIAL_HASH];
-  const words = new Uint32Array(64);
-  for (let offset = 0;offset < paddedLength; offset += 64) {
-    for (let index = 0;index < 16; index += 1) {
-      words[index] = paddedView.getUint32(offset + index * 4);
-    }
-    for (let index = 16;index < 64; index += 1) {
-      const s0 = rightRotate(words[index - 15], 7) ^ rightRotate(words[index - 15], 18) ^ words[index - 15] >>> 3;
-      const s1 = rightRotate(words[index - 2], 17) ^ rightRotate(words[index - 2], 19) ^ words[index - 2] >>> 10;
-      words[index] = words[index - 16] + s0 + words[index - 7] + s1 >>> 0;
-    }
-    let [a, b, c, d, e, f, g, h] = hash2;
-    for (let index = 0;index < 64; index += 1) {
-      const s1 = rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25);
-      const ch = e & f ^ ~e & g;
-      const temp1 = h + s1 + ch + ROUND_CONSTANTS[index] + words[index] >>> 0;
-      const s0 = rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22);
-      const maj = a & b ^ a & c ^ b & c;
-      const temp2 = s0 + maj >>> 0;
-      h = g;
-      g = f;
-      f = e;
-      e = d + temp1 >>> 0;
-      d = c;
-      c = b;
-      b = a;
-      a = temp1 + temp2 >>> 0;
-    }
-    hash2[0] = hash2[0] + a >>> 0;
-    hash2[1] = hash2[1] + b >>> 0;
-    hash2[2] = hash2[2] + c >>> 0;
-    hash2[3] = hash2[3] + d >>> 0;
-    hash2[4] = hash2[4] + e >>> 0;
-    hash2[5] = hash2[5] + f >>> 0;
-    hash2[6] = hash2[6] + g >>> 0;
-    hash2[7] = hash2[7] + h >>> 0;
-  }
-  return hash2.map((value) => value.toString(16).padStart(8, "0")).join("");
-}
-var INITIAL_HASH, ROUND_CONSTANTS;
-var init_sha256_sync = __esm(() => {
-  INITIAL_HASH = [1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225];
-  ROUND_CONSTANTS = [
-    1116352408,
-    1899447441,
-    3049323471,
-    3921009573,
-    961987163,
-    1508970993,
-    2453635748,
-    2870763221,
-    3624381080,
-    310598401,
-    607225278,
-    1426881987,
-    1925078388,
-    2162078206,
-    2614888103,
-    3248222580,
-    3835390401,
-    4022224774,
-    264347078,
-    604807628,
-    770255983,
-    1249150122,
-    1555081692,
-    1996064986,
-    2554220882,
-    2821834349,
-    2952996808,
-    3210313671,
-    3336571891,
-    3584528711,
-    113926993,
-    338241895,
-    666307205,
-    773529912,
-    1294757372,
-    1396182291,
-    1695183700,
-    1986661051,
-    2177026350,
-    2456956037,
-    2730485921,
-    2820302411,
-    3259730800,
-    3345764771,
-    3516065817,
-    3600352804,
-    4094571909,
-    275423344,
-    430227734,
-    506948616,
-    659060556,
-    883997877,
-    958139571,
-    1322822218,
-    1537002063,
-    1747873779,
-    1955562222,
-    2024104815,
-    2227730452,
-    2361852424,
-    2428436474,
-    2756734187,
-    3204031479,
-    3329325298
-  ];
-});
-
 // ../../../v2/editor-core/dist/document/transactions/patch-substrate.js
 function normalizePartPatches(patches) {
   const sorted = [...patches].sort((a, b) => startOf(a) - startOf(b) || a.order - b.order);
@@ -168927,6 +169160,161 @@ var init_field_paragraph_range_deletion_groups = __esm(() => {
   init_logical_catalog();
 });
 
+// ../../../v2/editor-core/dist/document/transactions/tracked-changes/row-height-review-geometry.js
+function readRowHeightReviewCohorts(xml, options = {}) {
+  if (!["tblGridChange", "trPrChange", "tcPrChange"].every((name) => xml.includes(name)))
+    return [];
+  const parsed = collectXmlElementRanges(xml, { additionalNamespaces: options.additionalNamespaces });
+  if (parsed.errors.length)
+    return [];
+  const ranges = [...parsed.ranges].sort((a, b) => a.start - b.start || b.end - a.end);
+  const parents = new Map;
+  const children = new Map;
+  const stack = [];
+  for (const range of ranges) {
+    while (stack.length && range.start >= stack.at(-1).end)
+      stack.pop();
+    const parent = stack.at(-1);
+    if (parent) {
+      parents.set(range, parent);
+      const list = children.get(parent) ?? [];
+      list.push(range);
+      children.set(parent, list);
+    }
+    if (!range.tag.isSelfClosing)
+      stack.push(range);
+  }
+  const direct = (range, name) => (children.get(range) ?? []).filter((child) => word2(child, name));
+  const ancestor = (range, name) => {
+    let parent = parents.get(range);
+    while (parent) {
+      if (word2(parent, name))
+        return parent;
+      parent = parents.get(parent);
+    }
+    return;
+  };
+  const inSnapshot = (range) => {
+    let parent = parents.get(range);
+    while (parent) {
+      if (word2(parent) && parent.tag.localName.endsWith("Change"))
+        return true;
+      parent = parents.get(parent);
+    }
+    return false;
+  };
+  const signature2 = (range, omit2 = new Set) => {
+    const attributes = range.tag.attributes.filter((attribute) => attribute.namespaceUri !== "http://www.w3.org/2000/xmlns/").map((attribute) => [attribute.namespaceUri, attribute.localName, attribute.value]).sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
+    const content = [];
+    let cursor = range.openEnd;
+    for (const child of children.get(range) ?? []) {
+      const text = xml.slice(cursor, child.start);
+      if (text.trim())
+        content.push(text);
+      if (!omit2.has(child))
+        content.push(signature2(child, omit2));
+      cursor = child.end;
+    }
+    const tail = xml.slice(cursor, range.closeStart);
+    if (tail.trim())
+      content.push(tail);
+    return JSON.stringify([range.tag.namespaceUri, range.tag.localName, attributes, content]);
+  };
+  const snapshot = (change, name) => {
+    const inner = children.get(change) ?? [];
+    return inner.length === 1 && word2(inner[0], name) ? inner[0] : undefined;
+  };
+  const identity = (change) => buildReviewIdentity({ name: attr2(change, "author"), initials: attr2(change, "initials") });
+  const cohorts = [];
+  for (const table of ranges.filter((range) => word2(range, "tbl") && !inSnapshot(range))) {
+    const grids = direct(table, "tblGrid");
+    if (grids.length !== 1)
+      continue;
+    const grid = grids[0], gridChanges = direct(grid, "tblGridChange");
+    if (gridChanges.length !== 1)
+      continue;
+    const gridChange = gridChanges[0], oldGrid = snapshot(gridChange, "tblGrid");
+    if (!oldGrid || signature2(grid, new Set([gridChange])) !== signature2(oldGrid))
+      continue;
+    const rows = ranges.filter((range) => word2(range, "tr") && ancestor(range, "tbl") === table && !inSnapshot(range));
+    const rowChanges = [], cellChanges = [];
+    let actor;
+    let material = false, valid = true;
+    const acceptActor = (change) => {
+      const next = identity(change);
+      if (!next.hasName || actor && (!isSameReviewGroupIdentity(actor, next) || actor.initials !== next.initials))
+        return false;
+      actor ?? (actor = next);
+      return true;
+    };
+    for (const row of rows) {
+      const properties2 = direct(row, "trPr");
+      const property = properties2[0];
+      if (properties2.length > 1) {
+        valid = false;
+        break;
+      }
+      const changes = property ? direct(property, "trPrChange") : [];
+      if (!changes.length)
+        continue;
+      const change = changes[0], before = snapshot(change, "trPr");
+      if (changes.length !== 1 || !before || !acceptActor(change)) {
+        valid = false;
+        break;
+      }
+      const currentHeights = direct(property, "trHeight"), oldHeights = direct(before, "trHeight");
+      if (currentHeights.length > 1 || oldHeights.length > 1) {
+        valid = false;
+        break;
+      }
+      const afterOmit = new Set([change, ...currentHeights]), beforeOmit = new Set(oldHeights);
+      if (signature2(property, afterOmit) !== signature2(before, beforeOmit)) {
+        valid = false;
+        break;
+      }
+      const heightSignature = (height) => !height || attr2(height, "hRule") === "auto" ? "auto" : signature2(height);
+      material || (material = heightSignature(currentHeights[0]) !== heightSignature(oldHeights[0]));
+      const cells = ranges.filter((range) => word2(range, "tc") && ancestor(range, "tr") === row && ancestor(range, "tbl") === table && !inSnapshot(range));
+      if (!cells.length) {
+        valid = false;
+        break;
+      }
+      for (const cell of cells) {
+        const cellProperties = direct(cell, "tcPr");
+        if (cellProperties.length !== 1) {
+          valid = false;
+          break;
+        }
+        const cellProperty = cellProperties[0], changes2 = direct(cellProperty, "tcPrChange");
+        const cellChange = changes2[0], beforeCell = cellChange && snapshot(cellChange, "tcPr");
+        if (changes2.length !== 1 || !beforeCell || !acceptActor(cellChange) || signature2(cellProperty, new Set([cellChange])) !== signature2(beforeCell)) {
+          valid = false;
+          break;
+        }
+        cellChanges.push(cellChange);
+      }
+      if (!valid)
+        break;
+      rowChanges.push(change);
+    }
+    if (!valid || !actor || !rowChanges.length || !material && !options.allowAllNoop)
+      continue;
+    const owned = new Set([gridChange, ...rowChanges, ...cellChanges]);
+    const ids = [...owned].map((change) => attr2(change, "id")?.trim());
+    if (ids.some((id) => id === undefined || !/^[+-]?\d+$/.test(id)) || new Set(ids.map((id) => BigInt(id).toString())).size !== owned.size)
+      continue;
+    const otherProperties = ranges.some((range) => word2(range) && (["tblPrChange", "tblPrExChange", "tblGridChange", "trPrChange", "tcPrChange"].includes(range.tag.localName) || ["ins", "del", "cellIns", "cellDel", "cellMerge"].includes(range.tag.localName) && ["trPr", "tcPr"].some((name) => parents.get(range) && word2(parents.get(range), name))) && ancestor(range, "tbl") === table && !inSnapshot(range) && !owned.has(range));
+    if (otherProperties)
+      continue;
+    cohorts.push({ table, grid, gridChange, rowChanges, cellChanges, author: actor.name, initials: actor.initials, material });
+  }
+  return cohorts;
+}
+var word2 = (range, name) => (range.tag.namespaceUri === NS_W || range.tag.namespaceUri === NS_WSTRICT) && (name === undefined || range.tag.localName === name), attr2 = (range, name) => range.tag.attributes.find((attribute) => (attribute.namespaceUri === NS_W || attribute.namespaceUri === NS_WSTRICT) && attribute.localName === name)?.value;
+var init_row_height_review_geometry = __esm(() => {
+  init_xml_sax();
+});
+
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/image-paragraph-deletion-groups.js
 function projectDeletedImageParagraphGroups(input) {
   for (const [storyId, entries] of input.byStory) {
@@ -170692,6 +171080,17 @@ function projectStoryTableFormattingGroups(lookupContext, storyId, entries, inpu
   }
   if (candidates.length < 2)
     return;
+  for (const cohort of readRowHeightReviewCohorts(partXml)) {
+    const grid = candidates.find((candidate2) => candidate2.fragment.byteStart === cohort.gridChange.start);
+    const starts = new Set([...cohort.rowChanges, ...cohort.cellChanges].map((change) => change.start));
+    const members = candidates.filter((candidate2) => starts.has(candidate2.fragment.byteStart));
+    const head = members[0];
+    if (!grid || !head || members.length !== starts.size || members.some((member) => !isSameReviewGroupIdentity(head.identity, member.identity) || buildGroupIdentityKey(head.identity) !== buildGroupIdentityKey(member.identity) || head.initials !== member.initials))
+      continue;
+    grid.identity = head.identity;
+    grid.initials = head.initials;
+    grid.dependencyGrid = true;
+  }
   const grouped = new Map;
   for (const candidate2 of candidates) {
     const key2 = [
@@ -170714,7 +171113,7 @@ function materializeTableFormattingGroup(storyId, partUri, partXml, run, input)
   const childEntries = run.map((member) => member.entry);
   if (childEntries.some((entry) => entry.reviewGroup))
     return;
-  const head = run[0];
+  const head = run.find((member) => !member.dependencyGrid) ?? run[0];
   const carrierOrdinals = run.map((member) => member.carrierOrdinal).sort((a, b) => a - b);
   const tableParaId = findFirstParagraphIdInRange(partXml, head.table.start, head.table.end);
   const groupKeyBody = tableParaId ? `tbl:p:${tableParaId}|id:${buildGroupIdentityKey(head.identity)}|ini:${head.initials ?? ""}` : `to:${carrierOrdinals.join(",")}`;
@@ -171100,12 +171499,12 @@ function parsePropertyChildElements(innerXml) {
     }
     const attrs = new Map;
     const attrRe = /([\w.-]+):([\w.-]+)="([^"]*)"/g;
-    let attr2;
-    while (attr2 = attrRe.exec(match[4] ?? "")) {
-      const attrLocal2 = attr2[2];
+    let attr3;
+    while (attr3 = attrRe.exec(match[4] ?? "")) {
+      const attrLocal2 = attr3[2];
       if (attrLocal2.startsWith("rsid"))
         continue;
-      attrs.set(attrLocal2, attr2[3] ?? "");
+      attrs.set(attrLocal2, attr3[3] ?? "");
     }
     const element = { localName: localName2, attrs, children: [] };
     (stack.length > 0 ? stack[stack.length - 1].children : roots).push(element);
@@ -171715,22 +172114,10 @@ var init_review_groups = __esm(() => {
   init_field_paragraph_deletion_groups();
   init_bookmark_revision_groups();
   init_field_paragraph_range_deletion_groups();
+  init_row_height_review_geometry();
   init_image_paragraph_deletion_groups();
 });
 
-// ../../../v2/editor-core/dist/document/internal/xml-ignorable.js
-function appendXmlIgnorablePrefix(openTag, namespaceBindings, prefix, mcPrefix) {
-  for (const attribute of scanRawXmlAttributes(openTag)) {
-    if (attribute.localName === "Ignorable" && attribute.prefix && namespaceBindings[attribute.prefix] === NS_MC) {
-      return openTag.slice(0, attribute.valueEnd) + ` ${prefix}` + openTag.slice(attribute.valueEnd);
-    }
-  }
-  return openTag.slice(0, -1) + ` xmlns:${mcPrefix}="${NS_MC}" ${mcPrefix}:Ignorable="${prefix}">`;
-}
-var init_xml_ignorable = __esm(() => {
-  init_xml_sax();
-});
-
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/rewrite-groups.js
 function readRewriteGroupId(carrier) {
   const values = carrier.customAttributes?.filter((attribute) => attribute.namespaceUri === REWRITE_NAMESPACE && attribute.localName === "id");
@@ -175036,7 +175423,7 @@ function resolveMoveRangeMarkersForFragment(lookupContext, fragment3, partXml, m
       return bounds.startAfter <= fragment3.byteStart && bounds.endBefore >= fragment3.byteEnd;
     });
     if (containing.length === 1) {
-      matched.push({ id: containing[0].id, name: containing[0].name });
+      matched.push({ id: containing[0].id, logicalId: containing[0].logicalId, name: containing[0].name });
     }
   }
   matched.sort((a, b) => a.id.localeCompare(b.id));
@@ -175212,7 +175599,7 @@ function isSameRevisionFragment(head, candidate2, headNoteId, candidateNoteId) {
     return false;
   if (headNoteId !== candidateNoteId)
     return false;
-  if (!head.wId || revisionWIdIdentity(head.wId) !== revisionWIdIdentity(candidate2.wId))
+  if (!head.wId || revisionWIdIdentity(logicalRevisionWId(head)) !== revisionWIdIdentity(logicalRevisionWId(candidate2)))
     return false;
   if ((head.author.name || "") !== (candidate2.author.name || ""))
     return false;
@@ -175352,8 +175739,9 @@ function buildCoalescedSameRevisionLogical(lookupContext, fragments, noteId, par
     wordIdOther: extraWordIds,
     rsids
   };
-  if (contributingWordIds.length > 1) {
-    const coalescedId = buildLogicalId(head.storyId, head.kind, groupKind, ...contributingWordIds);
+  const identityWordIds = [...new Set(fragments.map(logicalRevisionWId).filter(Boolean))].sort();
+  if (identityWordIds.length > 1) {
+    const coalescedId = buildLogicalId(head.storyId, head.kind, groupKind, ...identityWordIds);
     mutable.id = coalescedId;
     mutable.revisionGroupId = coalescedId;
   }
@@ -175766,8 +176154,8 @@ function isGeneratedMoveApproximationPair(del, ins, partXml, splitLineage) {
     return false;
   if (splitLineage?.has(del.rsid) || splitLineage?.has(ins.rsid))
     return false;
-  const delId = numericWordId(del.wId);
-  const insId = numericWordId(ins.wId);
+  const delId = numericWordId(logicalRevisionWId(del));
+  const insId = numericWordId(logicalRevisionWId(ins));
   if (delId != null && insId != null && insId - delId >= 100)
     return true;
   const delDrawing = extractFirstDrawingXml(extractTrackedWrapperInnerXml(partXml.slice(del.byteStart, del.byteEnd), "del") ?? "");
@@ -175780,8 +176168,8 @@ function numericWordId(value) {
   return Number(value);
 }
 function deriveGeneratedMoveApproximationPairId(source, destination) {
-  const left = source.wId || source.rsid;
-  const right = destination.wId || destination.rsid;
+  const left = logicalRevisionWId(source) || source.rsid;
+  const right = logicalRevisionWId(destination) || destination.rsid;
   return `${left}|${right}`;
 }
 function publicMoveSourceIdsRsids(source, destination) {
@@ -176063,8 +176451,10 @@ function paragraphCarriesSoleInlineImage(paragraphXml) {
   return !/<[\w.-]+:t\b[^>]*>[\s\S]*?<\/[\w.-]+:t>/.test(withoutDrawingRuns);
 }
 function derivePairId(source, destination, sourceMoveRangeMarkers, destinationMoveRangeMarkers) {
-  const sourceMoveRangeIds = sourceMoveRangeMarkers.map((marker) => marker.id);
-  const destinationMoveRangeIds = destinationMoveRangeMarkers.map((marker) => marker.id);
+  sourceMoveRangeMarkers = sourceMoveRangeMarkers.filter((marker) => marker.logicalId !== null);
+  destinationMoveRangeMarkers = destinationMoveRangeMarkers.filter((marker) => marker.logicalId !== null);
+  const sourceMoveRangeIds = sourceMoveRangeMarkers.map((marker) => marker.logicalId ?? marker.id);
+  const destinationMoveRangeIds = destinationMoveRangeMarkers.map((marker) => marker.logicalId ?? marker.id);
   const sharedMoveRangeId = firstSharedMoveRangeId(sourceMoveRangeIds, destinationMoveRangeIds);
   if (sharedMoveRangeId) {
     return sharedMoveRangeId;
@@ -176073,11 +176463,11 @@ function derivePairId(source, destination, sourceMoveRangeMarkers, destinationMo
   if (sharedMoveRangeName) {
     return sharedMoveRangeName;
   }
-  if (source.wId && destination.wId && source.wId === destination.wId) {
-    return source.wId;
+  if (source.wId && destination.wId && logicalRevisionWId(source) === logicalRevisionWId(destination)) {
+    return logicalRevisionWId(source);
   }
-  const left = source.wId || source.rsid;
-  const right = destination.wId || destination.rsid;
+  const left = logicalRevisionWId(source) || source.rsid;
+  const right = logicalRevisionWId(destination) || destination.rsid;
   return `${left}|${right}`;
 }
 function buildImagePairLogical(del, ins, noteId, partXml) {
@@ -176252,10 +176642,10 @@ function buildPairedImageMoveLogical(deleteEntityKey, a, insertEntityKey, b, not
   };
 }
 function deriveStructuralMovePairId(source, destination, sourceKey, destinationKey) {
-  if (source.wId && destination.wId && source.wId === destination.wId)
-    return source.wId;
-  const left = source.wId || sourceKey;
-  const right = destination.wId || destinationKey;
+  if (source.wId && destination.wId && logicalRevisionWId(source) === logicalRevisionWId(destination))
+    return logicalRevisionWId(source);
+  const left = logicalRevisionWId(source) || sourceKey;
+  const right = logicalRevisionWId(destination) || destinationKey;
   return `${left}|${right}`;
 }
 function buildPairedImageStructuralLogical(deleteEntityKey, a, insertEntityKey, b, noteId, partXml) {
@@ -177712,6 +178102,7 @@ function decodeXmlText4(escaped) {
 }
 var TE5, PARAGRAPH_SEMANTIC_KEYS, LIST_INDENT_KEYS, RUN_SEMANTIC_KEYS, FORMATTING_CARRIER_ELEMENTS, TD22;
 var init_logical_catalog = __esm(() => {
+  init_revision_id_identity();
   init_enclosed_table_groups();
   init_catalog_xml_analysis();
   init_pairing_markers();
@@ -177822,7 +178213,7 @@ function collectMoveRangeNamesFromXml(xml, names) {
     onOpenTag: ({ tag }) => {
       if (tag.namespaceUri !== NS_W || tag.localName !== "moveFromRangeStart" && tag.localName !== "moveToRangeStart")
         return;
-      const name = tag.attributes.find((attr2) => attr2.namespaceUri === NS_W && attr2.localName === "name")?.value;
+      const name = tag.attributes.find((attr3) => attr3.namespaceUri === NS_W && attr3.localName === "name")?.value;
       if (name !== undefined)
         names.add(name);
     }
@@ -177890,7 +178281,7 @@ function projectTrackedChangesForExport(state, options) {
     for (const [partUri, xml] of projected) {
       const original = partXmlByUri.get(partUri);
       if (original !== undefined && xml !== original) {
-        overrides.set(partUri, ENCODER.encode(xml));
+        overrides.set(partUri, ENCODER2.encode(xml));
       }
     }
   } else {
@@ -177900,10 +178291,24 @@ function projectTrackedChangesForExport(state, options) {
         if (partUri === "/word/document.xml") {
           assertMetadataProjectionPreserved(state, xml, projected, options.mode);
         }
-        overrides.set(partUri, ENCODER.encode(projected));
+        overrides.set(partUri, ENCODER2.encode(projected));
       }
     }
   }
+  const effectiveParts = new Map(partXmlByUri);
+  for (const [partUri, bytes] of overrides)
+    effectiveParts.set(partUri, DECODER.decode(bytes));
+  for (const [partUri, xml] of normalizeRevisionIdsForWordExport(effectiveParts, options.excludedPartUris)) {
+    overrides.set(partUri, ENCODER2.encode(xml));
+    warnings.push({
+      code: "revision-id-normalized",
+      message: "Revision IDs outside Word’s integer range were normalized in the exported document. SuperDoc review identities are retained in ignorable metadata.",
+      feature: "trackedChanges",
+      severity: "warning",
+      affectedPartUri: partUri,
+      canProceed: true
+    });
+  }
   return { overrides, warnings };
 }
 function readTrackedChangeCatalogForExport(state, excludedPartUris, baseOverrides) {
@@ -177917,6 +178322,10 @@ function readWordXmlParts(state, baseOverrides) {
     const effectiveBytes = baseOverrides?.get(partUri) ?? bytes;
     parts.set(partUri, DECODER.decode(effectiveBytes));
   }
+  for (const [partUri, bytes] of baseOverrides ?? []) {
+    if (isWordXmlPart(partUri) && !parts.has(partUri))
+      parts.set(partUri, DECODER.decode(bytes));
+  }
   return parts;
 }
 function isWordXmlPart(partUri) {
@@ -178321,15 +178730,16 @@ function convertDeletedTextToVisibleText(xml) {
 function escapeRegExp6(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-var DECODER, ENCODER;
+var DECODER, ENCODER2;
 var init_export_projection = __esm(() => {
   init_xml_sax();
   init_metadata_projection();
+  init_revision_id_export();
   init_catalog3();
   init_logical_catalog();
   init_move_stamps();
   DECODER = new TextDecoder;
-  ENCODER = new TextEncoder;
+  ENCODER2 = new TextEncoder;
 });
 
 // ../../../v2/editor-core/dist/document/transactions/word-text-payload.js
@@ -178876,7 +179286,7 @@ function closeTableCellBodyNamespaces(xml, source, destination) {
     let attributes = "";
     for (const [prefix, uri] of Object.entries(source)) {
       const name = prefix ? `xmlns:${prefix}` : "xmlns";
-      if (prefix === "xml" || prefix === "xmlns" || destination[prefix] === uri || root.tag.attributes.some((attr2) => attr2.name === name))
+      if (prefix === "xml" || prefix === "xmlns" || destination[prefix] === uri || root.tag.attributes.some((attr3) => attr3.name === name))
         continue;
       attributes += ` ${name}="${escapeXmlAttribute(uri)}"`;
     }
@@ -178947,8 +179357,8 @@ function collectOwnershipElements(xml, namespaceBindings, work) {
       if (work)
         work.visitedElements++;
       const parent = ancestors.at(-1)?.event.tag;
-      const word2 = event.tag.namespaceUri === NS_W;
-      const retain = parent?.namespaceUri === NS_W && parent.localName === "sdt" || word2 && (["sdt", "sdtContent", "sdtPr", "sdtEndPr", "customXml"].includes(event.tag.localName) || event.tag.localName === "id" && parent?.namespaceUri === NS_W && parent.localName === "sdtPr" || /^customXml(?:Ins|Del|MoveFrom|MoveTo)Range(?:Start|End)$/.test(event.tag.localName));
+      const word3 = event.tag.namespaceUri === NS_W;
+      const retain = parent?.namespaceUri === NS_W && parent.localName === "sdt" || word3 && (["sdt", "sdtContent", "sdtPr", "sdtEndPr", "customXml"].includes(event.tag.localName) || event.tag.localName === "id" && parent?.namespaceUri === NS_W && parent.localName === "sdtPr" || /^customXml(?:Ins|Del|MoveFrom|MoveTo)Range(?:Start|End)$/.test(event.tag.localName));
       if (retain && work)
         work.retainedElements++;
       if (event.tag.isSelfClosing) {
@@ -180345,8 +180755,8 @@ function assembleTrackedChangeParagraphAnalyses(input) {
     fragment3.logicalIdHint = mintTrackedTextLogicalIdHint({
       owners: textOwners,
       kind: fragment3.kind,
-      rsid: fragment3.rsid,
-      wId: fragment3.wId,
+      rsid: fragment3.logicalRsid ?? fragment3.rsid,
+      wId: logicalRevisionWId(fragment3),
       occurrence: 0,
       author: fragment3.author.name,
       date: fragment3.date,
@@ -180354,7 +180764,7 @@ function assembleTrackedChangeParagraphAnalyses(input) {
     });
   for (const fragment3 of structural) {
     const source = fragment3.sourceMetadata;
-    const identity = `${fragment3.structuralKind}|${rawStructuralRevisionIdentityKey({ ...source, wId: fragment3.wId })}`;
+    const identity = `${fragment3.structuralKind}|${rawStructuralRevisionIdentityKey({ ...source, wId: logicalRevisionWId(fragment3) })}`;
     const occurrence = (structuralOccurrences.get(identity) ?? 0) + 1;
     structuralOccurrences.set(identity, occurrence);
     fragment3.identityOccurrence = occurrence;
@@ -180363,7 +180773,7 @@ function assembleTrackedChangeParagraphAnalyses(input) {
       locatorOccurrences.set(identity, locator);
       fragment3.locatorOccurrence = locator;
     }
-    fragment3.entityKey = structuralOccurrenceEntityKey(input.storyId, fragment3.structuralKind, { ...source, wId: fragment3.wId }, occurrence);
+    fragment3.entityKey = structuralOccurrenceEntityKey(input.storyId, fragment3.structuralKind, { ...source, wId: logicalRevisionWId(fragment3) }, occurrence);
   }
   return catalogFromScan({
     fragments,
@@ -180433,6 +180843,27 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
   const structuralScan = yield* buildElementRangeIndexWork(xml, initialNamespaceBindings, shared?.analysis?.ranges, shared?.analysis ? readTrackedCatalogXmlTopology(shared.analysis, xml) : null);
   endElementIndex();
   const elementIndex = structuralScan.elementIndex;
+  const logicalWIds = yield* readRevisionIdentityAliasesWork(xml, partUri, structuralScan.revisionIdentityElements, structuralScan.namespaceBindingsByTagStart);
+  if (logicalWIds.size) {
+    const aliasesByOpenEnd = new Map;
+    for (const element of structuralScan.revisionIdentityElements) {
+      yield;
+      const alias = logicalWIds.get(element.start);
+      if (alias)
+        aliasesByOpenEnd.set(element.openEnd, alias);
+    }
+    for (const side of [structuralScan.moveRangeMarkers.moveFrom, structuralScan.moveRangeMarkers.moveTo]) {
+      for (const ranges of side.values())
+        for (const range of ranges) {
+          yield;
+          const start = range.startAfter == null ? undefined : aliasesByOpenEnd.get(range.startAfter);
+          const end = range.endBefore == null ? undefined : logicalWIds.get(range.endBefore);
+          if (start && end && canonicalTrackedTextRevisionWId(start) === canonicalTrackedTextRevisionWId(end)) {
+            range.logicalId = parseRevisionWId(normalizeXmlRevisionId(start)) === null ? null : canonicalTrackedTextRevisionWId(start);
+          }
+        }
+    }
+  }
   const wordTrackedMarkupTagStarts = structuralScan.wordTrackedMarkupTagStarts;
   const wordTrackedMarkupTags = structuralScan.wordTrackedMarkupTags;
   const namespaceBindingsByTagStart = structuralScan.namespaceBindingsByTagStart;
@@ -180482,12 +180913,13 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
   const pushStructural = (kind, markerStart, markerEnd, attrs, sourceWrapperKind, tagPrefix, enclosing, innerRange, containerMeta) => {
     const namespaceBindings = namespaceBindingsByTagStart.get(markerStart);
     const wId = readNamespacedAttr(attrs, namespaceBindings, "id") ?? "";
+    const logicalWId = logicalWIds.get(markerStart);
     const sourceAuthor = readNamespacedAttr(attrs, namespaceBindings, "author") ?? "";
     const sourceInitials = readNamespacedAttr(attrs, namespaceBindings, "initials");
     const sourceAuthorEmail = readRawTrackedChangeEmail(attrs, namespaceBindings);
     const sourceDate = readNamespacedAttr(attrs, namespaceBindings, "date") ?? "";
     const structuralIdentity = rawStructuralRevisionIdentity({
-      wId,
+      wId: logicalWId ?? wId,
       author: sourceAuthor,
       date: sourceDate
     });
@@ -180498,7 +180930,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       date: sourceDate
     });
     const rsid = sourceWrapperKind === "del" ? readNamespacedAttr(attrs, namespaceBindings, "rsidDel") : sourceWrapperKind === "ins" ? readNamespacedAttr(attrs, namespaceBindings, "rsidR") : null;
-    const identityOccurrence = nextStructuralIdentityOccurrence(kind, sourceAuthor, sourceDate, wId);
+    const identityOccurrence = nextStructuralIdentityOccurrence(kind, sourceAuthor, sourceDate, logicalWId ?? wId);
     const tableStart = containerMeta?.enclosingTableStart;
     const rowGroupedByTable = tableStart != null && (kind === "row-insertion" || kind === "row-deletion");
     const cellGroupedByTable = wId.length > 0 && tableStart != null && (kind === "cell-insertion" || kind === "cell-deletion" || kind === "cell-merge" || kind === "cell-split");
@@ -180509,7 +180941,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       author: structuralIdentity.author,
       date: structuralIdentity.date,
       tableToken
-    }) : cellGroupedByTable ? `struct:${storyId}|${kind}|${structuralIdentity.author}|${structuralIdentity.date}|${structuralIdentity.wId}|tbl:${tableToken}` : structuralOccurrenceEntityKey(storyId, kind, { wId, author: sourceAuthor, date: sourceDate }, identityOccurrence);
+    }) : cellGroupedByTable ? `struct:${storyId}|${kind}|${structuralIdentity.author}|${structuralIdentity.date}|${structuralIdentity.wId}|tbl:${tableToken}` : structuralOccurrenceEntityKey(storyId, kind, { wId: logicalWId ?? wId, author: sourceAuthor, date: sourceDate }, identityOccurrence);
     const fragment3 = {
       entityKey,
       identityOccurrence,
@@ -180522,6 +180954,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       authorEmail,
       date: date6,
       wId,
+      ...logicalWId ? { logicalWId } : {},
       sourceMetadata: {
         author: sourceAuthor,
         initials: sourceInitials,
@@ -180696,6 +181129,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       continue;
     }
     const wId = readNamespacedAttr(wrapperAttrs, namespaceBindings, "id") ?? "";
+    const logicalWId = logicalWIds.get(tag.start);
     const sourceAuthor = readNamespacedAttr(wrapperAttrs, namespaceBindings, "author") ?? "";
     const sourceInitials = readNamespacedAttr(wrapperAttrs, namespaceBindings, "initials");
     const sourceAuthorEmail = readRawTrackedChangeEmail(wrapperAttrs, namespaceBindings);
@@ -180714,7 +181148,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
     const subtype = formattingSubtypeForWrapper(wrapperLocal, beforeInnerXml, afterInnerXml, namespaceBindings, namespaceBindingsByTagStart.get(outer.start));
     occurrencesBySubtype[subtype] += 1;
     const occurrenceIndex = occurrencesBySubtype[subtype];
-    const entityKey = wId.length > 0 ? buildFormattingRevisionEntityKey({ storyId, subtype, author, date: date6, wId }) : `fmt:${storyId}|${subtype}|${author}|${date6}|#${occurrenceIndex}`;
+    const entityKey = wId.length > 0 ? buildFormattingRevisionEntityKey({ storyId, subtype, author, date: date6, wId: logicalWId ?? wId }) : `fmt:${storyId}|${subtype}|${author}|${date6}|#${occurrenceIndex}`;
     formatting.push({
       entityKey,
       partUri,
@@ -180740,6 +181174,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       authorEmail,
       date: date6,
       wId,
+      ...logicalWId ? { logicalWId } : {},
       sourceMetadata: {
         author: sourceAuthor,
         initials: sourceInitials,
@@ -180816,6 +181251,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
         const sourceAuthorEmail2 = readRawTrackedChangeEmail(attrs, namespaceBindings);
         const sourceDate2 = readNamespacedAttr(attrs, namespaceBindings, "date") ?? "";
         const wId2 = readNamespacedAttr(attrs, namespaceBindings, "id") ?? "";
+        const logicalWId2 = logicalWIds.get(byteStart);
         const { author: author2, initials: initials2, authorEmail: authorEmail2, date: date7 } = semanticTrackedChangeMetadata({
           author: sourceAuthor2,
           initials: sourceInitials2,
@@ -180823,9 +181259,9 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
           date: sourceDate2
         });
         const rsid2 = kind === "del" ? readNamespacedAttr(attrs, namespaceBindings, "rsidDel") : readNamespacedAttr(attrs, namespaceBindings, "rsidR");
-        const identityOccurrence = nextStructuralIdentityOccurrence(structuralKind, sourceAuthor2, sourceDate2, wId2);
+        const identityOccurrence = nextStructuralIdentityOccurrence(structuralKind, sourceAuthor2, sourceDate2, logicalWId2 ?? wId2);
         const locatorOccurrence = nextBlockStructuralLocatorOccurrence(structuralKind, sourceAuthor2, sourceDate2, wId2);
-        const entityKey = structuralOccurrenceEntityKey(storyId, structuralKind, { wId: wId2, author: sourceAuthor2, date: sourceDate2 }, identityOccurrence);
+        const entityKey = structuralOccurrenceEntityKey(storyId, structuralKind, { wId: logicalWId2 ?? wId2, author: sourceAuthor2, date: sourceDate2 }, identityOccurrence);
         structural.push({
           entityKey,
           identityOccurrence,
@@ -180841,6 +181277,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
           authorEmail: authorEmail2,
           date: date7,
           wId: wId2,
+          ...logicalWId2 ? { logicalWId: logicalWId2 } : {},
           sourceMetadata: {
             author: sourceAuthor2,
             initials: sourceInitials2,
@@ -180878,6 +181315,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       date: sourceDate
     });
     const wId = readNamespacedAttr(attrs, namespaceBindings, "id") ?? "";
+    const logicalWId = logicalWIds.get(byteStart);
     const rawExplicitRsid = readNamespacedAttr(attrs, namespaceBindings, "rsidR") ?? readNamespacedAttr(attrs, namespaceBindings, "rsidDel");
     const explicitRsid = rawExplicitRsid ? normalizeTrackedChangeRsid({ storyId, kind, rsid: rawExplicitRsid }) : null;
     const rsid = explicitRsid && explicitRsid.length > 0 ? explicitRsid : synthesizeTrackedChangeRsidFromRawMetadata({
@@ -180888,11 +181326,19 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       wId,
       occurrence
     });
+    const logicalRsid = logicalWId && !explicitRsid ? synthesizeTrackedChangeRsidFromRawMetadata({
+      storyId,
+      kind,
+      author: sourceAuthor,
+      date: sourceDate,
+      wId: logicalWId,
+      occurrence
+    }) : rsid;
     const logicalIdHint = mintTrackedTextLogicalIdHint({
       owners: textLogicalIdHintOwners,
       kind,
-      rsid,
-      wId,
+      rsid: logicalRsid,
+      wId: logicalWId ?? wId,
       occurrence,
       author,
       date: date6,
@@ -180901,6 +181347,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
     fragments.push({
       rsid,
       logicalIdHint,
+      ...logicalWId ? { logicalRsid } : {},
       partUri,
       storyId,
       byteStart,
@@ -180918,6 +181365,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       authorEmail,
       date: date6,
       wId,
+      ...logicalWId ? { logicalWId } : {},
       sourceMetadata: {
         author: sourceAuthor,
         initials: sourceInitials,
@@ -180944,6 +181392,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
         continue;
       const nestedNamespaceBindings = namespaceBindingsByTagStart.get(nestedByteStart);
       const nestedWId = readNamespacedAttr(nestedAttrs, nestedNamespaceBindings, "id") ?? "";
+      const nestedLogicalWId = logicalWIds.get(nestedByteStart);
       const nestedSourceAuthor = readNamespacedAttr(nestedAttrs, nestedNamespaceBindings, "author") ?? "";
       const nestedSourceInitials = readNamespacedAttr(nestedAttrs, nestedNamespaceBindings, "initials");
       const nestedSourceAuthorEmail = readRawTrackedChangeEmail(nestedAttrs, nestedNamespaceBindings);
@@ -180964,11 +181413,19 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
         wId: nestedWId,
         occurrence
       });
+      const nestedLogicalRsid = nestedLogicalWId && !nestedExplicitRsid ? synthesizeTrackedChangeRsidFromRawMetadata({
+        storyId,
+        kind: nestedKind,
+        author: nestedSourceAuthor,
+        date: nestedSourceDate,
+        wId: nestedLogicalWId,
+        occurrence
+      }) : nestedRsid;
       const nestedLogicalIdHint = mintTrackedTextLogicalIdHint({
         owners: textLogicalIdHintOwners,
         kind: nestedKind,
-        rsid: nestedRsid,
-        wId: nestedWId,
+        rsid: nestedLogicalRsid,
+        wId: nestedLogicalWId ?? nestedWId,
         occurrence,
         author: nestedAuthor,
         date: nestedDate,
@@ -180977,6 +181434,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       fragments.push({
         rsid: nestedRsid,
         logicalIdHint: nestedLogicalIdHint,
+        ...nestedLogicalWId ? { logicalRsid: nestedLogicalRsid } : {},
         partUri,
         storyId,
         byteStart: nestedByteStart,
@@ -180994,6 +181452,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
         authorEmail: nestedAuthorEmail,
         date: nestedDate,
         wId: nestedWId,
+        ...nestedLogicalWId ? { logicalWId: nestedLogicalWId } : {},
         sourceMetadata: {
           author: nestedSourceAuthor,
           initials: nestedSourceInitials,
@@ -181010,8 +181469,9 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
     yield;
     const insertion = group.kind === "ins" || group.kind === "moveTo";
     const structuralKind = insertion ? "content-control-insertion" : "content-control-deletion";
+    const logicalWordIds = group.ranges.map((range) => logicalWIds.get(range.startMarker.start) ?? range.wId);
     structural.push({
-      entityKey: `native-sdt:${storyId}|${group.kind}|${group.wordIds.join(",")}|${group.author}|${group.date}`,
+      entityKey: `native-sdt:${storyId}|${group.kind}|${logicalWordIds.join(",")}|${group.author}|${group.date}`,
       partUri,
       storyId,
       structuralKind,
@@ -181020,6 +181480,7 @@ function* scanFragmentsWork(xml, partUri, storyId, sourceByteBase = 0, initialNa
       author: { name: group.author, initials: null },
       date: group.date,
       wId: group.wordIds[0],
+      ...logicalWordIds[0] !== group.wordIds[0] ? { logicalWId: logicalWordIds[0] } : {},
       sourceWrapperKind: insertion ? "ins" : "del",
       tagPrefix: group.tagPrefix,
       nativeSdtOwnership: group
@@ -181575,6 +182036,8 @@ function* buildElementRangeIndexWork(xml, initialNamespaceBindings = {}, sharedR
   const trackedTextTokens = [];
   const emptyPropertyRevisionEnds = new Map;
   const bookmarkBoundaries = [];
+  const revisionIdentityElements = [];
+  const hasRevisionIdentity = xml.includes("binding");
   const namespaceBindingsByTagStart = new Map;
   const stack = [];
   const accumulators = {
@@ -181604,6 +182067,10 @@ function* buildElementRangeIndexWork(xml, initialNamespaceBindings = {}, sharedR
     const declarations = isClose || tag.namespaceBindings ? null : readNamespaceDeclarations2(attrs);
     const namespaceBindings = tag.namespaceBindings ?? (!declarations || Object.keys(declarations).length === 0 ? parentBindings : createNamespaceBindings(parentBindings, declarations));
     const wordTrackedMarkup = !isClose && TRACKED_CHANGE_MARKUP_LOCAL_NAMES.has(localName2) && namespaceBindings[prefix] === NS_W;
+    if (hasRevisionIdentity && !isClose && namespaceBindings[prefix] === NS_W) {
+      revisionIdentityElements.push({ start: tag.start, openEnd: tag.end, namespaceUri: NS_W, localName: localName2 });
+      namespaceBindingsByTagStart.set(tag.start, namespaceBindings);
+    }
     if (!isClose && (wordTrackedMarkup || localName2 === "p" || localName2 === "hyperlink")) {
       namespaceBindingsByTagStart.set(tag.start, namespaceBindings);
     }
@@ -181710,6 +182177,7 @@ function* buildElementRangeIndexWork(xml, initialNamespaceBindings = {}, sharedR
     }
   }
   return {
+    revisionIdentityElements,
     elementIndex: {
       entries,
       starts: entries.map((entry) => entry.start),
@@ -181758,6 +182226,8 @@ function* projectCanonicalElementRangesWork(xml, ranges, sharedTopology) {
   const trackedTextTokens = [];
   const emptyPropertyRevisionEnds = new Map;
   const bookmarkBoundaries = [];
+  const revisionIdentityElements = [];
+  const hasRevisionIdentity = xml.includes("binding");
   const namespaceBindingsByTagStart = new Map;
   const ancestors = [];
   const markerEvents = [];
@@ -181778,6 +182248,10 @@ function* projectCanonicalElementRangesWork(xml, ranges, sharedTopology) {
     const { tag, namespaceBindings, start, openEnd, closeStart, end } = range;
     const { localName: localName2, prefix, namespaceUri, isSelfClosing } = tag;
     const wordTrackedMarkup = namespaceUri === NS_W && TRACKED_CHANGE_MARKUP_LOCAL_NAMES.has(localName2);
+    if (hasRevisionIdentity && namespaceUri === NS_W) {
+      revisionIdentityElements.push({ start, openEnd, namespaceUri, localName: localName2 });
+      namespaceBindingsByTagStart.set(start, namespaceBindings);
+    }
     if (wordTrackedMarkup || localName2 === "p" || localName2 === "hyperlink") {
       namespaceBindingsByTagStart.set(start, namespaceBindings);
     }
@@ -181865,6 +182339,7 @@ function* projectCanonicalElementRangesWork(xml, ranges, sharedTopology) {
   }
   recordSDTxPerf("trackedCatalogSharedXmlReuses", 1);
   return {
+    revisionIdentityElements,
     elementIndex: { entries, starts, byStart, textContainers: { entries: containers, starts: containerStarts, maxEnds } },
     moveRangeMarkers,
     bookmarkBoundaries,
@@ -181918,6 +182393,8 @@ function customAttributesField(attrs, namespaceBindings) {
     const namespaceUri = namespaceBindings[attribute.prefix];
     if (!namespaceUri || !isUnknownExtensionNamespace(namespaceUri))
       continue;
+    if (namespaceUri === REVISION_IDENTITY_NAMESPACE && (attribute.localName === "id" || attribute.localName === "binding" || attribute.localName === "lexical"))
+      continue;
     if (namespaceUri === TRACKED_CHANGE_NAMESPACE && (attribute.localName === "rsidR" || attribute.localName === "rsidDel"))
       continue;
     customAttributes.push({
@@ -182065,6 +182542,7 @@ function normalizeTrackedChangeRsid(input) {
 }
 var TD25, TE6, TRACKED_CHANGE_CATALOG_REGISTRY_KEY = "__sd:tracked-change-rsid-catalog", TRACKED_CHANGE_PART_SCAN_REGISTRY_KEY = "__sd:tracked-change-part-scan-cache", TRACKED_CHANGE_CATALOG_TAG, TRACKED_CHANGE_PART_SCAN_TAG, paragraphAnalyses, paragraphAnalysisSuffix = "</w:body></w:document>", TRACKED_CHANGE_MARKUP_LOCAL_NAMES, TRACKED_CHANGE_ELEMENT_CANDIDATE, RAW_CATALOG_CHECKPOINT_BATCH = 16;
 var init_catalog3 = __esm(() => {
+  init_revision_id_identity();
   init_xml_range_topology();
   init_resident_paragraphs();
   init_resident_paragraph_ownership();
@@ -183952,21 +184430,21 @@ function measureTrackedLength(xml, namespaceBindings) {
 function sourceKeys(xml, storyId, inheritedNamespaces = {}) {
   const keys = new Set;
   for (const match of xml.matchAll(/<(?:[^<>\s/:]+:)?(?:rPrChange|pPrChange|tblPrChange|tblPrExChange|trPrChange|tcPrChange|sectPrChange)\b[^>]*>/g)) {
-    for (const attr2 of scanRawXmlAttributes(match[0]))
-      if (attr2.localName === "id" && attr2.value) {
-        const id = decodeXmlText(attr2.value);
+    for (const attr3 of scanRawXmlAttributes(match[0]))
+      if (attr3.localName === "id" && attr3.value) {
+        const id = decodeXmlText(attr3.value);
         keys.add(id);
         keys.add(canonicalTrackedTextRevisionWId(id));
       }
   }
   for (const match of xml.matchAll(/<w:(ins|del|moveFrom|moveTo|rPrChange|pPrChange|tblPrChange|trPrChange|tcPrChange)\b[^>]*>/g)) {
-    const attr2 = (name) => new RegExp(`\\bw:${name}=["']([^"']*)["']`).exec(match[0])?.[1] ?? "";
-    const wId = attr2("id");
+    const attr3 = (name) => new RegExp(`\\bw:${name}=["']([^"']*)["']`).exec(match[0])?.[1] ?? "";
+    const wId = attr3("id");
     if (wId)
       keys.add(canonicalTrackedTextRevisionWId(wId));
     if (match[1] === "ins" || match[1] === "del") {
       const localName2 = match[1] === "ins" ? "rsidR" : "rsidDel";
-      let rsid = attr2(localName2);
+      let rsid = attr3(localName2);
       if (!rsid) {
         const namespaces = { ...inheritedNamespaces, ...Object.fromEntries([...match[0].matchAll(/xmlns:([\w.-]+)=["']([^"']*)["']/g)].map((binding) => [binding[1], binding[2]])) };
         rsid = readXmlAttributeValueByNamespace(match[0], namespaces, "urn:superdoc:tracked-change:1", localName2) ?? "";
@@ -183978,8 +184456,8 @@ function sourceKeys(xml, storyId, inheritedNamespaces = {}) {
           storyId,
           kind: match[1],
           wId,
-          author: attr2("author"),
-          date: attr2("date"),
+          author: attr3("author"),
+          date: attr3("date"),
           occurrence: 0
         }));
     }
@@ -184356,12 +184834,12 @@ function readResidentReviewComponent(state, mode, sourceIds, includeCoordinates
         return all;
       let found = false;
       for (const wrapper of owner2.xml.matchAll(/<w:(ins|del)\b([^>]*)>/g)) {
-        const attr2 = (name) => new RegExp(`\\bw:${name}=["']([^"']*)["']`).exec(wrapper[2])?.[1] ?? "";
-        const rsid = attr2(wrapper[1] === "ins" ? "rsidR" : "rsidDel");
+        const attr3 = (name) => new RegExp(`\\bw:${name}=["']([^"']*)["']`).exec(wrapper[2])?.[1] ?? "";
+        const rsid = attr3(wrapper[1] === "ins" ? "rsidR" : "rsidDel");
         const normalized = rsid && normalizeTrackedChangeRsid({ storyId: review.storyId, kind: wrapper[1], rsid });
         if (normalized === key3)
           return all;
-        if (canonicalTrackedTextRevisionWId(attr2("id")) !== key3)
+        if (canonicalTrackedTextRevisionWId(attr3("id")) !== key3)
           continue;
         if (!rsid || hasParagraphBridge(owner2))
           return all;
@@ -196651,7 +197129,7 @@ function buildCommentMarkerIndex(partXml, original) {
   return { allByWId, ordered: [...allByWId.values()].flat().sort((left, right) => left.byteStart - right.byteStart) };
 }
 function buildStagedCommentMarkerFact(input) {
-  const word2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+  const word3 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
   const kinds = new Set(["commentRangeStart", "commentRangeEnd", "commentReference"]);
   if (input.original.errors.length || !/^\uFEFF?\s*<\?xml\b/.test(input.sourceXml))
     return null;
@@ -196664,20 +197142,20 @@ function buildStagedCommentMarkerFact(input) {
     const { tag } = range;
     if (!root || range.start < root.start)
       root = range;
-    if (tag.namespaceUri === word2 && tag.prefix !== "w")
+    if (tag.namespaceUri === word3 && tag.prefix !== "w")
       return null;
-    if (tag.prefix === "w" && tag.namespaceUri !== word2)
+    if (tag.prefix === "w" && tag.namespaceUri !== word3)
       return null;
     if (byStart.has(range.start))
       owners.set(range.start, range);
-    if (tag.namespaceUri !== word2 || !kinds.has(tag.localName))
+    if (tag.namespaceUri !== word3 || !kinds.has(tag.localName))
       continue;
-    const id = tag.attributes.find((attr2) => attr2.namespaceUri === word2 && attr2.localName === "id");
+    const id = tag.attributes.find((attr3) => attr3.namespaceUri === word3 && attr3.localName === "id");
     if (tag.prefix !== "w" || !tag.isSelfClosing || !id?.value || id.prefix !== "w")
       return null;
     originalMarkers.push({ commentWId: id.value, kind: tag.localName, byteStart: range.start, byteEnd: range.end });
   }
-  if (!root || root.tag.prefix !== "w" || root.tag.namespaceUri !== word2 || root.namespaceBindings.w !== word2)
+  if (!root || root.tag.prefix !== "w" || root.tag.namespaceUri !== word3 || root.namespaceBindings.w !== word3)
     return null;
   originalMarkers.sort((left, right) => left.byteStart - right.byteStart);
   if (originalMarkers.length !== input.markerIndex.ordered.length || originalMarkers.some((hit, index) => {
@@ -196691,7 +197169,7 @@ function buildStagedCommentMarkerFact(input) {
   let previousEnd = 0;
   for (const edit of edits) {
     const owner = owners.get(edit.start);
-    if (!owner || owner.end !== edit.end || owner.tag.namespaceUri !== word2 || owner.tag.prefix !== "w" || !["ins", "del"].includes(owner.tag.localName) || owner.namespaceBindings.w !== word2 || edit.start < previousEnd || edit.end <= edit.start || edit.end > input.sourceXml.length || /\bxmlns(?::[\w.-]+)?\s*=/.test(input.sourceXml.slice(edit.start, edit.end)) || /\bxmlns(?::[\w.-]+)?\s*=/.test(edit.replacement))
+    if (!owner || owner.end !== edit.end || owner.tag.namespaceUri !== word3 || owner.tag.prefix !== "w" || !["ins", "del"].includes(owner.tag.localName) || owner.namespaceBindings.w !== word3 || edit.start < previousEnd || edit.end <= edit.start || edit.end > input.sourceXml.length || /\bxmlns(?::[\w.-]+)?\s*=/.test(input.sourceXml.slice(edit.start, edit.end)) || /\bxmlns(?::[\w.-]+)?\s*=/.test(edit.replacement))
       return null;
     while (cursor < originalMarkers.length && originalMarkers[cursor].byteStart < edit.start) {
       const hit = originalMarkers[cursor++];
@@ -196711,9 +197189,9 @@ function buildStagedCommentMarkerFact(input) {
         fragment: true,
         additionalNamespaces: owner.namespaceBindings,
         onOpenTag({ tag, start, end }) {
-          if (tag.namespaceUri !== word2 || !kinds.has(tag.localName))
+          if (tag.namespaceUri !== word3 || !kinds.has(tag.localName))
             return;
-          const id = tag.attributes.find((attr2) => attr2.namespaceUri === word2 && attr2.localName === "id");
+          const id = tag.attributes.find((attr3) => attr3.namespaceUri === word3 && attr3.localName === "id");
           if (tag.prefix !== "w" || !tag.isSelfClosing || !id?.value || id.prefix !== "w") {
             unsupported2 = true;
             return;
@@ -196919,14 +197397,14 @@ function collectAllCommentMarkers(partXml, original) {
   return out;
 }
 function readCommentMarkerHits(xml, original) {
-  const word2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+  const word3 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
   if (original && /^\uFEFF?\s*<\?xml\b/.test(xml)) {
     const parsed2 = original.analysis.original(original.partUri, xml);
     if (parsed2.errors.length === 0) {
-      const markers = parsed2.ranges.filter(({ tag }) => tag.namespaceUri === word2 && ["commentRangeStart", "commentRangeEnd", "commentReference"].includes(tag.localName));
+      const markers = parsed2.ranges.filter(({ tag }) => tag.namespaceUri === word3 && ["commentRangeStart", "commentRangeEnd", "commentReference"].includes(tag.localName));
       if (markers.every(({ tag }) => tag.isSelfClosing)) {
         return markers.flatMap(({ tag, start, end }) => {
-          const id = tag.attributes.find((attr2) => attr2.namespaceUri === word2 && attr2.localName === "id")?.value;
+          const id = tag.attributes.find((attr3) => attr3.namespaceUri === word3 && attr3.localName === "id")?.value;
           return id ? [{ commentWId: id, kind: tag.localName, byteStart: start, byteEnd: end }] : [];
         });
       }
@@ -196936,11 +197414,11 @@ function readCommentMarkerHits(xml, original) {
   const pending2 = [];
   const parsed = walkXmlElements(xml, {
     fragment: !/^\uFEFF?\s*<\?xml\b/.test(xml),
-    additionalNamespaces: xmlFragmentAdditionalNamespaces(xml, new Map, { w: word2 }),
+    additionalNamespaces: xmlFragmentAdditionalNamespaces(xml, new Map, { w: word3 }),
     onOpenTag({ tag, start, end }) {
-      if (tag.namespaceUri !== word2 || !["commentRangeStart", "commentRangeEnd", "commentReference"].includes(tag.localName))
+      if (tag.namespaceUri !== word3 || !["commentRangeStart", "commentRangeEnd", "commentReference"].includes(tag.localName))
         return;
-      const id = tag.attributes.find((attr2) => attr2.namespaceUri === word2 && attr2.localName === "id")?.value;
+      const id = tag.attributes.find((attr3) => attr3.namespaceUri === word3 && attr3.localName === "id")?.value;
       if (!id)
         return;
       const hit = { commentWId: id, kind: tag.localName, byteStart: start, byteEnd: end };
@@ -196949,7 +197427,7 @@ function readCommentMarkerHits(xml, original) {
         pending2.push(hit);
     },
     onCloseTag({ tag, end }) {
-      if (tag.isSelfClosing || tag.namespaceUri !== word2)
+      if (tag.isSelfClosing || tag.namespaceUri !== word3)
         return;
       const hit = pending2[pending2.length - 1];
       if (hit?.kind === tag.localName) {
@@ -196976,7 +197454,7 @@ var init_comment_cascade = __esm(() => {
 
 // ../../../v2/editor-core/dist/document/transactions/tracked-changes/insertion-restoration.js
 function attribute(element, namespace, name) {
-  const attrs = element.tag.attributes.filter((attr2) => attr2.namespaceUri === namespace && attr2.localName === name);
+  const attrs = element.tag.attributes.filter((attr3) => attr3.namespaceUri === namespace && attr3.localName === name);
   return attrs.length === 1 ? attrs[0].value : null;
 }
 function originId(element) {
@@ -196985,7 +197463,7 @@ function originId(element) {
   return id == null ? null : String(id);
 }
 function hasRestorationOrigin(element) {
-  return element.tag.attributes.some((attr2) => attr2.namespaceUri === RESTORE_NS && attr2.localName === RESTORE_ATTR);
+  return element.tag.attributes.some((attr3) => attr3.namespaceUri === RESTORE_NS && attr3.localName === RESTORE_ATTR);
 }
 function stampInsertionRestoration(openTag, namespaceBindings, originalWId, originalCarrierXml, paragraphXml) {
   const raw = parseRawXmlElementTag(openTag);
@@ -197000,7 +197478,7 @@ function stampInsertionRestoration(openTag, namespaceBindings, originalWId, orig
   const element = parsed.ranges[0];
   if (parsed.errors.length > 0 || !element || element.tag.namespaceUri !== NS_W || element.tag.localName !== "ins")
     return null;
-  const existing = element.tag.attributes.filter((attr2) => attr2.namespaceUri === RESTORE_NS && attr2.localName === RESTORE_ATTR);
+  const existing = element.tag.attributes.filter((attr3) => attr3.namespaceUri === RESTORE_NS && attr3.localName === RESTORE_ATTR);
   if (existing.length > 0) {
     return originId(element) == null || restorationProof(element) == null ? null : openTag;
   }
@@ -197037,11 +197515,11 @@ function stampInsertionRestoration(openTag, namespaceBindings, originalWId, orig
     return prefix3;
   };
   const prefix2 = availablePrefix("sdRewrite");
-  const ignorable = element.tag.attributes.find((attr2) => attr2.namespaceUri === MC_NS2 && attr2.localName === "Ignorable");
+  const ignorable = element.tag.attributes.find((attr3) => attr3.namespaceUri === MC_NS2 && attr3.localName === "Ignorable");
   let result = openTag;
   let declarations = ` xmlns:${prefix2}="${RESTORE_NS}"`;
   if (ignorable) {
-    const sourceAttr = [...scanRawXmlAttributes(openTag)].find((attr2) => attr2.name === ignorable.name);
+    const sourceAttr = [...scanRawXmlAttributes(openTag)].find((attr3) => attr3.name === ignorable.name);
     result = result.slice(0, sourceAttr.valueStart) + escapeXmlAttribute(`${ignorable.value} ${prefix2}`.trim()) + result.slice(sourceAttr.valueEnd);
   } else {
     const mc = availablePrefix("sdRewriteMc");
@@ -197055,7 +197533,7 @@ function insertionId(element) {
   return id == null ? null : String(id);
 }
 function metadata2(element) {
-  return JSON.stringify(element.tag.attributes.filter((attr2) => attr2.namespaceUri !== "http://www.w3.org/2000/xmlns/" && !(attr2.namespaceUri === NS_W && attr2.localName === "id") && !(attr2.namespaceUri === RESTORE_NS && (attr2.localName === RESTORE_ATTR || attr2.localName === PROOF_ATTR)) && !(attr2.namespaceUri === MC_NS2 && attr2.localName === "Ignorable")).map((attr2) => [attr2.namespaceUri === "urn:superdoc:tracked-change:1" && ["rsidR", "rsidDel"].includes(attr2.localName) ? NS_W : attr2.namespaceUri, attr2.localName, attr2.value]).sort());
+  return JSON.stringify(element.tag.attributes.filter((attr3) => attr3.namespaceUri !== "http://www.w3.org/2000/xmlns/" && !(attr3.namespaceUri === NS_W && attr3.localName === "id") && !(attr3.namespaceUri === RESTORE_NS && (attr3.localName === RESTORE_ATTR || attr3.localName === PROOF_ATTR)) && !(attr3.namespaceUri === MC_NS2 && attr3.localName === "Ignorable")).map((attr3) => [attr3.namespaceUri === "urn:superdoc:tracked-change:1" && ["rsidR", "rsidDel"].includes(attr3.localName) ? NS_W : attr3.namespaceUri, attr3.localName, attr3.value]).sort());
 }
 function restorationProof(element) {
   const value = attribute(element, RESTORE_NS, PROOF_ATTR);
@@ -200896,12 +201374,12 @@ function renderTrackedChangeMarker(kind, id, stamp, includeRsid, wordPrefix = "w
   return renderTrackedChangeOpen(kind, id, stamp, includeRsid, wordPrefix, declareWordPrefix).replace(/>$/, "/>");
 }
 function renderTrackedChangeOpen(kind, id, stamp, includeRsid, wordPrefix = "w", declareWordPrefix = false, protectedXml = "") {
-  const attr2 = (name) => xmlQName(wordPrefix, name);
+  const attr3 = (name) => xmlQName(wordPrefix, name);
   const namespace = declareWordPrefix ? ` xmlns:${wordPrefix}="${WORDPROCESSINGML_NAMESPACE3}"` : "";
-  const initials = stamp.author.initials ? ` ${attr2("initials")}="${escapeXmlAttribute(stamp.author.initials)}"` : "";
+  const initials = stamp.author.initials ? ` ${attr3("initials")}="${escapeXmlAttribute(stamp.author.initials)}"` : "";
   const email3 = serializeTrackedChangeEmail(stamp.author.email, wordPrefix, protectedXml);
-  const rsid = includeRsid ? ` ${attr2(kind === "del" ? "rsidDel" : "rsidR")}="${escapeXmlAttribute(stamp.rsid)}"` : "";
-  return `<${xmlQName(wordPrefix, kind)}${namespace} ${attr2("id")}="${id}" ${attr2("author")}="${escapeXmlAttribute(stamp.author.name)}"${initials}${email3}` + ` ${attr2("date")}="${escapeXmlAttribute(stamp.date)}"${rsid}>`;
+  const rsid = includeRsid ? ` ${attr3(kind === "del" ? "rsidDel" : "rsidR")}="${escapeXmlAttribute(stamp.rsid)}"` : "";
+  return `<${xmlQName(wordPrefix, kind)}${namespace} ${attr3("id")}="${id}" ${attr3("author")}="${escapeXmlAttribute(stamp.author.name)}"${initials}${email3}` + ` ${attr3("date")}="${escapeXmlAttribute(stamp.date)}"${rsid}>`;
 }
 function tableColumnCount(spec) {
   return Math.max(1, ...spec.rows.map((row) => row.cells.reduce((sum, cell) => sum + Math.max(1, cell.gridSpan ?? 1), 0)));
@@ -201499,14 +201977,14 @@ function prepareEnclosedTrackedTables(bytes, startByte, endByte, stamp) {
 function stampTrackedRangeParagraph(xml, rsid, partBytes, paragraphStartByte) {
   return xml.replace(new RegExp(`^<([\\w.-]+):p\\b${RAW_XML_TAG_ATTRIBUTES_PATTERN}>`), (open2) => {
     const prefix2 = /^<([\w.-]+):/.exec(open2)[1];
-    const attr2 = `${prefix2}:rsidR`;
+    const attr3 = `${prefix2}:rsidR`;
     const namespaces = namespaceBindingsAtPosition(partBytes, paragraphStartByte, open2);
     for (const attribute2 of scanRawXmlAttributes(open2)) {
       if (attribute2.localName === "rsidR" && attribute2.prefix && namespaces[attribute2.prefix] === NS_W) {
         return open2.slice(0, attribute2.valueStart) + rsid + open2.slice(attribute2.valueEnd);
       }
     }
-    return open2.replace(/>$/, ` ${attr2}="${rsid}">`);
+    return open2.replace(/>$/, ` ${attr3}="${rsid}">`);
   });
 }
 var TE10, TD37;
@@ -231734,9 +232212,9 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
     fragment: true,
     additionalNamespaces: { ...source.namespaces }
   });
-  if (parsed.ranges.some((r) => word2(r) && ["document", "body", "hdr", "ftr", "sectPr", "altChunk", "dataBinding"].includes(r.tag.localName)))
+  if (parsed.ranges.some((r) => word3(r) && ["document", "body", "hdr", "ftr", "sectPr", "altChunk", "dataBinding"].includes(r.tag.localName)))
     return fail4();
-  const inline = roots.value.every((r) => word2(r) && [
+  const inline = roots.value.every((r) => word3(r) && [
     "r",
     "hyperlink",
     "ins",
@@ -231747,20 +232225,20 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
     "commentRangeEnd",
     "fldSimple"
   ].includes(r.tag.localName));
-  if (!inline && !roots.value.every((r) => word2(r) && ["p", "tbl"].includes(r.tag.localName)))
+  if (!inline && !roots.value.every((r) => word3(r) && ["p", "tbl"].includes(r.tag.localName)))
     return fail4();
   if (inline && !validateRetainableParagraphXml(`<w:p xmlns:w="${NS_W}">${source.xml}</w:p>`, source.namespaces).ok)
     return fail4();
   if (!inline && !validNativeBlockPlacement(source.xml, parsed.ranges))
     return fail4();
-  for (const range of parsed.ranges.filter((r) => word2(r) && r.tag.localName === "p")) {
+  for (const range of parsed.ranges.filter((r) => word3(r) && r.tag.localName === "p")) {
     const check2 = validateRetainableParagraphXml(source.xml.slice(range.start, range.end), range.namespaceBindings);
     if (!check2.ok)
       return fail4();
   }
   const sourceParagraphIds = new Set;
   for (const range of parsed.ranges) {
-    if (!word2(range) || range.tag.localName !== "p")
+    if (!word3(range) || range.tag.localName !== "p")
       continue;
     const id = range.tag.attributes.find((a) => a.namespaceUri === W14 && a.localName === "paraId")?.value;
     if (id && sourceParagraphIds.has(id))
@@ -231807,7 +232285,7 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
       occupiedHex.add(id.toUpperCase());
     for (const r of collectXmlElementRanges(xml2).ranges)
       if (r.tag.localName === "docPr" && r.tag.namespaceUri === "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing") {
-        const id = attr2(r, "id");
+        const id = attr3(r, "id");
         if (id)
           occupiedDrawingIds.add(id);
       }
@@ -231893,8 +232371,8 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
     if (ranges.errors.length || ranges.ranges.length > 50000 || /<!DOCTYPE|<!ENTITY/i.test(xml2))
       return fail4();
     for (const range of ranges.ranges) {
-      if (word2(range) && range.tag.localName === "comment") {
-        const id = attr2(range, "id");
+      if (word3(range) && range.tag.localName === "comment") {
+        const id = attr3(range, "id");
         if (!id || commentIds.has(id))
           return fail4();
         mintNumeric(commentIds, id);
@@ -231905,25 +232383,25 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
         if (a.localName === "durableId")
           mintHex(durableIds, a.value.toUpperCase());
       }
-      if (word2(range) && range.tag.localName === "style") {
-        const id = attr2(range, "styleId");
+      if (word3(range) && range.tag.localName === "style") {
+        const id = attr3(range, "styleId");
         if (!id || styleIds.has(id))
           return fail4();
         const destinationBytes = read(sourceToDest.get(uri));
         const destinationXml = destinationBytes ? TD57.decode(destinationBytes) : "";
         const destinationRanges = collectXmlElementRanges(destinationXml).ranges;
-        const found = destinationRanges.find((r) => word2(r) && r.tag.localName === "style" && attr2(r, "styleId") === id);
+        const found = destinationRanges.find((r) => word3(r) && r.tag.localName === "style" && attr3(r, "styleId") === id);
         const same = found && destinationXml.slice(found.start, found.end) === xml2.slice(range.start, range.end);
         styleIds.set(id, !found || same ? id : `SD_${mintHex(new Map, id)}`);
       }
-      if (word2(range) && range.tag.localName === "num") {
-        const id = attr2(range, "numId");
+      if (word3(range) && range.tag.localName === "num") {
+        const id = attr3(range, "numId");
         if (!id)
           return fail4();
         mintNumeric(numIds, id);
       }
-      if (word2(range) && range.tag.localName === "abstractNum") {
-        const id = attr2(range, "abstractNumId");
+      if (word3(range) && range.tag.localName === "abstractNum") {
+        const id = attr3(range, "abstractNumId");
         if (!id)
           return fail4();
         mintNumeric(abstractIds, id);
@@ -231968,7 +232446,7 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
           next = mintHex(paraIds, a.value);
         else if (a.localName === "durableId")
           next = mintHex(durableIds, a.value.toUpperCase());
-        else if (word2(range) && a.localName === "id") {
+        else if (word3(range) && a.localName === "id") {
           if (/^(comment|commentRangeStart|commentRangeEnd|commentReference)$/.test(range.tag.localName)) {
             next = commentIds.get(a.value);
             if (!next)
@@ -231979,13 +232457,13 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
             next = mintNumeric(revisions2, a.value);
           else if (["footnoteReference", "endnoteReference", "footnote", "endnote"].includes(range.tag.localName))
             return null;
-        } else if (word2(range) && a.localName === "styleId")
+        } else if (word3(range) && a.localName === "styleId")
           next = styleIds.get(a.value);
-        else if (word2(range) && a.localName === "numId" && range.tag.localName === "num")
+        else if (word3(range) && a.localName === "numId" && range.tag.localName === "num")
           next = numIds.get(a.value);
-        else if (word2(range) && a.localName === "abstractNumId" && range.tag.localName === "abstractNum")
+        else if (word3(range) && a.localName === "abstractNumId" && range.tag.localName === "abstractNum")
           next = abstractIds.get(a.value);
-        else if (word2(range) && a.localName === "val") {
+        else if (word3(range) && a.localName === "val") {
           if (["pStyle", "rStyle", "tblStyle", "basedOn", "link", "next"].includes(range.tag.localName))
             next = styleIds.get(a.value);
           if (range.tag.localName === "numId")
@@ -232084,13 +232562,13 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
     return relation ? read(resolveTargetUri("/word/document.xml", relation.target, "Internal")) : undefined;
   };
   const destinationStyles = sharedPart("styles");
-  const availableStyles = new Set(destinationStyles ? collectXmlElementRanges(TD57.decode(destinationStyles)).ranges.filter((r) => word2(r) && r.tag.localName === "style").map((r) => attr2(r, "styleId")) : []);
+  const availableStyles = new Set(destinationStyles ? collectXmlElementRanges(TD57.decode(destinationStyles)).ranges.filter((r) => word3(r) && r.tag.localName === "style").map((r) => attr3(r, "styleId")) : []);
   const destinationNumbering = sharedPart("numbering");
-  const availableNumbers = new Set(destinationNumbering ? collectXmlElementRanges(TD57.decode(destinationNumbering)).ranges.filter((r) => word2(r) && r.tag.localName === "num").map((r) => attr2(r, "numId")) : []);
+  const availableNumbers = new Set(destinationNumbering ? collectXmlElementRanges(TD57.decode(destinationNumbering)).ranges.filter((r) => word3(r) && r.tag.localName === "num").map((r) => attr3(r, "numId")) : []);
   for (const r of nativeRefs.ranges) {
-    if (!word2(r))
+    if (!word3(r))
       continue;
-    const value = attr2(r, "val");
+    const value = attr3(r, "val");
     if (["pStyle", "rStyle", "tblStyle"].includes(r.tag.localName) && value !== "CommentReference" && !availableStyles.has(value))
       return fail4();
     if (r.tag.localName === "numId" && value !== "0" && !availableNumbers.has(value))
@@ -232108,7 +232586,7 @@ function planNativeOoxmlImport(state, source, txId, basePerPart = {}) {
   else {
     const all = collectXmlElementRanges(xml, { fragment: true });
     for (const range of [...all.ranges].reverse())
-      if (word2(range) && range.tag.localName === "p" && !range.tag.attributes.some((a) => a.namespaceUri === W14 && a.localName === "paraId")) {
+      if (word3(range) && range.tag.localName === "p" && !range.tag.attributes.some((a) => a.namespaceUri === W14 && a.localName === "paraId")) {
         const open2 = xml.slice(range.start, range.openEnd);
         xml = xml.slice(0, range.start) + open2.replace(/\/?\s*>$/, (tail) => `${range.namespaceBindings.w14 === W14 ? "" : ` xmlns:w14="${W14}"`} w14:paraId="${mintHex(paraIds, "paragraph-" + range.start)}"` + tail) + xml.slice(range.openEnd);
       }
@@ -232178,11 +232656,11 @@ function validNativeDependency(bytes, contentType, kind) {
   const catalog = catalogs[kind];
   if (!catalog) {
     if (kind === "theme")
-      return contentType === "application/vnd.openxmlformats-officedocument.theme+xml" && root.tag.localName === "theme" && root.tag.namespaceUri === "http://schemas.openxmlformats.org/drawingml/2006/main" && !parsed.ranges.some(word2);
+      return contentType === "application/vnd.openxmlformats-officedocument.theme+xml" && root.tag.localName === "theme" && root.tag.namespaceUri === "http://schemas.openxmlformats.org/drawingml/2006/main" && !parsed.ranges.some(word3);
     if (kind === "customXml")
-      return contentType === "application/xml" && !parsed.ranges.some(word2);
+      return contentType === "application/xml" && !parsed.ranges.some(word3);
     if (kind === "customXmlProps")
-      return contentType === "application/vnd.openxmlformats-officedocument.customXmlProperties+xml" && root.tag.localName === "datastoreItem" && root.tag.namespaceUri === "http://schemas.openxmlformats.org/officeDocument/2006/customXml" && !!attr2(root, "itemID") && direct.every((r) => r.tag.localName === "schemaRefs" && r.tag.namespaceUri === root.tag.namespaceUri) && parsed.ranges.every((r) => r === root || ["schemaRefs", "schemaRef"].includes(r.tag.localName) && r.tag.namespaceUri === root.tag.namespaceUri);
+      return contentType === "application/vnd.openxmlformats-officedocument.customXmlProperties+xml" && root.tag.localName === "datastoreItem" && root.tag.namespaceUri === "http://schemas.openxmlformats.org/officeDocument/2006/customXml" && !!attr3(root, "itemID") && direct.every((r) => r.tag.localName === "schemaRefs" && r.tag.namespaceUri === root.tag.namespaceUri) && parsed.ranges.every((r) => r === root || ["schemaRefs", "schemaRef"].includes(r.tag.localName) && r.tag.namespaceUri === root.tag.namespaceUri);
     return false;
   }
   if (contentType !== wordCt + kind + "+xml" || root.tag.localName !== catalog.root || root.tag.namespaceUri !== catalog.namespace)
@@ -232195,7 +232673,7 @@ function validNativeDependency(bytes, contentType, kind) {
     offset = child.end;
     const keyName = kind === "numbering" ? child.tag.localName === "num" ? "numId" : "abstractNumId" : catalog.key;
     if (keyName && !(kind === "styles" && child.tag.localName !== "style")) {
-      const key3 = attr2(child, keyName);
+      const key3 = attr3(child, keyName);
       if (!key3 || keys.has(child.tag.localName + ":" + key3))
         return false;
       keys.add(child.tag.localName + ":" + key3);
@@ -232204,10 +232682,10 @@ function validNativeDependency(bytes, contentType, kind) {
     if (kind.startsWith("comments") && kind !== "comments") {
       if (descendants.length || xml.slice(child.openEnd, child.closeStart).trim())
         return false;
-      if (kind === "commentsIds" && !attr2(child, "durableId"))
+      if (kind === "commentsIds" && !attr3(child, "durableId"))
         return false;
     } else if (kind === "comments") {
-      if (!descendants.some((r) => word2(r) && r.tag.localName === "p"))
+      if (!descendants.some((r) => word3(r) && r.tag.localName === "p"))
         return false;
       const body = xml.slice(child.openEnd, child.closeStart);
       const blocks = collectXmlElementRanges(body, {
@@ -232216,15 +232694,15 @@ function validNativeDependency(bytes, contentType, kind) {
       });
       if (blocks.errors.length || !validNativeBlockPlacement(body, blocks.ranges))
         return false;
-      for (const paragraph of blocks.ranges.filter((r) => word2(r) && r.tag.localName === "p"))
+      for (const paragraph of blocks.ranges.filter((r) => word3(r) && r.tag.localName === "p"))
         if (!validateRetainableParagraphXml(body.slice(paragraph.start, paragraph.end), paragraph.namespaceBindings).ok)
           return false;
     } else {
-      if (descendants.some((r) => !word2(r) || ["p", "r", "t", "delText", "tbl", "comment", "style", "num", "abstractNum"].includes(r.tag.localName)))
+      if (descendants.some((r) => !word3(r) || ["p", "r", "t", "delText", "tbl", "comment", "style", "num", "abstractNum"].includes(r.tag.localName)))
         return false;
       if (kind === "numbering" && child.tag.localName === "num") {
         const abstract = descendants.filter((r) => r.tag.localName === "abstractNumId");
-        if (abstract.length !== 1 || !attr2(abstract[0], "val"))
+        if (abstract.length !== 1 || !attr3(abstract[0], "val"))
           return false;
       }
     }
@@ -232243,30 +232721,30 @@ function validDependencyReferences(payloads, state, mainRanges) {
   const collect = (bytes, kind) => {
     const ranges = collectXmlElementRanges(TD57.decode(bytes)).ranges;
     for (const r of ranges) {
-      if (word2(r) && r.tag.localName === "style")
-        styleIds.add(attr2(r, "styleId"));
-      if (word2(r) && r.tag.localName === "abstractNum")
-        abstractIds.add(attr2(r, "abstractNumId"));
-      if (word2(r) && r.tag.localName === "num")
-        numIds.add(attr2(r, "numId"));
-      if (kind === "comments" && word2(r) && r.tag.localName === "comment") {
-        const lastParagraph = ranges.filter((p) => r.start < p.start && r.end > p.end && word2(p) && p.tag.localName === "p").at(-1);
-        const paraId = lastParagraph && attr2(lastParagraph, "paraId");
-        const id = attr2(r, "id");
+      if (word3(r) && r.tag.localName === "style")
+        styleIds.add(attr3(r, "styleId"));
+      if (word3(r) && r.tag.localName === "abstractNum")
+        abstractIds.add(attr3(r, "abstractNumId"));
+      if (word3(r) && r.tag.localName === "num")
+        numIds.add(attr3(r, "numId"));
+      if (kind === "comments" && word3(r) && r.tag.localName === "comment") {
+        const lastParagraph = ranges.filter((p) => r.start < p.start && r.end > p.end && word3(p) && p.tag.localName === "p").at(-1);
+        const paraId = lastParagraph && attr3(lastParagraph, "paraId");
+        const id = attr3(r, "id");
         if (importedComments.has(id) || paraId && commentParas.has(paraId))
           validIdentities = false;
         importedComments.set(id, paraId);
         if (paraId)
           commentParas.add(paraId);
       }
-      if (kind === "commentsIds" && attr2(r, "durableId")) {
-        const id = attr2(r, "durableId").toUpperCase();
+      if (kind === "commentsIds" && attr3(r, "durableId")) {
+        const id = attr3(r, "durableId").toUpperCase();
         if (durableIds.has(id))
           validIdentities = false;
         durableIds.add(id);
       }
-      if (kind === "commentsExtended" && r.tag.localName === "commentEx" && attr2(r, "paraIdParent"))
-        parents.set(attr2(r, "paraId"), attr2(r, "paraIdParent"));
+      if (kind === "commentsExtended" && r.tag.localName === "commentEx" && attr3(r, "paraIdParent"))
+        parents.set(attr3(r, "paraId"), attr3(r, "paraIdParent"));
     }
     return ranges;
   };
@@ -232290,24 +232768,24 @@ function validDependencyReferences(payloads, state, mainRanges) {
     return false;
   for (const { kind, ranges } of catalogs)
     for (const r of ranges) {
-      const value = attr2(r, "val");
-      if (word2(r) && ["pStyle", "rStyle", "tblStyle", "basedOn", "link", "next"].includes(r.tag.localName) && value !== "CommentReference" && !styleIds.has(value))
+      const value = attr3(r, "val");
+      if (word3(r) && ["pStyle", "rStyle", "tblStyle", "basedOn", "link", "next"].includes(r.tag.localName) && value !== "CommentReference" && !styleIds.has(value))
         return false;
-      if (word2(r) && r.tag.localName === "abstractNumId" && !abstractIds.has(value))
+      if (word3(r) && r.tag.localName === "abstractNumId" && !abstractIds.has(value))
         return false;
-      if (word2(r) && r.tag.localName === "numId" && value !== "0" && !numIds.has(value))
+      if (word3(r) && r.tag.localName === "numId" && value !== "0" && !numIds.has(value))
         return false;
       if (["commentsExtended", "commentsIds"].includes(kind) && ["commentEx", "commentId"].includes(r.tag.localName)) {
-        if (!commentParas.has(attr2(r, "paraId")))
+        if (!commentParas.has(attr3(r, "paraId")))
           return false;
-        const parent = attr2(r, "paraIdParent");
+        const parent = attr3(r, "paraIdParent");
         if (parent && !commentParas.has(parent))
           return false;
       }
-      if (kind === "commentsExtensible" && r.tag.localName === "commentExtensible" && !durableIds.has(attr2(r, "durableId").toUpperCase()))
+      if (kind === "commentsExtensible" && r.tag.localName === "commentExtensible" && !durableIds.has(attr3(r, "durableId").toUpperCase()))
         return false;
     }
-  const referenced = new Set(mainRanges.filter((r) => word2(r) && r.tag.localName === "commentReference").map((r) => attr2(r, "id")));
+  const referenced = new Set(mainRanges.filter((r) => word3(r) && r.tag.localName === "commentReference").map((r) => attr3(r, "id")));
   const byPara = new Map([...importedComments].filter(([, para]) => !!para).map(([id, para]) => [para, id]));
   for (const [id, para] of importedComments) {
     if (referenced.has(id) && para && parents.has(para))
@@ -232382,9 +232860,9 @@ function validNativeBlockPlacement(xml, ranges) {
     while (stack.length && range.start >= stack.at(-1).end)
       stack.pop();
     const parent = stack.at(-1);
-    const inParagraph = stack.some((r) => word2(r) && r.tag.localName === "p");
+    const inParagraph = stack.some((r) => word3(r) && r.tag.localName === "p");
     if (!inParagraph) {
-      if (!word2(range))
+      if (!word3(range))
         return false;
       const name = range.tag.localName;
       if (!parent) {
@@ -232410,7 +232888,7 @@ function validNativeBlockPlacement(xml, ranges) {
     stack.push(range);
   }
   for (const range of ranges) {
-    if (!word2(range) || !["tbl", "tr", "tc", "tblGrid"].includes(range.tag.localName))
+    if (!word3(range) || !["tbl", "tr", "tc", "tblGrid"].includes(range.tag.localName))
       continue;
     const direct = children.get(range) ?? [];
     const required2 = range.tag.localName === "tbl" ? ["tr"] : range.tag.localName === "tr" ? ["tc"] : range.tag.localName === "tc" ? ["p", "tbl"] : ["gridCol"];
@@ -232435,8 +232913,8 @@ function mergeDefinitions(destination, source, kind) {
     return null;
   if (kind === "styles") {
     for (const name of ["docDefaults", "latentStyles"]) {
-      const sourceDefault = s.ranges.find((r) => word2(r) && r.tag.localName === name);
-      const destinationDefault = d.ranges.find((r) => word2(r) && r.tag.localName === name);
+      const sourceDefault = s.ranges.find((r) => word3(r) && r.tag.localName === name);
+      const destinationDefault = d.ranges.find((r) => word3(r) && r.tag.localName === name);
       if (sourceDefault && (!destinationDefault || source.slice(sourceDefault.start, sourceDefault.end) !== destination.slice(destinationDefault.start, destinationDefault.end)))
         return null;
     }
@@ -232446,10 +232924,10 @@ function mergeDefinitions(destination, source, kind) {
     if (kind === "styles" && !["style"].includes(child.tag.localName))
       continue;
     const keyName = kind === "styles" ? "styleId" : kind === "numbering" ? child.tag.localName === "num" ? "numId" : "abstractNumId" : kind === "comments" ? "id" : kind === "commentsExtensible" ? "durableId" : "paraId";
-    const key3 = attr2(child, keyName);
+    const key3 = attr3(child, keyName);
     if (!key3)
       return null;
-    const found = d.ranges.find((r) => r.tag.namespaceUri === child.tag.namespaceUri && r.tag.localName === child.tag.localName && attr2(r, keyName) === key3);
+    const found = d.ranges.find((r) => r.tag.namespaceUri === child.tag.namespaceUri && r.tag.localName === child.tag.localName && attr3(r, keyName) === key3);
     const raw = source.slice(child.start, child.end);
     if (found) {
       if (destination.slice(found.start, found.end) !== raw)
@@ -232516,7 +232994,7 @@ function canonicalWordMarkup(xml, namespaces) {
     return null;
   const patches = [];
   for (const r of parsed.ranges) {
-    if (!word2(r))
+    if (!word3(r))
       continue;
     let open2 = xml.slice(r.start, r.openEnd).replace(new RegExp(`^<${r.tag.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?=[\\s/>])`), `<w:${r.tag.localName}`);
     for (const a of r.tag.attributes)
@@ -232533,7 +233011,7 @@ function canonicalWordMarkup(xml, namespaces) {
 var TE28, TD57, W14 = "http://schemas.microsoft.com/office/word/2010/wordml", CT_URI = "/[Content_Types].xml", REL_CT = "application/vnd.openxmlformats-package.relationships+xml", fail4 = () => ({
   ok: false,
   reason: "paste-structure-unsupported"
-}), word2 = (r) => r.tag.namespaceUri === NS_W || r.tag.namespaceUri === NS_WSTRICT, attr2 = (r, name) => r.tag.attributes.find((a) => a.localName === name)?.value;
+}), word3 = (r) => r.tag.namespaceUri === NS_W || r.tag.namespaceUri === NS_WSTRICT, attr3 = (r, name) => r.tag.attributes.find((a) => a.localName === name)?.value;
 var init_native_ooxml_import = __esm(() => {
   init_xml_sax();
   init_sha256_sync();
@@ -232647,7 +233125,7 @@ function readContentControlBlockGroups(bytes) {
     while (ancestors.length && ancestors.at(-1).range.end < control2.end)
       ancestors.pop();
     const idRange = parsed.ranges.find((range) => range.start > control2.start && range.end < headerEnd && range.tag.namespaceUri === W2 && range.tag.localName === "id");
-    const id = idRange?.tag.attributes.find((attr3) => attr3.namespaceUri === W2 && attr3.localName === "val")?.value ?? `paragraph:${first.id}:${ancestors.length}`;
+    const id = idRange?.tag.attributes.find((attr4) => attr4.namespaceUri === W2 && attr4.localName === "val")?.value ?? `paragraph:${first.id}:${ancestors.length}`;
     const parentId = ancestors.at(-1)?.id ?? null;
     const candidate2 = { id, parentId, range: control2, members };
     candidates.push(candidate2);
@@ -232730,7 +233208,7 @@ function snapshot(xml, parsed = collectXmlElementRanges(xml)) {
       continue;
     if (range.start < cursor || range.end > container.closeStart)
       return null;
-    const id = range.tag.attributes.find((attr3) => attr3.namespaceUri === W142 && attr3.localName === "paraId")?.value ?? syntheticParagraphBlockId(ordinal);
+    const id = range.tag.attributes.find((attr4) => attr4.namespaceUri === W142 && attr4.localName === "paraId")?.value ?? syntheticParagraphBlockId(ordinal);
     if (!id || ids.has(id))
       return null;
     ids.add(id);
@@ -232869,7 +233347,7 @@ function applyEntry(current, entry) {
   return applied.ok ? applied.value : undefined;
 }
 function paragraphId(range) {
-  return range.tag.attributes.find((attr3) => attr3.namespaceUri === W143 && attr3.localName === "paraId")?.value ?? null;
+  return range.tag.attributes.find((attr4) => attr4.namespaceUri === W143 && attr4.localName === "paraId")?.value ?? null;
 }
 function readHeader(bytes) {
   const xml = TD59.decode(bytes);
@@ -232997,7 +233475,7 @@ function readMarginCarriers(xml, allowed) {
     if (!parent || parent.tag.namespaceUri !== W4 || !["body", "pPr"].includes(parent.tag.localName))
       return null;
     const paragraph = parent.tag.localName === "pPr" ? parentOf(parent, parsed.ranges) : null;
-    const blockId = paragraph?.tag.attributes.find((attr3) => attr3.namespaceUri === W144 && attr3.localName === "paraId")?.value ?? null;
+    const blockId = paragraph?.tag.attributes.find((attr4) => attr4.namespaceUri === W144 && attr4.localName === "paraId")?.value ?? null;
     if (parent.tag.localName === "pPr" && (!paragraph || paragraph.tag.namespaceUri !== W4 || paragraph.tag.localName !== "p" || !blockId || sections.some((section) => section.blockId === blockId)))
       return null;
     const margins = parsed.ranges.filter((candidate2) => candidate2.tag.namespaceUri === W4 && candidate2.tag.localName === "pgMar" && candidate2.start > range.start && candidate2.end <= range.closeStart);
@@ -233006,9 +233484,9 @@ function readMarginCarriers(xml, allowed) {
     const margin = margins[0];
     if (margin && (parentOf(margin, parsed.ranges) !== range || !margin.tag.isSelfClosing && xml.slice(margin.openEnd, margin.closeStart).trim()))
       return null;
-    if (margin?.tag.attributes.some((attr3) => attr3.namespaceUri === W4 && allowed.includes(attr3.localName) && !/^\d+$/.test(attr3.value)))
+    if (margin?.tag.attributes.some((attr4) => attr4.namespaceUri === W4 && allowed.includes(attr4.localName) && !/^\d+$/.test(attr4.value)))
       return null;
-    const otherAttributes = JSON.stringify((margin?.tag.attributes ?? []).filter((attr3) => attr3.namespaceUri !== W4 || !allowed.includes(attr3.localName)).map((attr3) => [attr3.name, attr3.namespaceUri, attr3.value]).sort((a, b) => a[0].localeCompare(b[0])));
+    const otherAttributes = JSON.stringify((margin?.tag.attributes ?? []).filter((attr4) => attr4.namespaceUri !== W4 || !allowed.includes(attr4.localName)).map((attr4) => [attr4.name, attr4.namespaceUri, attr4.value]).sort((a, b) => a[0].localeCompare(b[0])));
     const inner = range.tag.isSelfClosing ? "" : margin ? xml.slice(range.openEnd, margin.start) + xml.slice(margin.end, range.closeStart) : xml.slice(range.openEnd, range.closeStart);
     const opening = xml.slice(range.start, range.openEnd).replace(/\s*\/>$/, ">");
     shell += xml.slice(cursor, range.start) + opening + inner + `</${range.tag.name}>`;
@@ -237675,10 +238153,10 @@ function scanXmlChunks(chunks, partUri, bytesScanned) {
       } else if (local === "Fallback")
         counts.mceFallback += 1;
     }
-    for (const attr3 of tag.attributes) {
-      if (attr3.namespaceUri === "http://schemas.openxmlformats.org/markup-compatibility/2006") {
-        const lname = attr3.localName;
-        const val = attr3.value;
+    for (const attr4 of tag.attributes) {
+      if (attr4.namespaceUri === "http://schemas.openxmlformats.org/markup-compatibility/2006") {
+        const lname = attr4.localName;
+        const val = attr4.value;
         if (lname === "Ignorable")
           for (const t of val.split(/\s+/).filter(Boolean))
             bump(mceIgnorable, t, anchor);
@@ -237692,8 +238170,8 @@ function scanXmlChunks(chunks, partUri, bytesScanned) {
           for (const t of val.split(/\s+/).filter(Boolean))
             bump(mceProcessContent, t, anchor);
       }
-      if (attr3.namespaceUri && isUnknownAttributeNamespace(attr3.namespaceUri)) {
-        bump(unknownAttributeCounts, `${attr3.localName}@${attr3.namespaceUri}`, anchor);
+      if (attr4.namespaceUri && isUnknownAttributeNamespace(attr4.namespaceUri)) {
+        bump(unknownAttributeCounts, `${attr4.localName}@${attr4.namespaceUri}`, anchor);
       }
     }
     if (ns === "http://schemas.openxmlformats.org/wordprocessingml/2006/main") {
@@ -237978,15 +238456,15 @@ function currentAnchor(parser) {
   };
 }
 function findAttrValue(tag, localName2) {
-  for (const attr3 of tag.attributes) {
-    if (attr3.localName === localName2)
-      return attr3.value;
+  for (const attr4 of tag.attributes) {
+    if (attr4.localName === localName2)
+      return attr4.value;
   }
   return null;
 }
 function readXmlSpace2(tag) {
-  const attr3 = readXmlAttribute(tag, "http://www.w3.org/XML/1998/namespace", "space");
-  return attr3?.value === "preserve" || attr3?.value === "default" ? attr3.value : null;
+  const attr4 = readXmlAttribute(tag, "http://www.w3.org/XML/1998/namespace", "space");
+  return attr4?.value === "preserve" || attr4?.value === "default" ? attr4.value : null;
 }
 function bump(map3, key3, anchor) {
   if (!key3)
@@ -238700,12 +239178,12 @@ function colorFromBackgroundAttrs(attrs) {
   const wColor = readXmlAttribute({ attributes: [...attrs] }, NS_W, "color");
   if (wColor)
     return normalizeDocumentBackgroundColor(wColor.value);
-  for (const attr3 of attrs) {
-    if (attr3.localName === "color" && (!attr3.namespaceUri || attr3.namespaceUri === NS_W)) {
-      return normalizeDocumentBackgroundColor(attr3.value);
+  for (const attr4 of attrs) {
+    if (attr4.localName === "color" && (!attr4.namespaceUri || attr4.namespaceUri === NS_W)) {
+      return normalizeDocumentBackgroundColor(attr4.value);
     }
-    if (attr3.name === "color" || attr3.name === "w:color") {
-      return normalizeDocumentBackgroundColor(attr3.value);
+    if (attr4.name === "color" || attr4.name === "w:color") {
+      return normalizeDocumentBackgroundColor(attr4.value);
     }
   }
   return null;
@@ -243265,8 +243743,8 @@ function applyOneProperty(inner, key3, value, emit) {
     if (v === null)
       return null;
     if (typeof v === "string") {
-      const attr3 = escapeXmlAttribute(v);
-      return `<${w}:rFonts ${w}:ascii="${attr3}" ${w}:hAnsi="${attr3}"/>`;
+      const attr4 = escapeXmlAttribute(v);
+      return `<${w}:rFonts ${w}:ascii="${attr4}" ${w}:hAnsi="${attr4}"/>`;
     }
     if (v && typeof v === "object") {
       const obj = v;
@@ -243282,11 +243760,11 @@ function applyOneProperty(inner, key3, value, emit) {
         csTheme: `${w}:csTheme`,
         hint: `${w}:hint`
       };
-      for (const [k, attr3] of Object.entries(keyToAttr)) {
+      for (const [k, attr4] of Object.entries(keyToAttr)) {
         const raw = obj[k];
         if (raw === undefined || raw === null)
           continue;
-        attrs.push(`${attr3}="${escapeXmlAttribute(String(raw))}"`);
+        attrs.push(`${attr4}="${escapeXmlAttribute(String(raw))}"`);
       }
       if (attrs.length === 0)
         return null;
@@ -244300,7 +244778,7 @@ function restoreParagraphMarkFormattingSnapshot(beforeXml, liveXml, namespaceBin
   if (before.markers.length === 0 && live.markers.length === 0)
     return beforeXml;
   for (const marker of live.markers) {
-    const prefixes = new Set([marker.tag.prefix ?? "", ...marker.tag.attributes.map((attr3) => attr3.prefix).filter((prefix3) => !!prefix3 && prefix3 !== "xml" && prefix3 !== "xmlns")]);
+    const prefixes = new Set([marker.tag.prefix ?? "", ...marker.tag.attributes.map((attr4) => attr4.prefix).filter((prefix3) => !!prefix3 && prefix3 !== "xml" && prefix3 !== "xmlns")]);
     for (const prefix3 of prefixes) {
       if (marker.namespaceBindings[prefix3] !== before.root.namespaceBindings[prefix3])
         return null;
@@ -247147,7 +247625,7 @@ function localDependencyInventory(xml, namespaceBindings, removedCommentRoots) {
   const inventory = [];
   for (const range of [...parsed.ranges].sort((left, right) => left.start - right.start)) {
     const name = range.tag.localName;
-    if (["commentRangeStart", "commentRangeEnd", "commentReference"].includes(name) && range.tag.attributes.some((attr3) => attr3.localName === "id" && removedCommentRoots.has(attr3.value)))
+    if (["commentRangeStart", "commentRangeEnd", "commentReference"].includes(name) && range.tag.attributes.some((attr4) => attr4.localName === "id" && removedCommentRoots.has(attr4.value)))
       continue;
     if (!resources.has(name) && name !== "hyperlink")
       continue;
@@ -256590,7 +257068,7 @@ function propertySurface(xml, namespaceBindings) {
   for (const range of ranges) {
     while (stack.length && range.start >= stack[stack.length - 1].closeStart)
       stack.pop();
-    if (range.tag.attributes.some((attr3) => attr3.namespaceUri.includes("/relationships")) && [...stack, range].some((ancestor) => ancestor.tag.namespaceUri === NS_W && Object.values(PROPERTY_BLOCKS).some((names) => names.includes(ancestor.tag.localName))))
+    if (range.tag.attributes.some((attr4) => attr4.namespaceUri.includes("/relationships")) && [...stack, range].some((ancestor) => ancestor.tag.namespaceUri === NS_W && Object.values(PROPERTY_BLOCKS).some((names) => names.includes(ancestor.tag.localName))))
       return null;
     const parent = stack[stack.length - 1];
     if (parent) {
@@ -257093,14 +257571,14 @@ function linearSpaceDiff(oldSeq, newSeq, isEqual, keyOf) {
           x2[column >>> 5] |= 1 << (column & 31);
         let carry = 1;
         let borrow = 0;
-        for (let word3 = 0;word3 < bits2.length; word3 += 1) {
-          const previous = bits2[word3];
+        for (let word4 = 0;word4 < bits2.length; word4 += 1) {
+          const previous = bits2[word4];
           const shifted = (previous << 1 | carry) >>> 0;
           carry = previous >>> 31;
           const subtrahend = shifted + borrow;
-          const difference = x2[word3] - subtrahend >>> 0;
-          borrow = x2[word3] < subtrahend ? 1 : 0;
-          bits2[word3] = x2[word3] & ~difference;
+          const difference = x2[word4] - subtrahend >>> 0;
+          borrow = x2[word4] < subtrahend ? 1 : 0;
+          bits2[word4] = x2[word4] & ~difference;
         }
       }
       const row2 = new Uint32Array(newLength + 1);
@@ -257339,7 +257817,7 @@ function prepareCompareTableBlockReplay(bytes, step2) {
     cursor = range.end;
   }
   const namespaceBindings = new Map(Object.entries(body.namespaceBindings));
-  const occupiedIds = ranges.flatMap((range) => range.tag.namespaceUri === NS_W && ["p", "tr"].includes(range.tag.localName) ? range.tag.attributes.filter((attr3) => attr3.namespaceUri === W146 && attr3.localName === "paraId").map((attr3) => attr3.value.toUpperCase()) : []);
+  const occupiedIds = ranges.flatMap((range) => range.tag.namespaceUri === NS_W && ["p", "tr"].includes(range.tag.localName) ? range.tag.attributes.filter((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId").map((attr4) => attr4.value.toUpperCase()) : []);
   const ids = safeTableParagraphIds(step2.tableXml, step2.storyId, body.namespaceBindings);
   if (!ids)
     return null;
@@ -257359,9 +257837,9 @@ function prepareCompareTableBlockReplay(bytes, step2) {
   }
   if (step2.kind !== "insertTable" || !["before", "after"].includes(step2.placement))
     return null;
-  const anchors = children.filter((range) => range.tag.namespaceUri === NS_W && range.tag.localName === "p" && range.tag.attributes.some((attr3) => attr3.namespaceUri === W146 && attr3.localName === "paraId" && attr3.value === step2.anchorBlockId));
+  const anchors = children.filter((range) => range.tag.namespaceUri === NS_W && range.tag.localName === "p" && range.tag.attributes.some((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId" && attr4.value === step2.anchorBlockId));
   const normalizedIds = ids.map((id) => id.toUpperCase());
-  if (anchors.length !== 1 || ranges.some((range) => range.tag.attributes.some((attr3) => attr3.namespaceUri === W146 && attr3.localName === "paraId" && normalizedIds.includes(attr3.value.toUpperCase()))))
+  if (anchors.length !== 1 || ranges.some((range) => range.tag.attributes.some((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId" && normalizedIds.includes(attr4.value.toUpperCase()))))
     return null;
   const at = byteOffsets[step2.placement === "before" ? anchors[0].start : anchors[0].end];
   return { startByte: at, endByte: at, namespaceBindings, paragraphIds: ids, occupiedIds };
@@ -257374,7 +257852,7 @@ function safeTableParagraphIds(tableXml, storyId, namespaceBindings) {
   const root = payload.ranges.find((range) => range.start === 0 && range.end === tableXml.length);
   if (payload.errors.length || root?.tag.namespaceUri !== NS_W || root.tag.localName !== "tbl")
     return null;
-  if (payload.ranges.some((range) => range.tag.namespaceUri === NS_W && (UNSAFE.has(range.tag.localName) || range.tag.localName.endsWith("PrChange")) || range.tag.attributes.some((attr3) => attr3.namespaceUri.includes("/relationships"))))
+  if (payload.ranges.some((range) => range.tag.namespaceUri === NS_W && (UNSAFE.has(range.tag.localName) || range.tag.localName.endsWith("PrChange")) || range.tag.attributes.some((attr4) => attr4.namespaceUri.includes("/relationships"))))
     return null;
   const tableCatalog = buildTableCatalog({
     bytes: TE42.encode(tableXml),
@@ -257384,8 +257862,8 @@ function safeTableParagraphIds(tableXml, storyId, namespaceBindings) {
   if (tableCatalog.tables.length !== 1 || tableCatalog.tables.some((table) => table.containsNestedTable || !table.isRectangular || table.hasGridSpan || table.hasVMerge))
     return null;
   const paragraphs2 = payload.ranges.filter((range) => range.tag.namespaceUri === NS_W && range.tag.localName === "p");
-  const paragraphIds = paragraphs2.map((range) => range.tag.attributes.find((attr3) => attr3.namespaceUri === W146 && attr3.localName === "paraId")?.value);
-  const rowIds = payload.ranges.filter((range) => range.tag.namespaceUri === NS_W && range.tag.localName === "tr").flatMap((range) => range.tag.attributes.filter((attr3) => attr3.namespaceUri === W146 && attr3.localName === "paraId").map((attr3) => attr3.value));
+  const paragraphIds = paragraphs2.map((range) => range.tag.attributes.find((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId")?.value);
+  const rowIds = payload.ranges.filter((range) => range.tag.namespaceUri === NS_W && range.tag.localName === "tr").flatMap((range) => range.tag.attributes.filter((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId").map((attr4) => attr4.value));
   const normalizedIds = [...paragraphIds, ...rowIds].map((id) => id?.toUpperCase());
   if (!paragraphs2.length || normalizedIds.some((id) => !id || !/^[0-7][0-9A-F]{7}$/.test(id) || id === "00000000") || new Set(normalizedIds).size !== normalizedIds.length)
     return null;
@@ -257398,10 +257876,10 @@ function remapReplacementTableParagraphIds(xml, namespaceBindings, nextId) {
   });
   const paragraphIds = [];
   for (const range of parsed.ranges.filter((range2) => range2.tag.namespaceUri === NS_W && ["p", "tr"].includes(range2.tag.localName)).sort((a, b) => b.start - a.start)) {
-    const attr3 = range.tag.attributes.find((attr4) => attr4.namespaceUri === W146 && attr4.localName === "paraId");
-    if (!attr3)
+    const attr4 = range.tag.attributes.find((attr5) => attr5.namespaceUri === W146 && attr5.localName === "paraId");
+    if (!attr4)
       continue;
-    const raw = [...scanRawXmlAttributes(xml.slice(range.start, range.openEnd))].find((raw2) => raw2.name === attr3.name);
+    const raw = [...scanRawXmlAttributes(xml.slice(range.start, range.openEnd))].find((raw2) => raw2.name === attr4.name);
     const id = nextId();
     if (range.tag.localName === "p")
       paragraphIds.unshift(id);
@@ -260378,11 +260856,11 @@ function splitCompareManualBreakSegments(xml, prefix2) {
       const childXml = xml.slice(child.start, child.end);
       const carrier = children.length === 1 ? xml.slice(run.start, run.end) : `${openTag}${childXml}</${prefix2}:r>`;
       if (child.tag.localName === "t") {
-        if (child.tag.isSelfClosing || xml.slice(child.openEnd, child.closeStart).includes("<") || child.tag.attributes.some((attr3) => !(attr3.namespaceUri === "http://www.w3.org/XML/1998/namespace" && attr3.localName === "space")))
+        if (child.tag.isSelfClosing || xml.slice(child.openEnd, child.closeStart).includes("<") || child.tag.attributes.some((attr4) => !(attr4.namespaceUri === "http://www.w3.org/XML/1998/namespace" && attr4.localName === "space")))
           return null;
         spans[spans.length - 1] += carrier;
       } else if (child.tag.localName === "br") {
-        if (xml.slice(child.openEnd, child.closeStart).trim() || child.tag.attributes.some((attr3) => attr3.namespaceUri !== NS_W || (attr3.localName === "type" ? attr3.value !== "textWrapping" : attr3.localName !== "clear" || !["none", "left", "right", "all"].includes(attr3.value))))
+        if (xml.slice(child.openEnd, child.closeStart).trim() || child.tag.attributes.some((attr4) => attr4.namespaceUri !== NS_W || (attr4.localName === "type" ? attr4.value !== "textWrapping" : attr4.localName !== "clear" || !["none", "left", "right", "all"].includes(attr4.value))))
           return null;
         breaks.push(carrier);
         spans.push("");
@@ -261212,8 +261690,8 @@ function renderTrackedSectionReplay(step2, stamp, context) {
   const before = step2.beforeXml;
   const names = replayNames(context.after.namespaceBindings, context.after.tag.prefix);
   const markerName = qualifiedName(names.elementPrefix, "sectPrChange");
-  const attr3 = (name) => qualifiedName(names.attributePrefix, name);
-  const marker = `<${markerName}${names.namespaceDeclaration} ${attr3("id")}="${stamp.wId}" ${attr3("author")}="${escapeXmlAttribute(stamp.author.name)}"` + ` ${attr3("date")}="${escapeXmlAttribute(stamp.date)}">${before}</${markerName}>`;
+  const attr4 = (name) => qualifiedName(names.attributePrefix, name);
+  const marker = `<${markerName}${names.namespaceDeclaration} ${attr4("id")}="${stamp.wId}" ${attr4("author")}="${escapeXmlAttribute(stamp.author.name)}"` + ` ${attr4("date")}="${escapeXmlAttribute(stamp.date)}">${before}</${markerName}>`;
   if (context.after.tag.isSelfClosing) {
     return step2.afterXml.slice(0, -2) + `>${marker}</${context.after.tag.name}>`;
   }
@@ -261240,10 +261718,10 @@ function renderTrackedBookmarkMarkerReplay(step2, stamp, context) {
 function renderTrackedWrapper(kind, inner, stamp, context) {
   const names = replayNames(context.parentNamespaceBindings, context.before.tag.prefix);
   const wrapperName = qualifiedName(names.elementPrefix, kind);
-  const attr3 = (name) => qualifiedName(names.attributePrefix, name);
+  const attr4 = (name) => qualifiedName(names.attributePrefix, name);
   const rsidAttribute = kind === "del" ? "rsidDel" : "rsidR";
-  const initials = stamp.author.initials ? ` ${attr3("initials")}="${escapeXmlAttribute(stamp.author.initials)}"` : "";
-  return `<${wrapperName}${names.namespaceDeclaration} ${attr3("id")}="${stamp.wId}" ${attr3("author")}="${escapeXmlAttribute(stamp.author.name)}"${initials}` + ` ${attr3("date")}="${escapeXmlAttribute(stamp.date)}" ${attr3(rsidAttribute)}="${stamp.rsid}">${inner}</${wrapperName}>`;
+  const initials = stamp.author.initials ? ` ${attr4("initials")}="${escapeXmlAttribute(stamp.author.initials)}"` : "";
+  return `<${wrapperName}${names.namespaceDeclaration} ${attr4("id")}="${stamp.wId}" ${attr4("author")}="${escapeXmlAttribute(stamp.author.name)}"${initials}` + ` ${attr4("date")}="${escapeXmlAttribute(stamp.date)}" ${attr4(rsidAttribute)}="${stamp.rsid}">${inner}</${wrapperName}>`;
 }
 function readResolvedReplayAttribute(element, localName2) {
   return element.tag.attributes.find((attribute2) => attribute2.namespaceUri === NS_W && attribute2.localName === localName2)?.value ?? null;
@@ -271961,7 +272439,7 @@ function removeCommentsExtendedEntries3(xml, paraIds) {
   return { ok: true, value: next };
 }
 function removeCommentsExtendedParentRefs(xml, paraIds) {
-  return xml.replace(/\s+\b(?:w14|w15):(?:paraIdParent|parentId)="([^"]*)"/g, (attr3, parentParaId) => paraIds.has(parentParaId) ? "" : attr3);
+  return xml.replace(/\s+\b(?:w14|w15):(?:paraIdParent|parentId)="([^"]*)"/g, (attr4, parentParaId) => paraIds.has(parentParaId) ? "" : attr4);
 }
 function removeCommentsIdsEntries3(xml, paraIds) {
   const re = /<[\w.-]+:commentId\b[^>]*\/?>/g;
@@ -276015,8 +276493,8 @@ function sanitizeWordNamespaces(bytes) {
 function sanitizeReviewMetadataOpeningTag(open2, element) {
   if (element.tag.namespaceUri !== WORD_NS2)
     return open2;
-  const illegal = ["ins", "del", "moveFrom", "moveTo"].includes(element.tag.localName) ? element.tag.attributes.filter((attr3) => attr3.namespaceUri === WORD_NS2 && ["rsidR", "rsidDel"].includes(attr3.localName)) : [];
-  const comments = element.tag.localName === "comment" ? element.tag.attributes.filter((attr3) => attr3.namespaceUri === COMMENT_META_NS) : [];
+  const illegal = ["ins", "del", "moveFrom", "moveTo"].includes(element.tag.localName) ? element.tag.attributes.filter((attr4) => attr4.namespaceUri === WORD_NS2 && ["rsidR", "rsidDel"].includes(attr4.localName)) : [];
+  const comments = element.tag.localName === "comment" ? element.tag.attributes.filter((attr4) => attr4.namespaceUri === COMMENT_META_NS) : [];
   if (!illegal.length && !comments.length)
     return open2;
   let tag = open2;
@@ -276028,7 +276506,7 @@ function sanitizeReviewMetadataOpeningTag(open2, element) {
     return prefix2;
   };
   const markIgnorable = (prefix2) => {
-    const current = [...scanRawXmlAttributes(tag)].find((attr3) => attr3.localName === "Ignorable" && bindings2[attr3.prefix ?? ""] === MC_NS3);
+    const current = [...scanRawXmlAttributes(tag)].find((attr4) => attr4.localName === "Ignorable" && bindings2[attr4.prefix ?? ""] === MC_NS3);
     if (current) {
       const value = tag.slice(current.valueStart, current.valueEnd);
       if (!value.trim().split(/\s+/).includes(prefix2)) {
@@ -276042,37 +276520,37 @@ function sanitizeReviewMetadataOpeningTag(open2, element) {
   };
   if (illegal.length) {
     const prefix2 = Object.keys(bindings2).find((key3) => key3.length > 0 && bindings2[key3] === TRACKED_CHANGE_NS2) ?? freePrefix("sdtr");
-    const identityPrefixes = new Set([prefix2, ...element.tag.attributes.filter((attr3) => attr3.namespaceUri === TRACKED_CHANGE_NS2 && illegal.some((legacy) => legacy.localName === attr3.localName)).flatMap((attr3) => attr3.prefix ? [attr3.prefix] : [])]);
+    const identityPrefixes = new Set([prefix2, ...element.tag.attributes.filter((attr4) => attr4.namespaceUri === TRACKED_CHANGE_NS2 && illegal.some((legacy) => legacy.localName === attr4.localName)).flatMap((attr4) => attr4.prefix ? [attr4.prefix] : [])]);
     for (const identityPrefix of identityPrefixes) {
-      if (![...scanRawXmlAttributes(tag)].some((attr3) => attr3.name === `xmlns:${identityPrefix}`)) {
+      if (![...scanRawXmlAttributes(tag)].some((attr4) => attr4.name === `xmlns:${identityPrefix}`)) {
         tag = insertRootAttribute(tag, `xmlns:${identityPrefix}="${TRACKED_CHANGE_NS2}"`);
         bindings2[identityPrefix] = TRACKED_CHANGE_NS2;
       }
     }
-    const names = new Set(illegal.map((attr3) => attr3.name));
+    const names = new Set(illegal.map((attr4) => attr4.name));
     const attributes = [...scanRawXmlAttributes(tag)];
     const updates = new Map;
-    for (const attr3 of attributes) {
-      if (!names.has(attr3.name))
+    for (const attr4 of attributes) {
+      if (!names.has(attr4.name))
         continue;
-      const existing = attributes.find((candidate2) => candidate2.localName === attr3.localName && bindings2[candidate2.prefix ?? ""] === TRACKED_CHANGE_NS2);
+      const existing = attributes.find((candidate2) => candidate2.localName === attr4.localName && bindings2[candidate2.prefix ?? ""] === TRACKED_CHANGE_NS2);
       if (existing)
-        updates.set(existing.name, attr3.value);
+        updates.set(existing.name, attr4.value);
     }
-    for (const attr3 of attributes.reverse()) {
-      if (updates.has(attr3.name)) {
-        tag = tag.slice(0, attr3.valueStart) + updates.get(attr3.name) + tag.slice(attr3.valueEnd);
-      } else if (names.has(attr3.name)) {
-        const localName2 = attr3.localName;
+    for (const attr4 of attributes.reverse()) {
+      if (updates.has(attr4.name)) {
+        tag = tag.slice(0, attr4.valueStart) + updates.get(attr4.name) + tag.slice(attr4.valueEnd);
+      } else if (names.has(attr4.name)) {
+        const localName2 = attr4.localName;
         const exists = element.tag.attributes.some((candidate2) => candidate2.localName === localName2 && candidate2.namespaceUri === TRACKED_CHANGE_NS2);
-        const replacement2 = exists ? "" : tag.slice(attr3.sourceStart, attr3.sourceEnd).replace(attr3.name, `${prefix2}:${localName2}`);
-        tag = tag.slice(0, attr3.sourceStart) + replacement2 + tag.slice(attr3.sourceEnd);
+        const replacement2 = exists ? "" : tag.slice(attr4.sourceStart, attr4.sourceEnd).replace(attr4.name, `${prefix2}:${localName2}`);
+        tag = tag.slice(0, attr4.sourceStart) + replacement2 + tag.slice(attr4.sourceEnd);
       }
     }
     for (const identityPrefix of identityPrefixes)
       markIgnorable(identityPrefix);
   }
-  for (const prefix2 of new Set(comments.map((attr3) => attr3.prefix))) {
+  for (const prefix2 of new Set(comments.map((attr4) => attr4.prefix))) {
     if (prefix2)
       markIgnorable(prefix2);
   }
@@ -278300,7 +278778,7 @@ function serializeSDDocumentSessionInternalPackageWithDiagnostics(session, optio
       continue;
     if (internal.state.packageBytes.has(partUri))
       continue;
-    finalizeEntry(partUri, bytes);
+    finalizeEntry(partUri, trackedChangesProjection.overrides.get(partUri) ?? bytes);
   }
   for (const [partUri, bytes] of trackedChangesProjection.overrides) {
     if (commentRemovals.has(partUri))
@@ -278441,12 +278919,19 @@ function planSourceBackedStreamingSave(internal, mainPartUri, options) {
   const commentOverrides = normalization.overrides;
   const commentRemovals = EMPTY_PART_URI_SET;
   const commentWarnings = normalization.warnings;
-  const trackedChangesProjection = projectTrackedChangesForExport(state, {
-    mode,
-    replacementMode: internal.trackedChangesReplacementMode,
-    baseOverrides: commentOverrides,
-    excludedPartUris: hasResidentMain ? EMPTY_PART_URI_SET : new Set([mainPartUri])
-  });
+  let trackedChangesProjection;
+  try {
+    trackedChangesProjection = projectTrackedChangesForExport(state, {
+      mode,
+      replacementMode: internal.trackedChangesReplacementMode,
+      baseOverrides: commentOverrides,
+      excludedPartUris: hasResidentMain ? EMPTY_PART_URI_SET : new Set([mainPartUri])
+    });
+  } catch (error48) {
+    if (!(error48 instanceof RevisionIdExportCoverageError))
+      throw error48;
+    throw new SDSourceBackedSaveUnsupportedError("save-overlay-unsupported", error48.partUri, "Revision ID normalization requires a complete ID inventory; the fenced main story cannot be materialized for export.");
+  }
   if (commentRemovals.has(mainPartUri) || !hasResidentMain && (commentOverrides.has(mainPartUri) || trackedChangesProjection.overrides.has(mainPartUri))) {
     throw new SDSourceBackedSaveUnsupportedError("save-overlay-unsupported", mainPartUri, `Save would rewrite the fenced source-backed main story ${mainPartUri}; the streaming overlay path cannot compose a fenced-main rewrite yet.`);
   }
@@ -278563,7 +279048,7 @@ function planSourceBackedStreamingSave(internal, mainPartUri, options) {
       continue;
     if (state.packageBytes.has(partUri))
       continue;
-    pushBytes(partUri, bytes);
+    pushBytes(partUri, trackedChangesProjection.overrides.get(partUri) ?? bytes);
   }
   for (const [partUri, bytes] of trackedChangesProjection.overrides) {
     if (partUri === mainPartUri || commentRemovals.has(partUri) || emitted.has(partUri))
@@ -282611,6 +283096,7 @@ var init_sd_document_session = __esm(() => {
   init_hyperlink_catalog();
   init_field_catalog();
   init_remote_paragraph_publication();
+  init_revision_id_export();
   init_resident_review();
   init_canonical_xml_analysis_frame();
   init_catalog_xml_analysis();
@@ -283010,7 +283496,7 @@ function readScalarDocumentProperty(session, name) {
     return missing;
   if (!root)
     return unavailable2;
-  const matches = children(root, CUSTOM, "property").filter((property) => property.tag.attributes.some((attr3) => attr3.namespaceUri === "" && attr3.localName === "name" && attr3.value === name));
+  const matches = children(root, CUSTOM, "property").filter((property) => property.tag.attributes.some((attr4) => attr4.namespaceUri === "" && attr4.localName === "name" && attr4.value === name));
   if (!matches.length)
     return missing;
   if (matches.length !== 1 || matches[0].children.length !== 1)
@@ -283026,12 +283512,12 @@ function readScalarDocumentVariable(session, name) {
     return missing;
   if (!root)
     return unavailable2;
-  const matches = children(root, W6, "docVars").flatMap((vars) => children(vars, W6, "docVar")).filter((entry) => entry.tag.attributes.some((attr3) => attr3.namespaceUri === W6 && attr3.localName === "name" && attr3.value === name));
+  const matches = children(root, W6, "docVars").flatMap((vars) => children(vars, W6, "docVar")).filter((entry) => entry.tag.attributes.some((attr4) => attr4.namespaceUri === W6 && attr4.localName === "name" && attr4.value === name));
   if (!matches.length)
     return missing;
   if (matches.length !== 1 || matches[0].children.length)
     return unavailable2;
-  const value = matches[0].tag.attributes.find((attr3) => attr3.namespaceUri === W6 && attr3.localName === "val");
+  const value = matches[0].tag.attributes.find((attr4) => attr4.namespaceUri === W6 && attr4.localName === "val");
   return value ? { kind: "value", value: value.value } : unavailable2;
 }
 var CP = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties", DC = "http://purl.org/dc/elements/1.1/", DCTERMS = "http://purl.org/dc/terms/", APP = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties", CUSTOM = "http://schemas.openxmlformats.org/officeDocument/2006/custom-properties", VT = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes", W6 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", TD88, unavailable2, missing, BUILTINS;
@@ -283986,6 +284472,8 @@ var init_sd_document_session_internal = __esm(() => {
   init_core_properties();
   init_docx_package_sanitizer();
   init_scalar_properties();
+  init_revision_id_export();
+  init_row_height_review_geometry();
   init_sd_document_session();
   init_review_projection_overlay();
   init_ensure_para_ids();
@@ -312627,6 +313115,7 @@ var init_registry3 = __esm(() => {
     "tables.applyBorderPreset",
     "tables.setBorders",
     "tables.setLayout",
+    "tables.setColumnWidth",
     "tables.setRowHeight",
     "tables.setRowOptions",
     "tables.setCellProperties",
@@ -312765,6 +313254,13 @@ var init_source = __esm(() => {
       relatedV1Operation: "replace",
       rationale: "Host-owned cut/paste and pointer-drag move authoring primitive. It returns the text-mutation receipt used for atomic render and history finalization."
     },
+    {
+      method: "createDocumentApi(host.adapter).tables.resizeColumns",
+      stability: "internal",
+      workerWired: true,
+      relatedV1Operation: "tables.setColumnWidth",
+      rationale: "Native column-drag primitive: commit the complete width grid and fixed layout as one property revision and history entry."
+    },
     {
       method: "createDocumentApi(host.adapter).tables.applyTableProperties",
       stability: "consumer-supported",
@@ -312960,8 +313456,8 @@ var init_source = __esm(() => {
       revisionBinding: "unbound",
       durability: "save-reopen",
       remapBehavior: "invalidate",
-      invalidationBehavior: "Tracked-change refs are stable across save/reopen while the change is pending. Accept/reject invalidates.",
-      refreshGuidance: "After accept/reject, drop the held tracked-change address; re-list from `trackChanges.list` for any remaining changes.",
+      invalidationBehavior: "Pending tracked-change refs with Word-valid revision IDs are stable across save/reopen. DOCX export normalizes out-of-range revision IDs without changing live refs; those normalized refs must be rediscovered after reopening. Accept/reject invalidates.",
+      refreshGuidance: "After accept/reject, drop the held tracked-change address; re-list from `trackChanges.list` for any remaining changes. Re-list after reopening an export that normalized out-of-range revision IDs.",
       lifecycleFixture: "covered"
     },
     {
@@ -319445,15 +319941,15 @@ var require_js2xml = __commonJS((exports, module) => {
     if ("attributesFn" in options) {
       attributes = options.attributesFn(attributes, currentElementName, currentElement);
     }
-    var key3, attr3, attrName, quote, result = [];
+    var key3, attr4, attrName, quote, result = [];
     for (key3 in attributes) {
       if (attributes.hasOwnProperty(key3) && attributes[key3] !== null && attributes[key3] !== undefined) {
         quote = options.noQuotesForNativeAttributes && typeof attributes[key3] !== "string" ? "" : '"';
-        attr3 = "" + attributes[key3];
-        attr3 = attr3.replace(/"/g, "&quot;");
-        attrName = "attributeNameFn" in options ? options.attributeNameFn(key3, attr3, currentElementName, currentElement) : key3;
+        attr4 = "" + attributes[key3];
+        attr4 = attr4.replace(/"/g, "&quot;");
+        attrName = "attributeNameFn" in options ? options.attributeNameFn(key3, attr4, currentElementName, currentElement) : key3;
         result.push(options.spaces && options.indentAttributes ? writeIndentation(options, depth + 1, false) : " ");
-        result.push(attrName + "=" + quote + ("attributeValueFn" in options ? options.attributeValueFn(attr3, key3, currentElementName, currentElement) : attr3) + quote);
+        result.push(attrName + "=" + quote + ("attributeValueFn" in options ? options.attributeValueFn(attr4, key3, currentElementName, currentElement) : attr4) + quote);
       }
     }
     if (attributes && Object.keys(attributes).length && options.spaces && options.indentAttributes) {
@@ -319784,14 +320280,14 @@ function findChildren(node3, name) {
     return [];
   return node3.elements.filter((el) => el && el.name === name);
 }
-function attr3(node3, name) {
+function attr4(node3, name) {
   const value = node3?.attributes?.[name];
   return value == null ? undefined : String(value);
 }
 function parseOnOff2(node3) {
   if (!node3)
     return;
-  const raw = attr3(node3, "w:val");
+  const raw = attr4(node3, "w:val");
   if (raw == null)
     return true;
   const lower = raw.trim().toLowerCase();
@@ -319802,14 +320298,14 @@ function parseOnOff2(node3) {
   return true;
 }
 function parseNumberVal(node3) {
-  const raw = attr3(node3, "w:val");
+  const raw = attr4(node3, "w:val");
   if (raw == null)
     return;
   const num = Number(raw);
   return Number.isFinite(num) ? num : undefined;
 }
 function parseStringVal(node3) {
-  return attr3(node3, "w:val");
+  return attr4(node3, "w:val");
 }
 var import_xml_js, DECODER3, ST_ON, ST_OFF;
 var init_parse_xml = __esm(() => {
@@ -324863,8 +325359,8 @@ function parseContainerXml(xml, localName2) {
   };
 }
 function ensureNamespaceOnRoot(xml, prefix2, uri) {
-  const attr4 = `xmlns:${prefix2}=`;
-  if (xml.includes(attr4))
+  const attr5 = `xmlns:${prefix2}=`;
+  if (xml.includes(attr5))
     return xml;
   return xml.replace(/<([\w.-]+:[\w.-]+\b)([^>]*)>/, `<$1$2 xmlns:${prefix2}="${uri}">`);
 }
@@ -326580,7 +327076,7 @@ function evaluateScalarField(context, source, cachedText, snapshot2) {
         text = text.toLowerCase();
         break;
       case "Caps":
-        text = text.replace(/\p{L}[\p{L}\p{M}]*/gu, (word3) => word3[0].toUpperCase() + word3.slice(1).toLowerCase());
+        text = text.replace(/\p{L}[\p{L}\p{M}]*/gu, (word4) => word4[0].toUpperCase() + word4.slice(1).toLowerCase());
         break;
       case "FirstCap":
         text = text.replace(/\p{L}/u, (letter) => letter.toUpperCase());
@@ -327418,18 +327914,18 @@ function readInlinePatchFromRPrXml(rPrXml) {
   const children2 = parsed ? parseTopLevelChildren(parsed.inner) : [];
   const patch = {};
   const child = (localName2) => children2.find((candidate2) => candidate2.localName === localName2);
-  const attr4 = (xml, localName2) => {
+  const attr5 = (xml, localName2) => {
     const raw = readAttr2(xml, localName2);
     return raw == null ? undefined : decodeXmlText8(raw);
   };
   const scaled = (localName2, divisor) => {
     const node3 = child(localName2);
-    const raw = node3 ? Number.parseInt(attr4(node3.xml, "val") ?? "", 10) : Number.NaN;
+    const raw = node3 ? Number.parseInt(attr5(node3.xml, "val") ?? "", 10) : Number.NaN;
     return Number.isFinite(raw) ? raw / divisor : undefined;
   };
   const stringVal = (localName2) => {
     const node3 = child(localName2);
-    return node3 ? attr4(node3.xml, "val") : undefined;
+    return node3 ? attr5(node3.xml, "val") : undefined;
   };
   const objectOf = (localName2, attrMap, numeric = new Set) => {
     const node3 = child(localName2);
@@ -327437,7 +327933,7 @@ function readInlinePatchFromRPrXml(rPrXml) {
       return;
     const out = {};
     for (const [key3, attrName] of Object.entries(attrMap)) {
-      const raw = attr4(node3.xml, attrName);
+      const raw = attr5(node3.xml, attrName);
       if (raw == null || raw === "")
         continue;
       out[key3] = numeric.has(key3) ? Number(raw) : raw;
@@ -327451,13 +327947,13 @@ function readInlinePatchFromRPrXml(rPrXml) {
   }
   const underline = child("u");
   if (underline) {
-    const style = attr4(underline.xml, "val");
+    const style = attr5(underline.xml, "val");
     if (style === "none" || style === "0")
       patch.underline = false;
     else {
       const value2 = { style: style ?? "single" };
-      const color2 = attr4(underline.xml, "color");
-      const themeColor = attr4(underline.xml, "themeColor");
+      const color2 = attr5(underline.xml, "color");
+      const themeColor = attr5(underline.xml, "themeColor");
       if (color2)
         value2.color = color2;
       if (themeColor)
@@ -327471,7 +327967,7 @@ function readInlinePatchFromRPrXml(rPrXml) {
   else {
     const shading2 = child("shd");
     if (shading2 && isHighlightFallbackShdXml3(shading2.xml))
-      patch.highlight = attr4(shading2.xml, "fill");
+      patch.highlight = attr5(shading2.xml, "fill");
   }
   const color = stringVal("color");
   if (color)
@@ -327552,8 +328048,8 @@ function readInlinePatchFromRPrXml(rPrXml) {
   const stylisticSets = child("stylisticSets");
   if (stylisticSets) {
     patch.stylisticSets = [...stylisticSets.xml.matchAll(/<[\w.-]+:ss\b[^>]*>/g)].map(([tag]) => {
-      const val = attr4(tag, "val");
-      return { id: Number(attr4(tag, "id")), val: val !== "0" && val !== "false" };
+      const val = attr5(tag, "val");
+      return { id: Number(attr5(tag, "id")), val: val !== "0" && val !== "false" };
     });
   }
   return patch;
@@ -333468,7 +333964,7 @@ function collectPermissionRanges(context, includeUnpaired) {
 }
 function collectPermissionMarkers(xml) {
   return collectXmlElementRanges(xml).ranges.filter(({ tag }) => tag.namespaceUri === WORD_NAMESPACE7 && (tag.localName === "permStart" || tag.localName === "permEnd")).map(({ tag, start, end }) => {
-    const attribute2 = (name) => tag.attributes.find((attr4) => attr4.namespaceUri === WORD_NAMESPACE7 && attr4.localName === name)?.value;
+    const attribute2 = (name) => tag.attributes.find((attr5) => attr5.namespaceUri === WORD_NAMESPACE7 && attr5.localName === name)?.value;
     const group = attribute2("edGrp");
     const editor = attribute2("ed");
     return {
@@ -333953,7 +334449,7 @@ function parseRoot(xml, localName2, namespace) {
 function parseSettings(xml) {
   const parsed = parseRoot(xml, "settings", WORD_NAMESPACES2);
   const namespace = parsed.root.tag.namespaceUri;
-  if (parsed.ranges.some((range) => WORD_NAMESPACES2.has(range.tag.namespaceUri) && range.tag.namespaceUri !== namespace || range.tag.attributes.some((attr4) => WORD_NAMESPACES2.has(attr4.namespaceUri) && attr4.namespaceUri !== namespace))) {
+  if (parsed.ranges.some((range) => WORD_NAMESPACES2.has(range.tag.namespaceUri) && range.tag.namespaceUri !== namespace || range.tag.attributes.some((attr5) => WORD_NAMESPACES2.has(attr5.namespaceUri) && attr5.namespaceUri !== namespace))) {
     throw operationError("PRECONDITION_FAILED", "Settings XML mixes WordprocessingML dialects.");
   }
   return {
@@ -333968,7 +334464,7 @@ function parseSettings(xml) {
   };
 }
 function wordAttributes(element) {
-  return Object.fromEntries(element.tag.attributes.filter((attr4) => attr4.namespaceUri === element.tag.namespaceUri).map((attr4) => [`w:${attr4.localName}`, attr4.value]));
+  return Object.fromEntries(element.tag.attributes.filter((attr5) => attr5.namespaceUri === element.tag.namespaceUri).map((attr5) => [`w:${attr5.localName}`, attr5.value]));
 }
 function serializeAttributes2(attrs) {
   return Object.entries(attrs).map(([key3, value2]) => ` ${key3}="${xmlEscapeAttr(value2)}"`).join("");
@@ -333990,7 +334486,7 @@ function updateSettingsChild(xml, name, changes) {
   const existing = parsed.find(name);
   const bindings2 = existing?.namespaceBindings ?? parsed.root.namespaceBindings;
   let prefix2 = Object.keys(bindings2).find((key3) => key3.length > 0 && bindings2[key3] === parsed.namespace);
-  const attrs = Object.fromEntries((existing?.tag.attributes ?? []).filter((attr4) => !(attr4.namespaceUri === parsed.namespace && Object.prototype.hasOwnProperty.call(changes, attr4.localName))).map((attr4) => [attr4.name, attr4.value]));
+  const attrs = Object.fromEntries((existing?.tag.attributes ?? []).filter((attr5) => !(attr5.namespaceUri === parsed.namespace && Object.prototype.hasOwnProperty.call(changes, attr5.localName))).map((attr5) => [attr5.name, attr5.value]));
   if (!prefix2) {
     prefix2 = "w";
     for (let index = 1;bindings2[prefix2] !== undefined; index++)
@@ -335739,6 +336235,86 @@ function prepareRowHeightMutation(resolved, heightTwips, rule, tracked = false)
     render: (propertyXml) => resolved.tableXml.slice(0, start) + open2 + propertyXml + close + resolved.tableXml.slice(end)
   };
 }
+function prepareRowHeightReviewGeometry(resolved) {
+  const source = TD95.decode(resolved.bytes);
+  const tableStart = TD95.decode(resolved.bytes.subarray(0, resolved.table.tableByteStart)).length;
+  const rowStart = TD95.decode(resolved.bytes.subarray(0, resolved.row.rowByteStart)).length - tableStart;
+  const table = collectXmlElementRanges(source).ranges.find((range) => range.start === tableStart && range.tag.localName === "tbl" && range.tag.namespaceUri === W8);
+  const namespaces = { ...table.namespaceBindings };
+  const inspect = (xml) => {
+    const parsed = collectXmlElementRanges(xml, { fragment: true, additionalNamespaces: namespaces });
+    if (parsed.errors.length)
+      throw new Error("Row history requires well-formed table source.");
+    const ranges = parsed.ranges;
+    const direct = (parent, name) => ranges.filter((range) => range.start >= parent.openEnd && range.end <= parent.closeStart && range.tag.namespaceUri === W8 && range.tag.localName === name && !ranges.some((outer) => outer.start >= parent.openEnd && outer.end <= parent.closeStart && outer.start < range.start && outer.end > range.end));
+    const root = ranges.find((range) => range.start === 0 && range.tag.namespaceUri === W8 && range.tag.localName === "tbl");
+    const row = ranges.find((range) => range.start === rowStart && range.tag.namespaceUri === W8 && range.tag.localName === "tr");
+    if (!root || !row)
+      throw new Error("Row history target no longer matches the captured source.");
+    const cellRanges = ranges.filter((range) => range.tag.namespaceUri === W8 && range.tag.localName === "tc" && range.start >= row.openEnd && range.end <= row.closeStart && !ranges.some((outer) => outer.tag.namespaceUri === W8 && ["tc", "tbl"].includes(outer.tag.localName) && outer.start >= row.openEnd && outer.start < range.start && outer.end > range.end)).sort((a, b) => a.start - b.start);
+    if (cellRanges.length !== resolved.row.cells.length)
+      throw new Error("Row history cell ranges are ambiguous.");
+    const grid = direct(root, "tblGrid");
+    if (grid.length !== 1)
+      throw new Error("Row history requires one source table grid.");
+    return { grid: grid[0], direct, cells: cellRanges };
+  };
+  const original = inspect(resolved.tableXml);
+  const missingCells = original.cells.filter((cell) => {
+    const property2 = original.direct(cell, "tcPr")[0];
+    return !property2 || original.direct(property2, "tcPrChange").length === 0;
+  }).length;
+  const missingGrid = original.direct(original.grid, "tblGridChange").length === 0;
+  return {
+    count: missingCells + Number(missingGrid),
+    namespaces,
+    render(xml, ids, author, date6) {
+      const facts = inspect(xml);
+      const replacements = [];
+      let index = 0;
+      const prefixFor = (range) => {
+        let prefix2 = range.tag.prefix || Object.keys(range.namespaceBindings).find((key3) => key3 && range.namespaceBindings[key3] === W8) || "rh";
+        if (range.namespaceBindings[prefix2] !== undefined && range.namespaceBindings[prefix2] !== W8) {
+          prefix2 = "rh";
+          for (let n = 1;range.namespaceBindings[prefix2] !== undefined; n++)
+            prefix2 = `rh${n}`;
+        }
+        return { prefix: prefix2, declaration: range.namespaceBindings[prefix2] === W8 ? "" : ` xmlns:${prefix2}="${W8}"` };
+      };
+      for (const cell of facts.cells) {
+        const properties2 = facts.direct(cell, "tcPr");
+        if (properties2.length > 1)
+          throw new Error("Row history cell properties are ambiguous.");
+        const property2 = properties2[0];
+        if (property2 && facts.direct(property2, "tcPrChange").length)
+          continue;
+        const { prefix: prefix2, declaration } = prefixFor(property2 ?? cell);
+        const before = property2 ? xml.slice(property2.start, property2.end) : `<${prefix2}:tcPr/>`;
+        const wrapper = `<${prefix2}:tcPrChange${declaration} ${prefix2}:id="${ids[index++]}" ${prefix2}:author="${escapeXmlAttribute3(author)}" ${prefix2}:date="${escapeXmlAttribute3(date6)}">${before}</${prefix2}:tcPrChange>`;
+        let next;
+        if (property2 && !property2.tag.isSelfClosing)
+          next = xml.slice(property2.start, property2.closeStart) + wrapper + xml.slice(property2.closeStart, property2.end);
+        else if (property2)
+          next = before.replace(/\/\s*>$/, ">") + wrapper + `</${property2.tag.name}>`;
+        else
+          next = `<${prefix2}:tcPr${declaration}>${wrapper}</${prefix2}:tcPr>`;
+        replacements.push({ start: property2?.start ?? cell.openEnd, end: property2?.end ?? cell.openEnd, xml: next });
+      }
+      if (!facts.direct(facts.grid, "tblGridChange").length) {
+        const { prefix: prefix2, declaration } = prefixFor(facts.grid);
+        const before = xml.slice(facts.grid.start, facts.grid.end);
+        const wrapper = `<${prefix2}:tblGridChange${declaration} ${prefix2}:id="${ids[index++]}">${before}</${prefix2}:tblGridChange>`;
+        const next = facts.grid.tag.isSelfClosing ? before.replace(/\/\s*>$/, ">") + wrapper + `</${facts.grid.tag.name}>` : xml.slice(facts.grid.start, facts.grid.closeStart) + wrapper + xml.slice(facts.grid.closeStart, facts.grid.end);
+        replacements.push({ start: facts.grid.start, end: facts.grid.end, xml: next });
+      }
+      if (index !== ids.length)
+        throw new Error("Row history revision reservation does not match its source surfaces.");
+      for (const replacement2 of replacements.sort((a, b) => b.start - a.start))
+        xml = xml.slice(0, replacement2.start) + replacement2.xml + xml.slice(replacement2.end);
+      return xml;
+    }
+  };
+}
 var W8 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", TD95;
 var init_native_table_properties = __esm(() => {
   init_sd_document_session_internal();
@@ -340774,7 +341350,7 @@ var init_default2 = __esm(() => {
       }
     },
     adoptAttributes(recipient, attrs) {
-      const recipientAttrsMap = new Set(recipient.attrs.map((attr4) => attr4.name));
+      const recipientAttrsMap = new Set(recipient.attrs.map((attr5) => attr5.name));
       for (let j = 0;j < attrs.length; j++) {
         if (!recipientAttrsMap.has(attrs[j].name)) {
           recipient.attrs.push(attrs[j]);
@@ -341070,7 +341646,7 @@ var init_foreign_content = __esm(() => {
     "xChannelSelector",
     "yChannelSelector",
     "zoomAndPan"
-  ].map((attr4) => [attr4.toLowerCase(), attr4]));
+  ].map((attr5) => [attr5.toLowerCase(), attr5]));
   XML_ATTRS_ADJUSTMENT_MAP = new Map([
     ["xlink:actuate", { prefix: "xlink", name: "actuate", namespace: NS.XLINK }],
     ["xlink:arcrole", { prefix: "xlink", name: "arcrole", namespace: NS.XLINK }],
@@ -345799,10 +346375,10 @@ function convertFlowChildren(children2, context, inlineContext, path6, indexOffs
     }
     if (!isElement(node3))
       continue;
-    const word3 = describeWordListParagraph(node3);
-    if (word3) {
+    const word4 = describeWordListParagraph(node3);
+    if (word4) {
       flushPending();
-      const group = [{ descriptor: word3, sourcePath: nodePath }];
+      const group = [{ descriptor: word4, sourcePath: nodePath }];
       let lookahead = index + 1;
       while (lookahead < children2.length) {
         const next = children2[lookahead];
@@ -345813,7 +346389,7 @@ function convertFlowChildren(children2, context, inlineContext, path6, indexOffs
         if (!isElement(next))
           break;
         const nextWord = describeWordListParagraph(next);
-        if (!nextWord || nextWord.listKey !== word3.listKey)
+        if (!nextWord || nextWord.listKey !== word4.listKey)
           break;
         group.push({ descriptor: nextWord, sourcePath: [...path6, lookahead + indexOffset] });
         lookahead += 1;
@@ -346773,8 +347349,8 @@ function hasBlockDescendant(element) {
 }
 function headingLevelForElement(element) {
   const semantic = /^h([1-6])$/.exec(element.tagName)?.[1];
-  const word3 = /(?:^|\s)MsoHeading([1-6])(?:\s|$)/i.exec(attributeValue2(element, "class") ?? "")?.[1];
-  const value2 = semantic ?? word3;
+  const word4 = /(?:^|\s)MsoHeading([1-6])(?:\s|$)/i.exec(attributeValue2(element, "class") ?? "")?.[1];
+  const value2 = semantic ?? word4;
   return value2 ? Number.parseInt(value2, 10) : undefined;
 }
 function orderedListStart(list, context, path6) {
@@ -367052,18 +367628,18 @@ function rewriteWholeBodySelectionText(bytes, index2, text4) {
   const parsed = collectXmlElementRanges(sourceXml);
   if (parsed.errors.length)
     return { ok: false, reason: "invalid-range" };
-  const document5 = parsed.ranges.find((range) => range.tag.namespaceUri === word3 && range.tag.localName === "document");
+  const document5 = parsed.ranges.find((range) => range.tag.namespaceUri === word4 && range.tag.localName === "document");
   if (!document5)
     return { ok: false, reason: "invalid-range" };
-  const body = directChildren3(sourceXml, document5, parsed.ranges)?.find((range) => range.tag.namespaceUri === word3 && range.tag.localName === "body");
+  const body = directChildren3(sourceXml, document5, parsed.ranges)?.find((range) => range.tag.namespaceUri === word4 && range.tag.localName === "body");
   if (!body || body.tag.isSelfClosing)
     return { ok: false, reason: "invalid-range" };
   const children2 = directChildren3(sourceXml, body, parsed.ranges);
   if (!children2?.length)
     return { ok: false, reason: "unsupported-context" };
   const section = children2.at(-1);
-  const contentEnd = section?.tag.namespaceUri === word3 && section.tag.localName === "sectPr" ? section.start : body.closeStart;
-  if (children2.some((child) => child.start < contentEnd && (child.tag.namespaceUri !== word3 || !["p", "tbl"].includes(child.tag.localName)))) {
+  const contentEnd = section?.tag.namespaceUri === word4 && section.tag.localName === "sectPr" ? section.start : body.closeStart;
+  if (children2.some((child) => child.start < contentEnd && (child.tag.namespaceUri !== word4 || !["p", "tbl"].includes(child.tag.localName)))) {
     return { ok: false, reason: "unsupported-context" };
   }
   const protection = validateSelectionTextReplacement({
@@ -367157,7 +367733,7 @@ function rewriteMixedBody(xml, body, contentEnd, ranges, firstByteStart, text4)
     "tcPrChange",
     "tblGridChange"
   ]);
-  if (ranges.some((range) => range.start >= body.openEnd && range.end <= contentEnd && range.tag.namespaceUri === word3 && unsupported5.has(range.tag.localName))) {
+  if (ranges.some((range) => range.start >= body.openEnd && range.end <= contentEnd && range.tag.namespaceUri === word4 && unsupported5.has(range.tag.localName))) {
     return { ok: false, reason: "unsupported-context" };
   }
   const beforeXml = xml.slice(body.openEnd, contentEnd);
@@ -367169,13 +367745,13 @@ function rewriteMixedBody(xml, body, contentEnd, ranges, firstByteStart, text4)
   }))
     return { ok: false, reason: "unsupported-context" };
   const firstStart = decoder7.decode(encoder4.encode(xml).subarray(0, firstByteStart)).length;
-  const first = ranges.find((range) => range.start === firstStart && range.tag.namespaceUri === word3 && range.tag.localName === "p");
+  const first = ranges.find((range) => range.start === firstStart && range.tag.namespaceUri === word4 && range.tag.localName === "p");
   if (!first || first.start < body.openEnd || first.end > contentEnd)
     return { ok: false, reason: "invalid-range" };
   const firstChildren = first.tag.isSelfClosing ? [] : directChildren3(xml, first, ranges);
   if (!firstChildren)
     return { ok: false, reason: "invalid-range" };
-  const properties2 = firstChildren[0]?.tag.namespaceUri === word3 && firstChildren[0].tag.localName === "pPr" ? xml.slice(firstChildren[0].start, firstChildren[0].end) : "";
+  const properties2 = firstChildren[0]?.tag.namespaceUri === word4 && firstChildren[0].tag.localName === "pPr" ? xml.slice(firstChildren[0].start, firstChildren[0].end) : "";
   const prefix2 = first.tag.prefix ? first.tag.prefix + ":" : "";
   const escaped = text4.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
   const run = "<" + prefix2 + "r><" + prefix2 + 't xml:space="preserve">' + escaped + "</" + prefix2 + "t></" + prefix2 + "r>";
@@ -367188,7 +367764,7 @@ function rewriteMixedBody(xml, body, contentEnd, ranges, firstByteStart, text4)
     return { ok: false, reason: "invalid-range" };
   return { ok: true, xml: result };
 }
-var decoder7, encoder4, word3 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+var decoder7, encoder4, word4 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 var init_whole_body_selection_text = __esm(() => {
   init_sd_document_session_internal();
   decoder7 = new TextDecoder;
@@ -371668,7 +372244,7 @@ function prepareNativeTableSplit(input) {
     return null;
   const start = decoder8.decode(input.bytes.subarray(0, input.startByte)).length;
   const end = decoder8.decode(input.bytes.subarray(0, input.endByte)).length;
-  const table = parsed.ranges.find((range) => range.start === start && range.end === end && range.tag.namespaceUri === word4 && range.tag.localName === "tbl");
+  const table = parsed.ranges.find((range) => range.start === start && range.end === end && range.tag.namespaceUri === word5 && range.tag.localName === "tbl");
   if (!table)
     return null;
   const rows = [];
@@ -371676,7 +372252,7 @@ function prepareNativeTableSplit(input) {
   for (const child of [...parsed.ranges].sort((left, right) => left.start - right.start)) {
     if (child.start < cursor || child.end > table.closeStart)
       continue;
-    if (xml.slice(cursor, child.start).trim() || child.tag.namespaceUri !== word4)
+    if (xml.slice(cursor, child.start).trim() || child.tag.namespaceUri !== word5)
       return null;
     if (child.tag.localName === "tr")
       rows.push(child);
@@ -371693,7 +372269,7 @@ function prepareNativeTableSplit(input) {
     secondXml: header + xml.slice(rows[input.rowIndex].start, rows.at(-1).end) + footer
   };
 }
-var word4 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", decoder8;
+var word5 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", decoder8;
 var init_native_table_split = __esm(() => {
   init_sd_document_session_internal();
   decoder8 = new TextDecoder;
@@ -372122,10 +372698,16 @@ function prepareNativeCellSplit(resolved, original, columnInsertIndex) {
       }
       flushRows();
       const addedColumns = model.tblGrid.gridColXmls.length - originalGridColumns.length;
-      if (addedColumns < 0 || originalGridColumns.some((column, index2) => model.tblGrid.gridColXmls[index2 < columnInsertIndex ? index2 : index2 + addedColumns] !== column))
+      const resizedColumnIndex = columnInsertIndex - 1;
+      const resizedColumnChanged = resizedColumnIndex >= 0 && model.tblGrid.gridColXmls[resizedColumnIndex] !== originalGridColumns[resizedColumnIndex];
+      if (addedColumns < 0 || originalGridColumns.some((column, index2) => index2 !== resizedColumnIndex && model.tblGrid.gridColXmls[index2 < columnInsertIndex ? index2 : index2 + addedColumns] !== column))
         return null;
-      if (model.tblGrid.changeXml !== originalGridChangeXml || addedColumns) {
+      if (model.tblGrid.changeXml !== originalGridChangeXml || addedColumns || resizedColumnChanged) {
         const gridPatches = [];
+        if (resizedColumnChanged) {
+          const column = gridColumns[resizedColumnIndex];
+          gridPatches.push({ start: column.start, end: column.end, xml: model.tblGrid.gridColXmls[resizedColumnIndex] });
+        }
         if (addedColumns) {
           const at = columnInsertIndex > 0 ? gridColumns[columnInsertIndex - 1].end : grid.openEnd;
           gridPatches.push({
@@ -372187,7 +372769,7 @@ function prepareNativeCellMerge(resolved, model) {
     for (const properties2 of nativeChildren(rows[index2], "trPr")) {
       for (const name of ["gridBefore", "gridAfter"]) {
         const omissions = nativeChildren(properties2, name);
-        if (omissions.length > 1 || omissions.some((range) => !/^\+?0+$/.test(range.tag.attributes.find((attr4) => attr4.namespaceUri === W12 && attr4.localName === "val")?.value ?? "")))
+        if (omissions.length > 1 || omissions.some((range) => !/^\+?0+$/.test(range.tag.attributes.find((attr5) => attr5.namespaceUri === W12 && attr5.localName === "val")?.value ?? "")))
           simpleTopology = false;
       }
     }
@@ -372204,7 +372786,7 @@ function prepareNativeCellMerge(resolved, model) {
           simpleTopology = false;
         if (property2) {
           const spans = nativeChildren(property2, "gridSpan");
-          if (spans.length > 1 || spans.some((range2) => !/^\+?0*1$/.test(range2.tag.attributes.find((attr4) => attr4.namespaceUri === W12 && attr4.localName === "val")?.value ?? "")) || nativeChildren(property2, "vMerge").length > 0)
+          if (spans.length > 1 || spans.some((range2) => !/^\+?0*1$/.test(range2.tag.attributes.find((attr5) => attr5.namespaceUri === W12 && attr5.localName === "val")?.value ?? "")) || nativeChildren(property2, "vMerge").length > 0)
             simpleTopology = false;
         }
         const prefix2 = property2 ? source.slice(range.openEnd, property2.start) : "";
@@ -374225,12 +374807,17 @@ class V2TablesAdapter {
   }
   setRowHeight(input, options) {
     options = normalizeRuntimeTableMutationOptions(input, options);
-    const guard = this.guardMutation(input, options, { trackedOperationId: "tables.setRowHeight" });
+    const guard = this.guardMutation(input, options, { trackedOperationId: "tables.setRowHeight", rowHeightPurpose: "height" });
     if (guard)
       return guard;
     const resolved = resolveRowLocatorForMutation(this.context, input, "tables.setRowHeight");
     const prepared = prepareRowHeightMutation(resolved, ptToTwips(input.heightPt), input.rule, options?.changeMode === "tracked");
     const dryRun = dryRunRequested2(input, options);
+    if (options?.changeMode === "tracked" && resolved.row.cells.length > 0) {
+      if (prepared.beforeXml === prepared.afterXml)
+        return successMutation(resolved.table.tableNodeId);
+      return this.commitTrackedRowHeight(resolved, prepared, { ...options, dryRun });
+    }
     const tracked = this.applyTrackedPropertyXmlWrap(prepared.beforeXml, prepared.afterXml, "trPr", {
       ...options,
       dryRun
@@ -374252,6 +374839,52 @@ class V2TablesAdapter {
       trackedChangeRefs: projectTrackedStructuralEntityIds(this.context, refs.map((ref5) => ref5.entityId)).map((entityId) => ({ kind: "entity", entityType: "trackedChange", entityId }))
     };
   }
+  commitTrackedRowHeight(resolved, prepared, options) {
+    const author = readTrackedAuthor(this.context);
+    if (!author.name)
+      return mutationFailure("PRECONDITION_FAILED", "no-author-configured");
+    const source = TD104.decode(resolved.bytes);
+    const tableStart = TD104.decode(resolved.bytes.subarray(0, resolved.table.tableByteStart)).length;
+    const prior = readRowHeightReviewCohorts(source).find((cohort) => cohort.table.start === tableStart);
+    const geometry = prepareRowHeightReviewGeometry(resolved);
+    const tableRanges = collectXmlElementRanges(resolved.tableXml, { fragment: true, additionalNamespaces: geometry.namespaces }).ranges;
+    if (!prior && tableRanges.some((range) => range.tag.localName === "tblGridChange" && range.tag.namespaceUri === "http://schemas.openxmlformats.org/wordprocessingml/2006/main")) {
+      return mutationFailure("CAPABILITY_UNAVAILABLE", "Review the existing table-grid revision before resizing this row.");
+    }
+    const count = 1 + geometry.count;
+    const previewIds = reserveTrackedRevisionIds(this.context, count, true);
+    if (!previewIds)
+      return tableRevisionIdReservationFailure("tables.setRowHeight");
+    const date6 = new Date().toISOString();
+    const prepare = (ids2) => {
+      const row = wrapAfterPropertyBlockWithChange({ nextXml: prepared.afterXml, beforeXml: prepared.beforeXml, block: "trPr", stamp: { revisionId: ids2[0], author, date: date6 } });
+      if (!row)
+        return null;
+      const xml = geometry.render(prepared.render(row), ids2.slice(1), author.name, date6);
+      const cohort = readRowHeightReviewCohorts(xml, { additionalNamespaces: geometry.namespaces, allowAllNoop: prior !== undefined }).find((value3) => value3.table.start === 0);
+      return cohort ? { xml, cohort } : null;
+    };
+    const preview = prepare(previewIds);
+    if (!preview)
+      return mutationFailure("CAPABILITY_UNAVAILABLE", "Pending or unsupported table properties cannot preserve this row-height review. Review those changes first.");
+    if (options.dryRun)
+      return successMutation(resolved.table.tableNodeId);
+    if (prior && !preview.cohort.material) {
+      let xml = preview.xml;
+      for (const change of [preview.cohort.gridChange, ...preview.cohort.rowChanges, ...preview.cohort.cellChanges].sort((a, b) => b.start - a.start)) {
+        xml = xml.slice(0, change.start) + xml.slice(change.end);
+      }
+      return this.commitTableModel(resolved, null, "v2-tables-set-row-height", [], false, xml);
+    }
+    const ids = reserveTrackedRevisionIds(this.context, count);
+    if (!ids)
+      return tableRevisionIdReservationFailure("tables.setRowHeight");
+    const result = prepare(ids);
+    const committed = this.commitTableModel(resolved, null, "v2-tables-set-row-height", ids.map((id) => ({ kind: "trackedChange", entityId: String(id), storyId: resolved.storyId })), false, result.xml);
+    if (!committed.success)
+      return committed;
+    return { ...committed, trackedChangeRefs: projectTrackedStructuralEntityIds(this.context, ids.map(String)).map((entityId) => ({ kind: "entity", entityType: "trackedChange", entityId })) };
+  }
   distributeRows(input, options) {
     options = normalizeRuntimeTableMutationOptions(input, options);
     const guard = this.guardPlannedMutation(input, options);
@@ -374685,6 +375318,34 @@ class V2TablesAdapter {
     stabilizeTableIdentityAcrossRows(model, originalTableIdentityParaId, allocParaId);
     return this.commitTableModel(resolved, model, "v2-tables-move-column");
   }
+  resizeColumns(input, options) {
+    options = normalizeRuntimeTableMutationOptions(input, options);
+    const guard = this.guardMutation(input, options, { trackedOperationId: "tables.setColumnWidth" });
+    if (guard)
+      return guard;
+    const resolved = resolvePublicTableLocator(this.context, input, "tables.resizeColumns", false);
+    const model = parseTableXmlModel(resolved.tableXml);
+    if (!Array.isArray(input.widthsPt) || input.widthsPt.length !== model.tblGrid.gridColXmls.length || input.widthsPt.some((width) => !Number.isFinite(width) || width <= 0 || ptToTwips(width) < 1)) {
+      throw operationError2("INVALID_ARGUMENT", "A column resize requires a positive width for every existing grid column.", "tables.resizeColumns");
+    }
+    const widths = input.widthsPt.map(ptToTwips);
+    model.tblGrid.gridColXmls = widths.map((width) => singleElement2(model.prefix, "gridCol", { w: String(width) }));
+    for (const row of model.rows) {
+      const gridBefore = readValidatedRowGridOmission(row.trPrXml, "gridBefore");
+      if (gridBefore == null)
+        return mutationFailure("INVALID_CONTEXT", "Column resize requires a valid row gridBefore.");
+      let column = gridBefore;
+      for (const cell of row.cells) {
+        const span = readValidatedGridSpan(cell.tcPrXml);
+        if (span == null || column + span > widths.length)
+          return mutationFailure("INVALID_CONTEXT", "Column resize requires a complete cell grid span.");
+        setCellDxaWidth(cell, model.prefix, widths.slice(column, column + span).reduce((sum, width) => sum + width, 0));
+        column += span;
+      }
+    }
+    mutateTablePr(model, (children2) => setOrRemoveChild(setOrRemoveChild(children2, "tblLayout", singleElement2(model.prefix, "tblLayout", { type: "fixed" })), "tblW", buildTablePreferredWidthXml(model.prefix, { type: "dxa", value: widths.reduce((sum, width) => sum + width, 0) })));
+    return this.commitTrackedPropertyChanges(resolved, model, "v2-tables-set-column-width", options);
+  }
   setColumnWidth(input, options) {
     options = normalizeRuntimeTableMutationOptions(input, options);
     const guard = this.guardPlannedMutation(input, options);
@@ -375425,9 +376086,11 @@ class V2TablesAdapter {
     const originalFirstParaId = model.rows[0]?.cells[0]?.firstParaId ?? null;
     const beforeCellXml = targetCell.tcPrXml ?? `<${model.prefix}:tcPr></${model.prefix}:tcPr>`;
     const beforeGridXml = `${model.tblGrid.openTag}${model.tblGrid.gridColXmls.join("")}${model.tblGrid.closeTag}`;
+    const originalWidth = readGridColumnWidth2(model.tblGrid.gridColXmls[targetColumnIndex] ?? "");
     for (let offset = 0;offset < input.columns - 1; offset += 1) {
       insertSplitColumnIntoModel(model, targetColumnIndex + 1 + offset, targetRowIndex, targetRowIndex + 1, allocParaId);
     }
+    subdivideCellWidths(model, targetRowIndex, targetColumnIndex, input.columns, originalWidth);
     const splitCells = listRowCells(row).filter((entry) => entry.gridColumnStart >= targetColumnIndex).slice(0, input.columns).map((entry) => entry.cell);
     if (splitCells.length !== input.columns) {
       return mutationFailure("PRECONDITION_FAILED", "tracked-cell-split-model-incomplete");
@@ -375516,7 +376179,7 @@ class V2TablesAdapter {
         const result = this.setCellText({ nodeId: input.cellNodeId, text: input.text }, mutationOptions2);
         return projectNarrowMutation(input.tableNodeId, result);
       }
-      const guard2 = this.guardMutation(input, mutationOptions2, { deferTrackedGate: true });
+      const guard2 = this.guardMutation(input, mutationOptions2, { deferTrackedGate: true, rowHeightPurpose: "cell-text" });
       if (guard2)
         return guard2;
       const resolved2 = resolveCellOrScopedCellLocator(this.context, { nodeId: input.cellNodeId, text: input.text }, "tables.setCellText");
@@ -375546,7 +376209,7 @@ class V2TablesAdapter {
       return { success: true, tableNodeId: resolved2.table.tableNodeId, txId: receipt4.txId };
     }
     const mutationOptions = options;
-    const guard = this.guardMutation(input, mutationOptions, { deferTrackedGate: true });
+    const guard = this.guardMutation(input, mutationOptions, { deferTrackedGate: true, rowHeightPurpose: "cell-text" });
     if (guard)
       return guard;
     const resolved = resolveCellOrScopedCellLocator(this.context, input, "tables.setCellText");
@@ -376526,6 +377189,35 @@ class V2TablesAdapter {
     if (expectedRevision !== undefined && expectedRevision !== this.context.currentPublicRevision()) {
       return mutationFailure("REVISION_MISMATCH", `expected-revision ${expectedRevision} does not match current revision ${this.context.currentPublicRevision()}.`);
     }
+    const records = [];
+    const add = (value3) => {
+      if (value3 && typeof value3 === "object")
+        records.push(value3);
+    };
+    add(input);
+    if (records[0]) {
+      add(records[0].target);
+      add(records[0].destination);
+    }
+    for (const record3 of [...records])
+      add(record3.target);
+    const ids = new Set(records.flatMap((record3) => ["nodeId", "tableNodeId", "rowNodeId", "cellNodeId"].flatMap((key3) => typeof record3[key3] === "string" ? [record3[key3]] : [])));
+    const seen = new Set;
+    for (const id of ids) {
+      const resolved = findTableByNodeIdIncludingNested(this.context, id) ?? findRowByNodeId(this.context, id) ?? findCellByNodeId(this.context, id);
+      if (!resolved || seen.has(resolved.table.tableNodeId))
+        continue;
+      seen.add(resolved.table.tableNodeId);
+      const start = TD104.decode(resolved.bytes.subarray(0, resolved.table.tableByteStart)).length;
+      const cohort = readRowHeightReviewCohorts(TD104.decode(resolved.bytes)).find((value3) => value3.table.start === start);
+      if (!cohort)
+        continue;
+      if (config2?.rowHeightPurpose === "cell-text")
+        continue;
+      if (config2?.rowHeightPurpose === "height" && options?.changeMode === "tracked" && cohort.author.trim().toLowerCase() === readTrackedAuthorName(this.context).trim().toLowerCase())
+        continue;
+      return mutationFailure("CAPABILITY_UNAVAILABLE", "Review the pending row-height change before changing this table’s structure or properties.");
+    }
     return null;
   }
   guardDocumentMutation(input, options, trackedMessage = "Document-level table mutations do not support tracked mode on v2 yet.") {
@@ -377505,11 +378197,26 @@ function createSplitCloneCell(template, paraId, prefix2, span = 1, vMerge = "non
   setCellVMerge(cell, prefix2, vMerge);
   return cell;
 }
+function subdivideCellWidths(model, rowIndex, columnIndex, columns, originalWidth) {
+  if (originalWidth == null || columns <= 1)
+    return;
+  const width = Math.floor(originalWidth / columns);
+  const remainder = originalWidth - width * columns;
+  for (let offset = 0;offset < columns; offset += 1) {
+    const cellWidth = width + (offset < remainder ? 1 : 0);
+    model.tblGrid.gridColXmls[columnIndex + offset] = singleElement2(model.prefix, "gridCol", { w: String(cellWidth) });
+    const cell = findRowCellAtGridColumn(model.rows[rowIndex], columnIndex + offset)?.cell;
+    if (cell)
+      setCellDxaWidth(cell, model.prefix, cellWidth);
+  }
+}
 function splitSimpleCellModel(model, rowIndex, columnIndex, input, allocate) {
   const originalFirstId = model.rows[0]?.cells[0]?.firstParaId ?? null;
+  const originalWidth = readGridColumnWidth2(model.tblGrid.gridColXmls[columnIndex] ?? "");
   for (let offset = 0;offset < input.columns - 1; offset += 1) {
-    insertSplitColumnIntoModel(model, columnIndex + 1 + offset, rowIndex, rowIndex + input.rows, allocate);
+    insertSplitColumnIntoModel(model, columnIndex + 1 + offset, rowIndex, rowIndex + 1, allocate);
   }
+  subdivideCellWidths(model, rowIndex, columnIndex, input.columns, originalWidth);
   for (let offset = 0;offset < input.rows - 1; offset += 1) {
     insertSplitRowIntoModel(model, rowIndex + 1 + offset, columnIndex, columnIndex + input.columns, allocate);
   }
@@ -383549,13 +384256,13 @@ function normalizeOoxml(content3, allocate) {
       return `${prefix2}:${name2.localName}`;
     };
     const name = qualifiedName2(range.tag);
-    const attrs = range.tag.attributes.filter((attr4) => !(range.tag.namespaceUri === W18 && range.tag.localName === "p" && attr4.namespaceUri === W147 && attr4.localName === "paraId")).map((attr4) => ({ name: qualifiedName2(attr4), value: attr4.value }));
+    const attrs = range.tag.attributes.filter((attr5) => !(range.tag.namespaceUri === W18 && range.tag.localName === "p" && attr5.namespaceUri === W147 && attr5.localName === "paraId")).map((attr5) => ({ name: qualifiedName2(attr5), value: attr5.value }));
     if (range.tag.namespaceUri === W18 && range.tag.localName === "p") {
       attrs.push({ name: "w14:paraId", value: allocate() });
       if (range.namespaceBindings["w14"] !== W147)
         bindings2.set("w14", W147);
     }
-    const serialized = attrs.filter((attr4) => !bindings2.has(attr4.name.replace(/^xmlns:/, ""))).map((attr4) => ` ${attr4.name}="${xmlEscapeAttr(attr4.value).replaceAll(`
+    const serialized = attrs.filter((attr5) => !bindings2.has(attr5.name.replace(/^xmlns:/, ""))).map((attr5) => ` ${attr5.name}="${xmlEscapeAttr(attr5.value).replaceAll(`
 `, "&#10;").replaceAll("\r", "&#13;").replaceAll("\t", "&#9;")}"`).join("");
     const declarations = [...bindings2].map(([prefix2, uri]) => ` xmlns:${prefix2}="${uri}"`).join("");
     edits.push({
@@ -383707,16 +384414,16 @@ function validateOoxml(input) {
         control2.content = true;
       }
       if (["pStyle", "rStyle", "tblStyle", "numId"].includes(name)) {
-        const value3 = tag.attributes.find((attr4) => attr4.namespaceUri === W18 && attr4.localName === "val")?.value;
+        const value3 = tag.attributes.find((attr5) => attr5.namespaceUri === W18 && attr5.localName === "val")?.value;
         const part = name === "numId" ? "/word/numbering.xml" : "/word/styles.xml";
         const attribute2 = name === "numId" ? "numId" : "styleId";
         const catalog = collectXmlElementRanges(readPartXml(input.context, part) ?? "").ranges;
-        if (!value3 || !catalog.some((range) => range.tag.attributes.some((attr4) => attr4.namespaceUri === W18 && attr4.localName === attribute2 && attr4.value === value3))) {
+        if (!value3 || !catalog.some((range) => range.tag.attributes.some((attr5) => attr5.namespaceUri === W18 && attr5.localName === attribute2 && attr5.value === value3))) {
           invalid4(`OOXML replacement references unavailable ${name}.`);
         }
       }
       if (name === "id" && parent === "sdtPr") {
-        const id = tag.attributes.find((attr4) => attr4.namespaceUri === W18 && attr4.localName === "val")?.value;
+        const id = tag.attributes.find((attr5) => attr5.namespaceUri === W18 && attr5.localName === "val")?.value;
         const numeric = Number(id);
         const control2 = controls.at(-1);
         if (!id || !/^-?\d+$/.test(id) || !Number.isSafeInteger(numeric) || numeric < -2147483648 || numeric > 2147483647 || ids.has(String(numeric)) || !control2 || control2.id)
@@ -383725,9 +384432,9 @@ function validateOoxml(input) {
         control2.id = true;
       }
     }
-    for (const attr4 of tag.attributes) {
-      if (attr4.namespaceUri === R && !relationshipIds.has(attr4.value))
-        invalid4(`OOXML relationship ${attr4.value} is unavailable in the destination part.`);
+    for (const attr5 of tag.attributes) {
+      if (attr5.namespaceUri === R && !relationshipIds.has(attr5.value))
+        invalid4(`OOXML relationship ${attr5.value} is unavailable in the destination part.`);
     }
     stack.push(name);
   });
@@ -383877,7 +384584,7 @@ function collectPackageControlIds(context, removed) {
     parser.on("opentag", (tag) => {
       const parent = stack.at(-1);
       if (tag.namespaceUri === W19 && tag.localName === "id" && parent?.namespaceUri === W19 && parent.localName === "sdtPr") {
-        const value3 = tag.attributes.find((attr4) => attr4.namespaceUri === W19 && attr4.localName === "val")?.value;
+        const value3 = tag.attributes.find((attr5) => attr5.namespaceUri === W19 && attr5.localName === "val")?.value;
         if (value3 !== undefined)
           ids.add(String(Number(value3)));
       }
@@ -384171,7 +384878,7 @@ function prepareStructuralSdtReplacement(context, fragment4) {
   if (lowered.plan.assets?.length)
     throw new DocumentApiValidationError2("CAPABILITY_UNSUPPORTED", "Structural SDT replacement cannot import package assets.");
   const styleBytes = readStyleDefinitionsPartBytes(context);
-  const styles = new Set(collectXmlElementRanges(styleBytes ? new TextDecoder().decode(styleBytes) : "").ranges.filter((range) => range.tag.namespaceUri === W21 && range.tag.localName === "style").flatMap((range) => range.tag.attributes.filter((attr4) => attr4.namespaceUri === W21 && attr4.localName === "styleId").map((attr4) => attr4.value)));
+  const styles = new Set(collectXmlElementRanges(styleBytes ? new TextDecoder().decode(styleBytes) : "").ranges.filter((range) => range.tag.namespaceUri === W21 && range.tag.localName === "style").flatMap((range) => range.tag.attributes.filter((attr5) => attr5.namespaceUri === W21 && attr5.localName === "styleId").map((attr5) => attr5.value)));
   const allocate = createParaIdAllocator(context);
   const contentXml = lowered.plan.blocks.map((block) => {
     if (block.kind !== "paragraph" || block.numbering || block.listIntent || block.semanticStyleRole) {
@@ -385854,6 +386561,9 @@ class V2ContentControlsAdapter {
     if (rowSection && options?.changeMode === "tracked") {
       throw operationError("CAPABILITY_UNAVAILABLE", "Tracked insertion of a repeating table row is not supported.");
     }
+    if (options?.changeMode === "tracked" && this.context.isCollaborativeSession()) {
+      throw operationError("CAPABILITY_UNAVAILABLE", "Tracked repeating-item insertion is not supported in collaboration.");
+    }
     const template = children2[Math.max(0, Math.min(insertIndex, children2.length - 1))];
     const innerXml = rowSection ? buildEmptyRepeatingTableRowXml(template, this.context) : buildParaIdParagraphXml(createParaIdAllocator(this.context)());
     const id = this.allocateId(loaded, dryRunRequested(input, options));
@@ -385888,7 +386598,10 @@ class V2ContentControlsAdapter {
     if (dryRunRequested(input, options))
       return { success: true, contentControl: target };
     const nextXml = replaceRange3(loaded.documentXml, control2.start, control2.end, replacement2);
-    return this.commitDocument(nextXml, "content-control-repeat-insert", input, options, target, { createdRefs });
+    return this.commitDocument(nextXml, "content-control-repeat-insert", input, options, target, {
+      createdRefs,
+      storySurface: { family: "storyBlocks", contentControlRewrite: true, targetBlockIds: [] }
+    });
   }
   cloneRepeatingItem(input, options) {
     this.validateTrackedControlMutation(input, options);
@@ -385904,6 +386617,9 @@ class V2ContentControlsAdapter {
       throw repeatingSectionCloneIndexError(input.index, children2.length);
     if (hasTrackedControlAncestor(loaded.documentXml, control2))
       this.requireDirectControlStructure(input, options);
+    if (options?.changeMode === "tracked" && this.context.isCollaborativeSession()) {
+      throw operationError("CAPABILITY_UNAVAILABLE", "Tracked repeating-item insertion is not supported in collaboration.");
+    }
     if (options?.changeMode !== "tracked" && dryRunRequested(input, options))
       return this.validateDryRun(input, options, control2.target);
     const cloneRevision = expectedRevisionFrom(input, options);
@@ -385932,7 +386648,10 @@ class V2ContentControlsAdapter {
     const localEnd = item.end - control2.start;
     const replacement2 = `${control2.xml.slice(0, localEnd)}${clone3}${control2.xml.slice(localEnd)}`;
     const nextXml = replaceRange3(loaded.documentXml, control2.start, control2.end, replacement2);
-    return this.commitDocument(nextXml, "content-control-repeat-clone", input, options, control2.target, { createdRefs });
+    return this.commitDocument(nextXml, "content-control-repeat-clone", input, options, control2.target, {
+      createdRefs,
+      storySurface: { family: "storyBlocks", contentControlRewrite: true, targetBlockIds: [] }
+    });
   }
   deleteRepeatingItem(input, options) {
     return this.mutateControl(input.target, input, options, (control2, loaded) => {
@@ -392427,9 +393146,9 @@ function paragraphRangeIndentationContext(paragraphXml, namespaceBindings) {
 }
 function paragraphRangeIndentationPropertiesXml(paragraphXml, namespaceBindings) {
   const { indent: indent2, propertyChildren } = paragraphRangeIndentationContext(paragraphXml, namespaceBindings);
-  const styleId = propertyChildren.find((child) => child.tag.namespaceUri === WORD_NAMESPACE9 && child.tag.localName === "pStyle")?.tag.attributes.find((attr4) => attr4.namespaceUri === WORD_NAMESPACE9 && attr4.localName === "val")?.value;
+  const styleId = propertyChildren.find((child) => child.tag.namespaceUri === WORD_NAMESPACE9 && child.tag.localName === "pStyle")?.tag.attributes.find((attr5) => attr5.namespaceUri === WORD_NAMESPACE9 && attr5.localName === "val")?.value;
   const style = styleId == null ? "" : `<w:pStyle w:val="${escapeXmlAttribute3(styleId)}"/>`;
-  const attrs = indent2?.tag.attributes.filter((attr4) => attr4.namespaceUri === WORD_NAMESPACE9).map((attr4) => `w:${attr4.localName}="${escapeXmlAttribute3(attr4.value)}"`).join(" ") ?? "";
+  const attrs = indent2?.tag.attributes.filter((attr5) => attr5.namespaceUri === WORD_NAMESPACE9).map((attr5) => `w:${attr5.localName}="${escapeXmlAttribute3(attr5.value)}"`).join(" ") ?? "";
   return `<w:pPr>${style}<w:ind ${attrs}/></w:pPr>`;
 }
 function classifyParagraphNodeType(input) {
@@ -392572,7 +393291,7 @@ function setParagraphRangeLeftIndentation(paragraphXml, left, logicalStart, name
       opening = opening.replace(/\/?>$/, (end) => ` xmlns:${attributePrefix}="${WORD_NAMESPACE9}"${end}`);
     }
     for (const localName2 of logicalStart ? ["left", "start"] : ["left"]) {
-      const existing = indent2.tag.attributes.find((attr4) => attr4.namespaceUri === WORD_NAMESPACE9 && attr4.localName === localName2);
+      const existing = indent2.tag.attributes.find((attr5) => attr5.namespaceUri === WORD_NAMESPACE9 && attr5.localName === localName2);
       const name = existing?.name ?? `${attributePrefix}:${localName2}`;
       if (existing) {
         opening = opening.replace(/\s+([^\s=]+)\s*=\s*(["'])[^]*?\2/g, (attribute2, qualifiedName2) => qualifiedName2 === name ? ` ${name}="${left}"` : attribute2);
@@ -392591,7 +393310,7 @@ function setParagraphRangeLeftIndentation(paragraphXml, left, logicalStart, name
       prefix2 += "w";
   }
   const declaration = ` xmlns:${prefix2}="${WORD_NAMESPACE9}"`;
-  const attrs = (logicalStart ? ["left", "start"] : ["left"]).map((attr4) => `${prefix2}:${attr4}="${left}"`).join(" ");
+  const attrs = (logicalStart ? ["left", "start"] : ["left"]).map((attr5) => `${prefix2}:${attr5}="${left}"`).join(" ");
   const xml = `<${prefix2}:ind${declaration} ${attrs}/>`;
   if (!properties2) {
     const pPr = `<${prefix2}:pPr${declaration}>${xml}</${prefix2}:pPr>`;
@@ -393868,7 +394587,7 @@ function buildCommentMarkerEnvelopeIndex(xml) {
   const result = walkXmlElements(xml, { onOpenTag({ tag, start, end }) {
     if (!WORD_NAMESPACES4.has(tag.namespaceUri) || !["commentRangeStart", "commentRangeEnd"].includes(tag.localName))
       return;
-    const id = tag.attributes.find((attr4) => attr4.localName === "id" && WORD_NAMESPACES4.has(attr4.namespaceUri))?.value;
+    const id = tag.attributes.find((attr5) => attr5.localName === "id" && WORD_NAMESPACES4.has(attr5.namespaceUri))?.value;
     if (id === undefined)
       return;
     const entry = markers.get(id) ?? { starts: [], ends: [] };
@@ -400024,11 +400743,11 @@ function numberingInstanceIsOwnedByRun(runtime, run) {
     for (const reference of parsed.ranges) {
       if (reference.tag.namespaceUri !== WORDPROCESSINGML_NAMESPACE7 || reference.tag.localName !== "numId")
         continue;
-      const value3 = reference.tag.attributes.find((attr4) => attr4.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr4.localName === "val")?.value;
+      const value3 = reference.tag.attributes.find((attr5) => attr5.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr5.localName === "val")?.value;
       if (value3 !== run.definitionNumId)
         continue;
       const paragraph4 = parsed.ranges.find((range) => range.tag.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && range.tag.localName === "p" && range.start < reference.start && range.end > reference.end);
-      const paraId = paragraph4?.tag.attributes.find((attr4) => attr4.namespaceUri === "http://schemas.microsoft.com/office/word/2010/wordml" && attr4.localName === "paraId")?.value;
+      const paraId = paragraph4?.tag.attributes.find((attr5) => attr5.namespaceUri === "http://schemas.microsoft.com/office/word/2010/wordml" && attr5.localName === "paraId")?.value;
       if (partUri !== runtime.partUri || !paraId || !paragraphs2.has(paraId))
         return false;
     }
@@ -400516,7 +401235,7 @@ function versionNumberingDefinition(numbering, abstractNumId) {
   if (parsed.ranges.some((range) => ["num", "abstractNum"].includes(range.tag.localName) && range.tag.namespaceUri !== WORDPROCESSINGML_NAMESPACE7)) {
     return { ok: false, code: "CAPABILITY_UNAVAILABLE", message: "Tracked shared numbering cannot version extension-owned definitions." };
   }
-  const abstract = parsed.ranges.find((range) => range.tag.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && range.tag.localName === "abstractNum" && range.tag.attributes.some((attr4) => attr4.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr4.localName === "abstractNumId" && attr4.value === abstractNumId));
+  const abstract = parsed.ranges.find((range) => range.tag.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && range.tag.localName === "abstractNum" && range.tag.attributes.some((attr5) => attr5.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr5.localName === "abstractNumId" && attr5.value === abstractNumId));
   if (!abstract || parsed.ranges.some((range) => range.start > abstract.start && range.end < abstract.end && range.tag.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && ["styleLink", "numStyleLink"].includes(range.tag.localName))) {
     return { ok: false, code: "CAPABILITY_UNAVAILABLE", message: "Tracked shared numbering does not yet support linked style ownership." };
   }
@@ -400577,7 +401296,7 @@ function commitTrackedDefinitionMutation(runtime, abstractNumId, txIdPrefix, mut
     for (const reference of parsed.ranges) {
       if (reference.tag.namespaceUri !== WORDPROCESSINGML_NAMESPACE7 || reference.tag.localName !== "numId")
         continue;
-      const id = reference.tag.attributes.find((attr4) => attr4.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr4.localName === "val")?.value;
+      const id = reference.tag.attributes.find((attr5) => attr5.namespaceUri === WORDPROCESSINGML_NAMESPACE7 && attr5.localName === "val")?.value;
       if (!id || !numIds.has(id))
         continue;
       const startByte = TE62.encode(xml.slice(0, reference.start)).length;
@@ -421803,10 +422522,10 @@ function insertBeforeSectPr(documentXml, insertion) {
     xml: documentXml.slice(0, at) + insertion + documentXml.slice(at)
   };
 }
-function ensureDocumentRootNamespace(xml, attr4, uri) {
-  if (xml.includes(`${attr4}=`))
+function ensureDocumentRootNamespace(xml, attr5, uri) {
+  if (xml.includes(`${attr5}=`))
     return xml;
-  return xml.replace(/<w:document\b/, `<w:document ${attr4}="${escapeXmlAttribute3(uri)}"`);
+  return xml.replace(/<w:document\b/, `<w:document ${attr5}="${escapeXmlAttribute3(uri)}"`);
 }
 function spliceRunIntoParagraphXml(paraXml, runXml, offset, allocateWId) {
   const selfClosed = /^<([\w.-]+:p)\b([^>]*?)\/>$/.exec(paraXml);
@@ -422250,10 +422969,10 @@ function insertHeaderFooterParagraph(partXml, paragraphXml, kind) {
     xml: withNamespace.slice(0, finalCloseIdx) + paragraphXml + withNamespace.slice(finalCloseIdx)
   };
 }
-function ensureRootNamespace(xml, attr4, uri) {
-  if (xml.includes(`${attr4}=`))
+function ensureRootNamespace(xml, attr5, uri) {
+  if (xml.includes(`${attr5}=`))
     return xml;
-  return xml.replace(/<(w:(?:hdr|ftr))\b/, `<$1 ${attr4}="${escapeXmlAttribute3(uri)}"`);
+  return xml.replace(/<(w:(?:hdr|ftr))\b/, `<$1 ${attr5}="${escapeXmlAttribute3(uri)}"`);
 }
 function insertAtHeaderFooterStart(partXml, paragraphXml, kind) {
   const openTag = kind === "header" ? /<w:hdr\b[^>]*>/ : /<w:ftr\b[^>]*>/;
@@ -426774,9 +427493,9 @@ function normalizeSettingsXml(xml) {
     const ns = [];
     const rest = [];
     for (const m of attrs.matchAll(XML_ATTR_RE)) {
-      const attr4 = m[0];
-      const trimmed = attr4.trimStart();
-      (/^(?:xmlns(?::|=)|mc:Ignorable=)/.test(trimmed) ? ns : rest).push(attr4);
+      const attr5 = m[0];
+      const trimmed = attr5.trimStart();
+      (/^(?:xmlns(?::|=)|mc:Ignorable=)/.test(trimmed) ? ns : rest).push(attr5);
     }
     return "<w:settings" + [...ns.sort(), ...rest].join("") + close;
   });
@@ -426789,19 +427508,19 @@ function normalizeSettingsXml(xml) {
     const ns = [];
     const rest = [];
     for (const m of attrs.matchAll(XML_ATTR_RE)) {
-      const attr4 = m[0];
-      const trimmed = attr4.trimStart();
+      const attr5 = m[0];
+      const trimmed = attr5.trimStart();
       if (trimmed.startsWith("xmlns:")) {
         const prefix2 = trimmed.slice("xmlns:".length, trimmed.indexOf("="));
         if (usedPrefixes.has(prefix2))
-          ns.push(attr4);
+          ns.push(attr5);
         continue;
       }
       if (trimmed.startsWith("xmlns=")) {
-        ns.push(attr4);
+        ns.push(attr5);
         continue;
       }
-      rest.push(attr4);
+      rest.push(attr5);
     }
     return open2 + [...ns.sort(), ...rest].join("") + close;
   });
@@ -429904,7 +430623,7 @@ function buildTrackedTableBlockReplayPlan(input) {
     bodyOperations: input.bodyOperations.filter((operation) => !ownedIds.has(operation.blockId))
   };
 }
-var W27 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", W149 = "http://schemas.microsoft.com/office/word/2010/wordml", STORY = "body:/word/document.xml", TE74, paragraphId2 = (range) => range.tag.attributes.find((attr4) => attr4.namespaceUri === W149 && attr4.localName === "paraId")?.value;
+var W27 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", W149 = "http://schemas.microsoft.com/office/word/2010/wordml", STORY = "body:/word/document.xml", TE74, paragraphId2 = (range) => range.tag.attributes.find((attr5) => attr5.namespaceUri === W149 && attr5.localName === "paraId")?.value;
 var init_tracked_table_block_replay = __esm(() => {
   init_sd_document_session_internal();
   init_tracked_table_row_replay();
@@ -444609,11 +445328,11 @@ function captureDependencies(context, sourcePartUri, xml, namespaces, definition
     const styleIds = new Set;
     const numberIds = new Set;
     for (const range of parsed.ranges) {
-      for (const attr4 of range.tag.attributes) {
-        if (attr4.namespaceUri === R2) {
-          ids.add(attr4.value);
+      for (const attr5 of range.tag.attributes) {
+        if (attr5.namespaceUri === R2) {
+          ids.add(attr5.value);
         }
-        if (range.tag.namespaceUri === W28 && attr4.namespaceUri === W28 && (attr4.localName.startsWith("theme") || attr4.localName.endsWith("Theme"))) {
+        if (range.tag.namespaceUri === W28 && attr5.namespaceUri === W28 && (attr5.localName.startsWith("theme") || attr5.localName.endsWith("Theme"))) {
           needsTheme = true;
           anyThemeReference = true;
         }
@@ -445350,13 +446069,13 @@ function captureCommentFamily(context, owner, ids) {
       invalid4("PRECONDITION_FAILED", "Modern comment metadata has no root.");
     return { rel, xml: partXml, root };
   });
-  const attr4 = (r, name) => r.tag.attributes.find((a) => a.localName === name)?.value;
+  const attr5 = (r, name) => r.tag.attributes.find((a) => a.localName === name)?.value;
   let size = -1;
   while (size !== paraIds.size) {
     size = paraIds.size;
     for (const part of entries2)
       for (const child of part.root.children) {
-        const parent = attr4(child.range, "paraIdParent"), id = attr4(child.range, "paraId");
+        const parent = attr5(child.range, "paraIdParent"), id = attr5(child.range, "paraId");
         if (parent && id && paraIds.has(parent))
           paraIds.add(id);
       }
@@ -445368,14 +446087,14 @@ function captureCommentFamily(context, owner, ids) {
   const durableIds = new Set;
   for (const part of entries2)
     for (const child of part.root.children) {
-      if (paraIds.has(attr4(child.range, "paraId") ?? "")) {
-        const durable = attr4(child.range, "durableId");
+      if (paraIds.has(attr5(child.range, "paraId") ?? "")) {
+        const durable = attr5(child.range, "durableId");
         if (durable)
           durableIds.add(durable.toUpperCase());
       }
     }
   for (const part of entries2) {
-    const children2 = part.root.children.filter((c) => paraIds.has(attr4(c.range, "paraId") ?? "") || durableIds.has((attr4(c.range, "durableId") ?? "").toUpperCase()));
+    const children2 = part.root.children.filter((c) => paraIds.has(attr5(c.range, "paraId") ?? "") || durableIds.has((attr5(c.range, "durableId") ?? "").toUpperCase()));
     result.set(part.rel.resolvedTarget, TE79.encode(part.xml.slice(part.root.range.start, part.root.range.openEnd) + children2.map((c) => part.xml.slice(c.range.start, c.range.end)).join("") + part.xml.slice(part.root.range.closeStart, part.root.range.end)));
   }
   return result;
@@ -453449,9 +454168,9 @@ var iterateDeletedStructs = (transaction, ds, f) => ds.clients.forEach((deletes,
         switch (currPos.right.content.constructor) {
           case ContentFormat: {
             const { key: key3, value: value3 } = currPos.right.content;
-            const attr4 = attributes[key3];
-            if (attr4 !== undefined) {
-              if (equalAttrs(attr4, value3)) {
+            const attr5 = attributes[key3];
+            if (attr5 !== undefined) {
+              if (equalAttrs(attr5, value3)) {
                 negatedAttributes.delete(key3);
               } else {
                 if (length2 === 0) {
@@ -454626,9 +455345,9 @@ var init_yjs = __esm(() => {
                   }
                 } else if (!item.deleted) {
                   oldAttributes.set(key3, value3);
-                  const attr4 = attributes[key3];
-                  if (attr4 !== undefined) {
-                    if (!equalAttrs(attr4, value3)) {
+                  const attr5 = attributes[key3];
+                  if (attr5 !== undefined) {
+                    if (!equalAttrs(attr5, value3)) {
                       if (action2 === "retain") {
                         addOp();
                       }
@@ -454637,7 +455356,7 @@ var init_yjs = __esm(() => {
                       } else {
                         attributes[key3] = value3;
                       }
-                    } else if (attr4 !== null) {
+                    } else if (attr5 !== null) {
                       item.delete(transaction);
                     }
                   }
@@ -455267,8 +455986,8 @@ var init_yjs = __esm(() => {
           const node4 = nestedNodes[i2];
           str += `<${node4.nodeName}`;
           for (let j = 0;j < node4.attrs.length; j++) {
-            const attr4 = node4.attrs[j];
-            str += ` ${attr4.key}="${attr4.value}"`;
+            const attr5 = node4.attrs[j];
+            str += ` ${attr5.key}="${attr5.value}"`;
           }
           str += ">";
         }
@@ -468114,8 +468833,8 @@ function clean(...arrays) {
 function createView(arr) {
   return new DataView(arr.buffer, arr.byteOffset, arr.byteLength);
 }
-function rotr(word5, shift) {
-  return word5 << 32 - shift | word5 >>> shift;
+function rotr(word6, shift) {
+  return word6 << 32 - shift | word6 >>> shift;
 }
 function utf8ToBytes(str) {
   if (typeof str !== "string")
@@ -473576,6 +474295,12 @@ function publishContentControlGroups(scope, groups, blockIds) {
         scope.order.set(unit, index2);
     }
   }
+  for (const group of groups) {
+    const key3 = ORDER_PREFIX + group.id;
+    const existing = group.blockIds.find((id2) => typeof scope.order.get(id2) === "number");
+    if (!scope.order.has(key3) && existing)
+      scope.order.set(key3, readBlockOrder(scope, existing, 0));
+  }
   for (const group of groups) {
     const key3 = ORDER_PREFIX + group.id;
     if (scope.order.has(key3))
@@ -473586,9 +474311,8 @@ function publishContentControlGroups(scope, groups, blockIds) {
     const after2 = units.slice(at + 1).find((unit) => typeof scope.order.get(unit) === "number");
     const left = before2 ? readBlockOrder(scope, before2, at - 1) : null;
     const right = after2 ? readBlockOrder(scope, after2, at + 1) : null;
-    const existing = group.blockIds.find((id2) => typeof scope.order.get(id2) === "number");
-    let order = existing ? readBlockOrder(scope, existing, at) : left === null ? (right ?? 1) - 1 : right === null ? left + 1 : (left + right) / 2;
-    if (!existing && left !== null && right !== null && right <= left) {
+    let order = left === null ? (right ?? 1) - 1 : right === null ? left + 1 : (left + right) / 2;
+    if (left !== null && right !== null && right <= left) {
       for (const [index2, unit] of units.entries())
         scope.order.set(unit, index2);
       order = at;
@@ -473658,8 +474382,8 @@ function bindOriginalBomNoteBoundaries(input) {
   const last2 = source.paragraphs.at(-1);
   if (!first || !last2 || new Set(source.paragraphs.map((p) => p.blockId)).size !== source.paragraphs.length || source.paragraphs.some((p) => !p.paraId || p.tableNodeId))
     return false;
-  const start = first.byteStart - ENCODER2.encode(first.leadingXml).length;
-  const end = last2.byteEnd + ENCODER2.encode(source.trailingXml).length;
+  const start = first.byteStart - ENCODER3.encode(first.leadingXml).length;
+  const end = last2.byteEnd + ENCODER3.encode(source.trailingXml).length;
   if (start < 3 || end - 3 < last2.byteEnd)
     return false;
   const scope = resolveStoryShardScope(input.target);
@@ -473711,7 +474435,7 @@ function readBomCorrectedLeadingXml(block) {
   const repair = BY_FIRST_BLOCK.get(block);
   return repair && matches(repair) ? repair.leadingXml : String(block.get(BLOCK_KEY.leadingXml) ?? "");
 }
-var DECODER4, ENCODER2, BY_META, BY_FIRST_BLOCK;
+var DECODER4, ENCODER3, BY_META, BY_FIRST_BLOCK;
 var init_bom_boundary_repair = __esm(() => {
   init_yjs();
   init_sd_document_session_internal();
@@ -473720,7 +474444,7 @@ var init_bom_boundary_repair = __esm(() => {
   init_content_control_groups();
   init_scope3();
   DECODER4 = new TextDecoder;
-  ENCODER2 = new TextEncoder;
+  ENCODER3 = new TextEncoder;
   BY_META = new WeakMap;
   BY_FIRST_BLOCK = new WeakMap;
 });
@@ -483920,7 +484644,7 @@ function projectCommentsFamilySource(comments, source, owner) {
       }
     }
     const generatedRows = emitted.ranges.filter((row) => row.tag.namespaceUri === namespace && row.tag.localName === localName3);
-    const attribute3 = (row, name) => row.tag.attributes.find((attr4) => attr4.namespaceUri === namespace && attr4.localName === name)?.value;
+    const attribute3 = (row, name) => row.tag.attributes.find((attr5) => attr5.namespaceUri === namespace && attr5.localName === name)?.value;
     const generatedByKey = new Map(generatedRows.map((row) => [attribute3(row, uri === BODY ? "id" : "paraId"), row]));
     const consumed = new Set;
     const patches = [];
@@ -483951,7 +484675,7 @@ function projectCommentsFamilySource(comments, source, owner) {
         if (changedBody)
           patches.push({ start: row.start, end: row.end, xml: emit(comment) });
         else {
-          const id2 = row.tag.attributes.find((attr4) => attr4.namespaceUri === W30 && attr4.localName === "id");
+          const id2 = row.tag.attributes.find((attr5) => attr5.namespaceUri === W30 && attr5.localName === "id");
           const frame = id2 ? attributeFrame(xml, row, id2.name) : null;
           if (id2 && !frame)
             throw new Error("comment source identity attribute cannot be located");
@@ -484105,10 +484829,10 @@ function paragraphEmissionNames(context, preservedXml) {
     bindings2[prefix2] = namespace;
     return prefix2;
   };
-  const word5 = choose("w", WORD_NAMESPACE10);
+  const word6 = choose("w", WORD_NAMESPACE10);
   const word2010 = choose("w14", WORD_2010_NAMESPACE3);
   const declarations = Object.entries({ "": "", ...bindings2 }).filter(([prefix2, uri]) => prefix2 !== "xml" && (context.inherited[prefix2] ?? "") !== uri).sort(([left], [right]) => left.localeCompare(right)).map(([prefix2, uri]) => ` xmlns${prefix2 ? `:${prefix2}` : ""}="${xmlEscape(uri)}"`).join("");
-  return { word: word5, word2010, declarations };
+  return { word: word6, word2010, declarations };
 }
 var WORD_NAMESPACE10 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", WORD_2010_NAMESPACE3 = "http://schemas.microsoft.com/office/word/2010/wordml", CANONICAL_NAMESPACES;
 var init_xml_emission_context = __esm(() => {
@@ -487181,8 +487905,8 @@ function renderSyntheticTableCell(input) {
   }).slice(0, 8).toUpperCase();
   const prefix2 = input.tableXml.slice(input.cellSpan.start, contentStart);
   const inherited = new XmlEmissionContext(prefix2, input.inherited).at(prefix2.length);
-  const { word: word5, word2010, declarations } = paragraphEmissionNames({ inherited, source: inherited }, "");
-  return prefix2 + `<${word5}:p ${word2010}:paraId="${paragraphId5}"${declarations}/>` + input.tableXml.slice(contentEnd, input.cellSpan.end);
+  const { word: word6, word2010, declarations } = paragraphEmissionNames({ inherited, source: inherited }, "");
+  return prefix2 + `<${word6}:p ${word2010}:paraId="${paragraphId5}"${declarations}/>` + input.tableXml.slice(contentEnd, input.cellSpan.end);
 }
 function directElementSpans(xml, openEnd, closeStart, localName3) {
   const spans = [];
@@ -489441,7 +490165,7 @@ function createCollabV2ProjectionRuntime(options) {
     }
     let bytes;
     try {
-      bytes = await bytesEncoder.encode(record3);
+      bytes = request.kind === BARRIER_KIND.save && bytesEncoder.encodeForTerminalSave ? await bytesEncoder.encodeForTerminalSave(record3) : await bytesEncoder.encode(record3);
     } catch (error50) {
       const diag = diagnosticFromThrownError(error50, "bytes encoder threw");
       const reason = classifyBlockingReason([diag]);
@@ -490693,7 +491417,9 @@ function mirrorStorySurfaceFromSession(input) {
         scope.meta.set(STORY_META_KEY.lastEditActorType, actorType);
         const source = input.prepared.source;
         const rewritesTableBoundaries = source.kind === "paragraphRangeCollapse" || source.kind === "trackedChangeDecide";
-        const groups = extension2.contentControlRewrite || hasContentControlGroups(scope) || rewritesTableBoundaries || extension2.family === "storyPaste" && (extension2.fragmentApply?.containsBlockControls || hasUnpublishedBlockControls(scope)) ? prepareStoryContentControlGroups(input.session, storyId, doc2) : null;
+        const controlRewrite = extension2.contentControlRewrite;
+        const preparesControlGroups = controlRewrite ? controlRewrite.addedBlockIds.length > 0 || controlRewrite.removedBlockIds.length > 0 || controlRewrite.leadingBlockIds.length > 0 || controlRewrite.trailingXmlChanged : hasContentControlGroups(scope) || rewritesTableBoundaries || extension2.family === "storyPaste" && (extension2.fragmentApply?.containsBlockControls || hasUnpublishedBlockControls(scope));
+        const groups = preparesControlGroups ? prepareStoryContentControlGroups(input.session, storyId, doc2) : null;
         mirrorFamilyIntoStory({
           session: input.session,
           prepared: input.prepared,
@@ -491036,11 +491762,12 @@ function mirrorContentControlRewrite(input) {
   const snapshot3 = readSessionStoryPayloads(loadStorySyncContext(input.session, input.storyId));
   const payloadById = new Map(snapshot3.payloads.map((payload) => [payload.blockId, payload]));
   const changed = new Set(rewrite.contentBlockIds);
+  const leadingChanged = new Set(rewrite.leadingBlockIds);
   const payloads = rewrite.contentBlockIds.map((id2) => {
     const payload = payloadById.get(id2);
     if (!payload)
       throw new Error(`Content-control rewrite paragraph ${id2} is unavailable.`);
-    return payload;
+    return leadingChanged.has(id2) ? payload : { ...payload, leadingXml: undefined };
   });
   resolveStoryShardScope(input.doc).doc.transact(() => {
     for (const id2 of rewrite.removedBlockIds) {
@@ -493712,7 +494439,7 @@ function collectCommentCarriers(doc2, commentIds, session) {
       if (parsed.errors.length > 0)
         throw new Error("comment carrier XML cannot be read");
       const carrier = parsed.ranges.find((row) => row.tag.namespaceUri === wordNamespace && row.tag.localName === marker);
-      const commentId = carrier?.tag.attributes.find((attr4) => attr4.namespaceUri === wordNamespace && attr4.localName === "id")?.value;
+      const commentId = carrier?.tag.attributes.find((attr5) => attr5.namespaceUri === wordNamespace && attr5.localName === "id")?.value;
       if (!commentId || !commentIds.has(commentId))
         continue;
       atoms.add(atom);
@@ -495854,6 +496581,12 @@ function createCollabV2SessionProjectionController(options) {
         record: record3,
         projectionRegistry: options.projectionRegistry,
         blobAdapter: options.blobAdapter
+      }),
+      encodeForTerminalSave: (record3) => encodeProjectionRecordAsDocx({
+        record: record3,
+        projectionRegistry: options.projectionRegistry,
+        blobAdapter: options.blobAdapter,
+        portableRevisionIds: true
       })
     },
     docxBytesValidator: {
@@ -496909,6 +497642,18 @@ async function encodeProjectionRecordAsDocx(input) {
     else
       entries4.set(zipKey(partUri), bytes);
   }
+  if (input.portableRevisionIds) {
+    const decoder13 = new TextDecoder;
+    const wordParts = new Map;
+    for (const [key3, bytes] of entries4) {
+      if (key3.startsWith("word/") && key3.endsWith(".xml") && !key3.includes("/_rels/")) {
+        wordParts.set(`/${key3}`, decoder13.decode(bytes));
+      }
+    }
+    for (const [partUri, xml] of normalizeRevisionIdsForWordExport(wordParts)) {
+      entries4.set(zipKey(partUri), encoder7.encode(xml));
+    }
+  }
   const ordered = {};
   for (const key3 of [...entries4.keys()].sort()) {
     ordered[key3] = entries4.get(key3);