fix(organization): route chat URLs the same way as organization Home

The chat page gated on (mothershipAvailable || memberScoped) while
OrganizationHome renders nothing without copilot.use, or without Build and
Search. A viewer with copilot.use but neither Build nor Search, and a
Search-only viewer opening an assistant chat, got a blank page. Apply
Home's two redirects (Search when copilot.use is denied, workspace
settings when neither Build nor Search is allowed) before loading the
chat, through one getOrganizationHomeRedirect shared by both pages so
they cannot drift again; the later copilot.use redirect becomes
unreachable and is removed.

Author: waleedlatif1

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

@@ -6,6 +6,7 @@ import { getAccessibleCopilotChatAuth } from '@/lib/mothership/chat/lifecycle'
 import { WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import OrganizationChatLoading from '@/app/o/[organizationId]/chat/[chatId]/loading'
+import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
 import { OrganizationHome } from '@/app/o/[organizationId]/home/organization-home'
 
 export const metadata: Metadata = { title: 'Chat' }
@@ -20,8 +21,8 @@ export default async function OrganizationChatPage({
   if (!session?.user?.id) notFound()
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  if (!context.mothershipAvailable && !context.searchAccess.memberScoped)
-    redirect(WORKSPACE_SETTINGS_PATH)
+  const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
+  if (homeRedirect) redirect(homeRedirect)
   const chat = await getAccessibleCopilotChatAuth(chatId, session.user.id, {
     principal: { kind: 'session', userId: session.user.id, sessionId: session.session.id },
   })
@@ -38,7 +39,6 @@ export default async function OrganizationChatPage({
       </Suspense>
     )
   }
-  if (!context.mothershipAvailable) redirect(WORKSPACE_SETTINGS_PATH)
   return (
     <Suspense fallback={<OrganizationChatLoading />}>
       <OrganizationHome

apps/sim/app/o/[organizationId]/home/home-redirect.ts

@@ -0,0 +1,20 @@
+import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
+import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
+
+/**
+ * Where organization Home and its chat URLs send a viewer Home cannot serve, or `null` when
+ * Home renders: Search when Chat is off but member Search is on, otherwise workspace settings
+ * unless the viewer can chat and build or search as a member.
+ */
+export function getOrganizationHomeRedirect(
+  context: Pick<OrganizationSurfaceContext, 'mothershipAvailable' | 'canBuild' | 'searchAccess'>,
+  organizationId: string
+): string | null {
+  if (!context.mothershipAvailable && context.searchAccess.memberScoped) {
+    return organizationRoutes(organizationId).search
+  }
+  if (!(context.mothershipAvailable && context.canBuild) && !context.searchAccess.memberScoped) {
+    return WORKSPACE_SETTINGS_PATH
+  }
+  return null
+}

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

@@ -152,6 +152,24 @@ describe('organization Search page gates', () => {
     )
     expect(mocks.chat).not.toHaveBeenCalled()
   })
+
+  it('routes chat URLs exactly where Home routes the same viewer, before loading the chat', async () => {
+    mocks.context.mockResolvedValue({
+      mothershipAvailable: true,
+      canBuild: false,
+      searchAccess: { memberScoped: false },
+    })
+    await expect(OrganizationChatPage({ params })).rejects.toThrow(
+      'redirect:/workspace?redirect=settings'
+    )
+    mocks.context.mockResolvedValue({
+      mothershipAvailable: false,
+      canBuild: false,
+      searchAccess: { memberScoped: true },
+    })
+    await expect(OrganizationChatPage({ params })).rejects.toThrow('redirect:/o/org-1/search')
+    expect(mocks.chat).not.toHaveBeenCalled()
+  })
 })
 
 it('renders standalone Search independently of assistant availability', async () => {

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

@@ -2,8 +2,8 @@ import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
-import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
+import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
 import { OrganizationHome } from '@/app/o/[organizationId]/home/organization-home'
 import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
 
@@ -21,10 +21,8 @@ export default async function OrganizationHomePage({
   if (!session?.user?.id) notFound()
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  if (!context.mothershipAvailable && context.searchAccess.memberScoped)
-    redirect(organizationRoutes(organizationId).search)
-  if (!(context.mothershipAvailable && context.canBuild) && !context.searchAccess.memberScoped)
-    redirect(WORKSPACE_SETTINGS_PATH)
+  const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
+  if (homeRedirect) redirect(homeRedirect)
 
   return (
     <Suspense fallback={<HomeFallback />}>