@@ -280,8 +280,8 @@ case "$group" in
     esac
     ;;
 
-  # One hosted Enterprise organization shaped like a real customer, a scripted worker in place of the
-  # model, and the app twice: as that customer has it, then with People on. Hosted is decided by the
+  # One hosted Enterprise organization, a scripted worker in place of the
+  # model, and the app twice: with People off, then on. Hosted is decided by the
   # app's hostname, which the job maps to loopback. Both phases report, whichever fails.
   org-redesign)
     app_server=start
 
@@ -1,10 +1,8 @@
 /**
  * @vitest-environment jsdom
  *
- * A surface's own landing must not change the conversation it fronts. Failure modes: Home's
- * Assistant sharing Search's unsent question, a new chat losing its Search address, the landing
- * outliving the first turn, a restored chat entry flashing the dashboard's skeleton, and a caller
- * without a landing (the extension, Search) seeing any of it.
+ * Transient states a browser run cannot hold still. Failure modes: the landing rendering before the
+ * session arrives, and a restored chat entry flashing the dashboard while the router takes over.
  */
 import { act, type ReactNode } from 'react'
 import { authClientMock, authClientMockFns } from '@sim/testing/mocks/auth-client.mock'
@@ -24,12 +22,10 @@ import {
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 
 const mocks = vi.hoisted(() => ({
   chat: vi.fn(),
   composer: vi.fn(),
-  send: vi.fn(),
 }))
 vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
   useFeatureFlag: () => false,
@@ -78,9 +74,6 @@ import {
   type OrganizationLandingSlot,
 } from '@/app/o/[organizationId]/components/organization-conversation'
 
-const SEARCH_DRAFT = 'reader:organization:organization-a:search-assistant'
-const HOME_DRAFT = 'reader:organization:organization-a:home-assistant'
-
 const landing = {
   fallback: <div>Dashboard skeleton</div>,
   render: ({ requestMode, composer, shortcuts }: OrganizationLandingSlot) => (
@@ -101,17 +94,10 @@ async function render(element: ReactNode) {
   })
 }
 
-function composerProps() {
-  const call = mocks.composer.mock.lastCall
-  if (!call) throw new Error('Composer has not rendered')
-  return call[0]
-}
-
 beforeEach(() => {
   vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
   reactQueryMockFns.mockUseQuery.mockReturnValue(createQueryResultMock())
   reactQueryMockFns.mockUseMutation.mockReturnValue(createMutationResultMock())
-  useMothershipDraftsStore.setState({ drafts: {} })
   nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization-a/home')
   authClientMockFns.mockUseSession.mockReturnValue({ data: { user: { id: 'reader' } } })
   organizationProviderMockFns.mockUseOrganizationContext.mockReturnValue({
@@ -121,7 +107,7 @@ beforeEach(() => {
     canBuild: false,
     viewer: { isAdmin: false, canUseSearchMcp: true },
   })
-  mocks.chat.mockReturnValue({ messages: [], resources: [], sendMessage: mocks.send })
+  mocks.chat.mockReturnValue({ messages: [], resources: [], sendMessage: vi.fn() })
   mocks.composer.mockReturnValue(<div>Question composer</div>)
   container = document.createElement('div')
   document.body.appendChild(container)
@@ -134,69 +120,6 @@ afterEach(async () => {
 })
 
 describe('an Assistant conversation on a surface with its own landing', () => {
-  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'
-        draftId='home-assistant'
-        landing={landing}
-      />
-    )
-    expect(container.textContent).toContain('Dashboard for assistant')
-    expect(container.textContent).toContain('Question composer')
-    expect(container.querySelector('[data-testid="shortcuts"]')?.textContent).toBe(
-      'Legacy get started'
-    )
-    expect(container.querySelector('h1')).toBeNull()
-  })
-
-  it('keeps its unsent question apart from Search’s Assistant, in both directions', async () => {
-    useMothershipDraftsStore.getState().setDraft(SEARCH_DRAFT, { text: 'Asked from Search' })
-    await render(
-      <OrganizationConversation
-        requestMode='assistant'
-        draftId='home-assistant'
-        landing={landing}
-      />
-    )
-    expect(composerProps().value).toBe('')
-    await act(async () => composerProps().onChange('Asked from Home'))
-    const { drafts } = useMothershipDraftsStore.getState()
-    expect(drafts[HOME_DRAFT]?.text).toBe('Asked from Home')
-    expect(drafts[SEARCH_DRAFT]?.text).toBe('Asked from Search')
-  })
-
-  it('addresses a new chat under Search, in the Assistant view', async () => {
-    await render(
-      <OrganizationConversation
-        requestMode='assistant'
-        draftId='home-assistant'
-        landing={landing}
-      />
-    )
-    const [, chatId, options] = mocks.chat.mock.lastCall ?? []
-    expect(chatId).toBeUndefined()
-    expect(options.requestMode).toBe('assistant')
-    expect(options.getChatUrl('chat-1')).toBe('/o/organization-a/search/chat/chat-1?mode=assistant')
-  })
-
-  it('gives way to today’s conversation view at the first turn', async () => {
-    mocks.chat.mockReturnValue({
-      messages: [{ id: 'turn' }],
-      resources: [],
-      sendMessage: mocks.send,
-    })
-    await render(
-      <OrganizationConversation
-        requestMode='assistant'
-        draftId='home-assistant'
-        landing={landing}
-      />
-    )
-    expect(container.textContent).toContain('Conversation view')
-    expect(container.textContent).not.toContain('Dashboard for')
-  })
-
   it('holds the surface’s fallback until the session arrives', async () => {
     authClientMockFns.mockUseSession.mockReturnValue({ data: null })
     await render(<OrganizationConversation requestMode='assistant' landing={landing} />)
@@ -209,13 +132,3 @@ describe('an Assistant conversation on a surface with its own landing', () => {
     expect(container.textContent).toBe('')
   })
 })
-
-describe('a conversation without a landing', () => {
-  it('keeps today’s landing and Search’s draft key', async () => {
-    useMothershipDraftsStore.getState().setDraft(SEARCH_DRAFT, { text: 'Asked from Search' })
-    await render(<OrganizationConversation requestMode='assistant' />)
-    expect(container.querySelector('h1')?.textContent).toBe('Search Acme')
-    expect(container.textContent).toContain('Legacy get started')
-    expect(composerProps().value).toBe('Asked from Search')
-  })
-})
@@ -22,9 +22,6 @@ vi.mock('@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-s
     <div>Home for {requestMode}</div>
   ),
 }))
-vi.mock('@/app/o/[organizationId]/integrations/integrations', () => ({
-  OrganizationIntegrations: () => <div>Integrations</div>,
-}))
 vi.mock('@/platform/app/(shell)/search/_components/search-surface/search-surface', () => ({
   OrganizationSearchSurface: () => <div>Standalone Search</div>,
 }))
 
@@ -1,29 +1,28 @@
-import { type ComponentProps, Suspense } from 'react'
+import { Suspense } from 'react'
 import type { SessionPrincipal } from '@sim/auth/principal'
 import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
 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 {
+  IntegrationsRoute,
+  IntegrationsRouteFallback,
+  type IntegrationsRouteProps,
+} from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-route'
 import { prefetchIntegrations } from '@/platform/lib/data/prefetch-member-inventory'
 
-interface HydratedIntegrationsProps extends ComponentProps<typeof OrganizationIntegrations> {
+interface HydratedIntegrationsProps extends Omit<IntegrationsRouteProps, 'organizationId'> {
   surface: OrganizationSurfaceContext
   principal: SessionPrincipal
 }
 
 export function HydratedIntegrations({ surface, principal, ...route }: HydratedIntegrationsProps) {
   return (
-    <Suspense
-      fallback={
-        <IntegrationsHost>
-          <IntegrationsRouteFallback detail={Boolean(route.section)} />
-        </IntegrationsHost>
-      }
-    >
-      <Hydrated state={prefetchIntegrations(surface, principal)}>
-        <OrganizationIntegrations {...route} />
-      </Hydrated>
-    </Suspense>
+    <IntegrationsHost>
+      <Suspense fallback={<IntegrationsRouteFallback detail={Boolean(route.section)} />}>
+        <Hydrated state={prefetchIntegrations(surface, principal)}>
+          <IntegrationsRoute organizationId={surface.organization.id} {...route} />
+        </Hydrated>
+      </Suspense>
+    </IntegrationsHost>
   )
 }
@@ -1,5 +1,14 @@
 import { createLoader, createSerializer, parseAsString } from 'nuqs/server'
-import { organizationPageParsers } from '@/app/o/[organizationId]/components/organization-page/search-params'
+
+/** The list's search text, written raw and debounced on the way to the URL. */
+export const integrationSearchParsers = {
+  q: parseAsString.withDefault(''),
+} as const
+
+export const integrationSearchUrlKeys = {
+  history: 'replace',
+  clearOnDefault: true,
+} as const
 
 export const integrationViewParsers = {
   integration: parseAsString,
@@ -8,13 +17,13 @@ export const integrationViewParsers = {
 } as const
 
 export const serializeIntegrationView = createSerializer({
-  ...organizationPageParsers,
+  ...integrationSearchParsers,
   ...integrationViewParsers,
 })
 
 /** Reads a link from before providers had their own route, so it can be sent there. */
 export const loadIntegrationView = createLoader({
-  ...organizationPageParsers,
+  ...integrationSearchParsers,
   ...integrationViewParsers,
 })
 
 
@@ -2,8 +2,10 @@ import type { Metadata } from 'next'
 import { createLoader, type SearchParams } from 'nuqs/server'
 import { OrganizationSecretsPage } from '@/components/secrets/organization-secrets-page'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { organizationPageParsers } from '@/app/o/[organizationId]/components/organization-page/search-params'
-import { serializeIntegrationView } from '@/app/o/[organizationId]/integrations/search-params'
+import {
+  integrationSearchParsers,
+  serializeIntegrationView,
+} from '@/app/o/[organizationId]/integrations/search-params'
 
 export const metadata: Metadata = { title: 'Generic Secrets' }
 
@@ -12,7 +14,7 @@ interface MemberSecretsPageProps {
   searchParams: Promise<SearchParams>
 }
 
-const loadSearch = createLoader(organizationPageParsers)
+const loadSearch = createLoader(integrationSearchParsers)
 
 export default async function Page({ params, searchParams }: MemberSecretsPageProps) {
   const { organizationId } = await params