@superdoc-dev/cli 0.2.0-next.76 → 0.2.0-next.77

package/dist/index.js

@@ -107315,9 +107315,9 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-C0LpayfV.es.js
-var exports_src_C0LpayfV_es = {};
-__export(exports_src_C0LpayfV_es, {
+// ../../packages/superdoc/dist/chunks/src-BdKG1LCw.es.js
+var exports_src_BdKG1LCw_es = {};
+__export(exports_src_BdKG1LCw_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -153718,8 +153718,7 @@ async function getEditorContext(editor, event) {
   const state = editor.state;
   if (!state)
     return null;
-  const { from: from$12, to, empty: empty$2 } = state.selection;
-  const selectedText = !empty$2 ? state.doc.textBetween(from$12, to) : "";
+  const { from: from$12 } = state.selection;
   let pos = null;
   let node3 = null;
   if (event && typeof event.clientX === "number" && typeof event.clientY === "number") {
@@ -153737,6 +153736,14 @@ async function getEditorContext(editor, event) {
     pos = from$12;
     node3 = state.doc.nodeAt(pos);
   }
+  const selection = getContextSelection({
+    editor,
+    state,
+    pos,
+    event
+  });
+  const hasSelection$1 = hasExpandedSelection(selection);
+  const selectedText = hasSelection$1 ? state.doc.textBetween(selection.from, selection.to) : "";
   const clipboardContent = {
     html: null,
     text: null,
@@ -153772,14 +153779,18 @@ async function getEditorContext(editor, event) {
     state.selection.$head.marks().forEach((mark2) => activeMarks.push(mark2.type.name));
   }
   const isTrackedChange = activeMarks.includes("trackInsert") || activeMarks.includes("trackDelete") || activeMarks.includes("trackFormat");
-  const trackedChanges = event && pos !== null ? collectTrackedChangesForContext({
+  const trackedChanges = (event && pos !== null ? hasExpandedSelection(selection) && selectionContainsPos(selection, pos) : hasSelection$1) ? collectTrackedChanges({
+    state,
+    from: selection.from,
+    to: selection.to
+  }) : event && pos !== null ? collectTrackedChangesForContext({
     state,
     pos,
     trackedChangeId
   }) : collectTrackedChanges({
     state,
-    from: from$12,
-    to
+    from: selection.from,
+    to: selection.to
   });
   const cursorCoords = pos !== null ? editor.coordsAtPos?.(pos) : null;
   const cursorPosition = cursorCoords ? {
@@ -153791,9 +153802,9 @@ async function getEditorContext(editor, event) {
   } : null;
   return {
     selectedText,
-    hasSelection: !empty$2,
-    selectionStart: from$12,
-    selectionEnd: to,
+    hasSelection: hasSelection$1,
+    selectionStart: selection.from,
+    selectionEnd: selection.to,
     isInTable: isInTable$2,
     isInList,
     isInSectionNode,
@@ -153817,6 +153828,20 @@ async function getEditorContext(editor, event) {
     trackedChanges
   };
 }
+function selectionContainsPos(selection, pos) {
+  return hasExpandedSelection(selection) && Number.isFinite(pos) && pos >= selection.from && pos <= selection.to;
+}
+function getContextSelection({ editor, state, pos, event }) {
+  const currentSelection = state.selection;
+  const preservedSelection = editor?.options?.preservedSelection ?? editor?.options?.lastSelection;
+  if (hasExpandedSelection(currentSelection))
+    return currentSelection;
+  if (!hasExpandedSelection(preservedSelection))
+    return currentSelection;
+  if (event)
+    return selectionContainsPos(preservedSelection, pos) ? preservedSelection : currentSelection;
+  return preservedSelection;
+}
 function computeCanUndo(editor, state) {
   if (typeof editor?.can === "function")
     try {
@@ -153992,10 +154017,11 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
         label: TEXTS.trackChangesAccept,
         isDefault: true,
         action: (editor$1, context$1) => {
-          if (context$1?.trackedChangeId)
-            editor$1.commands.acceptTrackedChangeById(context$1.trackedChangeId);
-          else
-            editor$1.commands.acceptTrackedChangeBySelection();
+          editor$1.commands.acceptTrackedChangeFromContextMenu({
+            from: context$1?.selectionStart,
+            to: context$1?.selectionEnd,
+            trackedChangeId: context$1?.trackedChangeId
+          });
         },
         showWhen: (context$1) => {
           const { trigger: trigger$1, isTrackedChange } = context$1;
@@ -154007,10 +154033,11 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
         icon: ICONS.trackChangesReject,
         isDefault: true,
         action: (editor$1, context$1) => {
-          if (context$1?.trackedChangeId)
-            editor$1.commands.rejectTrackedChangeById(context$1.trackedChangeId);
-          else
-            editor$1.commands.rejectTrackedChangeOnSelection();
+          editor$1.commands.rejectTrackedChangeFromContextMenu({
+            from: context$1?.selectionStart,
+            to: context$1?.selectionEnd,
+            trackedChangeId: context$1?.trackedChangeId
+          });
         },
         showWhen: (context$1) => {
           const { trigger: trigger$1, isTrackedChange } = context$1;
@@ -179803,27 +179830,102 @@ var Node$13 = class Node$14 {
   if (!trackedChangeId)
     return changes;
   return changes.filter((change) => change.id === trackedChangeId);
-}, TrackChanges, dedupeTrackedChangeRanges = (changes = []) => {
-  const byKey = /* @__PURE__ */ new Map;
-  changes.forEach((change) => {
-    if (!change || typeof change.from !== "number" || typeof change.to !== "number")
+}, hasExpandedSelection = (selection) => {
+  return Number.isFinite(selection?.from) && Number.isFinite(selection?.to) && selection.from !== selection.to;
+}, TrackChanges, TRACKED_CHANGE_MARKS, getTrackedMark = (node3) => node3?.marks?.find((mark2) => TRACKED_CHANGE_MARKS.includes(mark2.type.name)) ?? null, getTrackedChangeActionSelection = ({ state, editor }) => {
+  const currentSelection = state?.selection;
+  if (hasExpandedSelection(currentSelection))
+    return currentSelection;
+  const preservedSelection = editor?.options?.preservedSelection ?? editor?.options?.lastSelection;
+  if (hasExpandedSelection(preservedSelection))
+    return preservedSelection;
+  return currentSelection;
+}, getTrackedChangeResolutionContext = ({ state, trackedChangeId = null }) => {
+  const commentsPluginState = CommentsPluginKey.getState(state);
+  const resolvedTrackedChangeId = trackedChangeId ?? commentsPluginState?.activeThreadId ?? null;
+  const hasTrackedChangeInCache = Boolean(resolvedTrackedChangeId && commentsPluginState?.trackedChanges?.[resolvedTrackedChangeId]);
+  const hasTrackedChangeInDocument = Boolean(resolvedTrackedChangeId && getChangesByIdToResolve(state, resolvedTrackedChangeId)?.length);
+  return {
+    trackedChangeId: resolvedTrackedChangeId,
+    hasKnownTrackedChangeId: hasTrackedChangeInCache || hasTrackedChangeInDocument
+  };
+}, selectionTouchesTrackedChange = ({ state, trackedChangeId, selection = state?.selection }) => {
+  if (!selection)
+    return false;
+  if (!trackedChangeId)
+    return collectTrackedChanges({
+      state,
+      from: selection.from,
+      to: selection.to
+    }).length > 0;
+  return collectTrackedChanges({
+    state,
+    from: selection.from,
+    to: selection.to
+  }).some((change) => change.id === trackedChangeId);
+}, resolveTrackedChangeAction = ({ action, state, commands: commands$1, editor, trackedChangeId = null, hasKnownTrackedChangeId = false, selection = null }) => {
+  const targetSelection = selection ?? getTrackedChangeActionSelection({
+    state,
+    editor
+  });
+  const betweenCommand = action === "accept" ? commands$1.acceptTrackedChangesBetween : commands$1.rejectTrackedChangesBetween;
+  const byIdCommand = action === "accept" ? commands$1.acceptTrackedChangeById : commands$1.rejectTrackedChangeById;
+  const selectionCommand = action === "accept" ? commands$1.acceptTrackedChangeBySelection : commands$1.rejectTrackedChangeOnSelection;
+  if (hasExpandedSelection(targetSelection) && selectionTouchesTrackedChange({
+    state,
+    trackedChangeId,
+    selection: targetSelection
+  }))
+    return betweenCommand(targetSelection.from, targetSelection.to);
+  if (trackedChangeId && hasKnownTrackedChangeId)
+    return byIdCommand(trackedChangeId);
+  return hasExpandedSelection(targetSelection) ? betweenCommand(targetSelection.from, targetSelection.to) : selectionCommand();
+}, collectRemainingMarksByType = (trackedChanges = []) => ({
+  insertedMark: trackedChanges.find(({ mark: mark2 }) => mark2.type.name === "trackInsert")?.mark ?? null,
+  deletionMark: trackedChanges.find(({ mark: mark2 }) => mark2.type.name === "trackDelete")?.mark ?? null,
+  formatMark: trackedChanges.find(({ mark: mark2 }) => mark2.type.name === "trackFormat")?.mark ?? null
+}), emitTrackedChangeCommentLifecycle = ({ editor, nextState, touchedChangeIds }) => {
+  if (!editor?.emit || !touchedChangeIds?.size)
+    return;
+  const resolvedByEmail = editor.options?.user?.email;
+  const resolvedByName = editor.options?.user?.name;
+  touchedChangeIds.forEach((changeId) => {
+    const remainingTrackedChanges = getTrackChanges(nextState, changeId);
+    if (!remainingTrackedChanges.length) {
+      editor.emit("commentsUpdate", {
+        type: "trackedChange",
+        event: "resolve",
+        changeId,
+        resolvedByEmail,
+        resolvedByName
+      });
       return;
-    const type = change.mark?.type?.name || "";
-    const id2 = change.mark?.attrs?.id || "";
-    const key$1 = `${change.from}:${change.to}:${type}:${id2}`;
-    if (!byKey.has(key$1))
-      byKey.set(key$1, change);
-  });
-  return Array.from(byKey.values()).sort((left$1, right$1) => {
-    if (left$1.from !== right$1.from)
-      return left$1.from - right$1.from;
-    return left$1.to - right$1.to;
-  });
-}, getTrackedChangesByTouchedIds = (state, trackedChanges = []) => {
-  const touchedIds = new Set(trackedChanges.map(({ mark: mark2 }) => mark2?.attrs?.id).filter(Boolean));
-  if (!touchedIds.size)
-    return trackedChanges;
-  return Array.from(touchedIds).flatMap((id2) => getChangesByIdToResolve(state, id2) || []);
+    }
+    const updatePayload = createOrUpdateTrackedChangeComment({
+      event: "update",
+      marks: collectRemainingMarksByType(remainingTrackedChanges),
+      deletionNodes: [],
+      nodes: [],
+      newEditorState: nextState,
+      documentId: editor.options?.documentId,
+      trackedChangesForId: remainingTrackedChanges
+    });
+    if (updatePayload)
+      editor.emit("commentsUpdate", updatePayload);
+  });
+}, dispatchTrackedChangeResolution = ({ state, tr, dispatch, editor, touchedChangeIds }) => {
+  if (!tr.steps.length)
+    return true;
+  const nextState = state.apply(tr);
+  if (dispatch)
+    dispatch(tr);
+  if (dispatch && touchedChangeIds?.size)
+    emitTrackedChangeCommentLifecycle({
+      editor,
+      nextState,
+      touchedChangeIds
+    });
+  return true;
 }, getChangesByIdToResolve = (state, id2) => {
   const trackedChanges = getTrackChanges(state);
   const changeIndex = trackedChanges.findIndex(({ mark: mark2 }) => mark2.attrs.id === id2);
@@ -181991,7 +182093,7 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$2, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, _hoisted_2$1, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_HEIGHT_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, POPOVER_VERTICAL_OFFSET_PX = 15, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_C0LpayfV_es = __esm(() => {
+var init_src_BdKG1LCw_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_CoCZX_fP_es();
   init_jszip_ChlR43oI_es();
@@ -209829,98 +209931,92 @@ function print() { __p += __j.call(arguments, '') }
             return false;
           let { tr, doc: doc$2 } = state;
           tr.setMeta("inputType", "acceptReject");
+          const touchedChangeIds = /* @__PURE__ */ new Set;
           const map$22 = new Mapping;
           doc$2.nodesBetween(from$12, to, (node3, pos) => {
-            if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackDelete")) {
-              const deletionStep = new ReplaceStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), Slice.empty);
+            const trackedMark = getTrackedMark(node3);
+            if (!trackedMark)
+              return;
+            const mappedFrom = map$22.map(Math.max(pos, from$12));
+            const mappedTo = map$22.map(Math.min(pos + node3.nodeSize, to));
+            if (mappedFrom >= mappedTo)
+              return;
+            if (trackedMark.attrs?.id)
+              touchedChangeIds.add(trackedMark.attrs.id);
+            if (trackedMark.type.name === "trackDelete") {
+              const deletionStep = new ReplaceStep(mappedFrom, mappedTo, Slice.empty);
               tr.step(deletionStep);
               map$22.appendMap(deletionStep.getMap());
-            } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackInsert")) {
-              const insertionMark = node3.marks.find((mark2) => mark2.type.name === TrackInsertMarkName);
-              tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), insertionMark));
-            } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackFormat")) {
-              const formatChangeMark = node3.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
-              tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), formatChangeMark));
+              return;
             }
+            tr.step(new RemoveMarkStep(mappedFrom, mappedTo, trackedMark));
           });
-          if (tr.steps.length)
-            dispatch(tr);
-          return true;
-        },
-        rejectTrackedChangesBetween: (from$12, to) => ({ state, dispatch, editor }) => {
-          const trackedChangesInSelection = collectTrackedChanges({
+          return dispatchTrackedChangeResolution({
             state,
-            from: from$12,
-            to
+            tr,
+            dispatch,
+            editor,
+            touchedChangeIds
           });
-          const trackedChangesById = getTrackedChangesByTouchedIds(state, trackedChangesInSelection);
-          const trackedChangesWithoutId = trackedChangesInSelection.filter(({ mark: mark2 }) => !mark2?.attrs?.id);
-          const trackedChanges = dedupeTrackedChangeRanges([...trackedChangesById, ...trackedChangesWithoutId]);
+        },
+        rejectTrackedChangesBetween: (from$12, to) => ({ state, dispatch, editor }) => {
           if (!isTrackedChangeActionAllowed({
             editor,
             action: "reject",
-            trackedChanges
+            trackedChanges: collectTrackedChanges({
+              state,
+              from: from$12,
+              to
+            })
           }))
             return false;
           const { tr, doc: doc$2 } = state;
-          const rejectedChangeIds = /* @__PURE__ */ new Set;
+          const touchedChangeIds = /* @__PURE__ */ new Set;
           tr.setMeta("inputType", "acceptReject");
           const map$22 = new Mapping;
-          trackedChanges.forEach(({ from: rangeFrom, to: rangeTo }) => {
-            doc$2.nodesBetween(rangeFrom, rangeTo, (node3, pos) => {
-              if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackDelete")) {
-                const deletionMark = node3.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName);
-                if (deletionMark?.attrs?.id)
-                  rejectedChangeIds.add(deletionMark.attrs.id);
-                tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), deletionMark));
-              } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackInsert")) {
-                const insertionMark = node3.marks.find((mark2) => mark2.type.name === TrackInsertMarkName);
-                if (insertionMark?.attrs?.id)
-                  rejectedChangeIds.add(insertionMark.attrs.id);
-                const deletionStep = new ReplaceStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), Slice.empty);
-                tr.step(deletionStep);
-                map$22.appendMap(deletionStep.getMap());
-              } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackFormat")) {
-                const formatChangeMark = node3.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
-                if (formatChangeMark?.attrs?.id)
-                  rejectedChangeIds.add(formatChangeMark.attrs.id);
-                formatChangeMark.attrs.before.forEach((oldMark) => {
-                  tr.step(new AddMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
-                });
-                formatChangeMark.attrs.after.forEach((newMark) => {
-                  const mappedFrom = map$22.map(Math.max(pos, rangeFrom));
-                  const mappedTo = map$22.map(Math.min(pos + node3.nodeSize, rangeTo));
-                  const liveMark = findMarkInRangeBySnapshot({
-                    doc: tr.doc,
-                    from: mappedFrom,
-                    to: mappedTo,
-                    snapshot: newMark
-                  });
-                  if (!liveMark)
-                    return;
-                  tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
-                });
-                tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), formatChangeMark));
-              }
+          doc$2.nodesBetween(from$12, to, (node3, pos) => {
+            const trackedMark = getTrackedMark(node3);
+            if (!trackedMark)
+              return;
+            const mappedFrom = map$22.map(Math.max(pos, from$12));
+            const mappedTo = map$22.map(Math.min(pos + node3.nodeSize, to));
+            if (mappedFrom >= mappedTo)
+              return;
+            if (trackedMark.attrs?.id)
+              touchedChangeIds.add(trackedMark.attrs.id);
+            if (trackedMark.type.name === "trackDelete") {
+              tr.step(new RemoveMarkStep(mappedFrom, mappedTo, trackedMark));
+              return;
+            }
+            if (trackedMark.type.name === "trackInsert") {
+              const deletionStep = new ReplaceStep(mappedFrom, mappedTo, Slice.empty);
+              tr.step(deletionStep);
+              map$22.appendMap(deletionStep.getMap());
+              return;
+            }
+            trackedMark.attrs.before.forEach((oldMark) => {
+              tr.step(new AddMarkStep(mappedFrom, mappedTo, state.schema.marks[oldMark.type].create(oldMark.attrs)));
             });
-          });
-          if (tr.steps.length) {
-            dispatch(tr);
-            if (editor?.emit && rejectedChangeIds.size) {
-              const resolvedByEmail = editor.options?.user?.email;
-              const resolvedByName = editor.options?.user?.name;
-              rejectedChangeIds.forEach((changeId) => {
-                editor.emit("commentsUpdate", {
-                  type: "trackedChange",
-                  event: "resolve",
-                  changeId,
-                  resolvedByEmail,
-                  resolvedByName
-                });
+            trackedMark.attrs.after.forEach((newMark) => {
+              const liveMark = findMarkInRangeBySnapshot({
+                doc: tr.doc,
+                from: mappedFrom,
+                to: mappedTo,
+                snapshot: newMark
               });
-            }
-          }
-          return true;
+              if (!liveMark)
+                return;
+              tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
+            });
+            tr.step(new RemoveMarkStep(mappedFrom, mappedTo, trackedMark));
+          });
+          return dispatchTrackedChangeResolution({
+            state,
+            tr,
+            dispatch,
+            editor,
+            touchedChangeIds
+          });
         },
         acceptTrackedChange: ({ trackedChange }) => ({ commands: commands$1 }) => {
           const { start: from$12, end: to } = trackedChange;
@@ -209930,13 +210026,33 @@ function print() { __p += __j.call(arguments, '') }
           const { from: from$12, to } = state.selection;
           return commands$1.acceptTrackedChangesBetween(from$12, to);
         },
-        acceptTrackedChangeFromToolbar: () => ({ state, commands: commands$1 }) => {
-          const commentsPluginState = CommentsPluginKey.getState(state);
-          const activeThreadId = commentsPluginState?.activeThreadId;
-          if (activeThreadId && commentsPluginState?.trackedChanges?.[activeThreadId])
-            return commands$1.acceptTrackedChangeById(activeThreadId);
-          else
-            return commands$1.acceptTrackedChangeBySelection();
+        acceptTrackedChangeFromToolbar: () => ({ state, commands: commands$1, editor }) => {
+          return resolveTrackedChangeAction({
+            action: "accept",
+            state,
+            commands: commands$1,
+            editor,
+            ...getTrackedChangeResolutionContext({
+              state,
+              trackedChangeId: CommentsPluginKey.getState(state)?.activeThreadId
+            })
+          });
+        },
+        acceptTrackedChangeFromContextMenu: ({ from: from$12, to, trackedChangeId = null } = {}) => ({ state, commands: commands$1, editor }) => {
+          return resolveTrackedChangeAction({
+            action: "accept",
+            state,
+            commands: commands$1,
+            editor,
+            selection: Number.isFinite(from$12) && Number.isFinite(to) ? {
+              from: from$12,
+              to
+            } : null,
+            ...getTrackedChangeResolutionContext({
+              state,
+              trackedChangeId
+            })
+          });
         },
         acceptTrackedChangeById: (id2) => ({ state, tr, commands: commands$1 }) => {
           return (getChangesByIdToResolve(state, id2) || []).map(({ from: from$12, to }) => {
@@ -209964,13 +210080,33 @@ function print() { __p += __j.call(arguments, '') }
           const { from: from$12, to } = state.selection;
           return commands$1.rejectTrackedChangesBetween(from$12, to);
         },
-        rejectTrackedChangeFromToolbar: () => ({ state, commands: commands$1 }) => {
-          const commentsPluginState = CommentsPluginKey.getState(state);
-          const activeThreadId = commentsPluginState?.activeThreadId;
-          if (activeThreadId && commentsPluginState?.trackedChanges?.[activeThreadId])
-            return commands$1.rejectTrackedChangeById(activeThreadId);
-          else
-            return commands$1.rejectTrackedChangeOnSelection();
+        rejectTrackedChangeFromToolbar: () => ({ state, commands: commands$1, editor }) => {
+          return resolveTrackedChangeAction({
+            action: "reject",
+            state,
+            commands: commands$1,
+            editor,
+            ...getTrackedChangeResolutionContext({
+              state,
+              trackedChangeId: CommentsPluginKey.getState(state)?.activeThreadId
+            })
+          });
+        },
+        rejectTrackedChangeFromContextMenu: ({ from: from$12, to, trackedChangeId = null } = {}) => ({ state, commands: commands$1, editor }) => {
+          return resolveTrackedChangeAction({
+            action: "reject",
+            state,
+            commands: commands$1,
+            editor,
+            selection: Number.isFinite(from$12) && Number.isFinite(to) ? {
+              from: from$12,
+              to
+            } : null,
+            ...getTrackedChangeResolutionContext({
+              state,
+              trackedChangeId
+            })
+          });
         },
         rejectAllTrackedChanges: () => ({ state, commands: commands$1 }) => {
           const from$12 = 0, to = state.doc.content.size;
@@ -210127,6 +210263,11 @@ function print() { __p += __j.call(arguments, '') }
       return [TrackChangesBasePlugin()];
     }
   });
+  TRACKED_CHANGE_MARKS = [
+    TrackDeleteMarkName,
+    TrackInsertMarkName,
+    TrackFormatMarkName
+  ];
   TextTransform = Extension.create({
     name: "textTransform",
     addOptions() {
@@ -213482,8 +213623,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_C0LpayfV_es == "object" && exports_src_C0LpayfV_es && !exports_src_C0LpayfV_es.nodeType && exports_src_C0LpayfV_es;
-  freeModule$2 = freeExports$2 && typeof module_src_C0LpayfV_es == "object" && module_src_C0LpayfV_es && !module_src_C0LpayfV_es.nodeType && module_src_C0LpayfV_es;
+  freeExports$2 = typeof exports_src_BdKG1LCw_es == "object" && exports_src_BdKG1LCw_es && !exports_src_BdKG1LCw_es.nodeType && exports_src_BdKG1LCw_es;
+  freeModule$2 = freeExports$2 && typeof module_src_BdKG1LCw_es == "object" && module_src_BdKG1LCw_es && !module_src_BdKG1LCw_es.nodeType && module_src_BdKG1LCw_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -213491,8 +213632,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_C0LpayfV_es == "object" && exports_src_C0LpayfV_es && !exports_src_C0LpayfV_es.nodeType && exports_src_C0LpayfV_es;
-  freeModule$1 = freeExports$1 && typeof module_src_C0LpayfV_es == "object" && module_src_C0LpayfV_es && !module_src_C0LpayfV_es.nodeType && module_src_C0LpayfV_es;
+  freeExports$1 = typeof exports_src_BdKG1LCw_es == "object" && exports_src_BdKG1LCw_es && !exports_src_BdKG1LCw_es.nodeType && exports_src_BdKG1LCw_es;
+  freeModule$1 = freeExports$1 && typeof module_src_BdKG1LCw_es == "object" && module_src_BdKG1LCw_es && !module_src_BdKG1LCw_es.nodeType && module_src_BdKG1LCw_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -213597,8 +213738,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_C0LpayfV_es == "object" && exports_src_C0LpayfV_es && !exports_src_C0LpayfV_es.nodeType && exports_src_C0LpayfV_es;
-  freeModule = freeExports && typeof module_src_C0LpayfV_es == "object" && module_src_C0LpayfV_es && !module_src_C0LpayfV_es.nodeType && module_src_C0LpayfV_es;
+  freeExports = typeof exports_src_BdKG1LCw_es == "object" && exports_src_BdKG1LCw_es && !exports_src_BdKG1LCw_es.nodeType && exports_src_BdKG1LCw_es;
+  freeModule = freeExports && typeof module_src_BdKG1LCw_es == "object" && module_src_BdKG1LCw_es && !module_src_BdKG1LCw_es.nodeType && module_src_BdKG1LCw_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -221678,7 +221819,7 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_C0LpayfV_es();
+  init_src_BdKG1LCw_es();
   init_SuperConverter_CoCZX_fP_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.76",
+  "version": "0.2.0-next.77",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -21,8 +21,8 @@
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
+    "@superdoc/super-editor": "0.0.1",
     "superdoc": "1.17.0"
   },
   "module": "src/index.ts",
@@ -30,11 +30,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.76",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.76",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.76",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.76",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.76"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.77",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.77",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.77",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.77",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.77"
   },
   "scripts": {
     "dev": "bun run src/index.ts",