wordinweb 0.2.5 → 0.3.0

package/dist/collab.js

@@ -1,21 +1,26 @@
 import {
+  ADDRESS_WIRE_FIELD,
   DocxDocument,
   DocxToolbar,
   DocxView,
+  REGISTERED_OPERATION_KINDS,
   acceptAllRevisions,
   acceptRevision,
   addComment,
   adjustIndent,
   applyDeleteRange,
+  applyDeleteSeparator,
+  applyInsertSeparator,
   applyInsertText,
+  applyRegisteredOperation,
   applyRunFormat,
   applySplitParagraph,
   applyTableOp,
-  checkboxStateElement,
   collectRevisions,
   deleteComment,
   deleteMath,
   deleteSuggestedRange,
+  editCommentText,
   insertBlankPageAt,
   insertBookmarkAroundSelection,
   insertBookmarkAt,
@@ -32,9 +37,11 @@ import {
   insertSectionBreak,
   insertShapeAt,
   insertSmartArtAt,
-  insertTableAfter,
   insertWordArtAt,
+  isInsertableFieldInstruction,
+  isRegisteredOperationKind,
   isSafeUrl,
+  isValidShapePreset,
   localName,
   markParagraphGlyph,
   mergeParagraphBackward,
@@ -42,6 +49,7 @@ import {
   moveTableTo,
   parseXml,
   recordedProvenance,
+  registeredOperation,
   rejectAllRevisions,
   rejectRevision,
   removeDrawingRun,
@@ -49,15 +57,17 @@ import {
   replyToComment,
   resizeDrawing,
   resizeTableColumn,
-  resizeTableRow,
   resolveRunOffset,
   runWireLength,
+  separatorAtWireOffset,
   serializeXml,
   setChartData,
+  setCommentResolved,
   setDrawingFill,
   setDrawingLineStyle,
   setDrawingOrder,
   setDrawingRotation,
+  setDrawingWordArtStyle,
   setDrawingWordArtText,
   setDropCapAt,
   setFloatingPagePosition,
@@ -66,7 +76,6 @@ import {
   setLineNumbering,
   setLink,
   setListLevel,
-  setListType,
   setMathLinear,
   setPageLayout,
   setParagraphAlignment,
@@ -77,24 +86,109 @@ import {
   setSmartArtFill,
   setSmartArtNodeText,
   setSmartArtTextFormat,
-  toggleCheckbox,
-  validatePastedOoxml
-} from "./chunk-ALLQ5KWP.js";
+  siblingParagraph,
+  suggestMeta,
+  validatePastedOoxml,
+  validateRegisteredOperation
+} from "./chunk-VL6YPZSD.js";
 import "./chunk-7D4SUZUM.js";
 
 // src/collab.tsx
 import { useEffect, useMemo, useRef, useState, createElement } from "react";
 
 // ../collab/src/intents.ts
+function isRegisteredIntent(intent) {
+  return isRegisteredOperationKind(intent.kind);
+}
+var HAND_WRITTEN_INTENT_KIND_MAP = {
+  insertText: true,
+  insertSeparator: true,
+  deleteSeparator: true,
+  deleteText: true,
+  splitParagraph: true,
+  formatRun: true,
+  formatParagraph: true,
+  formatRange: true,
+  tableOp: true,
+  mergeParagraph: true,
+  commentRun: true,
+  pasteBlocks: true,
+  insertImage: true,
+  suggestRevision: true,
+  insertBreak: true,
+  insertMath: true,
+  insertShape: true,
+  replyComment: true,
+  adjustIndent: true,
+  setSpacing: true,
+  insertPageField: true,
+  setLink: true,
+  insertFootnote: true,
+  setDropCap: true,
+  setDivider: true,
+  insertBookmark: true,
+  insertBlankPage: true,
+  insertSectionBreak: true,
+  insertCrossRef: true,
+  insertCoverPage: true,
+  setPageLayout: true,
+  setListLevel: true,
+  insertWordArt: true,
+  insertChart: true,
+  insertSmartArt: true,
+  setLineNumbering: true,
+  insertDateTimeField: true,
+  insertField: true,
+  setDrawingRotation: true,
+  setDrawingFill: true,
+  setChartData: true,
+  setSmartArtNodeText: true,
+  setDrawingWordArtText: true,
+  setDrawingWordArtStyle: true,
+  setDrawingLineStyle: true,
+  setImageAltText: true,
+  removeLink: true,
+  setImageWrap: true,
+  setDrawingOrder: true,
+  setSmartArtData: true,
+  setSmartArtFill: true,
+  setSmartArtTextFormat: true,
+  setFloatingPagePosition: true,
+  resizeDrawing: true,
+  resizeTableColumn: true,
+  moveTable: true,
+  removeDrawing: true,
+  setMathLinear: true,
+  deleteMath: true,
+  moveMath: true,
+  ensureHeaderFooter: true,
+  deleteComment: true,
+  resolveComment: true,
+  editComment: true,
+  insertBookmarkRange: true,
+  acceptRevision: true,
+  rejectRevision: true,
+  acceptAllRevisions: true,
+  rejectAllRevisions: true
+};
+var INTENT_KINDS = Object.freeze([
+  ...Object.keys(HAND_WRITTEN_INTENT_KIND_MAP),
+  ...REGISTERED_OPERATION_KINDS
+]);
 function idempotencyKey(i) {
   return `${i.clientId}:${i.clientSeq}`;
 }
 
 // ../collab/src/transform.ts
 function runEditsOf(intent) {
+  if (isRegisteredIntent(intent)) return [];
   switch (intent.kind) {
     case "insertText":
       return [{ runId: intent.at.runId, at: intent.at.offset, del: 0, ins: intent.text.length }];
+    case "insertSeparator":
+      return [{ runId: intent.at.runId, at: intent.at.offset, del: 0, ins: 1 }];
+    case "deleteSeparator":
+      return intent.suggest ? [] : [{ runId: intent.at.runId, at: intent.at.offset, del: 1, ins: 0 }];
     case "deleteText":
       return [{ runId: intent.runId, at: intent.start, del: intent.end - intent.start, ins: 0 }];
     case "splitParagraph":
@@ -103,8 +197,6 @@ function runEditsOf(intent) {
       return [];
     case "formatParagraph":
       return [];
-    case "setListType":
-      return [];
     case "formatRange":
       return [{
         runId: intent.runId,
@@ -159,6 +251,7 @@ function runEditsOf(intent) {
     case "setChartData":
     case "setSmartArtNodeText":
     case "setDrawingWordArtText":
+    case "setDrawingWordArtStyle":
     case "setDrawingLineStyle":
     case "setImageAltText":
     case "removeLink":
@@ -170,19 +263,18 @@ function runEditsOf(intent) {
     case "setFloatingPagePosition":
     case "resizeDrawing":
     case "resizeTableColumn":
-    case "resizeTableRow":
     case "moveTable":
     case "removeDrawing":
     case "setMathLinear":
     case "deleteMath":
     case "ensureHeaderFooter":
     case "deleteComment":
+    case "resolveComment":
+    case "editComment":
     case "insertBookmarkRange":
-    case "toggleCheckbox":
       return [];
     case "moveMath":
       return [];
-    case "insertTable":
     case "acceptRevision":
     case "rejectRevision":
     case "acceptAllRevisions":
@@ -234,17 +326,20 @@ function transformPosition(pos, ahead, leftGravity = false) {
 }
 function transformIntent(intent, ahead) {
   const newBase = intent.base + ahead.length;
+  if (isRegisteredIntent(intent)) return { ...intent, base: newBase };
   switch (intent.kind) {
     case "insertText":
       return { ...intent, at: transformPosition(intent.at, ahead), base: newBase };
+    case "insertSeparator":
+      return { ...intent, at: transformPosition(intent.at, ahead), base: newBase };
+    case "deleteSeparator":
+      return { ...intent, at: transformPosition(intent.at, ahead), base: newBase };
     case "splitParagraph":
       return { ...intent, at: transformPosition(intent.at, ahead), base: newBase };
     case "formatRun":
       return { ...intent, base: newBase };
     case "formatParagraph":
       return { ...intent, base: newBase };
-    case "setListType":
-      return { ...intent, base: newBase };
     case "formatRange": {
       const s = transformPosition({ blockId: intent.blockId, runId: intent.runId, offset: intent.start }, ahead);
       const e = transformPosition({ blockId: intent.blockId, runId: intent.runId, offset: intent.end }, ahead);
@@ -305,6 +400,7 @@ function transformIntent(intent, ahead) {
     case "setChartData":
     case "setSmartArtNodeText":
     case "setDrawingWordArtText":
+    case "setDrawingWordArtStyle":
     case "setDrawingLineStyle":
     case "setImageAltText":
     case "removeLink":
@@ -316,16 +412,15 @@ function transformIntent(intent, ahead) {
     case "setFloatingPagePosition":
     case "resizeDrawing":
     case "resizeTableColumn":
-    case "resizeTableRow":
     case "moveTable":
     case "removeDrawing":
     case "setMathLinear":
     case "deleteMath":
     case "ensureHeaderFooter":
     case "deleteComment":
+    case "resolveComment":
+    case "editComment":
     case "insertBookmarkRange":
-    case "toggleCheckbox":
-    case "insertTable":
     case "acceptRevision":
     case "rejectRevision":
     case "acceptAllRevisions":
@@ -387,6 +482,7 @@ function applyIntentInner(doc, ids, intent, out) {
   const ctx = { suggesting: false, revMeta: () => {
     throw new Error("suggesting mode unsupported headlessly");
   } };
+  if (isRegisteredIntent(intent)) return applyRegistered(doc, ids, runOf, intent);
   switch (intent.kind) {
     case "insertText": {
       const caret = resolveCaret(ids, runOf, intent.at);
@@ -404,6 +500,43 @@ function applyIntentInner(doc, ids, intent, out) {
       out.scope = blockScope(ids, intent.at.blockId, intent.at.runId);
       return true;
     }
+    case "insertSeparator": {
+      const caret = resolveCaret(ids, runOf, intent.at);
+      if (!caret) return false;
+      if (intent.suggest) {
+        const s = intent.suggest;
+        const suggestCtx = { suggesting: true, revMeta: () => ({ author: s.author, date: s.date, nextId: () => doc.nextRevisionId() }) };
+        const scope = blockScope(ids, intent.at.blockId, intent.at.runId);
+        if (!applyInsertSeparator(doc, caret, intent.separator, suggestCtx)) return false;
+        if (doc.stableIds) resyncScope(doc, ids, scope);
+        out.scope = scope;
+        return true;
+      }
+      if (!applyInsertSeparator(doc, caret, intent.separator, ctx)) return false;
+      out.scope = blockScope(ids, intent.at.blockId, intent.at.runId);
+      return true;
+    }
+    case "deleteSeparator": {
+      const runEl = ids.elOf(intent.at.runId);
+      if (!runEl) return false;
+      const sepEl = separatorAtWireOffset(runEl, intent.at.offset);
+      if (!sepEl) return false;
+      if (intent.suggest) {
+        const s = intent.suggest;
+        const suggestCtx = { suggesting: true, revMeta: () => ({ author: s.author, date: s.date, nextId: () => doc.nextRevisionId() }) };
+        const scope2 = blockScope(ids, intent.at.blockId, intent.at.runId);
+        if (!applyDeleteSeparator(doc, sepEl, suggestCtx)) return false;
+        if (doc.stableIds) resyncScope(doc, ids, scope2);
+        out.scope = scope2;
+        return true;
+      }
+      const scope = blockScope(ids, intent.at.blockId, intent.at.runId);
+      const res = applyDeleteSeparator(doc, sepEl, ctx);
+      if (!res) return false;
+      if (res.removedRun) ids.prune(doc.editableRoots());
+      out.scope = scope;
+      return true;
+    }
     case "deleteText": {
       if (intent.end <= intent.start) return false;
       const caret = resolveCaret(ids, runOf, { blockId: intent.blockId, runId: intent.runId, offset: intent.start });
@@ -439,24 +572,19 @@ function applyIntentInner(doc, ids, intent, out) {
       const entry = runOf(runEl);
       if (!entry) return false;
       const seg = { run: entry.run, t: null, start: 0, end: 0, props: entry.run.props };
-      applyRunFormat(doc, [seg], intent.patch);
+      applyRunFormat(doc, [seg], intent.patch, suggestMeta(doc, intent.suggest));
       return true;
     }
     case "formatParagraph": {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
       const target = firstTextDescendant(blockEl) ?? blockEl;
+      const meta = suggestMeta(doc, intent.suggest);
       let changed = false;
-      if (intent.align) changed = setParagraphAlignment(doc, [target], intent.align) || changed;
-      if (intent.styleId !== void 0) changed = setParagraphStyle(doc, [target], intent.styleId) || changed;
+      if (intent.align) changed = setParagraphAlignment(doc, [target], intent.align, meta) || changed;
+      if (intent.styleId !== void 0) changed = setParagraphStyle(doc, [target], intent.styleId, meta) || changed;
       return changed;
     }
-    case "setListType": {
-      const blockEl = ids.elOf(intent.blockId);
-      if (!blockEl) return false;
-      const target = firstTextDescendant(blockEl) ?? blockEl;
-      return setListType(doc, [target], intent.listKind);
-    }
     case "formatRange": {
       if (intent.end <= intent.start) return false;
       const runEl = ids.elOf(intent.runId);
@@ -470,7 +598,7 @@ function applyIntentInner(doc, ids, intent, out) {
       const localEnd = hit.offset + (intent.end - intent.start);
       if (localEnd > hit.t.text.length) return false;
       const seg = { run: entry.run, t: hit.t, start: hit.offset, end: localEnd, props: entry.run.props };
-      const formatted = applyRunFormat(doc, [seg], intent.patch);
+      const formatted = applyRunFormat(doc, [seg], intent.patch, suggestMeta(doc, intent.suggest));
       if (formatted.length === 0) return false;
       const middleT = formatted[0].t;
       const middleRun = doc.findParentOf(middleT);
@@ -494,10 +622,11 @@ function applyIntentInner(doc, ids, intent, out) {
       if (!paraEl) return false;
       const target = firstTextDescendant(paraEl) ?? paraEl;
       const isInsert = intent.op === "rowAbove" || intent.op === "rowBelow" || intent.op === "colLeft" || intent.op === "colRight";
-      const before = isInsert ? trackedSet(ids, doc) : null;
-      const ok = applyTableOp(doc, target, intent.op);
+      const createsNodes = isInsert || intent.op === "mergeDown" || intent.op === "splitCell";
+      const before = createsNodes ? trackedSet(ids, doc) : null;
+      const ok = applyTableOp(doc, target, intent.op, suggestMeta(doc, intent.suggest));
       if (!ok) return false;
-      if (isInsert && before && intent.nodeIds) {
+      if (before && intent.nodeIds) {
         const fresh = [];
         walkTracked(doc, (el) => {
           if (!before.has(el)) fresh.push(el);
@@ -505,7 +634,8 @@ function applyIntentInner(doc, ids, intent, out) {
         for (let k = 0; k < fresh.length && k < intent.nodeIds.length; k++) {
           ids.reassign(fresh[k], intent.nodeIds[k]);
         }
-      } else {
+      }
+      if (!isInsert) {
         ids.prune(doc.editableRoots());
       }
       return true;
@@ -513,6 +643,14 @@ function applyIntentInner(doc, ids, intent, out) {
     case "mergeParagraph": {
       const pEl = ids.elOf(intent.blockId);
       if (!pEl) return false;
+      const meta = suggestMeta(doc, intent.suggest);
+      if (meta) {
+        const previous = siblingParagraph(doc, pEl, -1);
+        if (!previous) return false;
+        markParagraphGlyph(previous, "del", meta);
+        doc.refresh();
+        return true;
+      }
       const ok = mergeParagraphBackward(doc, pEl);
       if (ok) ids.prune(doc.editableRoots());
       return ok;
@@ -599,7 +737,7 @@ function applyIntentInner(doc, ids, intent, out) {
       if (!runEl) return false;
       const entry = runOf(runEl);
       if (!entry || !entry.firstT) return false;
-      const relId = doc.registerPendingImage(intent.blobSha, intent.ext, { iv: intent.iv });
+      const relId = doc.registerPendingImage(intent.blobSha, intent.ext, { iv: intent.iv }, runEl);
       const before = trackedSet(ids, doc);
       const newRun = insertImageAt(doc, entry.firstT, relId, intent.widthPx, intent.heightPx);
       if (!newRun) return false;
@@ -663,7 +801,7 @@ function applyIntentInner(doc, ids, intent, out) {
       const entry = runOf(runEl);
       if (!entry || !entry.firstT) return false;
       const before = trackedSet(ids, doc);
-      const drawing = insertWordArtAt(doc, entry.firstT, intent.text, intent.preset);
+      const drawing = insertWordArtAt(doc, entry.firstT, intent.text, intent.preset, intent.style);
       if (!drawing) return false;
       assignFreshTracked(ids, doc, before, intent.nodeIds);
       return true;
@@ -715,49 +853,56 @@ function applyIntentInner(doc, ids, intent, out) {
     case "setDrawingRotation": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setDrawingRotation(doc, drawing, intent.degrees);
     }
     case "setDrawingFill": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setDrawingFill(doc, drawing, intent.color);
     }
     case "setChartData": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setChartData(doc, drawing, intent.chart);
     }
     case "setSmartArtNodeText": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setSmartArtNodeText(doc, drawing, intent.index, intent.text);
     }
     case "setDrawingWordArtText": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setDrawingWordArtText(doc, drawing, intent.text);
     }
+    case "setDrawingWordArtStyle": {
+      const runEl = ids.elOf(intent.runId);
+      if (!runEl) return false;
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
+      if (!drawing) return false;
+      return setDrawingWordArtStyle(doc, drawing, intent.color, intent.opacity);
+    }
     case "setDrawingLineStyle": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setDrawingLineStyle(doc, drawing, intent.color, intent.widthPx, intent.dash);
     }
     case "setImageAltText": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setImageAltText(doc, drawing, intent.alt);
     }
@@ -771,49 +916,49 @@ function applyIntentInner(doc, ids, intent, out) {
     case "setImageWrap": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setImageWrap(doc, drawing, intent.mode);
     }
     case "setDrawingOrder": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setDrawingOrder(doc, drawing, intent.order);
     }
     case "setSmartArtData": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setSmartArtData(doc, drawing, intent.smartArt);
     }
     case "setSmartArtFill": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setSmartArtFill(doc, drawing, intent.color, intent.nodeIndex);
     }
     case "setSmartArtTextFormat": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setSmartArtTextFormat(doc, drawing, intent.format, intent.nodeIndex);
     }
     case "setFloatingPagePosition": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return setFloatingPagePosition(doc, drawing, intent.xPx, intent.yPx);
     }
     case "resizeDrawing": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       return resizeDrawing(doc, drawing, intent.widthPx, intent.heightPx);
     }
@@ -822,11 +967,6 @@ function applyIntentInner(doc, ids, intent, out) {
       if (!tbl) return false;
       return resizeTableColumn(doc, tbl, intent.boundary, intent.deltaPx, intent.renderedWidths);
     }
-    case "resizeTableRow": {
-      const tbl = tableOfParagraph(doc, ids, intent.cellParagraphId);
-      if (!tbl) return false;
-      return resizeTableRow(doc, tbl, intent.rowIdx, intent.heightPx);
-    }
     case "moveTable": {
       const tbl = tableOfParagraph(doc, ids, intent.cellParagraphId);
       if (!tbl) return false;
@@ -835,7 +975,7 @@ function applyIntentInner(doc, ids, intent, out) {
     case "removeDrawing": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
-      const drawing = firstDrawingIn(runEl);
+      const drawing = drawingIn(runEl, intent.objectIndex, runOf);
       if (!drawing) return false;
       const ok = removeDrawingRun(doc, drawing);
       if (ok) ids.prune(doc.editableRoots());
@@ -844,21 +984,21 @@ function applyIntentInner(doc, ids, intent, out) {
     case "setMathLinear": {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
-      const math = firstMathIn(blockEl);
+      const math = mathIn(blockEl, intent.mathIndex);
       if (!math) return false;
       return setMathLinear(doc, math, intent.mathText);
     }
     case "deleteMath": {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
-      const math = firstMathIn(blockEl);
+      const math = mathIn(blockEl, intent.mathIndex);
       if (!math) return false;
       return deleteMath(doc, math);
     }
     case "moveMath": {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
-      const math = firstMathIn(blockEl);
+      const math = mathIn(blockEl, intent.mathIndex);
       if (!math) return false;
       const dest = resolveCaret(ids, runOf, intent.at);
       if (!dest) return false;
@@ -884,6 +1024,10 @@ function applyIntentInner(doc, ids, intent, out) {
     }
     case "deleteComment":
       return deleteComment(doc, intent.commentId);
+    case "resolveComment":
+      return setCommentResolved(doc, intent.commentId, intent.resolved, recordedProvenance({ paraIds: [intent.paraId] }));
+    case "editComment":
+      return editCommentText(doc, intent.commentId, intent.text);
     case "insertBookmarkRange": {
       const runEl = ids.elOf(intent.runId);
       if (!runEl) return false;
@@ -897,16 +1041,6 @@ function applyIntentInner(doc, ids, intent, out) {
       const seg = { run: entry.run, t: hit.t, start: hit.offset, end: localEnd, props: entry.run.props };
       return insertBookmarkAroundSelection(doc, [seg], intent.name);
     }
-    case "toggleCheckbox": {
-      const runEl = ids.elOf(intent.runId);
-      if (!runEl) return false;
-      const entry = runOf(runEl);
-      if (!entry) return false;
-      const cbEl = checkboxStateElement(entry.run, entry.firstT);
-      if (!cbEl) return false;
-      toggleCheckbox(doc, cbEl);
-      return true;
-    }
     case "acceptRevision": {
       const refs = collectRevisions(doc);
       if (intent.index >= refs.length) return false;
@@ -918,19 +1052,9 @@ function applyIntentInner(doc, ids, intent, out) {
       return rejectRevision(doc, refs[intent.index]);
     }
     case "acceptAllRevisions":
-      return acceptAllRevisions(doc) > 0;
+      return acceptAllRevisions(doc, intent.author) > 0;
     case "rejectAllRevisions":
-      return rejectAllRevisions(doc) > 0;
-    case "insertTable": {
-      const runEl = ids.elOf(intent.runId);
-      if (!runEl) return false;
-      const entry = runOf(runEl);
-      if (!entry || !entry.firstT) return false;
-      const before = trackedSet(ids, doc);
-      const ok = insertTableAfter(doc, entry.firstT, intent.rows, intent.cols);
-      if (ok) assignFreshTracked(ids, doc, before, intent.nodeIds);
-      return ok;
-    }
+      return rejectAllRevisions(doc, intent.author) > 0;
     case "setLink": {
       if (!isSafeUrl(intent.url)) return false;
       const runEl = ids.elOf(intent.runId);
@@ -980,13 +1104,13 @@ function applyIntentInner(doc, ids, intent, out) {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
       const target = firstTextDescendant(blockEl) ?? blockEl;
-      return adjustIndent(doc, [target], intent.direction);
+      return adjustIndent(doc, [target], intent.direction, suggestMeta(doc, intent.suggest));
     }
     case "setSpacing": {
       const blockEl = ids.elOf(intent.blockId);
       if (!blockEl) return false;
       const target = firstTextDescendant(blockEl) ?? blockEl;
-      return setParagraphSpacing(doc, [target], intent.patch);
+      return setParagraphSpacing(doc, [target], intent.patch, suggestMeta(doc, intent.suggest));
     }
     case "insertPageField": {
       const runEl = ids.elOf(intent.runId);
@@ -1044,14 +1168,65 @@ function applyIntentInner(doc, ids, intent, out) {
       assignFreshTracked(ids, doc, before, intent.nodeIds);
       return true;
     }
+    default: {
+      const exhaustive = intent;
+      return exhaustive;
+    }
   }
 }
+function resolveOperationTarget(doc, ids, runOf, address, intent) {
+  const empty = { t: null, run: null, cellParagraph: null, drawing: null };
+  if (address === "document") return { ...empty, el: doc.docRoot };
+  const addressId = intent[ADDRESS_WIRE_FIELD[address]];
+  switch (address) {
+    case "run": {
+      const el = ids.elOf(addressId);
+      if (!el) return null;
+      const entry = runOf(el);
+      if (!entry) return null;
+      return { ...empty, el, t: entry.firstT ?? null, run: entry.run };
+    }
+    case "block": {
+      const el = ids.elOf(addressId);
+      if (!el) return null;
+      return { ...empty, el, t: firstTextDescendant(el) };
+    }
+    case "cell": {
+      const paraEl = ids.elOf(addressId) ?? null;
+      const tbl = paraEl ? tableOf(doc, paraEl) : null;
+      return tbl ? { ...empty, el: tbl, cellParagraph: paraEl } : null;
+    }
+    case "object": {
+      const el = ids.elOf(addressId);
+      if (!el) return null;
+      const objectIndex = intent.objectIndex;
+      const drawing = drawingIn(el, objectIndex, runOf);
+      return drawing ? { ...empty, el, drawing } : null;
+    }
+  }
+}
+function applyRegistered(doc, ids, runOf, intent) {
+  const definition = registeredOperation(intent.kind);
+  if (!definition) return false;
+  const target = resolveOperationTarget(doc, ids, runOf, definition.address, intent);
+  if (!target) return false;
+  const nodeIds = "nodeIds" in intent ? intent.nodeIds : void 0;
+  const before = nodeIds ? trackedSet(ids, doc) : null;
+  if (!applyRegisteredOperation(doc, target, intent)) return false;
+  if (definition.prunesIds) ids.prune(doc.editableRoots());
+  if (before && nodeIds) assignFreshTracked(ids, doc, before, nodeIds);
+  return true;
+}
 function assignFreshTracked(ids, doc, before, nodeIds) {
   const fresh = [];
   walkTracked(doc, (el) => {
     if (!before.has(el)) fresh.push(el);
   });
-  for (let k = 0; k < fresh.length && k < nodeIds.length; k++) ids.reassign(fresh[k], nodeIds[k]);
+  for (const el of fresh) ids.unassign(el);
+  for (let k = 0; k < fresh.length; k++) {
+    if (k < nodeIds.length) ids.reassign(fresh[k], nodeIds[k]);
+    else ids.assign(fresh[k]);
+  }
 }
 function localRun(el) {
   const n = el.name;
@@ -1080,27 +1255,41 @@ function firstTextDescendant(el) {
 }
 function tableOfParagraph(doc, ids, cellParagraphId) {
   const paraEl = ids.elOf(cellParagraphId);
-  if (!paraEl) return null;
-  for (let cur = paraEl; cur; cur = doc.findParentOf(cur) ?? null) {
+  return paraEl ? tableOf(doc, paraEl) : null;
+}
+function tableOf(doc, el) {
+  for (let cur = el; cur; cur = doc.findParentOf(cur) ?? null) {
     if (localName(cur.name) === "tbl") return cur;
   }
   return null;
 }
 function firstDrawingIn(el) {
-  if (["drawing", "shape", "rect"].includes(localName(el.name))) return el;
+  if (["drawing", "shape", "rect", "line"].includes(localName(el.name))) return el;
   for (const c of el.children) {
     const found = firstDrawingIn(c);
     if (found) return found;
   }
   return null;
 }
-function firstMathIn(el) {
-  if (localName(el.name) === "oMath") return el;
-  for (const c of el.children) {
-    const found = firstMathIn(c);
-    if (found) return found;
-  }
-  return null;
+function drawingSource(content) {
+  if (content.kind === "image" || content.kind === "drawing") return content.srcDrawing;
+  if (content.kind !== "anchor") return void 0;
+  const shape = content.shape;
+  if (shape.type === "wordart") return shape.src;
+  if (shape.type === "line") return shape.src;
+  return shape.srcDrawing;
+}
+function drawingIn(runEl, objectIndex, runOf) {
+  if (objectIndex === void 0) return firstDrawingIn(runEl);
+  const content = runOf(runEl)?.run.content[objectIndex];
+  return content ? drawingSource(content) ?? null : null;
+}
+function mathsIn(el) {
+  if (localName(el.name) === "oMath") return [el];
+  return el.children.flatMap(mathsIn);
+}
+function mathIn(el, index = 0) {
+  return mathsIn(el)[index] ?? null;
 }
 function runEntry(run) {
   return { run, firstT: run.content.find((c) => c.kind === "text")?.srcT };
@@ -1629,6 +1818,10 @@ function toSuggestions(tail, author, date) {
   for (const intent of tail) {
     if (intent.kind === "insertText") {
       suggestions.push({ kind: "insertText", at: intent.at, text: intent.text, suggest: { author, date } });
+    } else if (intent.kind === "insertSeparator") {
+      suggestions.push({ kind: "insertSeparator", at: intent.at, separator: intent.separator, suggest: { author, date } });
+    } else if (intent.kind === "deleteSeparator") {
+      suggestions.push({ kind: "deleteSeparator", at: intent.at, suggest: { author, date } });
     } else if (intent.kind === "deleteText") {
       suggestions.push({
         kind: "suggestRevision",
@@ -1656,7 +1849,7 @@ function arrivalMode(tailLength, diverged, opts = {}) {
 }
 
 // ../collab/src/protocol.ts
-var ENGINE_VERSION = "e11";
+var ENGINE_VERSION = "e19";
 var PRESENCE_MAX_RANGES = 64;
 function sanitizePresencePosition(pos) {
   if (!pos || !pos.ranges) return pos;
@@ -1672,7 +1865,7 @@ function sanitizePresencePosition(pos) {
   if (clean.length === pos.ranges.length) return pos;
   return clean.length > 0 ? { ...pos, ranges: clean } : { ...pos, ranges: void 0 };
 }
-var PROTOCOL_VERSION = 5;
+var PROTOCOL_VERSION = 6;
 
 // ../collab/src/id-allocator.ts
 var CarriedIdAllocator = class {
@@ -2223,9 +2416,19 @@ var _CollabConnection = class _CollabConnection {
       sinceSeq: 0,
       profile: opts?.profile,
       codeProof: opts?.codeProof,
-      ownerToken: opts?.ownerToken
+      ownerToken: opts?.ownerToken,
+      agentInvite: opts?.agentInvite
     });
   }
+  registerAgentInvite(inviteId, token, expiresAt) {
+    this.transport.send({ t: "agent-invite", inviteId, token, expiresAt });
+  }
+  revokeAgentInvite(inviteId) {
+    this.transport.send({ t: "agent-invite-revoke", inviteId });
+  }
+  sendAgentChat(agentClientId, messageId, iv, ciphertext) {
+    this.transport.send({ t: "agent-chat", agentClientId, messageId, iv, ciphertext });
+  }
   /** Owner admin op (doc 14 §2.5): honored only if this connection proved
    * the owner token at hello — otherwise the server refuses `not-owner`. */
   admin(action) {
@@ -2491,6 +2694,22 @@ var _CollabConnection = class _CollabConnection {
         this.cb.onRoster?.(msg.roster);
         return;
       }
+      case "agent-invite-registered": {
+        this.cb.onAgentInviteRegistered?.({ inviteId: msg.inviteId, expiresAt: msg.expiresAt });
+        return;
+      }
+      case "agent-invite-refused": {
+        this.cb.onAgentInviteRefused?.({ inviteId: msg.inviteId, reason: msg.reason });
+        return;
+      }
+      case "agent-connected": {
+        this.cb.onAgentConnected?.(msg);
+        return;
+      }
+      case "agent-chat": {
+        this.cb.onAgentChat?.(msg);
+        return;
+      }
       case "session-warning": {
         this.cb.onSessionWarning?.({ reason: msg.reason, inMs: msg.inMs });
         return;
@@ -2591,7 +2810,12 @@ function invertIntent(doc, ids, intent) {
     }
     // Formatting / table / comment / merge inverses need prior-state capture
     // (was-bold?, the merged paragraph's structure, …) — a documented
-    // extension; not undoable yet.
+    // extension; not undoable yet. That includes pasteBlocks: a rich paste in
+    // a ROOM is not undoable (its inverse — remove N spliced blocks plus
+    // re-merge the split — has no wire form yet), so Cmd+Z after a room paste
+    // stops at it as a cannot-undo marker (see submitUndoNow). The
+    // single-process session is unaffected: it replays local history
+    // (EditorHost.onLocalHistory) and undoes a paste as one step.
     default:
       return null;
   }
@@ -2607,7 +2831,8 @@ var DEFAULT_INTENT_LIMITS = {
 };
 function chartError(c, who) {
   if (typeof c !== "object" || c === null) return `${who}: bad chart`;
-  if (!["column", "bar", "line", "pie"].includes(c.type)) return `${who}: bad type`;
+  if (!["column", "bar", "line", "pie", "doughnut", "area", "scatter"].includes(c.type)) return `${who}: bad type`;
+  if (c.grouping !== void 0 && !["clustered", "stacked", "percentStacked"].includes(c.grouping)) return `${who}: bad grouping`;
   if (!Array.isArray(c.categories) || c.categories.length === 0 || c.categories.length > 100) return `${who}: bad categories`;
   if (c.categories.some((x) => typeof x !== "string" || x.length > 200)) return `${who}: bad category`;
   if (c.title !== void 0 && (typeof c.title !== "string" || c.title.length > 200)) return `${who}: bad title`;
@@ -2625,8 +2850,49 @@ function smartArtError(a, who) {
   if (a.items.some((x) => typeof x !== "string" || x.length > 500)) return `${who}: bad item`;
   return null;
 }
+function badCharacterStyle(patch, who) {
+  const id = patch?.characterStyleId;
+  if (id === void 0 || id === null) return null;
+  return typeof id === "string" && /^[A-Za-z0-9\-_]{1,253}$/.test(id) ? null : `${who}: bad characterStyleId`;
+}
+function badTextEffect(patch, who) {
+  const effect = patch?.textEffect;
+  if (effect === void 0 || effect === null) return null;
+  if (typeof effect !== "object") return `${who}: bad textEffect`;
+  const e = effect;
+  if (e.shadow !== void 0 && typeof e.shadow !== "boolean") return `${who}: bad textEffect.shadow`;
+  if (e.outline !== void 0 && e.outline !== null) {
+    if (typeof e.outline !== "object") return `${who}: bad textEffect.outline`;
+    const o = e.outline;
+    if (typeof o.color !== "string" || !/^#?[0-9a-fA-F]{6}$/.test(o.color)) return `${who}: bad textEffect.outline.color`;
+    if (typeof o.widthPt !== "number" || !Number.isFinite(o.widthPt) || o.widthPt <= 0 || o.widthPt > 50) {
+      return `${who}: bad textEffect.outline.widthPt`;
+    }
+  }
+  return null;
+}
 function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
   const nonNegInt = (n) => Number.isInteger(n) && n >= 0;
+  if (typeof intent.clientId !== "string" || intent.clientId.length === 0 || intent.clientId.length > 128) {
+    return "intent: bad clientId";
+  }
+  if (!nonNegInt(intent.clientSeq)) return "intent: bad clientSeq";
+  if (!nonNegInt(intent.base)) return "intent: bad base";
+  const badMathIndex = (math, kind) => math.mathIndex === void 0 || nonNegInt(math.mathIndex) && math.mathIndex <= 1e3 ? null : `${kind}: bad mathIndex`;
+  const badSuggest = (suggest) => {
+    if (suggest === void 0) return null;
+    if (typeof suggest.author !== "string" || suggest.author.length > 100) return `${intent.kind}: bad author`;
+    if (typeof suggest.date !== "string" || suggest.date.length > 40) return `${intent.kind}: bad date`;
+    return null;
+  };
+  if ("suggest" in intent && intent.kind !== "suggestRevision") {
+    const bad = badSuggest(intent.suggest);
+    if (bad) return bad;
+  }
+  if ("objectIndex" in intent && intent.objectIndex !== void 0 && (!Number.isInteger(intent.objectIndex) || intent.objectIndex < 0 || intent.objectIndex > 1e4)) {
+    return `${intent.kind}: bad objectIndex`;
+  }
+  if (isRegisteredIntent(intent)) return validateRegisteredOperation(intent);
   switch (intent.kind) {
     case "insertText":
       if (typeof intent.text !== "string") return "insertText: text not a string";
@@ -2634,6 +2900,13 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       if (intent.text.length > limits.maxInsertLength) return "insertText: too long";
       if (!nonNegInt(intent.at.offset)) return "insertText: bad offset";
       return null;
+    case "insertSeparator":
+      if (intent.separator !== "br" && intent.separator !== "tab") return "insertSeparator: bad separator";
+      if (!nonNegInt(intent.at.offset)) return "insertSeparator: bad offset";
+      return null;
+    case "deleteSeparator":
+      if (!nonNegInt(intent.at.offset)) return "deleteSeparator: bad offset";
+      return null;
     case "suggestRevision": {
       const nRanges = intent.ranges?.length ?? 0;
       const nMarks = intent.marks?.length ?? 0;
@@ -2658,15 +2931,11 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
     case "splitParagraph":
       if (!nonNegInt(intent.at.offset)) return "splitParagraph: bad offset";
       if (!nonNegInt(intent.newBlockId) || !nonNegInt(intent.newRunId)) return "splitParagraph: bad ids";
-      if (intent.suggest !== void 0) {
-        if (typeof intent.suggest.author !== "string" || intent.suggest.author.length > 100) return "splitParagraph: bad author";
-        if (typeof intent.suggest.date !== "string" || intent.suggest.date.length > 40) return "splitParagraph: bad date";
-      }
       return null;
     case "formatRange":
       if (!nonNegInt(intent.start) || !nonNegInt(intent.end) || intent.end <= intent.start) return "formatRange: bad range";
       if (!nonNegInt(intent.middleId)) return "formatRange: bad middleId";
-      return null;
+      return badCharacterStyle(intent.patch, "formatRange") ?? badTextEffect(intent.patch, "formatRange");
     case "commentRun":
       if (typeof intent.text !== "string" || intent.text.length === 0) return "commentRun: empty";
       if (intent.text.length > limits.maxCommentLength) return "commentRun: too long";
@@ -2692,11 +2961,9 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       if (typeof intent.mathText !== "string" || intent.mathText.length === 0) return "insertMath: empty";
       if (intent.mathText.length > 1e4) return "insertMath: too long";
       return null;
-    case "insertShape": {
-      const presets = ["line", "verticalLine", "rectangle", "roundedRectangle", "ellipse", "diamond", "textBox"];
-      if (!presets.includes(intent.preset)) return "insertShape: bad preset";
+    case "insertShape":
+      if (typeof intent.preset !== "string" || !isValidShapePreset(intent.preset)) return "insertShape: bad preset";
       return null;
-    }
     case "replyComment":
       if (typeof intent.text !== "string" || intent.text.length === 0) return "replyComment: empty";
       if (intent.text.length > 2e4) return "replyComment: too long";
@@ -2766,7 +3033,19 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
     case "insertWordArt": {
       if (typeof intent.text !== "string" || intent.text.length === 0) return "insertWordArt: empty text";
       if (intent.text.length > 500) return "insertWordArt: text too long";
-      if (!["plain", "archUp", "archDown", "wave", "chevron"].includes(intent.preset)) return "insertWordArt: bad preset";
+      if (!["plain", "archUp", "archDown", "wave", "chevron", "circle", "button", "chevronDown"].includes(intent.preset)) return "insertWordArt: bad preset";
+      if (intent.style !== void 0) {
+        const style = intent.style;
+        if (typeof style !== "object" || style === null) return "insertWordArt: bad style";
+        if (!/^[0-9a-fA-F]{6}$/.test(style.fill)) return "insertWordArt: bad style fill";
+        if (style.shadow !== void 0 && typeof style.shadow !== "boolean") return "insertWordArt: bad style shadow";
+        if (style.outline !== void 0) {
+          if (typeof style.outline !== "object" || style.outline === null) return "insertWordArt: bad style outline";
+          if (!/^[0-9a-fA-F]{6}$/.test(style.outline.color)) return "insertWordArt: bad outline color";
+          const width = style.outline.widthPt;
+          if (typeof width !== "number" || !Number.isFinite(width) || width <= 0 || width > 50) return "insertWordArt: bad outline width";
+        }
+      }
       return null;
     }
     case "insertChart":
@@ -2780,7 +3059,12 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
     case "setDrawingWordArtText":
       if (typeof intent.text !== "string" || intent.text.length === 0 || intent.text.length > 500) return "setDrawingWordArtText: bad text";
       return null;
+    case "setDrawingWordArtStyle":
+      if (!/^[0-9a-fA-F]{6}$/.test(intent.color)) return "setDrawingWordArtStyle: bad color";
+      if (typeof intent.opacity !== "number" || !Number.isFinite(intent.opacity) || intent.opacity < 0 || intent.opacity > 1) return "setDrawingWordArtStyle: bad opacity";
+      return null;
     case "setDrawingLineStyle":
+      if (intent.color === null) return null;
       if (!/^[0-9a-fA-F]{6}$/.test(intent.color)) return "setDrawingLineStyle: bad color";
       if (typeof intent.widthPx !== "number" || !Number.isFinite(intent.widthPx) || intent.widthPx <= 0 || intent.widthPx > 100) return "setDrawingLineStyle: bad width";
       if (!["solid", "dashed", "dotted"].includes(intent.dash)) return "setDrawingLineStyle: bad dash";
@@ -2834,11 +3118,6 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       }
       return null;
     }
-    case "resizeTableRow": {
-      if (!Number.isInteger(intent.rowIdx) || intent.rowIdx < 0 || intent.rowIdx > 5e3) return "resizeTableRow: bad row";
-      if (typeof intent.heightPx !== "number" || !Number.isFinite(intent.heightPx) || intent.heightPx < 1 || intent.heightPx > 2e4) return "resizeTableRow: bad height";
-      return null;
-    }
     case "moveTable": {
       const num = (v) => typeof v === "number" && Number.isFinite(v) && v >= -5e3 && v <= 2e4;
       if (!num(intent.xPx) || !num(intent.yPx)) return "moveTable: bad position";
@@ -2851,13 +3130,13 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
     // run-addressed only; resolution is the whole check
     case "setMathLinear":
       if (typeof intent.mathText !== "string" || intent.mathText.length === 0 || intent.mathText.length > 1e3) return "setMathLinear: bad mathText";
-      return null;
+      return badMathIndex(intent, "setMathLinear");
     case "deleteMath":
-      return null;
+      return badMathIndex(intent, "deleteMath");
     case "moveMath":
       if (!nonNegInt(intent.at?.offset)) return "moveMath: bad offset";
       if (!Array.isArray(intent.nodeIds) || intent.nodeIds.length > 64) return "moveMath: bad nodeIds";
-      return null;
+      return badMathIndex(intent, "moveMath");
     case "ensureHeaderFooter":
       if (intent.hfKind !== "header" && intent.hfKind !== "footer") return "ensureHeaderFooter: bad kind";
       if (!Array.isArray(intent.nodeIds) || intent.nodeIds.length > 64) return "ensureHeaderFooter: bad nodeIds";
@@ -2865,24 +3144,30 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
     case "deleteComment":
       if (typeof intent.commentId !== "string" || intent.commentId.length === 0 || intent.commentId.length > 64) return "deleteComment: bad id";
       return null;
+    case "resolveComment":
+      if (typeof intent.commentId !== "string" || intent.commentId.length === 0 || intent.commentId.length > 64) return "resolveComment: bad id";
+      if (typeof intent.resolved !== "boolean") return "resolveComment: bad resolved";
+      if (typeof intent.paraId !== "string" || intent.paraId.length === 0 || intent.paraId.length > 16) return "resolveComment: bad paraId";
+      return null;
+    case "editComment":
+      if (typeof intent.commentId !== "string" || intent.commentId.length === 0 || intent.commentId.length > 64) return "editComment: bad id";
+      if (typeof intent.text !== "string" || intent.text.length === 0) return "editComment: empty";
+      if (intent.text.length > limits.maxCommentLength) return "editComment: too long";
+      return null;
     case "insertBookmarkRange":
       if (typeof intent.name !== "string" || !/^[A-Za-z_][A-Za-z0-9_]{0,39}$/.test(intent.name)) return "insertBookmarkRange: bad name";
       if (!nonNegInt(intent.start) || !nonNegInt(intent.end) || intent.end <= intent.start) return "insertBookmarkRange: bad range";
       return null;
-    case "toggleCheckbox":
-      return null;
     case "acceptRevision":
     case "rejectRevision":
       if (!nonNegInt(intent.index) || intent.index > 1e5) return `${intent.kind}: bad index`;
       return null;
     case "acceptAllRevisions":
     case "rejectAllRevisions":
+      if (intent.author !== void 0 && (typeof intent.author !== "string" || intent.author.length > 255)) {
+        return `${intent.kind}: bad author`;
+      }
       return null;
-    case "insertTable": {
-      const okDim = (v) => typeof v === "number" && Number.isInteger(v) && v >= 1 && v <= 50;
-      if (!okDim(intent.rows) || !okDim(intent.cols)) return "insertTable: bad dimensions";
-      return null;
-    }
     case "setLineNumbering": {
       const p = intent.patch;
       if (typeof p !== "object" || p === null || typeof p.enabled !== "boolean") return "setLineNumbering: bad patch";
@@ -2898,38 +3183,8 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       return null;
     }
     case "insertField": {
-      if (typeof intent.instruction !== "string" || intent.instruction.length === 0 || intent.instruction.length > 200) return "insertField: bad instruction";
       if (intent.cachedResult !== void 0 && (typeof intent.cachedResult !== "string" || intent.cachedResult.length > 1e3)) return "insertField: bad cachedResult";
-      const SAFE_FIELDS = /* @__PURE__ */ new Set([
-        "PAGE",
-        "NUMPAGES",
-        "SECTIONPAGES",
-        "SECTION",
-        "DATE",
-        "TIME",
-        "CREATEDATE",
-        "SAVEDATE",
-        "PRINTDATE",
-        "AUTHOR",
-        "TITLE",
-        "SUBJECT",
-        "KEYWORDS",
-        "COMMENTS",
-        "FILENAME",
-        "NUMWORDS",
-        "NUMCHARS",
-        "PAGEREF",
-        "REF",
-        "SEQ",
-        "STYLEREF",
-        "TOC",
-        "INDEX",
-        "LISTNUM",
-        "QUOTE"
-      ]);
-      const type = intent.instruction.trim().split(/\s+/)[0]?.toUpperCase();
-      if (!type || !SAFE_FIELDS.has(type)) return "insertField: field type not allowed";
-      if (!/^[\x20-\x7e]+$/.test(intent.instruction)) return "insertField: illegal instruction char";
+      if (!isInsertableFieldInstruction(intent.instruction)) return "insertField: instruction not allowed";
       return null;
     }
     case "setDrawingRotation":
@@ -2939,14 +3194,14 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       if (intent.color !== null && !/^[0-9a-fA-F]{6}$/.test(intent.color)) return "setDrawingFill: bad color";
       return null;
     case "formatRun":
+      return badCharacterStyle(intent.patch, "formatRun") ?? badTextEffect(intent.patch, "formatRun");
     case "formatParagraph":
-    case "setListType":
     case "mergeParagraph":
       return null;
     case "tableOp": {
       const op = intent.op;
       if (typeof op === "string") {
-        return ["deleteRow", "deleteCol", "deleteTable", "rowAbove", "rowBelow", "colLeft", "colRight"].includes(op) ? null : "tableOp: bad operation";
+        return ["deleteRow", "deleteCol", "deleteTable", "rowAbove", "rowBelow", "colLeft", "colRight", "mergeRight", "mergeDown", "splitCell"].includes(op) ? null : "tableOp: bad operation";
       }
       if (op.kind === "cellShading") {
         return op.fill === null || /^[0-9a-fA-F]{6}$/.test(op.fill) ? null : "tableOp: bad shading";
@@ -2958,6 +3213,10 @@ function validateIntent(intent, limits = DEFAULT_INTENT_LIMITS) {
       if (op.wrapping !== "none" && op.wrapping !== "around" || !Number.isFinite(op.xPx) || !Number.isFinite(op.yPx)) return "tableOp: bad text wrapping";
       return null;
     }
+    default: {
+      const exhaustive = intent;
+      return exhaustive;
+    }
   }
 }
 
@@ -3300,6 +3559,15 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
     this.activity = [];
     /** Bundle being resumed from (consumed after the welcome replay). */
     this.resuming = null;
+    this.queuedUndos = 0;
+    this.undoDeadlineTimer = null;
+    /**
+     * How long held undos wait for the pending queue to drain before they are
+     * dropped. A few seconds: long enough to cover an ordinary round trip under
+     * load, short enough that a dead connection tells the user quickly. Settable
+     * for tests.
+     */
+    this.undoDrainTimeoutMs = 5e3;
     /**
      * Throws on the ingest/submit chain — in practice a seal or transport send
      * that failed AFTER the edit was accepted locally and counted as pending.
@@ -3392,6 +3660,7 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
       codeProof: opts?.codeProof,
       ownerToken: opts?.ownerToken,
       // owner-capability proof (doc 14 §2.5)
+      agentInvite: opts?.agentInvite,
       engineVersion: ENGINE_VERSION
       // the fence for client-derived canon (doc 13 §2)
     });
@@ -3437,6 +3706,15 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
   setProfile(profile) {
     this.transport.send({ t: "profile", profile });
   }
+  registerAgentInvite(inviteId, token, expiresAt) {
+    this.transport.send({ t: "agent-invite", inviteId, token, expiresAt });
+  }
+  revokeAgentInvite(inviteId) {
+    this.transport.send({ t: "agent-invite-revoke", inviteId });
+  }
+  sendAgentChat(agentClientId, messageId, iv, ciphertext) {
+    this.transport.send({ t: "agent-chat", agentClientId, messageId, iv, ciphertext });
+  }
   /**
    * Rejoin from a persisted bundle (doc 12 §5, encrypted flavor). Identical
    * contract to the plaintext connection: clientSeq watermark restored
@@ -3462,7 +3740,9 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
    * connection — the react layer's `as unknown as CollabConnection` cast
    * hid it from the typechecker, so the demo's owner controls were silent
    * TypeErrors on encrypted docs (the default), long misattributed to a
-   * Vite prebundle race ("stale session w/o admin"). */
+   * Vite prebundle race ("stale session w/o admin"). That cast is gone: this
+   * class now `implements CollabConnectionLike`, so the same omission is a
+   * compile error rather than a runtime silence. */
   admin(action) {
     this.transport.send({ t: "admin", action });
   }
@@ -3509,7 +3789,87 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
     this.submitFull(intent, true);
   }
   /**
-   * COLLABORATIVE UNDO (plan doc 03 Phase 8), encrypted flavour.
+   * COLLABORATIVE UNDO, the entry point — a PENDING GATE in front of the real
+   * work below.
+   *
+   * The undo stack lives on the MIRROR, which advances only by ingesting
+   * sequenced envelopes, while this client paints its OWN edits optimistically
+   * the moment they are made. So between a keystroke and its echo the mirror
+   * has not seen it, and `submitUndoNow` would reverse the previous
+   * CONFIRMED action instead — the user types, presses Ctrl+Z, and watches an
+   * older edit disappear while the one they just made stays. Architecturally
+   * correct and completely wrong to a person.
+   *
+   * The press is therefore HELD while `pendingCount > 0` and run on the drain,
+   * against a mirror that by then holds the edit the user meant. Presses
+   * ACCUMULATE (two quick Ctrl+Z's undo two actions), because that is what the
+   * same two presses do outside a room.
+   *
+   * Held presses are not held forever: the deadline exists because a queue
+   * that never drains means the connection stopped carrying edits to
+   * confirmation, and running the undo then would reverse the wrong action
+   * anyway. At the deadline the queue is DROPPED and onUndoQueue reports it,
+   * beside the offline/writes-blocked affordances that are already up by then.
+   * Each press restarts that deadline, so it measures the wait the user is
+   * actually watching rather than the age of the oldest press.
+   *
+   * A held press targets whatever this client's newest action is WHEN IT RUNS,
+   * so typing during the wait makes the new keystrokes the undo's target. It
+   * cannot be otherwise — the whole reason the press is held is that the
+   * target it would name is not in the mirror yet — and it stays "undo my
+   * latest thing", which is what the key means.
+   */
+  undoLast() {
+    if (!this.mirror || !this.replica || !this.keys || !this.genesisId) return "unavailable";
+    if (this.replica.pendingCount === 0) return this.submitUndoNow();
+    this.queuedUndos++;
+    this.armUndoDeadline();
+    this.cb.onUndoQueue?.({ queued: this.queuedUndos, expired: false });
+    return "queued";
+  }
+  /** Undos held for the drain (see undoLast) — the count onUndoQueue reports. */
+  get undoQueued() {
+    return this.queuedUndos;
+  }
+  /**
+   * Run ONE held undo now that the pending queue is empty. True when it
+   * submitted — the queue is non-empty again, so the caller has nothing left
+   * to schedule.
+   */
+  runQueuedUndo() {
+    if (this.queuedUndos === 0) return false;
+    while (this.queuedUndos > 0) {
+      this.queuedUndos--;
+      const outcome = this.submitUndoNow();
+      if (outcome === "undone") {
+        if (this.queuedUndos > 0) this.armUndoDeadline();
+        else this.clearUndoDeadline();
+        this.cb.onUndoQueue?.({ queued: this.queuedUndos, expired: false });
+        return true;
+      }
+      if (outcome !== "changed-since") this.queuedUndos = 0;
+    }
+    this.clearUndoDeadline();
+    this.cb.onUndoQueue?.({ queued: 0, expired: false });
+    return false;
+  }
+  armUndoDeadline() {
+    this.clearUndoDeadline();
+    this.undoDeadlineTimer = setTimeout(() => {
+      this.undoDeadlineTimer = null;
+      if (this.queuedUndos === 0) return;
+      this.queuedUndos = 0;
+      this.cb.onUndoQueue?.({ queued: 0, expired: true });
+    }, this.undoDrainTimeoutMs);
+  }
+  clearUndoDeadline() {
+    if (this.undoDeadlineTimer !== null) clearTimeout(this.undoDeadlineTimer);
+    this.undoDeadlineTimer = null;
+  }
+  /**
+   * COLLABORATIVE UNDO (plan doc 03 Phase 8), encrypted flavour. Callers go
+   * through `undoLast`, which holds the press until the mirror can see this
+   * client's own edits; everything below assumes that already happened.
    *
    * The mirror is a real DocumentSession fed the canonical log, so it already
    * knows the inverse of this client's last action — no new wire message and
@@ -3526,7 +3886,7 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
    * canonical id table first, so the common conflict (someone else removed
    * the thing) is declined up front rather than painted and yanked back.
    */
-  undoLast() {
+  submitUndoNow() {
     if (!this.mirror || !this.replica || !this.keys || !this.genesisId) return "unavailable";
     const candidate = this.mirror.takeUndo(this.clientId);
     if (candidate.kind !== "undoable") return candidate.kind;
@@ -3743,6 +4103,22 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
         this.cb.onRoster?.(msg.roster);
         return;
       }
+      case "agent-invite-registered": {
+        this.cb.onAgentInviteRegistered?.({ inviteId: msg.inviteId, expiresAt: msg.expiresAt });
+        return;
+      }
+      case "agent-invite-refused": {
+        this.cb.onAgentInviteRefused?.({ inviteId: msg.inviteId, reason: msg.reason });
+        return;
+      }
+      case "agent-connected": {
+        this.cb.onAgentConnected?.(msg);
+        return;
+      }
+      case "agent-chat": {
+        this.cb.onAgentChat?.(msg);
+        return;
+      }
       // Session lifecycle warnings are PLAINTEXT bookkeeping and identical in
       // both modes: the deadline is the server's own policy, not document
       // content, so a blind sequencer announces it in the clear. Dispatched
@@ -3816,6 +4192,7 @@ var _EncryptedCollabConnection = class _EncryptedCollabConnection {
       this.scheduleStuckCheck();
       return;
     }
+    if (this.runQueuedUndo()) return;
     this.redriveBackoffMs = 0;
     if (this.redriveTimer !== null) {
       clearTimeout(this.redriveTimer);
@@ -4305,8 +4682,12 @@ function useCollab(opts) {
   const [notOwner, setNotOwner] = useState(false);
   const [epochChanged, setEpochChanged] = useState(null);
   const [roster, setRoster] = useState([]);
+  const [agentConnections, setAgentConnections] = useState([]);
+  const [agentChat, setAgentChat] = useState([]);
+  const [agentInviteError, setAgentInviteError] = useState(null);
   const [arrival, setArrival] = useState(null);
   const [selfHeals, setSelfHeals] = useState(0);
+  const [undoQueue, setUndoQueue] = useState({ queued: 0, expired: false });
   const [droppedPreReady, setDroppedPreReady] = useState(0);
   const [persistErrors, setPersistErrors] = useState(0);
   const [storeSlow, setStoreSlow] = useState(false);
@@ -4640,7 +5021,17 @@ function useCollab(opts) {
       // there is deliberately no per-reason branch here to get wrong.
       onSessionWarningCleared: () => setDeadlines((d) => d.idle === null ? d : { ...d, idle: null }),
       onRoster: (r) => setRoster(r),
+      onAgentInviteRegistered: () => setAgentInviteError(null),
+      onAgentInviteRefused: (invite) => setAgentInviteError(invite),
+      onAgentConnected: (agent) => setAgentConnections((current) => {
+        const next = current.filter((item) => item.inviteId !== agent.inviteId);
+        return [...next, agent];
+      }),
+      onAgentChat: (message) => setAgentChat((current) => [...current.slice(-199), message]),
       onSelfHeal: () => setSelfHeals((n) => n + 1),
+      // Held undos (see CollabSession.undoQueued): the count is authoritative
+      // in the connection, so it is copied rather than derived here.
+      onUndoQueue: (state) => setUndoQueue(state),
       // A submit that never left the client. Counted, never swallowed.
       onSubmitDropped: () => setDroppedPreReady((n) => n + 1),
       // Async failures with nowhere to return (seal, transport send). Surfaced
@@ -4829,7 +5220,13 @@ function useCollab(opts) {
     // at construction — a pre-existing modelling wrinkle, not this arc's), so
     // the access is structural. The TYPE is the real one now, so a change to
     // UndoOutcome breaks here rather than silently disagreeing.
-    undoLast: () => connectionRef.current === "live" ? connRef.current?.undoLast?.() ?? "unavailable" : "unavailable",
+    undoLast: () => {
+      if (connectionRef.current !== "live") return "unavailable";
+      setUndoQueue((state) => state.expired ? { queued: state.queued, expired: false } : state);
+      return connRef.current?.undoLast?.() ?? "unavailable";
+    },
+    undoQueued: undoQueue.queued,
+    undoExpired: undoQueue.expired,
     presence: connection === "live" ? presence : EMPTY_PRESENCE,
     refused,
     sessionWarning,
@@ -4899,6 +5296,18 @@ function useCollab(opts) {
     retryWrites: () => setReadOnlyBlocked(false),
     epochChanged,
     roster,
+    agentConnections,
+    agentChat,
+    agentInviteError,
+    registerAgentInvite: (inviteId, inviteToken, expiresAt) => {
+      if (connectionRef.current === "live") connRef.current?.registerAgentInvite(inviteId, inviteToken, expiresAt);
+    },
+    revokeAgentInvite: (inviteId) => {
+      if (connectionRef.current === "live") connRef.current?.revokeAgentInvite(inviteId);
+    },
+    sendAgentChat: (agentClientId, messageId, iv, ciphertext) => {
+      if (connectionRef.current === "live") connRef.current?.sendAgentChat(agentClientId, messageId, iv, ciphertext);
+    },
     setProfile: (p) => {
       if (connectionRef.current === "live") connRef.current?.setProfile(p);
     },
@@ -4962,7 +5371,7 @@ function CollabEditor(opts) {
   const session = useCollab(opts);
   useEffect(() => {
     opts.onSession?.(session);
-  }, [session.version, session.ready, session.refused, session.roster, session.epochChanged, session.sessionWarning, session.writesBlocked, session.connection, session.persistErrors, session.storeSlow, session.notOwner, session.arrival, session.offline?.editsHeld, session.offline?.capped]);
+  }, [session.version, session.ready, session.refused, session.roster, session.agentConnections, session.agentChat, session.agentInviteError, session.epochChanged, session.sessionWarning, session.writesBlocked, session.connection, session.persistErrors, session.storeSlow, session.notOwner, session.arrival, session.offline?.editsHeld, session.offline?.capped]);
   const [api, setApi] = useState(null);
   const pendingCaretRef = useRef(null);
   const seenEpochRef = useRef(session.docEpoch);
@@ -5077,6 +5486,8 @@ function CollabEditor(opts) {
     // and lost it, which is why the read-only banner could be on screen while
     // the user's text appeared and then vanished.
     editable: (opts.editable ?? true) && !session.writesBlocked,
+    commentAuthor: opts.commentAuthor,
+    commentMentions: opts.commentMentions,
     revisions: opts.revisions,
     // Re-key only on docEpoch (a document replacement), not on every change.
     // Between replacements the live doc mutates in place and the key stays stable,
@@ -5090,7 +5501,8 @@ function CollabEditor(opts) {
     createElement(DocxToolbar, {
       api,
       mode: opts.toolbarMode ?? "advanced",
-      features: { ...COLLAB_TOOLBAR_DEFAULTS, ...opts.toolbarFeatures }
+      features: { ...COLLAB_TOOLBAR_DEFAULTS, ...opts.toolbarFeatures },
+      commentMentions: opts.commentMentions
     }),
     createElement("div", { style: { flex: 1, minHeight: 0 } }, view)
   );