@liveblocks/core 3.13.0-vincent3 → 3.13.0

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.13.0-vincent3";
+var PKG_VERSION = "3.13.0";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -251,6 +251,19 @@ function findLastIndex(arr, predicate) {
   }
   return -1;
 }
+function partition(iterable, predicate) {
+  const good = [];
+  const bad = [];
+  let index = 0;
+  for (const item of iterable) {
+    if (predicate(item, index++)) {
+      good.push(item);
+    } else {
+      bad.push(item);
+    }
+  }
+  return [good, bad];
+}
 
 // src/lib/signals.ts
 var kSinks = Symbol("kSinks");
@@ -1606,6 +1619,7 @@ function createApiClient({
         comment: {
           id: commentId,
           body: options.body,
+          metadata: options.commentMetadata,
           attachmentIds: options.attachmentIds
         },
         metadata: options.metadata
@@ -1659,6 +1673,16 @@ function createApiClient({
       options.metadata
     );
   }
+  async function editCommentMetadata(options) {
+    return await httpClient.post(
+      url`/v2/c/rooms/${options.roomId}/threads/${options.threadId}/comments/${options.commentId}/metadata`,
+      await authManager.getAuthValue({
+        requestedScope: "comments:read",
+        roomId: options.roomId
+      }),
+      options.metadata
+    );
+  }
   async function createComment(options) {
     const commentId = options.commentId ?? createCommentId();
     const comment = await httpClient.post(
@@ -1670,6 +1694,7 @@ function createApiClient({
       {
         id: commentId,
         body: options.body,
+        metadata: options.metadata,
         attachmentIds: options.attachmentIds
       }
     );
@@ -1684,7 +1709,8 @@ function createApiClient({
       }),
       {
         body: options.body,
-        attachmentIds: options.attachmentIds
+        attachmentIds: options.attachmentIds,
+        metadata: options.metadata
       }
     );
     return convertToCommentData(comment);
@@ -2426,6 +2452,7 @@ function createApiClient({
     editThreadMetadata,
     createComment,
     editComment,
+    editCommentMetadata,
     deleteComment,
     addReaction,
     removeReaction,
@@ -3090,12 +3117,7 @@ var ServerMsgCode = Object.freeze({
   BROADCASTED_EVENT: 103,
   ROOM_STATE: 104,
   // For Storage
-  STORAGE_STATE_V7: 200,
-  // Only sent in V7
-  STORAGE_CHUNK: 210,
-  // Used in V8+
-  STORAGE_STREAM_END: 211,
-  // Used in V8+
+  STORAGE_STATE: 200,
   UPDATE_STORAGE: 201,
   // For Yjs Docs
   UPDATE_YDOC: 300,
@@ -3109,6 +3131,7 @@ var ServerMsgCode = Object.freeze({
   COMMENT_DELETED: 404,
   COMMENT_REACTION_ADDED: 405,
   COMMENT_REACTION_REMOVED: 406,
+  COMMENT_METADATA_UPDATED: 409,
   // Error codes
   REJECT_STORAGE_OP: 299
   // Sent if a mutation was not allowed on the server (i.e. due to permissions, limit exceeded, etc)
@@ -6094,6 +6117,19 @@ var AbstractCrdt = class {
     }
     this.#pool = void 0;
   }
+  /**
+   * Serializes this CRDT and all its children into a list of creation ops
+   * with opIds. Used for forward operations that will be sent over the wire
+   * immediately. Each op gets a unique opId for server acknowledgement.
+   *
+   * @internal
+   */
+  _toOpsWithOpId(parentId, parentKey, pool) {
+    return this._toOps(parentId, parentKey).map((op) => ({
+      opId: pool.generateOpId(),
+      ...op
+    }));
+  }
   /** This caches the result of the last .toImmutable() call for this Live node. */
   #cachedImmutable;
   #cachedTreeNodeKey;
@@ -6145,57 +6181,6 @@ var CrdtType = Object.freeze({
   MAP: 2,
   REGISTER: 3
 });
-function isRootNode(node) {
-  return node[0] === "root";
-}
-function isRootCrdt(id, _) {
-  return id === "root";
-}
-function* compactNodesToNodeStream(nodes) {
-  for (const node of nodes) {
-    const id = node[0];
-    if (isRootNode(node)) {
-      yield [id, { type: CrdtType.OBJECT, data: node[1] }];
-      continue;
-    }
-    switch (node[1]) {
-      case CrdtType.OBJECT:
-        yield [id, { type: CrdtType.OBJECT, parentId: node[2], parentKey: node[3], data: node[4] }];
-        break;
-      case CrdtType.LIST:
-        yield [id, { type: CrdtType.LIST, parentId: node[2], parentKey: node[3] }];
-        break;
-      case CrdtType.MAP:
-        yield [id, { type: CrdtType.MAP, parentId: node[2], parentKey: node[3] }];
-        break;
-      case CrdtType.REGISTER:
-        yield [id, { type: CrdtType.REGISTER, parentId: node[2], parentKey: node[3], data: node[4] }];
-        break;
-    }
-  }
-}
-function* nodeStreamToCompactNodes(nodes) {
-  for (const [id, node] of nodes) {
-    switch (node.type) {
-      case CrdtType.OBJECT:
-        if (isRootCrdt(id, node)) {
-          yield [id, node.data];
-        } else {
-          yield [id, CrdtType.OBJECT, node.parentId, node.parentKey, node.data];
-        }
-        break;
-      case CrdtType.LIST:
-        yield [id, CrdtType.LIST, node.parentId, node.parentKey];
-        break;
-      case CrdtType.MAP:
-        yield [id, CrdtType.MAP, node.parentId, node.parentKey];
-        break;
-      case CrdtType.REGISTER:
-        yield [id, CrdtType.REGISTER, node.parentId, node.parentKey, node.data];
-        break;
-    }
-  }
-}
 
 // src/crdts/LiveRegister.ts
 var LiveRegister = class _LiveRegister extends AbstractCrdt {
@@ -6214,7 +6199,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return register;
   }
   /** @internal */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey) {
     if (this._id === void 0) {
       throw new Error(
         "Cannot serialize register if parentId or parentKey is undefined"
@@ -6223,7 +6208,6 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return [
       {
         type: OpCode.CREATE_REGISTER,
-        opId: pool?.generateOpId(),
         id: this._id,
         parentId,
         parentKey,
@@ -6322,14 +6306,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * This is quite unintuitive and should disappear as soon as
    * we introduce an explicit LiveList.Set operation
    */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
     const ops = [];
     const op = {
       id: this._id,
-      opId: pool?.generateOpId(),
       type: OpCode.CREATE_LIST,
       parentId,
       parentKey
@@ -6338,13 +6321,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
     for (const item of this.#items) {
       const parentKey2 = item._getParentKeyOrThrow();
       const childOps = HACK_addIntentAndDeletedIdToOperation(
-        item._toOps(this._id, parentKey2, pool),
+        item._toOps(this._id, parentKey2),
         void 0
       );
-      const childOpId = childOps[0].opId;
-      if (childOpId !== void 0) {
-        this.#unacknowledgedSets.set(parentKey2, childOpId);
-      }
       ops.push(...childOps);
     }
     return ops;
@@ -6636,7 +6615,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       existingItem._detach();
       this.#items[indexOfItemWithSameKey] = child;
       const reverse = HACK_addIntentAndDeletedIdToOperation(
-        existingItem._toOps(nn(this._id), key, this._pool),
+        existingItem._toOps(nn(this._id), key),
         op.id
       );
       const delta = [setDelta(indexOfItemWithSameKey, child)];
@@ -6692,7 +6671,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _detachChild(child) {
     if (child) {
       const parentKey = nn(child._parentKey);
-      const reverse = child._toOps(nn(this._id), parentKey, this._pool);
+      const reverse = child._toOps(nn(this._id), parentKey);
       const indexToDelete = this.#items.indexOf(child);
       if (indexToDelete === -1) {
         return {
@@ -6899,7 +6878,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       const id = this._pool.generateId();
       value._attach(id, this._pool);
       this._pool.dispatch(
-        value._toOps(this._id, position, this._pool),
+        value._toOpsWithOpId(this._id, position, this._pool),
         [{ type: OpCode.DELETE_CRDT, id }],
         /* @__PURE__ */ new Map([
           [this._id, makeUpdate(this, [insertDelta(index, value)])]
@@ -7058,12 +7037,12 @@ var LiveList = class _LiveList extends AbstractCrdt {
       const storageUpdates = /* @__PURE__ */ new Map();
       storageUpdates.set(this._id, makeUpdate(this, [setDelta(index, value)]));
       const ops = HACK_addIntentAndDeletedIdToOperation(
-        value._toOps(this._id, position, this._pool),
+        value._toOpsWithOpId(this._id, position, this._pool),
         existingId
       );
       this.#unacknowledgedSets.set(position, nn(ops[0].opId));
       const reverseOps = HACK_addIntentAndDeletedIdToOperation(
-        existingItem._toOps(this._id, position, void 0),
+        existingItem._toOps(this._id, position),
         id
       );
       this._pool.dispatch(ops, reverseOps, storageUpdates);
@@ -7302,21 +7281,20 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     }
   }
   /** @internal */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
     const ops = [];
     const op = {
       id: this._id,
-      opId: pool?.generateOpId(),
       type: OpCode.CREATE_MAP,
       parentId,
       parentKey
     };
     ops.push(op);
     for (const [key, value] of this.#map) {
-      ops.push(...value._toOps(this._id, key, pool));
+      ops.push(...value._toOps(this._id, key));
     }
     return ops;
   }
@@ -7400,7 +7378,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   _detachChild(child) {
     const id = nn(this._id);
     const parentKey = nn(child._parentKey);
-    const reverse = child._toOps(id, parentKey, this._pool);
+    const reverse = child._toOps(id, parentKey);
     for (const [key, value] of this.#map) {
       if (value === child) {
         this.#map.delete(key);
@@ -7467,10 +7445,10 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
         type: "LiveMap",
         updates: { [key]: { type: "update" } }
       });
-      const ops = item._toOps(this._id, key, this._pool);
+      const ops = item._toOpsWithOpId(this._id, key, this._pool);
       this.#unacknowledgedSet.set(key, nn(ops[0].opId));
       this._pool.dispatch(
-        item._toOps(this._id, key, this._pool),
+        ops,
         oldValue ? oldValue._toOps(this._id, key) : [{ type: OpCode.DELETE_CRDT, id }],
         storageUpdates
       );
@@ -7630,12 +7608,25 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
 
 // src/crdts/LiveObject.ts
 var MAX_LIVE_OBJECT_SIZE = 128 * 1024;
-function isRootCrdt2(id, _) {
+function isRootCrdt(id, _) {
   return id === "root";
 }
 var LiveObject = class _LiveObject extends AbstractCrdt {
   #map;
-  #propToLastUpdate;
+  /**
+   * Tracks unacknowledged local changes per property to preserve optimistic
+   * updates. Maps property keys to their pending operation IDs.
+   *
+   * INVARIANT: Only locally-generated opIds are ever stored here. Remote opIds
+   * are only compared against (to detect ACKs), never stored.
+   *
+   * When a local change is made, the opId is stored here. When a remote op
+   * arrives for the same key:
+   * - If no entry exists → apply remote op
+   * - If opId matches → it's an ACK, clear the entry
+   * - If opId differs → ignore remote op to preserve optimistic update
+   */
+  #unackedOpsByKey;
   /**
    * Enable or disable detection of too large LiveObjects.
    * When enabled, throws an error if LiveObject static data exceeds 128KB, which
@@ -7650,7 +7641,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     const parentToChildren = /* @__PURE__ */ new Map();
     let root = null;
     for (const [id, crdt] of items) {
-      if (isRootCrdt2(id, crdt)) {
+      if (isRootCrdt(id, crdt)) {
         root = crdt;
       } else {
         const tuple = [id, crdt];
@@ -7668,8 +7659,8 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     return [root, parentToChildren];
   }
   /** @private Do not use this API directly */
-  static _fromItems(nodes, pool) {
-    const [root, parentToChildren] = _LiveObject.#buildRootAndParentToChildren(nodes);
+  static _fromItems(items, pool) {
+    const [root, parentToChildren] = _LiveObject.#buildRootAndParentToChildren(items);
     return _LiveObject._deserialize(
       ["root", root],
       parentToChildren,
@@ -7678,7 +7669,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
   }
   constructor(obj = {}) {
     super();
-    this.#propToLastUpdate = /* @__PURE__ */ new Map();
+    this.#unackedOpsByKey = /* @__PURE__ */ new Map();
     const o = compactObject(obj);
     for (const key of Object.keys(o)) {
       const value = o[key];
@@ -7689,16 +7680,14 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     this.#map = new Map(Object.entries(o));
   }
   /** @internal */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
-    const opId = pool?.generateOpId();
     const ops = [];
     const op = {
       type: OpCode.CREATE_OBJECT,
       id: this._id,
-      opId,
       parentId,
       parentKey,
       data: {}
@@ -7706,7 +7695,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     ops.push(op);
     for (const [key, value] of this.#map) {
       if (isLiveNode(value)) {
-        ops.push(...value._toOps(this._id, key, pool));
+        ops.push(...value._toOps(this._id, key));
       } else {
         op.data[key] = value;
       }
@@ -7752,16 +7741,16 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     const { id, opId, parentKey: key } = op;
     const child = creationOpToLson(op);
     if (this._pool.getNode(id) !== void 0) {
-      if (this.#propToLastUpdate.get(key) === opId) {
-        this.#propToLastUpdate.delete(key);
+      if (this.#unackedOpsByKey.get(key) === opId) {
+        this.#unackedOpsByKey.delete(key);
       }
       return { modified: false };
     }
     if (source === 0 /* LOCAL */) {
-      this.#propToLastUpdate.set(key, nn(opId));
-    } else if (this.#propToLastUpdate.get(key) === void 0) {
-    } else if (this.#propToLastUpdate.get(key) === opId) {
-      this.#propToLastUpdate.delete(key);
+      this.#unackedOpsByKey.set(key, nn(opId));
+    } else if (this.#unackedOpsByKey.get(key) === void 0) {
+    } else if (this.#unackedOpsByKey.get(key) === opId) {
+      this.#unackedOpsByKey.delete(key);
       return { modified: false };
     } else {
       return { modified: false };
@@ -7803,7 +7792,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     if (child) {
       const id = nn(this._id);
       const parentKey = nn(child._parentKey);
-      const reverse = child._toOps(id, parentKey, this._pool);
+      const reverse = child._toOps(id, parentKey);
       for (const [key, value] of this.#map) {
         if (value === child) {
           this.#map.delete(key);
@@ -7889,11 +7878,11 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         continue;
       }
       if (isLocal) {
-        this.#propToLastUpdate.set(key, nn(op.opId));
-      } else if (this.#propToLastUpdate.get(key) === void 0) {
+        this.#unackedOpsByKey.set(key, nn(op.opId));
+      } else if (this.#unackedOpsByKey.get(key) === void 0) {
         isModified = true;
-      } else if (this.#propToLastUpdate.get(key) === op.opId) {
-        this.#propToLastUpdate.delete(key);
+      } else if (this.#unackedOpsByKey.get(key) === op.opId) {
+        this.#unackedOpsByKey.delete(key);
         continue;
       } else {
         continue;
@@ -7925,7 +7914,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     if (oldValue === void 0) {
       return { modified: false };
     }
-    if (!isLocal && this.#propToLastUpdate.get(key) !== void 0) {
+    if (!isLocal && this.#unackedOpsByKey.get(key) !== void 0) {
       return { modified: false };
     }
     const id = nn(this._id);
@@ -8108,17 +8097,21 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       if (isLiveNode(newValue)) {
         newValue._setParentLink(this, key);
         newValue._attach(this._pool.generateId(), this._pool);
-        const newAttachChildOps = newValue._toOps(this._id, key, this._pool);
+        const newAttachChildOps = newValue._toOpsWithOpId(
+          this._id,
+          key,
+          this._pool
+        );
         const createCrdtOp = newAttachChildOps.find(
           (op) => op.parentId === this._id
         );
         if (createCrdtOp) {
-          this.#propToLastUpdate.set(key, nn(createCrdtOp.opId));
+          this.#unackedOpsByKey.set(key, nn(createCrdtOp.opId));
         }
         ops.push(...newAttachChildOps);
       } else {
         updatedProps[key] = newValue;
-        this.#propToLastUpdate.set(key, opId);
+        this.#unackedOpsByKey.set(key, opId);
       }
       this.#map.set(key, newValue);
       this.invalidate();
@@ -8288,7 +8281,10 @@ function getTreesDiffOperations(currentItems, newItems) {
   const ops = [];
   currentItems.forEach((_, id) => {
     if (!newItems.get(id)) {
-      ops.push({ type: OpCode.DELETE_CRDT, id });
+      ops.push({
+        type: OpCode.DELETE_CRDT,
+        id
+      });
     }
   });
   newItems.forEach((crdt, id) => {
@@ -8713,6 +8709,8 @@ function defaultMessageFromContext(context) {
       return "Could not delete thread";
     case "EDIT_THREAD_METADATA_ERROR":
       return "Could not edit thread metadata";
+    case "EDIT_COMMENT_METADATA_ERROR":
+      return "Could not edit comment metadata";
     case "MARK_THREAD_AS_RESOLVED_ERROR":
       return "Could not mark thread as resolved";
     case "MARK_THREAD_AS_UNRESOLVED_ERROR":
@@ -8786,21 +8784,6 @@ function installBackgroundTabSpy() {
   };
   return [inBackgroundSince, unsub];
 }
-function makePartialNodeMap() {
-  let map = /* @__PURE__ */ new Map();
-  return {
-    append(chunk2) {
-      for (const [id, node] of chunk2) {
-        map.set(id, node);
-      }
-    },
-    clear() {
-      const result = map;
-      map = /* @__PURE__ */ new Map();
-      return result;
-    }
-  };
-}
 function createRoom(options, config) {
   const roomId = config.roomId;
   const initialPresence = options.initialPresence;
@@ -8861,7 +8844,6 @@ function createRoom(options, config) {
     activeBatch: null,
     unacknowledgedOps: /* @__PURE__ */ new Map()
   };
-  const partialNodes = makePartialNodeMap();
   let lastTokenKey;
   function onStatusDidChange(newStatus) {
     const authValue = managedSocket.authValue;
@@ -9143,11 +9125,14 @@ function createRoom(options, config) {
     self,
     (me) => me !== null ? userToTreeNode("Me", me) : null
   );
-  function createOrUpdateRootFromMessage(nodes) {
+  function createOrUpdateRootFromMessage(message) {
+    if (message.items.length === 0) {
+      throw new Error("Internal error: cannot load storage without items");
+    }
     if (context.root !== void 0) {
-      updateRoot(new Map(nodes));
+      updateRoot(message.items);
     } else {
-      context.root = LiveObject._fromItems(nodes, context.pool);
+      context.root = LiveObject._fromItems(message.items, context.pool);
     }
     const canWrite = self.get()?.canWrite ?? true;
     const stackSizeBefore = context.undoStack.length;
@@ -9164,10 +9149,7 @@ function createRoom(options, config) {
     }
     context.undoStack.length = stackSizeBefore;
   }
-  function updateRoot(nodes) {
-    if (nodes.size === 0) {
-      throw new Error("Internal error: cannot load storage without items");
-    }
+  function updateRoot(items) {
     if (context.root === void 0) {
       return;
     }
@@ -9175,26 +9157,22 @@ function createRoom(options, config) {
     for (const [id, node] of context.pool.nodes) {
       currentItems.set(id, node._serialize());
     }
-    const ops = getTreesDiffOperations(currentItems, nodes);
-    const result = applyOps(
-      ops,
-      /* isLocal */
-      false
-    );
+    const ops = getTreesDiffOperations(currentItems, new Map(items));
+    const result = applyRemoteOps(ops);
     notify(result.updates);
   }
-  function _addToRealUndoStack(historyOps) {
+  function _addToRealUndoStack(frames) {
     if (context.undoStack.length >= 50) {
       context.undoStack.shift();
     }
-    context.undoStack.push(historyOps);
+    context.undoStack.push(frames);
     onHistoryChange();
   }
-  function addToUndoStack(historyOps) {
+  function addToUndoStack(frames) {
     if (context.pausedHistory !== null) {
-      context.pausedHistory.pushLeft(historyOps);
+      context.pausedHistory.pushLeft(frames);
     } else {
-      _addToRealUndoStack(historyOps);
+      _addToRealUndoStack(frames);
     }
   }
   function notify(updates) {
@@ -9225,69 +9203,85 @@ function createRoom(options, config) {
       "Internal. Tried to get connection id but connection was never open"
     );
   }
-  function applyOps(rawOps, isLocal) {
+  function applyLocalOps(frames) {
+    const [pframes, ops] = partition(
+      frames,
+      (f) => f.type === "presence"
+    );
+    const opsWithOpIds = ops.map(
+      (op) => op.opId === void 0 ? { ...op, opId: context.pool.generateOpId() } : op
+    );
+    const { reverse, updates } = applyOps(
+      pframes,
+      opsWithOpIds,
+      /* isLocal */
+      true
+    );
+    return { opsToEmit: opsWithOpIds, reverse, updates };
+  }
+  function applyRemoteOps(ops) {
+    return applyOps(
+      [],
+      ops,
+      /* isLocal */
+      false
+    );
+  }
+  function applyOps(pframes, ops, isLocal) {
     const output = {
       reverse: new Deque(),
       storageUpdates: /* @__PURE__ */ new Map(),
       presence: false
     };
-    const createdNodeIds = /* @__PURE__ */ new Set();
-    const ops = rawOps.map((op) => {
-      if (op.type !== "presence" && !op.opId) {
-        return { ...op, opId: context.pool.generateOpId() };
+    for (const pf of pframes) {
+      const reverse = {
+        type: "presence",
+        data: {}
+      };
+      for (const key in pf.data) {
+        reverse.data[key] = context.myPresence.get()[key];
+      }
+      context.myPresence.patch(pf.data);
+      if (context.buffer.presenceUpdates === null) {
+        context.buffer.presenceUpdates = { type: "partial", data: pf.data };
       } else {
-        return op;
+        for (const key in pf.data) {
+          context.buffer.presenceUpdates.data[key] = pf.data[key];
+        }
       }
-    });
+      output.reverse.pushLeft(reverse);
+      output.presence = true;
+    }
+    const createdNodeIds = /* @__PURE__ */ new Set();
     for (const op of ops) {
-      if (op.type === "presence") {
-        const reverse = {
-          type: "presence",
-          data: {}
-        };
-        for (const key in op.data) {
-          reverse.data[key] = context.myPresence.get()[key];
-        }
-        context.myPresence.patch(op.data);
-        if (context.buffer.presenceUpdates === null) {
-          context.buffer.presenceUpdates = { type: "partial", data: op.data };
-        } else {
-          for (const key in op.data) {
-            context.buffer.presenceUpdates.data[key] = op.data[key];
-          }
-        }
-        output.reverse.pushLeft(reverse);
-        output.presence = true;
+      let source;
+      if (isLocal) {
+        source = 0 /* LOCAL */;
+      } else if (op.opId !== void 0) {
+        context.unacknowledgedOps.delete(op.opId);
+        source = 2 /* OURS */;
       } else {
-        let source;
-        if (isLocal) {
-          source = 0 /* LOCAL */;
-        } else {
-          const opId = nn(op.opId);
-          const deleted = context.unacknowledgedOps.delete(opId);
-          source = deleted ? 2 /* OURS */ : 1 /* THEIRS */;
+        source = 1 /* THEIRS */;
+      }
+      const applyOpResult = applyOp(op, source);
+      if (applyOpResult.modified) {
+        const nodeId = applyOpResult.modified.node._id;
+        if (!(nodeId && createdNodeIds.has(nodeId))) {
+          output.storageUpdates.set(
+            nn(applyOpResult.modified.node._id),
+            mergeStorageUpdates(
+              output.storageUpdates.get(nn(applyOpResult.modified.node._id)),
+              applyOpResult.modified
+            )
+          );
+          output.reverse.pushLeft(applyOpResult.reverse);
         }
-        const applyOpResult = applyOp(op, source);
-        if (applyOpResult.modified) {
-          const nodeId = applyOpResult.modified.node._id;
-          if (!(nodeId && createdNodeIds.has(nodeId))) {
-            output.storageUpdates.set(
-              nn(applyOpResult.modified.node._id),
-              mergeStorageUpdates(
-                output.storageUpdates.get(nn(applyOpResult.modified.node._id)),
-                applyOpResult.modified
-              )
-            );
-            output.reverse.pushLeft(applyOpResult.reverse);
-          }
-          if (op.type === OpCode.CREATE_LIST || op.type === OpCode.CREATE_MAP || op.type === OpCode.CREATE_OBJECT) {
-            createdNodeIds.add(nn(op.id));
-          }
+        if (op.type === OpCode.CREATE_LIST || op.type === OpCode.CREATE_MAP || op.type === OpCode.CREATE_OBJECT) {
+          createdNodeIds.add(op.id);
         }
       }
     }
     return {
-      ops,
       reverse: Array.from(output.reverse),
       updates: {
         storageUpdates: output.storageUpdates,
@@ -9472,20 +9466,16 @@ function createRoom(options, config) {
       return compact([parseServerMessage(data)]);
     }
   }
-  function applyAndSendOps(offlineOps) {
-    if (offlineOps.size === 0) {
+  function applyAndSendOfflineOps(unackedOps) {
+    if (unackedOps.size === 0) {
       return;
     }
     const messages = [];
-    const inOps = Array.from(offlineOps.values());
-    const result = applyOps(
-      inOps,
-      /* isLocal */
-      true
-    );
+    const inOps = Array.from(unackedOps.values());
+    const result = applyLocalOps(inOps);
     messages.push({
       type: ClientMsgCode.UPDATE_STORAGE,
-      ops: result.ops
+      ops: result.opsToEmit
     });
     notify(result.updates);
     sendMessages(messages);
@@ -9542,18 +9532,12 @@ function createRoom(options, config) {
           updates.others.push(onRoomStateMessage(message));
           break;
         }
-        case ServerMsgCode.STORAGE_CHUNK:
-          partialNodes.append(compactNodesToNodeStream(message.nodes));
-          break;
-        case ServerMsgCode.STORAGE_STREAM_END:
-          processInitialStorage(partialNodes.clear());
+        case ServerMsgCode.STORAGE_STATE: {
+          processInitialStorage(message);
           break;
+        }
         case ServerMsgCode.UPDATE_STORAGE: {
-          const applyResult = applyOps(
-            message.ops,
-            /* isLocal */
-            false
-          );
+          const applyResult = applyRemoteOps(message.ops);
           for (const [key, value] of applyResult.updates.storageUpdates) {
             updates.storageUpdates.set(
               key,
@@ -9586,12 +9570,11 @@ function createRoom(options, config) {
         case ServerMsgCode.COMMENT_REACTION_REMOVED:
         case ServerMsgCode.COMMENT_CREATED:
         case ServerMsgCode.COMMENT_EDITED:
-        case ServerMsgCode.COMMENT_DELETED: {
+        case ServerMsgCode.COMMENT_DELETED:
+        case ServerMsgCode.COMMENT_METADATA_UPDATED: {
           eventHub.comments.notify(message);
           break;
         }
-        case ServerMsgCode.STORAGE_STATE_V7:
-        // No longer used in V8
         default:
           break;
       }
@@ -9602,7 +9585,7 @@ function createRoom(options, config) {
     const storageOps = context.buffer.storageOperations;
     if (storageOps.length > 0) {
       for (const op of storageOps) {
-        context.unacknowledgedOps.set(nn(op.opId), op);
+        context.unacknowledgedOps.set(op.opId, op);
       }
       notifyStorageStatus();
     }
@@ -9693,18 +9676,18 @@ function createRoom(options, config) {
   }
   let _getStorage$ = null;
   let _resolveStoragePromise = null;
-  function processInitialStorage(nodes) {
+  function processInitialStorage(message) {
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
-    createOrUpdateRootFromMessage(nodes);
-    applyAndSendOps(unacknowledgedOps);
+    createOrUpdateRootFromMessage(message);
+    applyAndSendOfflineOps(unacknowledgedOps);
     _resolveStoragePromise?.();
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
   async function streamStorage() {
     if (!managedSocket.authValue) return;
-    const nodes = new Map(await httpClient.streamStorage({ roomId }));
-    processInitialStorage(nodes);
+    const items = await httpClient.streamStorage({ roomId });
+    processInitialStorage({ type: ServerMsgCode.STORAGE_STATE, items });
   }
   function refreshStorage(options2) {
     const messages = context.buffer.messages;
@@ -9712,7 +9695,6 @@ function createRoom(options, config) {
       void streamStorage();
     } else if (!messages.some((msg) => msg.type === ClientMsgCode.FETCH_STORAGE)) {
       messages.push({ type: ClientMsgCode.FETCH_STORAGE });
-      partialNodes.clear();
     }
     if (options2.flush) {
       flushNowOrSoon();
@@ -9765,23 +9747,17 @@ function createRoom(options, config) {
     if (context.activeBatch) {
       throw new Error("undo is not allowed during a batch");
     }
-    const historyOps = context.undoStack.pop();
-    if (historyOps === void 0) {
+    const frames = context.undoStack.pop();
+    if (frames === void 0) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(
-      historyOps,
-      /* isLocal */
-      true
-    );
+    const result = applyLocalOps(frames);
     notify(result.updates);
     context.redoStack.push(result.reverse);
     onHistoryChange();
-    for (const op of result.ops) {
-      if (op.type !== "presence") {
-        context.buffer.storageOperations.push(op);
-      }
+    for (const op of result.opsToEmit) {
+      context.buffer.storageOperations.push(op);
     }
     flushNowOrSoon();
   }
@@ -9789,23 +9765,17 @@ function createRoom(options, config) {
     if (context.activeBatch) {
       throw new Error("redo is not allowed during a batch");
     }
-    const historyOps = context.redoStack.pop();
-    if (historyOps === void 0) {
+    const frames = context.redoStack.pop();
+    if (frames === void 0) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(
-      historyOps,
-      /* isLocal */
-      true
-    );
+    const result = applyLocalOps(frames);
     notify(result.updates);
     context.undoStack.push(result.reverse);
     onHistoryChange();
-    for (const op of result.ops) {
-      if (op.type !== "presence") {
-        context.buffer.storageOperations.push(op);
-      }
+    for (const op of result.opsToEmit) {
+      context.buffer.storageOperations.push(op);
     }
     flushNowOrSoon();
   }
@@ -9852,10 +9822,10 @@ function createRoom(options, config) {
     }
   }
   function resumeHistory() {
-    const historyOps = context.pausedHistory;
+    const frames = context.pausedHistory;
     context.pausedHistory = null;
-    if (historyOps !== null && historyOps.length > 0) {
-      _addToRealUndoStack(Array.from(historyOps));
+    if (frames !== null && frames.length > 0) {
+      _addToRealUndoStack(Array.from(frames));
     }
   }
   const syncSourceForStorage = config.createSyncSource();
@@ -9941,6 +9911,7 @@ function createRoom(options, config) {
       commentId: options2.commentId,
       metadata: options2.metadata,
       body: options2.body,
+      commentMetadata: options2.commentMetadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9953,6 +9924,18 @@ function createRoom(options, config) {
   }) {
     return httpClient.editThreadMetadata({ roomId, threadId, metadata });
   }
+  async function editCommentMetadata({
+    threadId,
+    commentId,
+    metadata
+  }) {
+    return httpClient.editCommentMetadata({
+      roomId,
+      threadId,
+      commentId,
+      metadata
+    });
+  }
   async function markThreadAsResolved(threadId) {
     return httpClient.markThreadAsResolved({ roomId, threadId });
   }
@@ -9974,6 +9957,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9983,6 +9967,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -10170,6 +10155,7 @@ function createRoom(options, config) {
       unsubscribeFromThread,
       createComment,
       editComment,
+      editCommentMetadata,
       deleteComment,
       addReaction,
       removeReaction,
@@ -10302,7 +10288,7 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill, eng
     }
     const url2 = new URL(baseUrl);
     url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
-    url2.pathname = "/v8";
+    url2.pathname = "/v7";
     url2.searchParams.set("roomId", roomId);
     if (authValue.type === "secret") {
       url2.searchParams.set("tok", authValue.token.raw);
@@ -11601,7 +11587,6 @@ export {
   memoizeOnSuccess,
   nanoid,
   nn,
-  nodeStreamToCompactNodes,
   objectToQuery,
   patchLiveObjectKey,
   patchNotificationSettings,