@liveblocks/core 3.16.0-feeds1 → 3.16.0-flow2

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.16.0-feeds1";
+var PKG_VERSION = "3.16.0-flow2";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -3219,26 +3219,10 @@ var ServerMsgCode = Object.freeze({
   COMMENT_REACTION_ADDED: 405,
   COMMENT_REACTION_REMOVED: 406,
   COMMENT_METADATA_UPDATED: 409,
-  // For Feeds
-  FEEDS_LIST: 500,
-  FEEDS_ADDED: 501,
-  FEEDS_UPDATED: 502,
-  FEED_DELETED: 503,
-  FEED_MESSAGES_LIST: 504,
-  FEED_MESSAGES_ADDED: 505,
-  FEED_MESSAGES_UPDATED: 506,
-  FEED_MESSAGES_DELETED: 507,
-  FEED_REQUEST_FAILED: 508,
   // Error codes
   REJECT_STORAGE_OP: 299
   // Sent if a mutation was not allowed on the server (i.e. due to permissions, limit exceeded, etc)
 });
-var FeedRequestErrorCode = {
-  INTERNAL: "INTERNAL",
-  FEED_ALREADY_EXISTS: "FEED_ALREADY_EXISTS",
-  FEED_NOT_FOUND: "FEED_NOT_FOUND",
-  FEED_MESSAGE_NOT_FOUND: "FEED_MESSAGE_NOT_FOUND"
-};
 
 // src/types/IWebSocket.ts
 var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
@@ -5202,7 +5186,6 @@ var Permission = /* @__PURE__ */ ((Permission2) => {
   Permission2["PresenceWrite"] = "room:presence:write";
   Permission2["CommentsWrite"] = "comments:write";
   Permission2["CommentsRead"] = "comments:read";
-  Permission2["FeedsWrite"] = "feeds:write";
   return Permission2;
 })(Permission || {});
 function canWriteStorage(scopes) {
@@ -6319,7 +6302,6 @@ var AbstractCrdt = class {
   }
   /**
    * @internal
-   *
    * Return an snapshot of this Live tree for use in DevTools.
    */
   toTreeNode(key) {
@@ -6329,6 +6311,14 @@ var AbstractCrdt = class {
     }
     return this.#cachedTreeNode;
   }
+  /**
+   * @private
+   * Returns true if the cached immutable snapshot exists and is
+   * reference-equal to the given value. Does not trigger a recompute.
+   */
+  immutableIs(value) {
+    return this.#cachedImmutable !== void 0 && this.#cachedImmutable === value;
+  }
   /**
    * Return an immutable snapshot of this Live node and its children.
    */
@@ -7876,270 +7866,674 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   }
 };
 
-// src/crdts/LiveObject.ts
-var MAX_LIVE_OBJECT_SIZE = 128 * 1024;
-var LiveObject = class _LiveObject extends AbstractCrdt {
-  #map;
-  /**
-   * 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
-   * is the maximum value the server will be able to accept.
-   * By default, this behavior is disabled to avoid the runtime performance
-   * overhead on every LiveObject.set() or LiveObject.update() call.
-   *
-   * @experimental
-   */
-  static detectLargeObjects = false;
-  static #buildRootAndParentToChildren(nodes) {
-    const parentToChildren = /* @__PURE__ */ new Map();
-    let root = null;
-    for (const node of nodes) {
-      if (isRootStorageNode(node)) {
-        root = node[1];
+// src/lib/Json.ts
+function isJsonScalar(data) {
+  return data === null || typeof data === "string" || typeof data === "number" || typeof data === "boolean";
+}
+function isJsonArray(data) {
+  return Array.isArray(data);
+}
+function isJsonObject(data) {
+  return !isJsonScalar(data) && !isJsonArray(data);
+}
+
+// src/immutable.ts
+function lsonObjectToJson(obj) {
+  const result = {};
+  for (const key in obj) {
+    const val = obj[key];
+    if (val !== void 0) {
+      result[key] = lsonToJson(val);
+    }
+  }
+  return result;
+}
+function liveObjectToJson(liveObject) {
+  return lsonObjectToJson(liveObject.toObject());
+}
+function liveMapToJson(map) {
+  const result = {};
+  for (const [key, value] of map.entries()) {
+    result[key] = lsonToJson(value);
+  }
+  return result;
+}
+function lsonListToJson(value) {
+  return value.map(lsonToJson);
+}
+function liveListToJson(value) {
+  return lsonListToJson(value.toArray());
+}
+function lsonToJson(value) {
+  if (value instanceof LiveObject) {
+    return liveObjectToJson(value);
+  } else if (value instanceof LiveList) {
+    return liveListToJson(value);
+  } else if (value instanceof LiveMap) {
+    return liveMapToJson(value);
+  } else if (value instanceof LiveRegister) {
+    return value.data;
+  }
+  if (Array.isArray(value)) {
+    return lsonListToJson(value);
+  } else if (isPlainObject(value)) {
+    return lsonObjectToJson(value);
+  }
+  return value;
+}
+function deepLiveify(value, config) {
+  if (Array.isArray(value)) {
+    return new LiveList(value.map((v) => deepLiveify(v, config)));
+  } else if (isPlainObject(value)) {
+    const init = {};
+    const locals = {};
+    for (const key in value) {
+      const val = value[key];
+      if (val === void 0) {
+        continue;
+      }
+      const subConfig = isPlainObject(config) ? config[key] : config;
+      if (subConfig === false) {
+        locals[key] = val;
+      } else if (subConfig === "atomic") {
+        init[key] = val;
       } else {
-        const crdt = node[1];
-        const children = parentToChildren.get(crdt.parentId);
-        if (children !== void 0) {
-          children.push(node);
-        } else {
-          parentToChildren.set(crdt.parentId, [node]);
-        }
+        init[key] = deepLiveify(val, subConfig);
       }
     }
-    if (root === null) {
-      throw new Error("Root can't be null");
+    const lo = new LiveObject(init);
+    for (const key in locals) {
+      lo.setLocal(key, locals[key]);
     }
-    return [root, parentToChildren];
+    return lo;
+  } else {
+    return value;
   }
-  /** @private Do not use this API directly */
-  static _fromItems(nodes, pool) {
-    const [root, parentToChildren] = _LiveObject.#buildRootAndParentToChildren(nodes);
-    return _LiveObject._deserialize(
-      ["root", root],
-      parentToChildren,
-      pool
-    );
+}
+function deepLiveifyObject(obj, config) {
+  return deepLiveify(obj, config);
+}
+function reconcile(live, json, config) {
+  if (isLiveObject(live) && isPlainObject(json)) {
+    return reconcileLiveObject(live, json, config);
+  } else if (isLiveList(live) && Array.isArray(json)) {
+    return reconcileLiveList(live, json, config);
+  } else if (isLiveMap(live) && isPlainObject(json)) {
+    return reconcileLiveMap(live, config);
+  } else {
+    return deepLiveify(json, config);
   }
-  constructor(obj = {}) {
-    super();
-    this.#unackedOpsByKey = /* @__PURE__ */ new Map();
-    const o = compactObject(obj);
-    for (const key of Object.keys(o)) {
-      const value = o[key];
-      if (isLiveNode(value)) {
-        value._setParentLink(this, key);
+}
+function reconcileLiveMap(_liveMap, _config) {
+  throw new Error("Reconciling a LiveMap is not supported yet");
+}
+function reconcileLiveObject(liveObj, jsonObj, config) {
+  const currentKeys = liveObj.keys();
+  for (const key in jsonObj) {
+    currentKeys.delete(key);
+    const newVal = jsonObj[key];
+    if (newVal === void 0) {
+      liveObj.delete(key);
+      continue;
+    }
+    const subConfig = isPlainObject(config) ? config[key] : config;
+    if (subConfig === false) {
+      liveObj.setLocal(key, newVal);
+    } else if (subConfig === "atomic") {
+      const curVal = liveObj.get(key);
+      if (curVal !== newVal) {
+        liveObj.set(key, newVal);
+      }
+    } else {
+      const curVal = liveObj.get(key);
+      if (curVal === void 0) {
+        liveObj.set(key, deepLiveify(newVal, subConfig));
+      } else if (isLiveStructure(curVal)) {
+        const next = reconcile(curVal, newVal, subConfig);
+        if (next !== curVal) {
+          liveObj.set(key, next);
+        }
+      } else if (curVal !== newVal) {
+        liveObj.set(key, deepLiveify(newVal, subConfig));
       }
     }
-    this.#map = new Map(Object.entries(o));
   }
-  /** @internal */
-  _toOps(parentId, parentKey) {
-    if (this._id === void 0) {
-      throw new Error("Cannot serialize item is not attached");
-    }
-    const ops = [];
-    const op = {
-      type: OpCode.CREATE_OBJECT,
-      id: this._id,
-      parentId,
-      parentKey,
-      data: {}
-    };
-    ops.push(op);
-    for (const [key, value] of this.#map) {
-      if (isLiveNode(value)) {
-        for (const childOp of value._toOps(this._id, key)) {
-          ops.push(childOp);
-        }
-      } else {
-        op.data[key] = value;
+  for (const key of currentKeys) {
+    liveObj.delete(key);
+  }
+  return liveObj;
+}
+function reconcileLiveList(liveList, jsonArr, config) {
+  const curLen = liveList.length;
+  const newLen = jsonArr.length;
+  for (let i = 0; i < Math.min(curLen, newLen); i++) {
+    const curVal = liveList.get(i);
+    const newVal = jsonArr[i];
+    if (isLiveStructure(curVal)) {
+      const next = reconcile(curVal, newVal, config);
+      if (next !== curVal) {
+        liveList.set(i, next);
       }
+    } else if (curVal !== newVal) {
+      liveList.set(i, deepLiveify(newVal, config));
     }
-    return ops;
   }
-  /** @internal */
-  static _deserialize([id, item], parentToChildren, pool) {
-    const liveObj = new _LiveObject(item.data);
-    liveObj._attach(id, pool);
-    return this._deserializeChildren(liveObj, parentToChildren, pool);
+  for (let i = curLen; i < newLen; i++) {
+    liveList.push(deepLiveify(jsonArr[i], config));
   }
-  /** @internal */
-  static _deserializeChildren(liveObj, parentToChildren, pool) {
-    const children = parentToChildren.get(nn(liveObj._id));
-    if (children === void 0) {
-      return liveObj;
+  for (let i = curLen - 1; i >= newLen; i--) {
+    liveList.delete(i);
+  }
+  return liveList;
+}
+function legacy_patchLiveList(liveList, prev, next) {
+  let i = 0;
+  let prevEnd = prev.length - 1;
+  let nextEnd = next.length - 1;
+  let prevNode = prev[0];
+  let nextNode = next[0];
+  outer: {
+    while (prevNode === nextNode) {
+      ++i;
+      if (i > prevEnd || i > nextEnd) {
+        break outer;
+      }
+      prevNode = prev[i];
+      nextNode = next[i];
     }
-    for (const node of children) {
-      const child = deserializeToLson(node, parentToChildren, pool);
-      const crdt = node[1];
-      if (isLiveStructure(child)) {
-        child._setParentLink(liveObj, crdt.parentKey);
+    prevNode = prev[prevEnd];
+    nextNode = next[nextEnd];
+    while (prevNode === nextNode) {
+      prevEnd--;
+      nextEnd--;
+      if (i > prevEnd || i > nextEnd) {
+        break outer;
       }
-      liveObj.#map.set(crdt.parentKey, child);
-      liveObj.invalidate();
+      prevNode = prev[prevEnd];
+      nextNode = next[nextEnd];
     }
-    return liveObj;
   }
-  /** @internal */
-  _attach(id, pool) {
-    super._attach(id, pool);
-    for (const [_key, value] of this.#map) {
-      if (isLiveNode(value)) {
-        value._attach(pool.generateId(), pool);
+  if (i > prevEnd) {
+    if (i <= nextEnd) {
+      while (i <= nextEnd) {
+        liveList.insert(deepLiveify(next[i]), i);
+        i++;
       }
     }
-  }
-  /** @internal */
-  _attachChild(op, source) {
-    if (this._pool === void 0) {
-      throw new Error("Can't attach child if managed pool is not present");
+  } else if (i > nextEnd) {
+    let localI = i;
+    while (localI <= prevEnd) {
+      liveList.delete(i);
+      localI++;
     }
-    const { id, opId, parentKey: key } = op;
-    const child = creationOpToLson(op);
-    if (this._pool.getNode(id) !== void 0) {
-      if (this.#unackedOpsByKey.get(key) === opId) {
-        this.#unackedOpsByKey.delete(key);
+  } else {
+    while (i <= prevEnd && i <= nextEnd) {
+      prevNode = prev[i];
+      nextNode = next[i];
+      const liveListNode = liveList.get(i);
+      if (isLiveObject(liveListNode) && isPlainObject(prevNode) && isPlainObject(nextNode)) {
+        legacy_patchLiveObject(liveListNode, prevNode, nextNode);
+      } else {
+        liveList.set(i, deepLiveify(nextNode));
       }
-      return { modified: false };
+      i++;
     }
-    if (source === 0 /* LOCAL */) {
-      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 };
+    while (i <= nextEnd) {
+      liveList.insert(deepLiveify(next[i]), i);
+      i++;
     }
-    const thisId = nn(this._id);
-    const previousValue = this.#map.get(key);
-    let reverse;
-    if (isLiveNode(previousValue)) {
-      reverse = previousValue._toOps(thisId, key);
-      previousValue._detach();
-    } else if (previousValue === void 0) {
-      reverse = [{ type: OpCode.DELETE_OBJECT_KEY, id: thisId, key }];
-    } else {
-      reverse = [
-        {
-          type: OpCode.UPDATE_OBJECT,
-          id: thisId,
-          data: { [key]: previousValue }
-        }
-      ];
-    }
-    this.#map.set(key, child);
-    this.invalidate();
-    if (isLiveStructure(child)) {
-      child._setParentLink(this, key);
-      child._attach(id, this._pool);
+    let localI = i;
+    while (localI <= prevEnd) {
+      liveList.delete(i);
+      localI++;
     }
-    return {
-      reverse,
-      modified: {
-        node: this,
-        type: "LiveObject",
-        updates: { [key]: { type: "update" } }
-      }
-    };
   }
-  /** @internal */
-  _detachChild(child) {
-    if (child) {
-      const id = nn(this._id);
-      const parentKey = nn(child._parentKey);
-      const reverse = child._toOps(id, parentKey);
-      for (const [key, value] of this.#map) {
-        if (value === child) {
-          this.#map.delete(key);
-          this.invalidate();
-        }
-      }
-      child._detach();
-      const storageUpdate = {
-        node: this,
-        type: "LiveObject",
-        updates: {
-          [parentKey]: { type: "delete" }
-        }
-      };
-      return { modified: storageUpdate, reverse };
+}
+function legacy_patchLiveObjectKey(liveObject, key, prev, next) {
+  if (process.env.NODE_ENV !== "production") {
+    const nonSerializableValue = findNonSerializableValue(next);
+    if (nonSerializableValue) {
+      error2(
+        `New state path: '${nonSerializableValue.path}' value: '${String(
+          nonSerializableValue.value
+        )}' is not serializable.
+Only serializable value can be synced with Liveblocks.`
+      );
+      return;
     }
-    return { modified: false };
   }
-  /** @internal */
-  _detach() {
-    super._detach();
-    for (const value of this.#map.values()) {
-      if (isLiveNode(value)) {
-        value._detach();
-      }
+  const value = liveObject.get(key);
+  if (next === void 0) {
+    liveObject.delete(key);
+  } else if (value === void 0) {
+    liveObject.set(key, deepLiveify(next));
+  } else if (prev === next) {
+    return;
+  } else if (isLiveList(value) && Array.isArray(prev) && Array.isArray(next)) {
+    legacy_patchLiveList(value, prev, next);
+  } else if (isLiveObject(value) && isPlainObject(prev) && isPlainObject(next)) {
+    legacy_patchLiveObject(value, prev, next);
+  } else {
+    liveObject.set(key, deepLiveify(next));
+  }
+}
+function legacy_patchLiveObject(root, prev, next) {
+  const updates = {};
+  for (const key in next) {
+    legacy_patchLiveObjectKey(root, key, prev[key], next[key]);
+  }
+  for (const key in prev) {
+    if (next[key] === void 0) {
+      root.delete(key);
     }
   }
-  /** @internal */
-  _apply(op, isLocal) {
-    if (op.type === OpCode.UPDATE_OBJECT) {
-      return this.#applyUpdate(op, isLocal);
-    } else if (op.type === OpCode.DELETE_OBJECT_KEY) {
-      return this.#applyDeleteObjectKey(op, isLocal);
+  if (Object.keys(updates).length > 0) {
+    root.update(updates);
+  }
+}
+function getParentsPath(node) {
+  const path = [];
+  while (node.parent.type === "HasParent") {
+    if (isLiveList(node.parent.node)) {
+      path.push(node.parent.node._indexOfPosition(node.parent.key));
+    } else {
+      path.push(node.parent.key);
     }
-    return super._apply(op, isLocal);
+    node = node.parent.node;
   }
-  /** @internal */
-  _serialize() {
-    const data = {};
-    for (const [key, value] of this.#map) {
-      if (!isLiveNode(value)) {
-        data[key] = value;
+  return path;
+}
+function legacy_patchImmutableObject(state, updates) {
+  return updates.reduce(
+    (state2, update) => legacy_patchImmutableObjectWithUpdate(state2, update),
+    state
+  );
+}
+function legacy_patchImmutableObjectWithUpdate(state, update) {
+  const path = getParentsPath(update.node);
+  return legacy_patchImmutableNode(state, path, update);
+}
+function legacy_patchImmutableNode(state, path, update) {
+  const pathItem = path.pop();
+  if (pathItem === void 0) {
+    switch (update.type) {
+      case "LiveObject": {
+        if (!isJsonObject(state)) {
+          throw new Error(
+            "Internal: received update on LiveObject but state was not an object"
+          );
+        }
+        const newState = Object.assign({}, state);
+        for (const key in update.updates) {
+          if (update.updates[key]?.type === "update") {
+            const val = update.node.get(key);
+            if (val !== void 0) {
+              newState[key] = lsonToJson(val);
+            }
+          } else if (update.updates[key]?.type === "delete") {
+            delete newState[key];
+          }
+        }
+        return newState;
+      }
+      case "LiveList": {
+        if (!Array.isArray(state)) {
+          throw new Error(
+            "Internal: received update on LiveList but state was not an array"
+          );
+        }
+        let newState = state.map((x) => x);
+        for (const listUpdate of update.updates) {
+          if (listUpdate.type === "set") {
+            newState = newState.map(
+              (item, index) => index === listUpdate.index ? lsonToJson(listUpdate.item) : item
+            );
+          } else if (listUpdate.type === "insert") {
+            if (listUpdate.index === newState.length) {
+              newState.push(lsonToJson(listUpdate.item));
+            } else {
+              newState = [
+                ...newState.slice(0, listUpdate.index),
+                lsonToJson(listUpdate.item),
+                ...newState.slice(listUpdate.index)
+              ];
+            }
+          } else if (listUpdate.type === "delete") {
+            newState.splice(listUpdate.index, 1);
+          } else if (listUpdate.type === "move") {
+            if (listUpdate.previousIndex > listUpdate.index) {
+              newState = [
+                ...newState.slice(0, listUpdate.index),
+                lsonToJson(listUpdate.item),
+                ...newState.slice(listUpdate.index, listUpdate.previousIndex),
+                ...newState.slice(listUpdate.previousIndex + 1)
+              ];
+            } else {
+              newState = [
+                ...newState.slice(0, listUpdate.previousIndex),
+                ...newState.slice(
+                  listUpdate.previousIndex + 1,
+                  listUpdate.index + 1
+                ),
+                lsonToJson(listUpdate.item),
+                ...newState.slice(listUpdate.index + 1)
+              ];
+            }
+          }
+        }
+        return newState;
+      }
+      case "LiveMap": {
+        if (!isJsonObject(state)) {
+          throw new Error(
+            "Internal: received update on LiveMap but state was not an object"
+          );
+        }
+        const newState = Object.assign({}, state);
+        for (const key in update.updates) {
+          if (update.updates[key]?.type === "update") {
+            const value = update.node.get(key);
+            if (value !== void 0) {
+              newState[key] = lsonToJson(value);
+            }
+          } else if (update.updates[key]?.type === "delete") {
+            delete newState[key];
+          }
+        }
+        return newState;
       }
     }
-    if (this.parent.type === "HasParent" && this.parent.node._id) {
-      return {
-        type: CrdtType.OBJECT,
-        parentId: this.parent.node._id,
-        parentKey: this.parent.key,
-        data
-      };
+  }
+  if (Array.isArray(state)) {
+    const newArray = [...state];
+    newArray[pathItem] = legacy_patchImmutableNode(
+      state[pathItem],
+      path,
+      update
+    );
+    return newArray;
+  } else if (isJsonObject(state)) {
+    const node = state[pathItem];
+    if (node === void 0) {
+      return state;
     } else {
+      const stateAsObj = state;
       return {
-        type: CrdtType.OBJECT,
-        data
+        ...stateAsObj,
+        [pathItem]: legacy_patchImmutableNode(node, path, update)
       };
     }
+  } else {
+    return state;
   }
-  #applyUpdate(op, isLocal) {
-    let isModified = false;
-    const id = nn(this._id);
-    const reverse = [];
-    const reverseUpdate = {
-      type: OpCode.UPDATE_OBJECT,
-      id,
-      data: {}
-    };
-    for (const key in op.data) {
-      const oldValue = this.#map.get(key);
-      if (isLiveNode(oldValue)) {
-        for (const childOp of oldValue._toOps(id, key)) {
-          reverse.push(childOp);
-        }
-        oldValue._detach();
-      } else if (oldValue !== void 0) {
-        reverseUpdate.data[key] = oldValue;
-      } else if (oldValue === void 0) {
+}
+
+// src/crdts/LiveObject.ts
+var MAX_LIVE_OBJECT_SIZE = 128 * 1024;
+var LiveObject = class _LiveObject extends AbstractCrdt {
+  #synced;
+  #local = /* @__PURE__ */ new Map();
+  /**
+   * 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
+   * is the maximum value the server will be able to accept.
+   * By default, this behavior is disabled to avoid the runtime performance
+   * overhead on every LiveObject.set() or LiveObject.update() call.
+   *
+   * @experimental
+   */
+  static detectLargeObjects = false;
+  static #buildRootAndParentToChildren(nodes) {
+    const parentToChildren = /* @__PURE__ */ new Map();
+    let root = null;
+    for (const node of nodes) {
+      if (isRootStorageNode(node)) {
+        root = node[1];
+      } else {
+        const crdt = node[1];
+        const children = parentToChildren.get(crdt.parentId);
+        if (children !== void 0) {
+          children.push(node);
+        } else {
+          parentToChildren.set(crdt.parentId, [node]);
+        }
+      }
+    }
+    if (root === null) {
+      throw new Error("Root can't be null");
+    }
+    return [root, parentToChildren];
+  }
+  /** @private Do not use this API directly */
+  static _fromItems(nodes, pool) {
+    const [root, parentToChildren] = _LiveObject.#buildRootAndParentToChildren(nodes);
+    return _LiveObject._deserialize(
+      ["root", root],
+      parentToChildren,
+      pool
+    );
+  }
+  constructor(obj = {}) {
+    super();
+    this.#unackedOpsByKey = /* @__PURE__ */ new Map();
+    const o = compactObject(obj);
+    for (const key of Object.keys(o)) {
+      const value = o[key];
+      if (isLiveNode(value)) {
+        value._setParentLink(this, key);
+      }
+    }
+    this.#synced = new Map(Object.entries(o));
+  }
+  /** @internal */
+  _toOps(parentId, parentKey) {
+    if (this._id === void 0) {
+      throw new Error("Cannot serialize item is not attached");
+    }
+    const ops = [];
+    const op = {
+      type: OpCode.CREATE_OBJECT,
+      id: this._id,
+      parentId,
+      parentKey,
+      data: {}
+    };
+    ops.push(op);
+    for (const [key, value] of this.#synced) {
+      if (isLiveNode(value)) {
+        for (const childOp of value._toOps(this._id, key)) {
+          ops.push(childOp);
+        }
+      } else {
+        op.data[key] = value;
+      }
+    }
+    return ops;
+  }
+  /** @internal */
+  static _deserialize([id, item], parentToChildren, pool) {
+    const liveObj = new _LiveObject(item.data);
+    liveObj._attach(id, pool);
+    return this._deserializeChildren(liveObj, parentToChildren, pool);
+  }
+  /** @internal */
+  static _deserializeChildren(liveObj, parentToChildren, pool) {
+    const children = parentToChildren.get(nn(liveObj._id));
+    if (children === void 0) {
+      return liveObj;
+    }
+    for (const node of children) {
+      const child = deserializeToLson(node, parentToChildren, pool);
+      const crdt = node[1];
+      if (isLiveStructure(child)) {
+        child._setParentLink(liveObj, crdt.parentKey);
+      }
+      liveObj.#synced.set(crdt.parentKey, child);
+      liveObj.invalidate();
+    }
+    return liveObj;
+  }
+  /** @internal */
+  _attach(id, pool) {
+    super._attach(id, pool);
+    for (const [_key, value] of this.#synced) {
+      if (isLiveNode(value)) {
+        value._attach(pool.generateId(), pool);
+      }
+    }
+  }
+  /** @internal */
+  _attachChild(op, source) {
+    if (this._pool === void 0) {
+      throw new Error("Can't attach child if managed pool is not present");
+    }
+    const { id, opId, parentKey: key } = op;
+    const child = creationOpToLson(op);
+    if (this._pool.getNode(id) !== void 0) {
+      if (this.#unackedOpsByKey.get(key) === opId) {
+        this.#unackedOpsByKey.delete(key);
+      }
+      return { modified: false };
+    }
+    if (source === 0 /* LOCAL */) {
+      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 };
+    }
+    const thisId = nn(this._id);
+    const previousValue = this.#synced.get(key);
+    let reverse;
+    if (isLiveNode(previousValue)) {
+      reverse = previousValue._toOps(thisId, key);
+      previousValue._detach();
+    } else if (previousValue === void 0) {
+      reverse = [{ type: OpCode.DELETE_OBJECT_KEY, id: thisId, key }];
+    } else {
+      reverse = [
+        {
+          type: OpCode.UPDATE_OBJECT,
+          id: thisId,
+          data: { [key]: previousValue }
+        }
+      ];
+    }
+    this.#local.delete(key);
+    this.#synced.set(key, child);
+    this.invalidate();
+    if (isLiveStructure(child)) {
+      child._setParentLink(this, key);
+      child._attach(id, this._pool);
+    }
+    return {
+      reverse,
+      modified: {
+        node: this,
+        type: "LiveObject",
+        updates: { [key]: { type: "update" } }
+      }
+    };
+  }
+  /** @internal */
+  _detachChild(child) {
+    if (child) {
+      const id = nn(this._id);
+      const parentKey = nn(child._parentKey);
+      const reverse = child._toOps(id, parentKey);
+      for (const [key, value] of this.#synced) {
+        if (value === child) {
+          this.#synced.delete(key);
+          this.invalidate();
+        }
+      }
+      child._detach();
+      const storageUpdate = {
+        node: this,
+        type: "LiveObject",
+        updates: {
+          [parentKey]: { type: "delete" }
+        }
+      };
+      return { modified: storageUpdate, reverse };
+    }
+    return { modified: false };
+  }
+  /** @internal */
+  _detach() {
+    super._detach();
+    for (const value of this.#synced.values()) {
+      if (isLiveNode(value)) {
+        value._detach();
+      }
+    }
+  }
+  /** @internal */
+  _apply(op, isLocal) {
+    if (op.type === OpCode.UPDATE_OBJECT) {
+      return this.#applyUpdate(op, isLocal);
+    } else if (op.type === OpCode.DELETE_OBJECT_KEY) {
+      return this.#applyDeleteObjectKey(op, isLocal);
+    }
+    return super._apply(op, isLocal);
+  }
+  /** @internal */
+  _serialize() {
+    const data = {};
+    for (const [key, value] of this.#synced) {
+      if (!isLiveNode(value)) {
+        data[key] = value;
+      }
+    }
+    if (this.parent.type === "HasParent" && this.parent.node._id) {
+      return {
+        type: CrdtType.OBJECT,
+        parentId: this.parent.node._id,
+        parentKey: this.parent.key,
+        data
+      };
+    } else {
+      return {
+        type: CrdtType.OBJECT,
+        data
+      };
+    }
+  }
+  #applyUpdate(op, isLocal) {
+    let isModified = false;
+    const id = nn(this._id);
+    const reverse = [];
+    const reverseUpdate = {
+      type: OpCode.UPDATE_OBJECT,
+      id,
+      data: {}
+    };
+    for (const key in op.data) {
+      const oldValue = this.#synced.get(key);
+      if (isLiveNode(oldValue)) {
+        for (const childOp of oldValue._toOps(id, key)) {
+          reverse.push(childOp);
+        }
+        oldValue._detach();
+      } else if (oldValue !== void 0) {
+        reverseUpdate.data[key] = oldValue;
+      } else if (oldValue === void 0) {
         reverse.push({ type: OpCode.DELETE_OBJECT_KEY, id, key });
       }
     }
@@ -8159,13 +8553,14 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       } else {
         continue;
       }
-      const oldValue = this.#map.get(key);
+      const oldValue = this.#synced.get(key);
       if (isLiveNode(oldValue)) {
         oldValue._detach();
       }
       isModified = true;
       updateDelta[key] = { type: "update" };
-      this.#map.set(key, value);
+      this.#local.delete(key);
+      this.#synced.set(key, value);
       this.invalidate();
     }
     if (Object.keys(reverseUpdate.data).length !== 0) {
@@ -8182,7 +8577,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
   }
   #applyDeleteObjectKey(op, isLocal) {
     const key = op.key;
-    const oldValue = this.#map.get(key);
+    const oldValue = this.#synced.get(key);
     if (oldValue === void 0) {
       return { modified: false };
     }
@@ -8203,7 +8598,8 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         }
       ];
     }
-    this.#map.delete(key);
+    this.#local.delete(key);
+    this.#synced.delete(key);
     this.invalidate();
     return {
       modified: {
@@ -8216,11 +8612,23 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       reverse
     };
   }
+  /** @private */
+  keys() {
+    const result = new Set(this.#synced.keys());
+    for (const key of this.#local.keys()) {
+      result.add(key);
+    }
+    return result;
+  }
   /**
    * Transform the LiveObject into a javascript object
    */
   toObject() {
-    return Object.fromEntries(this.#map);
+    const result = Object.fromEntries(this.#synced);
+    for (const [key, value] of this.#local) {
+      result[key] = value;
+    }
+    return result;
   }
   /**
    * Adds or updates a property with a specified key and a value.
@@ -8228,49 +8636,109 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    this._pool?.assertStorageIsWritable();
     this.update({ [key]: value });
   }
+  /**
+   * @experimental
+   *
+   * Sets a local-only property that is not synchronized over the wire.
+   * The value will be visible via get(), toObject(), and toImmutable() on
+   * this client only. Other clients and the server will see `undefined`
+   * for this key.
+   *
+   * Caveat: this method will not add changes to the undo/redo stack.
+   */
+  setLocal(key, value) {
+    this._pool?.assertStorageIsWritable();
+    const deleteResult = this.#prepareDelete(key);
+    this.#local.set(key, value);
+    this.invalidate();
+    if (this._pool !== void 0 && this._id !== void 0) {
+      const ops = deleteResult?.[0] ?? [];
+      const reverse = deleteResult?.[1] ?? [];
+      const storageUpdates = deleteResult?.[2] ?? /* @__PURE__ */ new Map();
+      const existing = storageUpdates.get(this._id);
+      storageUpdates.set(this._id, {
+        node: this,
+        type: "LiveObject",
+        updates: {
+          ...existing?.updates,
+          [key]: { type: "update" }
+        }
+      });
+      this._pool.dispatch(ops, reverse, storageUpdates);
+    }
+  }
   /**
    * Returns a specified property from the LiveObject.
    * @param key The key of the property to get
    */
   get(key) {
-    return this.#map.get(key);
+    return this.#local.has(key) ? this.#local.get(key) : this.#synced.get(key);
   }
   /**
-   * Deletes a key from the LiveObject
-   * @param key The key of the property to delete
+   * Removes a synced key, returning the ops, reverse ops, and storage updates
+   * needed to notify the pool. Returns null if the key doesn't exist in
+   * #synced or pool/id are unavailable. Does NOT dispatch.
    */
-  delete(key) {
+  #prepareDelete(key) {
     this._pool?.assertStorageIsWritable();
-    const keyAsString = key;
-    const oldValue = this.#map.get(keyAsString);
+    const k = key;
+    if (this.#local.has(k) && !this.#synced.has(k)) {
+      const oldValue2 = this.#local.get(k);
+      this.#local.delete(k);
+      this.invalidate();
+      if (this._pool !== void 0 && this._id !== void 0) {
+        const storageUpdates2 = /* @__PURE__ */ new Map();
+        storageUpdates2.set(this._id, {
+          node: this,
+          type: "LiveObject",
+          updates: {
+            [k]: {
+              type: "delete",
+              deletedItem: oldValue2
+            }
+          }
+        });
+        return [[], [], storageUpdates2];
+      }
+      return null;
+    }
+    this.#local.delete(k);
+    const oldValue = this.#synced.get(k);
     if (oldValue === void 0) {
-      return;
+      return null;
     }
     if (this._pool === void 0 || this._id === void 0) {
       if (isLiveNode(oldValue)) {
         oldValue._detach();
       }
-      this.#map.delete(keyAsString);
+      this.#synced.delete(k);
       this.invalidate();
-      return;
+      return null;
     }
+    const ops = [
+      {
+        type: OpCode.DELETE_OBJECT_KEY,
+        key: k,
+        id: this._id,
+        opId: this._pool.generateOpId()
+      }
+    ];
     let reverse;
     if (isLiveNode(oldValue)) {
       oldValue._detach();
-      reverse = oldValue._toOps(this._id, keyAsString);
+      reverse = oldValue._toOps(this._id, k);
     } else {
       reverse = [
         {
           type: OpCode.UPDATE_OBJECT,
-          data: { [keyAsString]: oldValue },
+          data: { [k]: oldValue },
           id: this._id
         }
       ];
     }
-    this.#map.delete(keyAsString);
+    this.#synced.delete(k);
     this.invalidate();
     const storageUpdates = /* @__PURE__ */ new Map();
     storageUpdates.set(this._id, {
@@ -8280,18 +8748,18 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         [key]: { type: "delete", deletedItem: oldValue }
       }
     });
-    this._pool.dispatch(
-      [
-        {
-          type: OpCode.DELETE_OBJECT_KEY,
-          key: keyAsString,
-          id: this._id,
-          opId: this._pool.generateOpId()
-        }
-      ],
-      reverse,
-      storageUpdates
-    );
+    return [ops, reverse, storageUpdates];
+  }
+  /**
+   * Deletes a key from the LiveObject
+   * @param key The key of the property to delete
+   */
+  delete(key) {
+    const result = this.#prepareDelete(key);
+    if (result) {
+      const [ops, reverse, storageUpdates] = result;
+      this._pool?.dispatch(ops, reverse, storageUpdates);
+    }
   }
   /**
    * Adds or updates multiple properties at once with an object.
@@ -8301,7 +8769,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     this._pool?.assertStorageIsWritable();
     if (_LiveObject.detectLargeObjects) {
       const data = {};
-      for (const [key, value] of this.#map) {
+      for (const [key, value] of this.#synced) {
         if (!isLiveNode(value)) {
           data[key] = value;
         }
@@ -8330,14 +8798,15 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         if (newValue === void 0) {
           continue;
         }
-        const oldValue = this.#map.get(key);
+        const oldValue = this.#synced.get(key);
         if (isLiveNode(oldValue)) {
           oldValue._detach();
         }
         if (isLiveNode(newValue)) {
           newValue._setParentLink(this, key);
         }
-        this.#map.set(key, newValue);
+        this.#local.delete(key);
+        this.#synced.set(key, newValue);
         this.invalidate();
       }
       return;
@@ -8357,7 +8826,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       if (newValue === void 0) {
         continue;
       }
-      const oldValue = this.#map.get(key);
+      const oldValue = this.#synced.get(key);
       if (isLiveNode(oldValue)) {
         for (const childOp of oldValue._toOps(this._id, key)) {
           reverseOps.push(childOp);
@@ -8389,7 +8858,8 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
         updatedProps[key] = newValue;
         this.#unackedOpsByKey.set(key, opId);
       }
-      this.#map.set(key, newValue);
+      this.#local.delete(key);
+      this.#synced.set(key, newValue);
       this.invalidate();
       updateDelta[key] = { type: "update" };
     }
@@ -8412,6 +8882,19 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     });
     this._pool.dispatch(ops, reverseOps, storageUpdates);
   }
+  /**
+   * Reconciles a LiveObject tree to match the given JSON object and sync
+   * config. Only mutates keys that actually changed. Recursively reconciles
+   * the entire Live tree below it.
+   */
+  reconcile(jsonObj, config) {
+    if (this.immutableIs(jsonObj)) return;
+    if (!isPlainObject(jsonObj))
+      throw new Error(
+        "Reconciling the document root expects a plain object value"
+      );
+    reconcileLiveObject(this, jsonObj, config);
+  }
   toImmutable() {
     return super.toImmutable();
   }
@@ -8426,7 +8909,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       type: "LiveObject",
       id: nodeId,
       key,
-      payload: Array.from(this.#map.entries()).map(
+      payload: Array.from(this.#synced.entries()).map(
         ([key2, value]) => isLiveNode(value) ? value.toTreeNode(key2) : { type: "Json", id: `${nodeId}:${key2}`, key: key2, payload: value }
       )
     };
@@ -8434,20 +8917,27 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
   /** @internal */
   _toImmutable() {
     const result = {};
-    for (const [key, val] of this.#map) {
+    for (const [key, val] of this.#synced) {
       result[key] = isLiveStructure(val) ? val.toImmutable() : val;
     }
+    for (const [key, val] of this.#local) {
+      result[key] = val;
+    }
     return process.env.NODE_ENV === "production" ? result : Object.freeze(result);
   }
   clone() {
-    return new _LiveObject(
+    const cloned = new _LiveObject(
       Object.fromEntries(
-        Array.from(this.#map).map(([key, value]) => [
+        Array.from(this.#synced).map(([key, value]) => [
           key,
           isLiveStructure(value) ? value.clone() : deepClone(value)
         ])
       )
     );
+    for (const [key, value] of this.#local) {
+      cloned.#local.set(key, deepClone(value));
+    }
+    return cloned;
   }
 };
 
@@ -8747,17 +9237,6 @@ var Deque = class {
   }
 };
 
-// src/lib/Json.ts
-function isJsonScalar(data) {
-  return data === null || typeof data === "string" || typeof data === "number" || typeof data === "boolean";
-}
-function isJsonArray(data) {
-  return Array.isArray(data);
-}
-function isJsonObject(data) {
-  return !isJsonScalar(data) && !isJsonArray(data);
-}
-
 // src/lib/stopwatch.ts
 function makeStopWatch() {
   let startTime = 0;
@@ -8791,16 +9270,7 @@ var ClientMsgCode = Object.freeze({
   UPDATE_STORAGE: 201,
   // For Yjs support
   FETCH_YDOC: 300,
-  UPDATE_YDOC: 301,
-  // For Feeds
-  FETCH_FEEDS: 510,
-  FETCH_FEED_MESSAGES: 511,
-  ADD_FEED: 512,
-  UPDATE_FEED: 513,
-  DELETE_FEED: 514,
-  ADD_FEED_MESSAGE: 515,
-  UPDATE_FEED_MESSAGE: 516,
-  DELETE_FEED_MESSAGE: 517
+  UPDATE_YDOC: 301
 });
 
 // src/refs/ManagedOthers.ts
@@ -9036,15 +9506,12 @@ function defaultMessageFromContext(context) {
       return "Could not update notification settings";
     case "LARGE_MESSAGE_ERROR":
       return "Could not send large message";
-    case "FEED_REQUEST_ERROR":
-      return context.reason ?? "Feed request failed";
     default:
       return assertNever(context, "Unhandled case");
   }
 }
 
 // src/room.ts
-var FEEDS_TIMEOUT = 5e3;
 function makeIdFactory(connectionId) {
   let count = 0;
   return () => `${connectionId}:${count++}`;
@@ -9255,9 +9722,13 @@ function createRoom(options, config) {
       }
       context.activeBatch.reverseOps.pushLeft(reverse);
     } else {
-      addToUndoStack(reverse);
-      context.redoStack.length = 0;
-      dispatchOps(ops);
+      if (reverse.length > 0) {
+        addToUndoStack(reverse);
+      }
+      if (ops.length > 0) {
+        context.redoStack.length = 0;
+        dispatchOps(ops);
+      }
       notify({ storageUpdates });
     }
   }
@@ -9279,7 +9750,6 @@ function createRoom(options, config) {
     storageStatus: makeEventSource(),
     ydoc: makeEventSource(),
     comments: makeEventSource(),
-    feeds: makeEventSource(),
     roomWillDestroy: makeEventSource()
   };
   async function createTextMention(mentionId, mention) {
@@ -9367,19 +9837,20 @@ function createRoom(options, config) {
       );
     }
     const canWrite = self.get()?.canWrite ?? true;
-    const stackSizeBefore = context.undoStack.length;
-    for (const key in context.initialStorage) {
-      if (context.root.get(key) === void 0) {
-        if (canWrite) {
-          context.root.set(key, cloneLson(context.initialStorage[key]));
-        } else {
-          warn(
-            `Attempted to populate missing storage key '${key}', but current user has no write access`
-          );
+    const root = context.root;
+    withoutHistory(() => {
+      for (const key in context.initialStorage) {
+        if (root.get(key) === void 0) {
+          if (canWrite) {
+            root.set(key, cloneLson(context.initialStorage[key]));
+          } else {
+            warn(
+              `Attempted to populate missing storage key '${key}', but current user has no write access`
+            );
+          }
         }
       }
-    }
-    context.undoStack.length = stackSizeBefore;
+    });
   }
   function _addToRealUndoStack(frames) {
     if (context.undoStack.length >= 50) {
@@ -9700,9 +10171,6 @@ function createRoom(options, config) {
     notify(result.updates);
     sendMessages(messages);
   }
-  function isFeedRequestFailedMsg(msg) {
-    return msg.type === ServerMsgCode.FEED_REQUEST_FAILED;
-  }
   function handleServerMessage(event) {
     if (typeof event.data !== "string") {
       return;
@@ -9816,94 +10284,6 @@ function createRoom(options, config) {
           eventHub.comments.notify(message);
           break;
         }
-        case ServerMsgCode.FEEDS_LIST: {
-          const feedsListMsg = message;
-          const pending = pendingFeedsRequests.get(feedsListMsg.requestId);
-          if (pending) {
-            pending.resolve({
-              feeds: feedsListMsg.feeds,
-              nextCursor: feedsListMsg.nextCursor
-            });
-            pendingFeedsRequests.delete(feedsListMsg.requestId);
-          }
-          eventHub.feeds.notify(feedsListMsg);
-          break;
-        }
-        case ServerMsgCode.FEEDS_ADDED: {
-          const feedsAddedMsg = message;
-          eventHub.feeds.notify(feedsAddedMsg);
-          tryResolvePendingFeedMutationsFromFeedsEvent(feedsAddedMsg);
-          break;
-        }
-        case ServerMsgCode.FEEDS_UPDATED: {
-          const feedsUpdatedMsg = message;
-          eventHub.feeds.notify(feedsUpdatedMsg);
-          tryResolvePendingFeedMutationsFromFeedsEvent(feedsUpdatedMsg);
-          break;
-        }
-        case ServerMsgCode.FEED_DELETED: {
-          eventHub.feeds.notify(message);
-          tryResolvePendingFeedMutationsFromFeedsEvent(message);
-          break;
-        }
-        case ServerMsgCode.FEED_MESSAGES_LIST: {
-          const feedMsgsListMsg = message;
-          const pending = pendingFeedMessagesRequests.get(
-            feedMsgsListMsg.requestId
-          );
-          if (pending) {
-            pending.resolve({
-              messages: feedMsgsListMsg.messages,
-              nextCursor: feedMsgsListMsg.nextCursor
-            });
-            pendingFeedMessagesRequests.delete(feedMsgsListMsg.requestId);
-          }
-          eventHub.feeds.notify(feedMsgsListMsg);
-          break;
-        }
-        case ServerMsgCode.FEED_MESSAGES_ADDED: {
-          const feedMsgsAddedMsg = message;
-          eventHub.feeds.notify(feedMsgsAddedMsg);
-          tryResolvePendingFeedMutationsFromFeedsEvent(feedMsgsAddedMsg);
-          break;
-        }
-        case ServerMsgCode.FEED_MESSAGES_UPDATED: {
-          const feedMsgsUpdatedMsg = message;
-          eventHub.feeds.notify(feedMsgsUpdatedMsg);
-          tryResolvePendingFeedMutationsFromFeedsEvent(feedMsgsUpdatedMsg);
-          break;
-        }
-        case ServerMsgCode.FEED_MESSAGES_DELETED: {
-          eventHub.feeds.notify(message);
-          tryResolvePendingFeedMutationsFromFeedsEvent(message);
-          break;
-        }
-        case ServerMsgCode.FEED_REQUEST_FAILED: {
-          if (!isFeedRequestFailedMsg(message)) {
-            break;
-          }
-          const { requestId, code, reason } = message;
-          const err = new LiveblocksError(reason ?? "Feed request failed", {
-            type: "FEED_REQUEST_ERROR",
-            roomId,
-            requestId,
-            code,
-            reason
-          });
-          if (pendingFeedMutations.has(requestId)) {
-            settleFeedMutation(requestId, "error", err);
-          } else if (pendingFeedsRequests.has(requestId)) {
-            const pending = pendingFeedsRequests.get(requestId);
-            pendingFeedsRequests.delete(requestId);
-            pending?.reject(err);
-          } else if (pendingFeedMessagesRequests.has(requestId)) {
-            const pending = pendingFeedMessagesRequests.get(requestId);
-            pendingFeedMessagesRequests.delete(requestId);
-            pending?.reject(err);
-          }
-          eventHub.feeds.notify(message);
-          break;
-        }
         case ServerMsgCode.STORAGE_STATE_V7:
         // No longer used in V8
         default:
@@ -10007,141 +10387,6 @@ function createRoom(options, config) {
   }
   let _getStorage$ = null;
   let _resolveStoragePromise = null;
-  const pendingFeedsRequests = /* @__PURE__ */ new Map();
-  const pendingFeedMessagesRequests = /* @__PURE__ */ new Map();
-  const pendingFeedMutations = /* @__PURE__ */ new Map();
-  const pendingAddMessageFifoByFeed = /* @__PURE__ */ new Map();
-  function settleFeedMutation(requestId, outcome, error3) {
-    const pending = pendingFeedMutations.get(requestId);
-    if (pending === void 0) {
-      return;
-    }
-    clearTimeout(pending.timeoutId);
-    pendingFeedMutations.delete(requestId);
-    if (pending.kind === "add-message" && !pending.expectedClientMessageId) {
-      const q = pendingAddMessageFifoByFeed.get(pending.feedId);
-      if (q !== void 0) {
-        const idx = q.indexOf(requestId);
-        if (idx >= 0) {
-          q.splice(idx, 1);
-        }
-        if (q.length === 0) {
-          pendingAddMessageFifoByFeed.delete(pending.feedId);
-        }
-      }
-    }
-    if (outcome === "ok") {
-      pending.resolve();
-    } else {
-      pending.reject(error3 ?? new Error("Feed mutation failed"));
-    }
-  }
-  function registerFeedMutation(requestId, kind, feedId, options2) {
-    const { promise, resolve, reject } = Promise_withResolvers();
-    const timeoutId = setTimeout(() => {
-      if (pendingFeedMutations.has(requestId)) {
-        settleFeedMutation(
-          requestId,
-          "error",
-          new Error("Feed mutation timeout")
-        );
-      }
-    }, FEEDS_TIMEOUT);
-    pendingFeedMutations.set(requestId, {
-      resolve,
-      reject,
-      timeoutId,
-      kind,
-      feedId,
-      messageId: options2?.messageId,
-      expectedClientMessageId: options2?.expectedClientMessageId
-    });
-    if (kind === "add-message" && options2?.expectedClientMessageId === void 0) {
-      const q = pendingAddMessageFifoByFeed.get(feedId) ?? [];
-      q.push(requestId);
-      pendingAddMessageFifoByFeed.set(feedId, q);
-    }
-    return promise;
-  }
-  function tryResolvePendingFeedMutationsFromFeedsEvent(message) {
-    switch (message.type) {
-      case ServerMsgCode.FEEDS_ADDED: {
-        for (const feed of message.feeds) {
-          for (const [requestId, pending] of [...pendingFeedMutations]) {
-            if (pending.kind === "add-feed" && pending.feedId === feed.feedId) {
-              settleFeedMutation(requestId, "ok");
-              break;
-            }
-          }
-        }
-        break;
-      }
-      case ServerMsgCode.FEEDS_UPDATED: {
-        for (const feed of message.feeds) {
-          for (const [requestId, pending] of [...pendingFeedMutations]) {
-            if (pending.kind === "update-feed" && pending.feedId === feed.feedId) {
-              settleFeedMutation(requestId, "ok");
-            }
-          }
-        }
-        break;
-      }
-      case ServerMsgCode.FEED_DELETED: {
-        for (const [requestId, pending] of [...pendingFeedMutations]) {
-          if (pending.kind === "delete-feed" && pending.feedId === message.feedId) {
-            settleFeedMutation(requestId, "ok");
-            break;
-          }
-        }
-        break;
-      }
-      case ServerMsgCode.FEED_MESSAGES_ADDED: {
-        for (const m of message.messages) {
-          let matched = false;
-          for (const [requestId, pending] of [...pendingFeedMutations]) {
-            if (pending.kind === "add-message" && pending.feedId === message.feedId && pending.expectedClientMessageId === m.id) {
-              settleFeedMutation(requestId, "ok");
-              matched = true;
-              break;
-            }
-          }
-          if (!matched) {
-            const q = pendingAddMessageFifoByFeed.get(message.feedId);
-            const headId = q?.[0];
-            if (headId !== void 0) {
-              const pending = pendingFeedMutations.get(headId);
-              if (pending?.kind === "add-message" && pending.expectedClientMessageId === void 0) {
-                settleFeedMutation(headId, "ok");
-              }
-            }
-          }
-        }
-        break;
-      }
-      case ServerMsgCode.FEED_MESSAGES_UPDATED: {
-        for (const m of message.messages) {
-          for (const [requestId, pending] of [...pendingFeedMutations]) {
-            if (pending.kind === "update-message" && pending.feedId === message.feedId && pending.messageId === m.id) {
-              settleFeedMutation(requestId, "ok");
-            }
-          }
-        }
-        break;
-      }
-      case ServerMsgCode.FEED_MESSAGES_DELETED: {
-        for (const mid of message.messageIds) {
-          for (const [requestId, pending] of [...pendingFeedMutations]) {
-            if (pending.kind === "delete-message" && pending.feedId === message.feedId && pending.messageId === mid) {
-              settleFeedMutation(requestId, "ok");
-            }
-          }
-        }
-        break;
-      }
-      default:
-        break;
-    }
-  }
   function processInitialStorage(nodes) {
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(nodes);
@@ -10213,138 +10458,6 @@ function createRoom(options, config) {
     }
     flushNowOrSoon();
   }
-  async function fetchFeeds(options2) {
-    const requestId = nanoid();
-    const { promise, resolve, reject } = Promise_withResolvers();
-    pendingFeedsRequests.set(requestId, { resolve, reject });
-    const message = {
-      type: ClientMsgCode.FETCH_FEEDS,
-      requestId,
-      cursor: options2?.cursor,
-      since: options2?.since,
-      limit: options2?.limit,
-      metadata: options2?.metadata
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    setTimeout(() => {
-      if (pendingFeedsRequests.has(requestId)) {
-        pendingFeedsRequests.delete(requestId);
-        reject(new Error("Feeds fetch timeout"));
-      }
-    }, FEEDS_TIMEOUT);
-    return promise;
-  }
-  async function fetchFeedMessages(feedId, options2) {
-    const requestId = nanoid();
-    const { promise, resolve, reject } = Promise_withResolvers();
-    pendingFeedMessagesRequests.set(requestId, { resolve, reject });
-    const message = {
-      type: ClientMsgCode.FETCH_FEED_MESSAGES,
-      requestId,
-      feedId,
-      cursor: options2?.cursor,
-      since: options2?.since,
-      limit: options2?.limit
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    setTimeout(() => {
-      if (pendingFeedMessagesRequests.has(requestId)) {
-        pendingFeedMessagesRequests.delete(requestId);
-        reject(new Error("Feed messages fetch timeout"));
-      }
-    }, FEEDS_TIMEOUT);
-    return promise;
-  }
-  function addFeed(feedId, options2) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "add-feed", feedId);
-    const message = {
-      type: ClientMsgCode.ADD_FEED,
-      requestId,
-      feedId,
-      metadata: options2?.metadata,
-      createdAt: options2?.createdAt
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
-  function updateFeed(feedId, metadata) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "update-feed", feedId);
-    const message = {
-      type: ClientMsgCode.UPDATE_FEED,
-      requestId,
-      feedId,
-      metadata
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
-  function deleteFeed(feedId) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "delete-feed", feedId);
-    const message = {
-      type: ClientMsgCode.DELETE_FEED,
-      requestId,
-      feedId
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
-  function addFeedMessage(feedId, data, options2) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "add-message", feedId, {
-      expectedClientMessageId: options2?.id
-    });
-    const message = {
-      type: ClientMsgCode.ADD_FEED_MESSAGE,
-      requestId,
-      feedId,
-      data,
-      id: options2?.id,
-      createdAt: options2?.createdAt
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
-  function updateFeedMessage(feedId, messageId, data, options2) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "update-message", feedId, {
-      messageId
-    });
-    const message = {
-      type: ClientMsgCode.UPDATE_FEED_MESSAGE,
-      requestId,
-      feedId,
-      messageId,
-      data,
-      updatedAt: options2?.updatedAt
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
-  function deleteFeedMessage(feedId, messageId) {
-    const requestId = nanoid();
-    const promise = registerFeedMutation(requestId, "delete-message", feedId, {
-      messageId
-    });
-    const message = {
-      type: ClientMsgCode.DELETE_FEED_MESSAGE,
-      requestId,
-      feedId,
-      messageId
-    };
-    context.buffer.messages.push(message);
-    flushNowOrSoon();
-    return promise;
-  }
   function undo() {
     if (context.activeBatch) {
       throw new Error("undo is not allowed during a batch");
@@ -10430,6 +10543,16 @@ function createRoom(options, config) {
       _addToRealUndoStack(Array.from(frames));
     }
   }
+  function withoutHistory(fn) {
+    const undoBefore = context.undoStack.length;
+    const redoBefore = context.redoStack.length;
+    try {
+      return fn();
+    } finally {
+      context.undoStack.length = undoBefore;
+      context.redoStack.length = redoBefore;
+    }
+  }
   const syncSourceForStorage = config.createSyncSource();
   function getStorageStatus() {
     if (context.root === void 0) {
@@ -10487,7 +10610,6 @@ function createRoom(options, config) {
     storageStatus: eventHub.storageStatus.observable,
     ydoc: eventHub.ydoc.observable,
     comments: eventHub.comments.observable,
-    feeds: eventHub.feeds.observable,
     roomWillDestroy: eventHub.roomWillDestroy.observable
   };
   async function getThreadsSince(options2) {
@@ -10697,19 +10819,13 @@ function createRoom(options, config) {
       id: roomId,
       subscribe: makeClassicSubscribeFn(
         roomId,
-        eventHub,
+        events,
         config.errorEventSource
       ),
       connect: () => managedSocket.connect(),
       reconnect: () => managedSocket.reconnect(),
       disconnect: () => managedSocket.disconnect(),
       destroy: () => {
-        pendingFeedsRequests.forEach(
-          (request) => request.reject(new Error("Room destroyed"))
-        );
-        pendingFeedMessagesRequests.forEach(
-          (request) => request.reject(new Error("Room destroyed"))
-        );
         const { roomWillDestroy, ...eventsExceptDestroy } = eventHub;
         for (const source of Object.values(eventsExceptDestroy)) {
           source.dispose();
@@ -10735,17 +10851,12 @@ function createRoom(options, config) {
         canRedo,
         clear,
         pause: pauseHistory,
-        resume: resumeHistory
+        resume: resumeHistory,
+        [kInternal]: {
+          withoutHistory
+        }
       },
       fetchYDoc,
-      fetchFeeds,
-      fetchFeedMessages,
-      addFeed,
-      updateFeed,
-      deleteFeed,
-      addFeedMessage,
-      updateFeedMessage,
-      deleteFeedMessage,
       getStorage,
       getStorageSnapshot,
       getStorageStatus,
@@ -11653,309 +11764,6 @@ function toPlainLson(lson) {
   }
 }
 
-// src/immutable.ts
-function lsonObjectToJson(obj) {
-  const result = {};
-  for (const key in obj) {
-    const val = obj[key];
-    if (val !== void 0) {
-      result[key] = lsonToJson(val);
-    }
-  }
-  return result;
-}
-function liveObjectToJson(liveObject) {
-  return lsonObjectToJson(liveObject.toObject());
-}
-function liveMapToJson(map) {
-  const result = {};
-  for (const [key, value] of map.entries()) {
-    result[key] = lsonToJson(value);
-  }
-  return result;
-}
-function lsonListToJson(value) {
-  return value.map(lsonToJson);
-}
-function liveListToJson(value) {
-  return lsonListToJson(value.toArray());
-}
-function lsonToJson(value) {
-  if (value instanceof LiveObject) {
-    return liveObjectToJson(value);
-  } else if (value instanceof LiveList) {
-    return liveListToJson(value);
-  } else if (value instanceof LiveMap) {
-    return liveMapToJson(value);
-  } else if (value instanceof LiveRegister) {
-    return value.data;
-  }
-  if (Array.isArray(value)) {
-    return lsonListToJson(value);
-  } else if (isPlainObject(value)) {
-    return lsonObjectToJson(value);
-  }
-  return value;
-}
-function deepLiveify(value) {
-  if (Array.isArray(value)) {
-    return new LiveList(value.map(deepLiveify));
-  } else if (isPlainObject(value)) {
-    const init = {};
-    for (const key in value) {
-      const val = value[key];
-      if (val === void 0) {
-        continue;
-      }
-      init[key] = deepLiveify(val);
-    }
-    return new LiveObject(init);
-  } else {
-    return value;
-  }
-}
-function patchLiveList(liveList, prev, next) {
-  let i = 0;
-  let prevEnd = prev.length - 1;
-  let nextEnd = next.length - 1;
-  let prevNode = prev[0];
-  let nextNode = next[0];
-  outer: {
-    while (prevNode === nextNode) {
-      ++i;
-      if (i > prevEnd || i > nextEnd) {
-        break outer;
-      }
-      prevNode = prev[i];
-      nextNode = next[i];
-    }
-    prevNode = prev[prevEnd];
-    nextNode = next[nextEnd];
-    while (prevNode === nextNode) {
-      prevEnd--;
-      nextEnd--;
-      if (i > prevEnd || i > nextEnd) {
-        break outer;
-      }
-      prevNode = prev[prevEnd];
-      nextNode = next[nextEnd];
-    }
-  }
-  if (i > prevEnd) {
-    if (i <= nextEnd) {
-      while (i <= nextEnd) {
-        liveList.insert(deepLiveify(next[i]), i);
-        i++;
-      }
-    }
-  } else if (i > nextEnd) {
-    let localI = i;
-    while (localI <= prevEnd) {
-      liveList.delete(i);
-      localI++;
-    }
-  } else {
-    while (i <= prevEnd && i <= nextEnd) {
-      prevNode = prev[i];
-      nextNode = next[i];
-      const liveListNode = liveList.get(i);
-      if (isLiveObject(liveListNode) && isPlainObject(prevNode) && isPlainObject(nextNode)) {
-        patchLiveObject(liveListNode, prevNode, nextNode);
-      } else {
-        liveList.set(i, deepLiveify(nextNode));
-      }
-      i++;
-    }
-    while (i <= nextEnd) {
-      liveList.insert(deepLiveify(next[i]), i);
-      i++;
-    }
-    let localI = i;
-    while (localI <= prevEnd) {
-      liveList.delete(i);
-      localI++;
-    }
-  }
-}
-function patchLiveObjectKey(liveObject, key, prev, next) {
-  if (process.env.NODE_ENV !== "production") {
-    const nonSerializableValue = findNonSerializableValue(next);
-    if (nonSerializableValue) {
-      error2(
-        `New state path: '${nonSerializableValue.path}' value: '${String(
-          nonSerializableValue.value
-        )}' is not serializable.
-Only serializable value can be synced with Liveblocks.`
-      );
-      return;
-    }
-  }
-  const value = liveObject.get(key);
-  if (next === void 0) {
-    liveObject.delete(key);
-  } else if (value === void 0) {
-    liveObject.set(key, deepLiveify(next));
-  } else if (prev === next) {
-    return;
-  } else if (isLiveList(value) && Array.isArray(prev) && Array.isArray(next)) {
-    patchLiveList(value, prev, next);
-  } else if (isLiveObject(value) && isPlainObject(prev) && isPlainObject(next)) {
-    patchLiveObject(value, prev, next);
-  } else {
-    liveObject.set(key, deepLiveify(next));
-  }
-}
-function patchLiveObject(root, prev, next) {
-  const updates = {};
-  for (const key in next) {
-    patchLiveObjectKey(root, key, prev[key], next[key]);
-  }
-  for (const key in prev) {
-    if (next[key] === void 0) {
-      root.delete(key);
-    }
-  }
-  if (Object.keys(updates).length > 0) {
-    root.update(updates);
-  }
-}
-function getParentsPath(node) {
-  const path = [];
-  while (node.parent.type === "HasParent") {
-    if (isLiveList(node.parent.node)) {
-      path.push(node.parent.node._indexOfPosition(node.parent.key));
-    } else {
-      path.push(node.parent.key);
-    }
-    node = node.parent.node;
-  }
-  return path;
-}
-function legacy_patchImmutableObject(state, updates) {
-  return updates.reduce(
-    (state2, update) => legacy_patchImmutableObjectWithUpdate(state2, update),
-    state
-  );
-}
-function legacy_patchImmutableObjectWithUpdate(state, update) {
-  const path = getParentsPath(update.node);
-  return legacy_patchImmutableNode(state, path, update);
-}
-function legacy_patchImmutableNode(state, path, update) {
-  const pathItem = path.pop();
-  if (pathItem === void 0) {
-    switch (update.type) {
-      case "LiveObject": {
-        if (!isJsonObject(state)) {
-          throw new Error(
-            "Internal: received update on LiveObject but state was not an object"
-          );
-        }
-        const newState = Object.assign({}, state);
-        for (const key in update.updates) {
-          if (update.updates[key]?.type === "update") {
-            const val = update.node.get(key);
-            if (val !== void 0) {
-              newState[key] = lsonToJson(val);
-            }
-          } else if (update.updates[key]?.type === "delete") {
-            delete newState[key];
-          }
-        }
-        return newState;
-      }
-      case "LiveList": {
-        if (!Array.isArray(state)) {
-          throw new Error(
-            "Internal: received update on LiveList but state was not an array"
-          );
-        }
-        let newState = state.map((x) => x);
-        for (const listUpdate of update.updates) {
-          if (listUpdate.type === "set") {
-            newState = newState.map(
-              (item, index) => index === listUpdate.index ? lsonToJson(listUpdate.item) : item
-            );
-          } else if (listUpdate.type === "insert") {
-            if (listUpdate.index === newState.length) {
-              newState.push(lsonToJson(listUpdate.item));
-            } else {
-              newState = [
-                ...newState.slice(0, listUpdate.index),
-                lsonToJson(listUpdate.item),
-                ...newState.slice(listUpdate.index)
-              ];
-            }
-          } else if (listUpdate.type === "delete") {
-            newState.splice(listUpdate.index, 1);
-          } else if (listUpdate.type === "move") {
-            if (listUpdate.previousIndex > listUpdate.index) {
-              newState = [
-                ...newState.slice(0, listUpdate.index),
-                lsonToJson(listUpdate.item),
-                ...newState.slice(listUpdate.index, listUpdate.previousIndex),
-                ...newState.slice(listUpdate.previousIndex + 1)
-              ];
-            } else {
-              newState = [
-                ...newState.slice(0, listUpdate.previousIndex),
-                ...newState.slice(
-                  listUpdate.previousIndex + 1,
-                  listUpdate.index + 1
-                ),
-                lsonToJson(listUpdate.item),
-                ...newState.slice(listUpdate.index + 1)
-              ];
-            }
-          }
-        }
-        return newState;
-      }
-      case "LiveMap": {
-        if (!isJsonObject(state)) {
-          throw new Error(
-            "Internal: received update on LiveMap but state was not an object"
-          );
-        }
-        const newState = Object.assign({}, state);
-        for (const key in update.updates) {
-          if (update.updates[key]?.type === "update") {
-            const value = update.node.get(key);
-            if (value !== void 0) {
-              newState[key] = lsonToJson(value);
-            }
-          } else if (update.updates[key]?.type === "delete") {
-            delete newState[key];
-          }
-        }
-        return newState;
-      }
-    }
-  }
-  if (Array.isArray(state)) {
-    const newArray = [...state];
-    newArray[pathItem] = legacy_patchImmutableNode(
-      state[pathItem],
-      path,
-      update
-    );
-    return newArray;
-  } else if (isJsonObject(state)) {
-    const node = state[pathItem];
-    if (node === void 0) {
-      return state;
-    } else {
-      const stateAsObj = state;
-      return {
-        ...stateAsObj,
-        [pathItem]: legacy_patchImmutableNode(node, path, update)
-      };
-    }
-  } else {
-    return state;
-  }
-}
-
 // src/lib/abortController.ts
 function makeAbortController(externalSignal) {
   const ctl = new AbortController();
@@ -12127,7 +11935,6 @@ export {
   DefaultMap,
   Deque,
   DerivedSignal,
-  FeedRequestErrorCode,
   HttpError,
   LiveList,
   LiveMap,
@@ -12169,6 +11976,7 @@ export {
   createManagedPool,
   createNotificationSettings,
   createThreadId,
+  deepLiveifyObject,
   defineAiTool,
   deprecate,
   deprecateIf,
@@ -12202,6 +12010,7 @@ export {
   kInternal,
   keys,
   legacy_patchImmutableObject,
+  legacy_patchLiveObjectKey,
   lsonToJson,
   makeAbortController,
   makeEventSource,
@@ -12213,7 +12022,6 @@ export {
   nn,
   nodeStreamToCompactNodes,
   objectToQuery,
-  patchLiveObjectKey,
   patchNotificationSettings,
   raise,
   resolveMentionsInCommentBody,