@ai-matrx/office 0.8.37 → 0.8.39

package/dist/univer-collab.d.cts

@@ -290,9 +290,12 @@ declare function stampDeterministicIds<T>(snapshot: T): T;
  *   never skips. While an IME composition is open, remote applies QUEUE (acks continue); a local op captured
  *   meanwhile is rebased over the queue (`L' = T(L, Q, 'left')`, `Q' = T(Q, L, 'right')`), and the queue drains
  *   at `compositionend`.
- * - UNDO (§6.9). Each applied remote op rebases every stored undo and redo item of this seat
- *   (`T(item, R1, 'left')`); `textRanges` and `layoutState` are stripped from rebased items; an item whose rebase
- *   is a barrier, throws or comes back empty is dropped. Undo therefore only ever reverts this person's changes.
+ * - UNDO (§6.9). Each applied remote op rebases every stored undo and redo item of this seat. The side of an item
+ *   that applies now (an undo item's undo list, a redo item's redo list) meets R as it is, each mutation in turn
+ *   with R carried past it; the other side meets R carried past the first (`rebaseUndoStack`). The typing burst
+ *   Univer still holds outside the stack is pushed onto it first. `textRanges` and `layoutState` are stripped
+ *   from rebased items; an item whose rebase is a barrier, throws or comes back empty is dropped. Undo therefore
+ *   only ever reverts this person's changes.
  * - SAVES (§7.3). Only a quiet seat whose hash matches every peer at its rev saves, and only the chosen saver
  *   (the lowest client id among seats publishing a quiet hash) saves on its own; a manual save always tries.
  * - RESTORE (§20). A whole-document replace goes through `collab_replace`: the snapshot is loaded into this seat's
@@ -325,10 +328,14 @@ interface DocsOtPort {
     snapshot(): unknown | null;
     /** Replace the document in every view (and the kept editor). */
     load(snapshot: unknown): void;
-    /** Univer's undo/redo service of each mounted view and the unit it holds. */
+    /**
+     * Univer's undo/redo service of each mounted view and the unit it holds. `flushHistory` pushes the typing burst
+     * Univer still holds outside the stack (its 300 ms history debounce) onto the stack, so a rebase reaches it.
+     */
     undoTargets(): Array<{
         service: unknown;
         unitId: string;
+        flushHistory?: () => void;
     }>;
     /** Ask for a save (the record's one coalesced save). */
     markDirty(): void;
@@ -401,8 +408,17 @@ declare function undoStacksOf(service: unknown): {
     undo: Map<string, UndoItem$1[]>;
     redo: Map<string, UndoItem$1[]>;
 } | null;
-/** §6.9: rebase one stack over a remote op; items that cannot follow are dropped. Returns how many were dropped. */
-declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp): number;
+/**
+ * §6.9: rebase one stack over a remote op; items that cannot follow are dropped. Returns how many were dropped.
+ *
+ * `stack` says which side of each item applies to the document as it is NOW: an undo-stack item's
+ * `undoMutations` (its `redoMutations` apply after them), a redo-stack item's `redoMutations` (its
+ * `undoMutations` apply after them). The side that applies now meets the remote op as it is; the other side meets
+ * the remote op carried past the first. Rebasing both sides against the same op (as before) left the inactive
+ * side in coordinates of a document it never applies to: after undo → peer types → redo → undo, the second undo
+ * deleted the peer's letters instead of the redone ones (F1).
+ */
+declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp, stack: "undo" | "redo"): number;
 declare function openDocsOtRoom(o: OpenDocsOtRoomOptions): DocsOtRoom;
 
 interface CaretRange {

package/dist/univer-collab.d.ts

@@ -290,9 +290,12 @@ declare function stampDeterministicIds<T>(snapshot: T): T;
  *   never skips. While an IME composition is open, remote applies QUEUE (acks continue); a local op captured
  *   meanwhile is rebased over the queue (`L' = T(L, Q, 'left')`, `Q' = T(Q, L, 'right')`), and the queue drains
  *   at `compositionend`.
- * - UNDO (§6.9). Each applied remote op rebases every stored undo and redo item of this seat
- *   (`T(item, R1, 'left')`); `textRanges` and `layoutState` are stripped from rebased items; an item whose rebase
- *   is a barrier, throws or comes back empty is dropped. Undo therefore only ever reverts this person's changes.
+ * - UNDO (§6.9). Each applied remote op rebases every stored undo and redo item of this seat. The side of an item
+ *   that applies now (an undo item's undo list, a redo item's redo list) meets R as it is, each mutation in turn
+ *   with R carried past it; the other side meets R carried past the first (`rebaseUndoStack`). The typing burst
+ *   Univer still holds outside the stack is pushed onto it first. `textRanges` and `layoutState` are stripped
+ *   from rebased items; an item whose rebase is a barrier, throws or comes back empty is dropped. Undo therefore
+ *   only ever reverts this person's changes.
  * - SAVES (§7.3). Only a quiet seat whose hash matches every peer at its rev saves, and only the chosen saver
  *   (the lowest client id among seats publishing a quiet hash) saves on its own; a manual save always tries.
  * - RESTORE (§20). A whole-document replace goes through `collab_replace`: the snapshot is loaded into this seat's
@@ -325,10 +328,14 @@ interface DocsOtPort {
     snapshot(): unknown | null;
     /** Replace the document in every view (and the kept editor). */
     load(snapshot: unknown): void;
-    /** Univer's undo/redo service of each mounted view and the unit it holds. */
+    /**
+     * Univer's undo/redo service of each mounted view and the unit it holds. `flushHistory` pushes the typing burst
+     * Univer still holds outside the stack (its 300 ms history debounce) onto the stack, so a rebase reaches it.
+     */
     undoTargets(): Array<{
         service: unknown;
         unitId: string;
+        flushHistory?: () => void;
     }>;
     /** Ask for a save (the record's one coalesced save). */
     markDirty(): void;
@@ -401,8 +408,17 @@ declare function undoStacksOf(service: unknown): {
     undo: Map<string, UndoItem$1[]>;
     redo: Map<string, UndoItem$1[]>;
 } | null;
-/** §6.9: rebase one stack over a remote op; items that cannot follow are dropped. Returns how many were dropped. */
-declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp): number;
+/**
+ * §6.9: rebase one stack over a remote op; items that cannot follow are dropped. Returns how many were dropped.
+ *
+ * `stack` says which side of each item applies to the document as it is NOW: an undo-stack item's
+ * `undoMutations` (its `redoMutations` apply after them), a redo-stack item's `redoMutations` (its
+ * `undoMutations` apply after them). The side that applies now meets the remote op as it is; the other side meets
+ * the remote op carried past the first. Rebasing both sides against the same op (as before) left the inactive
+ * side in coordinates of a document it never applies to: after undo → peer types → redo → undo, the second undo
+ * deleted the peer's letters instead of the redone ones (F1).
+ */
+declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp, stack: "undo" | "redo"): number;
 declare function openDocsOtRoom(o: OpenDocsOtRoomOptions): DocsOtRoom;
 
 interface CaretRange {

package/dist/univer-collab.js

@@ -1089,7 +1089,7 @@ import { isOpBarrier, openOpSession } from "@ai-matrx/data/realtime/collab";
 // src/docs/comment-anchors.ts
 import { BuildTextUtils, CustomRangeType, JSONX as JSONX2 } from "@univerjs/core";
 var COMMENT_ANCHOR_RANGE_TYPE = CustomRangeType.COMMENT;
-var RETAIN_KEYS = /* @__PURE__ */ new Set(["t", "len", "body", "coverType"]);
+var RETAIN_KEYS = /* @__PURE__ */ new Set(["t", "len", "body", "coverType", "oldBody"]);
 var RANGE_KEYS = /* @__PURE__ */ new Set(["rangeId", "rangeType", "startIndex", "endIndex", "properties"]);
 var isObj = (v) => !!v && typeof v === "object" && !Array.isArray(v);
 var keysOf = (o) => Object.keys(o).filter((k) => o[k] !== void 0);
@@ -1141,29 +1141,38 @@ function undoStacksOf(service) {
   if (!s || !(s._undoStacks instanceof Map) || !(s._redoStacks instanceof Map)) return null;
   return { undo: s._undoStacks, redo: s._redoStacks };
 }
-function rebaseUndoStack(items, remote) {
+function threadThrough(list, remote) {
+  if (!list?.length || isNoopDocsOp(remote)) return { next: null, after: remote };
+  let R = remote;
+  let changed = false;
+  const next = list.map((m) => {
+    if (m.id !== RICH_TEXT_EDITING || isNoopDocsOp(R)) return m;
+    const own = m.params.actions;
+    if (touchesPageSetup(own) && touchesPageSetup(R)) throw new Error("page setup");
+    const x = transformDocsOp(own, R, "left");
+    if (isNoopDocsOp(x.op)) throw new Error("emptied");
+    R = transformDocsOp(R, own, "right").op;
+    changed = true;
+    const params = { ...m.params, actions: x.op };
+    delete params.textRanges;
+    delete params.layoutState;
+    return { ...m, params };
+  });
+  return { next: changed ? next : null, after: R };
+}
+function rebaseUndoStack(items, remote, stack) {
+  if (isNoopDocsOp(remote)) return 0;
+  const first = stack === "undo" ? "undoMutations" : "redoMutations";
+  const second = stack === "undo" ? "redoMutations" : "undoMutations";
   let dropped = 0;
   for (let i = items.length - 1; i >= 0; i--) {
     const item = items[i];
-    let ok3 = true;
-    for (const list of [item.undoMutations, item.redoMutations]) {
-      for (const m of list ?? []) {
-        if (m.id !== RICH_TEXT_EDITING) continue;
-        try {
-          if (touchesPageSetup(m.params.actions) && touchesPageSetup(remote)) throw new Error("page setup");
-          const r = transformDocsOp(m.params.actions, remote, "left");
-          if (isNoopDocsOp(r.op)) ok3 = false;
-          else {
-            m.params = { ...m.params, actions: r.op };
-            delete m.params.textRanges;
-            delete m.params.layoutState;
-          }
-        } catch {
-          ok3 = false;
-        }
-      }
-    }
-    if (!ok3) {
+    try {
+      const a = threadThrough(item[first], remote);
+      const b = threadThrough(item[second], a.after);
+      if (a.next) item[first] = a.next;
+      if (b.next) item[second] = b.next;
+    } catch {
       items.splice(i, 1);
       dropped++;
     }
@@ -1184,6 +1193,7 @@ function openDocsOtRoom(o) {
     }
   };
   const applyNow = (op) => {
+    for (const t of port.undoTargets()) t.flushHistory?.();
     for (const b of branches(op)) {
       const params = { segmentId: segmentOf(b), actions: b };
       port.applyRemote(RICH_TEXT_EDITING, params);
@@ -1191,10 +1201,10 @@ function openDocsOtRoom(o) {
     for (const t of port.undoTargets()) {
       const stacks = undoStacksOf(t.service);
       if (!stacks) continue;
-      for (const m of [stacks.undo, stacks.redo]) {
-        const items = m.get(t.unitId);
-        if (items?.length) rebaseUndoStack(items, op);
-      }
+      const undo = stacks.undo.get(t.unitId);
+      if (undo?.length) rebaseUndoStack(undo, op, "undo");
+      const redo = stacks.redo.get(t.unitId);
+      if (redo?.length) rebaseUndoStack(redo, op, "redo");
     }
     port.markDirty();
   };
@@ -1824,13 +1834,10 @@ var SHEET_MUTATIONS = {
   "data-validation.mutation.updateRule": covered("dv", "ruleId", "payload", "source", "derived"),
   "data-validation.mutation.removeRule": covered("dv", "ruleId", "source", "derived"),
   "sheet.mutation.set-filter-range": covered("filter", "range", "derived"),
-  // C5f: Univer's cell notes. Their transform is built (comment-anchor-transform.ts `transformCellNote`, pairwise and
-  // chained fuzz green) but the session fuzz still diverges on note cells (seed 1015, 6 seats: a note at column 5 on
-  // one seat, 8 on another), so they stay barriers until that seed is green. Covered form, for the next lane:
-  //   covered("note", "sheetId", "row", "col", "note" | "noteId", "newPosition", "silent", "derived")
-  "sheet.mutation.update-note": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
-  "sheet.mutation.remove-note": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
-  "sheet.mutation.update-note-position": barrier("C5c", "cell note: the session fuzz diverges on note cells (seed 1015)"),
+  // C5f/C5g: Univer's cell notes, keyed by note id, anchored to one cell (their transform: comment-anchor-transform.ts)
+  "sheet.mutation.update-note": covered("note", "sheetId", "row", "col", "note", "silent", "derived"),
+  "sheet.mutation.remove-note": covered("note", "sheetId", "noteId", "row", "col", "silent", "derived"),
+  "sheet.mutation.update-note-position": covered("note", "sheetId", "noteId", "row", "col", "newPosition", "silent", "derived"),
   "sheet.mutation.set-filter-criteria": covered("filter", "col", "criteria", "reCalc", "derived"),
   "sheet.mutation.remove-filter": covered("filter", "derived"),
   "sheet.mutation.add-table": barrier("C5c", RESOURCE),