improvement(org): settle Home's caches, URL key, and skeleton after review

Widget reads now refresh from every surface that changes an account, the search
history keys leave the auth client's module so the server prefetch stays light,
the day param moves to its own file, and the tests are aimed at the branches
they claim to cover.

Author: waleedlatif1

apps/sim/app/o/[organizationId]/components/organization-conversation-landing.test.tsx

@@ -134,7 +134,7 @@ afterEach(async () => {
 })
 
 describe('an Assistant conversation on a surface with its own landing', () => {
-  it('arranges the real composer and the mode’s shortcuts in the surface’s landing', async () => {
+  it('hands its composer and the Assistant shortcuts to the surface’s landing, in place of the default heading', async () => {
     await render(
       <OrganizationConversation
         requestMode='assistant'

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

@@ -100,10 +100,20 @@ describe('organization Search page gates', () => {
     await expect(OrganizationPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/home')
   })
 
-  it('gives a builder Home with the agent', async () => {
-    expect(renderToStaticMarkup(await OrganizationHomePage({ params }))).toContain('Home for agent')
-    await expect(OrganizationPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/home')
-  })
+  it.each([true, false])(
+    'gives a builder Home with the agent (Search access: %s)',
+    async (memberScoped) => {
+      mocks.context.mockResolvedValue({
+        mothershipAvailable: true,
+        canBuild: true,
+        searchAccess: { memberScoped },
+      })
+      expect(renderToStaticMarkup(await OrganizationHomePage({ params }))).toContain(
+        'Home for agent'
+      )
+      await expect(OrganizationPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/home')
+    }
+  )
 
   it('sends a member without the Assistant to Search, where Home has no conversation to hold', async () => {
     mocks.context.mockResolvedValue({ ...searchOnlyMember, mothershipAvailable: false })
@@ -116,7 +126,7 @@ describe('organization Search page gates', () => {
     await expect(OrganizationChatPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/search')
   })
 
-  it('routes chat URLs exactly where Home routes the same viewer, before loading the chat', async () => {
+  it('sends a viewer with no conversation here away from chat URLs, before loading the chat', async () => {
     mocks.context.mockResolvedValue({
       mothershipAvailable: true,
       canBuild: false,

apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx

@@ -71,8 +71,8 @@ import type { ResourceScope } from '@/lib/core/resource-scope'
 import { SearchLandingHistory } from '@/app/o/[organizationId]/components/search-landing-history'
 import { OrganizationSearch } from '@/app/o/[organizationId]/search/search'
 import { KnowledgeSearchResults } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results'
-import { searchHistoryKeys } from '@/hooks/queries/search-history'
 import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
+import { searchHistoryKeys } from '@/hooks/queries/utils/search-history-keys'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 
 nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization/search')

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx

@@ -323,7 +323,8 @@ let queryClient: QueryClient
 
 function renderUseChat(
   owner: string | { organizationId: string } = 'ws-1',
-  requestMode?: 'agent' | 'assistant'
+  requestMode?: 'agent' | 'assistant',
+  getChatUrl?: (chatId: string) => string
 ): {
   getResult: () => ReturnType<typeof useChat>
   unmount: () => void
@@ -337,7 +338,7 @@ function renderUseChat(
   let result: ReturnType<typeof useChat> | undefined
 
   function Probe() {
-    result = useChat(owner, undefined, { requestMode })
+    result = useChat(owner, undefined, { requestMode, getChatUrl })
     return null
   }
 
@@ -1165,7 +1166,11 @@ describe('useChat remount send recovery', () => {
     mockUsePathname.mockReturnValue('/o/org-1/home')
     state.postBehavior = 'task'
     const replace = vi.spyOn(window.history, 'replaceState')
-    const { getResult, selectMode } = renderUseChat({ organizationId: 'org-1' }, 'assistant')
+    const { getResult, selectMode } = renderUseChat(
+      { organizationId: 'org-1' },
+      'assistant',
+      (id) => `/o/org-1/search/chat/${id}?mode=assistant`
+    )
     await act(async () => {
       void getResult().sendMessage('What changed in the renewal policy?', undefined, undefined, {
         requestMode: 'assistant',
@@ -1174,7 +1179,7 @@ describe('useChat remount send recovery', () => {
     await waitFor(() => getResult().resolvedChatId === DEDUPED_CHAT_ID)
     expect(state.postBodies[0]).toMatchObject({ mode: 'assistant' })
     const chatPath = `/o/org-1/search/chat/${DEDUPED_CHAT_ID}`
-    expect(replace).toHaveBeenCalledWith(null, '', chatPath)
+    expect(replace).toHaveBeenCalledWith(null, '', `${chatPath}?mode=assistant`)
 
     mockUsePathname.mockReturnValue(chatPath)
     selectMode('assistant')

apps/sim/hooks/queries/organization-accounts.ts

@@ -47,6 +47,7 @@ import { connectCredentialGroupInPopup } from '@/lib/credential-groups/oauth-pop
 import { isDesktopApp } from '@/lib/desktop'
 import { connectDesktopSource } from '@/lib/desktop/source-connect'
 import { assistantActionKeys } from '@/hooks/queries/assistant-actions'
+import { organizationHomeKeys } from '@/hooks/queries/organization-home'
 import { personalCredentialKeys } from '@/hooks/queries/personal-credentials'
 import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 import {
@@ -154,6 +155,9 @@ export function useDisconnectPersonalOrganizationAccount() {
           queryKey: organizationAccountsKeys.detail(organizationId),
         }),
         queryClient.invalidateQueries({ queryKey: organizationAccountsKeys.personal() }),
+        queryClient.invalidateQueries({
+          queryKey: organizationHomeKeys.organization(organizationId),
+        }),
       ])
       router.refresh()
     },
@@ -251,13 +255,17 @@ export function useUpdateOrganizationAccounts() {
           queryKey: slackSearchKeys.organizationManifests(organizationId),
         }),
         queryClient.invalidateQueries({ queryKey: slackSearchKeys.list(organizationId) }),
+        queryClient.invalidateQueries({
+          queryKey: organizationHomeKeys.organization(organizationId),
+        }),
       ]),
   })
 }
 
 async function refreshAccounts(client: ReturnType<typeof useQueryClient>) {
   await Promise.all([
     client.invalidateQueries({ queryKey: organizationAccountsKeys.all }),
+    client.invalidateQueries({ queryKey: organizationHomeKeys.all }),
     client.invalidateQueries({ queryKey: assistantActionKeys.permissions() }),
     client.invalidateQueries({ queryKey: personalCredentialKeys.lists() }),
     client.invalidateQueries({ queryKey: mcpKeys.managedCatalog() }),

apps/sim/hooks/queries/organization-home.ts

@@ -32,7 +32,7 @@ export function useOrganizationHomeEmail(
     queryKey: organizationHomeKeys.email(organizationId),
     queryFn: ({ signal }) =>
       requestJson(getOrganizationHomeEmailContract, { params: { id: organizationId }, signal }),
-    enabled,
+    enabled: Boolean(organizationId) && enabled,
     staleTime: EMAIL_STALE_TIME,
     refetchOnWindowFocus: true,
   })
@@ -52,7 +52,7 @@ export function useOrganizationHomeCalendar(
         query: { date, timeZone },
         signal,
       }),
-    enabled,
+    enabled: Boolean(organizationId && date) && enabled,
     staleTime: CALENDAR_STALE_TIME,
     refetchOnWindowFocus: true,
   })

apps/sim/hooks/queries/search-history.ts

@@ -9,14 +9,10 @@ import {
   type SearchHistoryResponse,
 } from '@/lib/api/contracts/knowledge/search-history'
 import { useSession } from '@/lib/auth/client'
-
-export const SEARCH_HISTORY_STALE_TIME = 30_000
-export const searchHistoryKeys = {
-  all: ['search-history'] as const,
-  lists: () => [...searchHistoryKeys.all, 'list'] as const,
-  list: (organizationId: string | undefined, userId: string | undefined) =>
-    [...searchHistoryKeys.lists(), organizationId ?? '', userId ?? ''] as const,
-}
+import {
+  SEARCH_HISTORY_STALE_TIME,
+  searchHistoryKeys,
+} from '@/hooks/queries/utils/search-history-keys'
 
 export function useSearchHistory(organizationId: string | undefined) {
   const { data: session } = useSession()

apps/sim/hooks/queries/utils/search-history-keys.ts

@@ -0,0 +1,8 @@
+export const SEARCH_HISTORY_STALE_TIME = 30_000
+
+export const searchHistoryKeys = {
+  all: ['search-history'] as const,
+  lists: () => [...searchHistoryKeys.all, 'list'] as const,
+  list: (organizationId: string | undefined, userId: string | undefined) =>
+    [...searchHistoryKeys.lists(), organizationId ?? '', userId ?? ''] as const,
+}

apps/sim/lib/organizations/application/home-widgets.integration.ts

@@ -337,16 +337,18 @@ describe('whose mail a widget reads', () => {
 describe('what a widget reports', () => {
   it('refuses a member with no integrations surface, before any provider', async () => {
     serveProviders()
+    const real = await organizationSurface.getOrganizationSurfaceContext(organizationId, memberId)
+    if (!real) throw new Error('Fixture member has no organization surface')
     const surface = vi.spyOn(organizationSurface, 'getOrganizationSurfaceContext')
-    surface.mockResolvedValueOnce(null)
+    surface.mockResolvedValueOnce({ ...real, connectedAccountsAvailable: false })
     await expect(
       readOrganizationHomeEmail.execute({ principal: session(memberId), input })
     ).rejects.toMatchObject({ code: 'forbidden' })
     expect(provider).not.toHaveBeenCalled()
     surface.mockRestore()
   })
 
-  it('asks the provider once more with a fresh token when two reads race a rejection', async () => {
+  it('settles both reads on reconnect when they race a token the provider refuses', async () => {
     provider.mockImplementation(async () => providerResponse({ error: 'provider text' }, 401))
     const [email, calendar] = await Promise.all([
       readOrganizationHomeEmail.execute({ principal: session(memberId), input }),

apps/sim/lib/organizations/application/home-widgets.ts

@@ -50,7 +50,6 @@ import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 
 const logger = createLogger('OrganizationHomeWidgets')
 
-/** A widget gives up on a slow provider rather than holding its request open. */
 const READ_TIMEOUT_MS = 20_000
 
 /**