@liveblocks/core 3.19.4-test1 → 3.19.4

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.19.4-test1";
+var PKG_VERSION = "3.19.4";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -701,6 +701,20 @@ var SortedList = class _SortedList {
   get length() {
     return this.#data.length;
   }
+  /**
+   * Whether the given value is present, by identity. O(log n) plus the length
+   * of any run of items that share its sort key (normally 1). Bisects on the
+   * value's own key, so it only finds values sitting at their sorted position,
+   * which is true for any item currently in the list.
+   */
+  includes(value) {
+    for (let i = bisectRight(this.#data, value, this.#lt) - 1; i >= 0 && !this.#lt(this.#data[i], value); i--) {
+      if (this.#data[i] === value) {
+        return true;
+      }
+    }
+    return false;
+  }
   *filter(predicate) {
     for (const item of this.#data) {
       if (predicate(item)) {
@@ -2715,6 +2729,7 @@ var HttpClient = class {
 };
 
 // src/lib/fsm.ts
+var IGNORE = /* @__PURE__ */ Symbol("fsm.ignore");
 function distance(state1, state2) {
   if (state1 === state2) {
     return [0, 0];
@@ -2887,7 +2902,7 @@ var FSM = class {
     this.#eventHub = {
       didReceiveEvent: makeEventSource(),
       willTransition: makeEventSource(),
-      didIgnoreEvent: makeEventSource(),
+      didIgnoreUnexpectedEvent: makeEventSource(),
       willExitState: makeEventSource(),
       didEnterState: makeEventSource(),
       didExitState: makeEventSource()
@@ -2895,7 +2910,7 @@ var FSM = class {
     this.events = {
       didReceiveEvent: this.#eventHub.didReceiveEvent.observable,
       willTransition: this.#eventHub.willTransition.observable,
-      didIgnoreEvent: this.#eventHub.didIgnoreEvent.observable,
+      didIgnoreUnexpectedEvent: this.#eventHub.didIgnoreUnexpectedEvent.observable,
       willExitState: this.#eventHub.willExitState.observable,
       didEnterState: this.#eventHub.didEnterState.observable,
       didExitState: this.#eventHub.didExitState.observable
@@ -3018,9 +3033,14 @@ var FSM = class {
    * `context` params to conditionally decide which next state to transition
    * to.
    *
-   * If you set it to `null`, then the transition will be explicitly forbidden
-   * and throw an error. If you don't define a target for a transition, then
-   * such events will get ignored.
+   * If you don't define a target for a transition, the event is treated
+   * as unhandled in this state: `didIgnoreUnexpectedEvent` fires and the
+   * state does not change.
+   *
+   * To declare an event as an intentional silent no-op in this state, use
+   * the {@link IGNORE} sentinel — either statically (`{ EVENT: IGNORE }`)
+   * or as a return value from a target function. IGNORE'd events do not
+   * fire `didIgnoreUnexpectedEvent`.
    */
   addTransitions(nameOrPattern, mapping) {
     if (this.#runningState !== 0 /* NOT_STARTED_YET */) {
@@ -3040,7 +3060,12 @@ var FSM = class {
         }
         const target = target_;
         this.#knownEventTypes.add(type);
-        if (target !== void 0) {
+        if (target === void 0) {
+          continue;
+        }
+        if (target === IGNORE) {
+          map.set(type, IGNORE);
+        } else {
           const targetFn = typeof target === "function" ? target : () => target;
           map.set(type, targetFn);
         }
@@ -3139,12 +3164,14 @@ var FSM = class {
     if (this.#runningState === 2 /* STOPPED */) {
       return;
     }
-    const targetFn = this.#getTargetFn(event.type);
-    if (targetFn !== void 0) {
-      return this.#transition(event, targetFn);
-    } else {
-      this.#eventHub.didIgnoreEvent.notify(event);
+    const entry = this.#getTargetFn(event.type);
+    if (entry === IGNORE) {
+      return;
+    }
+    if (entry !== void 0) {
+      return this.#transition(event, entry);
     }
+    this.#eventHub.didIgnoreUnexpectedEvent.notify(event);
   }
   #transition(event, target) {
     this.#eventHub.didReceiveEvent.notify(event);
@@ -3153,8 +3180,7 @@ var FSM = class {
     const nextTarget = targetFn(event, this.#currentContext.current);
     let nextState;
     let effects = void 0;
-    if (nextTarget === null) {
-      this.#eventHub.didIgnoreEvent.notify(event);
+    if (nextTarget === IGNORE) {
       return;
     }
     if (typeof nextTarget === "string") {
@@ -3373,8 +3399,8 @@ function enableTracing(machine) {
     machine.events.didExitState.subscribe(
       ({ state, durationMs }) => log2(`Exited ${state} after ${durationMs.toFixed(0)}ms`)
     ),
-    machine.events.didIgnoreEvent.subscribe(
-      (e) => log2("Ignored event", e.type, e, "(current state won't handle it)")
+    machine.events.didIgnoreUnexpectedEvent.subscribe(
+      (e) => log2("Ignored unexpected event", e.type, e, "(no transition declared)")
     )
   ];
   return () => {
@@ -3486,7 +3512,12 @@ function createConnectionStateMachine(delegates, options) {
   );
   const onSocketError = (event) => machine.send({ type: "EXPLICIT_SOCKET_ERROR", event });
   const onSocketClose = (event) => machine.send({ type: "EXPLICIT_SOCKET_CLOSE", event });
-  const onSocketMessage = (event) => event.data === "pong" ? machine.send({ type: "PONG" }) : onMessage.notify(event);
+  const onSocketMessage = (event) => {
+    machine.send({ type: "ALIVE" });
+    if (event.data !== "pong") {
+      onMessage.notify(event);
+    }
+  };
   function teardownSocket(socket) {
     if (socket) {
       socket.removeEventListener("error", onSocketError);
@@ -3656,7 +3687,13 @@ function createConnectionStateMachine(delegates, options) {
         effect: [increaseBackoffDelay, logPrematureErrorOrCloseEvent(err)]
       };
     }
-  );
+  ).addTransitions("@connecting.busy", {
+    // The socket message listener is attached during @connecting.busy (see
+    // onEnterAsync above), so server frames (most notably the actor-id
+    // handshake) can fire onSocketMessage and emit a ALIVE before we
+    // reach @ok.*. That's fine. Heartbeat only matters in @ok.*.
+    ALIVE: IGNORE
+  });
   const sendHeartbeat = {
     target: "@ok.awaiting-pong",
     effect: (ctx) => {
@@ -3671,7 +3708,8 @@ function createConnectionStateMachine(delegates, options) {
   machine.addTimedTransition("@ok.connected", HEARTBEAT_INTERVAL, maybeHeartbeat).addTransitions("@ok.connected", {
     NAVIGATOR_OFFLINE: maybeHeartbeat,
     // Don't take the browser's word for it when it says it's offline. Do a ping/pong to make sure.
-    WINDOW_GOT_FOCUS: sendHeartbeat
+    WINDOW_GOT_FOCUS: sendHeartbeat,
+    ALIVE: IGNORE
   });
   machine.addTransitions("@idle.zombie", {
     WINDOW_GOT_FOCUS: "@connecting.backoff"
@@ -3692,7 +3730,7 @@ function createConnectionStateMachine(delegates, options) {
       clearTimeout(timerID);
       onMessage.pause();
     };
-  }).addTransitions("@ok.awaiting-pong", { PONG: "@ok.connected" }).addTimedTransition("@ok.awaiting-pong", PONG_TIMEOUT, {
+  }).addTransitions("@ok.awaiting-pong", { ALIVE: "@ok.connected" }).addTimedTransition("@ok.awaiting-pong", PONG_TIMEOUT, {
     target: "@connecting.busy",
     // Log implicit connection loss and drop the current open socket
     effect: log(
@@ -3705,7 +3743,7 @@ function createConnectionStateMachine(delegates, options) {
     // not. When still OPEN, don't transition.
     EXPLICIT_SOCKET_ERROR: (_, context) => {
       if (context.socket?.readyState === 1) {
-        return null;
+        return IGNORE;
       }
       return {
         target: "@connecting.backoff",
@@ -5473,21 +5511,21 @@ var OpCode = Object.freeze({
   DELETE_CRDT: 5,
   DELETE_OBJECT_KEY: 6,
   CREATE_MAP: 7,
-  CREATE_REGISTER: 8,
-  CREATE_TEXT: 9,
-  UPDATE_TEXT: 10
+  CREATE_REGISTER: 8
 });
 function isIgnoredOp(op) {
   return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
 }
+function isCreateOp(op) {
+  return op.type === OpCode.CREATE_OBJECT || op.type === OpCode.CREATE_REGISTER || op.type === OpCode.CREATE_MAP || op.type === OpCode.CREATE_LIST;
+}
 
 // src/protocol/StorageNode.ts
 var CrdtType = Object.freeze({
   OBJECT: 0,
   LIST: 1,
   MAP: 2,
-  REGISTER: 3,
-  TEXT: 4
+  REGISTER: 3
 });
 function isRootStorageNode(node) {
   return node[0] === "root";
@@ -5504,9 +5542,6 @@ function isMapStorageNode(node) {
 function isRegisterStorageNode(node) {
   return node[1].type === CrdtType.REGISTER;
 }
-function isTextStorageNode(node) {
-  return node[1].type === CrdtType.TEXT;
-}
 function isCompactRootNode(node) {
   return node[0] === "root";
 }
@@ -5529,9 +5564,6 @@ function* compactNodesToNodeStream(compactNodes) {
       case CrdtType.REGISTER:
         yield [cnode[0], { type: CrdtType.REGISTER, parentId: cnode[2], parentKey: cnode[3], data: cnode[4] }];
         break;
-      case CrdtType.TEXT:
-        yield [cnode[0], { type: CrdtType.TEXT, parentId: cnode[2], parentKey: cnode[3], data: cnode[4], version: cnode[5] }];
-        break;
       default:
     }
   }
@@ -5560,17 +5592,6 @@ function* nodeStreamToCompactNodes(nodes) {
       const id = node[0];
       const crdt = node[1];
       yield [id, CrdtType.REGISTER, crdt.parentId, crdt.parentKey, crdt.data];
-    } else if (isTextStorageNode(node)) {
-      const id = node[0];
-      const crdt = node[1];
-      yield [
-        id,
-        CrdtType.TEXT,
-        crdt.parentId,
-        crdt.parentKey,
-        crdt.data,
-        crdt.version
-      ];
     } else {
     }
   }
@@ -5755,12 +5776,95 @@ function asPos(str) {
   return isPos(str) ? str : convertToPos(str);
 }
 
+// src/crdts/UnacknowledgedOps.ts
+var UnacknowledgedOps = class {
+  // opId -> op
+  #byOpId = /* @__PURE__ */ new Map();
+  // position -> (opId -> Create op)
+  #createOpsByPosition = /* @__PURE__ */ new Map();
+  // parentId -> (opId -> Create op)
+  #createOpsByParent = /* @__PURE__ */ new Map();
+  #posKey(parentId, parentKey) {
+    return `${parentId}
+${parentKey}`;
+  }
+  get size() {
+    return this.#byOpId.size;
+  }
+  /**
+   * Mark the given Op as still unacknowledged.
+   */
+  add(op) {
+    this.#byOpId.set(op.opId, op);
+    if (isCreateOp(op)) {
+      const posKey = this.#posKey(op.parentId, op.parentKey);
+      let atPosition = this.#createOpsByPosition.get(posKey);
+      if (atPosition === void 0) {
+        atPosition = /* @__PURE__ */ new Map();
+        this.#createOpsByPosition.set(posKey, atPosition);
+      }
+      atPosition.set(op.opId, op);
+      let inParent = this.#createOpsByParent.get(op.parentId);
+      if (inParent === void 0) {
+        inParent = /* @__PURE__ */ new Map();
+        this.#createOpsByParent.set(op.parentId, inParent);
+      }
+      inParent.set(op.opId, op);
+    }
+  }
+  /**
+   * Drop the op with the given opId from the set, because the server has
+   * acknowledged it (confirmed our own op, or signalled it was seen but
+   * ignored).
+   */
+  delete(opId) {
+    const op = this.#byOpId.get(opId);
+    if (op === void 0) {
+      return;
+    }
+    this.#byOpId.delete(opId);
+    if (isCreateOp(op)) {
+      const posKey = this.#posKey(op.parentId, op.parentKey);
+      const atPosition = this.#createOpsByPosition.get(posKey);
+      atPosition?.delete(opId);
+      if (atPosition !== void 0 && atPosition.size === 0) {
+        this.#createOpsByPosition.delete(posKey);
+      }
+      const inParent = this.#createOpsByParent.get(op.parentId);
+      inParent?.delete(opId);
+      if (inParent !== void 0 && inParent.size === 0) {
+        this.#createOpsByParent.delete(op.parentId);
+      }
+    }
+  }
+  /**
+   * The still-unacknowledged Create ops with the given `parentId` and
+   * `parentKey` (targeting one exact position), in dispatch order. O(1) lookup.
+   * Empty if none.
+   */
+  getByParentIdAndKey(parentId, parentKey) {
+    return this.#createOpsByPosition.get(this.#posKey(parentId, parentKey))?.values() ?? [];
+  }
+  /**
+   * The still-unacknowledged Create ops with the given `parentId` (across all
+   * positions), in dispatch order. O(1) lookup. Empty if none.
+   */
+  getByParentId(parentId) {
+    return this.#createOpsByParent.get(parentId)?.values() ?? [];
+  }
+  /** All still-unacknowledged ops, in dispatch order. */
+  values() {
+    return this.#byOpId.values();
+  }
+};
+
 // src/crdts/AbstractCrdt.ts
 function createManagedPool(roomId, options) {
   const {
     getCurrentConnectionId,
     onDispatch,
-    isStorageWritable = () => true
+    isStorageWritable = () => true,
+    unacknowledgedOps = new UnacknowledgedOps()
   } = options;
   let clock = 0;
   let opClock = 0;
@@ -5782,7 +5886,8 @@ function createManagedPool(roomId, options) {
           "Cannot write to storage with a read only user, please ensure the user has write permissions"
         );
       }
-    }
+    },
+    unacknowledgedOps
   };
 }
 function crdtAsLiveNode(value) {
@@ -6064,11 +6169,9 @@ function childNodeLt(a, b) {
 var LiveList = class _LiveList extends AbstractCrdt {
   #items;
   #implicitlyDeletedItems;
-  #unacknowledgedSets;
   constructor(items) {
     super();
     this.#implicitlyDeletedItems = /* @__PURE__ */ new WeakSet();
-    this.#unacknowledgedSets = /* @__PURE__ */ new Map();
     const nodes = [];
     let lastPos;
     for (const item of items) {
@@ -6098,12 +6201,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /**
    * @internal
-   * This function assumes that the resulting ops will be sent to the server if they have an 'opId'
-   * so we mutate _unacknowledgedSets to avoid potential flickering
-   * https://github.com/liveblocks/liveblocks/pull/1177
+   * Serializes this list (and its children) into Create ops. Each child's
+   * create is tagged with the "set" intent (in the loop below) so that a list
+   * created and immediately mutated doesn't transiently re-show its initial
+   * items (flicker, https://github.com/liveblocks/liveblocks/pull/1177).
    *
-   * This is quite unintuitive and should disappear as soon as
-   * we introduce an explicit LiveList.Set operation
+   * This is quite unintuitive and should disappear as soon as we introduce an
+   * explicit LiveList.Set operation.
    */
   _toOps(parentId, parentKey) {
     if (this._id === void 0) {
@@ -6119,9 +6223,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
     ops.push(op);
     for (const item of this.#items) {
       const parentKey2 = item._getParentKeyOrThrow();
-      const childOps = HACK_addIntentAndDeletedIdToOperation(
+      const childOps = addIntentToRootOp(
         item._toOps(this._id, parentKey2),
-        void 0
+        "set"
       );
       for (const childOp of childOps) {
         ops.push(childOp);
@@ -6163,6 +6267,28 @@ var LiveList = class _LiveList extends AbstractCrdt {
       (item) => item._getParentKeyOrThrow() === position
     );
   }
+  /**
+   * The opId of this list's still-unacknowledged "set" op at the given position,
+   * or undefined if none. Derived from the room's unacknowledgedOps (the single
+   * source of truth) rather than tracked in a per-instance map. The pool's
+   * position index already scopes to this list's (parentId, position); the last
+   * match wins, matching the original last-write-wins map semantics.
+   */
+  #unacknowledgedSetOpIdAt(position) {
+    if (this._pool === void 0 || this._id === void 0) {
+      return void 0;
+    }
+    let opId;
+    for (const op of this._pool.unacknowledgedOps.getByParentIdAndKey(
+      this._id,
+      position
+    )) {
+      if (op.intent === "set") {
+        opId = op.opId;
+      }
+    }
+    return opId;
+  }
   /** @internal */
   _attach(id, pool) {
     super._attach(id, pool);
@@ -6243,13 +6369,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (deletedDelta) {
       delta.push(deletedDelta);
     }
-    const unacknowledgedOpId = this.#unacknowledgedSets.get(op.parentKey);
-    if (unacknowledgedOpId !== void 0) {
-      if (unacknowledgedOpId !== op.opId) {
-        return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta), reverse: [] };
-      } else {
-        this.#unacknowledgedSets.delete(op.parentKey);
-      }
+    const unacknowledgedOpId = this.#unacknowledgedSetOpIdAt(op.parentKey);
+    if (unacknowledgedOpId !== void 0 && unacknowledgedOpId !== op.opId) {
+      return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta), reverse: [] };
     }
     const indexOfItemWithSamePosition = this._indexOfPosition(op.parentKey);
     const existingItem = this.#items.find((item) => item._id === op.id);
@@ -6330,7 +6452,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     return result.modified.updates[0];
   }
-  #applyRemoteInsert(op) {
+  #applyRemoteInsert(op, fromSnapshot) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6340,11 +6462,82 @@ var LiveList = class _LiveList extends AbstractCrdt {
       this.#shiftItemPosition(existingItemIndex, key);
     }
     const { newItem, newIndex } = this.#createAttachItemAndSort(op, key);
+    const bumpDeltas = fromSnapshot ? [] : this.#bumpUnackedPushesAbove(key);
     return {
-      modified: makeUpdate(this, [insertDelta(newIndex, newItem)]),
+      modified: makeUpdate(this, [
+        insertDelta(newIndex, newItem),
+        ...bumpDeltas
+      ]),
       reverse: []
     };
   }
+  /**
+   * This list's own still-unacknowledged pushed items (their `intent: "push"`
+   * Create op is still pending in the room's unacknowledgedOps). Derived from
+   * the single source of truth, so an item drops out the instant its op is
+   * acked, with no per-instance membership to leak. Yielded in push order.
+   *
+   * Restricted to items currently in `#items`: a pushed node whose op is still
+   * pending may have been pulled out of the list (e.g. implicitly deleted by a
+   * remote set, or removed by an undo) while still living in the pool, and such
+   * a node must not be repositioned.
+   */
+  *#unackedPushNodes() {
+    if (this._pool === void 0 || this._id === void 0) {
+      return;
+    }
+    for (const op of this._pool.unacknowledgedOps.getByParentId(this._id)) {
+      if (op.intent !== "push") {
+        continue;
+      }
+      const node = this._pool.getNode(op.id);
+      if (node !== void 0 && this.#items.includes(node)) {
+        yield node;
+      }
+    }
+  }
+  /**
+   * Optimistic no-flip for pushed items. When a remote op lands at or below my
+   * still-unacked pushed items, those items must end up *after* it: FIFO plus
+   * the room's serial processing guarantee the remote was processed first, so
+   * my unacked pushes belong behind it. Re-chain the whole unacked-push block,
+   * in push order, to sit after the highest confirmed sibling, so it keeps
+   * rendering as a contiguous tail instead of getting interleaved. Local-only;
+   * the real acks overwrite these keys with the (identical) server keys.
+   */
+  #bumpUnackedPushesAbove(remoteKey) {
+    const pending = new Set(this.#unackedPushNodes());
+    if (pending.size === 0) {
+      return [];
+    }
+    let minPending;
+    for (const node of pending) {
+      const pos = node._parentPos;
+      if (minPending === void 0 || pos < minPending) {
+        minPending = pos;
+      }
+    }
+    if (remoteKey < nn(minPending)) {
+      return [];
+    }
+    let base;
+    for (const item of this.#items) {
+      if (!pending.has(item)) {
+        base = item._parentPos;
+      }
+    }
+    const deltas = [];
+    for (const node of pending) {
+      const previousIndex = this.#items.findIndex((item) => item === node);
+      base = makePosition(base);
+      this.#updateItemPosition(node, base);
+      const index = this.#items.findIndex((item) => item === node);
+      if (index !== previousIndex) {
+        deltas.push(moveDelta(previousIndex, index, node));
+      }
+    }
+    return deltas;
+  }
   #applyInsertAck(op) {
     const existingItem = this.#items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
@@ -6425,7 +6618,6 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (this._pool?.getNode(id) !== void 0) {
       return { modified: false };
     }
-    this.#unacknowledgedSets.set(key, nn(op.opId));
     const indexOfItemWithSameKey = this._indexOfPosition(key);
     child._attach(id, nn(this._pool));
     child._setParentLink(this, key);
@@ -6435,8 +6627,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
       existingItem._detach();
       this.#items.remove(existingItem);
       this.#items.add(child);
-      const reverse = HACK_addIntentAndDeletedIdToOperation(
+      const reverse = addIntentToRootOp(
         existingItem._toOps(nn(this._id), key),
+        "set",
         op.id
       );
       const delta = [setDelta(indexOfItemWithSameKey, child)];
@@ -6461,7 +6654,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   /** @internal */
-  _attachChild(op, source) {
+  _attachChild(op, source, fromSnapshot = false) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6476,7 +6669,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       }
     } else {
       if (source === 1 /* THEIRS */) {
-        result = this.#applyRemoteInsert(op);
+        result = this.#applyRemoteInsert(op, fromSnapshot);
       } else if (source === 2 /* OURS */) {
         result = this.#applyInsertAck(op);
       } else {
@@ -6679,8 +6872,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param element The element to add to the end of the LiveList.
    */
   push(element) {
-    this._pool?.assertStorageIsWritable();
-    return this.insert(element, this.length);
+    return this.#injectAt(element, this.length, "push");
   }
   /**
    * Inserts one element at a specified index.
@@ -6688,6 +6880,15 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index at which you want to insert the element.
    */
   insert(element, index) {
+    return this.#injectAt(element, index, "insert");
+  }
+  /**
+   * Shared implementation of `insert` and `push`. A `"push"` intent leaves the
+   * client-computed position untouched (so optimistic rendering is unchanged),
+   * but tags the Op so the server appends it to the true end of the list
+   * instead of resolving its position against the client's stale view.
+   */
+  #injectAt(element, index, intent) {
     this._pool?.assertStorageIsWritable();
     if (index < 0 || index > this.#items.length) {
       throw new Error(
@@ -6703,8 +6904,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (this._pool && this._id) {
       const id = this._pool.generateId();
       value._attach(id, this._pool);
+      const ops = value._toOpsWithOpId(this._id, position, this._pool);
       this._pool.dispatch(
-        value._toOpsWithOpId(this._id, position, this._pool),
+        intent === "push" ? addIntentToRootOp(ops, "push") : ops,
         [{ type: OpCode.DELETE_CRDT, id }],
         /* @__PURE__ */ new Map([
           [this._id, makeUpdate(this, [insertDelta(index, value)])]
@@ -6862,13 +7064,14 @@ var LiveList = class _LiveList extends AbstractCrdt {
       value._attach(id, this._pool);
       const storageUpdates = /* @__PURE__ */ new Map();
       storageUpdates.set(this._id, makeUpdate(this, [setDelta(index, value)]));
-      const ops = HACK_addIntentAndDeletedIdToOperation(
+      const ops = addIntentToRootOp(
         value._toOpsWithOpId(this._id, position, this._pool),
+        "set",
         existingId
       );
-      this.#unacknowledgedSets.set(position, nn(ops[0].opId));
-      const reverseOps = HACK_addIntentAndDeletedIdToOperation(
+      const reverseOps = addIntentToRootOp(
         existingItem._toOps(this._id, position),
+        "set",
         id
       );
       this._pool.dispatch(ops, reverseOps, storageUpdates);
@@ -7069,15 +7272,11 @@ function moveDelta(previousIndex, index, item) {
     previousIndex
   };
 }
-function HACK_addIntentAndDeletedIdToOperation(ops, deletedId) {
+function addIntentToRootOp(ops, intent, deletedId) {
   return ops.map((op, index) => {
     if (index === 0) {
       const firstOp = op;
-      return {
-        ...firstOp,
-        intent: "set",
-        deletedId
-      };
+      return { ...firstOp, intent, deletedId };
     } else {
       return op;
     }
@@ -7729,6 +7928,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       const id = nn(this._id);
       const parentKey = nn(child._parentKey);
       const reverse = child._toOps(id, parentKey);
+      const deletedItem = liveNodeToLson(child);
       for (const [key, value] of this.#synced) {
         if (value === child) {
           this.#synced.delete(key);
@@ -7740,7 +7940,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         node: this,
         type: "LiveObject",
         updates: {
-          [parentKey]: { type: "delete" }
+          [parentKey]: { type: "delete", deletedItem }
         }
       };
       return { modified: storageUpdate, reverse };
@@ -8227,581 +8427,6 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
   }
 };
 
-// src/crdts/liveTextOps.ts
-function attributesEqual(left, right) {
-  if (left === right) {
-    return true;
-  }
-  if (left === void 0 || right === void 0) {
-    return false;
-  }
-  const leftKeys = Object.keys(left);
-  const rightKeys = Object.keys(right);
-  if (leftKeys.length !== rightKeys.length) {
-    return false;
-  }
-  for (const key of leftKeys) {
-    if (left[key] !== right[key]) {
-      return false;
-    }
-  }
-  return true;
-}
-function cloneAttributes(attributes) {
-  return attributes === void 0 ? void 0 : freeze({ ...attributes });
-}
-function normalizeSegments(segments) {
-  const normalized = [];
-  for (const segment of segments) {
-    if (segment.text.length === 0) {
-      continue;
-    }
-    const last = normalized.at(-1);
-    const attributes = cloneAttributes(segment.attributes);
-    if (last !== void 0 && attributesEqual(last.attributes, attributes)) {
-      last.text += segment.text;
-    } else {
-      normalized.push({ text: segment.text, attributes });
-    }
-  }
-  return normalized;
-}
-function deltaToSegments(delta) {
-  return normalizeSegments(
-    delta.map((item) => ({
-      text: item.text,
-      attributes: item.attributes
-    }))
-  );
-}
-function segmentsToDelta(segments) {
-  return segments.map(
-    (segment) => segment.attributes === void 0 ? { text: segment.text } : { text: segment.text, attributes: { ...segment.attributes } }
-  );
-}
-function textLength(segments) {
-  return segments.reduce((sum, segment) => sum + segment.text.length, 0);
-}
-function splitSegmentsAt(segments, index) {
-  const result = [];
-  let offset = 0;
-  for (const segment of segments) {
-    const end = offset + segment.text.length;
-    if (index > offset && index < end) {
-      const before2 = segment.text.slice(0, index - offset);
-      const after2 = segment.text.slice(index - offset);
-      result.push({ text: before2, attributes: segment.attributes });
-      result.push({ text: after2, attributes: segment.attributes });
-    } else {
-      result.push({ text: segment.text, attributes: segment.attributes });
-    }
-    offset = end;
-  }
-  return result;
-}
-function clipRange(index, length, contentLength) {
-  const clippedIndex = Math.max(0, Math.min(index, contentLength));
-  const clippedEnd = Math.max(
-    clippedIndex,
-    Math.min(index + length, contentLength)
-  );
-  return { index: clippedIndex, length: clippedEnd - clippedIndex };
-}
-function applyInsert(segments, index, text, attributes) {
-  if (text.length === 0) {
-    return normalizeSegments(segments);
-  }
-  const split = splitSegmentsAt(segments, index);
-  const result = [];
-  let offset = 0;
-  let inserted = false;
-  for (const segment of split) {
-    if (!inserted && offset === index) {
-      result.push({ text, attributes });
-      inserted = true;
-    }
-    result.push(segment);
-    offset += segment.text.length;
-  }
-  if (!inserted) {
-    result.push({ text, attributes });
-  }
-  return normalizeSegments(result);
-}
-function extractDeletedSegments(segments, index, length) {
-  const split = splitSegmentsAt(
-    splitSegmentsAt(segments, index),
-    index + length
-  );
-  const deleted = [];
-  let offset = 0;
-  for (const segment of split) {
-    const end = offset + segment.text.length;
-    if (offset >= index && end <= index + length) {
-      deleted.push({
-        text: segment.text,
-        attributes: segment.attributes
-      });
-    }
-    offset = end;
-  }
-  return normalizeSegments(deleted);
-}
-function applyDelete(segments, index, length) {
-  const deletedSegments = extractDeletedSegments(segments, index, length);
-  const split = splitSegmentsAt(
-    splitSegmentsAt(segments, index),
-    index + length
-  );
-  const result = [];
-  let offset = 0;
-  let deletedText = "";
-  for (const segment of split) {
-    const end = offset + segment.text.length;
-    if (offset >= index && end <= index + length) {
-      deletedText += segment.text;
-    } else {
-      result.push(segment);
-    }
-    offset = end;
-  }
-  return {
-    segments: normalizeSegments(result),
-    deletedText,
-    deletedSegments
-  };
-}
-function applyFormat(segments, index, length, attributes) {
-  const split = splitSegmentsAt(
-    splitSegmentsAt(segments, index),
-    index + length
-  );
-  const result = [];
-  let offset = 0;
-  for (const segment of split) {
-    const end = offset + segment.text.length;
-    if (offset >= index && end <= index + length) {
-      const nextAttributes = {
-        ...segment.attributes ?? {}
-      };
-      for (const [key, value] of Object.entries(attributes)) {
-        if (value === null) {
-          delete nextAttributes[key];
-        } else {
-          nextAttributes[key] = value;
-        }
-      }
-      result.push({
-        text: segment.text,
-        attributes: Object.keys(nextAttributes).length === 0 ? void 0 : freeze(nextAttributes)
-      });
-    } else {
-      result.push(segment);
-    }
-    offset = end;
-  }
-  return normalizeSegments(result);
-}
-function formatReverseOperations(segments, index, length, patch) {
-  const split = splitSegmentsAt(
-    splitSegmentsAt(segments, index),
-    index + length
-  );
-  const result = [];
-  let offset = 0;
-  for (const segment of split) {
-    const end = offset + segment.text.length;
-    if (offset >= index && end <= index + length) {
-      const attributes = {};
-      for (const key of Object.keys(patch)) {
-        attributes[key] = segment.attributes?.[key] ?? null;
-      }
-      result.push({
-        type: "format",
-        index: offset,
-        length: segment.text.length,
-        attributes
-      });
-    }
-    offset = end;
-  }
-  return result;
-}
-function mapIndexThroughOperation(index, op) {
-  if (op.type === "insert") {
-    return op.index <= index ? index + op.text.length : index;
-  } else if (op.type === "delete") {
-    if (op.index >= index) {
-      return index;
-    }
-    return Math.max(op.index, index - op.length);
-  } else {
-    return index;
-  }
-}
-function mapTextIndexThroughOperations(index, ops) {
-  let mapped = index;
-  for (const op of ops) {
-    mapped = mapIndexThroughOperation(mapped, op);
-  }
-  return mapped;
-}
-function rebaseTextOperations(ops, acceptedOps) {
-  return ops.map((op) => {
-    if (op.type === "insert") {
-      return {
-        ...op,
-        index: mapTextIndexThroughOperations(op.index, acceptedOps)
-      };
-    } else if (op.type === "delete" || op.type === "format") {
-      const start = mapTextIndexThroughOperations(op.index, acceptedOps);
-      const end = mapTextIndexThroughOperations(
-        op.index + op.length,
-        acceptedOps
-      );
-      return { ...op, index: start, length: Math.max(0, end - start) };
-    } else {
-      return op;
-    }
-  });
-}
-function applyTextOperationsToSegments(segments, ops) {
-  let next = [...segments];
-  for (const op of ops) {
-    if (op.type === "insert") {
-      const index = Math.max(0, Math.min(op.index, textLength(next)));
-      next = applyInsert(next, index, op.text, op.attributes);
-    } else if (op.type === "delete") {
-      const index = Math.max(0, Math.min(op.index, textLength(next)));
-      const clipped = clipRange(index, op.length, textLength(next));
-      next = applyDelete(next, clipped.index, clipped.length).segments;
-    } else {
-      const index = Math.max(0, Math.min(op.index, textLength(next)));
-      const clipped = clipRange(index, op.length, textLength(next));
-      next = applyFormat(next, clipped.index, clipped.length, op.attributes);
-    }
-  }
-  return next;
-}
-function applyLiveTextOperations(delta, ops) {
-  return segmentsToDelta(applyTextOperationsToSegments(deltaToSegments(delta), ops));
-}
-function invertTextOperations(segments, ops) {
-  let shadow = [...segments];
-  const reverse = [];
-  for (const op of ops) {
-    if (op.type === "insert") {
-      shadow = applyInsert(shadow, op.index, op.text, op.attributes);
-      reverse.unshift({
-        type: "delete",
-        index: op.index,
-        length: op.text.length
-      });
-    } else if (op.type === "delete") {
-      const deletedSegments = extractDeletedSegments(
-        shadow,
-        op.index,
-        op.length
-      );
-      shadow = applyDelete(shadow, op.index, op.length).segments;
-      const inserts = [];
-      let insertIndex = op.index;
-      for (const segment of deletedSegments) {
-        inserts.push({
-          type: "insert",
-          index: insertIndex,
-          text: segment.text,
-          attributes: segment.attributes
-        });
-        insertIndex += segment.text.length;
-      }
-      for (let index = inserts.length - 1; index >= 0; index--) {
-        reverse.unshift(inserts[index]);
-      }
-    } else {
-      const inverse = formatReverseOperations(
-        shadow,
-        op.index,
-        op.length,
-        op.attributes
-      );
-      shadow = applyFormat(shadow, op.index, op.length, op.attributes);
-      reverse.unshift(...inverse.reverse());
-    }
-  }
-  return reverse;
-}
-
-// src/crdts/LiveText.ts
-var LiveText = class _LiveText extends AbstractCrdt {
-  #segments;
-  #version;
-  #pendingOps;
-  constructor(textOrDelta = "", version = 0) {
-    super();
-    this.#segments = typeof textOrDelta === "string" ? textOrDelta.length === 0 ? [] : [{ text: textOrDelta }] : deltaToSegments(textOrDelta);
-    this.#version = version;
-    this.#pendingOps = /* @__PURE__ */ new Map();
-  }
-  get version() {
-    return this.#version;
-  }
-  get length() {
-    return this.toString().length;
-  }
-  /** @internal */
-  static _deserialize([id, item], _parentToChildren, pool) {
-    const text = new _LiveText(item.data, item.version);
-    text._attach(id, pool);
-    return text;
-  }
-  /** @internal */
-  _toOps(parentId, parentKey) {
-    if (this._id === void 0) {
-      throw new Error("Cannot serialize LiveText if it is not attached");
-    }
-    return [
-      {
-        type: OpCode.CREATE_TEXT,
-        id: this._id,
-        parentId,
-        parentKey,
-        data: this.toDelta(),
-        version: this.#version
-      }
-    ];
-  }
-  /** @internal */
-  _serialize() {
-    if (this.parent.type !== "HasParent") {
-      throw new Error("Cannot serialize LiveText if parent is missing");
-    }
-    return {
-      type: CrdtType.TEXT,
-      parentId: nn(this.parent.node._id, "Parent node expected to have ID"),
-      parentKey: this.parent.key,
-      data: this.toDelta(),
-      version: this.#version
-    };
-  }
-  /** @internal */
-  _attachChild(_op) {
-    throw new Error("LiveText cannot contain child nodes");
-  }
-  /** @internal */
-  _detachChild(_crdt) {
-    throw new Error("LiveText cannot contain child nodes");
-  }
-  /** @internal */
-  _apply(op, isLocal) {
-    if (op.type !== OpCode.UPDATE_TEXT) {
-      return super._apply(op, isLocal);
-    }
-    if (isLocal) {
-      this.#pendingOps.set(nn(op.opId), op.ops);
-      return this.#applyOperations(op.ops, op.version ?? this.#version);
-    }
-    if (op.opId !== void 0) {
-      const pending2 = this.#pendingOps.get(op.opId);
-      this.#pendingOps.delete(op.opId);
-      const otherPending = Array.from(this.#pendingOps.values()).flat();
-      if (pending2 !== void 0 && otherPending.length > 0) {
-        this.#segments = applyTextOperationsToSegments(
-          this.#segments,
-          invertTextOperations(this.#segments, pending2)
-        );
-        const ops2 = rebaseTextOperations(op.ops, otherPending);
-        return this.#applyOperations(
-          ops2,
-          op.version ?? Math.max(this.#version, op.baseVersion + 1)
-        );
-      }
-      this.#version = op.version ?? Math.max(this.#version, op.baseVersion + 1);
-      return { modified: false };
-    }
-    const pending = Array.from(this.#pendingOps.values()).flat();
-    const ops = pending.length > 0 ? rebaseTextOperations(op.ops, pending) : op.ops;
-    return this.#applyOperations(ops, op.version ?? this.#version + 1);
-  }
-  insert(index, text, attributes) {
-    const clippedIndex = Math.max(0, Math.min(index, this.length));
-    this.#dispatch([{ type: "insert", index: clippedIndex, text, attributes }]);
-  }
-  delete(index, length) {
-    const clipped = clipRange(index, length, this.length);
-    if (clipped.length === 0) {
-      return;
-    }
-    this.#dispatch([
-      { type: "delete", index: clipped.index, length: clipped.length }
-    ]);
-  }
-  replace(index, length, text, attributes) {
-    const clipped = clipRange(index, length, this.length);
-    const ops = [];
-    if (clipped.length > 0) {
-      ops.push({
-        type: "delete",
-        index: clipped.index,
-        length: clipped.length
-      });
-    }
-    if (text.length > 0) {
-      ops.push({ type: "insert", index: clipped.index, text, attributes });
-    }
-    this.#dispatch(ops);
-  }
-  format(index, length, attributes) {
-    const clipped = clipRange(index, length, this.length);
-    if (clipped.length === 0) {
-      return;
-    }
-    this.#dispatch([
-      {
-        type: "format",
-        index: clipped.index,
-        length: clipped.length,
-        attributes
-      }
-    ]);
-  }
-  #dispatch(ops) {
-    if (ops.length === 0) {
-      return;
-    }
-    this._pool?.assertStorageIsWritable();
-    const baseVersion = this.#version;
-    const reverse = this._pool !== void 0 && this._id !== void 0 ? this.#invertOperations(ops) : [];
-    const changes = this.#applyOperationsLocally(ops);
-    if (this._pool !== void 0 && this._id !== void 0) {
-      const opId = this._pool.generateOpId();
-      this.#pendingOps.set(opId, ops);
-      this._pool.dispatch(
-        [
-          {
-            type: OpCode.UPDATE_TEXT,
-            id: this._id,
-            opId,
-            baseVersion,
-            ops: [...ops]
-          }
-        ],
-        reverse,
-        /* @__PURE__ */ new Map([
-          [
-            this._id,
-            {
-              type: "LiveText",
-              node: this,
-              version: this.#version,
-              updates: changes
-            }
-          ]
-        ])
-      );
-    }
-  }
-  #applyOperations(ops, version) {
-    const reverse = this.#invertOperations(ops);
-    const changes = this.#applyOperationsLocally(ops);
-    this.#version = Math.max(this.#version, version);
-    return {
-      reverse,
-      modified: {
-        type: "LiveText",
-        node: this,
-        version: this.#version,
-        updates: changes
-      }
-    };
-  }
-  #applyOperationsLocally(ops) {
-    const changes = [];
-    for (const op of ops) {
-      if (op.type === "insert") {
-        this.#segments = applyInsert(
-          this.#segments,
-          op.index,
-          op.text,
-          op.attributes
-        );
-        changes.push({
-          type: "insert",
-          index: op.index,
-          text: op.text,
-          attributes: op.attributes
-        });
-      } else if (op.type === "delete") {
-        const result = applyDelete(this.#segments, op.index, op.length);
-        this.#segments = result.segments;
-        changes.push({
-          type: "delete",
-          index: op.index,
-          length: op.length,
-          deletedText: result.deletedText
-        });
-      } else {
-        this.#segments = applyFormat(
-          this.#segments,
-          op.index,
-          op.length,
-          op.attributes
-        );
-        changes.push({
-          type: "format",
-          index: op.index,
-          length: op.length,
-          attributes: op.attributes
-        });
-      }
-    }
-    this.invalidate();
-    return changes;
-  }
-  #invertOperations(ops) {
-    return [
-      {
-        type: OpCode.UPDATE_TEXT,
-        id: nn(this._id),
-        baseVersion: this.#version,
-        ops: invertTextOperations(this.#segments, ops)
-      }
-    ];
-  }
-  toString() {
-    return this.#segments.map((segment) => segment.text).join("");
-  }
-  toDelta() {
-    return segmentsToDelta(this.#segments);
-  }
-  toJSON() {
-    return super.toJSON();
-  }
-  /** @internal */
-  _toJSON() {
-    return this.toDelta();
-  }
-  /** @internal */
-  _toTreeNode(key) {
-    return {
-      type: "LiveText",
-      id: this._id ?? nanoid(),
-      key,
-      payload: [
-        {
-          type: "Json",
-          id: `${this._id ?? nanoid()}:text`,
-          key: "text",
-          payload: this.toString()
-        }
-      ]
-    };
-  }
-  clone() {
-    return new _LiveText(this.toDelta(), this.#version);
-  }
-};
-
 // src/crdts/liveblocks-helpers.ts
 function creationOpToLiveNode(op) {
   return lsonToLiveNode(creationOpToLson(op));
@@ -8816,8 +8441,6 @@ function creationOpToLson(op) {
       return new LiveMap();
     case OpCode.CREATE_LIST:
       return new LiveList([]);
-    case OpCode.CREATE_TEXT:
-      return new LiveText(op.data, op.version);
     default:
       return assertNever(op, "Unknown creation Op");
   }
@@ -8840,8 +8463,6 @@ function deserialize(node, parentToChildren, pool) {
     return LiveMap._deserialize(node, parentToChildren, pool);
   } else if (isRegisterStorageNode(node)) {
     return LiveRegister._deserialize(node, parentToChildren, pool);
-  } else if (isTextStorageNode(node)) {
-    return LiveText._deserialize(node, parentToChildren, pool);
   } else {
     throw new Error("Unexpected CRDT type");
   }
@@ -8855,14 +8476,12 @@ function deserializeToLson(node, parentToChildren, pool) {
     return LiveMap._deserialize(node, parentToChildren, pool);
   } else if (isRegisterStorageNode(node)) {
     return node[1].data;
-  } else if (isTextStorageNode(node)) {
-    return LiveText._deserialize(node, parentToChildren, pool);
   } else {
     throw new Error("Unexpected CRDT type");
   }
 }
 function isLiveStructure(value) {
-  return isLiveList(value) || isLiveMap(value) || isLiveObject(value) || isLiveText(value);
+  return isLiveList(value) || isLiveMap(value) || isLiveObject(value);
 }
 function isLiveNode(value) {
   return isLiveStructure(value) || isLiveRegister(value);
@@ -8876,9 +8495,6 @@ function isLiveMap(value) {
 function isLiveObject(value) {
   return value instanceof LiveObject;
 }
-function isLiveText(value) {
-  return value instanceof LiveText;
-}
 function isLiveRegister(value) {
   return value instanceof LiveRegister;
 }
@@ -8888,19 +8504,73 @@ function cloneLson(value) {
 function liveNodeToLson(obj) {
   if (obj instanceof LiveRegister) {
     return obj.data;
-  } else if (obj instanceof LiveList || obj instanceof LiveMap || obj instanceof LiveObject || obj instanceof LiveText) {
+  } else if (obj instanceof LiveList || obj instanceof LiveMap || obj instanceof LiveObject) {
     return obj;
   } else {
     return assertNever(obj, "Unknown AbstractCrdt");
   }
 }
 function lsonToLiveNode(value) {
-  if (value instanceof LiveObject || value instanceof LiveMap || value instanceof LiveList || value instanceof LiveText) {
+  if (value instanceof LiveObject || value instanceof LiveMap || value instanceof LiveList) {
     return value;
   } else {
     return new LiveRegister(value);
   }
 }
+function dumpPool(pool) {
+  const rows = Array.from(pool.nodes.values(), (node) => {
+    const parent = node.parent;
+    const parentId = parent.type === "HasParent" ? parent.node._id ?? "?" : parent.type === "Orphaned" ? "<orphaned>" : "-";
+    let value;
+    if (node instanceof LiveRegister) {
+      value = stringifyOrLog(node.data);
+    } else if (node instanceof LiveList) {
+      value = "<LiveList>";
+    } else if (node instanceof LiveMap) {
+      value = "<LiveMap>";
+    } else {
+      value = "<LiveObject>";
+    }
+    return { id: nn(node._id), parentId, key: node._parentKey ?? "", value };
+  });
+  rows.sort((a, b) => {
+    if (a.parentId !== b.parentId) return a.parentId < b.parentId ? -1 : 1;
+    if (a.key !== b.key) return a.key < b.key ? -1 : 1;
+    return 0;
+  });
+  return rows.map(
+    (r) => `  ${r.id}  parent=${r.parentId}  key=${r.key || "\u2014"}  ${r.value}`
+  ).join("\n");
+}
+function isJsonEq(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+    return false;
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) {
+      return false;
+    }
+    for (let i = 0; i < a.length; i++) {
+      if (!isJsonEq(a[i], b[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  const aKeys = Object.keys(a);
+  if (aKeys.length !== Object.keys(b).length) {
+    return false;
+  }
+  for (const key of aKeys) {
+    if (!isJsonEq(a[key], b[key])) {
+      return false;
+    }
+  }
+  return true;
+}
 function getTreesDiffOperations(currentItems, newItems) {
   const ops = [];
   currentItems.forEach((_, id) => {
@@ -8912,44 +8582,28 @@ function getTreesDiffOperations(currentItems, newItems) {
     const currentCrdt = currentItems.get(id);
     if (currentCrdt) {
       if (crdt.type === CrdtType.OBJECT) {
-        if (currentCrdt.type !== CrdtType.OBJECT || stringifyOrLog(crdt.data) !== stringifyOrLog(currentCrdt.data)) {
-          ops.push({
-            type: OpCode.UPDATE_OBJECT,
-            id,
-            data: crdt.data
-          });
-        }
-      }
-      if (crdt.type === CrdtType.TEXT) {
-        if (currentCrdt.type !== CrdtType.TEXT || stringifyOrLog(crdt.data) !== stringifyOrLog(currentCrdt.data) || crdt.version !== currentCrdt.version) {
-          ops.push({
-            type: OpCode.UPDATE_TEXT,
-            id,
-            baseVersion: currentCrdt.type === CrdtType.TEXT ? currentCrdt.version : 0,
-            version: crdt.version,
-            ops: [
-              {
-                type: "delete",
-                index: 0,
-                length: currentCrdt.type === CrdtType.TEXT ? currentCrdt.data.reduce(
-                  (sum, item) => sum + item.text.length,
-                  0
-                ) : 0
-              },
-              ...crdt.data.map(
-                (item, index, items) => item.attributes === void 0 ? {
-                  type: "insert",
-                  index: items.slice(0, index).reduce((sum, item2) => sum + item2.text.length, 0),
-                  text: item.text
-                } : {
-                  type: "insert",
-                  index: items.slice(0, index).reduce((sum, item2) => sum + item2.text.length, 0),
-                  text: item.text,
-                  attributes: item.attributes
-                }
-              )
-            ]
-          });
+        if (currentCrdt.type !== CrdtType.OBJECT) {
+          ops.push({ type: OpCode.UPDATE_OBJECT, id, data: crdt.data });
+        } else {
+          const changed = /* @__PURE__ */ new Map();
+          for (const key of Object.keys(crdt.data)) {
+            const value = crdt.data[key];
+            if (value !== void 0 && !isJsonEq(value, currentCrdt.data[key])) {
+              changed.set(key, value);
+            }
+          }
+          if (changed.size > 0) {
+            ops.push({
+              type: OpCode.UPDATE_OBJECT,
+              id,
+              data: Object.fromEntries(changed)
+            });
+          }
+          for (const key of Object.keys(currentCrdt.data)) {
+            if (!(key in crdt.data)) {
+              ops.push({ type: OpCode.DELETE_OBJECT_KEY, id, key });
+            }
+          }
         }
       }
       if (crdt.parentKey !== currentCrdt.parentKey) {
@@ -9000,16 +8654,6 @@ function getTreesDiffOperations(currentItems, newItems) {
             parentKey: crdt.parentKey
           });
           break;
-        case CrdtType.TEXT:
-          ops.push({
-            type: OpCode.CREATE_TEXT,
-            id,
-            parentId: crdt.parentId,
-            parentKey: crdt.parentKey,
-            data: crdt.data,
-            version: crdt.version
-          });
-          break;
       }
     }
   });
@@ -9042,12 +8686,6 @@ function mergeListStorageUpdates(first, second) {
     updates: updates.concat(second.updates)
   };
 }
-function mergeTextStorageUpdates(first, second) {
-  return {
-    ...second,
-    updates: first.updates.concat(second.updates)
-  };
-}
 function mergeStorageUpdates(first, second) {
   if (first === void 0) {
     return second;
@@ -9058,8 +8696,6 @@ function mergeStorageUpdates(first, second) {
     return mergeMapStorageUpdates(first, second);
   } else if (first.type === "LiveList" && second.type === "LiveList") {
     return mergeListStorageUpdates(first, second);
-  } else if (first.type === "LiveText" && second.type === "LiveText") {
-    return mergeTextStorageUpdates(first, second);
   } else {
   }
   return second;
@@ -9960,6 +9596,7 @@ function createRoom(options, config) {
     delegates,
     config.enableDebugLogging
   );
+  const unacknowledgedOps = new UnacknowledgedOps();
   const context = {
     buffer: {
       flushTimerID: void 0,
@@ -9987,14 +9624,15 @@ function createRoom(options, config) {
     pool: createManagedPool(roomId, {
       getCurrentConnectionId,
       onDispatch,
-      isStorageWritable
+      isStorageWritable,
+      unacknowledgedOps
     }),
     root: void 0,
     undoStack: [],
     redoStack: [],
     pausedHistory: null,
     activeBatch: null,
-    unacknowledgedOps: /* @__PURE__ */ new Map()
+    unacknowledgedOps
   };
   const nodeMapBuffer = makeNodeMapBuffer();
   const stopwatch = config.enableDebugLogging ? makeStopWatch() : void 0;
@@ -10202,7 +9840,11 @@ function createRoom(options, config) {
         currentItems.set(id, crdt._serialize());
       }
       const ops = getTreesDiffOperations(currentItems, nodes);
-      const result = applyRemoteOps(ops);
+      const result = applyRemoteOps(
+        ops,
+        /* fromSnapshot */
+        true
+      );
       notify(result.updates);
     } else {
       context.root = LiveObject._fromItems(
@@ -10284,15 +9926,16 @@ function createRoom(options, config) {
     );
     return { opsToEmit: opsWithOpIds, reverse, updates };
   }
-  function applyRemoteOps(ops) {
+  function applyRemoteOps(ops, fromSnapshot = false) {
     return applyOps(
       [],
       ops,
       /* isLocal */
-      false
+      false,
+      fromSnapshot
     );
   }
-  function applyOps(pframes, ops, isLocal) {
+  function applyOps(pframes, ops, isLocal, fromSnapshot = false) {
     const output = {
       reverse: new Deque(),
       storageUpdates: /* @__PURE__ */ new Map(),
@@ -10328,7 +9971,7 @@ function createRoom(options, config) {
       } else {
         source = 1 /* THEIRS */;
       }
-      const applyOpResult = applyOp(op, source);
+      const applyOpResult = applyOp(op, source, fromSnapshot);
       if (applyOpResult.modified) {
         const nodeId = applyOpResult.modified.node._id;
         if (!(nodeId && createdNodeIds.has(nodeId))) {
@@ -10341,7 +9984,7 @@ function createRoom(options, config) {
           );
           output.reverse.pushLeft(applyOpResult.reverse);
         }
-        if (op.type === OpCode.CREATE_LIST || op.type === OpCode.CREATE_MAP || op.type === OpCode.CREATE_OBJECT || op.type === OpCode.CREATE_TEXT) {
+        if (op.type === OpCode.CREATE_LIST || op.type === OpCode.CREATE_MAP || op.type === OpCode.CREATE_OBJECT) {
           createdNodeIds.add(op.id);
         }
       }
@@ -10354,14 +9997,13 @@ function createRoom(options, config) {
       }
     };
   }
-  function applyOp(op, source) {
+  function applyOp(op, source, fromSnapshot = false) {
     if (isIgnoredOp(op)) {
       return { modified: false };
     }
     switch (op.type) {
       case OpCode.DELETE_OBJECT_KEY:
       case OpCode.UPDATE_OBJECT:
-      case OpCode.UPDATE_TEXT:
       case OpCode.DELETE_CRDT: {
         const node = context.pool.nodes.get(op.id);
         if (node === void 0) {
@@ -10386,7 +10028,6 @@ function createRoom(options, config) {
       case OpCode.CREATE_OBJECT:
       case OpCode.CREATE_LIST:
       case OpCode.CREATE_MAP:
-      case OpCode.CREATE_TEXT:
       case OpCode.CREATE_REGISTER: {
         if (op.parentId === void 0) {
           return { modified: false };
@@ -10395,7 +10036,7 @@ function createRoom(options, config) {
         if (parentNode === void 0) {
           return { modified: false };
         }
-        return parentNode._attachChild(op, source);
+        return parentNode._attachChild(op, source, fromSnapshot);
       }
     }
   }
@@ -10535,12 +10176,11 @@ function createRoom(options, config) {
     }
   }
   function applyAndSendOfflineOps(unackedOps) {
-    if (unackedOps.size === 0) {
+    if (unackedOps.length === 0) {
       return;
     }
     const messages = [];
-    const inOps = Array.from(unackedOps.values());
-    const result = applyLocalOps(inOps);
+    const result = applyLocalOps(unackedOps);
     messages.push({
       type: ClientMsgCode.UPDATE_STORAGE,
       ops: result.opsToEmit
@@ -10764,7 +10404,7 @@ function createRoom(options, config) {
     const storageOps = context.buffer.storageOperations;
     if (storageOps.length > 0) {
       for (const op of storageOps) {
-        context.unacknowledgedOps.set(op.opId, op);
+        context.unacknowledgedOps.add(op);
       }
       notifyStorageStatus();
     }
@@ -10991,9 +10631,9 @@ function createRoom(options, config) {
     }
   }
   function processInitialStorage(nodes) {
-    const unacknowledgedOps = new Map(context.unacknowledgedOps);
+    const unacknowledgedOps2 = [...context.unacknowledgedOps.values()];
     createOrUpdateRootFromMessage(nodes);
-    applyAndSendOfflineOps(unacknowledgedOps);
+    applyAndSendOfflineOps(unacknowledgedOps2);
     _resolveStoragePromise?.();
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
@@ -11582,6 +11222,11 @@ function createRoom(options, config) {
       connect: () => managedSocket.connect(),
       reconnect: () => managedSocket.reconnect(),
       disconnect: () => managedSocket.disconnect(),
+      _dump: () => {
+        const n = context.pool.nodes.size;
+        return `Room "${roomId}" (${n} node${n === 1 ? "" : "s"}):
+${dumpPool(context.pool)}`;
+      },
       destroy: () => {
         pendingFeedsRequests.forEach(
           (request) => request.reject(new Error("Room destroyed"))
@@ -12089,6 +11734,7 @@ function createClient(options) {
     {
       enterRoom,
       getRoom,
+      _dump: () => Array.from(roomsById.values(), ({ room }) => room._dump()).join("\n\n"),
       logout,
       // Public inbox notifications API
       getInboxNotifications: httpClient.getInboxNotifications,
@@ -12541,12 +12187,6 @@ function toPlainLson(lson) {
       liveblocksType: "LiveList",
       data: [...lson].map((item) => toPlainLson(item))
     };
-  } else if (lson instanceof LiveText) {
-    return {
-      liveblocksType: "LiveText",
-      data: lson.toDelta(),
-      version: lson.version
-    };
   } else {
     return lson;
   }
@@ -12728,7 +12368,6 @@ export {
   LiveList,
   LiveMap,
   LiveObject,
-  LiveText,
   LiveblocksError,
   MENTION_CHARACTER,
   MutableSignal,
@@ -12740,7 +12379,6 @@ export {
   SortedList,
   TextEditorType,
   WebsocketCloseCodes,
-  applyLiveTextOperations,
   asPos,
   assert,
   assertNever,
@@ -12796,7 +12434,6 @@ export {
   isRegisterStorageNode,
   isRootStorageNode,
   isStartsWithOperator,
-  isTextStorageNode,
   isUrl,
   kInternal,
   keys,