@superdoc-dev/cli 0.2.0-next.135 → 0.2.0-next.137

package/dist/index.js

@@ -38780,7 +38780,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-CEAHNaZj.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-BQCVReWb.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -59094,7 +59094,7 @@ function decode$10(params) {
   return {
     name: "w:del",
     attributes: {
-      "w:id": trackedMark.attrs.id,
+      "w:id": trackedMark.attrs.sourceId || trackedMark.attrs.id,
       "w:author": trackedMark.attrs.author,
       "w:authorEmail": trackedMark.attrs.authorEmail,
       "w:date": trackedMark.attrs.date
@@ -59119,7 +59119,7 @@ function decode$9(params) {
   return {
     name: "w:ins",
     attributes: {
-      "w:id": trackedMark.attrs.id,
+      "w:id": trackedMark.attrs.sourceId || trackedMark.attrs.id,
       "w:author": trackedMark.attrs.author,
       "w:authorEmail": trackedMark.attrs.authorEmail,
       "w:date": trackedMark.attrs.date
@@ -59203,6 +59203,59 @@ function importCommentData({ docx, editor, converter }) {
   }
   return extendedComments;
 }
+function isReplacementPair(previous$1, current) {
+  return previous$1.type !== current.type && previous$1.author === current.author && previous$1.date === current.date;
+}
+function assignInternalId(element, idMap, context, insideTrackedChange) {
+  const wordId = String(element.attributes?.["w:id"] ?? "");
+  if (!wordId)
+    return;
+  if (insideTrackedChange) {
+    if (!idMap.has(wordId))
+      idMap.set(wordId, v4_default());
+    return;
+  }
+  const current = {
+    type: element.name,
+    author: element.attributes?.["w:author"] ?? "",
+    date: element.attributes?.["w:date"] ?? ""
+  };
+  if (context.lastTrackedChange && isReplacementPair(context.lastTrackedChange, current)) {
+    if (!idMap.has(wordId))
+      idMap.set(wordId, context.lastTrackedChange.internalId);
+    context.lastTrackedChange = null;
+  } else {
+    const internalId = idMap.get(wordId) ?? v4_default();
+    idMap.set(wordId, internalId);
+    context.lastTrackedChange = {
+      ...current,
+      internalId
+    };
+  }
+}
+function walkElements(elements, idMap, context, insideTrackedChange = false) {
+  if (!Array.isArray(elements))
+    return;
+  for (const element of elements)
+    if (TRACKED_CHANGE_NAMES.has(element.name)) {
+      assignInternalId(element, idMap, context, insideTrackedChange);
+      if (element.elements)
+        walkElements(element.elements, idMap, { lastTrackedChange: null }, true);
+    } else {
+      if (!PAIRING_TRANSPARENT_NAMES.has(element.name))
+        context.lastTrackedChange = null;
+      if (element.elements)
+        walkElements(element.elements, idMap, context, insideTrackedChange);
+    }
+}
+function buildTrackedChangeIdMap(docx) {
+  const body = docx?.["word/document.xml"]?.elements?.[0];
+  if (!body?.elements)
+    return /* @__PURE__ */ new Map;
+  const idMap = /* @__PURE__ */ new Map;
+  walkElements(body.elements, idMap, { lastTrackedChange: null });
+  return idMap;
+}
 function importNoteEntries({ partXml, childElementName, filename, docx, editor, converter, nodeListHandler, numbering }) {
   const handler$1 = nodeListHandler || defaultNodeListHandler();
   if (!partXml?.elements?.length)
@@ -61592,7 +61645,7 @@ function getBibliographyPartExportPaths(bibliographyPart) {
 }
 function collectReferencedNumIds(convertedXml) {
   const numIds = /* @__PURE__ */ new Set;
-  function walkElements(elements) {
+  function walkElements$1(elements) {
     if (!Array.isArray(elements))
       return;
     for (const el of elements) {
@@ -61601,12 +61654,12 @@ function collectReferencedNumIds(convertedXml) {
       if (el.name === "w:numId" && el.attributes?.["w:val"] != null)
         numIds.add(Number(el.attributes["w:val"]));
       if (el.elements)
-        walkElements(el.elements);
+        walkElements$1(el.elements);
     }
   }
   for (const [path2, xml] of Object.entries(convertedXml))
     if (path2.startsWith("word/") && path2 !== "word/numbering.xml" && xml?.elements)
-      walkElements(xml.elements);
+      walkElements$1(xml.elements);
   return numIds;
 }
 function getAbstractNumIdFromDef(numDef) {
@@ -63606,7 +63659,29 @@ var isRegExp = (value) => {
     name: XML_NODE_NAME$37,
     attributes
   };
-}, config$36, translator$9, translator$140, translator$58, translator$51, translator$127, translator$129, translator$148, translator$149, translator$49, translator$135, translator$89, translator$209, translator$178, translator$136, translator$137, translator$62, translator$78, translator$106, translator$115, translator$116, translator$134, translator$192, translator$179, translator$60, translator$61, translator$173, translator$87, translator$124, translator$65, translator$59, translator$131, translator$54, translator$76, translator$193, XML_NAME$4 = "w14:ligatures", SD_KEY$4 = "ligatures", translator$210, XML_NAME$3 = "w14:numForm", SD_KEY$3 = "numForm", translator$211, XML_NAME$2 = "w14:numSpacing", SD_KEY$2 = "numSpacing", translator$212, XML_NAME$1 = "w14:stylisticSets", SD_KEY$1 = "stylisticSets", STYLISTIC_SET_CHILD_XML_NAME = "w14:ss", translator$213, XML_NAME = "w14:cntxtAlts", SD_KEY = "contextualAlternates", propertyTranslators$17, translator$128, XML_NODE_NAME$36 = "w:tab", SD_NODE_NAME$32 = "tab", encode$63 = (_, encodedAttrs = {}) => {
+}, config$36, translator$9, translator$140, translator$58, translator$51, translator$127, translator$129, translator$148, translator$149, translator$49, translator$135, translator$89, translator$209, translator$178, translator$136, translator$137, translator$62, translator$78, translator$106, translator$115, translator$116, translator$134, translator$192, translator$179, translator$60, translator$61, translator$173, translator$87, translator$124, translator$65, translator$59, translator$131, translator$54, translator$76, translator$193, XML_NAME$4 = "w14:ligatures", SD_KEY$4 = "ligatures", translator$210, XML_NAME$3 = "w14:numForm", SD_KEY$3 = "numForm", translator$211, XML_NAME$2 = "w14:numSpacing", SD_KEY$2 = "numSpacing", translator$212, XML_NAME$1 = "w14:stylisticSets", SD_KEY$1 = "stylisticSets", STYLISTIC_SET_CHILD_XML_NAME = "w14:ss", translator$213, XML_NAME = "w14:cntxtAlts", SD_KEY = "contextualAlternates", translator$214, createTrackChangeRunPropertyTranslator = (xmlName, sdNodeOrKeyName) => NodeTranslator.from({
+  xmlName,
+  sdNodeOrKeyName,
+  attributes: [
+    createAttributeHandler("w:id", "id"),
+    createAttributeHandler("w:author", "author"),
+    createAttributeHandler("w:authorEmail", "authorEmail"),
+    createAttributeHandler("w:date", "date")
+  ],
+  encode: (_params, encodedAttrs = {}) => {
+    return Object.keys(encodedAttrs).length ? encodedAttrs : undefined;
+  },
+  decode: function({ node: node3 }) {
+    const source = node3?.attrs?.[sdNodeOrKeyName];
+    if (!source || typeof source !== "object")
+      return;
+    const decodedAttrs = this.decodeAttributes({ node: {
+      ...node3,
+      attrs: source
+    } });
+    return Object.keys(decodedAttrs).length ? { attributes: decodedAttrs } : undefined;
+  }
+}), propertyTranslators$17, translator$128, XML_NODE_NAME$36 = "w:tab", SD_NODE_NAME$32 = "tab", encode$63 = (_, encodedAttrs = {}) => {
   const translated = { type: "tab" };
   if (encodedAttrs)
     translated.attrs = { ...encodedAttrs };
@@ -73347,8 +73422,10 @@ var isRegExp = (value) => {
 }, drawingNodeHandlerEntity, XML_NODE_NAME$6 = "w:del", SD_ATTR_KEY$1 = "trackDelete", validXmlAttributes$3, encode$10 = (params, encodedAttrs = {}) => {
   const { nodeListHandler, extraParams = {}, converter } = params;
   const { node: node3 } = extraParams;
-  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id))
-    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  const originalWordId = encodedAttrs.id;
+  if (originalWordId && converter?.trackedChangeIdMap?.has(originalWordId))
+    encodedAttrs.id = converter.trackedChangeIdMap.get(originalWordId);
+  encodedAttrs.sourceId = originalWordId || "";
   const subs = nodeListHandler.handler({
     ...params,
     insideTrackChange: true,
@@ -73374,8 +73451,10 @@ var isRegExp = (value) => {
 }, config$6, translator$55, XML_NODE_NAME$5 = "w:ins", SD_ATTR_KEY = "trackInsert", validXmlAttributes$2, encode$9 = (params, encodedAttrs = {}) => {
   const { nodeListHandler, extraParams = {}, converter } = params;
   const { node: node3 } = extraParams;
-  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id))
-    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  const originalWordId = encodedAttrs.id;
+  if (originalWordId && converter?.trackedChangeIdMap?.has(originalWordId))
+    encodedAttrs.id = converter.trackedChangeIdMap.get(originalWordId);
+  encodedAttrs.sourceId = originalWordId || "";
   const subs = nodeListHandler.handler({
     ...params,
     insideTrackChange: true,
@@ -74010,8 +74089,7 @@ var isRegExp = (value) => {
   let positionIndex = 0;
   let lastElementWasCommentMarker = false;
   const recentlyClosedComments = /* @__PURE__ */ new Set;
-  let lastTrackedChange = null;
-  const walkElements = (elements, currentTrackedChangeId = null) => {
+  const walkElements$1 = (elements, currentTrackedChangeId = null) => {
     if (!elements || !Array.isArray(elements))
       return;
     elements.forEach((element) => {
@@ -74057,62 +74135,32 @@ var isRegExp = (value) => {
         }
         lastElementWasCommentMarker = true;
       } else if (isTrackedChange) {
-        const trackedChangeId = element.attributes?.["w:id"];
-        const author = element.attributes?.["w:author"];
-        const date = element.attributes?.["w:date"];
-        const elementType = element.name;
-        let mappedId = trackedChangeId;
-        let isReplacement = false;
-        if (trackedChangeId !== undefined && converter) {
-          if (!converter.trackedChangeIdMap)
-            converter.trackedChangeIdMap = /* @__PURE__ */ new Map;
-          if (lastTrackedChange && lastTrackedChange.type !== elementType && lastTrackedChange.author === author && lastTrackedChange.date === date) {
-            mappedId = lastTrackedChange.mappedId;
-            converter.trackedChangeIdMap.set(String(trackedChangeId), mappedId);
-            isReplacement = true;
-          } else {
-            if (!converter.trackedChangeIdMap.has(String(trackedChangeId)))
-              converter.trackedChangeIdMap.set(String(trackedChangeId), v4_default());
-            mappedId = converter.trackedChangeIdMap.get(String(trackedChangeId));
-          }
-        }
-        if (currentTrackedChangeId === null)
-          if (isReplacement)
-            lastTrackedChange = null;
-          else
-            lastTrackedChange = {
-              type: elementType,
-              author,
-              date,
-              mappedId,
-              wordId: String(trackedChangeId)
-            };
+        const wordId = element.attributes?.["w:id"];
+        const mappedId = wordId != null ? converter?.trackedChangeIdMap?.get(String(wordId)) ?? String(wordId) : currentTrackedChangeId;
         if (mappedId && recentlyClosedComments.size > 0)
           recentlyClosedComments.forEach((commentId) => {
             if (!commentsInTrackedChanges.has(commentId))
-              commentsInTrackedChanges.set(commentId, String(mappedId));
+              commentsInTrackedChanges.set(commentId, mappedId);
           });
         recentlyClosedComments.clear();
         if (element.elements && Array.isArray(element.elements))
-          walkElements(element.elements, mappedId !== undefined ? String(mappedId) : currentTrackedChangeId);
+          walkElements$1(element.elements, mappedId);
       } else {
         if (lastElementWasCommentMarker) {
           positionIndex++;
           lastElementWasCommentMarker = false;
         }
-        if (element.name === "w:p") {
+        if (element.name === "w:p")
           recentlyClosedComments.clear();
-          lastTrackedChange = null;
-        }
         if (element.elements && Array.isArray(element.elements))
-          walkElements(element.elements, currentTrackedChangeId);
+          walkElements$1(element.elements, currentTrackedChangeId);
       }
     });
   };
   if (documentXml.elements && documentXml.elements.length > 0) {
     const body = documentXml.elements[0];
     if (body.elements)
-      walkElements(body.elements);
+      walkElements$1(body.elements);
   }
   return {
     rangeEvents,
@@ -74258,7 +74306,7 @@ var isRegExp = (value) => {
   if (importedId == null || !Number.isFinite(createdTime))
     return v4_default();
   return `imported-${simpleHash(`${importedId}-${createdTime}`)}`;
-}, stripFootnoteMarkerNodes = (nodes) => {
+}, TRACKED_CHANGE_NAMES, PAIRING_TRANSPARENT_NAMES, stripFootnoteMarkerNodes = (nodes) => {
   if (!Array.isArray(nodes) || nodes.length === 0)
     return nodes;
   const walk = (list$1) => {
@@ -74550,6 +74598,7 @@ var isRegExp = (value) => {
     const inlineDocumentFonts = [];
     patchNumberingDefinitions(docx);
     const numbering = getNumberingDefinitions(docx);
+    converter.trackedChangeIdMap = buildTrackedChangeIdMap(docx);
     const comments = importCommentData({
       docx,
       nodeListHandler,
@@ -75508,7 +75557,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_CEAHNaZj_es = __esm(() => {
+var init_SuperConverter_BQCVReWb_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -88872,6 +88921,24 @@ var init_SuperConverter_CEAHNaZj_es = __esm(() => {
       };
     }
   });
+  translator$214 = NodeTranslator.from({
+    xmlName: XML_NAME,
+    sdNodeOrKeyName: SD_KEY,
+    encode: ({ nodes }) => {
+      const rawValue = readVal(nodes?.[0]);
+      if (rawValue == null)
+        return true;
+      return parseBoolean(rawValue);
+    },
+    decode: ({ node: node3 }) => {
+      const value = node3?.attrs?.[SD_KEY];
+      if (value == null)
+        return;
+      if (value === true)
+        return { attributes: {} };
+      return { attributes: { "w14:val": "0" } };
+    }
+  });
   propertyTranslators$17 = [
     translator$45,
     translator$41,
@@ -88914,24 +88981,9 @@ var init_SuperConverter_CEAHNaZj_es = __esm(() => {
     translator$211,
     translator$212,
     translator$213,
-    NodeTranslator.from({
-      xmlName: XML_NAME,
-      sdNodeOrKeyName: SD_KEY,
-      encode: ({ nodes }) => {
-        const rawValue = readVal(nodes?.[0]);
-        if (rawValue == null)
-          return true;
-        return parseBoolean(rawValue);
-      },
-      decode: ({ node: node3 }) => {
-        const value = node3?.attrs?.[SD_KEY];
-        if (value == null)
-          return;
-        if (value === true)
-          return { attributes: {} };
-        return { attributes: { "w14:val": "0" } };
-      }
-    }),
+    translator$214,
+    createTrackChangeRunPropertyTranslator("w:ins", "trackInsert"),
+    createTrackChangeRunPropertyTranslator("w:del", "trackDelete"),
     translator$193,
     translator$173
   ];
@@ -108395,6 +108447,20 @@ var init_SuperConverter_CEAHNaZj_es = __esm(() => {
     handlerName: "handlePictNode",
     handler: handlePictNode
   };
+  TRACKED_CHANGE_NAMES = new Set(["w:ins", "w:del"]);
+  PAIRING_TRANSPARENT_NAMES = new Set([
+    "w:commentRangeStart",
+    "w:commentRangeEnd",
+    "w:bookmarkStart",
+    "w:bookmarkEnd",
+    "w:proofErr",
+    "w:permStart",
+    "w:permEnd",
+    "w:moveFromRangeStart",
+    "w:moveFromRangeEnd",
+    "w:moveToRangeStart",
+    "w:moveToRangeEnd"
+  ]);
   DocxHelpers = {
     findRelationshipIdFromTarget,
     insertNewRelationship,
@@ -135913,7 +135979,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CDxFqrrf.es.js
+// ../../packages/superdoc/dist/chunks/src-DpqULOk-.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -146670,7 +146736,7 @@ function mapParagraphProperties(attrs) {
   };
 }
 function mapListNumbering(attrs) {
-  const listRendering = attrs?.listRendering ?? undefined;
+  const listRendering = getListRendering(attrs?.listRendering);
   if (!listRendering)
     return;
   const listNumbering = {};
@@ -146678,8 +146744,7 @@ function mapListNumbering(attrs) {
     listNumbering.marker = listRendering.markerText;
   if (Array.isArray(listRendering.path))
     listNumbering.path = listRendering.path;
-  if (Array.isArray(listRendering.path) && listRendering.path.length > 0)
-    listNumbering.ordinal = listRendering.path[listRendering.path.length - 1];
+  listNumbering.ordinal = getListOrdinalFromPath(listRendering.path);
   return Object.keys(listNumbering).length ? listNumbering : undefined;
 }
 function mapParagraphNode(candidate) {
@@ -155274,12 +155339,6 @@ function evaluateCanContinuePrevious(editor, target) {
     reason: "INCOMPATIBLE_DEFINITIONS"
   };
 }
-function toPath(value) {
-  if (!Array.isArray(value))
-    return;
-  const parsed = value.map((entry) => toFiniteNumber$1(entry)).filter((entry) => entry != null);
-  return parsed.length > 0 ? parsed : undefined;
-}
 function getNumberingProperties2(node3) {
   const attrs = node3.attrs ?? {};
   const paragraphNumbering = attrs.paragraphProperties?.numberingProperties ?? undefined;
@@ -155324,9 +155383,10 @@ function getListText(candidate) {
 function projectListItemCandidate(editor, candidate) {
   const attrs = candidate.node.attrs ?? {};
   const { numId, level } = getNumberingProperties2(candidate.node);
-  const path2 = toPath(attrs.listRendering?.path);
-  const ordinal = path2?.length ? path2[path2.length - 1] : undefined;
-  const marker = typeof attrs.listRendering?.markerText === "string" ? attrs.listRendering.markerText : undefined;
+  const listRendering = getListRendering(attrs.listRendering);
+  const path2 = listRendering?.path;
+  const ordinal = getListOrdinalFromPath(path2);
+  const marker = listRendering?.markerText;
   return {
     candidate,
     address: {
@@ -172632,7 +172692,7 @@ async function measureParagraphBlock(block, maxWidth) {
       dropCapDescriptor.measuredWidth = dropCapMeasured.width;
       dropCapDescriptor.measuredHeight = dropCapMeasured.height;
     }
-  const emptyParagraphRun = normalizedRuns.length === 1 && isEmptyTextRun(normalizedRuns[0]) ? normalizedRuns[0] : null;
+  const emptyParagraphRun = normalizedRuns.length === 1 && isEmptyTextRun$1(normalizedRuns[0]) ? normalizedRuns[0] : null;
   if (emptyParagraphRun) {
     const metrics = calculateEmptyParagraphMetrics(emptyParagraphRun.fontSize ?? DEFAULT_PARAGRAPH_FONT_SIZE, spacing, getFontInfoFromRun(emptyParagraphRun));
     const emptyLine = {
@@ -181301,12 +181361,15 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
   if (!para.content || para.content.length === 0) {
     if (paragraphProps.runProperties?.vanish)
       return blocks2;
+    const paragraphMarkTrackedChange = getParagraphMarkTrackedChange(paragraphProps);
     const paraPos = positions.get(para);
     const emptyRun = {
       text: "",
       fontFamily: defaultFont,
       fontSize: defaultSize
     };
+    if (paragraphMarkTrackedChange)
+      emptyRun.trackedChange = paragraphMarkTrackedChange;
     if (paraPos) {
       emptyRun.pmStart = paraPos.start + 1;
       emptyRun.pmEnd = paraPos.start + 1;
@@ -181323,6 +181386,23 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
       runs: [emptyRun],
       attrs: emptyParagraphAttrs
     });
+    if (!trackedChangesConfig)
+      return blocks2;
+    const paragraphBlock = blocks2[blocks2.length - 1];
+    if (paragraphBlock?.kind !== "paragraph")
+      return blocks2;
+    const filteredRuns = applyTrackedChangesModeToRuns(paragraphBlock.runs, trackedChangesConfig, hyperlinkConfig, applyMarksToRun, themeColors, enableComments);
+    const isGhostTrackedListArtifact = trackedChangesConfig.enabled && isGhostSuppressionMode(trackedChangesConfig.mode) && Boolean(paragraphAttrs.numberingProperties) && Boolean(paragraphMarkTrackedChange) && filteredRuns.length > 0 && filteredRuns.every(isEmptyTextRun);
+    if (trackedChangesConfig.enabled && (filteredRuns.length === 0 || isGhostTrackedListArtifact)) {
+      blocks2.pop();
+      return blocks2;
+    }
+    paragraphBlock.runs = filteredRuns;
+    paragraphBlock.attrs = {
+      ...paragraphBlock.attrs ?? {},
+      trackedChangesMode: trackedChangesConfig.mode,
+      trackedChangesEnabled: trackedChangesConfig.enabled
+    };
     return blocks2;
   }
   let currentRuns = [];
@@ -181507,6 +181587,7 @@ function handleParagraphNode2(node3, context) {
     if (cached) {
       const delta = pmStart - cached.pmStart;
       const reusedBlocks = shiftCachedBlocks(cached.blocks, delta);
+      applyTrackedGhostListAdjustments(node3, reusedBlocks, context);
       reusedBlocks.forEach((block) => {
         blocks2.push(block);
         recordBlockKind?.(block.kind);
@@ -181515,7 +181596,7 @@ function handleParagraphNode2(node3, context) {
       sectionState.currentParagraphIndex++;
       return;
     }
-    const paragraphBlocks = paragraphToFlowBlocks$1({
+    const paragraphBlocks$1 = paragraphToFlowBlocks$1({
       para: node3,
       nextBlockId,
       positions,
@@ -181528,15 +181609,16 @@ function handleParagraphNode2(node3, context) {
       enableComments,
       stableBlockId: prefixedStableId
     });
-    paragraphBlocks.forEach((block) => {
+    applyTrackedGhostListAdjustments(node3, paragraphBlocks$1, context);
+    paragraphBlocks$1.forEach((block) => {
       blocks2.push(block);
       recordBlockKind?.(block.kind);
     });
-    flowBlockCache.set(prefixedStableId, nodeJson, nodeRev, paragraphBlocks, pmStart);
+    flowBlockCache.set(prefixedStableId, nodeJson, nodeRev, paragraphBlocks$1, pmStart);
     sectionState.currentParagraphIndex++;
     return;
   }
-  paragraphToFlowBlocks$1({
+  const paragraphBlocks = paragraphToFlowBlocks$1({
     para: node3,
     nextBlockId,
     positions,
@@ -181548,7 +181630,9 @@ function handleParagraphNode2(node3, context) {
     converterContext,
     enableComments,
     stableBlockId: prefixedStableId ?? undefined
-  }).forEach((block) => {
+  });
+  applyTrackedGhostListAdjustments(node3, paragraphBlocks, context);
+  paragraphBlocks.forEach((block) => {
     blocks2.push(block);
     recordBlockKind?.(block.kind);
   });
@@ -181613,7 +181697,9 @@ function toFlowBlocks(pmDoc, options) {
     },
     converters,
     themeColors,
-    flowBlockCache
+    flowBlockCache,
+    trackedListMarkerOffsets: /* @__PURE__ */ new Map,
+    trackedListLastOrdinals: /* @__PURE__ */ new Map
   };
   doc$2.content.forEach((node3) => {
     const handler2 = nodeHandlers2[node3.type];
@@ -188000,7 +188086,8 @@ function createNumberingPlugin(editor) {
             suffix,
             justification,
             path: path2,
-            numberingType: listNumberingType
+            numberingType: listNumberingType,
+            ...customFormat ? { customFormat } : {}
           };
           if (JSON.stringify(node3.attrs.listRendering) !== JSON.stringify(newListRendering)) {
             tr.setNodeAttribute(pos, "listRendering", newListRendering);
@@ -195025,7 +195112,36 @@ var Node$13 = class Node$14 {
       undoManager$1.destroy();
     } };
   }
-}), comments_module_events, v_click_outside_default, DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect", Telemetry = class {
+}), comments_module_events, toFiniteNumber$2 = (value) => {
+  if (typeof value === "number" && Number.isFinite(value))
+    return value;
+  if (typeof value === "string" && value.trim().length > 0) {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed))
+      return parsed;
+  }
+}, getListOrdinalFromPath = (path2) => {
+  if (!Array.isArray(path2) || path2.length === 0)
+    return;
+  const ordinal = toFiniteNumber$2(path2[path2.length - 1]);
+  return ordinal != null && ordinal > 0 ? ordinal : undefined;
+}, getListRendering = (value) => {
+  if (!value || typeof value !== "object")
+    return;
+  const attrs = value;
+  const markerText = typeof attrs.markerText === "string" ? attrs.markerText : undefined;
+  const numberingType = typeof attrs.numberingType === "string" ? attrs.numberingType : undefined;
+  const customFormat = typeof attrs.customFormat === "string" ? attrs.customFormat : undefined;
+  const path2 = Array.isArray(attrs.path) ? attrs.path.map(toFiniteNumber$2).filter((entry) => entry != null) : undefined;
+  if (!markerText && !numberingType && (!path2 || path2.length === 0))
+    return;
+  return {
+    markerText,
+    numberingType,
+    ...path2 && path2.length > 0 ? { path: path2 } : {},
+    ...customFormat ? { customFormat } : {}
+  };
+}, v_click_outside_default, DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect", Telemetry = class {
   constructor(config2) {
     this.enabled = config2.enabled;
     this.endpoint = config2.endpoint || DEFAULT_ENDPOINT;
@@ -203674,7 +203790,7 @@ var Node$13 = class Node$14 {
       return parsed;
   }
   return fallback;
-}, normalizeFontFamily = (value, fallback = DEFAULT_PARAGRAPH_FONT_FAMILY) => typeof value === "string" && value.trim().length > 0 ? value : fallback, roundValue = (value) => measurementConfig.mode === "deterministic" ? Math.round(value * 10) / 10 : value, WORD_SINGLE_LINE_SPACING_MULTIPLIER = 1.15, isEmptyTextRun = (run2) => {
+}, normalizeFontFamily = (value, fallback = DEFAULT_PARAGRAPH_FONT_FAMILY) => typeof value === "string" && value.trim().length > 0 ? value : fallback, roundValue = (value) => measurementConfig.mode === "deterministic" ? Math.round(value * 10) / 10 : value, WORD_SINGLE_LINE_SPACING_MULTIPLIER = 1.15, isEmptyTextRun$1 = (run2) => {
   if (run2.kind && run2.kind !== "text")
     return false;
   return typeof run2.text === "string" && run2.text.length === 0;
@@ -208554,6 +208670,161 @@ var Node$13 = class Node$14 {
     if (aKeys[i$1] !== bKeys[i$1])
       return false;
   return true;
+}, toTrackChangeAttrs = (value) => {
+  if (!value || typeof value !== "object")
+    return;
+  return value;
+}, getParagraphMarkTrackedChange = (paragraphProperties) => {
+  const runProperties = paragraphProperties?.runProperties && typeof paragraphProperties.runProperties === "object" ? paragraphProperties.runProperties : undefined;
+  if (!runProperties)
+    return;
+  const trackInsertAttrs = toTrackChangeAttrs(runProperties.trackInsert);
+  const trackDeleteAttrs = toTrackChangeAttrs(runProperties.trackDelete);
+  if (!trackInsertAttrs && !trackDeleteAttrs)
+    return;
+  const marks = [];
+  if (trackInsertAttrs)
+    marks.push({
+      type: "trackInsert",
+      attrs: trackInsertAttrs
+    });
+  if (trackDeleteAttrs)
+    marks.push({
+      type: "trackDelete",
+      attrs: trackDeleteAttrs
+    });
+  return collectTrackedChangeFromMarks(marks);
+}, isEmptyTextRun = (run2) => {
+  if (!isTextRun$2(run2))
+    return false;
+  return run2.text.length === 0;
+}, getBlockMarker = (block) => {
+  if (!("attrs" in block) || !block.attrs || typeof block.attrs !== "object")
+    return;
+  const wordLayout = block.attrs.wordLayout;
+  if (!wordLayout || typeof wordLayout !== "object")
+    return;
+  const marker = wordLayout.marker;
+  if (!marker || typeof marker !== "object")
+    return;
+  return marker;
+}, getOriginalMarkerText = (marker) => {
+  if (typeof marker.pmAdapterOriginalMarkerText === "string")
+    return marker.pmAdapterOriginalMarkerText;
+  return typeof marker.markerText === "string" ? marker.markerText : undefined;
+}, isGhostSuppressionMode = (mode) => mode !== "off" && mode !== "final" && mode !== "original", getListKey = (numId, ilvl) => {
+  if (typeof numId !== "number" && typeof numId !== "string" || typeof ilvl !== "number")
+    return;
+  const normalizedNumId = String(numId).trim();
+  if (!normalizedNumId)
+    return;
+  return `${normalizedNumId}:${ilvl}`;
+}, getParagraphListKeyFromAttrs = (attrs) => {
+  if (!attrs || typeof attrs !== "object")
+    return;
+  const numberingProperties = attrs.numberingProperties;
+  if (!numberingProperties)
+    return;
+  return getListKey(numberingProperties.numId, numberingProperties.ilvl);
+}, TRAILING_MARKER_TOKEN_RE, getNodeListOrdinal = (node3) => {
+  const listRendering = getListRendering(node3.attrs?.listRendering);
+  if (!listRendering || listRendering.numberingType === "bullet")
+    return;
+  return getListOrdinalFromPath(listRendering.path);
+}, formatListOrdinalToken = (numberingType, ordinal, customFormat) => {
+  if (!Number.isFinite(ordinal) || ordinal < 1 || numberingType === "bullet")
+    return;
+  return generateOrderedListIndex({
+    listLevel: [Math.trunc(ordinal)],
+    lvlText: "%1",
+    listNumberingType: numberingType,
+    customFormat
+  }) ?? undefined;
+}, replaceTrailingMarkerToken = (markerText, replacementToken) => {
+  const match$1 = TRAILING_MARKER_TOKEN_RE.exec(markerText);
+  if (!match$1)
+    return;
+  return `${match$1[1] ?? ""}${replacementToken}${match$1[3] ?? ""}`;
+}, updateGhostListMarkerOffsets = (node3, paragraphBlocks, context) => {
+  if (!context.trackedChangesConfig.enabled)
+    return;
+  if (paragraphBlocks.some((block) => block.kind === "paragraph"))
+    return;
+  if (Array.isArray(node3.content) && node3.content.length > 0)
+    return;
+  if (!getParagraphMarkTrackedChange(typeof node3.attrs?.paragraphProperties === "object" && node3.attrs.paragraphProperties !== null ? node3.attrs.paragraphProperties : {}))
+    return;
+  const { paragraphAttrs } = computeParagraphAttrs(node3, context.converterContext);
+  const key$1 = getParagraphListKeyFromAttrs(paragraphAttrs);
+  if (!key$1)
+    return;
+  const offsets = context.trackedListMarkerOffsets;
+  if (!offsets)
+    return;
+  offsets.set(key$1, (offsets.get(key$1) ?? 0) + 1);
+}, getNodeListKey = (node3, context) => {
+  const { paragraphAttrs } = computeParagraphAttrs(node3, context.converterContext);
+  return getParagraphListKeyFromAttrs(paragraphAttrs);
+}, applyGhostListMarkerOffsets = (node3, paragraphBlocks, context) => {
+  const offsets = context.trackedListMarkerOffsets;
+  const lastOrdinals = context.trackedListLastOrdinals;
+  if (!offsets || offsets.size === 0 || !context.trackedChangesConfig.enabled)
+    return;
+  const listRendering = getListRendering(node3.attrs?.listRendering);
+  const numberingType = listRendering?.numberingType;
+  if (!numberingType || numberingType === "bullet")
+    return;
+  const sourceOrdinal = getNodeListOrdinal(node3);
+  if (!sourceOrdinal)
+    return;
+  const nodeListKey = getNodeListKey(node3, context);
+  if (!nodeListKey)
+    return;
+  const previousOrdinal = lastOrdinals?.get(nodeListKey);
+  if (previousOrdinal != null && sourceOrdinal <= previousOrdinal)
+    offsets.delete(nodeListKey);
+  lastOrdinals?.set(nodeListKey, sourceOrdinal);
+  const offset$1 = offsets.get(nodeListKey) ?? 0;
+  if (offset$1 <= 0)
+    return;
+  const adjustedOrdinal = sourceOrdinal - offset$1;
+  if (adjustedOrdinal < 1) {
+    offsets.delete(nodeListKey);
+    paragraphBlocks.forEach((block) => {
+      if (block.kind !== "paragraph" || getParagraphListKeyFromAttrs(block.attrs) !== nodeListKey)
+        return;
+      const marker = getBlockMarker(block);
+      if (!marker)
+        return;
+      const sourceMarkerText = getOriginalMarkerText(marker);
+      if (sourceMarkerText)
+        marker.markerText = sourceMarkerText;
+    });
+    return;
+  }
+  const replacementToken = formatListOrdinalToken(numberingType, adjustedOrdinal, listRendering.customFormat);
+  if (!replacementToken)
+    return;
+  paragraphBlocks.forEach((block) => {
+    if (block.kind !== "paragraph" || getParagraphListKeyFromAttrs(block.attrs) !== nodeListKey)
+      return;
+    const marker = getBlockMarker(block);
+    if (!marker)
+      return;
+    const sourceMarkerText = getOriginalMarkerText(marker);
+    if (!sourceMarkerText)
+      return;
+    const adjustedText = replaceTrailingMarkerToken(sourceMarkerText, replacementToken);
+    if (!adjustedText || adjustedText === sourceMarkerText)
+      return;
+    marker.pmAdapterOriginalMarkerText = sourceMarkerText;
+    marker.markerText = adjustedText;
+  });
+}, applyTrackedGhostListAdjustments = (node3, paragraphBlocks, context) => {
+  if (!context.trackedChangesConfig.enabled)
+    return;
+  updateGhostListMarkerOffsets(node3, paragraphBlocks, context);
+  applyGhostListMarkerOffsets(node3, paragraphBlocks, context);
 }, INLINE_CONVERTERS_REGISTRY, SHAPE_CONVERTERS_REGISTRY, DEFAULT_FONT = "Times New Roman", DEFAULT_SIZE, nodeHandlers2, converters, measurementCanvas = null, measurementCtx = null, TAB_CHAR_LENGTH = 1, SPACE_CHARS$1, isTabRun = (run2) => run2?.kind === "tab", isWordChar$2 = (char) => {
   if (!char)
     return false;
@@ -217722,38 +217993,19 @@ var Node$13 = class Node$14 {
     return;
   const matchingChange = trackedChanges[changeIndex];
   const matchingId = matchingChange.mark.attrs.id;
-  const getSegmentSize = ({ from: from$1, to }) => to - from$1;
-  const areDirectlyConnected = (left$1, right$1) => {
-    if (!left$1 || !right$1)
-      return false;
-    if (left$1.to !== right$1.from)
-      return false;
-    return !(state.doc.textBetween(left$1.from, right$1.to, `
-`).length > getSegmentSize(left$1) + getSegmentSize(right$1));
-  };
-  const isComplementaryPair = (firstType, secondType) => firstType === "trackDelete" && secondType === "trackInsert" || firstType === "trackInsert" && secondType === "trackDelete";
   const linkedBefore = [];
   const linkedAfter = [];
   const collectDirection = (direction, collection) => {
     let currentIndex = changeIndex;
-    let currentChange = matchingChange;
     while (true) {
       const neighborIndex = currentIndex + direction;
       const neighbor = trackedChanges[neighborIndex];
       if (!neighbor)
         break;
-      const [left$1, right$1] = direction < 0 ? [neighbor, currentChange] : [currentChange, neighbor];
-      const sharesId = neighbor.mark.attrs.id === matchingId;
-      const complementary = isComplementaryPair(currentChange.mark.type.name, neighbor.mark.type.name);
-      if (!sharesId && !areDirectlyConnected(left$1, right$1))
-        break;
-      if (!sharesId && !complementary)
+      if (!(neighbor.mark.attrs.id === matchingId))
         break;
       collection.push(neighbor);
       currentIndex = neighborIndex;
-      currentChange = neighbor;
-      if (!sharesId)
-        break;
     }
   };
   collectDirection(-1, linkedBefore);
@@ -219444,9 +219696,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_CDxFqrrf_es = __esm(() => {
+var init_src_DpqULOk_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_CEAHNaZj_es();
+  init_SuperConverter_BQCVReWb_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_CMPtQbp7_es();
@@ -226553,7 +226805,7 @@ function print() { __p += __j.call(arguments, '') }
             iteratee$1(index2);
           return result$1;
         }
-        function toPath$1(value) {
+        function toPath(value) {
           if (isArray$2(value))
             return arrayMap(value, toKey);
           return isSymbol2(value) ? [value] : copyArray(stringToPath(toString2(value)));
@@ -226723,7 +226975,7 @@ function print() { __p += __j.call(arguments, '') }
         lodash.toArray = toArray;
         lodash.toPairs = toPairs2;
         lodash.toPairsIn = toPairsIn;
-        lodash.toPath = toPath$1;
+        lodash.toPath = toPath;
         lodash.toPlainObject = toPlainObject;
         lodash.transform = transform;
         lodash.unary = unary;
@@ -237461,6 +237713,7 @@ function print() { __p += __j.call(arguments, '') }
     chartType: "unknown",
     series: []
   };
+  TRAILING_MARKER_TOKEN_RE = /^(.*?)([\p{L}\p{N}]+)([^\p{L}\p{N}]*)$/u;
   INLINE_CONVERTERS_REGISTRY = {
     footnoteReference: { inlineConverter: footnoteReferenceToBlock },
     endnoteReference: { inlineConverter: endnoteReferenceToBlock },
@@ -248246,6 +248499,10 @@ function print() { __p += __j.call(arguments, '') }
             return { "data-date": attrs.date };
           }
         },
+        sourceId: {
+          default: "",
+          rendered: false
+        },
         importedAuthor: {
           default: "",
           rendered: false
@@ -248317,6 +248574,10 @@ function print() { __p += __j.call(arguments, '') }
             return { "data-date": attrs.date };
           }
         },
+        sourceId: {
+          default: "",
+          rendered: false
+        },
         importedAuthor: {
           default: "",
           rendered: false
@@ -253128,8 +253389,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CDxFqrrf_es();
-  init_SuperConverter_CEAHNaZj_es();
+  init_src_DpqULOk_es();
+  init_SuperConverter_BQCVReWb_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CMPtQbp7_es();
@@ -261133,6 +261394,41 @@ var init_get_adapter = __esm(() => {
   init_sd_projection();
 });
 
+// ../../shared/common/list-rendering.ts
+var toFiniteNumber3 = (value) => {
+  if (typeof value === "number" && Number.isFinite(value))
+    return value;
+  if (typeof value === "string" && value.trim().length > 0) {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed))
+      return parsed;
+  }
+  return;
+}, getListOrdinalFromPath2 = (path2) => {
+  if (!Array.isArray(path2) || path2.length === 0)
+    return;
+  const ordinal = toFiniteNumber3(path2[path2.length - 1]);
+  return ordinal != null && ordinal > 0 ? ordinal : undefined;
+}, getListRendering2 = (value) => {
+  if (!value || typeof value !== "object") {
+    return;
+  }
+  const attrs = value;
+  const markerText = typeof attrs.markerText === "string" ? attrs.markerText : undefined;
+  const numberingType = typeof attrs.numberingType === "string" ? attrs.numberingType : undefined;
+  const customFormat = typeof attrs.customFormat === "string" ? attrs.customFormat : undefined;
+  const path2 = Array.isArray(attrs.path) ? attrs.path.map(toFiniteNumber3).filter((entry) => entry != null) : undefined;
+  if (!markerText && !numberingType && (!path2 || path2.length === 0)) {
+    return;
+  }
+  return {
+    markerText,
+    numberingType,
+    ...path2 && path2.length > 0 ? { path: path2 } : {},
+    ...customFormat ? { customFormat } : {}
+  };
+};
+
 // ../../packages/super-editor/src/document-api-adapters/helpers/content-controls/target-resolution.ts
 function isSdtNode2(node3) {
   return SDT_NODE_NAMES2.includes(node3.type.name);
@@ -261482,7 +261778,7 @@ function mapParagraphProperties2(attrs) {
   };
 }
 function mapListNumbering2(attrs) {
-  const listRendering = attrs?.listRendering ?? undefined;
+  const listRendering = getListRendering2(attrs?.listRendering);
   if (!listRendering)
     return;
   const listNumbering = {};
@@ -261490,9 +261786,7 @@ function mapListNumbering2(attrs) {
     listNumbering.marker = listRendering.markerText;
   if (Array.isArray(listRendering.path))
     listNumbering.path = listRendering.path;
-  if (Array.isArray(listRendering.path) && listRendering.path.length > 0) {
-    listNumbering.ordinal = listRendering.path[listRendering.path.length - 1];
-  }
+  listNumbering.ordinal = getListOrdinalFromPath2(listRendering.path);
   return Object.keys(listNumbering).length ? listNumbering : undefined;
 }
 function mapParagraphNode2(candidate) {
@@ -284004,6 +284298,40 @@ var init_cntxtAlts_translator = __esm(() => {
   });
 });
 
+// ../../packages/super-editor/src/core/super-converter/v3/handlers/w/rpr/track-change-run-property-translator.js
+var createTrackChangeRunPropertyTranslator2 = (xmlName, sdNodeOrKeyName) => NodeTranslator3.from({
+  xmlName,
+  sdNodeOrKeyName,
+  attributes: [
+    createAttributeHandler2("w:id", "id"),
+    createAttributeHandler2("w:author", "author"),
+    createAttributeHandler2("w:authorEmail", "authorEmail"),
+    createAttributeHandler2("w:date", "date")
+  ],
+  encode: (_params, encodedAttrs = {}) => {
+    return Object.keys(encodedAttrs).length ? encodedAttrs : undefined;
+  },
+  decode: function({ node: node4 }) {
+    const source = node4?.attrs?.[sdNodeOrKeyName];
+    if (!source || typeof source !== "object") {
+      return;
+    }
+    const decodedAttrs = this.decodeAttributes({
+      node: {
+        ...node4,
+        attrs: source
+      }
+    });
+    return Object.keys(decodedAttrs).length ? { attributes: decodedAttrs } : undefined;
+  }
+}), trackInsertRunPropertyTranslator, trackDeleteRunPropertyTranslator;
+var init_track_change_run_property_translator = __esm(() => {
+  init_node_translator2();
+  init_utils();
+  trackInsertRunPropertyTranslator = createTrackChangeRunPropertyTranslator2("w:ins", "trackInsert");
+  trackDeleteRunPropertyTranslator = createTrackChangeRunPropertyTranslator2("w:del", "trackDelete");
+});
+
 // ../../packages/super-editor/src/core/super-converter/v3/handlers/w/rpr/rpr-translator.js
 var propertyTranslators2, translator47;
 var init_rpr_translator = __esm(() => {
@@ -284053,6 +284381,7 @@ var init_rpr_translator = __esm(() => {
   init_numSpacing_translator();
   init_stylisticSets_translator();
   init_cntxtAlts_translator();
+  init_track_change_run_property_translator();
   propertyTranslators2 = [
     translator5,
     translator4,
@@ -284096,6 +284425,8 @@ var init_rpr_translator = __esm(() => {
     translator44,
     translator45,
     translator46,
+    trackInsertRunPropertyTranslator,
+    trackDeleteRunPropertyTranslator,
     translator41,
     translator33
   ];
@@ -309195,7 +309526,7 @@ function decode74(params3) {
   return {
     name: "w:del",
     attributes: {
-      "w:id": trackedMark.attrs.id,
+      "w:id": trackedMark.attrs.sourceId || trackedMark.attrs.id,
       "w:author": trackedMark.attrs.author,
       "w:authorEmail": trackedMark.attrs.authorEmail,
       "w:date": trackedMark.attrs.date
@@ -309206,9 +309537,11 @@ function decode74(params3) {
 var XML_NODE_NAME35 = "w:del", SD_ATTR_KEY5 = "trackDelete", validXmlAttributes11, encode70 = (params3, encodedAttrs = {}) => {
   const { nodeListHandler, extraParams = {}, converter } = params3;
   const { node: node4 } = extraParams;
-  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id)) {
-    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  const originalWordId = encodedAttrs.id;
+  if (originalWordId && converter?.trackedChangeIdMap?.has(originalWordId)) {
+    encodedAttrs.id = converter.trackedChangeIdMap.get(originalWordId);
   }
+  encodedAttrs.sourceId = originalWordId || "";
   const subs = nodeListHandler.handler({
     ...params3,
     insideTrackChange: true,
@@ -309275,7 +309608,7 @@ function decode75(params3) {
   return {
     name: "w:ins",
     attributes: {
-      "w:id": trackedMark.attrs.id,
+      "w:id": trackedMark.attrs.sourceId || trackedMark.attrs.id,
       "w:author": trackedMark.attrs.author,
       "w:authorEmail": trackedMark.attrs.authorEmail,
       "w:date": trackedMark.attrs.date
@@ -309286,9 +309619,11 @@ function decode75(params3) {
 var XML_NODE_NAME36 = "w:ins", SD_ATTR_KEY6 = "trackInsert", validXmlAttributes12, encode71 = (params3, encodedAttrs = {}) => {
   const { nodeListHandler, extraParams = {}, converter } = params3;
   const { node: node4 } = extraParams;
-  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id)) {
-    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  const originalWordId = encodedAttrs.id;
+  if (originalWordId && converter?.trackedChangeIdMap?.has(originalWordId)) {
+    encodedAttrs.id = converter.trackedChangeIdMap.get(originalWordId);
   }
+  encodedAttrs.sourceId = originalWordId || "";
   const subs = nodeListHandler.handler({
     ...params3,
     insideTrackChange: true,
@@ -311655,8 +311990,7 @@ var generateCommentsWithExtendedData2 = ({ docx, comments, converter, threadingP
   let positionIndex = 0;
   let lastElementWasCommentMarker = false;
   const recentlyClosedComments = new Set;
-  let lastTrackedChange = null;
-  const walkElements = (elements, currentTrackedChangeId = null) => {
+  const walkElements2 = (elements, currentTrackedChangeId = null) => {
     if (!elements || !Array.isArray(elements))
       return;
     elements.forEach((element3) => {
@@ -311699,50 +312033,18 @@ var generateCommentsWithExtendedData2 = ({ docx, comments, converter, threadingP
         }
         lastElementWasCommentMarker = true;
       } else if (isTrackedChange) {
-        const trackedChangeId = element3.attributes?.["w:id"];
-        const author = element3.attributes?.["w:author"];
-        const date = element3.attributes?.["w:date"];
-        const elementType = element3.name;
-        let mappedId = trackedChangeId;
-        let isReplacement = false;
-        if (trackedChangeId !== undefined && converter) {
-          if (!converter.trackedChangeIdMap) {
-            converter.trackedChangeIdMap = new Map;
-          }
-          if (lastTrackedChange && lastTrackedChange.type !== elementType && lastTrackedChange.author === author && lastTrackedChange.date === date) {
-            mappedId = lastTrackedChange.mappedId;
-            converter.trackedChangeIdMap.set(String(trackedChangeId), mappedId);
-            isReplacement = true;
-          } else {
-            if (!converter.trackedChangeIdMap.has(String(trackedChangeId))) {
-              converter.trackedChangeIdMap.set(String(trackedChangeId), v42());
-            }
-            mappedId = converter.trackedChangeIdMap.get(String(trackedChangeId));
-          }
-        }
-        if (currentTrackedChangeId === null) {
-          if (isReplacement) {
-            lastTrackedChange = null;
-          } else {
-            lastTrackedChange = {
-              type: elementType,
-              author,
-              date,
-              mappedId,
-              wordId: String(trackedChangeId)
-            };
-          }
-        }
+        const wordId = element3.attributes?.["w:id"];
+        const mappedId = wordId != null ? converter?.trackedChangeIdMap?.get(String(wordId)) ?? String(wordId) : currentTrackedChangeId;
         if (mappedId && recentlyClosedComments.size > 0) {
           recentlyClosedComments.forEach((commentId) => {
             if (!commentsInTrackedChanges.has(commentId)) {
-              commentsInTrackedChanges.set(commentId, String(mappedId));
+              commentsInTrackedChanges.set(commentId, mappedId);
             }
           });
         }
         recentlyClosedComments.clear();
         if (element3.elements && Array.isArray(element3.elements)) {
-          walkElements(element3.elements, mappedId !== undefined ? String(mappedId) : currentTrackedChangeId);
+          walkElements2(element3.elements, mappedId);
         }
       } else {
         if (lastElementWasCommentMarker) {
@@ -311751,10 +312053,9 @@ var generateCommentsWithExtendedData2 = ({ docx, comments, converter, threadingP
         }
         if (element3.name === "w:p") {
           recentlyClosedComments.clear();
-          lastTrackedChange = null;
         }
         if (element3.elements && Array.isArray(element3.elements)) {
-          walkElements(element3.elements, currentTrackedChangeId);
+          walkElements2(element3.elements, currentTrackedChangeId);
         }
       }
     });
@@ -311762,7 +312063,7 @@ var generateCommentsWithExtendedData2 = ({ docx, comments, converter, threadingP
   if (documentXml.elements && documentXml.elements.length > 0) {
     const body = documentXml.elements[0];
     if (body.elements) {
-      walkElements(body.elements);
+      walkElements2(body.elements);
     }
   }
   return { rangeEvents, rangePositions, commentsInTrackedChanges };
@@ -311916,6 +312217,82 @@ var init_documentCommentsImporter = __esm(() => {
   init_docxImporter();
 });
 
+// ../../packages/super-editor/src/core/super-converter/v2/importer/trackedChangeIdMapper.js
+function isReplacementPair2(previous5, current) {
+  return previous5.type !== current.type && previous5.author === current.author && previous5.date === current.date;
+}
+function assignInternalId2(element3, idMap, context, insideTrackedChange) {
+  const wordId = String(element3.attributes?.["w:id"] ?? "");
+  if (!wordId)
+    return;
+  if (insideTrackedChange) {
+    if (!idMap.has(wordId)) {
+      idMap.set(wordId, v42());
+    }
+    return;
+  }
+  const current = {
+    type: element3.name,
+    author: element3.attributes?.["w:author"] ?? "",
+    date: element3.attributes?.["w:date"] ?? ""
+  };
+  if (context.lastTrackedChange && isReplacementPair2(context.lastTrackedChange, current)) {
+    if (!idMap.has(wordId)) {
+      idMap.set(wordId, context.lastTrackedChange.internalId);
+    }
+    context.lastTrackedChange = null;
+  } else {
+    const internalId = idMap.get(wordId) ?? v42();
+    idMap.set(wordId, internalId);
+    context.lastTrackedChange = { ...current, internalId };
+  }
+}
+function walkElements2(elements, idMap, context, insideTrackedChange = false) {
+  if (!Array.isArray(elements))
+    return;
+  for (const element3 of elements) {
+    if (TRACKED_CHANGE_NAMES2.has(element3.name)) {
+      assignInternalId2(element3, idMap, context, insideTrackedChange);
+      if (element3.elements) {
+        walkElements2(element3.elements, idMap, { lastTrackedChange: null }, true);
+      }
+    } else {
+      if (!PAIRING_TRANSPARENT_NAMES2.has(element3.name)) {
+        context.lastTrackedChange = null;
+      }
+      if (element3.elements) {
+        walkElements2(element3.elements, idMap, context, insideTrackedChange);
+      }
+    }
+  }
+}
+function buildTrackedChangeIdMap2(docx) {
+  const body = docx?.["word/document.xml"]?.elements?.[0];
+  if (!body?.elements)
+    return new Map;
+  const idMap = new Map;
+  walkElements2(body.elements, idMap, { lastTrackedChange: null });
+  return idMap;
+}
+var TRACKED_CHANGE_NAMES2, PAIRING_TRANSPARENT_NAMES2;
+var init_trackedChangeIdMapper = __esm(() => {
+  init_wrapper();
+  TRACKED_CHANGE_NAMES2 = new Set(["w:ins", "w:del"]);
+  PAIRING_TRANSPARENT_NAMES2 = new Set([
+    "w:commentRangeStart",
+    "w:commentRangeEnd",
+    "w:bookmarkStart",
+    "w:bookmarkEnd",
+    "w:proofErr",
+    "w:permStart",
+    "w:permEnd",
+    "w:moveFromRangeStart",
+    "w:moveFromRangeEnd",
+    "w:moveToRangeStart",
+    "w:moveToRangeEnd"
+  ]);
+});
+
 // ../../packages/super-editor/src/core/super-converter/v2/importer/documentFootnotesImporter.js
 function importNoteEntries2({
   partXml,
@@ -313125,6 +313502,7 @@ var detectDocumentOrigin2 = (docx) => {
     const inlineDocumentFonts = [];
     patchNumberingDefinitions2(docx);
     const numbering = getNumberingDefinitions2(docx);
+    converter.trackedChangeIdMap = buildTrackedChangeIdMap2(docx);
     const comments = importCommentData2({ docx, nodeListHandler, converter, editor });
     const footnotes = importFootnoteData2({ docx, nodeListHandler, converter, editor, numbering });
     const endnotes = importEndnoteData2({ docx, nodeListHandler, converter, editor, numbering });
@@ -313456,6 +313834,7 @@ var init_docxImporter = __esm(() => {
   init_pageReferenceImporter();
   init_pictNodeImporter();
   init_documentCommentsImporter();
+  init_trackedChangeIdMapper();
   init_documentFootnotesImporter();
   init_docx_helpers2();
   init_ignoredNodes();
@@ -316143,7 +316522,7 @@ var init_citation_sources = __esm(() => {
 // ../../packages/super-editor/src/core/super-converter/export-helpers/strip-orphaned-numbering.js
 function collectReferencedNumIds2(convertedXml) {
   const numIds = new Set;
-  function walkElements(elements) {
+  function walkElements3(elements) {
     if (!Array.isArray(elements))
       return;
     for (const el of elements) {
@@ -316153,12 +316532,12 @@ function collectReferencedNumIds2(convertedXml) {
         numIds.add(Number(el.attributes["w:val"]));
       }
       if (el.elements)
-        walkElements(el.elements);
+        walkElements3(el.elements);
     }
   }
   for (const [path3, xml2] of Object.entries(convertedXml)) {
     if (path3.startsWith("word/") && path3 !== "word/numbering.xml" && xml2?.elements) {
-      walkElements(xml2.elements);
+      walkElements3(xml2.elements);
     }
   }
   return numIds;
@@ -328716,12 +329095,6 @@ var init_list_sequence_helpers = __esm(() => {
 });
 
 // ../../packages/super-editor/src/document-api-adapters/helpers/list-item-resolver.ts
-function toPath2(value) {
-  if (!Array.isArray(value))
-    return;
-  const parsed = value.map((entry) => toFiniteNumber2(entry)).filter((entry) => entry != null);
-  return parsed.length > 0 ? parsed : undefined;
-}
 function getNumberingProperties4(node4) {
   const attrs = node4.attrs ?? {};
   const paragraphNumbering = attrs.paragraphProperties?.numberingProperties ?? undefined;
@@ -328761,9 +329134,10 @@ function getListText2(candidate) {
 function projectListItemCandidate2(editor, candidate) {
   const attrs = candidate.node.attrs ?? {};
   const { numId, level } = getNumberingProperties4(candidate.node);
-  const path3 = toPath2(attrs.listRendering?.path);
-  const ordinal = path3?.length ? path3[path3.length - 1] : undefined;
-  const marker = typeof attrs.listRendering?.markerText === "string" ? attrs.listRendering.markerText : undefined;
+  const listRendering = getListRendering2(attrs.listRendering);
+  const path3 = listRendering?.path;
+  const ordinal = getListOrdinalFromPath2(path3);
+  const marker = listRendering?.markerText;
   return {
     candidate,
     address: {
@@ -397270,6 +397644,9 @@ function sleep2(ms) {
     return Promise.resolve();
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
+function nextTimerTurn() {
+  return new Promise((resolve3) => setTimeout(resolve3, 0));
+}
 async function claimBootstrap(ydoc, settlingMs, jitterMs = DEFAULT_BOOTSTRAP_JITTER_MS) {
   const jitterDelayMs = Math.floor(Math.random() * jitterMs);
   if (jitterDelayMs > 0)
@@ -397283,8 +397660,10 @@ async function claimBootstrap(ydoc, settlingMs, jitterMs = DEFAULT_BOOTSTRAP_JIT
   });
   const observer = observeCompetitor(ydoc);
   try {
-    if (settlingMs > 0)
+    if (settlingMs > 0) {
       await sleep2(settlingMs);
+      await nextTimerTurn();
+    }
     const competitor = observer.getCompetitor();
     if (competitor)
       return { granted: false, competitor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.135",
+  "version": "0.2.0-next.137",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -22,19 +22,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.18.0"
+    "superdoc": "1.18.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.135",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.135",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.135",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.135",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.135"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.137",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.137",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.137",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.137",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.137"
   },
   "scripts": {
     "dev": "bun run src/index.ts",