@liveblocks/core 3.23.1-exp1 → 3.23.1-exp3

package/dist/index.js

@@ -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-exp3";
 var PKG_FORMAT = "esm";
 
 // 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 (this._pool?.getNode(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 (this._pool?.getNode(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 = 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 = 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 = class _LiveObject extends AbstractCrdt {
         type: "LiveObject",
         updates: {
           [parentKey]: { type: "delete", deletedItem }
-        }
+        },
+        source
       };
       return { modified: storageUpdate, reverse };
     }
@@ -8739,13 +8808,13 @@ var LiveObject = 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 = 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 = 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 = 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 = class _LiveObject extends AbstractCrdt {
         type: "LiveObject",
         updates: {
           [op.key]: { type: "delete", deletedItem: oldValue }
-        }
+        },
+        source: toUpdateSource(source)
       },
       reverse
     };
@@ -8907,7 +8978,8 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         updates: {
           ...existing?.updates,
           [key]: { type: "update" }
-        }
+        },
+        source: LOCAL_EDIT
       });
       this._pool.dispatch(ops, reverse, storageUpdates);
     }
@@ -8941,7 +9013,8 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
               type: "delete",
               deletedItem: oldValue2
             }
-          }
+          },
+          source: LOCAL_EDIT
         });
         return [[], [], storageUpdates2];
       }
@@ -8989,7 +9062,8 @@ var LiveObject = 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 = 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);
@@ -9638,6 +9738,34 @@ function applyLiveTextOperations(data, ops) {
     applyTextOperationsToSegments(dataToSegments(data), ops)
   );
 }
+function normalizeLiveTextOperations(data, operations) {
+  let shadow = dataToSegments(data);
+  const normalized = [];
+  for (const operation of operations) {
+    const text = shadow.map((segment) => segment.text).join("");
+    let normalizedOperation;
+    if (operation.type === "insert") {
+      normalizedOperation = {
+        ...operation,
+        index: clipIndexToCodePointBoundary(text, operation.index)
+      };
+    } else {
+      const range = clipRangeToCodePointBoundaries(
+        text,
+        operation.index,
+        operation.length
+      );
+      normalizedOperation = {
+        ...operation,
+        index: range.index,
+        length: range.length
+      };
+    }
+    normalized.push(normalizedOperation);
+    shadow = applyTextOperationsToSegments(shadow, [normalizedOperation]);
+  }
+  return normalized;
+}
 function invertTextOperations(segments, ops) {
   let shadow = [...segments];
   const reverse = [];
@@ -9770,21 +9898,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, 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 +9928,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 +9939,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 +9959,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 +10056,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 +10094,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
           type: "LiveText",
           node: this,
           version: this.#version,
-          updates: changes
+          updates: changes,
+          source: LOCAL_EDIT
         }
       ]
     ]);
@@ -9984,7 +10125,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 +10161,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 = op.version ?? Math.max(this.#version, op.baseVersion + 1);
     const predicted = this.#inFlightOps;
     const opId = this.#inFlightOpId;
@@ -10047,7 +10189,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
             type: "LiveText",
             node: this,
             version: ackedVersion,
-            updates: rebuilt.changes
+            updates: rebuilt.changes,
+            source
           }
         };
       }
@@ -10058,7 +10201,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 = op.version ?? this.#version + 1;
     this.#confirmed = applyTextOperationsToSegments(this.#confirmed, op.ops);
     const [overInFlight, inFlight] = transformTextOperationsX(
@@ -10087,7 +10230,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
         type: "LiveText",
         node: this,
         version: this.#version,
-        updates: changes
+        updates: changes,
+        source
       }
     };
   }
@@ -10171,7 +10315,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 +10327,8 @@ var LiveText = class _LiveText extends AbstractCrdt {
       type: "LiveText",
       node: this,
       version: this.#version,
-      updates: rebuilt.changes
+      updates: rebuilt.changes,
+      source
     };
   }
   /**
@@ -10697,37 +10842,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 (sa?.origin === "remote" || sb?.origin === "remote") {
-      merged[kStorageUpdateSource] = { origin: "remote" };
-    } else if (sa?.via === "history" || sb?.via === "history") {
-      const historySource = sb?.via === "history" ? sb : sa?.via === "history" ? sa : void 0;
-      if (historySource?.via === "history") {
-        merged[kStorageUpdateSource] = historySource;
-      }
-    } else {
-      merged[kStorageUpdateSource] = { origin: "local", via: "mutation" };
-    }
+    return { ...second, source };
   }
-  return merged;
 }
 
 // src/devtools/bridge.ts
@@ -11771,9 +11909,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);
@@ -11923,7 +12058,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,
@@ -12026,7 +12161,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 +12178,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 +12230,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 +12252,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 +12281,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 +12331,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);
@@ -12469,6 +12624,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)) {
@@ -13027,11 +13183,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 +13202,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);
@@ -14696,7 +14844,6 @@ export {
   isTextStorageNode,
   isUrl,
   kInternal,
-  kStorageUpdateSource,
   keys,
   makeAbortController,
   makeEventSource,
@@ -14708,6 +14855,7 @@ export {
   nanoid,
   nn,
   nodeStreamToCompactNodes,
+  normalizeLiveTextOperations,
   normalizeRoomAccesses,
   normalizeRoomPermissions,
   normalizeUpdateRoomAccesses,