feat(search): move assistant into organization search

Author: waleedlatif1

apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx

@@ -3,11 +3,11 @@ import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getAccessibleCopilotChatAuth } from '@/lib/mothership/chat/lifecycle'
-import { WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
+import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import OrganizationChatLoading from '@/app/o/[organizationId]/chat/[chatId]/loading'
+import { OrganizationConversation } from '@/app/o/[organizationId]/components/organization-conversation'
 import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
-import { OrganizationHome } from '@/app/o/[organizationId]/home/organization-home'
 
 export const metadata: Metadata = { title: 'Chat' }
 
@@ -21,27 +21,24 @@ export default async function OrganizationChatPage({
   if (!session?.user?.id) notFound()
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
-  if (homeRedirect) redirect(homeRedirect)
+  if (!context.mothershipAvailable || (!context.canBuild && !context.searchAccess.memberScoped)) {
+    const unavailableRedirect = getOrganizationHomeRedirect(context, organizationId)
+    if (unavailableRedirect) redirect(unavailableRedirect)
+  }
   const chat = await getAccessibleCopilotChatAuth(chatId, session.user.id, {
     principal: { kind: 'session', userId: session.user.id, sessionId: session.session.id },
   })
   if (!chat || chat.type !== 'mothership' || chat.organizationId !== organizationId) notFound()
   if (chat.mode === 'assistant') {
     if (!context.searchAccess.memberScoped) redirect(WORKSPACE_SETTINGS_PATH)
-    return (
-      <Suspense fallback={<OrganizationChatLoading />}>
-        <OrganizationHome
-          requestMode='assistant'
-          userName={session.user.name ?? undefined}
-          chatId={chatId}
-        />
-      </Suspense>
-    )
+    redirect(organizationRoutes(organizationId).searchChat(chatId))
   }
+  const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
+  if (homeRedirect) redirect(homeRedirect)
+
   return (
     <Suspense fallback={<OrganizationChatLoading />}>
-      <OrganizationHome
+      <OrganizationConversation
         userName={session.user.name ?? undefined}
         chatId={chatId}
         requestMode={chat.mode}

…ationId]/home/organization-home.test.tsx …nents/organization-conversation.test.tsxapps/sim/app/o/[organizationId]/home/organization-home.test.tsx renamed to apps/sim/app/o/[organizationId]/components/organization-conversation.test.tsx apps/sim/app/o/[organizationId]/home/organization-home.test.tsx renamed to apps/sim/app/o/[organizationId]/components/organization-conversation.test.tsx

@@ -15,12 +15,12 @@ import {
   organizationProviderMockFns,
 } from '@sim/testing/mocks/organization-provider.mock'
 import { reactQueryMock } from '@sim/testing/mocks/react-query.mock'
+import { toRecord } from '@sim/utils/object'
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AuthorizedAppsPage } from '@/lib/api/contracts/user'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
-import { useOrganizationChatModeStore } from '@/stores/organization-chat-mode/store'
 
 const mocks = vi.hoisted(() => ({
   plan: false,
@@ -90,8 +90,8 @@ vi.mock('@/app/workspace/[workspaceId]/home/components/mothership-chat', () => (
   MothershipChat: mocks.renderer,
 }))
 
+import { OrganizationConversation } from '@/app/o/[organizationId]/components/organization-conversation'
 import type { Composer } from '@/app/o/[organizationId]/home/components/composer'
-import { OrganizationHome } from '@/app/o/[organizationId]/home/organization-home'
 
 const mockSession = authClientMockFns.mockUseSession
 const mockContext = organizationProviderMockFns.mockUseOrganizationContext
@@ -106,7 +106,6 @@ beforeEach(() => {
   mocks.plan = false
   mocks.activeResource = null
   mockSession.mockReturnValue({ data: { user: { id: 'reader' } } })
-  useOrganizationChatModeStore.setState({ modes: {}, assistantSearchLevels: {} })
   mocks.resourcePanel.mockImplementation(({ children }: { children: ReactNode }) => children)
   vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
   vi.stubGlobal(
@@ -151,7 +150,9 @@ function renderHome(element: ReactNode, searchParams = '') {
   )
 }
 function composerProps(): ComponentProps<typeof Composer> {
-  return mocks.composer.mock.lastCall![0]
+  const call = mocks.composer.mock.lastCall
+  if (!call) throw new Error('Composer has not rendered')
+  return call[0]
 }
 
 async function attachDraftImage() {
@@ -186,11 +187,17 @@ describe('organization home', () => {
       sendMessage: mocks.send,
     })
     mocks.renderer.mockImplementation(({ composer }: { composer: ReactNode }) => composer)
-    await act(async () => renderHome(<OrganizationHome chatId='chat-a' />))
+    await act(async () =>
+      renderHome(<OrganizationConversation requestMode='agent' chatId='chat-a' />)
+    )
     await act(async () => composerProps().onChange('A draft for chat A'))
-    await act(async () => renderHome(<OrganizationHome chatId='chat-a' />))
+    await act(async () =>
+      renderHome(<OrganizationConversation requestMode='agent' chatId='chat-a' />)
+    )
     expect(composerProps().value).toBe('A draft for chat A')
-    await act(async () => renderHome(<OrganizationHome chatId='chat-b' />))
+    await act(async () =>
+      renderHome(<OrganizationConversation requestMode='agent' chatId='chat-b' />)
+    )
     expect(composerProps().value).toBe('')
     expect(mocks.chat).toHaveBeenLastCalledWith(
       { organizationId: 'organization-a' },
@@ -205,22 +212,32 @@ describe('organization home', () => {
 
 it('isolates saved drafts by user, organization, and conversation', async () => {
   mocks.renderer.mockImplementation(({ composer }: { composer: ReactNode }) => composer)
-  await act(async () => renderHome(<OrganizationHome chatId='chat-a' requestMode='assistant' />))
+  await act(async () =>
+    renderHome(<OrganizationConversation chatId='chat-a' requestMode='assistant' />)
+  )
   await attachDraftImage()
   await act(async () => composerProps().onChange('Chat A follow-up'))
-  await act(async () => renderHome(<OrganizationHome chatId='chat-b' requestMode='assistant' />))
+  await act(async () =>
+    renderHome(<OrganizationConversation chatId='chat-b' requestMode='assistant' />)
+  )
   expect(composerProps().value).toBe('')
-  await act(async () => renderHome(<OrganizationHome chatId='chat-a' requestMode='assistant' />))
+  await act(async () =>
+    renderHome(<OrganizationConversation chatId='chat-a' requestMode='assistant' />)
+  )
   expect(composerProps().value).toBe('Chat A follow-up')
   expect(composerProps().files.attachedFiles[0]?.key).toBe('image-key')
   mockSession.mockReturnValue({ data: { user: { id: 'other-user' } } })
-  await act(async () => renderHome(<OrganizationHome chatId='chat-a' requestMode='assistant' />))
+  await act(async () =>
+    renderHome(<OrganizationConversation chatId='chat-a' requestMode='assistant' />)
+  )
   expect(composerProps().value).toBe('')
   mockSession.mockReturnValue({ data: { user: { id: 'reader' } } })
   mockContext.mockReturnValue({
-    ...mockContext(),
+    ...toRecord(mockContext()),
     organization: { id: 'other-org', name: 'Other' },
   })
-  await act(async () => renderHome(<OrganizationHome chatId='chat-a' requestMode='assistant' />))
+  await act(async () =>
+    renderHome(<OrganizationConversation chatId='chat-a' requestMode='assistant' />)
+  )
   expect(composerProps().value).toBe('')
 })