@ai-matrx/office 0.8.45 → 0.8.46

package/dist/univer-collab.d.cts

@@ -617,13 +617,14 @@ type SheetsLocalEvent = SheetsLocalGroup | SheetsNotShared;
 /** What the workbook editor lends the room (implemented by `univerSheetsOtPort`). */
 interface SheetsOtPort {
     onLocal(listener: (e: SheetsLocalEvent) => void): () => void;
-    /** True while a local command is still running (its group is not handed over yet). */
+    /** True while a local command is still running (its group is not handed over yet). Every remote op waits. */
     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.
+     * True when this remote op must wait until `whenIdle`: the port's cell editor is open on a cell the op writes, or
+     * the op moves or removes that cell. A later op waits behind a held one only when the two do not commute; every
+     * other op applies live. The held ops apply when the editor 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. */
@@ -704,6 +705,8 @@ interface SheetsOtAdapterHooks {
     onUndoRebased?: (dropped: number) => void;
     /** Called with the milliseconds of undo bookkeeping each remote op (and each catch-up) cost (tests, logs). */
     onUndoWork?: (ms: number, kind: "remote" | "catch_up") => void;
+    /** The session's rev right now (the rev of the op being applied): a held op remembers it for `overrode`. */
+    rev?: () => number;
     /**
      * The state hash of a snapshot (default `sheetsStateHash`, Web Crypto). A seeded test passes a synchronous one:
      * Web Crypto resolves on a worker thread, outside a virtual clock, so the same seed would not replay.
@@ -714,8 +717,17 @@ interface SheetsOtAdapterHooks {
 interface SheetsOtAdapter extends OpDocumentAdapter<SheetOp> {
     /** Remote ops held while a local command runs. */
     held(): number;
-    /** A local group finished while remote ops were held: rebase it over them and them over it (Docs IME rule). */
-    rebaseLocalOverHeld(local: SheetMutation[]): SheetMutation[] | "barrier";
+    /**
+     * A local group finished while remote ops were held: rebase it over them and them over it (Docs IME rule).
+     * `overrode` names what it overrode of each held op (by the rev it was committed at), for that op's author.
+     */
+    rebaseLocalOverHeld(local: SheetMutation[]): {
+        op: SheetMutation[];
+        overrode: Array<{
+            rev: number;
+            lost: string[];
+        }>;
+    } | "barrier";
     clearHeld(): void;
 }
 declare function createSheetsOtAdapter(port: SheetsOtPort, hooks?: SheetsOtAdapterHooks): SheetsOtAdapter;
@@ -846,9 +858,10 @@ interface UniverSheetsOtPortOptions {
      * `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).
+     * "$1,234.50" vs "$7" → 507). While the editor is open, a remote op whose ranges cover its cell, or that moves or
+     * removes it (a row/column insert, remove or move, a sheet removal, a shrink), is held: 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). Everything else applies live, so the person still sees the others work.
      */
     cellEditor?(): EditedCell | null;
     /** Replace the workbook's whole content, keeping its unit id. */
@@ -905,6 +918,13 @@ declare function univerSheetsOtPort(o: UniverSheetsOtPortOptions): SheetsOtPort
     dispose(): void;
     running(): string[];
 };
+/**
+ * Whether a remote mutation must wait for the open cell editor: it writes the editor's cell (a value, a style, a
+ * merge, a format, a rule or a sort whose ranges cover it), or it moves or removes that cell (a row/column insert,
+ * remove or move before it, its sheet's removal, a row or column count below it). A mutation with no range on that
+ * sheet (a rename, a sheet order, a filter's criteria) never touches the cell. Anything this cannot read waits.
+ */
+declare function touchesEditedCell(m: SheetMutation, at: EditedCell): boolean;
 /**
  * This seat's selections after a remote structural op: indices move with their rows/columns; one the op removed
  * lands on the first surviving index; everything is clamped to the sheet; whole-row/column ranges span the sheet.
@@ -994,4 +1014,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 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 };
+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, touchesEditedCell, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };

package/dist/univer-collab.d.ts

@@ -617,13 +617,14 @@ type SheetsLocalEvent = SheetsLocalGroup | SheetsNotShared;
 /** What the workbook editor lends the room (implemented by `univerSheetsOtPort`). */
 interface SheetsOtPort {
     onLocal(listener: (e: SheetsLocalEvent) => void): () => void;
-    /** True while a local command is still running (its group is not handed over yet). */
+    /** True while a local command is still running (its group is not handed over yet). Every remote op waits. */
     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.
+     * True when this remote op must wait until `whenIdle`: the port's cell editor is open on a cell the op writes, or
+     * the op moves or removes that cell. A later op waits behind a held one only when the two do not commute; every
+     * other op applies live. The held ops apply when the editor 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. */
@@ -704,6 +705,8 @@ interface SheetsOtAdapterHooks {
     onUndoRebased?: (dropped: number) => void;
     /** Called with the milliseconds of undo bookkeeping each remote op (and each catch-up) cost (tests, logs). */
     onUndoWork?: (ms: number, kind: "remote" | "catch_up") => void;
+    /** The session's rev right now (the rev of the op being applied): a held op remembers it for `overrode`. */
+    rev?: () => number;
     /**
      * The state hash of a snapshot (default `sheetsStateHash`, Web Crypto). A seeded test passes a synchronous one:
      * Web Crypto resolves on a worker thread, outside a virtual clock, so the same seed would not replay.
@@ -714,8 +717,17 @@ interface SheetsOtAdapterHooks {
 interface SheetsOtAdapter extends OpDocumentAdapter<SheetOp> {
     /** Remote ops held while a local command runs. */
     held(): number;
-    /** A local group finished while remote ops were held: rebase it over them and them over it (Docs IME rule). */
-    rebaseLocalOverHeld(local: SheetMutation[]): SheetMutation[] | "barrier";
+    /**
+     * A local group finished while remote ops were held: rebase it over them and them over it (Docs IME rule).
+     * `overrode` names what it overrode of each held op (by the rev it was committed at), for that op's author.
+     */
+    rebaseLocalOverHeld(local: SheetMutation[]): {
+        op: SheetMutation[];
+        overrode: Array<{
+            rev: number;
+            lost: string[];
+        }>;
+    } | "barrier";
     clearHeld(): void;
 }
 declare function createSheetsOtAdapter(port: SheetsOtPort, hooks?: SheetsOtAdapterHooks): SheetsOtAdapter;
@@ -846,9 +858,10 @@ interface UniverSheetsOtPortOptions {
      * `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).
+     * "$1,234.50" vs "$7" → 507). While the editor is open, a remote op whose ranges cover its cell, or that moves or
+     * removes it (a row/column insert, remove or move, a sheet removal, a shrink), is held: 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). Everything else applies live, so the person still sees the others work.
      */
     cellEditor?(): EditedCell | null;
     /** Replace the workbook's whole content, keeping its unit id. */
@@ -905,6 +918,13 @@ declare function univerSheetsOtPort(o: UniverSheetsOtPortOptions): SheetsOtPort
     dispose(): void;
     running(): string[];
 };
+/**
+ * Whether a remote mutation must wait for the open cell editor: it writes the editor's cell (a value, a style, a
+ * merge, a format, a rule or a sort whose ranges cover it), or it moves or removes that cell (a row/column insert,
+ * remove or move before it, its sheet's removal, a row or column count below it). A mutation with no range on that
+ * sheet (a rename, a sheet order, a filter's criteria) never touches the cell. Anything this cannot read waits.
+ */
+declare function touchesEditedCell(m: SheetMutation, at: EditedCell): boolean;
 /**
  * This seat's selections after a remote structural op: indices move with their rows/columns; one the op removed
  * lands on the first surviving index; everything is clamped to the sheet; whole-row/column ranges span the sheet.
@@ -994,4 +1014,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 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 };
+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, touchesEditedCell, transformDocsOp, transformSheetOp, transformTextX, undoStacksOf, univerSheetsOtPort, workbookUsesOrderedRoom };

package/dist/univer-collab.js

@@ -3936,6 +3936,12 @@ function rebaseSheetUndoStack(items, remote, unitId) {
 function createSheetsOtAdapter(port, hooks = {}) {
   let queue = [];
   let draining = false;
+  const sameOp = (a, b) => JSON.stringify(canonicalKeys(a ?? [])) === JSON.stringify(canonicalKeys(b ?? []));
+  const commutesWithHeld = (op) => queue.every((q) => {
+    const a = transformSheetOp(op, q.op, "left");
+    const b = transformSheetOp(q.op, op, "right");
+    return !("barrier" in a) && !("barrier" in b) && sameOp(a.op, op) && sameOp(b.op, q.op);
+  });
   const lazy = typeof port.beforeUndo === "function";
   let pending = [];
   let pendingBase = 0;
@@ -4008,15 +4014,16 @@ function createSheetsOtAdapter(port, hooks = {}) {
     decode: decodeSheetOp,
     apply(op) {
       if (isNoopSheetOp(op)) return true;
-      if (port.busy() || queue.length || port.defers?.(op)) {
-        queue.push(op);
+      const hold = port.busy() || !!port.defers?.(op) || queue.length > 0 && !commutesWithHeld(op);
+      if (hold) {
+        queue.push({ op, rev: hooks.rev?.() ?? 0 });
         if (!draining) {
           draining = true;
           port.whenIdle(() => {
             draining = false;
             const held = queue;
             queue = [];
-            for (const q of held) applyNow(q);
+            for (const q of held) applyNow(q.op);
           });
         }
         return true;
@@ -4054,15 +4061,17 @@ function createSheetsOtAdapter(port, hooks = {}) {
     rebaseLocalOverHeld(local) {
       let op = local;
       const next = [];
+      const overrode = [];
       for (const q of queue) {
-        const l2 = transformSheetOp(op, q, "left");
-        const q2 = transformSheetOp(q, op, "right");
+        const l2 = transformSheetOp(op, q.op, "left");
+        const q2 = transformSheetOp(q.op, op, "right");
         if ("barrier" in l2 || "barrier" in q2) return "barrier";
+        if (l2.lost.length && q.rev > 0) overrode.push({ rev: q.rev, lost: l2.lost });
         op = l2.op ?? [];
-        if (q2.op?.length) next.push(q2.op);
+        if (q2.op?.length) next.push({ op: q2.op, rev: q.rev });
       }
       queue = next;
-      return op;
+      return { op, overrode };
     },
     clearHeld() {
       queue = [];
@@ -4080,7 +4089,7 @@ function openSheetsOtRoom(o) {
       console.warn("[sheets-ot] notice handler failed", err);
     }
   };
-  const adapter = createSheetsOtAdapter(port);
+  const adapter = createSheetsOtAdapter(port, { rev: () => session?.rev() ?? 0 });
   let healing = null;
   const HEALS = /* @__PURE__ */ new Set(["hash_mismatch", "save_hash_mismatch", "ack_mismatch"]);
   const screen = () => {
@@ -4122,6 +4131,7 @@ function openSheetsOtRoom(o) {
     }
     let op = e.mutations;
     let inverse = e.inverse;
+    let overrode = [];
     if (adapter.held()) {
       inverse = void 0;
       const r = adapter.rebaseLocalOverHeld(op);
@@ -4130,10 +4140,11 @@ function openSheetsOtRoom(o) {
         session.rebuild("held_barrier");
         return;
       }
-      op = r;
+      op = r.op;
+      overrode = r.overrode;
       if (!op.length) return;
     }
-    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: e.label ?? SHEETS_EDIT_GROUP })) notice({ kind: "not_live" });
+    if (!session.local(op, { ...inverse !== void 0 ? { inverse } : {}, label: e.label ?? SHEETS_EDIT_GROUP, ...overrode.length ? { overrode } : {} })) notice({ kind: "not_live" });
   };
   const unsubLocal = port.onLocal(onLocal);
   session = openOpSession2({
@@ -4639,9 +4650,9 @@ function univerSheetsOtPort(o) {
       listeners.add(listener);
       return () => void listeners.delete(listener);
     },
-    busy: () => tracker.stack.length > 0 || group !== null || holding(),
+    // the editor hold is not "busy": only the ops that touch its cell wait (defers), the rest apply live
+    busy: () => tracker.stack.length > 0 || group !== null,
     defers(op) {
-      if (holding()) return true;
       const at = edited();
       if (!at || !op.some((m) => touchesEditedCell(m, at))) return false;
       editorHold = true;
@@ -4718,11 +4729,46 @@ function inverseStyle(prev, wrote) {
   return out;
 }
 function touchesEditedCell(m, at) {
-  const sheet = String(m.params.subUnitId ?? "");
+  const p = m.params;
+  const sheet = String(p.subUnitId ?? p.sheetId ?? "");
   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);
+  if (m.id === VALUES) {
+    const row = p.cellValue?.[at.row];
+    return !!row && Object.prototype.hasOwnProperty.call(row, at.col);
+  }
+  if (m.id === REMOVE_SHEET2) return true;
+  if (m.id === "sheet.mutation.set-worksheet-row-count") return !(Number(p.rowCount) > at.row);
+  if (m.id === "sheet.mutation.set-worksheet-column-count") return !(Number(p.columnCount) > at.col);
+  const axis = axisOpOf(m);
+  if (axis) {
+    const i = axis.axis === "row" ? at.row : at.col;
+    return mapIndex(axis.op, i) !== i;
+  }
+  const ranges = [];
+  let unreadable = false;
+  const walk = (v, depth) => {
+    if (!v || typeof v !== "object" || depth > 6) return;
+    if (Array.isArray(v)) {
+      for (const x of v) walk(x, depth + 1);
+      return;
+    }
+    const o = v;
+    if (["startRow", "endRow", "startColumn", "endColumn"].some((k) => k in o)) {
+      const r = o;
+      if (![r.startRow, r.endRow, r.startColumn, r.endColumn].every((n) => typeof n === "number" && Number.isFinite(n)) && !(r.rangeType && r.rangeType > 0)) unreadable = true;
+      else ranges.push(r);
+      return;
+    }
+    if (typeof o.row === "number" && typeof o.col === "number") ranges.push({ startRow: o.row, endRow: o.row, startColumn: o.col, endColumn: o.col });
+    for (const x of Object.values(o)) walk(x, depth + 1);
+  };
+  walk(p, 0);
+  return unreadable || ranges.some((r) => covers(r, at));
+}
+function covers(r, at) {
+  const rows = r.rangeType === 2 || r.rangeType === 3 || r.startRow <= at.row && at.row <= r.endRow;
+  const cols = r.rangeType === 1 || r.rangeType === 3 || r.startColumn <= at.col && at.col <= r.endColumn;
+  return rows && cols;
 }
 function fullContent(cell) {
   const out = {};
@@ -5078,6 +5124,7 @@ export {
   startWorkbookOtRoom,
   stripSenderView,
   takeCovered,
+  touchesEditedCell,
   transformDocsOp,
   transformSheetOp,
   transformTextX,