@liveblocks/core 3.23.1-exp1 → 3.23.1-exp2

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.23.1-exp1";
+var PKG_VERSION = "3.23.1-exp2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1107,7 +1107,6 @@ function* nodeStreamToCompactNodes(nodes) {
 
 // src/internal.ts
 var kInternal = /* @__PURE__ */ Symbol();
-var kStorageUpdateSource = /* @__PURE__ */ Symbol();
 
 // src/lib/position.ts
 var MIN_CODE = 32;
@@ -1288,6 +1287,18 @@ function asPos(str) {
   return isPos(str) ? str : convertToPos(str);
 }
 
+// src/crdts/StorageUpdates.ts
+var REMOTE = freeze({ origin: "remote" });
+var LOCAL_EDIT = freeze({ origin: "local", via: "edit" });
+var LOCAL_UNDO = freeze({ origin: "local", via: "undo" });
+var LOCAL_REDO = freeze({ origin: "local", via: "redo" });
+function toUpdateSource(source) {
+  return source.origin === "remote" ? source : (
+    // Removes `optimistic` field, which is not public
+    { origin: "local", via: source.via }
+  );
+}
+
 // src/crdts/UnacknowledgedOps.ts
 var UnacknowledgedOps = class {
   // opId -> op
@@ -1496,11 +1507,14 @@ var AbstractCrdt = class {
     }
   }
   /** @internal */
-  _apply(op, _isLocal) {
+  _apply(op, source) {
     switch (op.type) {
       case OpCode.DELETE_CRDT: {
         if (this.parent.type === "HasParent") {
-          return this.parent.node._detachChild(crdtAsLiveNode(this));
+          return this.parent.node._detachChild(
+            crdtAsLiveNode(this),
+            toUpdateSource(source)
+          );
         }
         return { modified: false };
       }
@@ -1690,8 +1704,8 @@ var LiveFile = class _LiveFile extends AbstractCrdt {
     throw new Error("A LiveFile node cannot have children");
   }
   /** @internal */
-  _apply(op, isLocal) {
-    return super._apply(op, isLocal);
+  _apply(op, source) {
+    return super._apply(op, source);
   }
   /** @internal */
   _toTreeNode(key) {
@@ -6911,8 +6925,8 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     throw new Error("Method not implemented.");
   }
   /** @internal */
-  _apply(op, isLocal) {
-    return super._apply(op, isLocal);
+  _apply(op, source) {
+    return super._apply(op, source);
   }
   /** @internal */
   _toTreeNode(key) {
@@ -7073,7 +7087,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       item._detach();
     }
   }
-  #applySetRemote(op) {
+  #applyRemoteSet(op) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -7091,9 +7105,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
         itemWithSamePosition._detach();
         this.#items.add(child);
         return {
-          modified: makeUpdate(this, [
-            setDelta(indexOfItemWithSamePosition, child)
-          ]),
+          modified: makeUpdate(
+            this,
+            [setDelta(indexOfItemWithSamePosition, child)],
+            REMOTE
+          ),
           reverse: []
         };
       } else {
@@ -7104,20 +7120,22 @@ var LiveList = class _LiveList extends AbstractCrdt {
           setDelta(indexOfItemWithSamePosition, child)
         ];
         const deleteDelta2 = this.#detachItemAssociatedToSetOperation(
-          op.deletedId
+          op.deletedId,
+          REMOTE
         );
         if (deleteDelta2) {
           delta.push(deleteDelta2);
         }
         return {
-          modified: makeUpdate(this, delta),
+          modified: makeUpdate(this, delta, REMOTE),
           reverse: []
         };
       }
     } else {
       const updates = [];
       const deleteDelta2 = this.#detachItemAssociatedToSetOperation(
-        op.deletedId
+        op.deletedId,
+        REMOTE
       );
       if (deleteDelta2) {
         updates.push(deleteDelta2);
@@ -7126,29 +7144,32 @@ var LiveList = class _LiveList extends AbstractCrdt {
       updates.push(insertDelta(this._indexOfPosition(key), child));
       return {
         reverse: [],
-        modified: makeUpdate(this, updates)
+        modified: makeUpdate(this, updates, REMOTE)
       };
     }
   }
-  #applySetAck(op) {
+  #applySetAck(op, source) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
     const delta = [];
-    const deletedDelta = this.#detachItemAssociatedToSetOperation(op.deletedId);
+    const deletedDelta = this.#detachItemAssociatedToSetOperation(
+      op.deletedId,
+      source
+    );
     if (deletedDelta) {
       delta.push(deletedDelta);
     }
     const unacknowledgedOpId = this.#unacknowledgedSetOpIdAt(op.parentKey);
     if (unacknowledgedOpId !== void 0 && unacknowledgedOpId !== op.opId) {
-      return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta), reverse: [] };
+      return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta, source), reverse: [] };
     }
     const indexOfItemWithSamePosition = this._indexOfPosition(op.parentKey);
     const existingItem = this.#items.find((item) => item._id === op.id);
     if (existingItem !== void 0) {
       if (existingItem._parentKey === op.parentKey) {
         return {
-          modified: delta.length > 0 ? makeUpdate(this, delta) : false,
+          modified: delta.length > 0 ? makeUpdate(this, delta, source) : false,
           reverse: []
         };
       }
@@ -7166,7 +7187,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         delta.push(moveDelta(prevIndex, newIndex, existingItem));
       }
       return {
-        modified: delta.length > 0 ? makeUpdate(this, delta) : false,
+        modified: delta.length > 0 ? makeUpdate(this, delta, source) : false,
         reverse: []
       };
     } else {
@@ -7176,11 +7197,15 @@ var LiveList = class _LiveList extends AbstractCrdt {
         this.#implicitlyDeletedItems.delete(orphan);
         const recreatedItemIndex = this.#insert(orphan);
         return {
-          modified: makeUpdate(this, [
-            // If there is an item at this position, update is a set, else it's an insert
-            indexOfItemWithSamePosition === -1 ? insertDelta(recreatedItemIndex, orphan) : setDelta(recreatedItemIndex, orphan),
-            ...delta
-          ]),
+          modified: makeUpdate(
+            this,
+            [
+              // If there is an item at this position, update is a set, else it's an insert
+              indexOfItemWithSamePosition === -1 ? insertDelta(recreatedItemIndex, orphan) : setDelta(recreatedItemIndex, orphan),
+              ...delta
+            ],
+            source
+          ),
           reverse: []
         };
       } else {
@@ -7195,11 +7220,15 @@ var LiveList = class _LiveList extends AbstractCrdt {
           op.parentKey
         );
         return {
-          modified: makeUpdate(this, [
-            // If there is an item at this position, update is a set, else it's an insert
-            indexOfItemWithSamePosition === -1 ? insertDelta(newIndex, newItem) : setDelta(newIndex, newItem),
-            ...delta
-          ]),
+          modified: makeUpdate(
+            this,
+            [
+              // If there is an item at this position, update is a set, else it's an insert
+              indexOfItemWithSamePosition === -1 ? insertDelta(newIndex, newItem) : setDelta(newIndex, newItem),
+              ...delta
+            ],
+            source
+          ),
           reverse: []
         };
       }
@@ -7208,7 +7237,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   /**
    * Returns the update delta of the deletion or null
    */
-  #detachItemAssociatedToSetOperation(deletedId) {
+  #detachItemAssociatedToSetOperation(deletedId, source) {
     if (deletedId === void 0 || this._pool === void 0) {
       return null;
     }
@@ -7216,7 +7245,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (deletedItem === void 0) {
       return null;
     }
-    const result = this._detachChild(deletedItem);
+    const result = this._detachChild(deletedItem, source);
     if (result.modified === false) {
       return null;
     }
@@ -7234,10 +7263,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const { newItem, newIndex } = this.#createAttachItemAndSort(op, key);
     const bumpDeltas = this.#bumpUnackedPushesAbove(key);
     return {
-      modified: makeUpdate(this, [
-        insertDelta(newIndex, newItem),
-        ...bumpDeltas
-      ]),
+      modified: makeUpdate(
+        this,
+        [insertDelta(newIndex, newItem), ...bumpDeltas],
+        REMOTE
+      ),
       reverse: []
     };
   }
@@ -7318,7 +7348,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     return deltas;
   }
-  #applyInsertAck(op) {
+  #applyInsertAck(op, source) {
     const existingItem = this.#items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
@@ -7340,9 +7370,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
           return { modified: false };
         }
         return {
-          modified: makeUpdate(this, [
-            moveDelta(oldPositionIndex, newIndex, existingItem)
-          ]),
+          modified: makeUpdate(
+            this,
+            [moveDelta(oldPositionIndex, newIndex, existingItem)],
+            source
+          ),
           reverse: []
         };
       }
@@ -7354,7 +7386,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         this.#insert(orphan);
         const newIndex = this._indexOfPosition(key);
         return {
-          modified: makeUpdate(this, [insertDelta(newIndex, orphan)]),
+          modified: makeUpdate(this, [insertDelta(newIndex, orphan)], source),
           reverse: []
         };
       } else {
@@ -7363,13 +7395,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
         }
         const { newItem, newIndex } = this.#createAttachItemAndSort(op, key);
         return {
-          modified: makeUpdate(this, [insertDelta(newIndex, newItem)]),
+          modified: makeUpdate(this, [insertDelta(newIndex, newItem)], source),
           reverse: []
         };
       }
     }
   }
-  #applyInsertUndoRedo(op) {
+  #applyLocalInsert(op, source) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
     if (_optionalChain([this, 'access', _151 => _151._pool, 'optionalAccess', _152 => _152.getNode, 'call', _153 => _153(id)]) !== void 0) {
@@ -7388,11 +7420,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
     this.#insert(child);
     const newIndex = this._indexOfPosition(newKey);
     return {
-      modified: makeUpdate(this, [insertDelta(newIndex, child)]),
+      modified: makeUpdate(this, [insertDelta(newIndex, child)], source),
       reverse: [{ type: OpCode.DELETE_CRDT, id }]
     };
   }
-  #applySetUndoRedo(op) {
+  #applyLocalSet(op, source) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
     if (_optionalChain([this, 'access', _162 => _162._pool, 'optionalAccess', _163 => _163.getNode, 'call', _164 => _164(id)]) !== void 0) {
@@ -7414,46 +7446,48 @@ var LiveList = class _LiveList extends AbstractCrdt {
       );
       const delta = [setDelta(indexOfItemWithSameKey, child)];
       const deletedDelta = this.#detachItemAssociatedToSetOperation(
-        op.deletedId
+        op.deletedId,
+        source
       );
       if (deletedDelta) {
         delta.push(deletedDelta);
       }
       return {
-        modified: makeUpdate(this, delta),
+        modified: makeUpdate(this, delta, source),
         reverse
       };
     } else {
       this.#insert(child);
-      this.#detachItemAssociatedToSetOperation(op.deletedId);
+      this.#detachItemAssociatedToSetOperation(op.deletedId, source);
       const newIndex = this._indexOfPosition(newKey);
       return {
         reverse: [{ type: OpCode.DELETE_CRDT, id }],
-        modified: makeUpdate(this, [insertDelta(newIndex, child)])
+        modified: makeUpdate(this, [insertDelta(newIndex, child)], source)
       };
     }
   }
   /** @internal */
-  _attachChild(op, source) {
+  _attachChild(op, opSource) {
+    const source = toUpdateSource(opSource);
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
     let result;
     if (op.intent === "set") {
-      if (source === 1 /* THEIRS */) {
-        result = this.#applySetRemote(op);
-      } else if (source === 2 /* OURS */) {
-        result = this.#applySetAck(op);
+      if (opSource.origin === "remote") {
+        result = this.#applyRemoteSet(op);
+      } else if (!opSource.optimistic) {
+        result = this.#applySetAck(op, source);
       } else {
-        result = this.#applySetUndoRedo(op);
+        result = this.#applyLocalSet(op, source);
       }
     } else {
-      if (source === 1 /* THEIRS */) {
+      if (opSource.origin === "remote") {
         result = this.#applyRemoteInsert(op);
-      } else if (source === 2 /* OURS */) {
-        result = this.#applyInsertAck(op);
+      } else if (!opSource.optimistic) {
+        result = this.#applyInsertAck(op, source);
       } else {
-        result = this.#applyInsertUndoRedo(op);
+        result = this.#applyLocalInsert(op, source);
       }
     }
     if (result.modified !== false) {
@@ -7462,7 +7496,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     return result;
   }
   /** @internal */
-  _detachChild(child) {
+  _detachChild(child, source) {
     if (child) {
       const parentKey = nn(child._parentKey);
       const reverse = child._toOps(nn(this._id), parentKey);
@@ -7477,19 +7511,23 @@ var LiveList = class _LiveList extends AbstractCrdt {
       this.invalidate();
       child._detach();
       return {
-        modified: makeUpdate(this, [deleteDelta(indexToDelete, previousNode)]),
+        modified: makeUpdate(
+          this,
+          [deleteDelta(indexToDelete, previousNode)],
+          source
+        ),
         reverse
       };
     }
     return { modified: false };
   }
-  #applySetChildKeyRemote(newKey, child) {
+  #applyRemoteSetChildKey(newKey, child) {
     if (this.#implicitlyDeletedItems.has(child)) {
       this.#implicitlyDeletedItems.delete(child);
       child._setParentLink(this, newKey);
       const newIndex = this.#insert(child);
       return {
-        modified: makeUpdate(this, [insertDelta(newIndex, child)]),
+        modified: makeUpdate(this, [insertDelta(newIndex, child)], REMOTE),
         reverse: []
       };
     }
@@ -7510,7 +7548,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       }
       return {
-        modified: makeUpdate(this, [moveDelta(previousIndex, newIndex, child)]),
+        modified: makeUpdate(
+          this,
+          [moveDelta(previousIndex, newIndex, child)],
+          REMOTE
+        ),
         reverse: []
       };
     } else {
@@ -7527,12 +7569,16 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       }
       return {
-        modified: makeUpdate(this, [moveDelta(previousIndex, newIndex, child)]),
+        modified: makeUpdate(
+          this,
+          [moveDelta(previousIndex, newIndex, child)],
+          REMOTE
+        ),
         reverse: []
       };
     }
   }
-  #applySetChildKeyAck(newKey, child) {
+  #applySetChildKeyAck(newKey, child, source) {
     const previousKey = nn(child._parentKey);
     if (this.#implicitlyDeletedItems.has(child)) {
       const existingItemIndex = this._indexOfPosition(newKey);
@@ -7551,7 +7597,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       child._setParentLink(this, newKey);
       const newIndex = this.#insert(child);
       return {
-        modified: makeUpdate(this, [insertDelta(newIndex, child)]),
+        modified: makeUpdate(this, [insertDelta(newIndex, child)], source),
         reverse: []
       };
     } else {
@@ -7579,15 +7625,17 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       } else {
         return {
-          modified: makeUpdate(this, [
-            moveDelta(previousIndex, newIndex, child)
-          ]),
+          modified: makeUpdate(
+            this,
+            [moveDelta(previousIndex, newIndex, child)],
+            source
+          ),
           reverse: []
         };
       }
     }
   }
-  #applySetChildKeyUndoRedo(newKey, child) {
+  #applyLocalSetChildKey(newKey, child, source) {
     const previousKey = nn(child._parentKey);
     const previousIndex = this.#items.findIndex((item) => item === child);
     const existingItemIndex = this._indexOfPosition(newKey);
@@ -7606,7 +7654,11 @@ var LiveList = class _LiveList extends AbstractCrdt {
       };
     }
     return {
-      modified: makeUpdate(this, [moveDelta(previousIndex, newIndex, child)]),
+      modified: makeUpdate(
+        this,
+        [moveDelta(previousIndex, newIndex, child)],
+        source
+      ),
       reverse: [
         {
           type: OpCode.SET_PARENT_KEY,
@@ -7617,18 +7669,19 @@ var LiveList = class _LiveList extends AbstractCrdt {
     };
   }
   /** @internal */
-  _setChildKey(newKey, child, source) {
-    if (source === 1 /* THEIRS */) {
-      return this.#applySetChildKeyRemote(newKey, child);
-    } else if (source === 2 /* OURS */) {
-      return this.#applySetChildKeyAck(newKey, child);
+  _setChildKey(newKey, child, opSource) {
+    const source = toUpdateSource(opSource);
+    if (opSource.origin === "remote") {
+      return this.#applyRemoteSetChildKey(newKey, child);
+    } else if (!opSource.optimistic) {
+      return this.#applySetChildKeyAck(newKey, child, source);
     } else {
-      return this.#applySetChildKeyUndoRedo(newKey, child);
+      return this.#applyLocalSetChildKey(newKey, child, source);
     }
   }
   /** @internal */
-  _apply(op, isLocal) {
-    return super._apply(op, isLocal);
+  _apply(op, source) {
+    return super._apply(op, source);
   }
   /** @internal */
   _serialize() {
@@ -7689,7 +7742,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         intent === "push" ? addIntentToRootOp(ops, "push") : ops,
         [{ type: OpCode.DELETE_CRDT, id }],
         /* @__PURE__ */ new Map([
-          [this._id, makeUpdate(this, [insertDelta(index, value)])]
+          [this._id, makeUpdate(this, [insertDelta(index, value)], LOCAL_EDIT)]
         ])
       );
     }
@@ -7730,7 +7783,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
     this.#updateItemPositionAt(index, position);
     if (this._pool && this._id) {
       const storageUpdates = /* @__PURE__ */ new Map([
-        [this._id, makeUpdate(this, [moveDelta(index, targetIndex, item)])]
+        [
+          this._id,
+          makeUpdate(this, [moveDelta(index, targetIndex, item)], LOCAL_EDIT)
+        ]
       ]);
       this._pool.dispatch(
         [
@@ -7773,7 +7829,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         const storageUpdates = /* @__PURE__ */ new Map();
         storageUpdates.set(
           nn(this._id),
-          makeUpdate(this, [deleteDelta(index, item)])
+          makeUpdate(this, [deleteDelta(index, item)], LOCAL_EDIT)
         );
         this._pool.dispatch(
           [
@@ -7813,7 +7869,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
       this.#items.clear();
       this.invalidate();
       const storageUpdates = /* @__PURE__ */ new Map();
-      storageUpdates.set(nn(this._id), makeUpdate(this, updateDelta));
+      storageUpdates.set(
+        nn(this._id),
+        makeUpdate(this, updateDelta, LOCAL_EDIT)
+      );
       this._pool.dispatch(ops, reverseOps, storageUpdates);
     } else {
       for (const item of this.#items) {
@@ -7843,7 +7902,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
       const id = this._pool.generateId();
       value._attach(id, this._pool);
       const storageUpdates = /* @__PURE__ */ new Map();
-      storageUpdates.set(this._id, makeUpdate(this, [setDelta(index, value)]));
+      storageUpdates.set(
+        this._id,
+        makeUpdate(this, [setDelta(index, value)], LOCAL_EDIT)
+      );
       const ops = addIntentToRootOp(
         value._toOpsWithOpId(this._id, position, this._pool),
         "set",
@@ -8016,11 +8078,12 @@ var LiveList = class _LiveList extends AbstractCrdt {
     );
   }
 };
-function makeUpdate(liveList, deltaUpdates) {
+function makeUpdate(liveList, deltaUpdates, source) {
   return {
     node: liveList,
     type: "LiveList",
-    updates: deltaUpdates
+    updates: deltaUpdates,
+    source
   };
 }
 function setDelta(index, item) {
@@ -8139,7 +8202,9 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (this._pool.getNode(id) !== void 0) {
       return { modified: false };
     }
-    if (source === 2 /* OURS */) {
+    if (source.origin === "remote") {
+      this.#unacknowledgedSet.delete(key);
+    } else if (!source.optimistic) {
       const lastUpdateOpId = this.#unacknowledgedSet.get(key);
       if (lastUpdateOpId === opId) {
         this.#unacknowledgedSet.delete(key);
@@ -8147,8 +8212,6 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       } else if (lastUpdateOpId !== void 0) {
         return { modified: false };
       }
-    } else if (source === 1 /* THEIRS */) {
-      this.#unacknowledgedSet.delete(key);
     }
     const previousValue = this.#map.get(key);
     let reverse;
@@ -8167,7 +8230,8 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       modified: {
         node: this,
         type: "LiveMap",
-        updates: { [key]: { type: "update" } }
+        updates: { [key]: { type: "update" } },
+        source: toUpdateSource(source)
       },
       reverse
     };
@@ -8180,7 +8244,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     }
   }
   /** @internal */
-  _detachChild(child) {
+  _detachChild(child, source) {
     const id = nn(this._id);
     const parentKey = nn(child._parentKey);
     const reverse = child._toOps(id, parentKey);
@@ -8199,7 +8263,8 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
           type: "delete",
           deletedItem: liveNodeToLson(child)
         }
-      }
+      },
+      source
     };
     return { modified: storageUpdate, reverse };
   }
@@ -8248,7 +8313,8 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       storageUpdates.set(this._id, {
         node: this,
         type: "LiveMap",
-        updates: { [key]: { type: "update" } }
+        updates: { [key]: { type: "update" } },
+        source: LOCAL_EDIT
       });
       const ops = item._toOpsWithOpId(this._id, key, this._pool);
       this.#unacknowledgedSet.set(key, nn(ops[0].opId));
@@ -8297,7 +8363,8 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
             type: "delete",
             deletedItem: liveNodeToLson(item)
           }
-        }
+        },
+        source: LOCAL_EDIT
       });
       this._pool.dispatch(
         [
@@ -8662,7 +8729,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       }
       return { modified: false };
     }
-    if (source === 0 /* LOCAL */) {
+    if (source.origin === "local" && source.optimistic) {
       this.#unackedOpsByKey.set(key, nn(opId));
     } else if (this.#unackedOpsByKey.get(key) === void 0) {
     } else if (this.#unackedOpsByKey.get(key) === opId) {
@@ -8700,12 +8767,13 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       modified: {
         node: this,
         type: "LiveObject",
-        updates: { [key]: { type: "update" } }
+        updates: { [key]: { type: "update" } },
+        source: toUpdateSource(source)
       }
     };
   }
   /** @internal */
-  _detachChild(child) {
+  _detachChild(child, source) {
     if (child) {
       const id = nn(this._id);
       const parentKey = nn(child._parentKey);
@@ -8723,7 +8791,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         type: "LiveObject",
         updates: {
           [parentKey]: { type: "delete", deletedItem }
-        }
+        },
+        source
       };
       return { modified: storageUpdate, reverse };
     }
@@ -8739,13 +8808,13 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     }
   }
   /** @internal */
-  _apply(op, isLocal) {
+  _apply(op, source) {
     if (op.type === OpCode.UPDATE_OBJECT) {
-      return this.#applyUpdate(op, isLocal);
+      return this.#applyUpdate(op, source);
     } else if (op.type === OpCode.DELETE_OBJECT_KEY) {
-      return this.#applyDeleteObjectKey(op, isLocal);
+      return this.#applyDeleteObjectKey(op, source);
     }
-    return super._apply(op, isLocal);
+    return super._apply(op, source);
   }
   /** @internal */
   _serialize() {
@@ -8769,7 +8838,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       };
     }
   }
-  #applyUpdate(op, isLocal) {
+  #applyUpdate(op, source) {
     let isModified = false;
     const id = nn(this._id);
     const reverse = [];
@@ -8797,7 +8866,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       if (value === void 0) {
         continue;
       }
-      if (isLocal) {
+      if (source.origin === "local" && source.optimistic) {
         this.#unackedOpsByKey.set(key, nn(op.opId));
       } else if (this.#unackedOpsByKey.get(key) === void 0) {
         isModified = true;
@@ -8824,18 +8893,19 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       modified: {
         node: this,
         type: "LiveObject",
-        updates: updateDelta
+        updates: updateDelta,
+        source: toUpdateSource(source)
       },
       reverse
     } : { modified: false };
   }
-  #applyDeleteObjectKey(op, isLocal) {
+  #applyDeleteObjectKey(op, source) {
     const key = op.key;
     const oldValue = this.#synced.get(key);
     if (oldValue === void 0) {
       return { modified: false };
     }
-    if (!isLocal && this.#unackedOpsByKey.get(key) !== void 0) {
+    if (!(source.origin === "local" && source.optimistic) && this.#unackedOpsByKey.get(key) !== void 0) {
       return { modified: false };
     }
     const id = nn(this._id);
@@ -8861,7 +8931,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         type: "LiveObject",
         updates: {
           [op.key]: { type: "delete", deletedItem: oldValue }
-        }
+        },
+        source: toUpdateSource(source)
       },
       reverse
     };
@@ -8907,7 +8978,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         updates: {
           ..._optionalChain([existing, 'optionalAccess', _228 => _228.updates]),
           [key]: { type: "update" }
-        }
+        },
+        source: LOCAL_EDIT
       });
       this._pool.dispatch(ops, reverse, storageUpdates);
     }
@@ -8941,7 +9013,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
               type: "delete",
               deletedItem: oldValue2
             }
-          }
+          },
+          source: LOCAL_EDIT
         });
         return [[], [], storageUpdates2];
       }
@@ -8989,7 +9062,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       type: "LiveObject",
       updates: {
         [key]: { type: "delete", deletedItem: oldValue }
-      }
+      },
+      source: LOCAL_EDIT
     });
     return [ops, reverse, storageUpdates];
   }
@@ -9127,7 +9201,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     storageUpdates.set(this._id, {
       node: this,
       type: "LiveObject",
-      updates: updateDelta
+      updates: updateDelta,
+      source: LOCAL_EDIT
     });
     this._pool.dispatch(ops, reverseOps, storageUpdates);
   }
@@ -9289,6 +9364,31 @@ function clipRange(index, length, contentLength) {
   );
   return { index: clippedIndex, length: clippedEnd - clippedIndex };
 }
+function isInSurrogatePair(text, index) {
+  const previous = text.charCodeAt(index - 1);
+  const next = text.charCodeAt(index);
+  return previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343;
+}
+function clipIndexToCodePointBoundary(text, index) {
+  const clippedIndex = Math.max(0, Math.min(index, text.length));
+  return isInSurrogatePair(text, clippedIndex) ? clippedIndex - 1 : clippedIndex;
+}
+function clipRangeToCodePointBoundaries(text, index, length) {
+  const clipped = clipRange(index, length, text.length);
+  if (clipped.length === 0) {
+    return {
+      index: clipIndexToCodePointBoundary(text, clipped.index),
+      length: 0
+    };
+  }
+  const clippedEnd = clipped.index + clipped.length;
+  const normalizedIndex = isInSurrogatePair(text, clipped.index) ? clipped.index - 1 : clipped.index;
+  const normalizedEnd = isInSurrogatePair(text, clippedEnd) ? clippedEnd + 1 : clippedEnd;
+  return {
+    index: normalizedIndex,
+    length: normalizedEnd - normalizedIndex
+  };
+}
 function applyInsert(segments, index, text, attributes) {
   if (text.length === 0) {
     return normalizeSegments(segments);
@@ -9770,21 +9870,21 @@ var LiveText = class _LiveText extends AbstractCrdt {
     throw new Error("LiveText cannot contain child nodes");
   }
   /** @internal */
-  _apply(op, isLocal) {
+  _apply(op, source) {
     if (op.type !== OpCode.UPDATE_TEXT) {
-      return super._apply(op, isLocal);
+      return super._apply(op, source);
     }
-    if (isLocal) {
-      return this.#applyLocal(op);
+    if (source.origin === "local" && source.optimistic) {
+      return this.#applyLocal(op, toUpdateSource(source));
     }
     if (op.opId !== void 0 && op.opId === this.#inFlightOpId) {
-      return this.#applyAck(op);
+      return this.#applyAck(op, toUpdateSource(source));
     }
     if (op.opId !== void 0 && this.#acceptedOps.some((entry) => entry.opId === op.opId)) {
       this.#version = Math.max(this.#version, _nullishCoalesce(op.version, () => ( op.baseVersion + 1)));
       return { modified: false };
     }
-    return this.#applyRemote(op);
+    return this.#applyRemote(op, toUpdateSource(source));
   }
   /**
    * Inserts text at the given index.
@@ -9800,7 +9900,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
    * text.insert(0, "Say: ", { italic: true });
    */
   insert(index, text, attributes) {
-    const clippedIndex = Math.max(0, Math.min(index, this.length));
+    const clippedIndex = clipIndexToCodePointBoundary(this.toString(), index);
     this.#dispatch([{ type: "insert", index: clippedIndex, text, attributes }]);
   }
   /**
@@ -9811,7 +9911,11 @@ var LiveText = class _LiveText extends AbstractCrdt {
    * text.delete(5, 6); // "Hello"
    */
   delete(index, length) {
-    const clipped = clipRange(index, length, this.length);
+    const clipped = clipRangeToCodePointBoundaries(
+      this.toString(),
+      index,
+      length
+    );
     if (clipped.length === 0) {
       return;
     }
@@ -9827,7 +9931,11 @@ var LiveText = class _LiveText extends AbstractCrdt {
    * text.replace(0, 5, "Hi"); // "Hi world"
    */
   replace(index, length, text, attributes) {
-    const clipped = clipRange(index, length, this.length);
+    const clipped = clipRangeToCodePointBoundaries(
+      this.toString(),
+      index,
+      length
+    );
     const ops = [];
     if (clipped.length > 0) {
       ops.push({
@@ -9920,7 +10028,11 @@ var LiveText = class _LiveText extends AbstractCrdt {
    * text.format(0, 5, { bold: null });
    */
   format(index, length, attributes) {
-    const clipped = clipRange(index, length, this.length);
+    const clipped = clipRangeToCodePointBoundaries(
+      this.toString(),
+      index,
+      length
+    );
     if (clipped.length === 0) {
       return;
     }
@@ -9954,7 +10066,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
           type: "LiveText",
           node: this,
           version: this.#version,
-          updates: changes
+          updates: changes,
+          source: LOCAL_EDIT
         }
       ]
     ]);
@@ -9984,7 +10097,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
    * A local replay of an existing wire op: an undo/redo frame, or an
    * unacknowledged op re-sent after a reconnect.
    */
-  #applyLocal(op) {
+  #applyLocal(op, source) {
     const mutableOp = op;
     if (op.opId !== void 0 && op.opId === this.#inFlightOpId) {
       this.#inFlightOps = [...this.#inFlightOps, ...this.#queuedOps];
@@ -10020,12 +10133,13 @@ var LiveText = class _LiveText extends AbstractCrdt {
         type: "LiveText",
         node: this,
         version: this.#version,
-        updates: changes
+        updates: changes,
+        source
       }
     };
   }
   /** Server acknowledgement of our in-flight op. */
-  #applyAck(op) {
+  #applyAck(op, source) {
     const ackedVersion = _nullishCoalesce(op.version, () => ( Math.max(this.#version, op.baseVersion + 1)));
     const predicted = this.#inFlightOps;
     const opId = this.#inFlightOpId;
@@ -10047,7 +10161,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
             type: "LiveText",
             node: this,
             version: ackedVersion,
-            updates: rebuilt.changes
+            updates: rebuilt.changes,
+            source
           }
         };
       }
@@ -10058,7 +10173,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
     return result;
   }
   /** An accepted op from another client (or a server-fabricated fix op). */
-  #applyRemote(op) {
+  #applyRemote(op, source) {
     const version = _nullishCoalesce(op.version, () => ( this.#version + 1));
     this.#confirmed = applyTextOperationsToSegments(this.#confirmed, op.ops);
     const [overInFlight, inFlight] = transformTextOperationsX(
@@ -10087,7 +10202,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
         type: "LiveText",
         node: this,
         version: this.#version,
-        updates: changes
+        updates: changes,
+        source
       }
     };
   }
@@ -10171,7 +10287,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
    *
    * @internal
    */
-  _resyncText(data, version) {
+  _resyncText(data, version, source) {
     this.#confirmed = dataToSegments(data);
     this.#version = version;
     this.#acceptedOps = [];
@@ -10183,7 +10299,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
       type: "LiveText",
       node: this,
       version: this.#version,
-      updates: rebuilt.changes
+      updates: rebuilt.changes,
+      source
     };
   }
   /**
@@ -10697,37 +10814,30 @@ function mergeTextStorageUpdates(first, second) {
     updates: first.updates.concat(second.updates)
   };
 }
+function mergeUpdateSources(first, second) {
+  if (first.origin === "remote" || second.origin === "remote") {
+    return REMOTE;
+  }
+  if (second.via !== "edit") return second;
+  if (first.via !== "edit") return first;
+  return LOCAL_EDIT;
+}
 function mergeStorageUpdates(first, second) {
   if (first === void 0) {
     return second;
   }
-  let merged;
+  const source = mergeUpdateSources(first.source, second.source);
   if (first.type === "LiveObject" && second.type === "LiveObject") {
-    merged = mergeObjectStorageUpdates(first, second);
+    return { ...mergeObjectStorageUpdates(first, second), source };
   } else if (first.type === "LiveMap" && second.type === "LiveMap") {
-    merged = mergeMapStorageUpdates(first, second);
+    return { ...mergeMapStorageUpdates(first, second), source };
   } else if (first.type === "LiveList" && second.type === "LiveList") {
-    merged = mergeListStorageUpdates(first, second);
+    return { ...mergeListStorageUpdates(first, second), source };
   } else if (first.type === "LiveText" && second.type === "LiveText") {
-    merged = mergeTextStorageUpdates(first, second);
+    return { ...mergeTextStorageUpdates(first, second), source };
   } else {
-    merged = second;
-  }
-  const sa = first[kStorageUpdateSource];
-  const sb = second[kStorageUpdateSource];
-  if (sa !== void 0 || sb !== void 0) {
-    if (_optionalChain([sa, 'optionalAccess', _245 => _245.origin]) === "remote" || _optionalChain([sb, 'optionalAccess', _246 => _246.origin]) === "remote") {
-      merged[kStorageUpdateSource] = { origin: "remote" };
-    } else if (_optionalChain([sa, 'optionalAccess', _247 => _247.via]) === "history" || _optionalChain([sb, 'optionalAccess', _248 => _248.via]) === "history") {
-      const historySource = _optionalChain([sb, 'optionalAccess', _249 => _249.via]) === "history" ? sb : _optionalChain([sa, 'optionalAccess', _250 => _250.via]) === "history" ? sa : void 0;
-      if (_optionalChain([historySource, 'optionalAccess', _251 => _251.via]) === "history") {
-        merged[kStorageUpdateSource] = historySource;
-      }
-    } else {
-      merged[kStorageUpdateSource] = { origin: "local", via: "mutation" };
-    }
+    return { ...second, source };
   }
-  return merged;
 }
 
 // src/devtools/bridge.ts
@@ -10743,7 +10853,7 @@ function sendToPanel(message, options) {
     ...message,
     source: "liveblocks-devtools-client"
   };
-  if (!(_optionalChain([options, 'optionalAccess', _252 => _252.force]) || _bridgeActive)) {
+  if (!(_optionalChain([options, 'optionalAccess', _245 => _245.force]) || _bridgeActive)) {
     return;
   }
   window.postMessage(fullMsg, "*");
@@ -10751,7 +10861,7 @@ function sendToPanel(message, options) {
 var eventSource = makeEventSource();
 if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
   window.addEventListener("message", (event) => {
-    if (event.source === window && _optionalChain([event, 'access', _253 => _253.data, 'optionalAccess', _254 => _254.source]) === "liveblocks-devtools-panel") {
+    if (event.source === window && _optionalChain([event, 'access', _246 => _246.data, 'optionalAccess', _247 => _247.source]) === "liveblocks-devtools-panel") {
       eventSource.notify(event.data);
     } else {
     }
@@ -10893,7 +11003,7 @@ function fullSync(room) {
     msg: "room::sync::full",
     roomId: room.id,
     status: room.getStatus(),
-    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _255 => _255.toTreeNode, 'call', _256 => _256("root"), 'access', _257 => _257.payload]), () => ( null)),
+    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _248 => _248.toTreeNode, 'call', _249 => _249("root"), 'access', _250 => _250.payload]), () => ( null)),
     me,
     others
   });
@@ -11580,15 +11690,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _258 => _258.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _251 => _251.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _259 => _259.addEventListener, 'call', _260 => _260("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _252 => _252.addEventListener, 'call', _253 => _253("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _261 => _261.removeEventListener, 'call', _262 => _262("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _254 => _254.removeEventListener, 'call', _255 => _255("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -11612,7 +11722,7 @@ function makeNodeMapBuffer() {
 function topLevelKeysOf(nodes) {
   const keys2 = /* @__PURE__ */ new Set();
   const root = nodes.get("root");
-  for (const key in _optionalChain([root, 'optionalAccess', _263 => _263.data])) {
+  for (const key in _optionalChain([root, 'optionalAccess', _256 => _256.data])) {
     keys2.add(key);
   }
   for (const node of nodes.values()) {
@@ -11771,9 +11881,6 @@ function createRoom(options, config) {
     }
   });
   function onDispatch(ops, reverse, storageUpdates, options2) {
-    for (const value of storageUpdates.values()) {
-      value[kStorageUpdateSource] = { origin: "local", via: "mutation" };
-    }
     if (context.activeBatch) {
       for (const op of ops) {
         context.activeBatch.ops.push(op);
@@ -11788,14 +11895,14 @@ function createRoom(options, config) {
         );
       }
       context.activeBatch.reverseOps.pushLeft(reverse);
-      if (_optionalChain([options2, 'optionalAccess', _264 => _264.clearRedoStack])) {
+      if (_optionalChain([options2, 'optionalAccess', _257 => _257.clearRedoStack])) {
         context.activeBatch.clearRedoStack = true;
       }
     } else {
       if (reverse.length > 0) {
         addToUndoStack(reverse);
       }
-      if (_nullishCoalesce(_optionalChain([options2, 'optionalAccess', _265 => _265.clearRedoStack]), () => ( ops.length > 0))) {
+      if (_nullishCoalesce(_optionalChain([options2, 'optionalAccess', _258 => _258.clearRedoStack]), () => ( ops.length > 0))) {
         clearRedoStack();
       }
       if (ops.length > 0) {
@@ -11805,7 +11912,7 @@ function createRoom(options, config) {
     }
   }
   function isStorageWritable() {
-    const permissionMatrix = _optionalChain([context, 'access', _266 => _266.dynamicSessionInfoSig, 'access', _267 => _267.get, 'call', _268 => _268(), 'optionalAccess', _269 => _269.permissionMatrix]);
+    const permissionMatrix = _optionalChain([context, 'access', _259 => _259.dynamicSessionInfoSig, 'access', _260 => _260.get, 'call', _261 => _261(), 'optionalAccess', _262 => _262.permissionMatrix]);
     return permissionMatrix !== void 0 ? hasPermissionAccess(permissionMatrix, "storage", "write") : true;
   }
   const eventHub = {
@@ -11923,7 +12030,7 @@ function createRoom(options, config) {
         if (crdt.type === CrdtType.TEXT) {
           const node = context.pool.nodes.get(id);
           if (node !== void 0 && isLiveText(node)) {
-            const update = node._resyncText(crdt.data, crdt.version);
+            const update = node._resyncText(crdt.data, crdt.version, REMOTE);
             if (update !== void 0) {
               result.updates.storageUpdates.set(
                 id,
@@ -11943,7 +12050,7 @@ function createRoom(options, config) {
         context.pool
       );
     }
-    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _270 => _270.get, 'call', _271 => _271(), 'optionalAccess', _272 => _272.canWrite]), () => ( true));
+    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _263 => _263.get, 'call', _264 => _264(), 'optionalAccess', _265 => _265.canWrite]), () => ( true));
     const serverTopLevelKeys = topLevelKeysOf(nodes);
     const root = context.root;
     disableHistory(() => {
@@ -12026,7 +12133,10 @@ function createRoom(options, config) {
       eventHub.myPresence.notify(context.myPresence.get());
     }
     if (storageUpdates !== void 0 && storageUpdates.size > 0) {
-      const updates2 = Array.from(storageUpdates.values());
+      const updates2 = Array.from(storageUpdates.values(), (update) => ({
+        ...update,
+        source: toUpdateSource(update.source)
+      }));
       eventHub.storageBatch.notify(updates2);
     }
     notifyStorageStatus();
@@ -12040,7 +12150,16 @@ function createRoom(options, config) {
       "Internal. Tried to get connection id but connection was never open"
     );
   }
-  function applyLocalOps(frames, localStorageUpdateSource = { origin: "local", via: "mutation" }) {
+  const viaByOpId = /* @__PURE__ */ new Map();
+  function viaOfAckedOp(opId) {
+    const via = viaByOpId.get(opId);
+    if (via === void 0) {
+      return "edit";
+    }
+    viaByOpId.delete(opId);
+    return via;
+  }
+  function applyLocalOps(frames, localSource = LOCAL_EDIT) {
     const [pframes, ops] = partition(
       frames,
       (f) => f.type === "presence"
@@ -12083,12 +12202,17 @@ function createRoom(options, config) {
     const opsWithOpIds = remappedOps.map(
       (op) => op.opId === void 0 ? { ...op, opId: context.pool.generateOpId() } : op
     );
+    if (localSource.via !== "edit") {
+      for (const op of opsWithOpIds) {
+        viaByOpId.set(op.opId, localSource.via);
+      }
+    }
     const { reverse, updates } = applyOps(
       pframes,
       opsWithOpIds,
       /* isLocal */
       true,
-      localStorageUpdateSource
+      localSource
     );
     return { opsToEmit: opsWithOpIds, reverse, updates };
   }
@@ -12100,7 +12224,7 @@ function createRoom(options, config) {
       false
     );
   }
-  function applyOps(pframes, ops, isLocal, localStorageUpdateSource = { origin: "local", via: "mutation" }) {
+  function applyOps(pframes, ops, isLocal, localSource = LOCAL_EDIT) {
     const output = {
       reverse: new Deque(),
       storageUpdates: /* @__PURE__ */ new Map(),
@@ -12129,16 +12253,19 @@ function createRoom(options, config) {
     for (const op of ops) {
       let source;
       if (isLocal) {
-        source = 0 /* LOCAL */;
+        source = { ...localSource, optimistic: true };
       } else if (op.opId !== void 0) {
         context.unacknowledgedOps.delete(op.opId);
-        source = 2 /* OURS */;
+        source = {
+          origin: "local",
+          via: viaOfAckedOp(op.opId),
+          optimistic: false
+        };
       } else {
-        source = 1 /* THEIRS */;
+        source = REMOTE;
       }
       const applyOpResult = applyOp(op, source);
       if (applyOpResult.modified) {
-        applyOpResult.modified[kStorageUpdateSource] = source === 1 /* THEIRS */ ? { origin: "remote" } : localStorageUpdateSource;
         const nodeId = applyOpResult.modified.node._id;
         if (!(nodeId && createdNodeIds.has(nodeId))) {
           output.storageUpdates.set(
@@ -12176,7 +12303,7 @@ function createRoom(options, config) {
         if (node === void 0) {
           return { modified: false };
         }
-        return node._apply(op, source === 0 /* LOCAL */);
+        return node._apply(op, source);
       }
       case OpCode.SET_PARENT_KEY: {
         const node = context.pool.nodes.get(op.id);
@@ -12231,7 +12358,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _273 => _273.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _266 => _266.addToHistory])) {
         context.activeBatch.reverseOps.pushLeft({
           type: "presence",
           data: oldValues
@@ -12240,7 +12367,7 @@ function createRoom(options, config) {
       context.activeBatch.updates.presence = true;
     } else {
       flushNowOrSoon();
-      if (_optionalChain([options2, 'optionalAccess', _274 => _274.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _267 => _267.addToHistory])) {
         addToUndoStack([{ type: "presence", data: oldValues }]);
       }
       notify({ presence: true });
@@ -12419,11 +12546,11 @@ function createRoom(options, config) {
           break;
         }
         case ServerMsgCode.STORAGE_CHUNK:
-          _optionalChain([stopwatch, 'optionalAccess', _275 => _275.lap, 'call', _276 => _276()]);
+          _optionalChain([stopwatch, 'optionalAccess', _268 => _268.lap, 'call', _269 => _269()]);
           nodeMapBuffer.append(compactNodesToNodeStream(message.nodes));
           break;
         case ServerMsgCode.STORAGE_STREAM_END: {
-          const timing = _optionalChain([stopwatch, 'optionalAccess', _277 => _277.stop, 'call', _278 => _278()]);
+          const timing = _optionalChain([stopwatch, 'optionalAccess', _270 => _270.stop, 'call', _271 => _271()]);
           if (timing) {
             const ms = (v) => `${v.toFixed(1)}ms`;
             const rest = timing.laps.slice(1);
@@ -12469,6 +12596,7 @@ function createRoom(options, config) {
             const rejectedOp = context.unacknowledgedOps.get(opId);
             context.unacknowledgedOps.delete(opId);
             context.buffer.storageOperations = context.buffer.storageOperations.filter((op) => op.opId !== opId);
+            viaByOpId.delete(opId);
             if (rejectedOp !== void 0 && rejectedOp.type === OpCode.UPDATE_TEXT) {
               const node = context.pool.nodes.get(rejectedOp.id);
               if (node !== void 0 && isLiveText(node)) {
@@ -12579,11 +12707,11 @@ function createRoom(options, config) {
           } else if (pendingFeedsRequests.has(requestId)) {
             const pending = pendingFeedsRequests.get(requestId);
             pendingFeedsRequests.delete(requestId);
-            _optionalChain([pending, 'optionalAccess', _279 => _279.reject, 'call', _280 => _280(err)]);
+            _optionalChain([pending, 'optionalAccess', _272 => _272.reject, 'call', _273 => _273(err)]);
           } else if (pendingFeedMessagesRequests.has(requestId)) {
             const pending = pendingFeedMessagesRequests.get(requestId);
             pendingFeedMessagesRequests.delete(requestId);
-            _optionalChain([pending, 'optionalAccess', _281 => _281.reject, 'call', _282 => _282(err)]);
+            _optionalChain([pending, 'optionalAccess', _274 => _274.reject, 'call', _275 => _275(err)]);
           }
           eventHub.feeds.notify(message);
           break;
@@ -12737,10 +12865,10 @@ function createRoom(options, config) {
       timeoutId,
       kind,
       feedId,
-      messageId: _optionalChain([options2, 'optionalAccess', _283 => _283.messageId]),
-      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _284 => _284.expectedClientMessageId])
+      messageId: _optionalChain([options2, 'optionalAccess', _276 => _276.messageId]),
+      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _277 => _277.expectedClientMessageId])
     });
-    if (kind === "add-message" && _optionalChain([options2, 'optionalAccess', _285 => _285.expectedClientMessageId]) === void 0) {
+    if (kind === "add-message" && _optionalChain([options2, 'optionalAccess', _278 => _278.expectedClientMessageId]) === void 0) {
       const q = _nullishCoalesce(pendingAddMessageFifoByFeed.get(feedId), () => ( []));
       q.push(requestId);
       pendingAddMessageFifoByFeed.set(feedId, q);
@@ -12791,10 +12919,10 @@ function createRoom(options, config) {
           }
           if (!matched) {
             const q = pendingAddMessageFifoByFeed.get(message.feedId);
-            const headId = _optionalChain([q, 'optionalAccess', _286 => _286[0]]);
+            const headId = _optionalChain([q, 'optionalAccess', _279 => _279[0]]);
             if (headId !== void 0) {
               const pending = pendingFeedMutations.get(headId);
-              if (_optionalChain([pending, 'optionalAccess', _287 => _287.kind]) === "add-message" && pending.expectedClientMessageId === void 0) {
+              if (_optionalChain([pending, 'optionalAccess', _280 => _280.kind]) === "add-message" && pending.expectedClientMessageId === void 0) {
                 settleFeedMutation(headId, "ok");
               }
             }
@@ -12830,7 +12958,7 @@ function createRoom(options, config) {
     const unacknowledgedOps2 = [...context.unacknowledgedOps.values()];
     createOrUpdateRootFromMessage(nodes);
     applyAndSendOfflineOps(unacknowledgedOps2);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _288 => _288()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _281 => _281()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -12839,7 +12967,7 @@ function createRoom(options, config) {
     if (!messages.some((msg) => msg.type === ClientMsgCode.FETCH_STORAGE)) {
       messages.push({ type: ClientMsgCode.FETCH_STORAGE });
       nodeMapBuffer.take();
-      _optionalChain([stopwatch, 'optionalAccess', _289 => _289.start, 'call', _290 => _290()]);
+      _optionalChain([stopwatch, 'optionalAccess', _282 => _282.start, 'call', _283 => _283()]);
     }
   }
   function startLoadingStorage() {
@@ -12893,10 +13021,10 @@ function createRoom(options, config) {
     const message = {
       type: ClientMsgCode.FETCH_FEEDS,
       requestId,
-      cursor: _optionalChain([options2, 'optionalAccess', _291 => _291.cursor]),
-      since: _optionalChain([options2, 'optionalAccess', _292 => _292.since]),
-      limit: _optionalChain([options2, 'optionalAccess', _293 => _293.limit]),
-      metadata: _optionalChain([options2, 'optionalAccess', _294 => _294.metadata])
+      cursor: _optionalChain([options2, 'optionalAccess', _284 => _284.cursor]),
+      since: _optionalChain([options2, 'optionalAccess', _285 => _285.since]),
+      limit: _optionalChain([options2, 'optionalAccess', _286 => _286.limit]),
+      metadata: _optionalChain([options2, 'optionalAccess', _287 => _287.metadata])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -12916,9 +13044,9 @@ function createRoom(options, config) {
       type: ClientMsgCode.FETCH_FEED_MESSAGES,
       requestId,
       feedId,
-      cursor: _optionalChain([options2, 'optionalAccess', _295 => _295.cursor]),
-      since: _optionalChain([options2, 'optionalAccess', _296 => _296.since]),
-      limit: _optionalChain([options2, 'optionalAccess', _297 => _297.limit])
+      cursor: _optionalChain([options2, 'optionalAccess', _288 => _288.cursor]),
+      since: _optionalChain([options2, 'optionalAccess', _289 => _289.since]),
+      limit: _optionalChain([options2, 'optionalAccess', _290 => _290.limit])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -12937,8 +13065,8 @@ function createRoom(options, config) {
       type: ClientMsgCode.ADD_FEED,
       requestId,
       feedId,
-      metadata: _optionalChain([options2, 'optionalAccess', _298 => _298.metadata]),
-      createdAt: _optionalChain([options2, 'optionalAccess', _299 => _299.createdAt])
+      metadata: _optionalChain([options2, 'optionalAccess', _291 => _291.metadata]),
+      createdAt: _optionalChain([options2, 'optionalAccess', _292 => _292.createdAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -12972,15 +13100,15 @@ function createRoom(options, config) {
   function addFeedMessage(feedId, data, options2) {
     const requestId = nanoid();
     const promise = registerFeedMutation(requestId, "add-message", feedId, {
-      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _300 => _300.id])
+      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _293 => _293.id])
     });
     const message = {
       type: ClientMsgCode.ADD_FEED_MESSAGE,
       requestId,
       feedId,
       data,
-      id: _optionalChain([options2, 'optionalAccess', _301 => _301.id]),
-      createdAt: _optionalChain([options2, 'optionalAccess', _302 => _302.createdAt])
+      id: _optionalChain([options2, 'optionalAccess', _294 => _294.id]),
+      createdAt: _optionalChain([options2, 'optionalAccess', _295 => _295.createdAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -12997,7 +13125,7 @@ function createRoom(options, config) {
       feedId,
       messageId,
       data,
-      updatedAt: _optionalChain([options2, 'optionalAccess', _303 => _303.updatedAt])
+      updatedAt: _optionalChain([options2, 'optionalAccess', _296 => _296.updatedAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -13027,11 +13155,7 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyLocalOps(item.frames, {
-      origin: "local",
-      via: "history",
-      action: "undo"
-    });
+    const result = applyLocalOps(item.frames, LOCAL_UNDO);
     context.redoStack.push({ id: item.id, frames: result.reverse });
     notifyPrivateHistory({ action: "undo", id: item.id });
     notify(result.updates);
@@ -13050,11 +13174,7 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyLocalOps(item.frames, {
-      origin: "local",
-      via: "history",
-      action: "redo"
-    });
+    const result = applyLocalOps(item.frames, LOCAL_REDO);
     context.undoStack.push({ id: item.id, frames: result.reverse });
     notifyPrivateHistory({ action: "redo", id: item.id });
     notify(result.updates);
@@ -13215,8 +13335,8 @@ function createRoom(options, config) {
   async function getThreads(options2) {
     return httpClient.getThreads({
       roomId,
-      query: _optionalChain([options2, 'optionalAccess', _304 => _304.query]),
-      cursor: _optionalChain([options2, 'optionalAccess', _305 => _305.cursor])
+      query: _optionalChain([options2, 'optionalAccess', _297 => _297.query]),
+      cursor: _optionalChain([options2, 'optionalAccess', _298 => _298.cursor])
     });
   }
   async function getThread(threadId) {
@@ -13349,7 +13469,7 @@ function createRoom(options, config) {
   function getSubscriptionSettings(options2) {
     return httpClient.getSubscriptionSettings({
       roomId,
-      signal: _optionalChain([options2, 'optionalAccess', _306 => _306.signal])
+      signal: _optionalChain([options2, 'optionalAccess', _299 => _299.signal])
     });
   }
   function updateSubscriptionSettings(settings) {
@@ -13371,7 +13491,7 @@ function createRoom(options, config) {
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _307 => _307.buffer, 'access', _308 => _308.presenceUpdates, 'optionalAccess', _309 => _309.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _300 => _300.buffer, 'access', _301 => _301.presenceUpdates, 'optionalAccess', _302 => _302.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -13401,15 +13521,15 @@ function createRoom(options, config) {
           return context.yjsProvider;
         },
         setYjsProvider(newProvider) {
-          _optionalChain([context, 'access', _310 => _310.yjsProvider, 'optionalAccess', _311 => _311.off, 'call', _312 => _312("status", yjsStatusDidChange)]);
+          _optionalChain([context, 'access', _303 => _303.yjsProvider, 'optionalAccess', _304 => _304.off, 'call', _305 => _305("status", yjsStatusDidChange)]);
           context.yjsProvider = newProvider;
-          _optionalChain([newProvider, 'optionalAccess', _313 => _313.on, 'call', _314 => _314("status", yjsStatusDidChange)]);
+          _optionalChain([newProvider, 'optionalAccess', _306 => _306.on, 'call', _307 => _307("status", yjsStatusDidChange)]);
           context.yjsProviderDidChange.notify();
         },
         yjsProviderDidChange: context.yjsProviderDidChange.observable,
         // send metadata when using a text editor
         reportTextEditor,
-        getPermissionMatrix: () => _optionalChain([context, 'access', _315 => _315.dynamicSessionInfoSig, 'access', _316 => _316.get, 'call', _317 => _317(), 'optionalAccess', _318 => _318.permissionMatrix]),
+        getPermissionMatrix: () => _optionalChain([context, 'access', _308 => _308.dynamicSessionInfoSig, 'access', _309 => _309.get, 'call', _310 => _310(), 'optionalAccess', _311 => _311.permissionMatrix]),
         // create a text mention when using a text editor
         createTextMention,
         // delete a text mention when using a text editor
@@ -13472,7 +13592,7 @@ ${dumpPool(
           source.dispose();
         }
         eventHub.roomWillDestroy.notify();
-        _optionalChain([context, 'access', _319 => _319.yjsProvider, 'optionalAccess', _320 => _320.off, 'call', _321 => _321("status", yjsStatusDidChange)]);
+        _optionalChain([context, 'access', _312 => _312.yjsProvider, 'optionalAccess', _313 => _313.off, 'call', _314 => _314("status", yjsStatusDidChange)]);
         syncSourceForStorage.destroy();
         syncSourceForYjs.destroy();
         uninstallBgTabSpy();
@@ -13636,7 +13756,7 @@ function makeClassicSubscribeFn(roomId, events, errorEvents) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _322 => _322.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _315 => _315.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -13726,8 +13846,8 @@ function createClient(options) {
   const authManager = createAuthManager(options, (token) => {
     currentUserId.set(() => token.uid);
   });
-  const fetchPolyfill = _optionalChain([clientOptions, 'access', _323 => _323.polyfills, 'optionalAccess', _324 => _324.fetch]) || /* istanbul ignore next */
-  _optionalChain([globalThis, 'access', _325 => _325.fetch, 'optionalAccess', _326 => _326.bind, 'call', _327 => _327(globalThis)]);
+  const fetchPolyfill = _optionalChain([clientOptions, 'access', _316 => _316.polyfills, 'optionalAccess', _317 => _317.fetch]) || /* istanbul ignore next */
+  _optionalChain([globalThis, 'access', _318 => _318.fetch, 'optionalAccess', _319 => _319.bind, 'call', _320 => _320(globalThis)]);
   const httpClient = createApiClient({
     baseUrl,
     fetchPolyfill,
@@ -13744,7 +13864,7 @@ function createClient(options) {
     delegates: {
       createSocket: makeCreateSocketDelegateForAi(
         baseUrl,
-        _optionalChain([clientOptions, 'access', _328 => _328.polyfills, 'optionalAccess', _329 => _329.WebSocket])
+        _optionalChain([clientOptions, 'access', _321 => _321.polyfills, 'optionalAccess', _322 => _322.WebSocket])
       ),
       authenticate: async () => {
         const resp = await authManager.getAuthValue({
@@ -13815,7 +13935,7 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _330 => _330.polyfills, 'optionalAccess', _331 => _331.WebSocket])
+            _optionalChain([clientOptions, 'access', _323 => _323.polyfills, 'optionalAccess', _324 => _324.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
@@ -13837,7 +13957,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _332 => _332.polyfills, 'optionalAccess', _333 => _333.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _325 => _325.polyfills, 'optionalAccess', _326 => _326.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -13849,7 +13969,7 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _334 => _334.get, 'call', _335 => _335(roomId), 'optionalAccess', _336 => _336.room]);
+    const room = _optionalChain([roomsById, 'access', _327 => _327.get, 'call', _328 => _328(roomId), 'optionalAccess', _329 => _329.room]);
     return room ? room : null;
   }
   function logout() {
@@ -13865,7 +13985,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _337 => _337({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _330 => _330({ userIds })]);
       warnOnceIf(
         !resolveUsers,
         "Set the resolveUsers option in createClient to specify user info."
@@ -13882,7 +14002,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _338 => _338({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _331 => _331({ roomIds })]);
       warnOnceIf(
         !resolveRoomsInfo,
         "Set the resolveRoomsInfo option in createClient to specify room info."
@@ -13899,7 +14019,7 @@ function createClient(options) {
   const batchedResolveGroupsInfo = new Batch(
     async (batchedGroupIds) => {
       const groupIds = batchedGroupIds.flat();
-      const groupsInfo = await _optionalChain([resolveGroupsInfo, 'optionalCall', _339 => _339({ groupIds })]);
+      const groupsInfo = await _optionalChain([resolveGroupsInfo, 'optionalCall', _332 => _332({ groupIds })]);
       warnOnceIf(
         !resolveGroupsInfo,
         "Set the resolveGroupsInfo option in createClient to specify group info."
@@ -13958,7 +14078,7 @@ function createClient(options) {
       }
     };
     const win = typeof window !== "undefined" ? window : void 0;
-    _optionalChain([win, 'optionalAccess', _340 => _340.addEventListener, 'call', _341 => _341("beforeunload", maybePreventClose)]);
+    _optionalChain([win, 'optionalAccess', _333 => _333.addEventListener, 'call', _334 => _334("beforeunload", maybePreventClose)]);
   }
   async function getNotificationSettings(options2) {
     const plainSettings = await httpClient.getNotificationSettings(options2);
@@ -14086,7 +14206,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _342 => _342.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _335 => _335.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -14096,13 +14216,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _343 => _343(block)]);
+        _optionalChain([visitor, 'optionalCall', _336 => _336(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _344 => _344(inline)]);
+          _optionalChain([visitor, 'optionalCall', _337 => _337(inline)]);
         }
       }
     }
@@ -14272,7 +14392,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user, group }) => {
-    return `@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _345 => _345.name]), () => ( _optionalChain([group, 'optionalAccess', _346 => _346.name]))), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _338 => _338.name]), () => ( _optionalChain([group, 'optionalAccess', _339 => _339.name]))), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -14302,7 +14422,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.text ? html`${element.text}` : element.url}</a>`;
   },
   mention: ({ element, user, group }) => {
-    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _347 => _347.name]) ? html`${_optionalChain([user, 'optionalAccess', _348 => _348.name])}` : _optionalChain([group, 'optionalAccess', _349 => _349.name]) ? html`${_optionalChain([group, 'optionalAccess', _350 => _350.name])}` : element.id}</span>`;
+    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _340 => _340.name]) ? html`${_optionalChain([user, 'optionalAccess', _341 => _341.name])}` : _optionalChain([group, 'optionalAccess', _342 => _342.name]) ? html`${_optionalChain([group, 'optionalAccess', _343 => _343.name])}` : element.id}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -14332,20 +14452,20 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user, group }) => {
-    return markdown`@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _351 => _351.name]), () => ( _optionalChain([group, 'optionalAccess', _352 => _352.name]))), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _344 => _344.name]), () => ( _optionalChain([group, 'optionalAccess', _345 => _345.name]))), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _353 => _353.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _354 => _354.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _346 => _346.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _347 => _347.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _355 => _355.elements])
+    ..._optionalChain([options, 'optionalAccess', _348 => _348.elements])
   };
   const { users: resolvedUsers, groups: resolvedGroupsInfo } = await resolveMentionsInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _356 => _356.resolveUsers]),
-    _optionalChain([options, 'optionalAccess', _357 => _357.resolveGroupsInfo])
+    _optionalChain([options, 'optionalAccess', _349 => _349.resolveUsers]),
+    _optionalChain([options, 'optionalAccess', _350 => _350.resolveGroupsInfo])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -14491,9 +14611,9 @@ function makePoller(callback, intervalMs, options) {
   const startTime = performance.now();
   const doc = typeof document !== "undefined" ? document : void 0;
   const win = typeof window !== "undefined" ? window : void 0;
-  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _358 => _358.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
+  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _351 => _351.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
   const context = {
-    inForeground: _optionalChain([doc, 'optionalAccess', _359 => _359.visibilityState]) !== "hidden",
+    inForeground: _optionalChain([doc, 'optionalAccess', _352 => _352.visibilityState]) !== "hidden",
     lastSuccessfulPollAt: startTime,
     count: 0,
     backoff: 0
@@ -14574,11 +14694,11 @@ function makePoller(callback, intervalMs, options) {
     pollNowIfStale();
   }
   function onVisibilityChange() {
-    setInForeground(_optionalChain([doc, 'optionalAccess', _360 => _360.visibilityState]) !== "hidden");
+    setInForeground(_optionalChain([doc, 'optionalAccess', _353 => _353.visibilityState]) !== "hidden");
   }
-  _optionalChain([doc, 'optionalAccess', _361 => _361.addEventListener, 'call', _362 => _362("visibilitychange", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _363 => _363.addEventListener, 'call', _364 => _364("online", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _365 => _365.addEventListener, 'call', _366 => _366("focus", pollNowIfStale)]);
+  _optionalChain([doc, 'optionalAccess', _354 => _354.addEventListener, 'call', _355 => _355("visibilitychange", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _356 => _356.addEventListener, 'call', _357 => _357("online", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _358 => _358.addEventListener, 'call', _359 => _359("focus", pollNowIfStale)]);
   fsm.start();
   return {
     inc,
@@ -14731,6 +14851,5 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveFile = LiveFile; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveText = LiveText; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.applyLiveTextOperations = applyLiveTextOperations; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createStorageFileId = createStorageFileId; exports.createThreadId = createThreadId; exports.deepLiveify = deepLiveify; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getLiveFileId = getLiveFileId; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.hasPermissionAccess = hasPermissionAccess; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isFileStorageNode = isFileStorageNode; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isTextStorageNode = isTextStorageNode; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.kStorageUpdateSource = kStorageUpdateSource; exports.keys = keys; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.mergeRoomPermissionScopes = mergeRoomPermissionScopes; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.normalizeRoomAccesses = normalizeRoomAccesses; exports.normalizeRoomPermissions = normalizeRoomPermissions; exports.normalizeUpdateRoomAccesses = normalizeUpdateRoomAccesses; exports.objectToQuery = objectToQuery; exports.patchNotificationSettings = patchNotificationSettings; exports.permissionMatrixFromScopes = permissionMatrixFromScopes; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.transformTextOperations = transformTextOperations; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.validatePermissionsSet = validatePermissionsSet; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveFile = LiveFile; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveText = LiveText; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.applyLiveTextOperations = applyLiveTextOperations; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createStorageFileId = createStorageFileId; exports.createThreadId = createThreadId; exports.deepLiveify = deepLiveify; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getLiveFileId = getLiveFileId; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.hasPermissionAccess = hasPermissionAccess; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isFileStorageNode = isFileStorageNode; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isTextStorageNode = isTextStorageNode; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.mergeRoomPermissionScopes = mergeRoomPermissionScopes; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.normalizeRoomAccesses = normalizeRoomAccesses; exports.normalizeRoomPermissions = normalizeRoomPermissions; exports.normalizeUpdateRoomAccesses = normalizeUpdateRoomAccesses; exports.objectToQuery = objectToQuery; exports.patchNotificationSettings = patchNotificationSettings; exports.permissionMatrixFromScopes = permissionMatrixFromScopes; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.transformTextOperations = transformTextOperations; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.validatePermissionsSet = validatePermissionsSet; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map