Merge branch 'wip/fix-consistency' into wip/platform-org-wiring

Author: waleedlatif1

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

@@ -94,7 +94,7 @@ beforeEach(() => {
     searchAccess: { memberScoped: true },
     mothershipAvailable: true,
     canBuild: false,
-    viewer: { isAdmin: false, canUseSearchMcp: true },
+    viewer: { userId: 'reader', isAdmin: false, canUseSearchMcp: true },
   })
   mockUseChat.mockReturnValue({ messages: [], resources: [], sendMessage: vi.fn() })
   mocks.composer.mockReturnValue(<div>Question composer</div>)
@@ -110,16 +110,16 @@ afterEach(async () => {
 })
 
 describe('an Assistant conversation on a surface with its own landing', () => {
-  it('holds the surface’s fallback until the session arrives', async () => {
-    authClientMockFns.mockUseSession.mockReturnValue({ data: null })
+  it('mounts on the viewer the layout authorized, without a round trip for the client session', async () => {
+    authClientMockFns.mockUseSession.mockReturnValue({ data: null, isPending: true })
     await render(
       <PageConversation
         requestMode='assistant'
         fallback={<div>Dashboard skeleton</div>}
         landing={landing}
       />
     )
-    expect(container.textContent).toBe('Dashboard skeleton')
+    expect(container.textContent).not.toContain('Dashboard skeleton')
   })
 
   it('shows no dashboard while a restored chat entry hands itself back to the router', async () => {

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

@@ -132,6 +132,7 @@ beforeEach(async () => {
     searchAccess: { memberScoped: true },
     mothershipAvailable: true,
     canBuild: true,
+    viewer: { userId: 'reader' },
   })
   mocks.speech.mockReturnValue({
     isSupported: false,

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

@@ -130,7 +130,7 @@ beforeEach(() => {
     searchAccess: { memberScoped: true },
     mothershipAvailable: true,
     canBuild: true,
-    viewer: { isAdmin: false, canUseSearchMcp: true },
+    viewer: { userId: 'reader', isAdmin: false, canUseSearchMcp: true },
   })
   mocks.apiKeys.mockReturnValue({ data: { personalKeys: [] } })
   mockAuthorizedApps([{ apps: [], nextCursor: null }])
@@ -247,12 +247,16 @@ it('isolates saved drafts by user, organization, and conversation', async () =>
   )
   expect(draftText()).toBe('Chat A follow-up')
   expect(composerProps().files.attachedFiles[0]?.key).toBe('image-key')
-  mockSession.mockReturnValue({ data: { user: { id: 'other-user' } } })
+  const reader = toRecord(mockContext())
+  mockContext.mockReturnValue({
+    ...reader,
+    viewer: { ...toRecord(reader.viewer), userId: 'other-user' },
+  })
   await act(async () =>
     renderHome(<PageConversation chatId='chat-a' requestMode='assistant' fallback={null} />)
   )
   expect(draftText()).toBe('')
-  mockSession.mockReturnValue({ data: { user: { id: 'reader' } } })
+  mockContext.mockReturnValue(reader)
   mockContext.mockReturnValue({
     ...toRecord(mockContext()),
     organization: { id: 'other-org', name: 'Other' },

apps/sim/app/o/[organizationId]/components/use-organization-conversation.ts

@@ -9,7 +9,6 @@ import { createSerializer, useQueryStates } from 'nuqs'
 import { requestJson } from '@/lib/api/client/request'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces'
-import { useSession } from '@/lib/auth/client'
 import { BrowserStorage } from '@/lib/core/utils/browser-storage'
 import {
   getMothershipAttachmentPreviewUrl,
@@ -125,21 +124,19 @@ interface UseConversationGateOptions {
 
 /** Whether the surface may mount, and for which identity. Its key remounts on any change to one. */
 export function useConversationGate({ chatId, requestMode }: UseConversationGateOptions) {
-  const { organization, searchAccess, canBuild, mothershipAvailable } = useOrganization()
-  const { data: session } = useSession()
+  const { organization, viewer, searchAccess, canBuild, mothershipAvailable } = useOrganization()
   const isClient = useHydrated()
   const isRestoredChatEntry = useRestoredChatEntry({ chatId })
-  const userId = session?.user?.id
   if (
     !mothershipAvailable ||
     (requestMode === 'assistant' ? !searchAccess.memberScoped : !canBuild)
   )
     return { status: 'denied' } as const
   if (isRestoredChatEntry) return { status: 'restoring' } as const
-  if (!isClient || !userId) return { status: 'waiting' } as const
+  if (!isClient) return { status: 'waiting' } as const
   return {
     status: 'ready',
-    instanceKey: `${userId}:${organization.id}:${chatId ?? 'new'}`,
+    instanceKey: `${viewer.userId}:${organization.id}:${chatId ?? 'new'}`,
   } as const
 }
 
@@ -165,10 +162,9 @@ export function useOrganizationConversation({
   summaryRequest,
   onSummaryConsumed,
 }: UseOrganizationConversationOptions) {
-  const { organization, canBuild } = useOrganization()
+  const { organization, viewer, canBuild } = useOrganization()
   const panelSurface = surface.kind === 'panel' ? surface : null
-  const { data: session } = useSession()
-  const userId = session?.user?.id
+  const userId = viewer.userId
   const planEnabled = useFeatureFlag('mothership-plan-mode')
   const [planning, setPlanning] = useState(false)
   const requestMode =

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

@@ -1,6 +1,5 @@
 import { HomeDashboardSkeleton } from '@/platform/embedded/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton'
 
-/** A route boundary cannot know the viewer's mode, so it holds the Assistant's, the common one. */
 export default function OrganizationHomeLoading() {
-  return <HomeDashboardSkeleton requestMode='assistant' />
+  return <HomeDashboardSkeleton />
 }

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

@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react'
 import { authMockFns } from '@sim/testing'
 import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
 import {
@@ -20,7 +21,16 @@ vi.mock('@/platform/embedded/lib/data/prefetch-member-inventory', () => ({
 vi.mock(
   '@/platform/embedded/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton',
   () => ({
-    HomeDashboardSkeleton: ({ requestMode }: { requestMode: string }) => (
+    HomeDashboardSkeleton: () => <div>Home skeleton</div>,
+  })
+)
+vi.mock('@/platform/design-system/components/surface/hydrated', () => ({
+  Hydrated: ({ children }: { children: ReactNode }) => children,
+}))
+vi.mock(
+  '@/platform/embedded/app/(shell)/home/_components/home-conversation/home-conversation',
+  () => ({
+    HomeConversation: ({ requestMode }: { requestMode: string }) => (
       <div>Home for {requestMode}</div>
     ),
   })

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

@@ -28,7 +28,7 @@ export default async function OrganizationHomePage({
 
   const requestMode = context.canBuild ? 'agent' : 'assistant'
   return (
-    <Suspense fallback={<HomeDashboardSkeleton requestMode={requestMode} />}>
+    <Suspense fallback={<HomeDashboardSkeleton />}>
       <Hydrated state={prefetchHome(context, principal)}>
         <HomeConversation requestMode={requestMode} />
       </Hydrated>

apps/sim/app/o/[organizationId]/integrations/secrets/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingRows } from '@/platform/design-system/components'
+import { LoadingRows } from '@/platform/design-system/components/status/query-boundary'
 import { PageSurface } from '@/platform/design-system/components/surface/surface'
 import { IntegrationsPage } from '@/platform/embedded/app/(shell)/integrations/_components/integrations-page/integrations-page'
 

apps/sim/app/o/[organizationId]/integrations/secrets/organization-secrets-page.tsx

@@ -6,7 +6,7 @@ import { readOrganizationSecretSource } from '@/lib/organization-secrets/applica
 import type { SecretSourceMode } from '@/lib/organization-secrets/validation'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-import { LoadingRows } from '@/platform/design-system/components'
+import { LoadingRows } from '@/platform/design-system/components/status/query-boundary'
 import { PageSurface } from '@/platform/design-system/components/surface/surface'
 import { IntegrationsPage } from '@/platform/embedded/app/(shell)/integrations/_components/integrations-page/integrations-page'
 import { SecretsEditor } from '@/platform/embedded/app/(shell)/integrations/_components/secrets-editor/secrets-editor'

apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingRows } from '@/platform/design-system/components'
+import { LoadingRows } from '@/platform/design-system/components/status/query-boundary'
 import { SettingsSubpageHost } from '@/platform/embedded/app/(shell)/settings/_components/settings-subpage-host'
 
 /** Keeps the section's heading visible while authorization and content load. */