@ai-matrx/office 0.8.12 → 0.8.13

package/CHANGELOG.md

@@ -1,11 +1,8 @@
 # Changelog
 
-## 0.8.12
+## 0.8.13
 
-UNVERIFIED: this release has no Unreleased entry and the source comparison could not be made (the caller supplied no source comparison). Whether source changed is unknown; consumer action is unknown.
-Check the package's gitHead on npm against this version's gitHead: `git diff <previous gitHead> <this gitHead> -- apps/shared/office/src`.
-
-## 0.8.11
+- **`/collab/sheets-transform` covers formulas (C5b; still inert, no consumer).** A formula typed on one seat now has its references rewritten by a concurrent row/column insert, removal or move and by a concurrent sheet rename, in both commit orders, exactly as Univer's own `@univerjs/sheets-formula` interceptor rewrites them: A1 references, ranges, absolute and mixed markers, whole rows and columns, cross-sheet references, references into a removed range (`#REF!`), array formulas (`ref` range moves; dynamic arrays are plain formulas). Defined names (`formula.mutation.set-defined-name` / `remove-defined-name`) are covered: their ranges follow structural edits and renames, a renamed name is renamed inside concurrent formulas, a removed one becomes `#REF!`. A rewrite a structural op carries for formulas that already existed (`derived`) never outranks a person's concurrent write to the same cell or name. Shared formulas (`si`) stay barriers (the failing case is in `sheet-formula-hard-cases.test.ts`). Rewrites match real sheets-formula 1.0.4 on 476 oracle cases (`fixtures/sheets-formula-oracle.json`, made by `spikes/c5b-probe/oracle.mjs`). Pairwise TP1 fuzz: 20 families (210 pairs) at 4,000 seeds each, both orders, 0 divergences, 0 throws. New exports: `annotateFormulas`, `forApply`, `SIDE_CAR_PARAMS`, `rewriteFormula`, `formulaBarrier`, `isFormulaText`, `refSheetsFor`, `refSheetsAfter`, `REF_ERROR` and the `RefChange`/`RefSheets`/`FormulaCtx` types. `CONTENT_KEYS` gains `ref`, `xf`, `ft`, `fd`; `SHEET_TRANSFORMER_VERSION` is `c5b-1`. `@univerjs/engine-formula` moves from devDependencies to dependencies (the lexer runs in shipped code). Consumer action: none (nothing imports this section yet). For C6: capture must call `annotateFormulas` on each group (sheet id → name, defined-name id → name, read before the command) and apply through `forApply`; the canonical sheet hash must sort the defined-names resource by id.
 
 - Docs co-editing (C3): a collaborator's edit now moves this seat's caret with the characters (§6.8). The view port gains an optional `selection { get, set }`; `DocumentModel` moves body ranges through each applied remote edit (`moveRangesThroughBodyEdit`). Found in the live two-browser run: with the caret left at its old offset, the next keystrokes landed scattered. Consumer action: pass `selection` from Univer's `DocSelectionManagerService` in the view port.
 

package/dist/collab-sheets-transform.cjs

@@ -22,15 +22,24 @@ var transform_exports = {};
 __export(transform_exports, {
   CONTENT_KEYS: () => CONTENT_KEYS,
   PAIR_BARRIERS: () => PAIR_BARRIERS,
+  REF_ERROR: () => REF_ERROR,
   SHEET_MUTATIONS: () => SHEET_MUTATIONS,
   SHEET_TRANSFORMER_VERSION: () => SHEET_TRANSFORMER_VERSION,
+  SIDE_CAR_PARAMS: () => SIDE_CAR_PARAMS,
   allowParams: () => allowParams,
+  annotateFormulas: () => annotateFormulas,
   cellRef: () => cellRef,
   completeCellContent: () => completeCellContent,
   exactMergeRemovals: () => exactMergeRemovals,
+  forApply: () => forApply,
+  formulaBarrier: () => formulaBarrier,
   isBarrier: () => isBarrier,
+  isFormulaText: () => isFormulaText,
   mapIndex: () => mapIndex,
   mergeThrough: () => mergeThrough,
+  refSheetsAfter: () => refSheetsAfter,
+  refSheetsFor: () => refSheetsFor,
+  rewriteFormula: () => rewriteFormula,
   sheetTransformer: () => sheetTransformer,
   transformAxis: () => transformAxis,
   transformGroup: () => transformGroup,
@@ -46,12 +55,11 @@ var covered = (family, ...allow) => ({ kind: "covered", family, allow: ["subUnit
 var never = (reason) => ({ kind: "never-travels", reason });
 var barrier = (until, reason) => ({ kind: "barrier", until, reason });
 var FORMULA_RESULT = "formula engine output; every seat computes it (dropped at capture)";
-var FORMULA = "formula state; C5b rewrites references";
 var RESOURCE = "ranged resource keyed by id; C5c";
 var UNIVER_COMMENTS = "Univer's own thread-comment store; our comments anchor elsewhere (design \xA78)";
 var SHEET_MUTATIONS = {
   // ── covered (C5a) ────────────────────────────────────────────────────────────────────────────────
-  "sheet.mutation.set-range-values": covered("cell", "cellValue"),
+  "sheet.mutation.set-range-values": covered("cell", "cellValue", "refSheets", "derived"),
   "sheet.mutation.insert-row": covered("structure", "range", "rowInfo"),
   "sheet.mutation.remove-rows": covered("structure", "range"),
   "sheet.mutation.insert-col": covered("structure", "range", "colInfo"),
@@ -128,16 +136,16 @@ var SHEET_MUTATIONS = {
   "sheet.mutation.set-worksheet-protection": barrier("X", "permissions: not in C5a"),
   "sheet.mutation.delete-worksheet-protection": barrier("X", "permissions: not in C5a"),
   "sheet.mutation.set-worksheet-permission-points": barrier("X", "permissions: not in C5a"),
-  // ── barriers until C5b (formulas) ────────────────────────────────────────────────────────────────
-  "formula.mutation.set-defined-name": barrier("C5b", FORMULA),
-  "formula.mutation.remove-defined-name": barrier("C5b", FORMULA),
-  "formula.mutation.set-feature-calculation": barrier("C5b", FORMULA),
-  "formula.mutation.remove-feature-calculation": barrier("C5b", FORMULA),
-  "formula.mutation.set-other-formula": barrier("C5b", FORMULA),
-  "formula.mutation.remove-other-formula": barrier("C5b", FORMULA),
-  "formula.mutation.set-super-table": barrier("C5b", FORMULA),
-  "formula.mutation.remove-super-table": barrier("C5b", FORMULA),
-  "formula.mutation.set-super-table-option": barrier("C5b", FORMULA),
+  // ── formulas (C5b) ───────────────────────────────────────────────────────────────────────────────
+  "formula.mutation.set-defined-name": covered("defname", "id", "name", "formulaOrRefString", "formulaOrRefStringWithPrefix", "comment", "localSheetId", "hidden", "refSheets", "previousName", "derived"),
+  "formula.mutation.remove-defined-name": covered("defname", "id", "name"),
+  "formula.mutation.set-feature-calculation": barrier("X", "a plugin's registered calculation (feature id + dependency ranges); no transform yet"),
+  "formula.mutation.remove-feature-calculation": barrier("X", "a plugin's registered calculation; no transform yet"),
+  "formula.mutation.set-other-formula": barrier("C5c", "formulas owned by conditional formats and data validation travel with their rule"),
+  "formula.mutation.remove-other-formula": barrier("C5c", "formulas owned by conditional formats and data validation travel with their rule"),
+  "formula.mutation.set-super-table": barrier("C5c", "table names in structured references belong to tables (C5c)"),
+  "formula.mutation.remove-super-table": barrier("C5c", "table names in structured references belong to tables (C5c)"),
+  "formula.mutation.set-super-table-option": barrier("C5c", "table names in structured references belong to tables (C5c)"),
   // ── barriers until C5c (ranged resources) ────────────────────────────────────────────────────────
   "sheet.mutation.add-conditional-rule": barrier("C5c", RESOURCE),
   "sheet.mutation.set-conditional-rule": barrier("C5c", RESOURCE),
@@ -181,7 +189,7 @@ function allowParams(id, params) {
 }
 
 // src/collab/sheets/transform/transform.ts
-var import_sheets = require("@univerjs/sheets");
+var import_sheets2 = require("@univerjs/sheets");
 
 // src/collab/sheets/transform/axis.ts
 function isNoopMove(op) {
@@ -294,8 +302,228 @@ function transformAxis(x, y, side) {
   }
 }
 
+// src/collab/sheets/transform/formula.ts
+var import_core = require("@univerjs/core");
+var import_engine_formula = require("@univerjs/engine-formula");
+var import_sheets = require("@univerjs/sheets");
+var REF_ERROR = "#REF!";
+var FULL = 16383 * 64;
+var lexer = null;
+var lex = (body) => (lexer ??= new import_engine_formula.LexerTreeBuilder()).sequenceNodesBuilder(body);
+var isFormulaText = (f) => typeof f === "string" && f.length > 1 && f.startsWith("=");
+var IDENT = /^[A-Za-z_\\][A-Za-z0-9_.\\]*$/;
+var ERROR_TOKEN = /^(?:[^!]+!)?#(?:REF!|NAME\?|VALUE!|DIV\/0!|N\/A|NUM!|NULL!|SPILL!|CALC!)$/i;
+function parse(text) {
+  const prefix = text.startsWith("=") ? "=" : "";
+  const nodes = lex(text.slice(prefix.length));
+  if (!nodes) return "the formula lexer could not read the text";
+  for (const n of nodes) {
+    if (typeof n === "string") continue;
+    if (n.nodeType === import_engine_formula.sequenceNodeType.TABLE || n.nodeType === import_engine_formula.sequenceNodeType.FUNCTION && n.token.includes("[")) return "a structured table reference (tables are C5c)";
+    if (n.nodeType === import_engine_formula.sequenceNodeType.FUNCTION && !IDENT.test(n.token) && !ERROR_TOKEN.test(n.token))
+      return `the lexer read "${n.token}" as one name (an intersection or a reference it cannot split)`;
+    if (n.nodeType === import_engine_formula.sequenceNodeType.REFERENCE) {
+      const d = (0, import_engine_formula.deserializeRangeWithSheet)(n.token);
+      if (d.unitId) return "a reference into another workbook";
+    }
+  }
+  return { prefix, nodes };
+}
+function targetSheet(sheetName, ctx) {
+  if (!sheetName) return ctx.ownSheet;
+  const id = ctx.refSheets?.[sheetName];
+  if (id === void 0) return void 0;
+  return id ?? "";
+}
+function formulaBarrier(text, ctx) {
+  const p = parse(text);
+  if (typeof p === "string") return p;
+  for (const n of p.nodes) {
+    if (typeof n === "string" || n.nodeType !== import_engine_formula.sequenceNodeType.REFERENCE) continue;
+    const { sheetName } = (0, import_engine_formula.deserializeRangeWithSheet)(n.token);
+    if (targetSheet(sheetName, ctx) === void 0) return `sheet "${sheetName}" is not in refSheets (capture must call annotateRefSheets)`;
+  }
+  return null;
+}
+function referencedSheetNames(text) {
+  const p = parse(text);
+  if (typeof p === "string") return [];
+  const out = /* @__PURE__ */ new Set();
+  for (const n of p.nodes) if (typeof n !== "string" && n.nodeType === import_engine_formula.sequenceNodeType.REFERENCE) {
+    const { sheetName } = (0, import_engine_formula.deserializeRangeWithSheet)(n.token);
+    if (sheetName) out.add(sheetName);
+  }
+  return [...out];
+}
+var fullRowsRange = (start, count) => ({ startRow: start, endRow: start + count - 1, startColumn: 0, endColumn: FULL, rangeType: import_core.RANGE_TYPE.ROW });
+var fullColsRange = (start, count) => ({ startRow: 0, endRow: FULL, startColumn: start, endColumn: start + count - 1, rangeType: import_core.RANGE_TYPE.COLUMN });
+var startV = (v) => Number.isNaN(v) || v == null ? -Infinity : v;
+var endV = (v) => Number.isNaN(v) || v == null ? Infinity : v;
+function startEnd(r) {
+  return { ...r, startRow: startV(r.startRow), endRow: endV(r.endRow), startColumn: startV(r.startColumn), endColumn: endV(r.endColumn) };
+}
+function checkMoveEdge(origin, from) {
+  const startRow = startV(origin.startRow), endRow = endV(origin.endRow), startColumn = startV(origin.startColumn), endColumn = endV(origin.endColumn);
+  const fromStartRow = startV(from.startRow), fromEndRow = endV(from.endRow), fromStartColumn = startV(from.startColumn), fromEndColumn = endV(from.endColumn);
+  const rowsCover = () => origin.rangeType === import_core.RANGE_TYPE.COLUMN && from.rangeType === import_core.RANGE_TYPE.COLUMN || startRow >= fromStartRow && endRow <= fromEndRow;
+  const columnsCover = () => origin.rangeType === import_core.RANGE_TYPE.ROW && from.rangeType === import_core.RANGE_TYPE.ROW || startColumn >= fromStartColumn && endColumn <= fromEndColumn;
+  const allCover = () => origin.rangeType === import_core.RANGE_TYPE.ALL && from.rangeType === import_core.RANGE_TYPE.ALL;
+  if (rowsCover() && columnsCover() || allCover()) return 4;
+  if (columnsCover() && startRow >= fromStartRow && startRow <= fromEndRow && endRow > fromEndRow) return 0;
+  if (columnsCover() && endRow >= fromStartRow && endRow <= fromEndRow && startRow < fromStartRow) return 1;
+  if (rowsCover() && startColumn >= fromStartColumn && startColumn <= fromEndColumn && endColumn > fromEndColumn) return 2;
+  if (rowsCover() && endColumn >= fromStartColumn && endColumn <= fromEndColumn && startColumn < fromStartColumn) return 3;
+  return null;
+}
+function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
+  const { startRow, endRow, startColumn, endColumn, rangeType } = startEnd(result);
+  const f = startEnd(from);
+  const fromRangeType = from.rangeType ?? import_core.RANGE_TYPE.NORMAL;
+  const t = startEnd(to);
+  const rm = startEnd(remain);
+  const o = startEnd(origin);
+  const originRangeType = origin.rangeType ?? import_core.RANGE_TYPE.NORMAL;
+  const newRange = { ...origin };
+  const rowsCover = () => rangeType === import_core.RANGE_TYPE.COLUMN && originRangeType === import_core.RANGE_TYPE.COLUMN || startColumn >= o.startColumn && endColumn <= o.endColumn;
+  const columnsCover = () => rangeType === import_core.RANGE_TYPE.ROW && originRangeType === import_core.RANGE_TYPE.ROW || startRow >= o.startRow && endRow <= o.endRow;
+  if (moveEdge === 0) {
+    if (!rowsCover()) return void 0;
+    if (startRow < o.startRow) newRange.startRow = startRow;
+    else if (startRow >= o.endRow) newRange.endRow -= f.endRow + 1 - o.startRow;
+    else return void 0;
+  } else if (moveEdge === 1) {
+    if (!rowsCover()) return void 0;
+    if (endRow > o.endRow) newRange.endRow = endRow;
+    else if (endRow <= o.startRow) newRange.startRow += o.endRow - f.startRow + 1;
+    else return void 0;
+  } else if (moveEdge === 2) {
+    if (!columnsCover()) return void 0;
+    if (startColumn < o.startColumn) newRange.startColumn = startColumn;
+    else if (startColumn >= o.endColumn) newRange.endColumn -= f.endColumn + 1 - o.startColumn;
+    else return void 0;
+  } else if (moveEdge === 3) {
+    if (!columnsCover()) return void 0;
+    if (endColumn > o.endColumn) newRange.endColumn = endColumn;
+    else if (endColumn <= o.startColumn) newRange.startColumn += o.endColumn - f.startColumn + 1;
+    else return void 0;
+  } else if (moveEdge === 4) {
+    Object.assign(newRange, { startRow, startColumn, endRow, endColumn });
+  } else if (f.startColumn <= o.startColumn && f.endColumn >= o.endColumn || fromRangeType === import_core.RANGE_TYPE.ROW && originRangeType === import_core.RANGE_TYPE.ROW) {
+    const n = f.endRow - f.startRow + 1;
+    if (from.endRow < o.startRow) {
+      if (t.startRow >= o.startRow) newRange.startRow -= n;
+      if (t.startRow >= o.endRow) newRange.endRow -= n;
+    } else if (from.startRow > o.endRow) {
+      if (t.endRow <= o.endRow) newRange.endRow += n;
+      if (t.endRow <= o.startRow) newRange.startRow += n;
+    } else if (from.startRow >= o.startRow && from.endRow <= o.endRow) {
+      if (t.startRow <= o.startRow) newRange.startRow += n;
+      else if (t.startRow >= o.endRow) newRange.endRow -= n;
+    }
+  } else if (f.startRow <= o.startRow && f.endRow >= o.endRow || fromRangeType === import_core.RANGE_TYPE.COLUMN && originRangeType === import_core.RANGE_TYPE.COLUMN) {
+    const n = f.endColumn - f.startColumn + 1;
+    if (from.endColumn < o.startColumn) {
+      if (t.startColumn >= o.startColumn) newRange.startColumn -= n;
+      if (t.startColumn >= o.endColumn) newRange.endColumn -= n;
+    } else if (from.startColumn > o.endColumn) {
+      if (t.endColumn <= o.endColumn) newRange.endColumn += n;
+      if (t.endColumn <= o.startColumn) newRange.startColumn += n;
+    } else if (from.startColumn >= o.startColumn && from.endColumn <= o.endColumn) {
+      if (t.startColumn <= o.startColumn) newRange.startColumn += n;
+      else if (t.startColumn >= o.endColumn) newRange.endColumn -= n;
+    }
+  } else {
+    Object.assign(newRange, { startRow, startColumn, endRow, endColumn });
+    void rm;
+  }
+  return newRange;
+}
+function moveRange(range, axis, op) {
+  const isRow = axis === "row";
+  if (op.kind === "insert") {
+    const r = isRow ? fullRowsRange(op.at, op.count) : fullColsRange(op.at, op.count);
+    const ops2 = isRow ? (0, import_sheets.handleInsertRow)({ id: import_sheets.EffectRefRangId.InsertRowCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core.Direction.DOWN } }, range) : (0, import_sheets.handleInsertCol)({ id: import_sheets.EffectRefRangId.InsertColCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core.Direction.RIGHT } }, range);
+    const res2 = (0, import_sheets.runRefRangeMutations)(ops2, range);
+    return res2 == null ? void 0 : { ...range, ...res2 };
+  }
+  if (op.kind === "remove") {
+    const r = isRow ? fullRowsRange(op.start, op.count) : fullColsRange(op.start, op.count);
+    const ops2 = isRow ? (0, import_sheets.handleIRemoveRow)({ id: import_sheets.EffectRefRangId.RemoveRowCommandId, params: { range: r } }, range, []) : (0, import_sheets.handleIRemoveCol)({ id: import_sheets.EffectRefRangId.RemoveColCommandId, params: { range: r } }, range);
+    const res2 = (0, import_sheets.runRefRangeMutations)(ops2, range);
+    return res2 == null ? REF_ERROR : { ...range, ...res2 };
+  }
+  const from = isRow ? fullRowsRange(op.from, op.count) : fullColsRange(op.from, op.count);
+  const to = isRow ? fullRowsRange(op.to, op.count) : fullColsRange(op.to, op.count);
+  const moveEdge = checkMoveEdge(range, from);
+  let remain = (0, import_core.getIntersectRange)(range, from);
+  if (isRow) {
+    if (remain == null && (from.endRow < range.startRow && to.endRow <= range.startRow || from.startRow > range.endRow && to.startRow > range.endRow)) return void 0;
+  } else if (remain == null && (from.endColumn < range.startColumn && to.endColumn <= range.startColumn || from.startColumn > range.endColumn && to.startColumn > range.endColumn)) return void 0;
+  remain ??= { startRow: range.startRow, endRow: range.endRow, startColumn: range.startColumn, endColumn: range.endColumn, rangeType: import_core.RANGE_TYPE.NORMAL };
+  const ops = isRow ? (0, import_sheets.handleMoveRows)({ id: import_sheets.EffectRefRangId.MoveRowsCommandId, params: { toRange: to, fromRange: from } }, remain) : (0, import_sheets.handleMoveCols)({ id: import_sheets.EffectRefRangId.MoveColsCommandId, params: { toRange: to, fromRange: from } }, remain);
+  const res = (0, import_sheets.runRefRangeMutations)(ops, remain);
+  if (res == null) return REF_ERROR;
+  return getMoveNewRange(moveEdge, res, from, to, range, remain);
+}
+function rewriteFormula(text, ctx, change) {
+  const p = parse(text);
+  if (typeof p === "string") return p;
+  const nodes = p.nodes.slice();
+  const changedIds = [];
+  for (let i = 0; i < nodes.length; i++) {
+    const n = nodes[i];
+    if (typeof n === "string") continue;
+    if (change.kind === "defined-name") {
+      if ((n.nodeType === import_engine_formula.sequenceNodeType.DEFINED_NAME || n.nodeType === import_engine_formula.sequenceNodeType.FUNCTION) && n.token === change.from) {
+        nodes[i] = { ...n, token: change.to ?? REF_ERROR };
+        changedIds.push(i);
+      }
+      continue;
+    }
+    if (n.nodeType !== import_engine_formula.sequenceNodeType.REFERENCE) continue;
+    const { range, sheetName, unitId } = (0, import_engine_formula.deserializeRangeWithSheet)(n.token);
+    const target = targetSheet(sheetName, ctx);
+    if (target === void 0) return `sheet "${sheetName}" is not in refSheets (capture must call annotateRefSheets)`;
+    if (target !== change.sheet) continue;
+    let token;
+    if (change.kind === "rename") {
+      if (!sheetName) continue;
+      token = (0, import_engine_formula.serializeRangeToRefString)({ range, sheetName: change.name, unitId });
+    } else {
+      const moved = moveRange(import_core.Rectangle.moveOffset(range, 0, 0), change.axis, change.op);
+      if (moved === void 0) continue;
+      token = moved === REF_ERROR ? REF_ERROR : (0, import_engine_formula.serializeRangeToRefString)({ range: moved, sheetName: target === ctx.ownSheet && !ctx.keepQualifier ? "" : sheetName, unitId });
+    }
+    nodes[i] = { ...n, token };
+    changedIds.push(i);
+  }
+  if (!changedIds.length) return { text, changed: false };
+  for (let i = 0; i < nodes.length; i++) {
+    const n = nodes[i];
+    if (typeof n === "string" || n.nodeType !== import_engine_formula.sequenceNodeType.REFERENCE || changedIds.includes(i)) continue;
+    nodes[i] = { ...n, token: (0, import_engine_formula.serializeRangeToRefString)((0, import_engine_formula.deserializeRangeWithSheet)(n.token)) };
+  }
+  const out = p.prefix + (0, import_engine_formula.generateStringWithSequence)(nodes);
+  return { text: out, changed: out !== text };
+}
+function refSheetsAfter(refSheets, change) {
+  if (change.kind !== "rename" || !refSheets) return refSheets;
+  const entries = Object.entries(refSheets);
+  if (!entries.some(([name, id]) => id === change.sheet || name === change.name)) return refSheets;
+  const next = {};
+  for (const [name, id] of entries) if (id !== change.sheet && name !== change.name) next[name] = id;
+  next[change.name] = change.sheet;
+  return next;
+}
+function refSheetsFor(texts, sheets) {
+  const byName = new Map(Object.entries(sheets).map(([id, name]) => [name, id]));
+  const out = {};
+  for (const t of texts) for (const name of referencedSheetNames(t)) out[name] = byName.get(name) ?? null;
+  return Object.keys(out).length ? out : void 0;
+}
+
 // src/collab/sheets/transform/transform.ts
-var SHEET_TRANSFORMER_VERSION = "c5a-1";
+var SHEET_TRANSFORMER_VERSION = "c5b-1";
 var ID = {
   values: "sheet.mutation.set-range-values",
   insertRow: "sheet.mutation.insert-row",
@@ -310,7 +538,9 @@ var ID = {
   rowIsAuto: "sheet.mutation.set-worksheet-row-is-auto-height",
   rowAutoHeight: "sheet.mutation.set-worksheet-row-auto-height",
   colWidth: "sheet.mutation.set-worksheet-col-width",
-  name: "sheet.mutation.set-worksheet-name"
+  name: "sheet.mutation.set-worksheet-name",
+  setName: "formula.mutation.set-defined-name",
+  removeName: "formula.mutation.remove-defined-name"
 };
 var PAIR_BARRIERS = {};
 var pairKey = (a, b) => a < b ? `${a}|${b}` : `${b}|${a}`;
@@ -375,9 +605,9 @@ function buildStructural(template, axis, op) {
   return { id: template.id, params: { ...p, range: { ...p.range, [a0]: start, [a1]: start + op.count - 1 } } };
 }
 function univerMutationInfo(axis, op) {
-  const FULL = { startRow: 0, endRow: Number.MAX_SAFE_INTEGER, startColumn: 0, endColumn: Number.MAX_SAFE_INTEGER };
+  const FULL2 = { startRow: 0, endRow: Number.MAX_SAFE_INTEGER, startColumn: 0, endColumn: Number.MAX_SAFE_INTEGER };
   const start = op.kind === "insert" ? op.at : op.start;
-  const range = axis === "row" ? { ...FULL, startRow: start, endRow: start + op.count - 1 } : { ...FULL, startColumn: start, endColumn: start + op.count - 1 };
+  const range = axis === "row" ? { ...FULL2, startRow: start, endRow: start + op.count - 1 } : { ...FULL2, startColumn: start, endColumn: start + op.count - 1 };
   const id = op.kind === "insert" ? axis === "row" ? ID.insertRow : ID.insertCol : axis === "row" ? ID.removeRows : ID.removeCol;
   return { id, params: { unitId: "", subUnitId: "", range } };
 }
@@ -390,11 +620,11 @@ function mergeThrough(s, m) {
   const op = s.op;
   if (op.kind === "insert") {
     const fixup = lo < op.at && op.at <= hi;
-    return { range: (0, import_sheets.adjustRangeOnMutation)(m, univerMutationInfo(s.axis, op)), fixup };
+    return { range: (0, import_sheets2.adjustRangeOnMutation)(m, univerMutationInfo(s.axis, op)), fixup };
   }
   if (op.kind === "remove") {
     const e = op.start + op.count - 1;
-    if (e < lo || op.start > hi) return { range: (0, import_sheets.adjustRangeOnMutation)(m, univerMutationInfo(s.axis, op)), fixup: false };
+    if (e < lo || op.start > hi) return { range: (0, import_sheets2.adjustRangeOnMutation)(m, univerMutationInfo(s.axis, op)), fixup: false };
     if (op.start <= lo && e >= hi) return { range: null, fixup: true };
     const r = { ...m };
     if (op.start >= lo && e <= hi) r[a1] = hi - op.count;
@@ -444,8 +674,8 @@ function exactMergeRemovals(group, merges) {
 var mergeRanges = (m) => m.params.ranges ?? [];
 var withRanges = (m, ranges) => ({ id: m.id, params: { ...m.params, ranges } });
 var mergeMutation = (id, sheet, ranges) => ({ id, params: { subUnitId: sheet, ranges } });
-var CONTENT_KEYS = ["v", "t", "p", "f", "si", "custom"];
-var CONTENT_TOUCH = ["v", "p", "f", "si", "custom"];
+var CONTENT_KEYS = ["v", "t", "p", "f", "si", "custom", "ref", "xf", "ft", "fd"];
+var CONTENT_TOUCH = ["v", "p", "f", "si", "custom", "ref", "xf", "ft", "fd"];
 var KNOWN_CELL_KEYS = /* @__PURE__ */ new Set([...CONTENT_KEYS, "s"]);
 function completeCellContent(entry, post) {
   if (entry === null) return null;
@@ -475,8 +705,10 @@ function cellBarrier(m) {
   forEachCell(cellsOf(m), (_r, _c, v) => {
     if (why || v === null) return;
     for (const k of Object.keys(v)) {
+      if (why) break;
       if (!KNOWN_CELL_KEYS.has(k)) why = `cell key "${k}" is not covered`;
-      else if ((k === "f" || k === "si") && v[k] != null) why = "formula content (f/si) belongs to C5b";
+      else if (k === "si" && v.si != null) why = "shared formula (si): its text lives in a master cell this op does not carry";
+      else if (k === "f" && isFormulaText(v.f) || k === "ref" && typeof v.ref === "string") why = formulaBarrier(v[k], formulaCtx(m));
     }
     if (typeof v.s === "string") why = "a style id travels (style ids are seat-local; capture must send the style object)";
     if (!why && CONTENT_TOUCH.some((k) => k in v) && !CONTENT_KEYS.every((k) => k in v || k === "t" && v.v == null))
@@ -549,6 +781,9 @@ function transformCell(X, Y, side) {
 function transformCellsOverCells(x, y, side) {
   if (sheetOf(x) !== sheetOf(y)) return ok([x]);
   const ycells = cellsOf(y);
+  const xd = isDerived(x);
+  const yd = isDerived(y);
+  const eff = derivedSide(x, y, side);
   const passes = [{}];
   const lost = [];
   const dropped = [];
@@ -560,29 +795,218 @@ function transformCellsOverCells(x, y, side) {
       putCell(passes[0], r, c, X);
       return;
     }
-    const res = transformCell(X, yRow[c] ?? null, side);
+    const res = transformCell(X, yRow[c] ?? null, eff);
     if (typeof res === "string") {
       why = res;
       return;
     }
     res.entries.forEach((e, i) => putCell(passes[i] ??= {}, r, c, e));
-    if (res.xLost) dropped.push(cellRef(sheetOf(x), r, c));
-    if (res.yLost) lost.push(cellRef(sheetOf(x), r, c));
+    if (res.xLost && !xd) dropped.push(cellRef(sheetOf(x), r, c));
+    if (res.yLost && !yd) lost.push(cellRef(sheetOf(x), r, c));
   });
   if (why) return barrier2(why);
   const op = passes.filter((p) => !isEmptyMatrix(p)).map((p) => cellsMutation(x, p));
   return ok(op, lost, dropped);
 }
-function transformCellsOverStructural(x, s) {
+var SIDE_CAR_PARAMS = ["refSheets", "previousName", "derived"];
+var isDerived = (m) => m.params.derived === true;
+function derivedSide(x, y, side) {
+  const xd = isDerived(x);
+  const yd = isDerived(y);
+  return xd === yd ? side : xd ? "right" : "left";
+}
+function forApply(m) {
+  if (!SIDE_CAR_PARAMS.some((k) => k in m.params)) return m;
+  const params = { ...m.params };
+  for (const k of SIDE_CAR_PARAMS) delete params[k];
+  return { id: m.id, params };
+}
+var refSheetsOf = (m) => m.params.refSheets;
+var formulaCtx = (m) => ({ ownSheet: sheetOf(m), refSheets: refSheetsOf(m) });
+function withRefSheets(params, rs) {
+  const out = { ...params };
+  if (rs) out.refSheets = rs;
+  else delete out.refSheets;
+  return out;
+}
+var hasFormulaText = (v) => !!v && (isFormulaText(v.f) || typeof v.ref === "string");
+function hasFormula(m) {
+  let any = false;
+  forEachCell(cellsOf(m), (_r, _c, v) => {
+    any ||= hasFormulaText(v);
+  });
+  return any;
+}
+var setNameWithoutPrevious = (m) => m.id === ID.setName && !("previousName" in m.params);
+function refChangeOf(m) {
+  const st = structuralOf(m);
+  if (st) return { kind: "axis", sheet: sheetOf(m), axis: st.axis, op: st.op };
+  if (m.id === ID.name) return { kind: "rename", sheet: sheetOf(m), name: String(m.params.name) };
+  if (m.id === ID.removeName) return { kind: "defined-name", from: String(m.params.name), to: null };
+  if (m.id === ID.setName && typeof m.params.previousName === "string" && m.params.previousName !== m.params.name)
+    return { kind: "defined-name", from: m.params.previousName, to: String(m.params.name) };
+  return null;
+}
+function rewriteEntry(v, ctx, change) {
+  let entry = v;
+  let changed = false;
+  for (const k of ["f", "ref"]) {
+    const t = v[k];
+    if (k === "f" ? !isFormulaText(t) : typeof t !== "string") continue;
+    const r = rewriteFormula(t, ctx, change);
+    if (typeof r === "string") return r;
+    if (!r.changed) continue;
+    if (k === "ref" && r.text.includes(REF_ERROR)) return "an array formula's range was removed under it";
+    entry = { ...entry, [k]: r.text };
+    changed = true;
+  }
+  return { entry, changed };
+}
+function cellThrough(sheet, change, r, c) {
+  if (change.kind !== "axis" || change.sheet !== sheet) return [r, c];
+  const nr = change.axis === "row" ? mapIndex(change.op, r) : r;
+  const nc = change.axis === "col" ? mapIndex(change.op, c) : c;
+  return nr === null || nc === null ? null : [nr, nc];
+}
+function cellsOverChange(x, change) {
+  const ctx = formulaCtx(x);
   const out = {};
   const dropped = [];
+  let why = null;
   forEachCell(cellsOf(x), (r, c, v) => {
-    const nr = s.axis === "row" ? mapIndex(s.op, r) : r;
-    const nc = s.axis === "col" ? mapIndex(s.op, c) : c;
-    if (nr === null || nc === null) dropped.push(cellRef(sheetOf(x), r, c));
-    else putCell(out, nr, nc, v);
+    if (why) return;
+    const at = cellThrough(sheetOf(x), change, r, c);
+    if (!at) {
+      dropped.push(cellRef(sheetOf(x), r, c));
+      return;
+    }
+    let e = v;
+    if (hasFormulaText(v)) {
+      const res = rewriteEntry(v, ctx, change);
+      if (typeof res === "string") {
+        why = res;
+        return;
+      }
+      e = res.entry;
+    }
+    putCell(out, at[0], at[1], e);
+  });
+  if (why) return barrier2(why);
+  const params = { ...withRefSheets(x.params, refSheetsAfter(ctx.refSheets, change)), cellValue: out };
+  return ok(isEmptyMatrix(out) ? [] : [{ id: x.id, params }], [], dropped);
+}
+function rewritesOf(y, change) {
+  const ctx = formulaCtx(y);
+  const out = {};
+  let why = null;
+  forEachCell(cellsOf(y), (r, c, v) => {
+    if (why || !hasFormulaText(v)) return;
+    const at = cellThrough(sheetOf(y), change, r, c);
+    if (!at) return;
+    const res = rewriteEntry(v, ctx, change);
+    if (typeof res === "string") {
+      why = res;
+      return;
+    }
+    if (res.changed) putCell(out, at[0], at[1], contentOf(res.entry));
+  });
+  if (why) return why;
+  if (isEmptyMatrix(out)) return null;
+  return { id: ID.values, params: withRefSheets({ subUnitId: sheetOf(y), cellValue: out, derived: true }, refSheetsAfter(ctx.refSheets, change)) };
+}
+var NAME_TEXT_KEYS = ["formulaOrRefString", "formulaOrRefStringWithPrefix"];
+function definedNameThrough(m, change) {
+  if (change.kind === "defined-name" || m.id !== ID.setName) return { op: m, changed: false };
+  const ctx = { ownSheet: change.sheet, refSheets: refSheetsOf(m), keepQualifier: true };
+  const params = { ...m.params };
+  let changed = false;
+  for (const k of NAME_TEXT_KEYS) {
+    if (typeof params[k] !== "string" || !params[k]) continue;
+    const r = rewriteFormula(params[k], ctx, change);
+    if (typeof r === "string") return r;
+    if (r.changed) {
+      params[k] = r.text;
+      changed = true;
+    }
+  }
+  return { op: { id: m.id, params: withRefSheets(params, refSheetsAfter(ctx.refSheets, change)) }, changed };
+}
+function asDerived(m) {
+  return { id: m.id, params: { ...m.params, derived: true } };
+}
+function formulaPair(x, y, side) {
+  const fx = familyOf(x.id);
+  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]);
+    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 (fx === "defname") {
+    if (fy === "cell") {
+      if (setNameWithoutPrevious(x) && hasFormula(y)) return barrier2(SET_NAME_BARRIER);
+      const ch2 = refChangeOf(x);
+      if (!ch2) return ok([x]);
+      const add = rewritesOf(y, ch2);
+      if (typeof add === "string") return barrier2(add);
+      return ok(add ? [x, add] : [x]);
+    }
+    const ch = refChangeOf(y);
+    if (!ch) return ok([x]);
+    const r = definedNameThrough(x, ch);
+    return typeof r === "string" ? barrier2(r) : ok([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]);
+    }
+    const ch = refChangeOf(x);
+    if (!ch) return ok([x]);
+    const r = definedNameThrough(y, ch);
+    if (typeof r === "string") return barrier2(r);
+    return ok(r.changed ? [x, asDerived(r.op)] : [x]);
+  }
+  if (fx === "cell") {
+    const ch = refChangeOf(y);
+    return ch ? cellsOverChange(x, ch) : null;
+  }
+  if (fy === "cell") {
+    const ch = refChangeOf(x);
+    if (!ch) return null;
+    const lost = [];
+    forEachCell(cellsOf(y), (r, c) => {
+      if (!cellThrough(sheetOf(y), ch, r, c)) lost.push(cellRef(sheetOf(y), r, c));
+    });
+    const add = rewritesOf(y, ch);
+    if (typeof add === "string") return barrier2(add);
+    return ok(add ? [x, add] : [x], lost);
+  }
+  return null;
+}
+var withPrevious = (m, definedNames) => m.id === ID.setName && !("previousName" in m.params) ? { id: m.id, params: { ...m.params, previousName: definedNames[String(m.params.id)] ?? null } } : m;
+function annotateFormulas(group, sheets, definedNames) {
+  let changed = false;
+  return group.map((m0) => {
+    const m = changed && (m0.id === ID.values || m0.id === ID.setName) ? asDerived(m0) : m0;
+    if (!changed && refChangeOf(withPrevious(m0, definedNames))) changed = true;
+    if (m.id === ID.values) {
+      const texts = [];
+      forEachCell(cellsOf(m), (_r, _c, v) => {
+        if (v && isFormulaText(v.f)) texts.push(v.f);
+        if (v && typeof v.ref === "string") texts.push(v.ref);
+      });
+      return { id: m.id, params: withRefSheets(m.params, refSheetsFor(texts, sheets)) };
+    }
+    if (m.id === ID.setName) {
+      const texts = NAME_TEXT_KEYS.map((k) => m.params[k]).filter((t) => typeof t === "string");
+      return { id: m.id, params: { ...withRefSheets(m.params, refSheetsFor(texts, sheets)), previousName: withPrevious(m, definedNames).params.previousName } };
+    }
+    return m;
   });
-  return ok(isEmptyMatrix(out) ? [] : [cellsMutation(x, out)], [], dropped);
 }
 function sizeOf(m) {
   const p = m.params;
@@ -633,6 +1057,8 @@ function transformMutation(x, y, side) {
   }
   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 fp = formulaPair(x, y, side);
+  if (fp) return fp;
   if (sheetOf(x) !== sheetOf(y)) return ok([x]);
   const fx = familyOf(x.id);
   const fy = familyOf(y.id);
@@ -646,7 +1072,6 @@ function transformMutation(x, y, side) {
     return ok(out.map((o) => buildStructural(x, sx.axis, o)), [], dropped);
   }
   if (sy) {
-    if (fx === "cell") return transformCellsOverStructural(x, sy);
     if (fx === "merge") {
       const kept = [];
       const dropped = [];
@@ -671,13 +1096,6 @@ function transformMutation(x, y, side) {
     return ok([x]);
   }
   if (sx) {
-    if (fy === "cell") {
-      const lost = [];
-      forEachCell(cellsOf(y), (r, c) => {
-        if ((sx.axis === "row" ? mapIndex(sx.op, r) : mapIndex(sx.op, c)) === null) lost.push(cellRef(sheetOf(y), r, c));
-      });
-      return ok([x], lost);
-    }
     if (fy !== "merge" || y.id !== ID.addMerge) return ok([x]);
     const remove = [];
     const add = [];