improvement(org): keep the member inventory out of the lighter pages' server graph

Author: waleedlatif1

apps/sim/app/o/[organizationId]/home/page.test.tsx

@@ -13,9 +13,9 @@ const mocks = vi.hoisted(() => ({ context: vi.fn(), prefetchHome: vi.fn() }))
 vi.mock('next/navigation', () => nextNavigationMock)
 vi.mock('@/lib/organizations/surface', () => ({ getOrganizationSurfaceContext: mocks.context }))
 vi.mock('@/lib/mothership/chat/lifecycle', () => mothershipChatLifecycleMock)
-vi.mock('@/platform/lib/data/prefetch', () => ({
+vi.mock('@/platform/lib/data/prefetch', () => ({}))
+vi.mock('@/platform/lib/data/prefetch-member-inventory', () => ({
   prefetchHome: mocks.prefetchHome,
-  prefetchSearch: mocks.prefetchHome,
 }))
 vi.mock('@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton', () => ({
   HomeDashboardSkeleton: ({ requestMode }: { requestMode: string }) => (

apps/sim/app/o/[organizationId]/home/page.tsx

@@ -7,7 +7,7 @@ import { Hydrated } from '@/app/o/[organizationId]/_redesign/hydrated'
 import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
 import { HomeConversation } from '@/platform/app/(shell)/home/_components/home-conversation/home-conversation'
 import { HomeDashboardSkeleton } from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton'
-import { prefetchHome } from '@/platform/lib/data/prefetch'
+import { prefetchHome } from '@/platform/lib/data/prefetch-member-inventory'
 
 export const metadata: Metadata = {
   title: 'Home',

apps/sim/app/o/[organizationId]/integrations/hydrated-integrations.tsx

@@ -5,14 +5,13 @@ import { Hydrated } from '@/app/o/[organizationId]/_redesign/hydrated'
 import { OrganizationIntegrations } from '@/app/o/[organizationId]/integrations/integrations'
 import { IntegrationsHost } from '@/app/o/[organizationId]/integrations/integrations-host'
 import { IntegrationsRouteFallback } from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-route'
-import { prefetchIntegrations } from '@/platform/lib/data/prefetch'
+import { prefetchIntegrations } from '@/platform/lib/data/prefetch-member-inventory'
 
 interface HydratedIntegrationsProps extends ComponentProps<typeof OrganizationIntegrations> {
   surface: OrganizationSurfaceContext
   principal: SessionPrincipal
 }
 
-/** The route, painted from the server's reads. */
 export function HydratedIntegrations({ surface, principal, ...route }: HydratedIntegrationsProps) {
   return (
     <Suspense

apps/sim/lib/organizations/surface.ts

@@ -58,7 +58,6 @@ export interface OrganizationSurfaceContext extends OrganizationChatAccess {
   deployment: DeploymentShape
 }
 
-/** Whether the viewer's permission group lets them connect accounts for Search. */
 export function canConnectSearchIntegrations(config: PermissionGroupConfig | null): boolean {
   return (
     !capabilityDeniedBy('integrations.manage', config) &&

apps/sim/platform/app/(shell)/search/_components/search-surface/search-history.tsx

@@ -12,7 +12,7 @@ import { InlineNotice } from '@/platform/design-system/components/status/status'
 
 const HISTORY_RECENT_LIMIT = 5
 
-/** The viewer's private recent activity, and which list is showing. A refused read shows nothing. */
+/** The viewer's private recent activity, and which list is showing. A failed read hides stale rows. */
 function useSearchLandingHistory(organizationId: string, userId: string) {
   const history = useSearchHistory(organizationId, userId)
   const clearHistory = useClearSearchHistory(organizationId, userId)

apps/sim/platform/lib/data/chat-list.ts

@@ -13,7 +13,6 @@ import {
   useSetMothershipChatPinned,
 } from '@/hooks/queries/mothership-chats'
 
-/** Assistant chats live under Search, agent chats at the chat route. */
 export function organizationChatHref(
   chat: { id: string; mode?: string },
   routes: ReturnType<typeof organizationRoutes>

apps/sim/platform/lib/data/integrations.ts

@@ -51,7 +51,7 @@ export function useMemberIntegrations(organizationId: string) {
   }
 }
 
-/** Connecting an account and letting it go, wherever accounts are offered. A failure reports itself. */
+/** A failure reports itself. */
 export function useIntegrationActions(organizationId: string) {
   const connect = useConnectOrganizationAccount()
   const reconnect = useReconnectPersonalOrganizationAccount()

apps/sim/platform/lib/data/prefetch-member-inventory.ts

@@ -0,0 +1,73 @@
+import 'server-only'
+import type { SessionPrincipal } from '@sim/auth/principal'
+import type { DehydratedState } from '@tanstack/react-query'
+import { listSearchIntegrationsContract } from '@/lib/api/contracts/knowledge/search-integrations'
+import { getOrganizationAccountsContract } from '@/lib/api/contracts/organization-accounts'
+import { getOrganizationAccountsSettings } from '@/lib/credential-groups/application/organization-accounts'
+import { canReadMemberIntegrations } from '@/lib/credential-groups/member-integrations'
+import { listSearchIntegrations } from '@/lib/knowledge/application/search-integrations'
+import {
+  ORGANIZATION_ACCOUNTS_STALE_TIME,
+  organizationAccountsKeys,
+} from '@/hooks/queries/utils/organization-accounts-keys'
+import {
+  SEARCH_INTEGRATIONS_STALE_TIME,
+  searchIntegrationKeys,
+} from '@/hooks/queries/utils/search-integration-keys'
+import { createSeeds } from '@/platform/lib/data/prefetch'
+
+type PrefetchSurface = Parameters<typeof canReadMemberIntegrations>[0] & {
+  organization: { id: string }
+}
+
+function seedMemberInventory(
+  seeds: ReturnType<typeof createSeeds>,
+  surface: PrefetchSurface,
+  principal: SessionPrincipal
+) {
+  if (!canReadMemberIntegrations(surface)) return []
+  const organizationId = surface.organization.id
+  const input = { organizationId }
+  return [
+    seeds.seed(
+      organizationAccountsKeys.detail(organizationId),
+      ORGANIZATION_ACCOUNTS_STALE_TIME,
+      async () =>
+        getOrganizationAccountsContract.response.schema.parse(
+          await getOrganizationAccountsSettings.execute({ principal, input })
+        )
+    ),
+    seeds.seed(
+      searchIntegrationKeys.list(organizationId),
+      SEARCH_INTEGRATIONS_STALE_TIME,
+      async () =>
+        listSearchIntegrationsContract.response.schema.parse({
+          success: true,
+          data: await listSearchIntegrations.execute({ principal, input }),
+        }).data
+    ),
+  ]
+}
+
+/**
+ * What decides each Home widget's state, so a viewer with no connection paints their prompt at once.
+ * Provider reads stay on the client: they can take seconds.
+ */
+export function prefetchHome(
+  surface: PrefetchSurface,
+  principal: SessionPrincipal
+): Promise<DehydratedState> {
+  const seeds = createSeeds(surface.organization.id, principal)
+  return seeds.settle([
+    ...seedMemberInventory(seeds, surface, principal),
+    ...(surface.searchAccess.memberScoped ? [seeds.searchHistory()] : []),
+  ])
+}
+
+export function prefetchIntegrations(
+  surface: PrefetchSurface,
+  principal: SessionPrincipal
+): Promise<DehydratedState> {
+  const seeds = createSeeds(surface.organization.id, principal)
+  return seeds.settle([...seedMemberInventory(seeds, surface, principal), seeds.secretSource()])
+}

apps/sim/platform/lib/data/prefetch.test.ts

@@ -39,12 +39,8 @@ vi.mock('@/lib/sim-links/application/use-cases', () => ({
   listSimLinks: { execute: mocks.links },
 }))
 
-import {
-  prefetchHome,
-  prefetchIntegrations,
-  prefetchSearch,
-  prefetchSimLinks,
-} from '@/platform/lib/data/prefetch'
+import { prefetchSearch, prefetchSimLinks } from '@/platform/lib/data/prefetch'
+import { prefetchHome, prefetchIntegrations } from '@/platform/lib/data/prefetch-member-inventory'
 
 const principal = createSessionPrincipal({ userId: 'viewer' })
 const surface = (memberScoped: boolean, canConnect = true) => ({
@@ -124,6 +120,10 @@ describe('seeding under the keys the hooks read', () => {
     expect(seeded(await prefetchSimLinks('org-1', principal, view))).toEqual([
       [...simLinksQueryOptions('org-1', term, view.sort, view.dir).queryKey],
     ])
+    expect(mocks.links).toHaveBeenCalledWith({
+      principal,
+      input: { organizationId: 'org-1', search: term || undefined, sort: view.sort, dir: view.dir },
+    })
   })
 })
 
@@ -134,10 +134,6 @@ describe('Links first paint', () => {
       sort: 'name',
       dir: 'asc',
     })
-    expect(mocks.links).toHaveBeenCalledWith({
-      principal,
-      input: { organizationId: 'org-1', search: undefined, sort: 'name', dir: 'asc' },
-    })
     const { normalizedName, ...wire } = LINK_RECORD
     expect(state.queries[0].state.data).toEqual({
       pages: [

apps/sim/platform/lib/data/prefetch.ts

@@ -2,25 +2,16 @@ import 'server-only'
 import type { SessionPrincipal } from '@sim/auth/principal'
 import { type DehydratedState, dehydrate } from '@tanstack/react-query'
 import { listSearchHistoryContract } from '@/lib/api/contracts/knowledge/search-history'
-import { listSearchIntegrationsContract } from '@/lib/api/contracts/knowledge/search-integrations'
-import { getOrganizationAccountsContract } from '@/lib/api/contracts/organization-accounts'
 import { getSecretSourceContract } from '@/lib/api/contracts/organization-secrets'
 import { listSimLinksContract } from '@/lib/api/contracts/sim-links'
 import { presentSimLinkPage } from '@/lib/api/server/sim-link-presenters'
 import { withinDeadline } from '@/lib/core/utils/deadline'
-import { getOrganizationAccountsSettings } from '@/lib/credential-groups/application/organization-accounts'
-import { canReadMemberIntegrations } from '@/lib/credential-groups/member-integrations'
 import { listSearchHistory } from '@/lib/knowledge/application/search-history'
-import { listSearchIntegrations } from '@/lib/knowledge/application/search-integrations'
 import { readOrganizationSecretSource } from '@/lib/organization-secrets/application/use-cases'
 import { listSimLinks } from '@/lib/sim-links/application/use-cases'
 import type { SimLinkSort } from '@/lib/sim-links/validation'
 import type { SortDirection } from '@/lib/url-state'
 import { makeQueryClient } from '@/app/_shell/providers/get-query-client'
-import {
-  ORGANIZATION_ACCOUNTS_STALE_TIME,
-  organizationAccountsKeys,
-} from '@/hooks/queries/utils/organization-accounts-keys'
 import {
   ORGANIZATION_SECRET_STALE_TIME,
   organizationSecretKeys,
@@ -29,10 +20,6 @@ import {
   SEARCH_HISTORY_STALE_TIME,
   searchHistoryKeys,
 } from '@/hooks/queries/utils/search-history-keys'
-import {
-  SEARCH_INTEGRATIONS_STALE_TIME,
-  searchIntegrationKeys,
-} from '@/hooks/queries/utils/search-integration-keys'
 import { SIM_LINKS_STALE_TIME, simLinkKeys } from '@/hooks/queries/utils/sim-link-keys'
 
 /** A slow read gives up its first-paint seat rather than hold the document; the client fetches it. */
@@ -42,10 +29,6 @@ function withinBudget<T>(read: () => Promise<T>) {
   return () => withinDeadline(read, Date.now() + PREFETCH_TIMEOUT_MS)
 }
 
-type PrefetchSurface = Parameters<typeof canReadMemberIntegrations>[0] & {
-  organization: { id: string }
-}
-
 interface SimLinksListView {
   search: string
   sort: SimLinkSort
@@ -56,35 +39,17 @@ interface SimLinksListView {
  * The cheap reads behind first paint. Each runs its route's use case and contract schema under its
  * hook's key, together rather than in turn. A failed or slow read stays out of hydration for the
  * client to retry, and a read the route would refuse this viewer fails the same way here.
+ *
+ * Keep these light, since each lands in its route's server graph: the member inventory, which reaches
+ * the block and tool registries, is apart in `prefetch-member-inventory.ts`.
  */
-function createSeeds(organizationId: string, principal: SessionPrincipal) {
+export function createSeeds(organizationId: string, principal: SessionPrincipal) {
   const queryClient = makeQueryClient()
   const input = { organizationId }
   const seed = <T>(queryKey: readonly unknown[], staleTime: number, read: () => Promise<T>) =>
     queryClient.prefetchQuery({ queryKey, staleTime, queryFn: withinBudget(read) })
   return {
-    memberInventory: (surface: PrefetchSurface) =>
-      canReadMemberIntegrations(surface)
-        ? [
-            seed(
-              organizationAccountsKeys.detail(organizationId),
-              ORGANIZATION_ACCOUNTS_STALE_TIME,
-              async () =>
-                getOrganizationAccountsContract.response.schema.parse(
-                  await getOrganizationAccountsSettings.execute({ principal, input })
-                )
-            ),
-            seed(
-              searchIntegrationKeys.list(organizationId),
-              SEARCH_INTEGRATIONS_STALE_TIME,
-              async () =>
-                listSearchIntegrationsContract.response.schema.parse({
-                  success: true,
-                  data: await listSearchIntegrations.execute({ principal, input }),
-                }).data
-            ),
-          ]
-        : [],
+    seed,
     searchHistory: () =>
       seed(
         searchHistoryKeys.list(organizationId, principal.userId),
@@ -128,21 +93,6 @@ function createSeeds(organizationId: string, principal: SessionPrincipal) {
   }
 }
 
-/**
- * What decides each Home widget's state, so a viewer with no connection paints their prompt at once.
- * Provider reads stay on the client: they can take seconds.
- */
-export function prefetchHome(
-  surface: PrefetchSurface,
-  principal: SessionPrincipal
-): Promise<DehydratedState> {
-  const seeds = createSeeds(surface.organization.id, principal)
-  return seeds.settle([
-    ...seeds.memberInventory(surface),
-    ...(surface.searchAccess.memberScoped ? [seeds.searchHistory()] : []),
-  ])
-}
-
 /** The history under Search's field. Results stay on the client: they are the slow live read. */
 export function prefetchSearch(
   organizationId: string,
@@ -152,15 +102,6 @@ export function prefetchSearch(
   return seeds.settle([seeds.searchHistory()])
 }
 
-/** The member inventory and secret source the Integrations pages list. */
-export function prefetchIntegrations(
-  surface: PrefetchSurface,
-  principal: SessionPrincipal
-): Promise<DehydratedState> {
-  const seeds = createSeeds(surface.organization.id, principal)
-  return seeds.settle([...seeds.memberInventory(surface), seeds.secretSource()])
-}
-
 /** The first page of the list the URL asks for. Later pages load as the table scrolls. */
 export function prefetchSimLinks(
   organizationId: string,