@liveblocks/react 3.15.0-components1 → 3.15.0-feeds2

package/dist/{chunk-B5F24HAT.js → chunk-GWYQHSXI.js}

@@ -8,8 +8,8 @@ function useClientOrNull() {
 function useClient() {
   return useClientOrNull() ?? raise("LiveblocksProvider is missing from the React tree.");
 }
-var GlobalRoomContext = createContext(null);
-function useRoomOrNull(RoomContext = GlobalRoomContext) {
+var RoomContext = createContext(null);
+function useRoomOrNull() {
   return useContext(RoomContext);
 }
 function useIsInsideRoom() {
@@ -512,6 +512,12 @@ function makeAiChatsQueryKey(query) {
 function makeInboxNotificationsQueryKey(query) {
   return stableStringify(query ?? {});
 }
+function makeFeedsQueryKey(roomId, options) {
+  return stableStringify([roomId, options ?? {}]);
+}
+function makeFeedMessagesQueryKey(roomId, feedId, options) {
+  return stableStringify([roomId, feedId, options ?? {}]);
+}
 function usify(promise) {
   if ("status" in promise) {
     return promise;
@@ -559,6 +565,7 @@ var PaginatedResource = class {
     this.#patch({ isFetchingMore: true });
     try {
       const nextCursor = await this.#fetchPage(state.data.cursor);
+      this.#pendingFetchMore = null;
       this.#patch({
         cursor: nextCursor,
         hasFetchedAll: nextCursor === null,
@@ -566,6 +573,7 @@ var PaginatedResource = class {
         isFetchingMore: false
       });
     } catch (err) {
+      this.#pendingFetchMore = null;
       this.#patch({
         isFetchingMore: false,
         fetchMoreError: err
@@ -576,9 +584,7 @@ var PaginatedResource = class {
     const state = this.#signal.get();
     if (!state.data?.cursor) return noop;
     if (!this.#pendingFetchMore) {
-      this.#pendingFetchMore = this.#fetchMore().finally(() => {
-        this.#pendingFetchMore = null;
-      });
+      this.#pendingFetchMore = this.#fetchMore();
     }
     return this.#pendingFetchMore;
   }
@@ -979,6 +985,16 @@ var UmbrellaStore = class {
   #roomVersionsLastRequestedAtByRoom = /* @__PURE__ */ new Map();
   // Notification Settings
   #notificationSettings;
+  // Feeds
+  #feedsByRoomId = /* @__PURE__ */ new Map();
+  #feedMessagesByFeedId = /* @__PURE__ */ new Map();
+  // Signals for feeds and feed messages to trigger reactivity
+  #feedsSignal = new MutableSignal3({
+    version: 0
+  });
+  #feedMessagesSignal = new MutableSignal3({
+    version: 0
+  });
   constructor(client) {
     this.#client = client[kInternal2].as();
     this.optimisticUpdates = createStore_forOptimistic(this.#client);
@@ -1350,6 +1366,91 @@ var UmbrellaStore = class {
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
+    const loadingFeeds = new DefaultMap(
+      (queryKey) => {
+        const [roomId, options] = JSON.parse(queryKey);
+        const resource = new PaginatedResource(async (cursor) => {
+          const room = this.#client.getRoom(roomId);
+          if (room === null) {
+            throw new Error(
+              `Room '${roomId}' is not available on client. Make sure you're calling useFeeds inside a RoomProvider.`
+            );
+          }
+          const result = await room.fetchFeeds({
+            cursor,
+            since: options?.since,
+            metadata: options?.metadata
+          });
+          this.upsertFeeds(roomId, result.feeds);
+          return result.nextCursor ?? null;
+        });
+        const signal = DerivedSignal.from(
+          resource.signal,
+          this.#feedsSignal,
+          (resourceResult, _signalState) => {
+            if (resourceResult.isLoading || resourceResult.error) {
+              return resourceResult;
+            }
+            const feedsMap = this.#feedsByRoomId.get(roomId);
+            const feeds = feedsMap ? Array.from(feedsMap.values()) : [];
+            const page = resourceResult.data;
+            return {
+              isLoading: false,
+              feeds,
+              hasFetchedAll: page.hasFetchedAll,
+              isFetchingMore: page.isFetchingMore,
+              fetchMoreError: page.fetchMoreError,
+              fetchMore: page.fetchMore
+            };
+          },
+          shallow2
+        );
+        return { signal, waitUntilLoaded: resource.waitUntilLoaded };
+      }
+    );
+    const loadingFeedMessages = new DefaultMap(
+      (queryKey) => {
+        const [roomId, feedId, options] = JSON.parse(queryKey);
+        const resource = new PaginatedResource(async (cursor) => {
+          const room = this.#client.getRoom(roomId);
+          if (room === null) {
+            throw new Error(
+              `Room '${roomId}' is not available on client. Make sure you're calling useFeedMessages inside a RoomProvider.`
+            );
+          }
+          const result = await room.fetchFeedMessages(feedId, {
+            cursor,
+            limit: options?.limit
+          });
+          this.upsertFeedMessages(roomId, feedId, result.messages);
+          return result.nextCursor ?? null;
+        });
+        const signal = DerivedSignal.from(
+          resource.signal,
+          this.#feedMessagesSignal,
+          (resourceResult, _signalState) => {
+            if (resourceResult.isLoading || resourceResult.error) {
+              return resourceResult;
+            }
+            const messagesMap = this.#feedMessagesByFeedId.get(feedId);
+            const messages = messagesMap ? Array.from(messagesMap.values()).sort(
+              (a, b) => a.timestamp - b.timestamp
+            ) : [];
+            const page = resourceResult.data;
+            return {
+              isLoading: false,
+              messages,
+              hasFetchedAll: page.hasFetchedAll,
+              isFetchingMore: page.isFetchingMore,
+              fetchMoreError: page.fetchMoreError,
+              fetchMore: page.fetchMore
+            };
+          },
+          shallow2
+        );
+        return { signal, waitUntilLoaded: resource.waitUntilLoaded };
+      }
+    );
     this.outputs = {
       threadifications,
       threads,
@@ -1365,7 +1466,9 @@ var UmbrellaStore = class {
       aiChats,
       messagesByChatId,
       aiChatById,
-      urlMetadataByUrl
+      urlMetadataByUrl,
+      loadingFeeds,
+      loadingFeedMessages
     };
     autobind(this);
   }
@@ -1586,6 +1689,64 @@ var UmbrellaStore = class {
       result.subscriptions.deleted
     );
   }
+  /**
+   * Upserts feeds in the cache (for list/added/updated operations).
+   */
+  upsertFeeds(roomId, feeds) {
+    let feedsMap = this.#feedsByRoomId.get(roomId);
+    if (!feedsMap) {
+      feedsMap = /* @__PURE__ */ new Map();
+      this.#feedsByRoomId.set(roomId, feedsMap);
+    }
+    for (const feed of feeds) {
+      feedsMap.set(feed.feedId, feed);
+    }
+    this.#feedsSignal.mutate((state) => {
+      state.version++;
+    });
+  }
+  /**
+   * Removes feeds from the cache (for deleted operations).
+   */
+  deleteFeeds(roomId, feeds) {
+    const feedsMap = this.#feedsByRoomId.get(roomId);
+    if (!feedsMap) return;
+    for (const feed of feeds) {
+      feedsMap.delete(feed.feedId);
+    }
+    this.#feedsSignal.mutate((state) => {
+      state.version++;
+    });
+  }
+  /**
+   * Upserts feed messages in the cache (for list/added/updated operations).
+   */
+  upsertFeedMessages(_roomId, feedId, messages) {
+    let messagesMap = this.#feedMessagesByFeedId.get(feedId);
+    if (!messagesMap) {
+      messagesMap = /* @__PURE__ */ new Map();
+      this.#feedMessagesByFeedId.set(feedId, messagesMap);
+    }
+    for (const message of messages) {
+      messagesMap.set(message.id, message);
+    }
+    this.#feedMessagesSignal.mutate((state) => {
+      state.version++;
+    });
+  }
+  /**
+   * Removes feed messages from the cache (for deleted operations).
+   */
+  deleteFeedMessages(_roomId, feedId, messages) {
+    const messagesMap = this.#feedMessagesByFeedId.get(feedId);
+    if (!messagesMap) return;
+    for (const message of messages) {
+      messagesMap.delete(message.id);
+    }
+    this.#feedMessagesSignal.mutate((state) => {
+      state.version++;
+    });
+  }
   async fetchUnreadNotificationsCount(queryKey, signal) {
     const query = JSON.parse(queryKey);
     const result = await this.#client.getUnreadInboxNotificationsCount({
@@ -3358,7 +3519,6 @@ import {
   stableStringify as stableStringify2
 } from "@liveblocks/core";
 import {
-  createContext as createContext2,
   useCallback as useCallback3,
   useEffect as useEffect6,
   useMemo as useMemo4,
@@ -3449,6 +3609,15 @@ function getCurrentUserId(client) {
   return userId;
 }
 var _extras2 = /* @__PURE__ */ new WeakMap();
+var _bundles2 = /* @__PURE__ */ new WeakMap();
+function getOrCreateRoomContextBundle(client) {
+  let bundle = _bundles2.get(client);
+  if (!bundle) {
+    bundle = makeRoomContextBundle(client);
+    _bundles2.set(client, bundle);
+  }
+  return bundle;
+}
 function getRoomExtrasForClient(client) {
   let extras = _extras2.get(client);
   if (!extras) {
@@ -3536,6 +3705,130 @@ function makeRoomExtrasForClient(client) {
     )
   };
 }
+function makeRoomContextBundle(client) {
+  function RoomProvider_withImplicitLiveblocksProvider(props) {
+    return /* @__PURE__ */ jsx2(LiveblocksProviderWithClient, { client, allowNesting: true, children: /* @__PURE__ */ jsx2(RoomProvider, { ...props }) });
+  }
+  const shared = createSharedContext(client);
+  const bundle = {
+    RoomContext,
+    RoomProvider: RoomProvider_withImplicitLiveblocksProvider,
+    useRoom,
+    useStatus,
+    useBroadcastEvent,
+    useOthersListener,
+    useLostConnectionListener,
+    useEventListener,
+    useHistory,
+    useUndo,
+    useRedo,
+    useCanRedo,
+    useCanUndo,
+    useStorageRoot,
+    useStorage,
+    useSelf,
+    useMyPresence,
+    useUpdateMyPresence,
+    useOthers,
+    useOthersMapped,
+    useOthersConnectionIds,
+    useOther,
+    // prettier-ignore
+    useMutation,
+    useThreads,
+    useFeeds,
+    useFeedMessages,
+    useCreateFeed,
+    useDeleteFeed,
+    useUpdateFeedMetadata,
+    useCreateFeedMessage,
+    useDeleteFeedMessage,
+    useUpdateFeedMessage,
+    useSearchComments,
+    // prettier-ignore
+    useCreateThread,
+    useDeleteThread,
+    useEditThreadMetadata,
+    useMarkThreadAsResolved,
+    useMarkThreadAsUnresolved,
+    useSubscribeToThread,
+    useUnsubscribeFromThread,
+    useCreateComment,
+    useEditComment,
+    useEditCommentMetadata,
+    useDeleteComment,
+    useAddReaction,
+    useRemoveReaction,
+    useMarkThreadAsRead,
+    useThreadSubscription,
+    useAttachmentUrl,
+    useHistoryVersions,
+    useHistoryVersionData,
+    useRoomSubscriptionSettings,
+    useUpdateRoomSubscriptionSettings,
+    ...shared.classic,
+    suspense: {
+      RoomContext,
+      RoomProvider: RoomProvider_withImplicitLiveblocksProvider,
+      useRoom,
+      useStatus,
+      useBroadcastEvent,
+      useOthersListener,
+      useLostConnectionListener,
+      useEventListener,
+      useHistory,
+      useUndo,
+      useRedo,
+      useCanRedo,
+      useCanUndo,
+      useStorageRoot,
+      useStorage: useStorageSuspense,
+      useSelf: useSelfSuspense,
+      useMyPresence,
+      useUpdateMyPresence,
+      useOthers: useOthersSuspense,
+      useOthersMapped: useOthersMappedSuspense,
+      useOthersConnectionIds: useOthersConnectionIdsSuspense,
+      useOther: useOtherSuspense,
+      // prettier-ignore
+      useMutation,
+      useThreads: useThreadsSuspense,
+      useFeeds: useFeedsSuspense,
+      useFeedMessages: useFeedMessagesSuspense,
+      useCreateFeed,
+      useDeleteFeed,
+      useUpdateFeedMetadata,
+      useCreateFeedMessage,
+      useDeleteFeedMessage,
+      useUpdateFeedMessage,
+      // prettier-ignore
+      useCreateThread,
+      useDeleteThread,
+      useEditThreadMetadata,
+      useMarkThreadAsResolved,
+      useMarkThreadAsUnresolved,
+      useSubscribeToThread,
+      useUnsubscribeFromThread,
+      useCreateComment,
+      useEditComment,
+      useEditCommentMetadata,
+      useDeleteComment,
+      useAddReaction,
+      useRemoveReaction,
+      useMarkThreadAsRead,
+      useThreadSubscription,
+      useAttachmentUrl: useAttachmentUrlSuspense,
+      // TODO: useHistoryVersionData: useHistoryVersionDataSuspense,
+      useHistoryVersions: useHistoryVersionsSuspense,
+      useRoomSubscriptionSettings: useRoomSubscriptionSettingsSuspense,
+      useUpdateRoomSubscriptionSettings,
+      ...shared.suspense
+    }
+  };
+  return Object.defineProperty(bundle, kInternal4, {
+    enumerable: false
+  });
+}
 function RoomProvider(props) {
   const client = useClient();
   const [cache] = useState3(
@@ -3566,7 +3859,7 @@ function RoomProvider(props) {
 }
 function RoomProviderInner(props) {
   const client = useClient();
-  const { id: roomId, stableEnterRoom, BoundRoomContext } = props;
+  const { id: roomId, stableEnterRoom } = props;
   if (process.env.NODE_ENV !== "production") {
     if (!roomId) {
       throw new Error(
@@ -3647,6 +3940,33 @@ function RoomProviderInner(props) {
       (message) => void handleCommentEvent(message)
     );
   }, [client, room]);
+  useEffect6(() => {
+    const { store } = getRoomExtrasForClient(client);
+    function handleFeedEvent(message) {
+      switch (message.type) {
+        case ServerMsgCode.FEEDS_ADDED:
+        case ServerMsgCode.FEEDS_UPDATED:
+          store.upsertFeeds(room.id, message.feeds);
+          break;
+        case ServerMsgCode.FEEDS_DELETED:
+          store.deleteFeeds(room.id, message.feeds);
+          break;
+        case ServerMsgCode.FEED_MESSAGES_ADDED:
+        case ServerMsgCode.FEED_MESSAGES_UPDATED:
+          store.upsertFeedMessages(room.id, message.feedId, message.messages);
+          break;
+        case ServerMsgCode.FEED_MESSAGES_DELETED:
+          store.deleteFeedMessages(room.id, message.feedId, message.messages);
+          break;
+        // FEEDS_LIST and FEED_MESSAGES_LIST are handled by fetch promise resolution in room.ts
+        default:
+          break;
+      }
+    }
+    return room.events.feeds.subscribe(
+      (message) => void handleFeedEvent(message)
+    );
+  }, [client, room]);
   useEffect6(() => {
     const pair = stableEnterRoom(roomId, frozenProps);
     setRoomLeavePair(pair);
@@ -3658,31 +3978,22 @@ function RoomProviderInner(props) {
       leave();
     };
   }, [roomId, frozenProps, stableEnterRoom]);
-  return /* @__PURE__ */ jsx2(GlobalRoomContext.Provider, { value: room, children: BoundRoomContext ? /* @__PURE__ */ jsx2(BoundRoomContext.Provider, { value: room, children: props.children }) : props.children });
+  return /* @__PURE__ */ jsx2(RoomContext.Provider, { value: room, children: props.children });
 }
-function useRoom_withRoomContext(RoomContext, options) {
-  const room = useRoomOrNull(RoomContext);
+function useRoom(options) {
+  const room = useRoomOrNull();
   if (room === null && !options?.allowOutsideRoom) {
     throw new Error("RoomProvider is missing from the React tree.");
   }
   return room;
 }
-function useRoom(options) {
-  return useRoom_withRoomContext(
-    GlobalRoomContext,
-    options
-  );
-}
-function useStatus_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useStatus() {
+  const room = useRoom();
   const subscribe = room.events.status.subscribe;
   const getSnapshot = room.getStatus;
   const getServerSnapshot = room.getStatus;
   return useSyncExternalStore3(subscribe, getSnapshot, getServerSnapshot);
 }
-function useStatus() {
-  return useStatus_withRoomContext(GlobalRoomContext);
-}
 function useReportTextEditor(editor, rootKey) {
   const isReported = useRef3(false);
   const room = useRoom();
@@ -3745,10 +4056,8 @@ function useMentionSuggestionsCache() {
   const client = useClient();
   return client[kInternal4].mentionSuggestionsCache;
 }
-function useBroadcastEvent_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useBroadcastEvent() {
+  const room = useRoom();
   return useCallback3(
     (event, options = { shouldQueueEventIfNotReady: false }) => {
       room.broadcastEvent(event, options);
@@ -3756,24 +4065,16 @@ function useBroadcastEvent_withRoomContext(RoomContext) {
     [room]
   );
 }
-function useBroadcastEvent() {
-  return useBroadcastEvent_withRoomContext(GlobalRoomContext);
-}
-function useOthersListener_withRoomContext(RoomContext, callback) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useOthersListener(callback) {
+  const room = useRoom();
   const savedCallback = useLatest(callback);
   useEffect6(
     () => room.events.others.subscribe((event) => savedCallback.current(event)),
     [room, savedCallback]
   );
 }
-function useOthersListener(callback) {
-  return useOthersListener_withRoomContext(GlobalRoomContext, callback);
-}
-function useLostConnectionListener_withRoomContext(RoomContext, callback) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useLostConnectionListener(callback) {
+  const room = useRoom();
   const savedCallback = useLatest(callback);
   useEffect6(
     () => room.events.lostConnection.subscribe(
@@ -3782,13 +4083,8 @@ function useLostConnectionListener_withRoomContext(RoomContext, callback) {
     [room, savedCallback]
   );
 }
-function useLostConnectionListener(callback) {
-  return useLostConnectionListener_withRoomContext(GlobalRoomContext, callback);
-}
-function useEventListener_withRoomContext(RoomContext, callback) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useEventListener(callback) {
+  const room = useRoom();
   const savedCallback = useLatest(callback);
   useEffect6(() => {
     const listener = (eventData) => {
@@ -3797,49 +4093,29 @@ function useEventListener_withRoomContext(RoomContext, callback) {
     return room.events.customEvent.subscribe(listener);
   }, [room, savedCallback]);
 }
-function useEventListener(callback) {
-  return useEventListener_withRoomContext(GlobalRoomContext, callback);
-}
-function useHistory_withRoomContext(RoomContext) {
-  return useRoom_withRoomContext(RoomContext).history;
-}
 function useHistory() {
-  return useHistory_withRoomContext(GlobalRoomContext);
-}
-function useUndo_withRoomContext(RoomContext) {
-  return useHistory_withRoomContext(RoomContext).undo;
+  return useRoom().history;
 }
 function useUndo() {
-  return useUndo_withRoomContext(GlobalRoomContext);
-}
-function useRedo_withRoomContext(RoomContext) {
-  return useHistory_withRoomContext(RoomContext).redo;
+  return useHistory().undo;
 }
 function useRedo() {
-  return useRedo_withRoomContext(GlobalRoomContext);
+  return useHistory().redo;
 }
-function useCanUndo_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useCanUndo() {
+  const room = useRoom();
   const subscribe = room.events.history.subscribe;
   const canUndo = room.history.canUndo;
   return useSyncExternalStore3(subscribe, canUndo, canUndo);
 }
-function useCanUndo() {
-  return useCanUndo_withRoomContext(GlobalRoomContext);
-}
-function useCanRedo_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useCanRedo() {
+  const room = useRoom();
   const subscribe = room.events.history.subscribe;
   const canRedo = room.history.canRedo;
   return useSyncExternalStore3(subscribe, canRedo, canRedo);
 }
-function useCanRedo() {
-  return useCanRedo_withRoomContext(GlobalRoomContext);
-}
-function useSelf_withRoomContext(RoomContext, maybeSelector, isEqual) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useSelf(maybeSelector, isEqual) {
+  const room = useRoom();
   const subscribe = room.events.self.subscribe;
   const getSnapshot = room.getSelf;
   const selector = maybeSelector ?? identity3;
@@ -3856,38 +4132,19 @@ function useSelf_withRoomContext(RoomContext, maybeSelector, isEqual) {
     isEqual
   );
 }
-function useSelf(maybeSelector, isEqual) {
-  return useSelf_withRoomContext(
-    GlobalRoomContext,
-    maybeSelector,
-    isEqual
-  );
-}
-function useMyPresence_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useMyPresence() {
+  const room = useRoom();
   const subscribe = room.events.myPresence.subscribe;
   const getSnapshot = room.getPresence;
   const presence = useSyncExternalStore3(subscribe, getSnapshot, getSnapshot);
   const setPresence = room.updatePresence;
   return [presence, setPresence];
 }
-function useMyPresence() {
-  return useMyPresence_withRoomContext(GlobalRoomContext);
-}
-function useUpdateMyPresence_withRoomContext(RoomContext) {
-  return useRoom_withRoomContext(
-    RoomContext
-  ).updatePresence;
-}
 function useUpdateMyPresence() {
-  return useUpdateMyPresence_withRoomContext(GlobalRoomContext);
+  return useRoom().updatePresence;
 }
-function useOthers_withRoomContext(RoomContext, selector, isEqual) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useOthers(selector, isEqual) {
+  const room = useRoom();
   const subscribe = room.events.others.subscribe;
   const getSnapshot = room.getOthers;
   const getServerSnapshot = alwaysEmptyList;
@@ -3899,14 +4156,7 @@ function useOthers_withRoomContext(RoomContext, selector, isEqual) {
     isEqual
   );
 }
-function useOthers(selector, isEqual) {
-  return useOthers_withRoomContext(
-    GlobalRoomContext,
-    selector,
-    isEqual
-  );
-}
-function useOthersMapped_withRoomContext(RoomContext, itemSelector, itemIsEqual) {
+function useOthersMapped(itemSelector, itemIsEqual) {
   const wrappedSelector = useCallback3(
     (others) => others.map((other) => [other.connectionId, itemSelector(other)]),
     [itemSelector]
@@ -3921,31 +4171,13 @@ function useOthersMapped_withRoomContext(RoomContext, itemSelector, itemIsEqual)
     },
     [itemIsEqual]
   );
-  return useOthers_withRoomContext(
-    RoomContext,
-    wrappedSelector,
-    wrappedIsEqual
-  );
-}
-function useOthersMapped(itemSelector, itemIsEqual) {
-  return useOthersMapped_withRoomContext(
-    GlobalRoomContext,
-    itemSelector,
-    itemIsEqual
-  );
-}
-function useOthersConnectionIds_withRoomContext(RoomContext) {
-  return useOthers_withRoomContext(
-    RoomContext,
-    selectorFor_useOthersConnectionIds,
-    shallow4
-  );
+  return useOthers(wrappedSelector, wrappedIsEqual);
 }
 function useOthersConnectionIds() {
-  return useOthersConnectionIds_withRoomContext(GlobalRoomContext);
+  return useOthers(selectorFor_useOthersConnectionIds, shallow4);
 }
 var NOT_FOUND = Symbol();
-function useOther_withRoomContext(RoomContext, connectionId, selector, isEqual) {
+function useOther(connectionId, selector, isEqual) {
   const wrappedSelector = useCallback3(
     (others) => {
       const other2 = others.find((other3) => other3.connectionId === connectionId);
@@ -3963,11 +4195,7 @@ function useOther_withRoomContext(RoomContext, connectionId, selector, isEqual)
     },
     [isEqual]
   );
-  const other = useOthers_withRoomContext(
-    RoomContext,
-    wrappedSelector,
-    wrappedIsEqual
-  );
+  const other = useOthers(wrappedSelector, wrappedIsEqual);
   if (other === NOT_FOUND) {
     throw new Error(
       `No such other user with connection id ${connectionId} exists`
@@ -3975,34 +4203,19 @@ function useOther_withRoomContext(RoomContext, connectionId, selector, isEqual)
   }
   return other;
 }
-function useOther(connectionId, selector, isEqual) {
-  return useOther_withRoomContext(
-    GlobalRoomContext,
-    connectionId,
-    selector,
-    isEqual
-  );
-}
-function useMutableStorageRoot_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
+function useMutableStorageRoot() {
+  const room = useRoom();
   const subscribe = room.events.storageDidLoad.subscribeOnce;
   const getSnapshot = room.getStorageSnapshot;
   const getServerSnapshot = alwaysNull;
   return useSyncExternalStore3(subscribe, getSnapshot, getServerSnapshot);
 }
-function useStorageRoot_withRoomContext(RoomContext) {
-  return [useMutableStorageRoot_withRoomContext(RoomContext)];
-}
 function useStorageRoot() {
-  return useStorageRoot_withRoomContext(GlobalRoomContext);
+  return [useMutableStorageRoot()];
 }
-function useStorage_withRoomContext(RoomContext, selector, isEqual) {
-  const room = useRoom_withRoomContext(
-    RoomContext
-  );
-  const rootOrNull = useMutableStorageRoot_withRoomContext(RoomContext);
+function useStorage(selector, isEqual) {
+  const room = useRoom();
+  const rootOrNull = useMutableStorageRoot();
   const wrappedSelector = useCallback3(
     (rootOrNull2) => rootOrNull2 !== null ? selector(rootOrNull2) : null,
     [selector]
@@ -4029,11 +4242,8 @@ function useStorage_withRoomContext(RoomContext, selector, isEqual) {
     isEqual
   );
 }
-function useStorage(selector, isEqual) {
-  return useStorage_withRoomContext(GlobalRoomContext, selector, isEqual);
-}
-function useMutation_withRoomContext(RoomContext, callback, deps) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useMutation(callback, deps) {
+  const room = useRoom();
   return useMemo4(
     () => {
       return (...args) => (
@@ -4053,17 +4263,10 @@ function useMutation_withRoomContext(RoomContext, callback, deps) {
     [room, ...deps]
   );
 }
-function useMutation(callback, deps) {
-  return useMutation_withRoomContext(
-    GlobalRoomContext,
-    callback,
-    deps
-  );
-}
-function useThreads_withRoomContext(RoomContext, options = {}) {
+function useThreads(options = {}) {
   const { scrollOnLoad = true } = options;
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const { store, getOrCreateThreadsPollerForRoomId } = getRoomExtrasForClient(client);
   const queryKey = makeRoomThreadsQueryKey(room.id, options.query);
   const poller = getOrCreateThreadsPollerForRoomId(room.id);
@@ -4089,17 +4292,100 @@ function useThreads_withRoomContext(RoomContext, options = {}) {
   useScrollToCommentOnLoadEffect(scrollOnLoad, result);
   return result;
 }
-function useThreads(options = {}) {
-  return useThreads_withRoomContext(GlobalRoomContext, options);
+function useFeeds(options) {
+  const room = useRoom();
+  const client = useClient();
+  const { store } = getRoomExtrasForClient(client);
+  const queryKey = makeFeedsQueryKey(room.id, options);
+  const loadableResource = store.outputs.loadingFeeds.getOrCreate(queryKey);
+  useEffect6(() => {
+    void loadableResource.waitUntilLoaded();
+  });
+  return useSignal(loadableResource.signal);
 }
-function useSearchComments_withRoomContext(RoomContext, options) {
+function useFeedMessages(feedId, options) {
+  const room = useRoom();
+  const client = useClient();
+  const { store } = getRoomExtrasForClient(client);
+  const queryKey = makeFeedMessagesQueryKey(room.id, feedId, options);
+  useEffect6(() => {
+    void store.outputs.loadingFeedMessages.getOrCreate(queryKey).waitUntilLoaded();
+  });
+  return useSignal(
+    store.outputs.loadingFeedMessages.getOrCreate(queryKey).signal
+  );
+}
+function useFeedsSuspense(options) {
+  ensureNotServerSide();
+  const client = useClient();
+  const room = useRoom();
+  const { store } = getRoomExtrasForClient(client);
+  const queryKey = makeFeedsQueryKey(room.id, options);
+  use(store.outputs.loadingFeeds.getOrCreate(queryKey).waitUntilLoaded());
+  const result = useFeeds(options);
+  assert2(!result.error, "Did not expect error");
+  assert2(!result.isLoading, "Did not expect loading");
+  return result;
+}
+function useFeedMessagesSuspense(feedId, options) {
+  ensureNotServerSide();
+  const client = useClient();
+  const room = useRoom();
+  const { store } = getRoomExtrasForClient(client);
+  const queryKey = makeFeedMessagesQueryKey(room.id, feedId, options);
+  use(store.outputs.loadingFeedMessages.getOrCreate(queryKey).waitUntilLoaded());
+  const result = useFeedMessages(feedId, options);
+  assert2(!result.error, "Did not expect error");
+  assert2(!result.isLoading, "Did not expect loading");
+  return result;
+}
+function useCreateFeed() {
+  const room = useRoom();
+  return useCallback3(
+    (feedId, options) => room.addFeed(feedId, options),
+    [room]
+  );
+}
+function useDeleteFeed() {
+  const room = useRoom();
+  return useCallback3((feedId) => room.deleteFeed(feedId), [room]);
+}
+function useUpdateFeedMetadata() {
+  const room = useRoom();
+  return useCallback3(
+    (feedId, metadata) => room.updateFeed(feedId, metadata),
+    [room]
+  );
+}
+function useCreateFeedMessage() {
+  const room = useRoom();
+  return useCallback3(
+    (feedId, data, options) => room.addFeedMessage(feedId, data, options),
+    [room]
+  );
+}
+function useDeleteFeedMessage() {
+  const room = useRoom();
+  return useCallback3(
+    (feedId, messageId) => room.deleteFeedMessage(feedId, messageId),
+    [room]
+  );
+}
+function useUpdateFeedMessage() {
+  const room = useRoom();
+  return useCallback3(
+    (feedId, messageId, data) => room.updateFeedMessage(feedId, messageId, data),
+    [room]
+  );
+}
+function useSearchComments(options) {
   const [result, setResult] = useState3({
     isLoading: true
   });
   const currentRequestInfo = useRef3(null);
   const timeout = useRef3(null);
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const queryKey = stableStringify2([room.id, options.query]);
   useEffect6(() => {
     const currentRequestId = (currentRequestInfo.current?.id ?? 0) + 1;
@@ -4143,14 +4429,8 @@ function useSearchComments_withRoomContext(RoomContext, options) {
   }, [queryKey, client, room.id]);
   return result;
 }
-function useSearchComments(options) {
-  return useSearchComments_withRoomContext(GlobalRoomContext, options);
-}
-function useCreateThread_withRoomContext(RoomContext) {
-  return useCreateRoomThread(useRoom_withRoomContext(RoomContext).id);
-}
 function useCreateThread() {
-  return useCreateThread_withRoomContext(GlobalRoomContext);
+  return useCreateRoomThread(useRoom().id);
 }
 function useCreateRoomThread(roomId) {
   const client = useClient();
@@ -4223,11 +4503,8 @@ function useCreateRoomThread(roomId) {
     [client, roomId]
   );
 }
-function useDeleteThread_withRoomContext(RoomContext) {
-  return useDeleteRoomThread(useRoom_withRoomContext(RoomContext).id);
-}
 function useDeleteThread() {
-  return useDeleteThread_withRoomContext(GlobalRoomContext);
+  return useDeleteRoomThread(useRoom().id);
 }
 function useDeleteRoomThread(roomId) {
   const client = useClient();
@@ -4259,11 +4536,8 @@ function useDeleteRoomThread(roomId) {
     [client, roomId]
   );
 }
-function useEditThreadMetadata_withRoomContext(RoomContext) {
-  return useEditRoomThreadMetadata(useRoom_withRoomContext(RoomContext).id);
-}
 function useEditThreadMetadata() {
-  return useEditThreadMetadata_withRoomContext(GlobalRoomContext);
+  return useEditRoomThreadMetadata(useRoom().id);
 }
 function useEditRoomThreadMetadata(roomId) {
   const client = useClient();
@@ -4302,13 +4576,8 @@ function useEditRoomThreadMetadata(roomId) {
     [client, roomId]
   );
 }
-function useEditCommentMetadata_withRoomContext(RoomContext) {
-  return useEditRoomCommentMetadata(
-    useRoom_withRoomContext(RoomContext).id
-  );
-}
 function useEditCommentMetadata() {
-  return useEditCommentMetadata_withRoomContext(GlobalRoomContext);
+  return useEditRoomCommentMetadata(useRoom().id);
 }
 function useEditRoomCommentMetadata(roomId) {
   const client = useClient();
@@ -4356,11 +4625,8 @@ function useEditRoomCommentMetadata(roomId) {
     [client, roomId]
   );
 }
-function useCreateComment_withRoomContext(RoomContext) {
-  return useCreateRoomComment(useRoom_withRoomContext(RoomContext).id);
-}
 function useCreateComment() {
-  return useCreateComment_withRoomContext(GlobalRoomContext);
+  return useCreateRoomComment(useRoom().id);
 }
 function useCreateRoomComment(roomId) {
   const client = useClient();
@@ -4418,11 +4684,8 @@ function useCreateRoomComment(roomId) {
     [client, roomId]
   );
 }
-function useEditComment_withRoomContext(RoomContext) {
-  return useEditRoomComment(useRoom_withRoomContext(RoomContext).id);
-}
 function useEditComment() {
-  return useEditComment_withRoomContext(GlobalRoomContext);
+  return useEditRoomComment(useRoom().id);
 }
 function useEditRoomComment(roomId) {
   const client = useClient();
@@ -4495,11 +4758,8 @@ function useEditRoomComment(roomId) {
     [client, roomId]
   );
 }
-function useDeleteComment_withRoomContext(RoomContext) {
-  return useDeleteRoomComment(useRoom_withRoomContext(RoomContext).id);
-}
 function useDeleteComment() {
-  return useDeleteComment_withRoomContext(GlobalRoomContext);
+  return useDeleteRoomComment(useRoom().id);
 }
 function useDeleteRoomComment(roomId) {
   const client = useClient();
@@ -4528,11 +4788,8 @@ function useDeleteRoomComment(roomId) {
     [client, roomId]
   );
 }
-function useAddReaction_withRoomContext(RoomContext) {
-  return useAddRoomCommentReaction(useRoom_withRoomContext(RoomContext).id);
-}
 function useAddReaction() {
-  return useAddReaction_withRoomContext(GlobalRoomContext);
+  return useAddRoomCommentReaction(useRoom().id);
 }
 function useAddRoomCommentReaction(roomId) {
   const client = useClient();
@@ -4577,11 +4834,8 @@ function useAddRoomCommentReaction(roomId) {
     [client, roomId]
   );
 }
-function useRemoveReaction_withRoomContext(RoomContext) {
-  return useRemoveRoomCommentReaction(useRoom_withRoomContext(RoomContext).id);
-}
 function useRemoveReaction() {
-  return useRemoveReaction_withRoomContext(GlobalRoomContext);
+  return useRemoveRoomCommentReaction(useRoom().id);
 }
 function useRemoveRoomCommentReaction(roomId) {
   const client = useClient();
@@ -4625,6 +4879,9 @@ function useRemoveRoomCommentReaction(roomId) {
     [client, roomId]
   );
 }
+function useMarkThreadAsRead() {
+  return useMarkRoomThreadAsRead(useRoom().id);
+}
 function useMarkRoomThreadAsRead(roomId) {
   const client = useClient();
   return useCallback3(
@@ -4670,18 +4927,8 @@ function useMarkRoomThreadAsRead(roomId) {
     [client, roomId]
   );
 }
-function useMarkThreadAsRead_withRoomContext(RoomContext) {
-  const room = useRoom_withRoomContext(RoomContext);
-  return useMarkRoomThreadAsRead(room.id);
-}
-function useMarkThreadAsRead() {
-  return useMarkThreadAsRead_withRoomContext(GlobalRoomContext);
-}
-function useMarkThreadAsResolved_withRoomContext(RoomContext) {
-  return useMarkRoomThreadAsResolved(useRoom_withRoomContext(RoomContext).id);
-}
 function useMarkThreadAsResolved() {
-  return useMarkThreadAsResolved_withRoomContext(GlobalRoomContext);
+  return useMarkRoomThreadAsResolved(useRoom().id);
 }
 function useMarkRoomThreadAsResolved(roomId) {
   const client = useClient();
@@ -4713,11 +4960,8 @@ function useMarkRoomThreadAsResolved(roomId) {
     [client, roomId]
   );
 }
-function useMarkThreadAsUnresolved_withRoomContext(RoomContext) {
-  return useMarkRoomThreadAsUnresolved(useRoom_withRoomContext(RoomContext).id);
-}
 function useMarkThreadAsUnresolved() {
-  return useMarkThreadAsUnresolved_withRoomContext(GlobalRoomContext);
+  return useMarkRoomThreadAsUnresolved(useRoom().id);
 }
 function useMarkRoomThreadAsUnresolved(roomId) {
   const client = useClient();
@@ -4749,11 +4993,8 @@ function useMarkRoomThreadAsUnresolved(roomId) {
     [client, roomId]
   );
 }
-function useSubscribeToThread_withRoomContext(RoomContext) {
-  return useSubscribeToRoomThread(useRoom_withRoomContext(RoomContext).id);
-}
 function useSubscribeToThread() {
-  return useSubscribeToThread_withRoomContext(GlobalRoomContext);
+  return useSubscribeToRoomThread(useRoom().id);
 }
 function useSubscribeToRoomThread(roomId) {
   const client = useClient();
@@ -4780,11 +5021,8 @@ function useSubscribeToRoomThread(roomId) {
     [client, roomId]
   );
 }
-function useUnsubscribeFromThread_withRoomContext(RoomContext) {
-  return useUnsubscribeFromRoomThread(useRoom_withRoomContext(RoomContext).id);
-}
 function useUnsubscribeFromThread() {
-  return useUnsubscribeFromThread_withRoomContext(GlobalRoomContext);
+  return useUnsubscribeFromRoomThread(useRoom().id);
 }
 function useUnsubscribeFromRoomThread(roomId) {
   const client = useClient();
@@ -4814,14 +5052,8 @@ function useUnsubscribeFromRoomThread(roomId) {
     [client, roomId]
   );
 }
-function useThreadSubscription_withRoomContext(RoomContext, threadId) {
-  return useRoomThreadSubscription(
-    useRoom_withRoomContext(RoomContext).id,
-    threadId
-  );
-}
 function useThreadSubscription(threadId) {
-  return useThreadSubscription_withRoomContext(GlobalRoomContext, threadId);
+  return useRoomThreadSubscription(useRoom().id, threadId);
 }
 function useRoomThreadSubscription(roomId, threadId) {
   const client = useClient();
@@ -4861,10 +5093,10 @@ function useRoomThreadSubscription(roomId, threadId) {
   );
   return useSignal(signal, selector, shallow4);
 }
-function useRoomSubscriptionSettings_withRoomContext(RoomContext) {
-  const updateRoomSubscriptionSettings = useUpdateRoomSubscriptionSettings_withRoomContext(RoomContext);
+function useRoomSubscriptionSettings() {
+  const updateRoomSubscriptionSettings = useUpdateRoomSubscriptionSettings();
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const { store, getOrCreateSubscriptionSettingsPollerForRoomId } = getRoomExtrasForClient(client);
   const poller = getOrCreateSubscriptionSettingsPollerForRoomId(room.id);
   useEffect6(
@@ -4892,32 +5124,26 @@ function useRoomSubscriptionSettings_withRoomContext(RoomContext) {
     return [settings, updateRoomSubscriptionSettings];
   }, [settings, updateRoomSubscriptionSettings]);
 }
-function useRoomSubscriptionSettings() {
-  return useRoomSubscriptionSettings_withRoomContext(GlobalRoomContext);
-}
-function useRoomSubscriptionSettingsSuspense_withRoomContext(RoomContext) {
+function useRoomSubscriptionSettingsSuspense() {
   ensureNotServerSide();
   const client = useClient();
   const store = getRoomExtrasForClient(client).store;
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   use(
     store.outputs.roomSubscriptionSettingsByRoomId.getOrCreate(room.id).waitUntilLoaded()
   );
-  const [settings, updateRoomSubscriptionSettings] = useRoomSubscriptionSettings_withRoomContext(RoomContext);
+  const [settings, updateRoomSubscriptionSettings] = useRoomSubscriptionSettings();
   assert2(!settings.error, "Did not expect error");
   assert2(!settings.isLoading, "Did not expect loading");
   return useMemo4(() => {
     return [settings, updateRoomSubscriptionSettings];
   }, [settings, updateRoomSubscriptionSettings]);
 }
-function useRoomSubscriptionSettingsSuspense() {
-  return useRoomSubscriptionSettingsSuspense_withRoomContext(GlobalRoomContext);
-}
-function useHistoryVersionData_withRoomContext(RoomContext, versionId) {
+function useHistoryVersionData(versionId) {
   const [state, setState] = useState3({
     isLoading: true
   });
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   useEffect6(() => {
     setState({ isLoading: true });
     const load = async () => {
@@ -4942,12 +5168,9 @@ function useHistoryVersionData_withRoomContext(RoomContext, versionId) {
   }, [room, versionId]);
   return state;
 }
-function useHistoryVersionData(versionId) {
-  return useHistoryVersionData_withRoomContext(GlobalRoomContext, versionId);
-}
-function useHistoryVersions_withRoomContext(RoomContext) {
+function useHistoryVersions() {
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const { store, getOrCreateVersionsPollerForRoomId } = getRoomExtrasForClient(client);
   const poller = getOrCreateVersionsPollerForRoomId(room.id);
   useEffect6(() => {
@@ -4968,26 +5191,20 @@ function useHistoryVersions_withRoomContext(RoomContext) {
   );
   return useSignal(store.outputs.versionsByRoomId.getOrCreate(room.id).signal);
 }
-function useHistoryVersions() {
-  return useHistoryVersions_withRoomContext(GlobalRoomContext);
-}
-function useHistoryVersionsSuspense_withRoomContext(RoomContext) {
+function useHistoryVersionsSuspense() {
   ensureNotServerSide();
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const store = getRoomExtrasForClient(client).store;
   use(store.outputs.versionsByRoomId.getOrCreate(room.id).waitUntilLoaded());
-  const result = useHistoryVersions_withRoomContext(RoomContext);
+  const result = useHistoryVersions();
   assert2(!result.error, "Did not expect error");
   assert2(!result.isLoading, "Did not expect loading");
   return result;
 }
-function useHistoryVersionsSuspense() {
-  return useHistoryVersionsSuspense_withRoomContext(GlobalRoomContext);
-}
-function useUpdateRoomSubscriptionSettings_withRoomContext(RoomContext) {
+function useUpdateRoomSubscriptionSettings() {
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   return useCallback3(
     (settings) => {
       const { store, onMutationFailure, pollThreadsForRoomId } = getRoomExtrasForClient(client);
@@ -5022,118 +5239,61 @@ function useUpdateRoomSubscriptionSettings_withRoomContext(RoomContext) {
     [client, room]
   );
 }
-function useUpdateRoomSubscriptionSettings() {
-  return useUpdateRoomSubscriptionSettings_withRoomContext(GlobalRoomContext);
-}
-function useSuspendUntilPresenceReady_withRoomContext(RoomContext) {
+function useSuspendUntilPresenceReady() {
   ensureNotServerSide();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   use(room.waitUntilPresenceReady());
 }
-function useSelfSuspense_withRoomContext(RoomContext, selector, isEqual) {
-  useSuspendUntilPresenceReady_withRoomContext(RoomContext);
-  return useSelf_withRoomContext(
-    RoomContext,
-    selector,
-    isEqual
-  );
-}
 function useSelfSuspense(selector, isEqual) {
-  return useSelfSuspense_withRoomContext(
-    GlobalRoomContext,
-    selector,
-    isEqual
-  );
-}
-function useOthersSuspense_withRoomContext(RoomContext, selector, isEqual) {
-  useSuspendUntilPresenceReady_withRoomContext(RoomContext);
-  return useOthers_withRoomContext(
-    RoomContext,
+  useSuspendUntilPresenceReady();
+  return useSelf(
     selector,
     isEqual
   );
 }
 function useOthersSuspense(selector, isEqual) {
-  return useOthersSuspense_withRoomContext(
-    GlobalRoomContext,
+  useSuspendUntilPresenceReady();
+  return useOthers(
     selector,
     isEqual
   );
 }
-function useOthersConnectionIdsSuspense_withRoomContext(RoomContext) {
-  useSuspendUntilPresenceReady_withRoomContext(RoomContext);
-  return useOthersConnectionIds_withRoomContext(RoomContext);
-}
 function useOthersConnectionIdsSuspense() {
-  return useOthersConnectionIdsSuspense_withRoomContext(GlobalRoomContext);
-}
-function useOthersMappedSuspense_withRoomContext(RoomContext, itemSelector, itemIsEqual) {
-  useSuspendUntilPresenceReady_withRoomContext(RoomContext);
-  return useOthersMapped_withRoomContext(
-    RoomContext,
-    itemSelector,
-    itemIsEqual
-  );
+  useSuspendUntilPresenceReady();
+  return useOthersConnectionIds();
 }
 function useOthersMappedSuspense(itemSelector, itemIsEqual) {
-  return useOthersMappedSuspense_withRoomContext(
-    GlobalRoomContext,
-    itemSelector,
-    itemIsEqual
-  );
-}
-function useOtherSuspense_withRoomContext(RoomContext, connectionId, selector, isEqual) {
-  useSuspendUntilPresenceReady_withRoomContext(RoomContext);
-  return useOther_withRoomContext(
-    RoomContext,
-    connectionId,
-    selector,
-    isEqual
-  );
+  useSuspendUntilPresenceReady();
+  return useOthersMapped(itemSelector, itemIsEqual);
 }
 function useOtherSuspense(connectionId, selector, isEqual) {
-  return useOtherSuspense_withRoomContext(
-    GlobalRoomContext,
-    connectionId,
-    selector,
-    isEqual
-  );
+  useSuspendUntilPresenceReady();
+  return useOther(connectionId, selector, isEqual);
 }
-function useSuspendUntilStorageReady_withRoomContext(RoomContext) {
+function useSuspendUntilStorageReady() {
   ensureNotServerSide();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   use(room.waitUntilStorageReady());
 }
-function useStorageSuspense_withRoomContext(RoomContext, selector, isEqual) {
-  useSuspendUntilStorageReady_withRoomContext(RoomContext);
-  return useStorage_withRoomContext(
-    RoomContext,
-    selector,
-    isEqual
-  );
-}
 function useStorageSuspense(selector, isEqual) {
-  return useStorageSuspense_withRoomContext(
-    GlobalRoomContext,
+  useSuspendUntilStorageReady();
+  return useStorage(
     selector,
     isEqual
   );
 }
-function useThreadsSuspense_withRoomContext(RoomContext, options = {}) {
+function useThreadsSuspense(options = {}) {
   ensureNotServerSide();
   const client = useClient();
-  const room = useRoom_withRoomContext(RoomContext);
+  const room = useRoom();
   const { store } = getRoomExtrasForClient(client);
   const queryKey = makeRoomThreadsQueryKey(room.id, options.query);
   use(store.outputs.loadingRoomThreads.getOrCreate(queryKey).waitUntilLoaded());
-  const result = useThreads_withRoomContext(RoomContext, options);
+  const result = useThreads(options);
   assert2(!result.error, "Did not expect error");
   assert2(!result.isLoading, "Did not expect loading");
   return result;
 }
-function useThreadsSuspense(options = {}) {
-  return useThreadsSuspense_withRoomContext(GlobalRoomContext, options);
-}
 function selectorFor_useAttachmentUrl(state) {
   if (state === void 0 || state?.isLoading) {
     return state ?? { isLoading: true };
@@ -5147,12 +5307,9 @@ function selectorFor_useAttachmentUrl(state) {
     url: state.data
   };
 }
-function useAttachmentUrl_withRoomContext(RoomContext, attachmentId) {
-  const room = useRoom_withRoomContext(RoomContext);
-  return useRoomAttachmentUrl(attachmentId, room.id);
-}
 function useAttachmentUrl(attachmentId) {
-  return useAttachmentUrl_withRoomContext(GlobalRoomContext, attachmentId);
+  const room = useRoom();
+  return useRoomAttachmentUrl(attachmentId, room.id);
 }
 function useRoomAttachmentUrl(attachmentId, roomId) {
   const client = useClient();
@@ -5172,8 +5329,8 @@ function useRoomAttachmentUrl(attachmentId, roomId) {
     shallow4
   );
 }
-function useAttachmentUrlSuspense_withRoomContext(RoomContext, attachmentId) {
-  const room = useRoom_withRoomContext(RoomContext);
+function useAttachmentUrlSuspense(attachmentId) {
+  const room = useRoom();
   const { attachmentUrlsStore } = room[kInternal4];
   const getAttachmentUrlState = useCallback3(
     () => attachmentUrlsStore.getItemState(attachmentId),
@@ -5200,382 +5357,13 @@ function useAttachmentUrlSuspense_withRoomContext(RoomContext, attachmentId) {
     error: void 0
   };
 }
-function useAttachmentUrlSuspense(attachmentId) {
-  return useAttachmentUrlSuspense_withRoomContext(
-    GlobalRoomContext,
-    attachmentId
-  );
-}
 function useRoomPermissions(roomId) {
   const client = useClient();
   const store = getRoomExtrasForClient(client).store;
   return useSignal(store.permissionHints.getPermissionForRoom\u03A3(roomId));
 }
 function createRoomContext(client) {
-  const BoundRoomContext = createContext2(null);
-  function RoomProvider_withImplicitLiveblocksProviderAndBoundRoomContext(props) {
-    return /* @__PURE__ */ jsx2(LiveblocksProviderWithClient, { client, allowNesting: true, children: /* @__PURE__ */ jsx2(RoomProvider, { ...props, BoundRoomContext }) });
-  }
-  function useRoom_withBoundRoomContext(...args) {
-    return useRoom_withRoomContext(
-      BoundRoomContext,
-      ...args
-    );
-  }
-  function useStatus_withBoundRoomContext() {
-    return useStatus_withRoomContext(BoundRoomContext);
-  }
-  function useBroadcastEvent_withBoundRoomContext() {
-    return useBroadcastEvent_withRoomContext(BoundRoomContext);
-  }
-  function useOthersListener_withBoundRoomContext(...args) {
-    return useOthersListener_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useLostConnectionListener_withBoundRoomContext(...args) {
-    return useLostConnectionListener_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useEventListener_withBoundRoomContext(...args) {
-    return useEventListener_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useMarkThreadAsRead_withBoundRoomContext() {
-    return useMarkThreadAsRead_withRoomContext(BoundRoomContext);
-  }
-  function useHistory_withBoundRoomContext() {
-    return useHistory_withRoomContext(BoundRoomContext);
-  }
-  function useUndo_withBoundRoomContext() {
-    return useUndo_withRoomContext(BoundRoomContext);
-  }
-  function useRedo_withBoundRoomContext() {
-    return useRedo_withRoomContext(BoundRoomContext);
-  }
-  function useCanUndo_withBoundRoomContext() {
-    return useCanUndo_withRoomContext(BoundRoomContext);
-  }
-  function useCanRedo_withBoundRoomContext() {
-    return useCanRedo_withRoomContext(BoundRoomContext);
-  }
-  function useStorageRoot_withBoundRoomContext() {
-    return useStorageRoot_withRoomContext(BoundRoomContext);
-  }
-  function useStorage_withBoundRoomContext(...args) {
-    return useStorage_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useStorageSuspense_withBoundRoomContext(...args) {
-    return useStorageSuspense_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useSelf_withBoundRoomContext(...args) {
-    return useSelf_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useMyPresence_withBoundRoomContext() {
-    return useMyPresence_withRoomContext(BoundRoomContext);
-  }
-  function useUpdateMyPresence_withBoundRoomContext() {
-    return useUpdateMyPresence_withRoomContext(BoundRoomContext);
-  }
-  function useOthers_withBoundRoomContext(...args) {
-    return useOthers_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useOthersMapped_withBoundRoomContext(...args) {
-    return useOthersMapped_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useOthersConnectionIds_withBoundRoomContext() {
-    return useOthersConnectionIds_withRoomContext(BoundRoomContext);
-  }
-  function useOther_withBoundRoomContext(...args) {
-    return useOther_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useSelfSuspense_withBoundRoomContext(...args) {
-    return useSelfSuspense_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useOthersSuspense_withBoundRoomContext(...args) {
-    return useOthersSuspense_withRoomContext(
-      BoundRoomContext,
-      ...args
-    );
-  }
-  function useOthersMappedSuspense_withBoundRoomContext(...args) {
-    return useOthersMappedSuspense_withRoomContext(
-      BoundRoomContext,
-      ...args
-    );
-  }
-  function useOthersConnectionIdsSuspense_withBoundRoomContext() {
-    return useOthersConnectionIdsSuspense_withRoomContext(BoundRoomContext);
-  }
-  function useOtherSuspense_withBoundRoomContext(...args) {
-    return useOtherSuspense_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useMutation_withBoundRoomContext(...args) {
-    return useMutation_withRoomContext(
-      BoundRoomContext,
-      ...args
-    );
-  }
-  function useThreads_withBoundRoomContext(...args) {
-    return useThreads_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useCreateThread_withBoundRoomContext() {
-    return useCreateThread_withRoomContext(BoundRoomContext);
-  }
-  function useDeleteThread_withBoundRoomContext() {
-    return useDeleteThread_withRoomContext(BoundRoomContext);
-  }
-  function useEditThreadMetadata_withBoundRoomContext() {
-    return useEditThreadMetadata_withRoomContext(BoundRoomContext);
-  }
-  function useMarkThreadAsResolved_withBoundRoomContext() {
-    return useMarkThreadAsResolved_withRoomContext(BoundRoomContext);
-  }
-  function useMarkThreadAsUnresolved_withBoundRoomContext() {
-    return useMarkThreadAsUnresolved_withRoomContext(BoundRoomContext);
-  }
-  function useThreadsSuspense_withBoundRoomContext(...args) {
-    return useThreadsSuspense_withRoomContext(
-      BoundRoomContext,
-      ...args
-    );
-  }
-  function useSubscribeToThread_withBoundRoomContext() {
-    return useSubscribeToThread_withRoomContext(BoundRoomContext);
-  }
-  function useUnsubscribeFromThread_withBoundRoomContext() {
-    return useUnsubscribeFromThread_withRoomContext(BoundRoomContext);
-  }
-  function useCreateComment_withBoundRoomContext() {
-    return useCreateComment_withRoomContext(BoundRoomContext);
-  }
-  function useEditComment_withBoundRoomContext() {
-    return useEditComment_withRoomContext(BoundRoomContext);
-  }
-  function useEditCommentMetadata_withBoundRoomContext() {
-    return useEditCommentMetadata_withRoomContext(BoundRoomContext);
-  }
-  function useDeleteComment_withBoundRoomContext() {
-    return useDeleteComment_withRoomContext(BoundRoomContext);
-  }
-  function useAddReaction_withBoundRoomContext() {
-    return useAddReaction_withRoomContext(BoundRoomContext);
-  }
-  function useRemoveReaction_withBoundRoomContext() {
-    return useRemoveReaction_withRoomContext(BoundRoomContext);
-  }
-  function useThreadSubscription_withBoundRoomContext(...args) {
-    return useThreadSubscription_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useAttachmentUrl_withBoundRoomContext(...args) {
-    return useAttachmentUrl_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useAttachmentUrlSuspense_withBoundRoomContext(...args) {
-    return useAttachmentUrlSuspense_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useSearchComments_withBoundRoomContext(...args) {
-    return useSearchComments_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useHistoryVersions_withBoundRoomContext() {
-    return useHistoryVersions_withRoomContext(BoundRoomContext);
-  }
-  function useHistoryVersionsSuspense_withBoundRoomContext() {
-    return useHistoryVersionsSuspense_withRoomContext(BoundRoomContext);
-  }
-  function useHistoryVersionData_withBoundRoomContext(...args) {
-    return useHistoryVersionData_withRoomContext(BoundRoomContext, ...args);
-  }
-  function useRoomSubscriptionSettings_withBoundRoomContext() {
-    return useRoomSubscriptionSettings_withRoomContext(BoundRoomContext);
-  }
-  function useRoomSubscriptionSettingsSuspense_withBoundRoomContext() {
-    return useRoomSubscriptionSettingsSuspense_withRoomContext(
-      BoundRoomContext
-    );
-  }
-  function useUpdateRoomSubscriptionSettings_withBoundRoomContext() {
-    return useUpdateRoomSubscriptionSettings_withRoomContext(BoundRoomContext);
-  }
-  const shared = createSharedContext(client);
-  const bundle = {
-    RoomContext: BoundRoomContext,
-    RoomProvider: RoomProvider_withImplicitLiveblocksProviderAndBoundRoomContext,
-    // prettier-ignore
-    useRoom: useRoom_withBoundRoomContext,
-    // prettier-ignore
-    useStatus: useStatus_withBoundRoomContext,
-    // prettier-ignore
-    useBroadcastEvent: useBroadcastEvent_withBoundRoomContext,
-    // prettier-ignore
-    useOthersListener: useOthersListener_withBoundRoomContext,
-    // prettier-ignore
-    useLostConnectionListener: useLostConnectionListener_withBoundRoomContext,
-    // prettier-ignore
-    useEventListener: useEventListener_withBoundRoomContext,
-    // prettier-ignore
-    useHistory: useHistory_withBoundRoomContext,
-    // prettier-ignore
-    useUndo: useUndo_withBoundRoomContext,
-    // prettier-ignore
-    useRedo: useRedo_withBoundRoomContext,
-    // prettier-ignore
-    useCanUndo: useCanUndo_withBoundRoomContext,
-    // prettier-ignore
-    useCanRedo: useCanRedo_withBoundRoomContext,
-    // prettier-ignore
-    useStorageRoot: useStorageRoot_withBoundRoomContext,
-    // prettier-ignore
-    useStorage: useStorage_withBoundRoomContext,
-    // prettier-ignore
-    useMutation: useMutation_withBoundRoomContext,
-    // prettier-ignore
-    useSelf: useSelf_withBoundRoomContext,
-    // prettier-ignore
-    useMyPresence: useMyPresence_withBoundRoomContext,
-    // prettier-ignore
-    useUpdateMyPresence: useUpdateMyPresence_withBoundRoomContext,
-    // prettier-ignore
-    useOthers: useOthers_withBoundRoomContext,
-    // prettier-ignore
-    useOthersMapped: useOthersMapped_withBoundRoomContext,
-    // prettier-ignore
-    useOthersConnectionIds: useOthersConnectionIds_withBoundRoomContext,
-    // prettier-ignore
-    useOther: useOther_withBoundRoomContext,
-    // prettier-ignore
-    useThreads: useThreads_withBoundRoomContext,
-    // prettier-ignore
-    useCreateThread: useCreateThread_withBoundRoomContext,
-    // prettier-ignore
-    useDeleteThread: useDeleteThread_withBoundRoomContext,
-    // prettier-ignore
-    useEditThreadMetadata: useEditThreadMetadata_withBoundRoomContext,
-    // prettier-ignore
-    useMarkThreadAsResolved: useMarkThreadAsResolved_withBoundRoomContext,
-    // prettier-ignore
-    useMarkThreadAsUnresolved: useMarkThreadAsUnresolved_withBoundRoomContext,
-    // prettier-ignore
-    useSubscribeToThread: useSubscribeToThread_withBoundRoomContext,
-    // prettier-ignore
-    useUnsubscribeFromThread: useUnsubscribeFromThread_withBoundRoomContext,
-    // prettier-ignore
-    useCreateComment: useCreateComment_withBoundRoomContext,
-    // prettier-ignore
-    useEditComment: useEditComment_withBoundRoomContext,
-    // prettier-ignore
-    useEditCommentMetadata: useEditCommentMetadata_withBoundRoomContext,
-    // prettier-ignore
-    useDeleteComment: useDeleteComment_withBoundRoomContext,
-    // prettier-ignore
-    useAddReaction: useAddReaction_withBoundRoomContext,
-    // prettier-ignore
-    useRemoveReaction: useRemoveReaction_withBoundRoomContext,
-    // prettier-ignore
-    useMarkThreadAsRead: useMarkThreadAsRead_withBoundRoomContext,
-    // prettier-ignore
-    useThreadSubscription: useThreadSubscription_withBoundRoomContext,
-    // prettier-ignore
-    useAttachmentUrl: useAttachmentUrl_withBoundRoomContext,
-    // prettier-ignore
-    useSearchComments: useSearchComments_withBoundRoomContext,
-    // prettier-ignore
-    useHistoryVersions: useHistoryVersions_withBoundRoomContext,
-    // prettier-ignore
-    useHistoryVersionData: useHistoryVersionData_withBoundRoomContext,
-    // prettier-ignore
-    useRoomSubscriptionSettings: useRoomSubscriptionSettings_withBoundRoomContext,
-    // prettier-ignore
-    useUpdateRoomSubscriptionSettings: useUpdateRoomSubscriptionSettings_withBoundRoomContext,
-    ...shared.classic,
-    suspense: {
-      RoomContext: BoundRoomContext,
-      RoomProvider: RoomProvider_withImplicitLiveblocksProviderAndBoundRoomContext,
-      // prettier-ignore
-      useRoom: useRoom_withBoundRoomContext,
-      // prettier-ignore
-      useStatus: useStatus_withBoundRoomContext,
-      // prettier-ignore
-      useBroadcastEvent: useBroadcastEvent_withBoundRoomContext,
-      // prettier-ignore
-      useOthersListener: useOthersListener_withBoundRoomContext,
-      // prettier-ignore
-      useLostConnectionListener: useLostConnectionListener_withBoundRoomContext,
-      // prettier-ignore
-      useEventListener: useEventListener_withBoundRoomContext,
-      // prettier-ignore
-      useHistory: useHistory_withBoundRoomContext,
-      // prettier-ignore
-      useUndo: useUndo_withBoundRoomContext,
-      // prettier-ignore
-      useRedo: useRedo_withBoundRoomContext,
-      // prettier-ignore
-      useCanUndo: useCanUndo_withBoundRoomContext,
-      // prettier-ignore
-      useCanRedo: useCanRedo_withBoundRoomContext,
-      // prettier-ignore
-      useStorageRoot: useStorageRoot_withBoundRoomContext,
-      // prettier-ignore
-      useStorage: useStorageSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useMutation: useMutation_withBoundRoomContext,
-      // prettier-ignore
-      useSelf: useSelfSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useMyPresence: useMyPresence_withBoundRoomContext,
-      // prettier-ignore
-      useUpdateMyPresence: useUpdateMyPresence_withBoundRoomContext,
-      // prettier-ignore
-      useOthers: useOthersSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useOthersMapped: useOthersMappedSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useOthersConnectionIds: useOthersConnectionIdsSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useOther: useOtherSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useThreads: useThreadsSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useCreateThread: useCreateThread_withBoundRoomContext,
-      // prettier-ignore
-      useDeleteThread: useDeleteThread_withBoundRoomContext,
-      // prettier-ignore
-      useEditThreadMetadata: useEditThreadMetadata_withBoundRoomContext,
-      // prettier-ignore
-      useMarkThreadAsResolved: useMarkThreadAsResolved_withBoundRoomContext,
-      // prettier-ignore
-      useMarkThreadAsUnresolved: useMarkThreadAsUnresolved_withBoundRoomContext,
-      // prettier-ignore
-      useSubscribeToThread: useSubscribeToThread_withBoundRoomContext,
-      // prettier-ignore
-      useUnsubscribeFromThread: useUnsubscribeFromThread_withBoundRoomContext,
-      // prettier-ignore
-      useCreateComment: useCreateComment_withBoundRoomContext,
-      // prettier-ignore
-      useEditComment: useEditComment_withBoundRoomContext,
-      // prettier-ignore
-      useEditCommentMetadata: useEditCommentMetadata_withBoundRoomContext,
-      // prettier-ignore
-      useDeleteComment: useDeleteComment_withBoundRoomContext,
-      // prettier-ignore
-      useAddReaction: useAddReaction_withBoundRoomContext,
-      // prettier-ignore
-      useRemoveReaction: useRemoveReaction_withBoundRoomContext,
-      // prettier-ignore
-      useMarkThreadAsRead: useMarkThreadAsRead_withBoundRoomContext,
-      // prettier-ignore
-      useThreadSubscription: useThreadSubscription_withBoundRoomContext,
-      // prettier-ignore
-      useAttachmentUrl: useAttachmentUrlSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useHistoryVersions: useHistoryVersionsSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useRoomSubscriptionSettings: useRoomSubscriptionSettingsSuspense_withBoundRoomContext,
-      // prettier-ignore
-      useUpdateRoomSubscriptionSettings: useUpdateRoomSubscriptionSettings_withBoundRoomContext,
-      // No Suspense version: useSearchComments
-      // No Suspense version: useHistoryVersionData
-      ...shared.suspense
-    }
-  };
-  return Object.defineProperty(bundle, kInternal4, {
-    enumerable: false
-  });
+  return getOrCreateRoomContextBundle(client);
 }
 var _RoomProvider = RoomProvider;
 var _useBroadcastEvent = useBroadcastEvent;
@@ -5595,6 +5383,10 @@ var _useMyPresence = useMyPresence;
 var _useOthersMapped = useOthersMapped;
 var _useOthersMappedSuspense = useOthersMappedSuspense;
 var _useThreads = useThreads;
+var _useFeeds = useFeeds;
+var _useFeedMessages = useFeedMessages;
+var _useFeedsSuspense = useFeedsSuspense;
+var _useFeedMessagesSuspense = useFeedMessagesSuspense;
 var _useSearchComments = useSearchComments;
 var _useThreadsSuspense = useThreadsSuspense;
 var _useRoomSubscriptionSettings = useRoomSubscriptionSettings;
@@ -5624,7 +5416,7 @@ export {
   ClientContext,
   useClientOrNull,
   useClient,
-  GlobalRoomContext,
+  RoomContext,
   useLatest,
   RegisterAiKnowledge,
   RegisterAiTool,
@@ -5681,6 +5473,12 @@ export {
   useCanUndo,
   useCanRedo,
   useOthersConnectionIds,
+  useCreateFeed,
+  useDeleteFeed,
+  useUpdateFeedMetadata,
+  useCreateFeedMessage,
+  useDeleteFeedMessage,
+  useUpdateFeedMessage,
   useCreateRoomThread,
   useDeleteRoomThread,
   useEditRoomThreadMetadata,
@@ -5691,8 +5489,8 @@ export {
   useAddRoomCommentReaction,
   useRemoveReaction,
   useRemoveRoomCommentReaction,
-  useMarkRoomThreadAsRead,
   useMarkThreadAsRead,
+  useMarkRoomThreadAsRead,
   useMarkThreadAsResolved,
   useMarkRoomThreadAsResolved,
   useMarkThreadAsUnresolved,
@@ -5727,6 +5525,10 @@ export {
   _useOthersMapped,
   _useOthersMappedSuspense,
   _useThreads,
+  _useFeeds,
+  _useFeedMessages,
+  _useFeedsSuspense,
+  _useFeedMessagesSuspense,
   _useSearchComments,
   _useThreadsSuspense,
   _useRoomSubscriptionSettings,
@@ -5744,4 +5546,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-B5F24HAT.js.map
+//# sourceMappingURL=chunk-GWYQHSXI.js.map