@ai4b-team/fsaos-gateway-sdk 3.34.2 → 3.35.1

package/dist/iife/ui.js

@@ -1,3 +1,3 @@
-/* @fsaos/ui v2.0.0 — FSAOS UI Primitives — 2026-10-03T21:58:22.099Z */
+/* @fsaos/ui v2.0.0 — FSAOS UI Primitives — 2026-10-07T03:44:34.236Z */
 "use strict";var __FSAOS_UI__=(()=>{var m=Object.create;var r=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty;var y=(e,i)=>()=>(i||e((i={exports:{}}).exports,i),i.exports),N=(e,i)=>{for(var a in i)r(e,a,{get:i[a],enumerable:!0})},s=(e,i,a,l)=>{if(i&&typeof i=="object"||typeof i=="function")for(let t of u(i))!h.call(e,t)&&t!==a&&r(e,t,{get:()=>i[t],enumerable:!(l=g(i,t))||l.enumerable});return e};var x=(e,i,a)=>(a=e!=null?m(f(e)):{},s(i||!e||!e.__esModule?r(a,"default",{value:e,enumerable:!0}):a,e)),b=e=>s(r({},"__esModule",{value:!0}),e);var d=y((V,c)=>{c.exports=React});var P={};N(P,{Badge:()=>z,Breadcrumbs:()=>A,Button:()=>D,Card:()=>w,DataView:()=>R,Detail:()=>_,Empty:()=>I,FilePreview:()=>O,Form:()=>F,Grid:()=>k,Image:()=>G,Link:()=>E,Page:()=>v,Router:()=>T,Sidebar:()=>S,Spinner:()=>B,Stack:()=>C,Table:()=>j,Tabs:()=>W,Video:()=>H});var n=x(d(),1);function o(){return(typeof window<"u"&&window.__FSAOS_CONFIG__||{}).edgeBaseUrl||""}function v(e){return(0,n.createElement)("div",{style:{minHeight:"100vh",display:"flex",flexDirection:"column"},className:e.className||""},e.children)}function C(e){let i=e.direction||"vertical";return(0,n.createElement)("div",{style:{display:"flex",flexDirection:i==="horizontal"?"row":"column",gap:e.gap||"0.5rem",padding:e.padding||"0",alignItems:e.align||"stretch",justifyContent:e.justify||"flex-start",flex:e.flex||"initial"},className:e.className||""},e.children)}function k(e){return(0,n.createElement)("div",{style:{display:"grid",gridTemplateColumns:"repeat("+(e.columns||3)+", 1fr)",gap:e.gap||"1rem",padding:e.padding||"0"},className:e.className||""},e.children)}function S(e){return(0,n.createElement)("div",{style:{display:"flex",flexDirection:"row",minHeight:"100vh"},className:e.className||""},e.children)}function w(e){return(0,n.createElement)("div",{style:{border:"1px solid var(--color-border, #e5e7eb)",borderRadius:"var(--border-radius, 0.5rem)",padding:e.padding||"1rem",background:"var(--color-surface, #fff)"},className:e.className||"",onClick:e.onClick},e.children)}function z(e){return(0,n.createElement)("span",{style:{display:"inline-flex",alignItems:"center",padding:"0.125rem 0.5rem",fontSize:"0.75rem",fontWeight:"500",borderRadius:"9999px",background:e.color||"#e5e7eb",color:e.textColor||"#374151"},className:e.className||""},e.children||e.label)}function B(e){let i=e.size||"1.5rem";return(0,n.createElement)("div",{style:{width:i,height:i,border:"2px solid #e5e7eb",borderTopColor:"var(--color-primary, #3b82f6)",borderRadius:"50%",animation:"fsaos-spin 0.6s linear infinite"}})}function D(e){return(0,n.createElement)("button",{style:{display:"inline-flex",alignItems:"center",justifyContent:"center",padding:"0.5rem 1rem",fontSize:"0.875rem",fontWeight:"500",borderRadius:"var(--border-radius, 0.375rem)",border:e.variant==="outline"?"1px solid var(--color-border, #d1d5db)":"none",background:e.variant==="outline"||e.variant==="ghost"?"transparent":"var(--color-primary, #3b82f6)",color:e.variant==="outline"||e.variant==="ghost"?"var(--color-text, #1a1a1a)":"#fff",cursor:e.disabled?"not-allowed":"pointer",opacity:e.disabled?"0.5":"1",gap:"0.5rem"},className:e.className||"",onClick:e.onClick,disabled:e.disabled},e.children||e.label)}function I(e){return(0,n.createElement)("div",{style:{display:"flex",flexDirection:"column",alignItems:"center",justifyContent:"center",padding:"3rem",color:"var(--color-text-secondary, #6b7280)",textAlign:"center"}},e.icon?(0,n.createElement)("div",{style:{fontSize:"2rem",marginBottom:"0.5rem"}},e.icon):null,(0,n.createElement)("div",{style:{fontWeight:500,marginBottom:"0.25rem"}},e.title||e.message||e.children||"No items"),e.description?(0,n.createElement)("div",{style:{fontSize:"0.875rem",opacity:.7}},e.description):null)}function R(e){return(0,n.createElement)("div",{className:e.className||""},e.children)}function j(e){return(0,n.createElement)("table",{className:e.className||""},e.children)}function F(e){return(0,n.createElement)("form",{className:e.className||"",onSubmit:e.onSubmit},e.children)}function _(e){return(0,n.createElement)("div",{className:e.className||""},e.children)}function T(e){return(0,n.createElement)("div",null,e.children)}function E(e){return(0,n.createElement)("a",{href:e.href||e.to,className:e.className||"",onClick:e.onClick},e.children)}function W(e){return(0,n.createElement)("div",{className:e.className||""},e.children)}function A(e){return(0,n.createElement)("nav",{className:e.className||""},e.children)}function G(e){return(0,n.createElement)("img",{src:e.src||(e.path?o()+e.path:""),alt:e.alt||"",className:e.className||"",style:e.style})}function H(e){return(0,n.createElement)("video",{src:e.src||(e.path?o()+e.path:""),controls:!0,className:e.className||""})}function O(e){return(0,n.createElement)("div",{className:e.className||""},e.children||"File preview")}return b(P);})();
 //# sourceMappingURL=ui.js.map

package/dist/index.cjs

@@ -782,6 +782,10 @@ function listingTypes(filter) {
 }
 function affectsListing(query, filter, event) {
   if (containsChangedItem(query, event)) return true;
+  if (filter.spaceIds !== void 0) {
+    if (!filter.spaceIds.length) return false;
+    if (event.space_item_id !== void 0 && !filter.spaceIds.includes(event.space_item_id) && !filter.spaceIds.includes(event.old_space_item_id)) return false;
+  }
   const scope = filter.scope;
   const scoped = typeof scope === "string" && scope !== "__unscoped__";
   const hasPath = typeof event.path === "string" || typeof event.old_path === "string";
@@ -825,6 +829,29 @@ function clearInfiniteItemsRefreshes(client2) {
   pending2.delete(client2);
 }
 
+// src/items-selection.ts
+var SelectedSpaceContractError = class extends Error {
+  constructor() {
+    super("The server did not confirm the selected-Space listing contract");
+  }
+};
+function assertItemsSelection(requested, returned) {
+  if (!Array.isArray(returned) || returned.some((id) => typeof id !== "string") || JSON.stringify([...new Set(returned)].sort()) !== JSON.stringify(requested)) {
+    throw new SelectedSpaceContractError();
+  }
+}
+function normalizeItemsSelection(filter) {
+  if (!filter || filter.spaceIds === void 0) return filter;
+  return {
+    ...filter,
+    spaceIds: [...new Set(filter.spaceIds.map((id) => id.toLowerCase()))].sort(),
+    ...filter.limit !== void 0 ? { limit: Math.max(1, Math.min(filter.limit, 500)) } : {}
+  };
+}
+function unavailableItemsSelection(error) {
+  return error instanceof SelectedSpaceContractError || error instanceof EnforcementDeniedError || error instanceof GatewayRequestError && (error.payload?.error === "SPACE_SELECTION_UNAVAILABLE" || error.payload?.error === "QUERY_PARAMS_INVALID" || error.status === 401 || error.status === 403);
+}
+
 // src/vfs-keys.ts
 function sk() {
   return getScope() ?? "__unscoped__";
@@ -847,7 +874,7 @@ var vfsKeys = {
   /** Search results (scope-aware — search is scoped). */
   search: (query, types) => ["vfs", sk(), "search", query, ...types ?? []],
   /** Items query (type-based listing with filters, scope-aware). */
-  items: (type, filters) => ["vfs", sk(), "items", type, JSON.stringify(filters ?? {})],
+  items: (type, filters) => ["vfs", sk(), "items", type, JSON.stringify(normalizeItemsSelection(filters ?? {}))],
   /** All items queries for current scope (for broad invalidation). */
   allItems: () => ["vfs", sk(), "items"],
   /** Recursive tree at a path + depth (scope-aware). */
@@ -1737,12 +1764,15 @@ function itemsFilterFromQueryFilter(typeData, extra = {}) {
   return { ...filter, ...extra };
 }
 async function fetchItems(filter, options = {}) {
+  filter = normalizeItemsSelection(filter);
+  if (filter.spaceIds?.length === 0) return { items: [], total_hint: 0 };
   const params = {};
   if (filter.type) params.item_type = filter.type;
   if (filter.scope) {
     params.scope_path = filter.scope;
   }
   const filters = {};
+  if (filter.spaceIds !== void 0) filters.space_ids = filter.spaceIds;
   if (filter.name) filters.name = filter.name;
   if (filter.tag) filters.tag = filter.tag;
   if (filter.parent_id) filters.parent_id = filter.parent_id;
@@ -1769,6 +1799,9 @@ async function fetchItems(filter, options = {}) {
   }
   try {
     const response = await gatewayCall("query", params);
+    if (filter.spaceIds !== void 0) {
+      assertItemsSelection(filter.spaceIds, response.selected_space_ids ?? response.content?.selected_space_ids);
+    }
     const items = extractItems(response);
     for (const item of items) {
       getQueryClient().setQueryData(vfsKeys.item(item.path), item);
@@ -1776,7 +1809,7 @@ async function fetchItems(filter, options = {}) {
     return { items, total_hint: response.total ?? response.content?.total ?? items.length };
   } catch (err) {
     console.error(`[gateway] Failed to fetch items of type ${filter.type ?? "(any_of)"}:`, err);
-    if (options.throwOnError) throw err;
+    if (options.throwOnError || filter.spaceIds !== void 0) throw err;
     return { items: [], total_hint: 0 };
   }
 }
@@ -2109,7 +2142,7 @@ function handleCcmChange(data) {
   const sourceId = data.source_item_id || data.source_id;
   const targetId = data.target_item_id || data.target_id;
   const looksEdgeRelated = data.edge_type != null || sourceId != null || targetId != null;
-  if (!looksEdgeRelated) return;
+  if (!looksEdgeRelated || !sourceId && !targetId || data.item_type === "message") return;
   const debounceKey = `ccm:${sourceId ?? ""}:${targetId ?? ""}`;
   const existing = debounceTimers.get(debounceKey);
   if (existing) clearTimeout(existing);
@@ -2121,11 +2154,6 @@ function handleCcmChange(data) {
     if (targetId) {
       getQueryClient().invalidateQueries({ queryKey: vfsKeys.edges(targetId) });
     }
-    if (!sourceId && !targetId) {
-      getQueryClient().invalidateQueries({
-        predicate: (query) => query.queryKey[0] === "vfs" && query.queryKey[1] === "edges"
-      });
-    }
   }, DEBOUNCE_MS);
   debounceTimers.set(debounceKey, timer);
 }
@@ -2307,6 +2335,148 @@ function replaceMounts(refs, anchor) {
   });
 }
 
+// src/mounted-reader-events.ts
+function inMountedReadScope(event) {
+  if (typeof event.path !== "string") return false;
+  const roots = [...getMounts().map((mount3) => mount3.path), getAnchorRef()?.path].filter((path) => !!path);
+  if (!roots.length && getScope()) roots.push(getScope());
+  return roots.some((root) => isChannelPath(event.path, root));
+}
+
+// src/channel-message-events.ts
+function channelMessageChange(event, channelPath, parentId, messages) {
+  if (!["message", "card"].includes(event?.item_type) || !isChannelPath(event.path, channelPath)) return false;
+  if (!parentId) return true;
+  if (event.item_id === parentId || event.parent_id === parentId) return true;
+  return messages.some((message) => {
+    if (event.item_id === message.id || event.parent_id === message.id) return true;
+    const root = message.id === parentId ? message.path : message.parent_message_id === parentId ? message.path.slice(0, message.path.lastIndexOf("/")) : void 0;
+    return !!root && isChannelPath(event.path, root);
+  });
+}
+
+// src/channel-realtime.ts
+var watches = /* @__PURE__ */ new WeakMap();
+function watchChannels(client2, key, normalize) {
+  let entries = watches.get(client2);
+  if (!entries) {
+    entries = /* @__PURE__ */ new Map();
+    watches.set(client2, entries);
+  }
+  const hash = JSON.stringify(key);
+  let watch = entries.get(hash);
+  if (!watch) {
+    let stopped = false;
+    let timer;
+    let running = false;
+    let inventory = false;
+    const channels = /* @__PURE__ */ new Set();
+    const renames = /* @__PURE__ */ new Set();
+    const current = () => client2.getQueryData(key) ?? [];
+    const schedule2 = () => {
+      if (stopped || running || timer) return;
+      timer = setTimeout(() => {
+        timer = void 0;
+        void flush();
+      }, 250);
+    };
+    const flush = async () => {
+      if (stopped) return;
+      running = true;
+      const reload = inventory;
+      inventory = false;
+      const pending3 = [...channels];
+      const checkRename = new Set(renames);
+      renames.clear();
+      channels.clear();
+      try {
+        if (reload) {
+          await refreshQuery(client2, key, { exact: true });
+        } else {
+          const results = await Promise.allSettled(pending3.map(async (id) => {
+            const owner = client2.getQueryCache().find({ queryKey: key, exact: true });
+            if (!owner) return;
+            const result = await gatewayCall("read", { id });
+            if (result.success === false) throw new Error("Channel refresh failed");
+            if (stopped || !owner || client2.getQueryCache().find({ queryKey: key, exact: true }) !== owner) return;
+            const raw = normalizeItem(result.item ?? result);
+            if (raw.id !== id || raw.item_type !== "channel") return;
+            const previous = current().find((item2) => item2.id === id);
+            if (!previous) return;
+            const item = normalize({ ...raw });
+            const next = {
+              ...previous,
+              path: item.path,
+              name: item.name,
+              displayName: item.displayName,
+              messageCount: item.messageCount,
+              aiMode: item.aiMode,
+              isPrivate: item.isPrivate,
+              isDm: item.isDm,
+              autoPilot: item.autoPilot,
+              updatedAt: item.updatedAt
+            };
+            if (checkRename.has(id) && (previous.name !== next.name || previous.displayName !== next.displayName || previous.path !== next.path)) {
+              inventory = true;
+            }
+            client2.setQueryData(key, (list) => list?.map((item2) => item2.id === id ? next : item2));
+          }));
+          const failed = results.find((result) => result.status === "rejected");
+          if (failed?.status === "rejected") throw failed.reason;
+        }
+      } catch (error) {
+        console.warn("[channels] refresh failed", error);
+      } finally {
+        running = false;
+        if (inventory || channels.size) schedule2();
+      }
+    };
+    const inScope = (data) => {
+      if (current().some((c) => c.id === data.item_id || c.path === data.path)) return true;
+      return inMountedReadScope(data);
+    };
+    const onChannel = (data) => {
+      if (!inScope(data)) return;
+      const action = String(data.action ?? "").toLowerCase();
+      if (["insert", "delete", "rename", "move"].includes(action)) inventory = true;
+      else if (action === "update") {
+        const channel = current().find((c) => c.id === data.item_id || c.path === data.path);
+        if (channel) {
+          channels.add(channel.id);
+          renames.add(channel.id);
+        }
+      }
+      if (inventory || channels.size) schedule2();
+    };
+    const onMessage = (data) => {
+      const channel = current().find((c) => c.id === data.parent_id);
+      if (!channel) return;
+      channels.add(channel.id);
+      schedule2();
+    };
+    const stops = ["vfs_change", "ccm_change"].flatMap((type) => [
+      subscribeToEvents(type, onChannel, (data) => data.item_type === "channel"),
+      subscribeToEvents(type, onMessage, (data) => data.item_type === "message")
+    ]);
+    watch = { users: 0, stop: () => {
+      stopped = true;
+      if (timer) clearTimeout(timer);
+      stops.forEach((stop) => stop());
+    } };
+    entries.set(hash, watch);
+  }
+  watch.users++;
+  let released = false;
+  return () => {
+    if (released) return;
+    released = true;
+    if (--watch.users === 0) {
+      watch.stop();
+      entries.delete(hash);
+    }
+  };
+}
+
 // src/hooks.ts
 function useScopeKey() {
   return React.useSyncExternalStore(subscribeScope, getScopeVersion, getScopeVersion);
@@ -2390,22 +2560,28 @@ function useResolve(params) {
 }
 function useItems(filter) {
   useScopeKey();
-  const stableFilter = React.useMemo(() => filter, [JSON.stringify(filter)]);
-  return reactQuery.useQuery({
+  const selected = normalizeItemsSelection(filter);
+  const stableFilter = React.useMemo(() => selected, [JSON.stringify(selected)]);
+  const query = reactQuery.useQuery({
     queryKey: vfsKeys.items(
       stableFilter?.type ?? "",
       stableFilter
     ),
     queryFn: () => fetchItems(stableFilter),
     enabled: isListableItemsFilter(stableFilter),
+    ...stableFilter?.spaceIds !== void 0 ? {
+      retry: (attempt, error) => !unavailableItemsSelection(error) && attempt < 1
+    } : {},
     select: (result) => result.items
   });
+  return stableFilter?.spaceIds !== void 0 && unavailableItemsSelection(query.error) ? { ...query, data: void 0 } : query;
 }
 function useInfiniteItems(filter, options = {}) {
   const scopeKey = useScopeKey();
   const { realtime = false } = options;
-  const PAGE_SIZE = filter?.limit ?? 20;
-  const stableFilter = React.useMemo(() => filter, [JSON.stringify(filter)]);
+  const selected = normalizeItemsSelection(filter);
+  const PAGE_SIZE = selected?.limit ?? 20;
+  const stableFilter = React.useMemo(() => selected, [JSON.stringify(selected)]);
   const stableKey = React.useMemo(() => ["vfs", getScope() ?? "__unscoped__", "infinite-items", stableFilter?.type ?? "", JSON.stringify(stableFilter ?? {})], [scopeKey, stableFilter]);
   const query = reactQuery.useInfiniteQuery({
     queryKey: stableKey,
@@ -2418,16 +2594,21 @@ function useInfiniteItems(filter, options = {}) {
     },
     initialPageParam: 0,
     getNextPageParam: (lastPage, _allPages, lastPageParam) => {
+      if (stableFilter?.spaceIds !== void 0 && lastPage.total_hint !== void 0 && lastPageParam + lastPage.items.length >= lastPage.total_hint) return void 0;
       if (lastPage.items.length < PAGE_SIZE) return void 0;
       return lastPageParam + lastPage.items.length;
     },
     enabled: isListableItemsFilter(stableFilter),
+    ...stableFilter?.spaceIds !== void 0 ? {
+      retry: (attempt, error) => !unavailableItemsSelection(error) && attempt < 1
+    } : {},
     // Realtime marks the cache stale only on relevant changes or reconnect.
     // Expanding a channel or handing it to another observer reuses its pages.
     staleTime: realtime ? Infinity : void 0,
     meta: realtime && stableFilter ? { infiniteItemsRealtime: { filter: stableFilter } } : {}
   });
   const allItems = React.useMemo(() => {
+    if (stableFilter?.spaceIds !== void 0 && unavailableItemsSelection(query.error)) return [];
     if (!query.data?.pages) return [];
     const seen = /* @__PURE__ */ new Set();
     const flat = [];
@@ -2440,17 +2621,18 @@ function useInfiniteItems(filter, options = {}) {
       }
     }
     return flat;
-  }, [query.data?.pages]);
+  }, [query.data?.pages, query.error, stableFilter]);
+  const unavailable = stableFilter?.spaceIds !== void 0 && unavailableItemsSelection(query.error);
   return {
     allItems,
     refetch: query.refetch,
     fetchNextPage: query.fetchNextPage,
     isFetchingNextPage: query.isFetchingNextPage,
-    isExhausted: !query.hasNextPage,
+    isExhausted: unavailable || !query.hasNextPage,
     isLoading: query.isLoading,
     isFetching: query.isFetching,
     error: query.error,
-    totalHint: query.data?.pages?.[0]?.total_hint
+    totalHint: unavailable ? void 0 : query.data?.pages?.[0]?.total_hint
   };
 }
 function useInfiniteChildren(path) {
@@ -2758,10 +2940,15 @@ function useMounts() {
   useScopeKey();
   const version = React.useSyncExternalStore(subscribeMounts, getMountVersion, getMountVersion);
   const mounts = React.useMemo(() => getMounts(), [version]);
+  const anchor = getAnchorRef();
+  const selectedSpaces = React.useMemo(() => mounts.filter((ref) => ref.kind === "space" && (anchor?.kind === "account" || ref.id === anchor?.id)), [mounts, anchor]);
+  const readSpaceIds = React.useMemo(() => selectedSpaces.map((ref) => ref.id).sort(), [selectedSpaces]);
   return {
     mounts,
+    selectedSpaces,
+    readSpaceIds,
     homeAnchor: getHomeAnchor(),
-    anchor: getAnchorRef(),
+    anchor,
     setAnchor: selectMount,
     replaceMounts,
     mount,
@@ -3267,15 +3454,18 @@ function useChannelMessages(options) {
           void refreshQuery(qc, stableKey, { exact: true });
         }, 500);
       },
-      (data) => {
-        return (data.item_type === "message" || data.item_type === "card") && isChannelPath(data.path, channelPath);
-      }
+      (data) => channelMessageChange(
+        data,
+        channelPath,
+        parentMessageId,
+        qc.getQueryData(stableKey)?.messages ?? []
+      )
     );
     return () => {
       unsub();
       if (debounceRef.current) clearTimeout(debounceRef.current);
     };
-  }, [realtime, isEnabled, channelPath, stableKey, qc]);
+  }, [realtime, isEnabled, channelPath, parentMessageId, stableKey, qc]);
   const response = query.data;
   const messages = response?.messages ?? [];
   const messageCards = response?.messageCards ?? /* @__PURE__ */ new Map();
@@ -3462,9 +3652,12 @@ function useInfiniteChannelMessages(options) {
           void tail();
         }, 500);
       },
-      (data) => {
-        return (data.item_type === "message" || data.item_type === "card") && isChannelPath(data.path, channelPath);
-      }
+      (data) => channelMessageChange(
+        data,
+        channelPath,
+        parentMessageId,
+        qc.getQueryData(stableKey)?.pages.flatMap((page) => page.messages) ?? []
+      )
     );
     return () => {
       disposed = true;
@@ -3532,7 +3725,6 @@ function useAllChannels(options = {}) {
   const scopeKey = useScopeKey();
   const { realtime = true, enabled: enabled2 = true } = options;
   const qc = reactQuery.useQueryClient();
-  const debounceRef = React.useRef(null);
   const stableKey = React.useMemo(() => vfsKeys.channels("all"), [scopeKey]);
   const query = reactQuery.useQuery({
     queryKey: stableKey,
@@ -3549,31 +3741,7 @@ function useAllChannels(options = {}) {
   });
   React.useEffect(() => {
     if (!realtime || !enabled2) return;
-    const unsub = subscribeToEvents(
-      "vfs_change",
-      () => {
-        if (debounceRef.current) clearTimeout(debounceRef.current);
-        debounceRef.current = setTimeout(() => {
-          qc.invalidateQueries({ queryKey: stableKey });
-        }, 1e3);
-      },
-      (data) => data.item_type === "channel" || data.item_type === "message"
-    );
-    const unsub2 = subscribeToEvents(
-      "ccm_change",
-      () => {
-        if (debounceRef.current) clearTimeout(debounceRef.current);
-        debounceRef.current = setTimeout(() => {
-          qc.invalidateQueries({ queryKey: stableKey });
-        }, 1e3);
-      },
-      (data) => data.item_type === "channel" || data.item_type === "message"
-    );
-    return () => {
-      unsub();
-      unsub2();
-      if (debounceRef.current) clearTimeout(debounceRef.current);
-    };
+    return watchChannels(qc, stableKey, normalizeChannel);
   }, [realtime, enabled2, stableKey, qc]);
   const channels = query.data ?? [];
   return {
@@ -3632,7 +3800,7 @@ function useNotifications(options = {}) {
             qc.invalidateQueries({ queryKey: stableKey });
           }, 2e3);
         },
-        (data) => data.item_type === "notification" || data.item_type === "message"
+        (data) => data.item_type === "notification" && inMountedReadScope(data)
       )
     );
     return () => {
@@ -3859,6 +4027,8 @@ function useEventStream(handlerOrEventType, handlerOrOptions, filter) {
 function useRealtimeQuery(options) {
   const { queryKey, queryFn, eventType, filter, enabled: enabled2 = true, debounceMs = 500 } = options;
   const qc = reactQuery.useQueryClient();
+  const filterRef = React.useRef(filter);
+  filterRef.current = filter;
   const debounceRef = React.useRef(null);
   const query = reactQuery.useQuery({
     queryKey,
@@ -3872,10 +4042,10 @@ function useRealtimeQuery(options) {
       () => {
         if (debounceRef.current) clearTimeout(debounceRef.current);
         debounceRef.current = setTimeout(() => {
-          qc.invalidateQueries({ queryKey });
+          void refreshQuery(qc, queryKey, { exact: true });
         }, debounceMs);
       },
-      filter
+      (data) => filterRef.current?.(data) ?? true
     );
     return () => {
       unsub();
@@ -5487,11 +5657,11 @@ function useTimelineHistory(channelPath, options) {
           qc.invalidateQueries({ queryKey });
         }, debounceMs);
       },
-      // Filter: only react to changes on or under the dataset path
+      // Rows are written to the dataset item, not descendant items.
       (data) => {
         const eventPath = data?.path;
         if (!eventPath) return false;
-        return eventPath === datasetPath || eventPath.startsWith(datasetPath + "/");
+        return eventPath === datasetPath && data.item_type === "dataset";
       }
     );
     return () => {