@ai-matrx/office 0.8.21 → 0.8.23

package/dist/univer-collab.js

@@ -1113,25 +1113,25 @@ function rebaseUndoStack(items, remote) {
   let dropped = 0;
   for (let i = items.length - 1; i >= 0; i--) {
     const item = items[i];
-    let ok2 = true;
+    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)) ok2 = false;
+          if (isNoopDocsOp(r.op)) ok3 = false;
           else {
             m.params = { ...m.params, actions: r.op };
             delete m.params.textRanges;
             delete m.params.layoutState;
           }
         } catch {
-          ok2 = false;
+          ok3 = false;
         }
       }
     }
-    if (!ok2) {
+    if (!ok3) {
       items.splice(i, 1);
       dropped++;
     }
@@ -1693,6 +1693,9 @@ var SHEET_MUTATIONS = {
   "sheet.mutation.insert-sheet": covered("sheet", "index", "sheet"),
   "sheet.mutation.remove-sheet": covered("sheet", "sheetIndex", "sheetsLeft"),
   "sheet.mutation.set-worksheet-order": covered("sheet", "fromOrder", "toOrder"),
+  // ── covered (C9): our own cell comment anchors (comment-anchor-transform.ts; not emitted by Univer) ──────
+  "matrx.mutation.set-comment-anchor": covered("anchor", "anchorId", "cell"),
+  "sheet.mutation.reorder-range": covered("sort", "range", "order"),
   // ── never travels ────────────────────────────────────────────────────────────────────────────────
   "formula.mutation.set-formula-calculation-start": never(FORMULA_RESULT),
   "formula.mutation.set-trigger-formula-calculation-start": never(FORMULA_RESULT),
@@ -1726,7 +1729,6 @@ var SHEET_MUTATIONS = {
   "thread-comment.mutation.resolve-comment": never(UNIVER_COMMENTS),
   "thread-comment.mutation.delete-comment": never(UNIVER_COMMENTS),
   // ── barriers: X (no transform yet, design §10) ───────────────────────────────────────────────────
-  "sheet.mutation.reorder-range": barrier("X", "sort: a permutation, not transformed yet"),
   "sheet.mutation.move-range": barrier("X", "cut-paste carries the sender's cell matrices"),
   "sheet.mutation.set-worksheet-hidden": barrier("X", "sheet-level setting: not in C5a"),
   "sheet.mutation.set-tab-color": barrier("X", "sheet-level setting: not in C5a"),
@@ -2144,6 +2146,74 @@ function refSheetsFor(texts, sheets) {
   return Object.keys(out).length ? out : void 0;
 }
 
+// src/collab/sheets/comment-anchor-transform.ts
+var SET_SHEET_COMMENT_ANCHOR = "matrx.mutation.set-comment-anchor";
+var REMOVE_SHEET = "sheet.mutation.remove-sheet";
+function structuralAxisOp(id, params) {
+  const p = params;
+  switch (id) {
+    case "sheet.mutation.insert-row":
+      return p.range ? { axis: "row", op: { kind: "insert", at: p.range.startRow, count: p.range.endRow - p.range.startRow + 1 } } : null;
+    case "sheet.mutation.remove-rows":
+      return p.range ? { axis: "row", op: { kind: "remove", start: p.range.startRow, count: p.range.endRow - p.range.startRow + 1 } } : null;
+    case "sheet.mutation.insert-col":
+      return p.range ? { axis: "col", op: { kind: "insert", at: p.range.startColumn, count: p.range.endColumn - p.range.startColumn + 1 } } : null;
+    case "sheet.mutation.remove-col":
+      return p.range ? { axis: "col", op: { kind: "remove", start: p.range.startColumn, count: p.range.endColumn - p.range.startColumn + 1 } } : null;
+    case "sheet.mutation.move-rows":
+      return p.sourceRange && p.targetRange ? { axis: "row", op: { kind: "move", from: p.sourceRange.startRow, count: p.sourceRange.endRow - p.sourceRange.startRow + 1, to: p.targetRange.startRow } } : null;
+    case "sheet.mutation.move-columns":
+      return p.sourceRange && p.targetRange ? {
+        axis: "col",
+        op: { kind: "move", from: p.sourceRange.startColumn, count: p.sourceRange.endColumn - p.sourceRange.startColumn + 1, to: p.targetRange.startColumn }
+      } : null;
+    default:
+      return null;
+  }
+}
+function moveSheetAnchorCell(cell, sheet, id, params) {
+  if (String(params.subUnitId ?? "") !== sheet) return cell;
+  if (id === REMOVE_SHEET) return null;
+  const s = structuralAxisOp(id, params);
+  if (!s) return cell;
+  if (s.axis === "row") {
+    const row = mapIndex(s.op, cell.row);
+    return row === null ? null : row === cell.row ? cell : { row, col: cell.col };
+  }
+  const col = mapIndex(s.op, cell.col);
+  return col === null ? null : col === cell.col ? cell : { row: cell.row, col };
+}
+function colName(c) {
+  let s = "";
+  for (let n = c + 1; n > 0; n = Math.floor((n - 1) / 26)) s = String.fromCharCode(65 + (n - 1) % 26) + s;
+  return s;
+}
+var sheetCellName = (cell) => `${colName(cell.col)}${cell.row + 1}`;
+function cellOf(m) {
+  const c = m.params.cell;
+  return c && typeof c.row === "number" && typeof c.col === "number" ? c : null;
+}
+var ok = (op, lost = [], dropped = []) => ({ op, lost, dropped });
+var label = (m) => {
+  const c = cellOf(m);
+  return `${String(m.params.subUnitId ?? "")}!${c ? sheetCellName(c) : "?"} comment`;
+};
+function transformCommentAnchor(x, y, side) {
+  const xa = x.id === SET_SHEET_COMMENT_ANCHOR;
+  const ya = y.id === SET_SHEET_COMMENT_ANCHOR;
+  if (!xa && !ya) return null;
+  if (!xa) return ok([x]);
+  if (ya) {
+    if (x.params.anchorId !== y.params.anchorId || x.params.subUnitId !== y.params.subUnitId) return ok([x]);
+    return side === "left" ? ok([x], [label(y)]) : ok([], [], [label(x)]);
+  }
+  const cell = cellOf(x);
+  if (!cell) return ok([x]);
+  const moved = moveSheetAnchorCell(cell, String(x.params.subUnitId ?? ""), y.id, y.params);
+  if (!moved) return ok([], [], [label(x)]);
+  return ok([moved === cell ? x : { id: x.id, params: { ...x.params, cell: moved } }]);
+}
+
 // src/collab/sheets/transform/transform.ts
 var SHEET_TRANSFORMER_VERSION = "c5c-1";
 var ID = {
@@ -2169,21 +2239,22 @@ var ID = {
   colCount: "sheet.mutation.set-worksheet-column-count",
   insertSheet: "sheet.mutation.insert-sheet",
   removeSheet: "sheet.mutation.remove-sheet",
-  sheetOrder: "sheet.mutation.set-worksheet-order"
+  sheetOrder: "sheet.mutation.set-worksheet-order",
+  sort: "sheet.mutation.reorder-range"
 };
 var PAIR_BARRIERS = {};
 var pairKey = (a, b) => a < b ? `${a}|${b}` : `${b}|${a}`;
 var barrier2 = (reason) => ({ barrier: true, reason });
-var ok = (op, lost = [], dropped = []) => ({ op, lost, dropped });
+var ok2 = (op, lost = [], dropped = []) => ({ op, lost, dropped });
 var flip = (side) => side === "left" ? "right" : "left";
 var sheetOf = (m) => String(m.params.subUnitId ?? "");
-function colName(c) {
+function colName2(c) {
   let s = "";
   for (let n = c + 1; n > 0; n = Math.floor((n - 1) / 26)) s = String.fromCharCode(65 + (n - 1) % 26) + s;
   return s;
 }
-var cellRef = (sheet, row, col) => `${sheet}!${colName(col)}${row + 1}`;
-var rangeRef = (sheet, r) => `${sheet}!${colName(r.startColumn)}${r.startRow + 1}:${colName(r.endColumn)}${r.endRow + 1}`;
+var cellRef = (sheet, row, col) => `${sheet}!${colName2(col)}${row + 1}`;
+var rangeRef = (sheet, r) => `${sheet}!${colName2(r.startColumn)}${r.startRow + 1}:${colName2(r.endColumn)}${r.endRow + 1}`;
 function structuralOf(m) {
   const p = m.params;
   switch (m.id) {
@@ -2438,9 +2509,9 @@ function transformCell(X, Y4, side) {
   return { entries: Object.keys(out).length ? [out, ...tail] : tail, xLost, yLost };
 }
 function transformCellsOverCells(x, y, side) {
-  if (sheetOf(x) !== sheetOf(y)) return ok([x]);
+  if (sheetOf(x) !== sheetOf(y)) return ok2([x]);
   const ycells = cellsOf(y);
-  if (!cellsOverlap(cellsOf(x), ycells)) return ok([x]);
+  if (!cellsOverlap(cellsOf(x), ycells)) return ok2([x]);
   const xd = isDerived(x);
   const yd = isDerived(y);
   const eff = derivedSide(x, y, side);
@@ -2466,7 +2537,7 @@ function transformCellsOverCells(x, y, side) {
   });
   if (why) return barrier2(why);
   const op = passes.filter((p) => !isEmptyMatrix(p)).map((p) => cellsMutation(x, p));
-  return ok(op, lost, dropped);
+  return ok2(op, lost, dropped);
 }
 var SIDE_CAR_PARAMS = ["refSheets", "previousName", "derived", "sheetIndex", "sheetsLeft"];
 var isDerived = (m) => m.params.derived === true;
@@ -2537,7 +2608,7 @@ function cellThrough(sheet, change, r, c) {
   return nr === null || nc === null ? null : [nr, nc];
 }
 function cellsOverChange(x, change) {
-  if (!hasFormula(x) && (change.kind !== "axis" || change.sheet !== sheetOf(x))) return ok([x]);
+  if (!hasFormula(x) && (change.kind !== "axis" || change.sheet !== sheetOf(x))) return ok2([x]);
   const ctx = formulaCtx(x);
   const out = {};
   const dropped = [];
@@ -2566,9 +2637,9 @@ function cellsOverChange(x, change) {
   });
   if (why) return barrier2(why);
   const rsAfter = refSheetsAfter(ctx.refSheets, change);
-  if (!changed && JSON.stringify(rsAfter ?? null) === JSON.stringify(ctx.refSheets ?? null)) return ok([x]);
+  if (!changed && JSON.stringify(rsAfter ?? null) === JSON.stringify(ctx.refSheets ?? null)) return ok2([x]);
   const params = { ...withRefSheets(x.params, rsAfter), cellValue: out };
-  return ok(isEmptyMatrix(out) ? [] : [{ id: x.id, params }], [], dropped);
+  return ok2(isEmptyMatrix(out) ? [] : [{ id: x.id, params }], [], dropped);
 }
 function rewritesOf(y, change) {
   if (!hasFormula(y)) return null;
@@ -2615,36 +2686,36 @@ function formulaPair(x, y, side) {
   const fy = familyOf(y.id);
   const SET_NAME_BARRIER = "set-defined-name without previousName (capture must record the name it replaces) against formula text";
   if (fx === "defname" && fy === "defname") {
-    if (String(x.params.id) !== String(y.params.id)) return ok([x]);
+    if (String(x.params.id) !== String(y.params.id)) return ok2([x]);
     const eff = derivedSide(x, y, side);
-    if (eff === "left") return ok([x], isDerived(y) ? [] : [`defined name "${String(y.params.name)}"`]);
-    return ok([], [], isDerived(x) ? [] : [`defined name "${String(x.params.name)}"`]);
+    if (eff === "left") return ok2([x], isDerived(y) ? [] : [`defined name "${String(y.params.name)}"`]);
+    return ok2([], [], isDerived(x) ? [] : [`defined name "${String(x.params.name)}"`]);
   }
   if (fx === "defname") {
     if (fy === "cell") {
       if (setNameWithoutPrevious(x) && hasFormula(y)) return barrier2(SET_NAME_BARRIER);
       const ch2 = refChangeOf(x);
-      if (!ch2) return ok([x]);
+      if (!ch2) return ok2([x]);
       const add = rewritesOf(y, ch2);
       if (typeof add === "string") return barrier2(add);
-      return ok(add ? [x, add] : [x]);
+      return ok2(add ? [x, add] : [x]);
     }
     const ch = refChangeOf(y);
-    if (!ch) return ok([x]);
+    if (!ch) return ok2([x]);
     const r = definedNameThrough(x, ch);
-    return typeof r === "string" ? barrier2(r) : ok([r.op]);
+    return typeof r === "string" ? barrier2(r) : ok2([r.op]);
   }
   if (fy === "defname") {
     if (fx === "cell") {
       if (setNameWithoutPrevious(y) && hasFormula(x)) return barrier2(SET_NAME_BARRIER);
       const ch2 = refChangeOf(y);
-      return ch2 ? cellsOverChange(x, ch2) : ok([x]);
+      return ch2 ? cellsOverChange(x, ch2) : ok2([x]);
     }
     const ch = refChangeOf(x);
-    if (!ch) return ok([x]);
+    if (!ch) return ok2([x]);
     const r = definedNameThrough(y, ch);
     if (typeof r === "string") return barrier2(r);
-    return ok(r.changed ? [x, asDerived(r.op)] : [x]);
+    return ok2(r.changed ? [x, asDerived(r.op)] : [x]);
   }
   if (fx === "cell") {
     const ch = refChangeOf(y);
@@ -2659,7 +2730,7 @@ function formulaPair(x, y, side) {
     });
     const add = rewritesOf(y, ch);
     if (typeof add === "string") return barrier2(add);
-    return ok(add ? [x, add] : [x], lost);
+    return ok2(add ? [x, add] : [x], lost);
   }
   return null;
 }
@@ -2807,20 +2878,20 @@ function numfmtPair(x, y, side, sx, sy) {
   const nx = isNumfmt(x);
   const ny = isNumfmt(y);
   if (!nx && !ny) return null;
-  if (nx && sy) return ok(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsThrough(sy, p.ranges) }))));
-  if (ny && sx) return ok([x]);
+  if (nx && sy) return ok2(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsThrough(sy, p.ranges) }))));
+  if (ny && sx) return ok2([x]);
   if (nx && ny) {
-    if (side === "left") return ok([x]);
+    if (side === "left") return ok2([x]);
     const ys = nfParts(y).flatMap((p) => p.ranges);
-    return ok(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsMinus(p.ranges, ys) }))));
+    return ok2(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsMinus(p.ranges, ys) }))));
   }
   if (nx && y.id === ID.values) {
-    if (side === "left") return ok([x]);
+    if (side === "left") return ok2([x]);
     const ys = nWrites(y);
-    return ys.length ? ok(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsMinus(p.ranges, ys) })))) : ok([x]);
+    return ys.length ? ok2(nfBuild(x, nfParts(x).map((p) => ({ ...p, ranges: rectsMinus(p.ranges, ys) })))) : ok2([x]);
   }
   if (ny && x.id === ID.values) {
-    if (side === "left") return ok([x]);
+    if (side === "left") return ok2([x]);
     const out = {};
     const tail = {};
     let touched = false;
@@ -2846,31 +2917,31 @@ function numfmtPair(x, y, side, sx, sy) {
       }
       putCell(out, r, c, v);
     });
-    if (!touched) return ok([x]);
+    if (!touched) return ok2([x]);
     const ops = [];
     if (!isEmptyMatrix(out)) ops.push(cellsMutation(x, out));
     if (!isEmptyMatrix(tail)) ops.push({ id: ID.values, params: { subUnitId: sheetOf(x), cellValue: tail } });
-    return ok(ops);
+    return ok2(ops);
   }
-  return ok([x]);
+  return ok2([x]);
 }
 var isCount = (m) => m.id === ID.rowCount || m.id === ID.colCount;
 var countAxis = (m) => m.id === ID.rowCount ? "row" : "col";
 var countKey = (m) => m.id === ID.rowCount ? "rowCount" : "columnCount";
 function countPair(x, y, sy) {
-  if (!isCount(x)) return isCount(y) ? ok([x]) : null;
+  if (!isCount(x)) return isCount(y) ? ok2([x]) : null;
   const k = countKey(x);
   const v = Number(x.params[k]);
   if (sy) {
-    if (sy.axis !== countAxis(x) || sy.op.kind === "move") return ok([x]);
+    if (sy.axis !== countAxis(x) || sy.op.kind === "move") return ok2([x]);
     const d = sy.op.kind === "insert" ? sy.op.count : -sy.op.count;
-    return ok([{ id: x.id, params: { ...x.params, [k]: Math.max(1, v + d) } }]);
+    return ok2([{ id: x.id, params: { ...x.params, [k]: Math.max(1, v + d) } }]);
   }
   if (isCount(y) && y.id === x.id) {
     const w = Number(y.params[k]);
-    return ok([w > v ? { id: x.id, params: { ...x.params, [k]: w } } : x]);
+    return ok2([w > v ? { id: x.id, params: { ...x.params, [k]: w } } : x]);
   }
-  return ok([x]);
+  return ok2([x]);
 }
 var isSheetOp = (m) => m.id === ID.insertSheet || m.id === ID.removeSheet || m.id === ID.sheetOrder;
 var sheetIdOf = (m) => m.id === ID.insertSheet ? String(m.params.sheet?.id ?? "") : sheetOf(m);
@@ -2903,31 +2974,31 @@ function sheetPair(x, y, side) {
     const b = sheetAxisOf(y);
     if (!a || !b) return barrier2("a sheet add or remove without its index (capture must call annotateSheetOps)");
     if (x.id === ID.insertSheet && y.id === ID.insertSheet && sheetIdOf(x) === sheetIdOf(y)) {
-      return JSON.stringify(x.params) === JSON.stringify(y.params) ? ok([]) : barrier2("the same sheet id added twice with different content");
+      return JSON.stringify(x.params) === JSON.stringify(y.params) ? ok2([]) : barrier2("the same sheet id added twice with different content");
     }
     if (x.id === ID.removeSheet && typeof x.params.sheetsLeft === "number" && sheetIdOf(x) !== sheetIdOf(y) && (y.id === ID.removeSheet || y.id === ID.insertSheet)) {
       const left = x.params.sheetsLeft + (y.id === ID.insertSheet ? 1 : -1);
       if (left < 1) return barrier2("concurrent sheet removes would leave the workbook without a sheet");
       const out2 = transformAxis(a, b, side);
       if (!out2) return barrier2("sheet order: no transform");
-      return ok(out2.map((o) => buildSheetOp({ id: x.id, params: { ...x.params, sheetsLeft: left } }, o)));
+      return ok2(out2.map((o) => buildSheetOp({ id: x.id, params: { ...x.params, sheetsLeft: left } }, o)));
     }
     const out = transformAxis(a, b, side);
     if (!out) return barrier2("sheet order: no transform");
-    return ok(out.map((o) => buildSheetOp(x, o)), [], out.length === 0 && x.id === ID.sheetOrder ? [`${sheetIdOf(x)}: sheet order`] : []);
+    return ok2(out.map((o) => buildSheetOp(x, o)), [], out.length === 0 && x.id === ID.sheetOrder ? [`${sheetIdOf(x)}: sheet order`] : []);
   }
   if (ys) {
-    if (y.id !== ID.removeSheet) return ok([x]);
+    if (y.id !== ID.removeSheet) return ok2([x]);
     const gone2 = sheetOf(y);
     if (namesSheet(x, gone2)) return barrier2("a formula names a sheet removed at the same time");
     if (sheetOf(x) === gone2 && x.id !== ID.setName && x.id !== ID.removeName)
-      return ok([], [], isDerived(x) ? [] : [`${gone2}: the sheet was removed`]);
-    return ok([x]);
+      return ok2([], [], isDerived(x) ? [] : [`${gone2}: the sheet was removed`]);
+    return ok2([x]);
   }
-  if (x.id !== ID.removeSheet) return ok([x]);
+  if (x.id !== ID.removeSheet) return ok2([x]);
   const gone = sheetOf(x);
   if (namesSheet(y, gone)) return barrier2("a formula names a sheet removed at the same time");
-  return ok([x], sheetOf(y) === gone && !isDerived(y) && y.id !== ID.setName && y.id !== ID.removeName ? [`${gone}: the sheet was removed`] : []);
+  return ok2([x], sheetOf(y) === gone && !isDerived(y) && y.id !== ID.setName && y.id !== ID.removeName ? [`${gone}: the sheet was removed`] : []);
 }
 function annotateSheetOps(group, sheetOrder) {
   const order = [...sheetOrder];
@@ -2966,6 +3037,119 @@ function inlineSheetStyles(sheet, styleOf) {
   }
   return out;
 }
+var isSort = (m) => m.id === ID.sort;
+function sortOf(m) {
+  const P = /* @__PURE__ */ new Map();
+  for (const [t, src] of Object.entries(m.params.order ?? {})) P.set(Number(t), Number(src));
+  return { range: { ...m.params.range }, P };
+}
+var sortQ = (o) => new Map([...o.P].map(([t, s0]) => [s0, t]));
+function buildSort(template, o) {
+  const order = {};
+  for (const [t, s0] of [...o.P].sort((a, b) => a[0] - b[0])) if (t !== s0) order[t] = s0;
+  if (!Object.keys(order).length || o.range.startRow > o.range.endRow || o.range.startColumn > o.range.endColumn) return [];
+  return [{ id: template.id, params: { ...template.params, range: o.range, order } }];
+}
+var inSortCols = (o, c) => c >= o.range.startColumn && c <= o.range.endColumn;
+function sortThrough(o, st) {
+  const r = o.range;
+  if (st.axis === "col") {
+    if (st.op.kind === "move") {
+      const { from, count, to } = st.op;
+      const touches = !(from + count - 1 < r.startColumn || from > r.endColumn) || to > r.startColumn && to <= r.endColumn;
+      if (touches) return null;
+      const spans3 = spanThrough(st.op, r.startColumn, r.endColumn);
+      return spans3.length === 1 ? { range: { ...r, startColumn: spans3[0][0], endColumn: spans3[0][1] }, P: o.P } : null;
+    }
+    const spans2 = spanThrough(st.op, r.startColumn, r.endColumn);
+    if (!spans2.length) return { range: { ...r, startColumn: 1, endColumn: 0 }, P: /* @__PURE__ */ new Map() };
+    return { range: { ...r, startColumn: spans2[0][0], endColumn: spans2[spans2.length - 1][1] }, P: o.P };
+  }
+  const op = st.op;
+  if (op.kind === "move") {
+    const touches = !(op.from + op.count - 1 < r.startRow || op.from > r.endRow) || op.to > r.startRow && op.to <= r.endRow;
+    if (touches) return null;
+  }
+  if (op.kind === "insert" || op.kind === "move") {
+    const P2 = /* @__PURE__ */ new Map();
+    for (const [t, s0] of o.P) P2.set(mapIndex(op, t), mapIndex(op, s0));
+    const spans2 = spanThrough(op, r.startRow, r.endRow);
+    return { range: { ...r, startRow: spans2[0][0], endRow: spans2[spans2.length - 1][1] }, P: P2 };
+  }
+  const removed = (i) => i >= op.start && i < op.start + op.count;
+  const Q = sortQ(o);
+  const goneTargets = [];
+  for (let i = op.start; i < op.start + op.count; i++) goneTargets.push(Q.get(i) ?? i);
+  goneTargets.sort((a, b) => a - b);
+  const compact = (t) => t - goneTargets.filter((g) => g < t).length;
+  const P = /* @__PURE__ */ new Map();
+  for (const [t, s0] of o.P) if (!removed(s0)) P.set(compact(t), mapIndex(op, s0));
+  const spans = spanThrough(op, r.startRow, r.endRow);
+  if (!spans.length) return { range: { ...r, startRow: 1, endRow: 0 }, P: /* @__PURE__ */ new Map() };
+  return { range: { ...r, startRow: spans[0][0], endRow: spans[spans.length - 1][1] }, P };
+}
+function sortPair(x, y, sx, sy) {
+  const xs = isSort(x);
+  const ys = isSort(y);
+  if (!xs && !ys) return null;
+  if (xs && ys) {
+    const a = sortOf(x).range;
+    const b = sortOf(y).range;
+    const overlap = a.startRow <= b.endRow && b.startRow <= a.endRow && a.startColumn <= b.endColumn && b.startColumn <= a.endColumn;
+    return overlap ? barrier2("two sorts of overlapping ranges at once") : ok2([x]);
+  }
+  if (xs) {
+    if (sy) {
+      const t = sortThrough(sortOf(x), sy);
+      return t ? ok2(buildSort(x, t)) : barrier2("a row or column move through a sorted range");
+    }
+    return ok2([x]);
+  }
+  const o = sortOf(y);
+  const Q = sortQ(o);
+  const moved = (r) => r >= o.range.startRow && r <= o.range.endRow && Q.has(r);
+  if (sx) {
+    if (sx.axis === "col") return sx.op.kind === "move" && !sortThrough(o, sx) ? barrier2("a column move through a sorted range") : ok2([x]);
+    if (sx.op.kind === "insert") return ok2([x]);
+    if (sx.op.kind === "move") return sortThrough(o, sx) ? ok2([x]) : barrier2("a row move through a sorted range");
+    const rows = [];
+    let partial = false;
+    for (let i = sx.op.start; i < sx.op.start + sx.op.count; i++) {
+      if (moved(i)) partial = true;
+      rows.push(Q.get(i) ?? i);
+    }
+    if (partial) return barrier2("a row remove against a concurrent sort of those rows");
+    return ok2([x]);
+  }
+  if (x.id === ID.values) {
+    const out = {};
+    let changed = false;
+    forEachCell(cellsOf(x), (r, c, v) => {
+      if (inSortCols(o, c) && moved(r)) {
+        putCell(out, Q.get(r), c, v);
+        changed = true;
+      } else putCell(out, r, c, v);
+    });
+    return changed ? ok2([cellsMutation(x, out)]) : ok2([x]);
+  }
+  if (isNumfmt(x)) {
+    const parts = nfParts(x).map((p) => {
+      const ranges = [];
+      for (const rc of p.ranges) {
+        const inner = { ...rc, startRow: Math.max(rc.startRow, o.range.startRow), endRow: Math.min(rc.endRow, o.range.endRow), startColumn: Math.max(rc.startColumn, o.range.startColumn), endColumn: Math.min(rc.endColumn, o.range.endColumn) };
+        if (inner.startRow > inner.endRow || inner.startColumn > inner.endColumn) {
+          ranges.push(rc);
+          continue;
+        }
+        ranges.push(...rectMinus(rc, inner));
+        for (let r = inner.startRow; r <= inner.endRow; r++) ranges.push({ ...inner, startRow: Q.get(r) ?? r, endRow: Q.get(r) ?? r });
+      }
+      return { ...p, ranges };
+    });
+    return ok2(nfBuild(x, parts));
+  }
+  return ok2([x]);
+}
 function familyOf(id) {
   const e = SHEET_MUTATIONS[id];
   return e && e.kind === "covered" ? e.family : "";
@@ -2980,27 +3164,31 @@ function transformMutation(x, y, side) {
       if (why) return barrier2(why);
     }
   }
+  const ca = transformCommentAnchor(x, y, side);
+  if (ca) return ca;
   const pb = PAIR_BARRIERS[pairKey(x.id, y.id)];
   if (pb) return barrier2(`${x.id} \xD7 ${y.id}: ${pb.reason}${pb.seed === null ? "" : ` (fuzz seed ${pb.seed})`}`);
   const sp = sheetPair(x, y, side);
   if (sp) return sp;
   const fp = formulaPair(x, y, side);
   if (fp) return fp;
-  if (sheetOf(x) !== sheetOf(y)) return ok([x]);
+  if (sheetOf(x) !== sheetOf(y)) return ok2([x]);
   const fx = familyOf(x.id);
   const fy = familyOf(y.id);
   const sy = structuralOf(y);
   const sx = structuralOf(x);
+  const sortp = sortPair(x, y, sx, sy);
+  if (sortp) return sortp;
   const cp = countPair(x, y, sy);
   if (cp) return cp;
   const np = numfmtPair(x, y, side, sx, sy);
   if (np) return np;
   if (sx && sy) {
-    if (sx.axis !== sy.axis) return ok([x]);
+    if (sx.axis !== sy.axis) return ok2([x]);
     const out = transformAxis(sx.op, sy.op, side);
     if (!out) return barrier2(`${x.id} over ${y.id}: moved blocks overlap in part, or the block would split`);
     const dropped = out.length === 0 && sx.op.kind === "move" ? [`${sheetOf(x)}: moved ${sx.axis}s`] : [];
-    return ok(out.map((o) => buildStructural(x, sx.axis, o)), [], dropped);
+    return ok2(out.map((o) => buildStructural(x, sx.axis, o)), [], dropped);
   }
   if (sy) {
     if (fx === "merge") {
@@ -3011,23 +3199,23 @@ function transformMutation(x, y, side) {
         if (t) kept.push(t);
         else dropped.push(rangeRef(sheetOf(x), r));
       }
-      return ok(kept.length ? [withRanges(x, kept)] : [], [], x.id === ID.addMerge ? dropped : []);
+      return ok2(kept.length ? [withRanges(x, kept)] : [], [], x.id === ID.addMerge ? dropped : []);
     }
     if (fx === "size") {
       const size = sizeOf(x);
-      if (size.axis !== sy.axis) return ok([x]);
+      if (size.axis !== sy.axis) return ok2([x]);
       const next = /* @__PURE__ */ new Map();
       for (const [i, v] of size.values) {
         const m = mapIndex(sy.op, i);
         if (m !== null) next.set(m, v);
       }
       const built = buildSize(x, next);
-      return ok(built ? [built] : []);
+      return ok2(built ? [built] : []);
     }
-    return ok([x]);
+    return ok2([x]);
   }
   if (sx) {
-    if (fy !== "merge" || y.id !== ID.addMerge) return ok([x]);
+    if (fy !== "merge" || y.id !== ID.addMerge) return ok2([x]);
     const remove = [];
     const add = [];
     for (const r of mergeRanges(y)) {
@@ -3037,11 +3225,11 @@ function transformMutation(x, y, side) {
       if (t.range) add.push(t.range);
     }
     const lostMerges = mergeRanges(y).filter((r) => mergeThrough(sx, r).range === null).map((r) => rangeRef(sheetOf(y), r));
-    if (!remove.length) return ok([x], lostMerges);
+    if (!remove.length) return ok2([x], lostMerges);
     const sheet = sheetOf(x);
     const pre = sx.op.kind === "insert" ? [] : [mergeMutation(ID.removeMerge, sheet, remove)];
     const mid = sx.op.kind === "insert" ? [mergeMutation(ID.removeMerge, sheet, remove)] : [];
-    return ok([...pre, x, ...mid, ...add.length ? [mergeMutation(ID.addMerge, sheet, add)] : []], lostMerges);
+    return ok2([...pre, x, ...mid, ...add.length ? [mergeMutation(ID.addMerge, sheet, add)] : []], lostMerges);
   }
   if (fx === "cell" && fy === "cell") return transformCellsOverCells(x, y, side);
   if (fx === "merge" && fy === "merge") {
@@ -3050,45 +3238,45 @@ function transformMutation(x, y, side) {
     const hit = (r) => yr.some((q) => intersects(r, q));
     const sheet = sheetOf(x);
     if (x.id === ID.addMerge && y.id === ID.addMerge) {
-      if (!xr.some(hit)) return ok([x]);
+      if (!xr.some(hit)) return ok2([x]);
       if (side === "left") {
         const lost = yr.filter((q) => xr.some((r) => intersects(r, q))).map((q) => rangeRef(sheet, q));
-        return ok([mergeMutation(ID.removeMerge, sheet, xr.filter(hit)), x], lost);
+        return ok2([mergeMutation(ID.removeMerge, sheet, xr.filter(hit)), x], lost);
       }
       const kept = xr.filter((r) => !hit(r));
-      return ok(kept.length ? [withRanges(x, kept)] : [], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
+      return ok2(kept.length ? [withRanges(x, kept)] : [], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
     }
     if (x.id === ID.addMerge && y.id === ID.removeMerge) {
-      if (side === "left" || !xr.some(hit)) return ok([x], side === "left" && xr.some(hit) ? yr.filter((q) => xr.some((r) => intersects(r, q))).map((q) => rangeRef(sheet, q)) : []);
+      if (side === "left" || !xr.some(hit)) return ok2([x], side === "left" && xr.some(hit) ? yr.filter((q) => xr.some((r) => intersects(r, q))).map((q) => rangeRef(sheet, q)) : []);
       const kept = xr.filter((r) => !hit(r));
-      return ok(kept.length ? [withRanges(x, kept)] : [], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
+      return ok2(kept.length ? [withRanges(x, kept)] : [], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
     }
     if (x.id === ID.removeMerge && y.id === ID.addMerge) {
       const touched = yr.filter((q) => xr.some((r) => intersects(r, q)));
-      if (!touched.length) return ok([x]);
-      if (side === "left") return ok([x], touched.map((q) => rangeRef(sheet, q)));
-      return ok([x, mergeMutation(ID.addMerge, sheet, touched)], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
+      if (!touched.length) return ok2([x]);
+      if (side === "left") return ok2([x], touched.map((q) => rangeRef(sheet, q)));
+      return ok2([x, mergeMutation(ID.addMerge, sheet, touched)], [], xr.filter(hit).map((r) => rangeRef(sheet, r)));
     }
-    return ok([x]);
+    return ok2([x]);
   }
   if (fx === "size" && fy === "size") {
     const a = sizeOf(x);
     const b = sizeOf(y);
-    if (a.axis !== b.axis || a.attr !== b.attr) return ok([x]);
+    if (a.axis !== b.axis || a.attr !== b.attr) return ok2([x]);
     if (side === "left") {
       const lost = [...a.values.keys()].filter((i) => b.values.has(i)).map((i) => `${sheetOf(x)}: ${a.axis} ${i + 1} ${a.attr}`);
-      return ok([x], lost);
+      return ok2([x], lost);
     }
     const next = new Map([...a.values].filter(([i]) => !b.values.has(i)));
     const built = buildSize(x, next);
     const dropped = [...a.values.keys()].filter((i) => b.values.has(i)).map((i) => `${sheetOf(x)}: ${a.axis} ${i + 1} ${a.attr}`);
-    return ok(built ? [built] : [], [], dropped);
+    return ok2(built ? [built] : [], [], dropped);
   }
   if (fx === "name" && fy === "name") {
-    if (side === "left") return ok([x], [`${sheetOf(x)}: name "${String(y.params.name)}"`]);
-    return ok([], [], [`${sheetOf(x)}: name "${String(x.params.name)}"`]);
+    if (side === "left") return ok2([x], [`${sheetOf(x)}: name "${String(y.params.name)}"`]);
+    return ok2([], [], [`${sheetOf(x)}: name "${String(x.params.name)}"`]);
   }
-  return ok([x]);
+  return ok2([x]);
 }
 var blocked = (p) => !Array.isArray(p);
 function tSeq(xs, ys, side, acc) {
@@ -3267,10 +3455,10 @@ function rebaseSheetUndoStack(items, remote, unitId) {
   let dropped = 0;
   for (let i = items.length - 1; i >= 0; i--) {
     const item = items[i];
-    let ok2 = true;
+    let ok3 = true;
     for (const key of ["undoMutations", "redoMutations"]) {
       const list = item[key];
-      if (!ok2 || !list?.length) continue;
+      if (!ok3 || !list?.length) continue;
       const isOperation = (id) => !SHEET_MUTATIONS[id] && id.includes(".operation.");
       const operations = list.filter((m) => isOperation(m.id));
       let shaped = cachedShape(list);
@@ -3279,14 +3467,14 @@ function rebaseSheetUndoStack(items, remote, unitId) {
         shapedLists.set(list, { src: list.slice(), shaped });
       }
       if (shaped.some((m) => m === null)) {
-        ok2 = false;
+        ok3 = false;
         continue;
       }
       if (!shaped.length) continue;
       try {
         const r = transformGroup(shaped, remote, "left");
         if (isBarrier(r) || r.op.length === 0) {
-          ok2 = false;
+          ok3 = false;
           continue;
         }
         if (r.op.length === shaped.length && r.op.every((m, i2) => m === shaped[i2])) continue;
@@ -3294,10 +3482,10 @@ function rebaseSheetUndoStack(items, remote, unitId) {
         shapedLists.set(next, { src: next.slice(), shaped: r.op });
         item[key] = next;
       } catch {
-        ok2 = false;
+        ok3 = false;
       }
     }
-    if (!ok2) {
+    if (!ok3) {
       items.splice(i, 1);
       dropped++;
     }
@@ -3518,7 +3706,7 @@ function univerSheetsOtPort(o) {
     return out;
   };
   const sheetOrder = () => (o.workbook()?.getSheets() ?? []).map((ws) => ws.getSheetId());
-  const openGroup = (label) => ({ label, order: sheetOrder(), sheets: sheetNames(), names: definedNames(), mutations: [], inverses: [], notShared: null });
+  const openGroup = (label2) => ({ label: label2, order: sheetOrder(), sheets: sheetNames(), names: definedNames(), mutations: [], inverses: [], notShared: null });
   const emit = (e) => {
     for (const l of [...listeners]) {
       try {
@@ -3697,6 +3885,11 @@ function univerSheetsOtPort(o) {
         return { m, inverse: [{ id: "sheet.mutation.remove-col", params: { subUnitId: sheet, range: json(params.range) } }] };
       case ADD_MERGE:
         return { m, inverse: [{ id: REMOVE_MERGE, params: { subUnitId: sheet, ranges: json(params.ranges) } }] };
+      case "sheet.mutation.reorder-range": {
+        const order = {};
+        for (const [t, src] of Object.entries(params.order ?? {})) order[String(src)] = Number(t);
+        return { m, inverse: [{ id: info.id, params: { subUnitId: sheet, range: json(params.range), order } }] };
+      }
       case SHEET_NAME:
         return { m, inverse: before2.name !== void 0 ? [{ id: SHEET_NAME, params: { subUnitId: sheet, name: before2.name } }] : void 0 };
       default:
@@ -3769,8 +3962,8 @@ function univerSheetsOtPort(o) {
       const a = forApply(m);
       applying = true;
       try {
-        const ok2 = cs.syncExecuteCommand(a.id, { ...json(a.params), unitId: u }, { fromCollab: true });
-        if (ok2 === false) throw new Error(`"${m.id}" was refused by the editor`);
+        const ok3 = cs.syncExecuteCommand(a.id, { ...json(a.params), unitId: u }, { fromCollab: true });
+        if (ok3 === false) throw new Error(`"${m.id}" was refused by the editor`);
       } finally {
         applying = false;
       }