@ai-matrx/office 0.8.44 → 0.8.45

package/dist/univer-collab.d.cts

@@ -411,14 +411,18 @@ declare function undoStacksOf(service: unknown): {
 /**
  * §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).
+ * `stack` says which side of each item applies next: an undo-stack item's `undoMutations`, a redo-stack item's
+ * `redoMutations`. A stack applies top first, so each item's active side applies to the document as the items
+ * above it leave it: the top item meets the remote op as it is, and every item below meets it carried past the
+ * active sides of the items above (rebasing each item against the same op put a deeper item at offsets the items
+ * above had moved). The inactive side meets the op carried past its own active side; it is a fallback only: the
+ * room rewrites it from the real document whenever the item runs (`openDocsOtRoom`, walk 2 F1), because a tie at
+ * the edge of what the active side removes cannot say on which side of a collaborator's letters it belongs.
  */
 declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp, stack: "undo" | "redo"): number;
+/** Univer 1.0.4's undo and redo command ids (the outermost command of every mutation a history step runs). */
+declare const UNDO_COMMAND = "univer.command.undo";
+declare const REDO_COMMAND = "univer.command.redo";
 declare function openDocsOtRoom(o: OpenDocsOtRoomOptions): DocsOtRoom;
 
 interface CaretRange {
@@ -617,6 +621,11 @@ interface SheetsOtPort {
     busy(): boolean;
     /** Run `fn` once no local command is running (immediately when none is). */
     whenIdle(fn: () => void): void;
+    /**
+     * True when this remote op must wait (and so must every op after it) until `whenIdle`: the port's cell editor is
+     * open on a cell the op touches. The held ops apply when it closes, and the person's commit is rebased over them.
+     */
+    defers?(op: SheetMutation[]): boolean;
     /** Apply one committed mutation to this seat's workbook; throws when the editor refused it. */
     applyRemote(m: SheetMutation): void;
     /** The workbook as the editor holds it now (with resources), or null when none is mounted. */
@@ -637,11 +646,18 @@ interface SheetsOtPort {
     /** Ask for a save (the record's one coalesced save). */
     markDirty(): void;
 }
+/**
+ * `resynced`: this seat's workbook disagreed with the room's (a peer's quiet hash, a save's hash or an ack) and the
+ * reload that healed it changed what the person sees. One notice per heal; a heal that changed nothing says nothing.
+ */
 type SheetsOtNotice = OpSessionNotice<SheetOp> | {
     kind: "not_shared";
     mutationId: string;
 } | {
     kind: "not_live";
+} | {
+    kind: "resynced";
+    reason: string;
 };
 /**
  * The adapter's transform: the C5a/C5b group transform, with `lost` widened by what y can no longer apply
@@ -782,6 +798,10 @@ interface SheetsWorksheetLike {
     getMaxColumns?(): number;
     getCellRaw(row: number, col: number): Obj | null | undefined;
     getMergeData(): SheetRange[];
+    /** Univer's `Worksheet.getCellMatrix()` (every stored cell). */
+    getCellMatrix?(): {
+        forValue(fn: (row: number, col: number, cell: Obj | null | undefined) => unknown): void;
+    };
 }
 interface SheetsWorkbookLike {
     getUnitId(): string;
@@ -821,10 +841,51 @@ interface UniverSheetsOtPortOptions {
      * time on this seat. Without it a seat with a filter diverges from its peers on that write.
      */
     filterRange?(unitId: string, subUnitId: string): SheetRange | null | undefined;
+    /**
+     * The cell this seat's cell editor is open on, or null when it is closed (`IEditorBridgeService`:
+     * `isVisible().visible` and `getEditLocation()`). Univer rewrites an open editor's text whenever any write lands on
+     * its cell (`EditorDataSyncController` → `refreshEditCellState` → the editor's `ReplaceSnapshotCommand`, caret back
+     * to 0), so a peer's value landing mid-typing spliced into the draft and Enter committed the mix (the attack's
+     * "$1,234.50" vs "$7" → 507). While the editor is open, a remote op that touches its cell or its sheet is held,
+     * and so is everything after it: the person's draft and the cell it is committed against stay as they saw them,
+     * and their commit is rebased over the held ops when the editor closes (the later commit wins whole).
+     */
+    cellEditor?(): EditedCell | null;
     /** Replace the workbook's whole content, keeping its unit id. */
     load(snapshot: unknown): void;
     markDirty(): void;
 }
+/** The cell an open cell editor is on. */
+interface EditedCell {
+    sheetId: string;
+    row: number;
+    col: number;
+}
+/** What the port reads of Univer's `SheetsFilterService` (sheets-filter). */
+interface FilterServiceLike {
+    getFilterModel(unitId: string, subUnitId: string): {
+        getRange(): SheetRange | null | undefined;
+    } | null | undefined;
+}
+/**
+ * The port's `filterRange` over Univer's filter service: the range as the filter stores it, `rangeType` included.
+ * Every host lends this one (the editor, the fold, the fuzz seats): a host that dropped `rangeType` restored a peer's
+ * growth without it, and that seat's filter saved differently from the others (hash_mismatch, live attack rev 90).
+ */
+declare function filterServiceRange(service: () => FilterServiceLike | null | undefined): (unitId: string, subUnitId: string) => SheetRange | null;
+/** What the port reads of Univer's `IEditorBridgeService` (sheets-ui). */
+interface EditorBridgeLike {
+    isVisible(): {
+        visible: boolean;
+    };
+    getEditLocation(): {
+        sheetId: string;
+        row: number;
+        column: number;
+    } | null | undefined;
+}
+/** The port's `cellEditor` over Univer's editor bridge: the cell the cell editor is open on, or null. */
+declare function editorBridgeCell(bridge: EditorBridgeLike): () => EditedCell | null;
 /** One selection as `SheetsSelectionsService` holds it (range, primary cell, style). */
 interface SheetSelection {
     range: SheetRange & {
@@ -933,4 +994,4 @@ declare function startWorkbookOtRoom(port: SheetsOtPort & {
     dispose?: () => void;
 }, o: WorkbookOtRoomOptions): Promise<WorkbookOtRoomHandle>;
 
-export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type DocumentRestoreDeps, type DocumentRestoreResult, type OpenDocsOtRoomOptions, type OpenSheetsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, SHEETS_COLLAB_PROTO, SHEETS_EDIT_GROUP, SHEETS_READABLE_PROTOS, SHEET_ROOM_EDITOR_PRESETS, SHEET_ROOM_PLUGIN_PACKAGES, type SheetOp, type SheetSelection, type SheetsCommandService, type SheetsLocalEvent, type SheetsLocalGroup, type SheetsNotShared, type SheetsOtAdapter, type SheetsOtAdapterHooks, type SheetsOtNotice, type SheetsOtPort, type SheetsOtRoom, type SheetsWorkbookLike, type SheetsWorksheetLike, type UniverSheetsOtPortOptions, WorkbookCollabSession, type WorkbookCollabSessionOptions, type WorkbookOtRoomHandle, type WorkbookOtRoomOptions, type WorkbookOtRoomsKnob, applyDocsOp, asLoadedDocsSnapshot, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, canonicalSheet, canonicalSheetString, composeDocsOps, createSheetsOtAdapter, decodeSheetOp, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, encodeSheetOp, invertDocsOp, isCellEditorScratch, isNoopDocsOp, moveSelectionsThrough, normalizeDocsOp, offlineTextOfGroups, openDocsOtRoom, openSheetsOtRoom, rebaseSheetUndoStack, rebaseUndoStack, restoreDocumentSnapshot, sheetsStateHash, stampCovered, stampDeterministicIds, startWorkbookOtRoom, stripSenderView, takeCovered, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };
+export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type DocumentRestoreDeps, type DocumentRestoreResult, type EditedCell, type EditorBridgeLike, type FilterServiceLike, type OpenDocsOtRoomOptions, type OpenSheetsOtRoomOptions, type OtRoomsKnob, REDO_COMMAND, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, SHEETS_COLLAB_PROTO, SHEETS_EDIT_GROUP, SHEETS_READABLE_PROTOS, SHEET_ROOM_EDITOR_PRESETS, SHEET_ROOM_PLUGIN_PACKAGES, type SheetOp, type SheetSelection, type SheetsCommandService, type SheetsLocalEvent, type SheetsLocalGroup, type SheetsNotShared, type SheetsOtAdapter, type SheetsOtAdapterHooks, type SheetsOtNotice, type SheetsOtPort, type SheetsOtRoom, type SheetsWorkbookLike, type SheetsWorksheetLike, UNDO_COMMAND, type UniverSheetsOtPortOptions, WorkbookCollabSession, type WorkbookCollabSessionOptions, type WorkbookOtRoomHandle, type WorkbookOtRoomOptions, type WorkbookOtRoomsKnob, applyDocsOp, asLoadedDocsSnapshot, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, canonicalSheet, canonicalSheetString, composeDocsOps, createSheetsOtAdapter, decodeSheetOp, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, editorBridgeCell, encodeSheetOp, filterServiceRange, invertDocsOp, isCellEditorScratch, isNoopDocsOp, moveSelectionsThrough, normalizeDocsOp, offlineTextOfGroups, openDocsOtRoom, openSheetsOtRoom, rebaseSheetUndoStack, rebaseUndoStack, restoreDocumentSnapshot, sheetsStateHash, stampCovered, stampDeterministicIds, startWorkbookOtRoom, stripSenderView, takeCovered, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };

package/dist/univer-collab.d.ts

@@ -411,14 +411,18 @@ declare function undoStacksOf(service: unknown): {
 /**
  * §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).
+ * `stack` says which side of each item applies next: an undo-stack item's `undoMutations`, a redo-stack item's
+ * `redoMutations`. A stack applies top first, so each item's active side applies to the document as the items
+ * above it leave it: the top item meets the remote op as it is, and every item below meets it carried past the
+ * active sides of the items above (rebasing each item against the same op put a deeper item at offsets the items
+ * above had moved). The inactive side meets the op carried past its own active side; it is a fallback only: the
+ * room rewrites it from the real document whenever the item runs (`openDocsOtRoom`, walk 2 F1), because a tie at
+ * the edge of what the active side removes cannot say on which side of a collaborator's letters it belongs.
  */
 declare function rebaseUndoStack(items: UndoItem$1[], remote: DocsOp, stack: "undo" | "redo"): number;
+/** Univer 1.0.4's undo and redo command ids (the outermost command of every mutation a history step runs). */
+declare const UNDO_COMMAND = "univer.command.undo";
+declare const REDO_COMMAND = "univer.command.redo";
 declare function openDocsOtRoom(o: OpenDocsOtRoomOptions): DocsOtRoom;
 
 interface CaretRange {
@@ -617,6 +621,11 @@ interface SheetsOtPort {
     busy(): boolean;
     /** Run `fn` once no local command is running (immediately when none is). */
     whenIdle(fn: () => void): void;
+    /**
+     * True when this remote op must wait (and so must every op after it) until `whenIdle`: the port's cell editor is
+     * open on a cell the op touches. The held ops apply when it closes, and the person's commit is rebased over them.
+     */
+    defers?(op: SheetMutation[]): boolean;
     /** Apply one committed mutation to this seat's workbook; throws when the editor refused it. */
     applyRemote(m: SheetMutation): void;
     /** The workbook as the editor holds it now (with resources), or null when none is mounted. */
@@ -637,11 +646,18 @@ interface SheetsOtPort {
     /** Ask for a save (the record's one coalesced save). */
     markDirty(): void;
 }
+/**
+ * `resynced`: this seat's workbook disagreed with the room's (a peer's quiet hash, a save's hash or an ack) and the
+ * reload that healed it changed what the person sees. One notice per heal; a heal that changed nothing says nothing.
+ */
 type SheetsOtNotice = OpSessionNotice<SheetOp> | {
     kind: "not_shared";
     mutationId: string;
 } | {
     kind: "not_live";
+} | {
+    kind: "resynced";
+    reason: string;
 };
 /**
  * The adapter's transform: the C5a/C5b group transform, with `lost` widened by what y can no longer apply
@@ -782,6 +798,10 @@ interface SheetsWorksheetLike {
     getMaxColumns?(): number;
     getCellRaw(row: number, col: number): Obj | null | undefined;
     getMergeData(): SheetRange[];
+    /** Univer's `Worksheet.getCellMatrix()` (every stored cell). */
+    getCellMatrix?(): {
+        forValue(fn: (row: number, col: number, cell: Obj | null | undefined) => unknown): void;
+    };
 }
 interface SheetsWorkbookLike {
     getUnitId(): string;
@@ -821,10 +841,51 @@ interface UniverSheetsOtPortOptions {
      * time on this seat. Without it a seat with a filter diverges from its peers on that write.
      */
     filterRange?(unitId: string, subUnitId: string): SheetRange | null | undefined;
+    /**
+     * The cell this seat's cell editor is open on, or null when it is closed (`IEditorBridgeService`:
+     * `isVisible().visible` and `getEditLocation()`). Univer rewrites an open editor's text whenever any write lands on
+     * its cell (`EditorDataSyncController` → `refreshEditCellState` → the editor's `ReplaceSnapshotCommand`, caret back
+     * to 0), so a peer's value landing mid-typing spliced into the draft and Enter committed the mix (the attack's
+     * "$1,234.50" vs "$7" → 507). While the editor is open, a remote op that touches its cell or its sheet is held,
+     * and so is everything after it: the person's draft and the cell it is committed against stay as they saw them,
+     * and their commit is rebased over the held ops when the editor closes (the later commit wins whole).
+     */
+    cellEditor?(): EditedCell | null;
     /** Replace the workbook's whole content, keeping its unit id. */
     load(snapshot: unknown): void;
     markDirty(): void;
 }
+/** The cell an open cell editor is on. */
+interface EditedCell {
+    sheetId: string;
+    row: number;
+    col: number;
+}
+/** What the port reads of Univer's `SheetsFilterService` (sheets-filter). */
+interface FilterServiceLike {
+    getFilterModel(unitId: string, subUnitId: string): {
+        getRange(): SheetRange | null | undefined;
+    } | null | undefined;
+}
+/**
+ * The port's `filterRange` over Univer's filter service: the range as the filter stores it, `rangeType` included.
+ * Every host lends this one (the editor, the fold, the fuzz seats): a host that dropped `rangeType` restored a peer's
+ * growth without it, and that seat's filter saved differently from the others (hash_mismatch, live attack rev 90).
+ */
+declare function filterServiceRange(service: () => FilterServiceLike | null | undefined): (unitId: string, subUnitId: string) => SheetRange | null;
+/** What the port reads of Univer's `IEditorBridgeService` (sheets-ui). */
+interface EditorBridgeLike {
+    isVisible(): {
+        visible: boolean;
+    };
+    getEditLocation(): {
+        sheetId: string;
+        row: number;
+        column: number;
+    } | null | undefined;
+}
+/** The port's `cellEditor` over Univer's editor bridge: the cell the cell editor is open on, or null. */
+declare function editorBridgeCell(bridge: EditorBridgeLike): () => EditedCell | null;
 /** One selection as `SheetsSelectionsService` holds it (range, primary cell, style). */
 interface SheetSelection {
     range: SheetRange & {
@@ -933,4 +994,4 @@ declare function startWorkbookOtRoom(port: SheetsOtPort & {
     dispose?: () => void;
 }, o: WorkbookOtRoomOptions): Promise<WorkbookOtRoomHandle>;
 
-export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type DocumentRestoreDeps, type DocumentRestoreResult, type OpenDocsOtRoomOptions, type OpenSheetsOtRoomOptions, type OtRoomsKnob, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, SHEETS_COLLAB_PROTO, SHEETS_EDIT_GROUP, SHEETS_READABLE_PROTOS, SHEET_ROOM_EDITOR_PRESETS, SHEET_ROOM_PLUGIN_PACKAGES, type SheetOp, type SheetSelection, type SheetsCommandService, type SheetsLocalEvent, type SheetsLocalGroup, type SheetsNotShared, type SheetsOtAdapter, type SheetsOtAdapterHooks, type SheetsOtNotice, type SheetsOtPort, type SheetsOtRoom, type SheetsWorkbookLike, type SheetsWorksheetLike, type UniverSheetsOtPortOptions, WorkbookCollabSession, type WorkbookCollabSessionOptions, type WorkbookOtRoomHandle, type WorkbookOtRoomOptions, type WorkbookOtRoomsKnob, applyDocsOp, asLoadedDocsSnapshot, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, canonicalSheet, canonicalSheetString, composeDocsOps, createSheetsOtAdapter, decodeSheetOp, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, encodeSheetOp, invertDocsOp, isCellEditorScratch, isNoopDocsOp, moveSelectionsThrough, normalizeDocsOp, offlineTextOfGroups, openDocsOtRoom, openSheetsOtRoom, rebaseSheetUndoStack, rebaseUndoStack, restoreDocumentSnapshot, sheetsStateHash, stampCovered, stampDeterministicIds, startWorkbookOtRoom, stripSenderView, takeCovered, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };
+export { COLLAB_COVERED_KEY, type CollabBase, type CollabMutationInfo, type CollabProviderLike, type CommandServiceLike, DOCS_COLLAB_PROTO, DOCS_TRANSFORM_VERSION, DOC_LOCAL_KEYS, type DocsLocalMutation, type DocsLost, type DocsOp, type DocsOtNotice, type DocsOtPort, type DocsOtRoom, type DocsTransformResult, type DocumentOtFactoryOptions, type DocumentRestoreDeps, type DocumentRestoreResult, type EditedCell, type EditorBridgeLike, type FilterServiceLike, type OpenDocsOtRoomOptions, type OpenSheetsOtRoomOptions, type OtRoomsKnob, REDO_COMMAND, RICH_TEXT_EDITING, SENDER_VIEW_PARAMS, SHEETS_COLLAB_PROTO, SHEETS_EDIT_GROUP, SHEETS_READABLE_PROTOS, SHEET_ROOM_EDITOR_PRESETS, SHEET_ROOM_PLUGIN_PACKAGES, type SheetOp, type SheetSelection, type SheetsCommandService, type SheetsLocalEvent, type SheetsLocalGroup, type SheetsNotShared, type SheetsOtAdapter, type SheetsOtAdapterHooks, type SheetsOtNotice, type SheetsOtPort, type SheetsOtRoom, type SheetsWorkbookLike, type SheetsWorksheetLike, UNDO_COMMAND, type UniverSheetsOtPortOptions, WorkbookCollabSession, type WorkbookCollabSessionOptions, type WorkbookOtRoomHandle, type WorkbookOtRoomOptions, type WorkbookOtRoomsKnob, applyDocsOp, asLoadedDocsSnapshot, canonicalDocsSnapshot, canonicalDocsString, canonicalKeys, canonicalSheet, canonicalSheetString, composeDocsOps, createSheetsOtAdapter, decodeSheetOp, docsStateHash, documentOtFactory, documentUsesOrderedRoom, dropEmptyStyleRetains, editorBridgeCell, encodeSheetOp, filterServiceRange, invertDocsOp, isCellEditorScratch, isNoopDocsOp, moveSelectionsThrough, normalizeDocsOp, offlineTextOfGroups, openDocsOtRoom, openSheetsOtRoom, rebaseSheetUndoStack, rebaseUndoStack, restoreDocumentSnapshot, sheetsStateHash, stampCovered, stampDeterministicIds, startWorkbookOtRoom, stripSenderView, takeCovered, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };

package/dist/univer-collab.js

@@ -1165,26 +1165,77 @@ function rebaseUndoStack(items, remote, stack) {
   const first = stack === "undo" ? "undoMutations" : "redoMutations";
   const second = stack === "undo" ? "redoMutations" : "undoMutations";
   let dropped = 0;
-  for (let i = items.length - 1; i >= 0; i--) {
+  let R = remote;
+  for (let i = items.length - 1; i >= 0 && !isNoopDocsOp(R); i--) {
     const item = items[i];
     try {
-      const a = threadThrough(item[first], remote);
+      const a = threadThrough(item[first], R);
       const b = threadThrough(item[second], a.after);
       if (a.next) item[first] = a.next;
       if (b.next) item[second] = b.next;
+      R = a.after;
     } catch {
       items.splice(i, 1);
       dropped++;
+      R = carryPast(item[first], R);
     }
   }
   return dropped;
 }
+function carryPast(list, remote) {
+  let R = remote;
+  for (const m of list ?? []) {
+    if (m.id !== RICH_TEXT_EDITING || isNoopDocsOp(R)) continue;
+    const own = m.params.actions;
+    if (touchesPageSetup(own) && touchesPageSetup(R)) continue;
+    R = transformDocsOp(R, own, "right").op;
+  }
+  return R;
+}
+var UNDO_COMMAND = "univer.command.undo";
+var REDO_COMMAND = "univer.command.redo";
 function openDocsOtRoom(o) {
   const { port } = o;
   let session = null;
   let composing = false;
   let queue = [];
   const drainWaiters = [];
+  let replay = null;
+  const noteHistoryStep = (m, inverse) => {
+    const side = m.cmd === UNDO_COMMAND ? "undo" : m.cmd === REDO_COMMAND ? "redo" : null;
+    if (!side) {
+      replay = null;
+      return;
+    }
+    for (const t of port.undoTargets()) {
+      const stacks = undoStacksOf(t.service);
+      const stack = stacks ? (side === "undo" ? stacks.undo : stacks.redo).get(t.unitId) : void 0;
+      const item = stack?.[stack.length - 1];
+      const list = item ? side === "undo" ? item.undoMutations : item.redoMutations : void 0;
+      const k = list ? list.findIndex((x) => x.params === m.params) : -1;
+      if (!item || !list || k < 0) continue;
+      if (k === 0 || !replay || replay.item !== item || replay.side !== side) {
+        const other = (side === "undo" ? item.redoMutations : item.undoMutations)?.[0]?.params ?? {};
+        const { textRanges: _t, layoutState: _l, actions: _a, ...template } = other;
+        replay = { item, side, inverses: [], template };
+      }
+      if (inverse === void 0 || list.some((x) => x.id !== RICH_TEXT_EDITING)) {
+        replay = null;
+        return;
+      }
+      replay.inverses.unshift(inverse);
+      if (k === list.length - 1) {
+        const rewritten = replay.inverses.filter((op) => !isNoopDocsOp(op)).map((op) => ({ id: RICH_TEXT_EDITING, params: { ...replay.template, segmentId: m.params?.segmentId ?? "", actions: op } }));
+        if (rewritten.length) {
+          if (side === "undo") item.redoMutations = rewritten;
+          else item.undoMutations = rewritten;
+        }
+        replay = null;
+      }
+      return;
+    }
+    replay = null;
+  };
   const notice = (n) => {
     try {
       o.onNotice?.(n);
@@ -1282,7 +1333,10 @@ function openDocsOtRoom(o) {
     }
     const p = m.params ?? {};
     const applied = p.actions ?? null;
-    if (isNoopDocsOp(applied)) return;
+    if (isNoopDocsOp(applied)) {
+      noteHistoryStep(m, null);
+      return;
+    }
     let op = normalizeDocsOp(structuredClone(applied));
     let inverse;
     try {
@@ -1290,6 +1344,7 @@ function openDocsOtRoom(o) {
     } catch {
       inverse = void 0;
     }
+    noteHistoryStep(m, inverse === void 0 ? void 0 : normalizeDocsOp(inverse));
     if (queue.length) {
       inverse = void 0;
       const next = [];
@@ -2781,6 +2836,18 @@ function transformCell(X, Y4, side) {
       if (styleKeys(xs).length !== styleKeys(kept ?? {}).length) xLost = true;
     }
   }
+  if (hasContent(X) && hasContent(Y4)) {
+    const has = (s) => !!s && typeof s === "object" && "n" in s;
+    const outS = out.s;
+    if (side === "left" && !has(X.s) && has(Y4.s) && X.s !== null) {
+      out.s = { ...outS && typeof outS === "object" ? outS : {}, n: null };
+    } else if (side === "right" && outS && typeof outS === "object" && "n" in outS) {
+      const rest = withoutStyleKeys(outS, /* @__PURE__ */ new Set(["n"]));
+      if (rest) out.s = rest;
+      else delete out.s;
+      xLost = true;
+    }
+  }
   return { entries: Object.keys(out).length ? [out, ...tail] : tail, xLost, yLost };
 }
 function transformCellsOverCells(x, y, side) {
@@ -3941,7 +4008,7 @@ function createSheetsOtAdapter(port, hooks = {}) {
     decode: decodeSheetOp,
     apply(op) {
       if (isNoopSheetOp(op)) return true;
-      if (port.busy() || queue.length) {
+      if (port.busy() || queue.length || port.defers?.(op)) {
         queue.push(op);
         if (!draining) {
           draining = true;
@@ -3974,9 +4041,9 @@ function createSheetsOtAdapter(port, hooks = {}) {
     async hash() {
       if (port.busy() || queue.length) {
         await new Promise((resolve) => {
-          const done = setTimeout(resolve, 5e3);
+          const done = queue.length ? null : setTimeout(resolve, 5e3);
           port.whenIdle(() => {
-            clearTimeout(done);
+            if (done) clearTimeout(done);
             setTimeout(resolve, 0);
           });
         });
@@ -4006,7 +4073,6 @@ function createSheetsOtAdapter(port, hooks = {}) {
 function openSheetsOtRoom(o) {
   const { port } = o;
   let session = null;
-  const adapter = createSheetsOtAdapter(port);
   const notice = (n) => {
     try {
       o.onNotice?.(n);
@@ -4014,6 +4080,29 @@ function openSheetsOtRoom(o) {
       console.warn("[sheets-ot] notice handler failed", err);
     }
   };
+  const adapter = createSheetsOtAdapter(port);
+  let healing = null;
+  const HEALS = /* @__PURE__ */ new Set(["hash_mismatch", "save_hash_mismatch", "ack_mismatch"]);
+  const screen = () => {
+    try {
+      const s = port.snapshot();
+      return s ? canonicalSheetString(s) : null;
+    } catch {
+      return null;
+    }
+  };
+  const onIncident = (i) => {
+    if (HEALS.has(i.kind) && !healing) healing = { reason: i.kind, before: screen() };
+    o.onIncident?.(i);
+  };
+  const onStatus = (st) => {
+    if (st === "live" && healing) {
+      const h = healing;
+      healing = null;
+      if (h.before !== null && screen() !== h.before) notice({ kind: "resynced", reason: h.reason });
+    } else if (st === "read_only" || st === "closed") healing = null;
+    o.onStatus?.(st);
+  };
   const onLocal = (e) => {
     if (!session) return;
     if (e.kind === "not_shared") {
@@ -4054,8 +4143,8 @@ function openSheetsOtRoom(o) {
     clientId: o.clientId,
     ...o.presence ? { presence: o.presence } : {},
     onNotice: (n) => notice(n),
-    ...o.onIncident ? { onIncident: o.onIncident } : {},
-    ...o.onStatus ? { onStatus: o.onStatus } : {},
+    onIncident,
+    onStatus,
     ...o.offline ? { offline: o.offline } : {},
     ...o.onOffline ? { onOffline: o.onOffline } : {}
   });
@@ -4148,6 +4237,23 @@ function releaseUnitPluginState(cs, unitId, saved) {
 }
 
 // src/univer/collab/sheets-ot/univer-port.ts
+function filterServiceRange(service) {
+  return (unitId, subUnitId) => {
+    try {
+      const r = service()?.getFilterModel(unitId, subUnitId)?.getRange();
+      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn, ...r.rangeType !== void 0 ? { rangeType: r.rangeType } : {} } : null;
+    } catch {
+      return null;
+    }
+  };
+}
+function editorBridgeCell(bridge) {
+  return () => {
+    if (!bridge.isVisible()?.visible) return null;
+    const at = bridge.getEditLocation();
+    return at ? { sheetId: at.sheetId, row: at.row, col: at.column } : null;
+  };
+}
 var COMMAND = 0;
 var MUTATION = 2;
 var VALUES = "sheet.mutation.set-range-values";
@@ -4155,6 +4261,7 @@ var ADD_MERGE = "sheet.mutation.add-worksheet-merge";
 var REMOVE_MERGE = "sheet.mutation.remove-worksheet-merge";
 var SHEET_NAME = "sheet.mutation.set-worksheet-name";
 var INSERT_SHEET = "sheet.mutation.insert-sheet";
+var REMOVE_SHEET2 = "sheet.mutation.remove-sheet";
 var FILTER_RANGE = "sheet.mutation.set-filter-range";
 var RESHAPE = /* @__PURE__ */ new Set(["sheet.mutation.set-worksheet-row-count", "sheet.mutation.set-worksheet-column-count", "sheet.mutation.remove-sheet", INSERT_SHEET]);
 var UNDO = "univer.command.undo";
@@ -4174,6 +4281,18 @@ function univerSheetsOtPort(o) {
   const tracker = { stack: [], settle: () => settle() };
   let group = null;
   let applying = false;
+  let editorHold = false;
+  const edited = () => {
+    try {
+      return o.cellEditor?.() ?? null;
+    } catch {
+      return null;
+    }
+  };
+  const holding = () => {
+    if (editorHold && !edited()) editorHold = false;
+    return editorHold;
+  };
   const unitId = () => o.workbook()?.getUnitId() ?? null;
   const mine = (params) => {
     const u = unitId();
@@ -4202,7 +4321,7 @@ function univerSheetsOtPort(o) {
     if (!u || !o.filterRange) return null;
     try {
       const r = o.filterRange(u, sheet);
-      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn } : null;
+      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn, ...r.rangeType !== void 0 ? { rangeType: r.rangeType } : {} } : null;
     } catch {
       return null;
     }
@@ -4218,10 +4337,45 @@ function univerSheetsOtPort(o) {
       }
     }
   };
+  const sweepRemovedSheetRefs = (g) => {
+    const removed = g.mutations.filter((m) => m.id === REMOVE_SHEET2).map((m) => String(m.params.subUnitId ?? ""));
+    const wb = o.workbook();
+    const u = unitId();
+    if (!removed.length || !wb || !u) return;
+    const refSheets = {};
+    for (const [id, name] of Object.entries(g.sheets)) refSheets[name] = id;
+    for (const gone of removed) {
+      const name = g.sheets[gone];
+      if (!name) continue;
+      for (const ws of wb.getSheets()) {
+        const sheet = ws.getSheetId();
+        const cells = {};
+        ws.getCellMatrix?.().forValue((r, c, cell) => {
+          const f = cell?.f;
+          if (typeof f !== "string" || !f.includes(name)) return;
+          const out = rewriteFormula(f, { ownSheet: sheet, refSheets }, { kind: "remove-sheet", sheet: gone });
+          if (typeof out !== "string" && out.changed) (cells[r] ??= {})[c] = { f: out.text, si: null };
+        });
+        if (!Object.keys(cells).length) continue;
+        applying = true;
+        try {
+          cs.syncExecuteCommand(VALUES, { unitId: u, subUnitId: sheet, cellValue: json(cells) });
+        } finally {
+          applying = false;
+        }
+        const done = {};
+        for (const r of Object.keys(cells))
+          for (const c of Object.keys(cells[r])) (done[r] ??= {})[c] = completeCellContent(cells[r][c], json(ws.getCellRaw(Number(r), Number(c)) ?? null));
+        g.mutations.push({ id: VALUES, params: { subUnitId: sheet, cellValue: done } });
+        g.inverses.push(void 0);
+      }
+    }
+  };
   const flush = () => {
     const g = group;
     group = null;
     if (!g) return;
+    if (!g.notShared) sweepRemovedSheetRefs(g);
     if (g.notShared) emit({ kind: "not_shared", mutationId: g.notShared, label: g.label });
     else if (g.mutations.length) {
       const mutations = annotateSheetOps(annotateFormulas(g.mutations, g.sheets, g.names), g.order);
@@ -4233,7 +4387,7 @@ function univerSheetsOtPort(o) {
   };
   function settle() {
     if (tracker.stack.length === 0) flush();
-    if (tracker.stack.length === 0 && !group) for (const fn of idle.splice(0)) fn();
+    if (tracker.stack.length === 0 && !group && !holding()) for (const fn of idle.splice(0)) fn();
   }
   const before = cs.beforeCommandExecuted((info, options) => {
     if (info.id === UNDO || info.id === REDO) for (const fn of [...undoWatchers]) fn();
@@ -4247,6 +4401,7 @@ function univerSheetsOtPort(o) {
     const ws = o.workbook()?.getSheetBySheetId(String(p.subUnitId ?? ""));
     if (!ws) return;
     const record = { merges: json(ws.getMergeData() ?? []) };
+    if (!group) record.lone = openGroup(null);
     if (info.id === VALUES) {
       record.cells = /* @__PURE__ */ new Map();
       const cells = p.cellValue ?? {};
@@ -4283,6 +4438,7 @@ function univerSheetsOtPort(o) {
     }
   };
   const after = cs.onCommandExecuted((info) => {
+    if (editorHold && tracker.stack.length === 0 && !group && !edited()) settle();
     if (info.type !== COMMAND) return;
     const at = tracker.stack.lastIndexOf(info.id);
     if (at >= 0) tracker.stack.splice(at, 1);
@@ -4364,7 +4520,7 @@ function univerSheetsOtPort(o) {
           else {
             inv = {};
             if (CONTENT_KEYS.some((k) => k !== "t" && k in done)) Object.assign(inv, fullContent(p));
-            if ("s" in done) inv.s = p?.s ?? null;
+            if ("s" in done) inv.s = inverseStyle(p?.s, done.s);
           }
           (invCells[r] ??= {})[c] = inv;
         }
@@ -4402,7 +4558,7 @@ function univerSheetsOtPort(o) {
   };
   const collab = cs.onMutationExecutedForCollab((info, options) => {
     if (applying || flagged(options) || !mine(info.params)) return;
-    if (!group) group = openGroup(null);
+    if (!group) group = pre.get(info.params)?.lone ?? openGroup(null);
     const g = group;
     if (!g.notShared) {
       const r = capture(info);
@@ -4483,11 +4639,18 @@ function univerSheetsOtPort(o) {
       listeners.add(listener);
       return () => void listeners.delete(listener);
     },
-    busy: () => tracker.stack.length > 0 || group !== null,
+    busy: () => tracker.stack.length > 0 || group !== null || holding(),
+    defers(op) {
+      if (holding()) return true;
+      const at = edited();
+      if (!at || !op.some((m) => touchesEditedCell(m, at))) return false;
+      editorHold = true;
+      return true;
+    },
     /** The outermost commands still running here (why the port is busy), for logs. */
     running: () => [...tracker.stack, ...group && tracker.stack.length === 0 ? ["(group)"] : []],
     whenIdle(fn) {
-      if (tracker.stack.length === 0 && !group) fn();
+      if (tracker.stack.length === 0 && !group && !holding()) fn();
       else idle.push(fn);
     },
     applyRemote(m) {
@@ -4547,6 +4710,20 @@ function univerSheetsOtPort(o) {
     }
   };
 }
+function inverseStyle(prev, wrote) {
+  if (!prev || typeof prev !== "object") return null;
+  if (!wrote || typeof wrote !== "object") return prev;
+  const out = { ...prev };
+  for (const k of Object.keys(wrote)) if (!(k in out)) out[k] = null;
+  return out;
+}
+function touchesEditedCell(m, at) {
+  const sheet = String(m.params.subUnitId ?? "");
+  if (sheet !== at.sheetId) return false;
+  if (m.id !== VALUES) return true;
+  const row = m.params.cellValue?.[at.row];
+  return !!row && Object.prototype.hasOwnProperty.call(row, at.col);
+}
 function fullContent(cell) {
   const out = {};
   for (const k of CONTENT_KEYS) out[k] = cell && cell[k] !== void 0 ? cell[k] : null;
@@ -4857,6 +5034,7 @@ export {
   DOCS_COLLAB_PROTO,
   DOCS_TRANSFORM_VERSION,
   DOC_LOCAL_KEYS,
+  REDO_COMMAND,
   RICH_TEXT_EDITING,
   SENDER_VIEW_PARAMS,
   SHEETS_COLLAB_PROTO,
@@ -4864,6 +5042,7 @@ export {
   SHEETS_READABLE_PROTOS,
   SHEET_ROOM_EDITOR_PRESETS,
   SHEET_ROOM_PLUGIN_PACKAGES,
+  UNDO_COMMAND,
   WorkbookCollabSession,
   applyDocsOp,
   asLoadedDocsSnapshot,
@@ -4879,7 +5058,9 @@ export {
   documentOtFactory,
   documentUsesOrderedRoom,
   dropEmptyStyleRetains,
+  editorBridgeCell,
   encodeSheetOp,
+  filterServiceRange,
   invertDocsOp,
   isCellEditorScratch,
   isNoopDocsOp,